diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 839834cc086..ddcb00c5a40 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,18 +1,8 @@
-// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
-// https://github.com/microsoft/vscode-dev-containers/tree/v0.245.2/containers/java
 {
     "name": "Java",
     "image": "mcr.microsoft.com/vscode/devcontainers/base:bullseye",
-
-    // Configure tool-specific properties.
     "customizations": {
-        // Configure properties specific to VS Code.
         "vscode": {
-            // Set *default* container specific settings.json values on container create.
-            "settings": { 
-            },
-            
-            // Add the IDs of extensions you want installed when the container is created.
             "extensions": [
                 "vscjava.vscode-java-pack",
                 "vscjava.vscode-gradle",
@@ -22,23 +12,28 @@
         }
     },
 
-    "onCreateCommand": "gradle assemble",
+    // Source code generation needs to be done before hand-over to VS Code.
+    // Otherwise, the Java extension will go mad.
+    "onCreateCommand": "./gradlew testClasses --no-daemon",
 
-    // Forward the noVNC port (desktop-lite: https://github.com/devcontainers/features/tree/main/src/desktop-lite)  
-    "forwardPorts": [6080],
+    // Forward the vncPort and noVNC port.
+    // They are provided by desktop-lite:
+    // https://github.com/devcontainers/features/tree/main/src/desktop-lite#options
+    "forwardPorts": [5901, 6080],
 
     // Need to connect as root otherwise we run into issues with gradle.
     // default option is "vscode". More info: https://aka.ms/vscode-remote/containers/non-root.
     "remoteUser": "root",
     "features": {
         // Adds a lightweight desktop that can be accessed using a VNC viewer or the web
-        "desktop-lite": "latest",
+        "ghcr.io/devcontainers/features/desktop-lite:1": {},
 
-        // Install java
-        "java": {
-            "version": "20",
+        // Install java.
+        // See https://github.com/devcontainers/features/tree/main/src/java#options for details.
+        "ghcr.io/devcontainers/features/java:1": {
+            "version": "19.0.2-tem",
             "installGradle": false,
-            "jdkDistro": "sem"
+            "jdkDistro": "tem"
         }
     }
 }
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 783e39dd057..5f136688ca4 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -12,8 +12,7 @@ body:
     attributes:
       label: JabRef version
       options:
-        - "5.9 (latest release)"
-        - "3.8.2"
+        - "5.10 (latest release)"
         - Latest development branch build (please note build date below)
         - Other (please describe below)
       description: The version as shown in the about dialog.
@@ -42,7 +41,7 @@ body:
 
   - type: checkboxes
     attributes:
-      label: Checked with the latest development build
+      label: Checked with the latest development build (copy version output from About dialog)
       description: |
         Please always test if the bug is still reproducible in the latest development version. We are constantly improving JabRef and some bugs may already be fixed. If you already use a development version, ensure that you use the latest one.
         You can download the latest development build at: https://builds.jabref.org/main/ . **Please make a backup of your library before you try out this version.**
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 08445740dd0..5ce48160d2e 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -11,12 +11,10 @@ The title of the PR must not reference an issue, because GitHub does not support
 - [x] done; [ ] not done / not applicable
 -->
 
-```[tasklist]
-### Compulsory checks
+### Mandatory checks
 - [ ] Change in `CHANGELOG.md` described in a way that is understandable for the average user (if applicable)
 - [ ] 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/dependabot.yml b/.github/dependabot.yml
index 2f18e225965..d417016ae16 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -5,7 +5,7 @@ updates:
     schedule:
       interval: weekly
     labels:
-      - "type: dependencies"
+      - "dependencies"
     ignore:
       - dependency-name: com.microsoft.azure:applicationinsights-core
         versions:
@@ -18,10 +18,10 @@ updates:
     schedule:
       interval: weekly
     labels:
-      - "type: dependencies"
+      - "dependencies"
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
       interval: weekly
     labels:
-      - "type: dependencies"
+      - "dependencies"
diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
index 78735f0ed31..886372e30cc 100644
--- a/.github/workflows/automerge.yml
+++ b/.github/workflows/automerge.yml
@@ -1,34 +1,22 @@
-name: Automerge Pull Requests
-on:
-  pull_request:
-    types:
-      - opened
-      - synchronize
-      - reopened
-      - labeled
+name: Dependabot auto-merge
+on: pull_request
+
+permissions:
+  contents: write
+  pull-requests: write
+
 jobs:
-  automerge:
-    name: Automerge Dependency Updates
+  dependabot:
     runs-on: ubuntu-latest
-    if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]' || contains(github.event.pull_request.labels.*.name, 'dependencies')
+    if: ${{ github.actor == 'dependabot[bot]' }}
     steps:
-      - name: 'Wait for status checks'
-        id: waitforstatuschecks
-        uses: "WyriHaximus/github-action-wait-for-status@v1.7.1"
-        with:
-          ignoreActions: Automerge Dependabot,Code coverage,Create snapcraft image,Deploy binaries on builds.jabref.org,codecov/project,markdown-link-check
-          checkInterval: 13
+      - name: Approve PR
+        run: gh pr review --approve "$PR_URL"
         env:
-          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-      - name: Auto approve
-        uses: hmarr/auto-approve-action@v3.2.1
-        if: steps.waitforstatuschecks.outputs.status == 'success'
-        with:
-          github-token: "${{ secrets.GITHUB_TOKEN }}"
-      - name: Merge pull requests
-        uses: pascalgn/automerge-action@v0.15.6
-        if: steps.waitforstatuschecks.outputs.status == 'success'
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+      - name: Merge PR
+        run: gh pr merge --auto "$PR_URL"
         env:
-          MERGE_METHOD: "merge"
-          MERGE_LABELS: ""
-          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
diff --git a/.github/workflows/cleanup_pr.yml b/.github/workflows/cleanup_pr.yml
index f5da4a713ef..31cdefde5ce 100644
--- a/.github/workflows/cleanup_pr.yml
+++ b/.github/workflows/cleanup_pr.yml
@@ -7,8 +7,12 @@ on:
 jobs:
   cleanup:
     runs-on: ubuntu-latest
-
     steps:
+      - name: Cancel deployment run
+        uses: styfle/cancel-workflow-action@0.11.0
+        with:
+          ignore_sha: true
+          workflow_id: 9813 # workflow "Deployment"
       - name: Check secrets presence
         id: checksecrets
         shell: bash
@@ -20,17 +24,19 @@ jobs:
           fi
         env:
           BUILDJABREFPRIVATEKEY: ${{ secrets.buildJabRefPrivateKey }}
-      - name: Extract branch name
-        id: extract_branch
-        if: ${{ steps.checksecrets.outputs.secretspresent }}
-        run: |
-          echo "branch=${{ github.event.pull_request.head.ref }}" >> $GITHUB_OUTPUT
       - name: Delete folder on builds.jabref.org
         if: steps.checksecrets.outputs.secretspresent == 'YES'
-        uses: appleboy/ssh-action@v0.1.10
+        uses: appleboy/ssh-action@v1.0.0
         with:
-          script: rm -rf /var/www/builds.jabref.org/www/${{ steps.extract_branch.outputs.branch }} || true
+          script: rm -rf /var/www/builds.jabref.org/www/pull/${{ github.event.pull_request.number }} || true
           host: build-upload.jabref.org
           port: 9922
           username: jrrsync
           key: ${{ secrets.buildJabRefPrivateKey }}
+      - name: Update PR comment
+        if: steps.checksecrets.outputs.secretspresent == 'YES'
+        uses: thollander/actions-comment-pull-request@v2
+        with:
+          comment_tag: download-link
+          message: The build for this PR is no longer available. Please visit <https://builds.jabref.org/main/> for the latest build.
+          mode: upsert
diff --git a/.github/workflows/deployment-arm64.yml b/.github/workflows/deployment-arm64.yml
index 261b7cb63af..38693c6fd8b 100644
--- a/.github/workflows/deployment-arm64.yml
+++ b/.github/workflows/deployment-arm64.yml
@@ -2,9 +2,15 @@ name: Deployment Release for ARM64 - Run manually!
 
 on:
   workflow_dispatch:
+    inputs:
+      notarization:
+        type: boolean
+        required: true
+        default: true
   push:
    branches:
     - arm64mac-release
+    - updateArm64Notarization
 
 env:
   SpringerNatureAPIKey: ${{ secrets.SpringerNatureAPIKey }}
@@ -29,7 +35,6 @@ jobs:
           - os: self-hosted
             displayName: macOS (Arm64)
             suffix: '_arm64'
-            archivePortable: tar -c -C build/distribution JabRef.app | pigz --rsyncable > build/distribution/JabRef-portable_macos_arm64.tar.gz && rm -R build/distribution/JabRef.app
     runs-on: ${{ matrix.os }}
     name: Create installer and portable version for ${{ matrix.displayName }}
     steps:
@@ -37,11 +42,7 @@ jobs:
         id: checksecrets
         shell: bash
         run: |
-          if [ "$BUILDJABREFPRIVATEKEY" == "" ]; then
-            echo "secretspresent=NO" >> $GITHUB_OUTPUT
-          else
-            echo "secretspresent=YES" >> $GITHUB_OUTPUT
-          fi
+          [ -n "$BUILDJABREFPRIVATEKEY" ] || exit 1
         env:
           BUILDJABREFPRIVATEKEY: ${{ secrets.buildJabRefPrivateKey }}
       - name: Fetch all history for all tags and branches
@@ -61,114 +62,119 @@ jobs:
           java-version: 20
           distribution: 'temurin'
           cache: 'gradle'
+      - name: setup jdk JabRef-fix mac
+        shell: bash
+        run: |
+            mkdir ${{runner.temp}}/jdk
+            wget -qO- https://files.jabref.org/jdks/jdk-macos-aarch64.tar.gz | tar xz -C ${{runner.temp}}/jdk
+            mv ${{runner.temp}}/jdk/jdk-21.jdk ${{runner.temp}}/jdk/jdk-21
+            echo "JDK21=${{runner.temp}}/jdk/jdk-21" >> "$GITHUB_ENV"
+            ls ${{runner.temp}}/jdk
+
+            echo "org.gradle.java.installations.paths=${{runner.temp}}/jdk/jdk-21" >> gradle.properties
+            echo "org.gradle.java.installations.auto-detect=false" >> gradle.properties
+            cat gradle.properties
+
+            sed -i'.bak' -e "s/JavaLanguageVersion.of(20)/JavaLanguageVersion.of(21)/" build.gradle
       - name: Clean up keychain
-        if: (matrix.os == 'self-hosted') && (steps.checksecrets.outputs.secretspresent == 'YES')
         run: |
-         security delete-keychain signing_temp.keychain || true
+         security delete-keychain signing_temp.keychain ${{runner.temp}}/keychain/notarization.keychain || true
       - name: Setup OSX key chain on OSX
-        if: (matrix.os == 'macos-latest' || matrix.os == 'self-hosted') && (steps.checksecrets.outputs.secretspresent == 'YES')
         uses: apple-actions/import-codesign-certs@v2
         with:
           p12-file-base64: ${{ secrets.OSX_SIGNING_CERT }}
           p12-password: ${{ secrets.OSX_CERT_PWD }}
           keychain-password: jabref
       - name: Setup OSX key chain on OSX for app id cert
-        if: (matrix.os == 'macos-latest' || matrix.os == 'self-hosted') && (steps.checksecrets.outputs.secretspresent == 'YES')
         uses: apple-actions/import-codesign-certs@v2
         with:
           p12-file-base64: ${{ secrets.OSX_SIGNING_CERT_APPLICATION }}
           p12-password: ${{ secrets.OSX_CERT_PWD }}
           create-keychain: false
           keychain-password: jabref
-      - name: Build runtime image
-        if: (matrix.os != 'macos-latest') || (steps.checksecrets.outputs.secretspresent == 'YES')
-        run: ./gradlew -i -PprojVersion="${{ steps.gitversion.outputs.AssemblySemVer }}" -PprojVersionInfo="${{ steps.gitversion.outputs.InformationalVersion }}" jlinkZip
-      - name: Build installer
-        if: (matrix.os != 'macos-latest') || (steps.checksecrets.outputs.secretspresent == 'YES')
-        run: ./gradlew -i -PprojVersion="${{ steps.gitversion.outputs.AssemblySemVer }}" -PprojVersionInfo="${{ steps.gitversion.outputs.InformationalVersion }}" jpackage
+      - name: Create notarization keychain
+        run: |
+          mkdir ${{runner.temp}}/keychain
+          security create-keychain -p jabref ${{runner.temp}}/keychain/notarization.keychain
+          security set-keychain-settings ${{runner.temp}}/keychain/notarization.keychain
+      - name: Prepare merged jars and modules dir (macos)
+        run: ./gradlew -i -PprojVersion="${{ steps.gitversion.outputs.AssemblySemVer }}" -PprojVersionInfo="${{ steps.gitversion.outputs.InformationalVersion }}" prepareModulesDir
+      - name: Build dmg (macos)
         shell: bash
-      - name: Resign app image for OSX and build dmg
-        if: (matrix.os == 'macos-latest' || matrix.os == 'self-hosted') && (steps.checksecrets.outputs.secretspresent == 'YES')
+        run: |
+          ${{env.JDK21}}/Contents/Home/bin/jpackage \
+          --module org.jabref/org.jabref.cli.Launcher \
+          --module-path ${{env.JDK21}}/Contents/Home/jmods/:build/jlinkbase/jlinkjars \
+          --add-modules org.jabref,org.jabref.merged.module  \
+          --dest build/distribution \
+          --name JabRef \
+          --app-version ${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }} \
+          --verbose \
+          --mac-sign \
+          --vendor JabRef \
+          --mac-package-identifier Jabref \
+          --mac-package-name JabRef \
+          --type dmg --mac-signing-key-user-name "JabRef e.V. (6792V39SK3)" \
+          --mac-package-signing-prefix org.jabref \
+          --mac-entitlements buildres/mac/jabref.entitlements \
+          --icon src/main/resources/icons/jabref.icns \
+          --resource-dir buildres/mac \
+          --file-associations buildres/mac/bibtexAssociations.properties \
+          --jlink-options --bind-services
+      - name: Build pkg (macos)
         shell: bash
         run: |
-          jpackage --type pkg --dest build/distribution --name JabRef --app-version "${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}" --app-image build/distribution/JabRef.app --verbose --type dmg --vendor JabRef --app-version "${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}" --file-associations buildres/mac/bibtexAssociations.properties --resource-dir buildres/mac --mac-sign --mac-signing-key-user-name "Developer ID Installer: JabRef e.V. (6792V39SK3)"
-          jpackage --type pkg --dest build/distribution --name JabRef --mac-package-identifier JabRef --app-version "${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}" --app-image build/distribution/JabRef.app --verbose --type pkg --vendor JabRef --app-version "${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}" --file-associations buildres/mac/bibtexAssociations.properties --resource-dir buildres/mac --mac-sign --mac-signing-key-user-name "Developer ID Installer: JabRef e.V. (6792V39SK3)"
-          productsign --sign "Developer ID Installer: JabRef e.V. (6792V39SK3)" "build/distribution/JabRef-${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}.pkg" "build/distribution/JabRef-${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}-signed.pkg"
-      - name: Notarize dmg and pkg installer
-        if: (matrix.os == 'macos-latest' || matrix.os == 'self-hosted' ) && contains(fromJson('["refs/tags/", "refs/heads/arm64mac-release"]'), github.ref) && (steps.checksecrets.outputs.secretspresent == 'YES')
+          ${{env.JDK21}}/Contents/Home/bin/jpackage \
+          --module org.jabref/org.jabref.cli.Launcher \
+          --module-path ${{env.JDK21}}/Contents/Home/jmods/:build/jlinkbase/jlinkjars \
+          --add-modules org.jabref,org.jabref.merged.module  \
+          --dest build/distribution \
+          --name JabRef \
+          --app-version ${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }} \
+          --verbose \
+          --mac-sign \
+          --vendor JabRef \
+          --mac-package-identifier Jabref \
+          --mac-package-name JabRef \
+          --type pkg --mac-signing-key-user-name "JabRef e.V. (6792V39SK3)" \
+          --mac-package-signing-prefix org.jabref \
+          --mac-entitlements buildres/mac/jabref.entitlements \
+          --icon src/main/resources/icons/jabref.icns \
+          --resource-dir buildres/mac \
+          --file-associations buildres/mac/bibtexAssociations.properties \
+          --jlink-options --bind-services
+      - name: Rename files with arm64 suffix as well
         shell: bash
         run: |
-          codesign --timestamp -s "Developer ID Application: JabRef e.V. (6792V39SK3)" --options runtime --entitlements buildres/mac/jabref.entitlements -vvvv --deep "build/distribution/JabRef-${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}.dmg"
-          xcrun notarytool submit build/distribution/JabRef-${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}.dmg --apple-id "${{ secrets.OSX_NOTARIZATION_APP_USERNAME }}" --team-id "6792V39SK3" --password "${{ secrets.OSX_NOTARIZATION_APP_PWD }}" --wait
-          xcrun stapler staple "build/distribution/JabRef-${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}.dmg"
-          spctl -a -t open --context context:primary-signature -vv "build/distribution/JabRef-${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}.dmg"
-      - name: Rename files (non-macos)
-        if: (matrix.os != 'macos-latest' && matrix.os != 'self-hosted')
-        shell: pwsh
+          mv build/distribution/JabRef-${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}.dmg  build/distribution/JabRef-${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}-arm64.dmg
+          mv build/distribution/JabRef-${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}.pkg  build/distribution/JabRef-${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}-arm64.pkg
+      - name: Notarize dmg
+        if: (startsWith(github.ref, 'refs/tags/') || (${{ inputs.notarization }}))
+        shell: bash
         run: |
-          get-childitem -Path build/distribution/* | rename-item -NewName {$_.name -replace "${{ steps.gitversion.outputs.AssemblySemVer }}","${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}"}
-          get-childitem -Path build/distribution/* | rename-item -NewName {$_.name -replace "portable","${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}-portable"}
-      - name: Rename files (arm64)
-        if: (matrix.os == 'self-hosted') && (steps.checksecrets.outputs.secretspresent == 'YES')
-        shell: pwsh
+          xcrun notarytool store-credentials "notarytool-profile" --apple-id "vorstand@jabref.org" --team-id "6792V39SK3" --password "${{ secrets.OSX_NOTARIZATION_APP_PWD }}" --keychain ${{runner.temp}}/keychain/notarization.keychain
+          xcrun notarytool submit build/distribution/JabRef-${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}-arm64.dmg --keychain-profile "notarytool-profile" --keychain ${{runner.temp}}/keychain/notarization.keychain --wait
+          xcrun stapler staple build/distribution/JabRef-${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}-arm64.dmg
+      - name: Notarize pkg
+        if: (startsWith(github.ref, 'refs/tags/') || (${{ inputs.notarization }}))
+        shell: bash
         run: |
-          get-childitem -Path build/distribution/* | rename-item -NewName {$_.name -replace ".dmg", ".${{ matrix.suffix }}.dmg"}
-          get-childitem -Path build/distribution/* | rename-item -NewName {$_.name -replace ".pkg", ".${{ matrix.suffix }}.pkg"}
+          xcrun notarytool store-credentials "notarytool-profile" --apple-id "vorstand@jabref.org" --team-id "6792V39SK3" --password "${{ secrets.OSX_NOTARIZATION_APP_PWD }}" --keychain ${{runner.temp}}/keychain/notarization.keychain
+          xcrun notarytool submit build/distribution/JabRef-${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}-arm64.pkg --keychain-profile "notarytool-profile" --keychain ${{runner.temp}}/keychain/notarization.keychain --wait
+          xcrun stapler staple build/distribution/JabRef-${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}-arm64.pkg
+      - name: Upload with rsync
+        if: ${{ !startsWith(github.ref, 'refs/heads/gh-readonly-queue') }}
+        shell: bash
+        run: |
+          mkdir ${{runner.temp}}/sshkey
+          if [[ -z "${{ secrets.buildJabRefPrivateKey }}" ]]; then
+            echo "buildJabRefPrivateKey is empty, exiting"
+            exit 1
+          fi
+          rsync -Pavz --itemize-changes --stats --partial-dir=/tmp/partial --rsync-path="mkdir -p /var/www/builds.jabref.org/www/${{ steps.gitversion.outputs.branchName }} && rsync" -e 'ssh -p 9922 -i ~/.ssh/id_rsa' build/distribution/ jrrsync@build-upload.jabref.org:/var/www/builds.jabref.org/www/${{ steps.gitversion.outputs.branchName }}/
       - name: Upload to GitHub workflow artifacts store
-        if: (matrix.os != 'macos-latest' && matrix.os !='self-hosted') || (steps.checksecrets.outputs.secretspresent == 'YES')
+        if: ${{ !startsWith(github.ref, 'refs/heads/gh-readonly-queue') }}
         uses: actions/upload-artifact@v3
         with:
           name: JabRef-${{ matrix.displayName }}
           path: build/distribution
-  deploy:
-    strategy:
-      fail-fast: false
-    name: Deploy binaries on builds.jabref.org
-    runs-on: ubuntu-latest
-    needs: [build]
-    steps:
-      - name: Check secrets presence
-        id: checksecrets
-        shell: bash
-        run: |
-          if [ "$BUILDJABREFPRIVATEKEY" == "" ]; then
-            echo "secretspresent=NO" >> $GITHUB_OUTPUT
-          else
-            echo "secretspresent=YES" >> $GITHUB_OUTPUT
-          fi
-        env:
-          BUILDJABREFPRIVATEKEY: ${{ secrets.buildJabRefPrivateKey }}
-      - name: Checkout source
-        if: steps.checksecrets.outputs.secretspresent == 'YES'
-        uses: actions/checkout@v3
-      - name: Fetch all history for all tags and branches
-        if: steps.checksecrets.outputs.secretspresent == 'YES'
-        run: git fetch --prune --unshallow
-      - name: Install GitVersion
-        if: steps.checksecrets.outputs.secretspresent == 'YES'
-        uses: gittools/actions/gitversion/setup@v0.10.2
-        with:
-          versionSpec: '5.x'
-      - name: Run GitVersion
-        if: steps.checksecrets.outputs.secretspresent == 'YES'
-        id: gitversion
-        uses: gittools/actions/gitversion/execute@v0.10.2
-      - name: Get macOSArm64 binaries
-        if: steps.checksecrets.outputs.secretspresent == 'YES'
-        uses: actions/download-artifact@master
-        with:
-          name: JabRef-macOS (Arm64)
-          path: build/distribution/
-      - name: Deploy to builds.jabref.org
-        id: deploy
-        if: steps.checksecrets.outputs.secretspresent == 'YES'
-        uses: Pendect/action-rsyncer@v2.0.0
-        env:
-          DEPLOY_KEY: ${{ secrets.buildJabRefPrivateKey }}
-          BRANCH: ${{ steps.gitversion.outputs.branchName }}
-        with:
-          flags: -vaz --itemize-changes --stats --partial-dir=/tmp/partial --rsync-path="mkdir -p /var/www/builds.jabref.org/www/${{ steps.gitversion.outputs.branchName }} && rsync"
-          options: ''
-          ssh_options: '-p 9922'
-          src: 'build/distribution/'
-          dest: jrrsync@build-upload.jabref.org:/var/www/builds.jabref.org/www/${{ steps.gitversion.outputs.branchName }}/
diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml
index ffca8ea3323..c439988a226 100644
--- a/.github/workflows/deployment.yml
+++ b/.github/workflows/deployment.yml
@@ -2,6 +2,11 @@ name: Deployment
 
 on:
   workflow_dispatch:
+    inputs:
+      notarization:
+        type: boolean
+        required: false
+        default: false
   push:
     branches:
       - main
@@ -17,6 +22,7 @@ on:
       - 'docs/**'
       - 'src/test/**'
       - 'README.md'
+  merge_group:
 
 env:
   SpringerNatureAPIKey: ${{ secrets.SpringerNatureAPIKey }}
@@ -26,6 +32,7 @@ env:
   OSXCERT: ${{ secrets.OSX_SIGNING_CERT }}
   GRADLE_OPTS: -Xmx4g -Dorg.gradle.daemon=false -Dorg.gradle.vfs.watch=false
   JAVA_OPTS: -Xmx4g
+  JDK21: ""
 
 concurrency:
   group: ${{ github.ref }}
@@ -41,12 +48,14 @@ jobs:
           - os: ubuntu-latest
             displayName: linux
             archivePortable: tar -c -C build/distribution JabRef | pigz --rsyncable > build/distribution/JabRef-portable_linux.tar.gz && rm -R build/distribution/JabRef
+            eaJdk: https://files.jabref.org/jdks/jdk-linux-x64.tar.gz
           - os: windows-latest
             displayName: windows
             archivePortable: 7z a -r build/distribution/JabRef-portable_windows.zip ./build/distribution/JabRef && rm -R build/distribution/JabRef
+            eaJDK: https://files.jabref.org/jdks/jdk-windows-x64.zip
           - os: macos-latest
             displayName: macOS
-            archivePortable: brew install pigz && tar -c -C build/distribution JabRef.app | pigz --rsyncable > build/distribution/JabRef-portable_macos.tar.gz && rm -R build/distribution/JabRef.app
+            eaJDK: https://files.jabref.org/jdks/jdk-macos-x64.tar.gz
     runs-on: ${{ matrix.os }}
     name: Create installer and portable version for ${{ matrix.displayName }}
     steps:
@@ -65,6 +74,12 @@ jobs:
         uses: actions/checkout@v3
         with:
           fetch-depth: 0
+      - name: Install pigz and cache (linux)
+        if: (matrix.os == 'ubuntu-latest')
+        uses: awalsh128/cache-apt-pkgs-action@latest
+        with:
+          packages: pigz
+          version: 1.0
       - name: Install GitVersion
         uses: gittools/actions/gitversion/setup@v0.10.2
         with:
@@ -78,14 +93,57 @@ jobs:
           java-version: 20
           distribution: 'temurin'
           cache: 'gradle'
-      - name: Setup OSX key chain on OSX
+      - name: setup jdk JabRef-fix (windows)
+        if: (matrix.os == 'windows-latest')
+        shell: bash
+        run: |
+         mkdir ${{runner.temp}}\jdk
+         curl -kLsS ${{matrix.eaJDK}} -o temp.zip && 7z x temp.zip -o"$(cygpath -u "$RUNNER_TEMP\jdk")"
+         echo "JDK21=${{runner.temp}}\jdk\jdk-21" >> "$GITHUB_ENV"
+         ls "$(cygpath -u "$RUNNER_TEMP\jdk\jdk-21")"
+
+         echo "org.gradle.java.installations.paths=${{runner.temp}}\jdk\jdk-21" | sed "s/\\\\/\\\\\\\\/g" >> gradle.properties
+         echo "org.gradle.java.installations.auto-detect=false" >> gradle.properties
+         cat gradle.properties
+
+         sed -i "s/JavaLanguageVersion.of(20)/JavaLanguageVersion.of(21)/" build.gradle
+      - name: setup jdk JabRef-fix (ubuntu)
+        if: (matrix.os == 'ubuntu-latest')
+        shell: bash
+        run: |
+          mkdir ${{runner.temp}}/jdk
+          wget -qO- ${{matrix.eaJDK}} | tar xz -C ${{runner.temp}}/jdk
+          echo "JDK21=${{runner.temp}}/jdk/jdk-21" >> "$GITHUB_ENV"
+          ls ${{runner.temp}}/jdk
+
+          echo "org.gradle.java.installations.paths=${{runner.temp}}/jdk/jdk-21" >> gradle.properties
+          echo "org.gradle.java.installations.auto-detect=false" >> gradle.properties
+          cat gradle.properties
+
+          sed -i "s/JavaLanguageVersion.of(20)/JavaLanguageVersion.of(21)/" build.gradle
+      - name: setup jdk JabRef-fix (macos)
+        if: (matrix.os == 'macos-latest')
+        shell: bash
+        run: |
+          mkdir ${{runner.temp}}/jdk
+          wget -qO- ${{matrix.eaJDK}} | tar xz -C ${{runner.temp}}/jdk
+          mv ${{runner.temp}}/jdk/jdk-21.jdk ${{runner.temp}}/jdk/jdk-21
+          echo "JDK21=${{runner.temp}}/jdk/jdk-21" >> "$GITHUB_ENV"
+          ls ${{runner.temp}}/jdk
+
+          echo "org.gradle.java.installations.paths=${{runner.temp}}/jdk/jdk-21" >> gradle.properties
+          echo "org.gradle.java.installations.auto-detect=false" >> gradle.properties
+          cat gradle.properties
+
+          sed -i'.bak' -e "s/JavaLanguageVersion.of(20)/JavaLanguageVersion.of(21)/" build.gradle
+      - name: Setup OSX key chain (macos)
         if: (matrix.os == 'macos-latest') && (steps.checksecrets.outputs.secretspresent == 'YES')
         uses: apple-actions/import-codesign-certs@v2
         with:
           p12-file-base64: ${{ secrets.OSX_SIGNING_CERT }}
           p12-password: ${{ secrets.OSX_CERT_PWD }}
           keychain-password: jabref
-      - name: Setup OSX key chain on OSX for app id cert
+      - name: Setup OSX key chain on OSX for app id cert (macos)
         if: (matrix.os == 'macos-latest') && (steps.checksecrets.outputs.secretspresent == 'YES')
         uses: apple-actions/import-codesign-certs@v2
         with:
@@ -93,26 +151,64 @@ jobs:
           p12-password: ${{ secrets.OSX_CERT_PWD }}
           create-keychain: false
           keychain-password: jabref
-      - name: Build runtime image
-        if: (matrix.os != 'macos-latest') || (steps.checksecrets.outputs.secretspresent == 'YES')
+      - name: Build runtime image (non-macos)
+        if: (matrix.os != 'macos-latest')
         run: ./gradlew -i -PprojVersion="${{ steps.gitversion.outputs.AssemblySemVer }}" -PprojVersionInfo="${{ steps.gitversion.outputs.InformationalVersion }}" jlinkZip
-      - name: Build installer
-        if: (matrix.os != 'macos-latest') || (steps.checksecrets.outputs.secretspresent == 'YES')
+      - name: Prepare merged jars and modules dir (macos)
+        if: (matrix.os == 'macos-latest') && (steps.checksecrets.outputs.secretspresent == 'YES')
+        run: ./gradlew -i -PprojVersion="${{ steps.gitversion.outputs.AssemblySemVer }}" -PprojVersionInfo="${{ steps.gitversion.outputs.InformationalVersion }}" prepareModulesDir
+      - name: Build installer (non-macos)
+        if: (matrix.os != 'macos-latest')
+        shell: bash
         run: ./gradlew -i -PprojVersion="${{ steps.gitversion.outputs.AssemblySemVer }}" -PprojVersionInfo="${{ steps.gitversion.outputs.InformationalVersion }}" jpackage
+      - name: Build dmg (macos)
+        if: (matrix.os == 'macos-latest') && (steps.checksecrets.outputs.secretspresent == 'YES')
         shell: bash
-      - name: Resign app image for OSX and build dmg
+        run: |
+          ${{env.JDK21}}/Contents/Home/bin/jpackage \
+          --module org.jabref/org.jabref.cli.Launcher \
+          --module-path ${{env.JDK21}}/Contents/Home/jmods/:build/jlinkbase/jlinkjars \
+          --add-modules org.jabref,org.jabref.merged.module  \
+          --dest build/distribution \
+          --name JabRef \
+          --app-version ${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }} \
+          --verbose \
+          --mac-sign \
+          --vendor JabRef \
+          --mac-package-identifier Jabref \
+          --mac-package-name JabRef \
+          --type dmg --mac-signing-key-user-name "JabRef e.V. (6792V39SK3)" \
+          --mac-package-signing-prefix org.jabref \
+          --mac-entitlements buildres/mac/jabref.entitlements \
+          --icon src/main/resources/icons/jabref.icns \
+          --resource-dir buildres/mac \
+          --file-associations buildres/mac/bibtexAssociations.properties \
+          --jlink-options --bind-services
+      - name: Build pkg (macos)
         if: (matrix.os == 'macos-latest') && (steps.checksecrets.outputs.secretspresent == 'YES')
         shell: bash
         run: |
-          codesign --entitlements buildres/mac/jabref.entitlements --options runtime -vvv -f --sign "Developer ID Application: JabRef e.V. (6792V39SK3)" build/distribution/JabRef.app/Contents/runtime/Contents/MacOS/libjli.dylib
-          codesign --entitlements buildres/mac/jabref.entitlements --options runtime -vvv -f --sign "Developer ID Application: JabRef e.V. (6792V39SK3)" build/distribution/JabRef.app/Contents/MacOS/JabRef
-          codesign --entitlements buildres/mac/jabref.entitlements --options runtime -vvv -f --sign "Developer ID Application: JabRef e.V. (6792V39SK3)" build/distribution/JabRef.app
-          jpackage --type pkg --dest build/distribution --name JabRef --app-version "${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}" --app-image build/distribution/JabRef.app --verbose --type dmg --vendor JabRef --app-version "${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}" --file-associations buildres/mac/bibtexAssociations.properties --resource-dir buildres/mac
-          codesign -s "Developer ID Application: JabRef e.V. (6792V39SK3)" --options runtime --entitlements buildres/mac/jabref.entitlements -vvvv --deep "build/distribution/JabRef-${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}.dmg"
-          jpackage --type pkg --dest build/distribution --name JabRef --mac-package-identifier JabRef --app-version "${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}" --app-image build/distribution/JabRef.app --verbose --type pkg --vendor JabRef --app-version "${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}" --file-associations buildres/mac/bibtexAssociations.properties --resource-dir buildres/mac
-          productsign --sign "Developer ID Installer: JabRef e.V. (6792V39SK3)" "build/distribution/JabRef-${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}.pkg" "build/distribution/JabRef-${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}-signed.pkg"
-      - name: Package application image
-        if: (matrix.os != 'macos-latest') || (steps.checksecrets.outputs.secretspresent == 'YES')
+          ${{env.JDK21}}/Contents/Home/bin/jpackage \
+          --module org.jabref/org.jabref.cli.Launcher \
+          --module-path ${{env.JDK21}}/Contents/Home/jmods/:build/jlinkbase/jlinkjars \
+          --add-modules org.jabref,org.jabref.merged.module  \
+          --dest build/distribution \
+          --name JabRef \
+          --app-version ${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }} \
+          --verbose \
+          --mac-sign \
+          --vendor JabRef \
+          --mac-package-identifier Jabref \
+          --mac-package-name JabRef \
+          --type pkg --mac-signing-key-user-name "JabRef e.V. (6792V39SK3)" \
+          --mac-package-signing-prefix org.jabref \
+          --mac-entitlements buildres/mac/jabref.entitlements \
+          --icon src/main/resources/icons/jabref.icns \
+          --resource-dir buildres/mac \
+          --file-associations buildres/mac/bibtexAssociations.properties \
+          --jlink-options --bind-services
+      - name: Package application image (non-macos)
+        if: (matrix.os != 'macos-latest')
         shell: bash
         run: ${{ matrix.archivePortable }}
       - name: Rename files
@@ -132,20 +228,31 @@ jobs:
           ar -m -c -a sdsd jabref_${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}_amd64_repackaged.deb debian-binary control.tar.xz data.tar.xz
           rm debian-binary control.tar.* data.tar.*
           mv -f jabref_${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}_amd64_repackaged.deb  jabref_${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}_amd64.deb
-      - name: Upload to GitHub workflow artifacts store (non-Mac)
-        if: (matrix.os != 'macos-latest')
+      - name: Upload to builds.jabref.org (ubuntu)
+        if: (matrix.os == 'ubuntu-latest') && (steps.checksecrets.outputs.secretspresent == 'YES') && (!startsWith(github.ref, 'refs/heads/gh-readonly-queue'))
+        uses: Pendect/action-rsyncer@v2.0.0
+        env:
+          DEPLOY_KEY: ${{ secrets.buildJabRefPrivateKey }}
+        with:
+          flags: -vaz --itemize-changes --stats --partial-dir=/tmp/partial --rsync-path="mkdir -p /var/www/builds.jabref.org/www/${{ steps.gitversion.outputs.branchName }} && rsync"
+          options: ''
+          ssh_options: '-p 9922'
+          src: 'build/distribution/'
+          dest: jrrsync@build-upload.jabref.org:/var/www/builds.jabref.org/www/${{ steps.gitversion.outputs.branchName }}/
+      - name: Upload to GitHub workflow artifacts store (windows)
+        if: (matrix.os == 'windows-latest') && (!startsWith(github.ref, 'refs/heads/gh-readonly-queue'))
         uses: actions/upload-artifact@v3
         with:
           name: JabRef-${{ matrix.displayName }}
           path: build/distribution
-      - name: Upload to GitHub workflow artifacts store (Mac)
-        if: (matrix.os == 'macos-latest') && (steps.checksecrets.outputs.secretspresent == 'YES')
+      - name: Upload to GitHub workflow artifacts store (macos)
+        if: (matrix.os == 'macos-latest') && (steps.checksecrets.outputs.secretspresent == 'YES') && (!startsWith(github.ref, 'refs/heads/gh-readonly-queue'))
         uses: actions/upload-artifact@v3
         with:
-          name: JabRef-macOS-signed
+          # tbn = to-be-notarized
+          name: JabRef-macOS-tbn
           path: build/distribution
   notarize: # outsourced in a separate job to be able to rerun if this fails for timeouts
-    if: ${{ false }}  # disable for v5.9 since apple notarization fails
     name: Notarize and package Mac OS binaries
     runs-on: macos-latest
     needs: [build]
@@ -166,62 +273,52 @@ jobs:
         uses: actions/checkout@v3
         with:
           fetch-depth: 0
+      - name: Install GitVersion
+        if: steps.checksecrets.outputs.secretspresent == 'YES'
+        uses: gittools/actions/gitversion/setup@v0.10.2
+        with:
+          versionSpec: "5.x"
       - name: Run GitVersion
         if: steps.checksecrets.outputs.secretspresent == 'YES'
         id: gitversion
-        shell: bash
-        run: |
-          echo "AssemblySemVer=5.9.60000" >> $GITHUB_OUTPUT
-          echo "InformationalVersion=5.9--`git log -1 --pretty='format:%cd' --date=format:'%Y-%m-%d'`--`git log -1 --format=%h`" >> $GITHUB_OUTPUT
-          echo "Major=5" >> $GITHUB_OUTPUT
-          echo "Minor=9" >> $GITHUB_OUTPUT
+        uses: gittools/actions/gitversion/execute@v0.10.2
       - name: Get macOS binaries
         if: steps.checksecrets.outputs.secretspresent == 'YES'
         uses: actions/download-artifact@master
         with:
-          name: JabRef-macOS-signed
+          name: JabRef-macOS-tbn
           path: build/distribution/
-      - name: Notarize dmg and pkg installer
-        if: startsWith(github.ref, 'refs/tags/') && (steps.checksecrets.outputs.secretspresent == 'YES')
+      - name: Notarize dmg
+        if: (steps.checksecrets.outputs.secretspresent == 'YES') && (startsWith(github.ref, 'refs/tags/') ||  inputs.notarization == true)
+        shell: bash
+        run: |
+          xcrun notarytool store-credentials "notarytool-profile" --apple-id "vorstand@jabref.org" --team-id "6792V39SK3" --password "${{ secrets.OSX_NOTARIZATION_APP_PWD }}"
+          xcrun notarytool submit build/distribution/JabRef-${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}.dmg --keychain-profile "notarytool-profile" --wait
+          xcrun stapler staple build/distribution/JabRef-${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}.dmg
+      - name: Notarize pkg
+        if: (steps.checksecrets.outputs.secretspresent == 'YES') && (startsWith(github.ref, 'refs/tags/') ||  inputs.notarization == true)
         shell: bash
         run: |
-          REQUEST_UUID_DMG=$(xcrun altool --verbose --notarize-app --primary-bundle-id "org.jabref" --username ${{ secrets.OSX_NOTARIZATION_APP_USERNAME }} --password ${{ secrets.OSX_NOTARIZATION_APP_PWD }} --asc-provider "6792V39SK3" --file "build/distribution/JabRef-${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}.dmg" | grep RequestUUID | awk '{print $3}')
-          while xcrun altool --notarization-info "$REQUEST_UUID_DMG" -u ${{ secrets.OSX_NOTARIZATION_APP_USERNAME }} -p  ${{ secrets.OSX_NOTARIZATION_APP_PWD }} | grep "Status: in progress" > /dev/null; do
-            echo "Verification in progress..."
-            sleep 30
-          done
-          codesign -vvv --deep --strict "build/distribution/JabRef-${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}.dmg"
-          codesign -dvv "build/distribution/JabRef-${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}.dmg"
-          REQUEST_UUID_PKG=$(xcrun altool --verbose --notarize-app --primary-bundle-id "org.jabref" --username ${{ secrets.OSX_NOTARIZATION_APP_USERNAME }} --password ${{ secrets.OSX_NOTARIZATION_APP_PWD }} --asc-provider "6792V39SK3" --file "build/distribution/JabRef-${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}-signed.pkg" | grep RequestUUID | awk '{print $3}')
-          while xcrun altool --notarization-info "$REQUEST_UUID_PKG" -u ${{ secrets.OSX_NOTARIZATION_APP_USERNAME }} -p  ${{ secrets.OSX_NOTARIZATION_APP_PWD }} | grep "Status: in progress" > /dev/null; do
-            echo "Verification in progress..."
-            sleep 30
-          done
-          xcrun stapler staple "build/distribution/JabRef-${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}-signed.pkg"
-          rm "build/distribution/JabRef-${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}.pkg"
-          mv "build/distribution/JabRef-${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}-signed.pkg" "build/distribution/JabRef-${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}.pkg"
+          xcrun notarytool store-credentials "notarytool-profile" --apple-id "vorstand@jabref.org" --team-id "6792V39SK3" --password "${{ secrets.OSX_NOTARIZATION_APP_PWD }}"
+          xcrun notarytool submit build/distribution/JabRef-${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}.pkg --keychain-profile "notarytool-profile" --wait
+          xcrun stapler staple build/distribution/JabRef-${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}.pkg
       - name: Package application image
-        if: (steps.checksecrets.outputs.secretspresent == 'YES')
+        if: (steps.checksecrets.outputs.secretspresent == 'YES') && (matrix.os != 'macos-latest')
         shell: bash
         run: ${{ matrix.archivePortable }}
-      - name: Rename files
-        if: (steps.checksecrets.outputs.secretspresent == 'YES')
-        shell: pwsh
-        run: |
-          get-childitem -Path build/distribution/* | rename-item -NewName {$_.name -replace "${{ steps.gitversion.outputs.AssemblySemVer }}","${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}"}
-          get-childitem -Path build/distribution/* | rename-item -NewName {$_.name -replace "portable","${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}-portable"}
       - name: Upload to GitHub workflow artifacts store
-        if: (steps.checksecrets.outputs.secretspresent == 'YES')
+        if: (steps.checksecrets.outputs.secretspresent == 'YES') && (!startsWith(github.ref, 'refs/heads/gh-readonly-queue'))
         uses: actions/upload-artifact@v3
         with:
           name: JabRef-macOS
           path: build/distribution
-  deploy:
+  upload:
     strategy:
       fail-fast: false
-    name: Deploy binaries on builds.jabref.org
+    name: Upload binaries on builds.jabref.org
     runs-on: ubuntu-latest
-    needs: [build]
+    needs: [build, notarize]
+    if: ${{ !startsWith(github.ref, 'refs/heads/gh-readonly-queue') }}
     steps:
       - name: Check secrets presence
         id: checksecrets
@@ -249,34 +346,42 @@ jobs:
         if: steps.checksecrets.outputs.secretspresent == 'YES'
         id: gitversion
         uses: gittools/actions/gitversion/execute@v0.10.2
-      - name: Get linux binaries
-        if: steps.checksecrets.outputs.secretspresent == 'YES'
-        uses: actions/download-artifact@master
-        with:
-          name: JabRef-linux
-          path: build/distribution
       - name: Get windows binaries
         if: steps.checksecrets.outputs.secretspresent == 'YES'
         uses: actions/download-artifact@master
         with:
           name: JabRef-windows
           path: build/distribution
-      - name: Get macOS binaries
-        if: steps.checksecrets.outputs.secretspresent == 'YES'
+      - name: Get macOS binaries unsigned
+        if: (steps.checksecrets.outputs.secretspresent == 'YES') && (inputs.notarization == false && !startsWith(github.ref, 'refs/tags/'))
+        uses: actions/download-artifact@master
+        with:
+          name: JabRef-macOS-tbn
+          path: build/distribution/
+      - name: Get macOS binaries notarized
+        if: (steps.checksecrets.outputs.secretspresent == 'YES') && (inputs.notarization == true || startsWith(github.ref, 'refs/tags/'))
         uses: actions/download-artifact@master
         with:
-          name: JabRef-macOS-signed
+          name: JabRef-macOS
           path: build/distribution/
-      - name: Deploy to builds.jabref.org
-        id: deploy
+      # Upload to build server using rsync
+      # The action runs on linux only (because it is a Dockerized action), therefore it is embedded in a separate workflow
+      - name: Upload to builds.jabref.org
         if: steps.checksecrets.outputs.secretspresent == 'YES'
         uses: Pendect/action-rsyncer@v2.0.0
         env:
           DEPLOY_KEY: ${{ secrets.buildJabRefPrivateKey }}
-          BRANCH: ${{ steps.gitversion.outputs.branchName }}
         with:
           flags: -vaz --itemize-changes --stats --partial-dir=/tmp/partial --rsync-path="mkdir -p /var/www/builds.jabref.org/www/${{ steps.gitversion.outputs.branchName }} && rsync"
           options: ''
           ssh_options: '-p 9922'
           src: 'build/distribution/'
           dest: jrrsync@build-upload.jabref.org:/var/www/builds.jabref.org/www/${{ steps.gitversion.outputs.branchName }}/
+      - name: Comment PR
+        if: github.event_name == 'pull_request' && steps.checksecrets.outputs.secretspresent == 'YES'
+        uses: thollander/actions-comment-pull-request@v2
+        with:
+          message: |
+            The build of this PR is available at <https://builds.jabref.org/pull/${{ github.event.pull_request.number }}/merge>.
+          comment_tag: download-link
+          mode: recreate
diff --git a/.github/workflows/gource.yml b/.github/workflows/gource.yml
index 05109275365..06fe6006b2b 100644
--- a/.github/workflows/gource.yml
+++ b/.github/workflows/gource.yml
@@ -4,10 +4,15 @@ on:
   push:
     branches:
       - gource
+      - fix-gource
   schedule:
-    - cron:  '15 3 1 1,4,7,10 *'
+    - cron:  '15 3 5 * *'
   workflow_dispatch:
 
+concurrency:
+  group: gource
+  cancel-in-progress: true
+  
 jobs:
   action:
     runs-on: ubuntu-latest
@@ -16,35 +21,44 @@ jobs:
         uses: actions/checkout@v3
         with:
           fetch-depth: 0
-      - name: Determine dates
-        id: dates
-        run: |
-          echo "start_date=`date -d "$(date +%Y-%m-01) -3 months" +%Y-%m-%d`" >> $GITHUB_STATE
-          echo "stop_date=`date -d "$(date +%Y-%m-01) -1 day" +%Y-%m-%d`" >> $GITHUB_STATE
-          echo "quarter=`date -d "$(date +%Y-%m-01) -1 day" +%Y`-Q$(( ((`date -d "$(date +%Y-%m-01) -1 day" +%m`)-1)/3+1 ))" >> $GITHUB_STATE
-      - name: 'Development history of last quarter'
-        uses: nbprojekt/gource-action@v1
+      - name: 'Development history of current build'
+        uses: BoundfoxStudios/action-gource@v2
         with:
-          gource_title: 'JabRef | more information at contribute.jabref.org'
+          gource_title: 'JabRef v5.10 (in development) | more information at contribute.jabref.org'
           logo_url: 'https://www.jabref.org/img/JabRef-icon-256.png'
+          avatars_auto_fetch: true
           # 5s * 365 / 4 = 7.5min
-          gource_seconds_per_day: 5
-          gource_start_date: ${{ steps.dates.outputs.start_date }}
-          gource_stop_date: ${{ steps.dates.outputs.stop_date }}
-          gource_file_filter: csl$
+          gource_seconds_per_day: 1
+          gource_start_date: '2023-01-06'
+          gource_file_filter: 'buildres/csl|\.csl'
       - name: 'Store video'
         run: |
           mkdir gource-videos
-          mv ./gource/gource.mp4 ./gource-videos/jabref-${{ steps.dates.outputs.quarter }}.mp4
+          mv ./gource/gource.mp4 ./gource-videos/jabref-v5.10-dev.mp4
+      - name: 'Development history of last release'
+        uses: BoundfoxStudios/action-gource@v2
+        with:
+          gource_title: 'JabRef v5.9 | more information at contribute.jabref.org'
+          logo_url: 'https://www.jabref.org/img/JabRef-icon-256.png'
+          avatars_auto_fetch: true
+          # 5s * 365 / 4 = 7.5min
+          gource_seconds_per_day: 2
+          gource_start_date: '2022-12-18'
+          gource_stop_date: '2023-01-06'
+          gource_file_filter: 'buildres/csl|\.csl'
+      - name: 'Store video'
+        run: |
+          mv ./gource/gource.mp4 ./gource-videos/jabref-v5.9.mp4
       - name: 'Complete development history'
-        uses: nbprojekt/gource-action@v1
+        uses: BoundfoxStudios/action-gource@v2
         with:
           gource_title: 'JabRef | more information at contribute.jabref.org'
           logo_url: 'https://www.jabref.org/img/JabRef-icon-256.png'
+          avatars_auto_fetch: true
           # 0.01 leads to a 45 second video for the complete history until end of 2020
           # 0.1 leads to a 8 minute video
           gource_seconds_per_day: 0.1
-          gource_file_filter: csl$
+          gource_file_filter: 'buildres/csl|\.csl'
       - name: 'Store video'
         run: |
           mv gource/gource.mp4 gource-videos/jabref-complete.mp4
@@ -52,5 +66,27 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: Gource
-          path: ./gource-videos/
+          path: gource-videos/
           retention-days: 80
+      - name: Check secrets presence
+        id: checksecrets
+        shell: bash
+        run: |
+          if [ "$BUILDJABREFPRIVATEKEY" == "" ]; then
+            echo "secretspresent=NO" >> $GITHUB_OUTPUT
+          else
+            echo "secretspresent=YES" >> $GITHUB_OUTPUT
+          fi
+        env:
+          BUILDJABREFPRIVATEKEY: ${{ secrets.buildJabRefPrivateKey }}
+      - name: Upload to files.jabref.org
+        if: steps.checksecrets.outputs.secretspresent == 'YES'
+        uses: Pendect/action-rsyncer@v2.0.0
+        env:
+          DEPLOY_KEY: ${{ secrets.buildJabRefPrivateKey }}
+        with:
+          flags: -vaz --itemize-changes --stats --partial-dir=/tmp/partial
+          options: ''
+          ssh_options: '-p 9922'
+          src: 'gource-videos/'
+          dest: jrrsync@build-upload.jabref.org:/var/www/files.jabref.org/www/gource/
diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml
index a2dba0e0ec8..ed17df2a103 100644
--- a/.github/workflows/pages.yml
+++ b/.github/workflows/pages.yml
@@ -43,7 +43,7 @@ jobs:
           cd docs
           bundle exec jekyll build
       - name: Upload artifact
-        uses: actions/upload-pages-artifact@v1
+        uses: actions/upload-pages-artifact@v2
         with:
           path: docs/_site/
 
diff --git a/.github/workflows/refresh-csl-subtrees.yml b/.github/workflows/refresh-csl-subtrees.yml
index 151b3057194..bc2f74cc724 100644
--- a/.github/workflows/refresh-csl-subtrees.yml
+++ b/.github/workflows/refresh-csl-subtrees.yml
@@ -13,19 +13,22 @@ jobs:
   publish:
     name: Refresh Citation Style Language Files
     runs-on: ubuntu-latest
-    if: github.repository == 'JabRef/jabref'
+    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
+    if: (github.repository == 'JabRef/jabref' || github.repository == 'koppor/jabref')
     steps:
-      - name: Checkout source
-        uses: actions/checkout@v3
+      - uses: actions/checkout@v3
         with:
+          persist-credentials: true
           ref: main
           fetch-depth: 0
       - name: Initialize git
         run: |
           git checkout main
           git config --local core.editor /usr/bin/cat
-          git config user.name "github actions"
-          git config user.email "jabrefmail+webfeedback@gmail.com"
+          git config user.name 'github-actions[bot]'
+          git config user.email 'github-actions[bot]@users.noreply.github.com'
       - name: Add csl-styles remote
         run: git remote add -f csl-styles https://github.com/citation-style-language/styles.git
       - name: Update csl-styles
@@ -48,8 +51,8 @@ jobs:
           git commit -m"Refresh example styles" || true
       - uses: peter-evans/create-pull-request@v5
         with:
-          token: ${{ secrets.GH_TOKEN_UPDATE_GRADLE_WRAPPER }}
+          token: ${{ secrets.GITHUB_TOKEN }}
           branch: refresh-csl
-          commit-message: Update CSL styles
           title: "[Bot] Update CSL styles"
+          commit-message: Update CSL styles
           labels: dependencies
diff --git a/.github/workflows/refresh-journal-lists.yml b/.github/workflows/refresh-journal-lists.yml
index 3b0c2ec1445..ac6107c713c 100644
--- a/.github/workflows/refresh-journal-lists.yml
+++ b/.github/workflows/refresh-journal-lists.yml
@@ -1,7 +1,12 @@
 name: Refresh Journal Lists
 
 on:
-  # Allow to run manually
+  push:
+    paths:
+      - '.github/workflows/refresh-journal-lists.yml'
+      - 'buildSrc/build.gradle'
+      - 'buildSrc/src/main/java/**'
+      - 'src/main/java/org/jabref/logic/journals/**'
   workflow_dispatch:
 
 permissions:
@@ -47,24 +52,14 @@ jobs:
           cp * $GITHUB_WORKSPACE/build/journals/
 
           # ensure that the .java classes are the most recent ones
-          mkdir -p $GITHUB_WORKSPACE/buildSrc/src/copied/java/org/jabref/logic/journals
-          cp $GITHUB_WORKSPACE/src/main/java/org/jabref/logic/journals/* $GITHUB_WORKSPACE/buildSrc/src/copied/java/org/jabref/logic/journals
+          cp $GITHUB_WORKSPACE/src/main/java/org/jabref/logic/journals/* $GITHUB_WORKSPACE/buildSrc/src/main/java/org/jabref/logic/journals
 
           # create .mv file
           cd $GITHUB_WORKSPACE
           ./gradlew generateJournalAbbreviationList
       - uses: peter-evans/create-pull-request@v5
-        if: github.ref == 'refs/heads/main'
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           branch: update-journallist
-          title: "[Bot] Update Journal abbrev list"
-          commit-message: Update journal abbrev list
-      - name: Commit and push changes
-        uses: EndBug/add-and-commit@v9
-        if: github.ref != 'refs/heads/main'
-        with:
-          message: 'Update journal abbrev list'
-          committer_email: actions@github.com
-          fetch: false
-          push: true
+          title: "[Bot] Update journal abbreviation lists"
+          commit-message: Update journal abbreviation lists
diff --git a/.github/workflows/tests-fetchers.yml b/.github/workflows/tests-fetchers.yml
index e430cf8bd37..98a21bdef09 100644
--- a/.github/workflows/tests-fetchers.yml
+++ b/.github/workflows/tests-fetchers.yml
@@ -7,6 +7,8 @@ on:
     paths:
       - 'src/main/java/org/jabref/logic/importer/fetcher/**'
       - 'src/test/java/org/jabref/logic/importer/fetcher/**'
+      - 'src/main/java/org/jabref/logic/crawler/**'
+      - 'src/test/java/org/jabref/logic/crawler/**'
       - '.github/workflows/tests-fetchers.yml'
       - 'build.gradle'
   pull_request:
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 2f6c9545f3f..d0cfa18a724 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -7,6 +7,7 @@ on:
       - main-release
   pull_request:
     # always run on pull requests
+  merge_group:
   workflow_dispatch:
 
 env:
@@ -23,7 +24,7 @@ concurrency:
 
 jobs:
   checkstyle:
-    name: Checkstyle
+    name: Code style check
     runs-on: ubuntu-latest
     steps:
       - name: Checkout source
@@ -34,15 +35,37 @@ jobs:
           java-version: 20
           distribution: 'temurin'
           cache: 'gradle'
-      - name: Run check style reporter
+      - name: Run checkstyle reporter
         uses: nikitasavinov/checkstyle-action@master
         with:
           reporter: github-pr-review
           github_token: ${{ secrets.GITHUB_TOKEN }}
           checkstyle_config: 'config/checkstyle/checkstyle_reviewdog.xml'
           checkstyle_version: '10.3'
-      - name: Run checkstyle gradle
+      - name: Run checkstyle using gradle
         run: ./gradlew checkstyleMain checkstyleTest checkstyleJmh
+      - name: Add comment on pull request
+        if: ${{ failure() }}
+        uses: thollander/actions-comment-pull-request@v2
+        with:
+          message: >
+              Your code currently does not meet JabRef's code guidelines.
+              The tool reviewdog already placed comments on GitHub to indicate the places. See the tab "Files" in you PR.
+              Please carefully follow [the setup guide for the codestyle](https://devdocs.jabref.org/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/intellij-13-code-style.html).
+              Afterwards, please run checkstyle locally and fix the issues.
+
+
+              More information on code quality in JabRef is available at <https://devdocs.jabref.org/getting-into-the-code/development-strategy.html>.
+          comment_tag: checkstyle
+          reactions: eyes
+      - name: Run OpenRewrite
+        run: |
+          ./gradlew rewriteDryRun
+      - name: Run modernizer
+        run: |
+          # enable failing of this task if modernizer complains
+          sed -i "s/failOnViolations = false/failOnViolations = true/" build.gradle
+          ./gradlew modernizer
       - name: Run markdown-lint
         uses: avto-dev/markdown-lint@v1
         with:
@@ -61,7 +84,7 @@ jobs:
           distribution: 'temurin'
           cache: 'gradle'
       - name: Run tests
-        run: xvfb-run --auto-servernum ./gradlew check -x checkstyleJmh -x checkstyleMain -x checkstyleTest
+        run: xvfb-run --auto-servernum ./gradlew check -x checkstyleJmh -x checkstyleMain -x checkstyleTest -x modernizer
         env:
           CI: "true"
       - name: Format failed test results
@@ -179,3 +202,11 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - uses: gradle/wrapper-validation-action@v1
+  # This ensures that no git merge conflict markers (<<<, ...) are contained
+  merge_conflict_job:
+    name: Find merge conflicts
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Merge Conflict finder
+        uses: olivernybroe/action-conflict-finder@v4.0
diff --git a/.gitignore b/.gitignore
index f2a7cad5e5e..1d3864a220b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,8 @@ src/main/gen/
 src/main/generated/
 src-gen/
 
+structure101-settings.java.hsw
+
 # private data
 /buildres/jabref-cert-2016.p12
 
@@ -475,3 +477,8 @@ lib/ojdbc.jar
 
 # do not ignore JabRef icons (they are ignored by the macos setting above)
 !src/main/java/org/jabref/gui/icon
+
+!**/autosaveandbackup/*.bak
+
+# generated during release process
+CHANGELOG.html
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 861ba08aff4..2094775de07 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -2,5 +2,5 @@
     "java.configuration.updateBuildConfiguration": "interactive",
     "java.format.settings.url": "/config/VSCode Code Style.xml",
     "java.checkstyle.configuration": "${workspaceFolder}/config/checkstyle/checkstyle_reviewdog.xml",
-    "java.checkstyle.version": "10.3.4",
+    "java.checkstyle.version": "10.3.4"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 29318baf986..6088e85301e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,42 +11,98 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 
 ### Added
 
+- We added an error-specific message for when a download from a URL fails[#9826](https://github.com/JabRef/jabref/issues/9826).
+- We added protected terms described as "Computer science". [#10222](https://github.com/JabRef/jabref/pull/10222)
+
+### Changed
+
+### Fixed
+
+- It is possible again to use "current table sort order" for the order of entries when saving. [#9869](https://github.com/JabRef/jabref/issues/9869)
+
+### Removed
+
+## [5.10] - 2023-09-02
+
+### Added
+
 - We added a field showing the BibTeX/biblatex source for added and deleted entries in the "External Changes Resolver" dialog. [#9509](https://github.com/JabRef/jabref/issues/9509)
+- We added user-specific comment field so that multiple users can make separate comments. [#543](https://github.com/koppor/jabref/issues/543)
 - We added a search history list in the search field's right click menu. [#7906](https://github.com/JabRef/jabref/issues/7906)
 - We added a full text fetcher for IACR eprints. [#9651](https://github.com/JabRef/jabref/pull/9651)
 - We added "Attach file from URL" to right-click context menu to download and store a file with the reference library. [#9646](https://github.com/JabRef/jabref/issues/9646)
 - We enabled updating an existing entry with data from InspireHEP. [#9351](https://github.com/JabRef/jabref/issues/9351)
 - We added a fetcher for the Bibliotheksverbund Bayern (experimental). [#9641](https://github.com/JabRef/jabref/pull/9641)
+- We added support for more biblatex date formats for parsing dates. [#2753](https://github.com/JabRef/issues/2753)
 - We added support for multiple languages for exporting to and importing references from MS Office. [#9699](https://github.com/JabRef/jabref/issues/9699)
 - We enabled scrolling in the groups list when dragging a group on another group. [#2869](https://github.com/JabRef/jabref/pull/2869)
-- We added the option to automatically download online files when a new entry is created from an existing ID (e.g. DOI). The option can be disabled in the preferences under "Import and Export" [#9756](https://github.com/JabRef/jabref/issues/9756)
-- We added a new Integrity check for unscaped ampersands. [koppor#585](https://github.com/koppor/jabref/issues/585)
-
+- We added the option to automatically download online files when a new entry is created from an existing ID (e.g., DOI). The option can be disabled in the preferences under "Import and Export". [#9756](https://github.com/JabRef/jabref/issues/9756)
+- We added a new Integrity check for unescaped ampersands. [koppor#585](https://github.com/koppor/jabref/issues/585)
+- We added support for parsing `$\backslash$` in file paths (as exported by Mendeley). [forum#3470](https://discourse.jabref.org/t/mendeley-bib-import-with-linked-files/3470)
+- We added the possibility to automatically fetch entries when an ISBN is pasted on the main table. [#9864](https://github.com/JabRef/jabref/issues/9864)
+- We added the option to disable the automatic linking of files in the entry editor [#5105](https://github.com/JabRef/jabref/issues/5105)
+- We added the link icon for ISBNs in linked identifiers column. [#9819](https://github.com/JabRef/jabref/issues/9819)
+- We added key binding to focus on groups <kbd>alt</kbd> + <kbd>s</kbd> [#9863](https://github.com/JabRef/jabref/issues/9863)
+- We added the option to unprotect a text selection, which strips all pairs of curly braces away. [#9950](https://github.com/JabRef/jabref/issues/9950)
+- We added drag and drop events for field 'Groups' in entry editor panel. [#569](https://github.com/koppor/jabref/issues/569)
+- We added support for parsing MathML in the Medline importer. [#4273](https://github.com/JabRef/jabref/issues/4273)
+- We added the ability to search for an identifier (DOI, ISBN, ArXiv ID) directly from 'Web Search'. [#7575](https://github.com/JabRef/jabref/issues/7575) [#9674](https://github.com/JabRef/jabref/issues/9674)
+- We added a cleanup activity that identifies a URL or a last-visited-date in the `note` field and moves it to the `url` and `urldate` field respectively. [koppor#216](https://github.com/koppor/jabref/issues/216)
+- We enabled the user to change the name of a field in a custom entry type by double-clicking on it. [#9840](https://github.com/JabRef/jabref/issues/9840)
+- We added some preferences options to disable online activity. [#10064](https://github.com/JabRef/jabref/issues/10064)
+- We integrated two mail actions ("As Email" and "To Kindle") under a new "Send" option in the right-click & Tools menus. The Kindle option creates an email targeted to the user's Kindle email, which can be set in preferences under "External programs" [#6186](https://github.com/JabRef/jabref/issues/6186)
+- We added an option to clear recent libraries' history. [#10003](https://github.com/JabRef/jabref/issues/10003)
+- We added an option to encrypt and remember the proxy password. [#8055](https://github.com/JabRef/jabref/issues/8055)[#10044](https://github.com/JabRef/jabref/issues/10044)
+- We added support for showing journal information, via info buttons next to the `Journal` and `ISSN` fields in the entry editor. [#6189](https://github.com/JabRef/jabref/issues/6189)
+- We added support for pushing citations to Sublime Text 3 [#10098](https://github.com/JabRef/jabref/issues/10098)
+- We added support for the Finnish language. [#10183](https://github.com/JabRef/jabref/pull/10183)
+- We added the option to automatically replaces illegal characters in the filename when adding a file to JabRef. [#10182](https://github.com/JabRef/jabref/issues/10182)
+- We added a privacy policy. [#10064](https://github.com/JabRef/jabref/issues/10064)
+- We added a tooltip to show the number of entries in a group [#10208](https://github.com/JabRef/jabref/issues/10208)
 
 ### Changed
 
-- We upgraded to Lucene 9.5 for the fulltext search. The search index will be rebuild. [#9584](https://github.com/JabRef/jabref/pull/9584)
+- We replaced "Close" by "Close library" and placed it after "Save all" in the File menu. [#10043](https://github.com/JabRef/jabref/pull/10043)
+- We upgraded to Lucene 9.7 for the fulltext search. The search index will be rebuild. [#9584](https://github.com/JabRef/jabref/pull/10036)
 - 'Get full text' now also checks the file url. [#568](https://github.com/koppor/jabref/issues/568)
 - JabRef writes a new backup file only if there is a change. Before, JabRef created a backup upon start. [#9679](https://github.com/JabRef/jabref/pull/9679)
 - We modified the `Add Group` dialog to use the most recently selected group hierarchical context. [#9141](https://github.com/JabRef/jabref/issues/9141)
 - We refined the 'main directory not found' error message. [#9625](https://github.com/JabRef/jabref/pull/9625)
 - JabRef writes a new backup file only if there is a change. Before, JabRef created a backup upon start. [#9679](https://github.com/JabRef/jabref/pull/9679)
-- Backups of libraries are not stored per JabRef version, but collected together.
-- We streamlined the paths for logs and backups: The parent path fragement is always `logs` or `backups`.
+- Backups of libraries are not stored per JabRef version, but collected together. [#9676](https://github.com/JabRef/jabref/pull/9676)
+- We streamlined the paths for logs and backups: The parent path fragment is always `logs` or `backups`.
 - `log.txt` now contains an entry if a BibTeX entry could not be parsed.
 - `log.txt` now contains debug messages. Debugging needs to be enabled explicitly. [#9678](https://github.com/JabRef/jabref/pull/9678)
 - `log.txt` does not contain entries for non-found files during PDF indexing. [#9678](https://github.com/JabRef/jabref/pull/9678)
+- The hostname is now determined using environment variables (`COMPUTERNAME`/`HOSTNAME`) first. [#9910](https://github.com/JabRef/jabref/pull/9910)
 - We improved the Medline importer to correctly import ISO dates for `revised`. [#9536](https://github.com/JabRef/jabref/issues/9536)
 - To avoid cluttering of the directory, We always delete the `.sav` file upon successful write. [#9675](https://github.com/JabRef/jabref/pull/9675)
 - We improved the unlinking/deletion of multiple linked files of an entry using the <kbd>Delete</kbd> key. [#9473](https://github.com/JabRef/jabref/issues/9473)
+- The field names of customized entry types are now exchanged preserving the case. [#9993](https://github.com/JabRef/jabref/pull/9993)
 - We moved the custom entry types dialog into the preferences dialog. [#9760](https://github.com/JabRef/jabref/pull/9760)
 - We moved the manage content selectors dialog to the library properties. [#9768](https://github.com/JabRef/jabref/pull/9768)
 - We moved the preferences menu command from the options menu to the file menu. [#9768](https://github.com/JabRef/jabref/pull/9768)
-
-
+- We reworked the cross ref labels in the entry editor and added a right click menu. [#10046](https://github.com/JabRef/jabref/pull/10046)
+- We reorganized the order of tabs and settings in the library properties. [#9836](https://github.com/JabRef/jabref/pull/9836)
+- We changed the handling of an "overflow" of authors at `[authIniN]`: JabRef uses `+` to indicate an overflow. Example: `[authIni2]` produces `A+` (instead of `AB`) for `Aachen and Berlin and Chemnitz`. [#9703](https://github.com/JabRef/jabref/pull/9703)
+- We moved the preferences option to open the last edited files on startup to the 'General' tab. [#9808](https://github.com/JabRef/jabref/pull/9808)
+- We improved the recognition of DOIs when pasting a link containing a DOI on the maintable. [#9864](https://github.com/JabRef/jabref/issues/9864s)
+- We reordered the preferences dialog. [#9839](https://github.com/JabRef/jabref/pull/9839)
+- We split the 'Import and Export' tab into 'Web Search' and 'Export'. [#9839](https://github.com/JabRef/jabref/pull/9839)
+- We moved the option to run JabRef in memory stick mode into the preferences dialog toolbar. [#9866](https://github.com/JabRef/jabref/pull/9866)
+- In case the library contains empty entries, they are not written to disk. [#8645](https://github.com/JabRef/jabref/issues/8645)
+- The formatter `remove_unicode_ligatures` is now called `replace_unicode_ligatures`. [#9890](https://github.com/JabRef/jabref/pull/9890)
+- We improved the error message when no terminal was found. [#9607](https://github.com/JabRef/jabref/issues/9607)
+- In the context of the "systematic literature functionality", we changed the name "database" to "catalog" to use a separate term for online catalogs in comparison to SQL databases. [#9951](https://github.com/JabRef/jabref/pull/9951)
+- We now show more fields (including Special Fields) in the dropdown selection for "Save sort order" in the library properties and for "Export sort order" in the preferences. [#10010](https://github.com/JabRef/jabref/issues/10010)
+- We now encrypt and store the custom API keys in the OS native credential store. [#10044](https://github.com/JabRef/jabref/issues/10044)
+- We changed the behavior of group addition/edit, so that sorting by alphabetical order is not performed by default after the modification. [#10017](https://github.com/JabRef/jabref/issues/10017)
+- We fixed an issue with spacing in the cleanup dialogue. [#10081](https://github.com/JabRef/jabref/issues/10081)
+- The GVK fetcher now uses the new [K10plus](https://www.bszgbv.de/services/k10plus/) database. [#10189](https://github.com/JabRef/jabref/pull/10189)
 
 ### Fixed
 
+- We fixed an issue where clicking the group expansion pane/arrow caused the node to be selected, when it should just expand/detract the node. [#10111](https://github.com/JabRef/jabref/pull/10111)
 - We fixed an issue where the browser import would add ' characters before the BibTeX entry on Linux. [#9588](https://github.com/JabRef/jabref/issues/9588)
 - We fixed an issue where searching for a specific term with the DOAB fetcher lead to an exception. [#9571](https://github.com/JabRef/jabref/issues/9571)
 - We fixed an issue where the "Import" -> "Library to import to" did not show the correct library name if two opened libraries had the same suffix. [#9567](https://github.com/JabRef/jabref/issues/9567)
@@ -55,26 +111,55 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 - We fixed an issue where custom field in the custom entry types could not be set to mulitline. [#9609](https://github.com/JabRef/jabref/issues/9609)
 - We fixed an issue where the Office XML exporter did not resolve BibTeX-Strings when exporting entries. [forum#3741](https://discourse.jabref.org/t/exporting-bibtex-constant-strings-to-ms-office-2007-xml/3741)
 - We fixed an issue where the Merge Entries Toolbar configuration was not saved after hitting 'Merge Entries' button. [#9091](https://github.com/JabRef/jabref/issues/9091)
-- We fixed an issue where the password is saved locally if user wants to use proxy with authentication. [#8055](https://github.com/JabRef/jabref/issues/8055)
+- We fixed an issue where the password is stored in clear text if the user wants to use a proxy with authentication. [#8055](https://github.com/JabRef/jabref/issues/8055)
 - JabRef is now more relaxed when parsing field content: In case a field content ended with `\`, the combination `\}` was treated as plain `}`. [#9668](https://github.com/JabRef/jabref/issues/9668)
-- We resolved an issue that cut off the number of group entries when it exceedet four digits. [#8797](https://github.com/JabRef/jabref/issues/8797)
+- We resolved an issue that cut off the number of group entries when it exceeded four digits. [#8797](https://github.com/JabRef/jabref/issues/8797)
 - We fixed the issue where the size of the global search window was not retained after closing. [#9362](https://github.com/JabRef/jabref/issues/9362)
 - We fixed an issue where the Global Search UI preview is still white in dark theme. [#9362](https://github.com/JabRef/jabref/issues/9362)
 - We fixed the double paste issue when <kbd>Cmd</kbd> + <kbd>v</kbd> is pressed on 'New entry from plaintext' dialog. [#9367](https://github.com/JabRef/jabref/issues/9367)
 - We fixed an issue where the pin button on the Global Search dialog was located at the bottom and not at the top. [#9362](https://github.com/JabRef/jabref/issues/9362)
 - We fixed the log text color in the event log console when using dark mode. [#9732](https://github.com/JabRef/jabref/issues/9732)
-- We fixed an issue where searching for unlinked files would include the current library's .bib file [#9735](https://github.com/JabRef/jabref/issues/9735)
-- We fixed an issue where it was no longer possible to connect to a shared mysql database due to an exception [#9761](https://github.com/JabRef/jabref/issues/9761)
+- We fixed an issue where searching for unlinked files would include the current library's .bib file. [#9735](https://github.com/JabRef/jabref/issues/9735)
+- We fixed an issue where it was no longer possible to connect to a shared mysql database due to an exception. [#9761](https://github.com/JabRef/jabref/issues/9761)
+- We fixed an issue where an exception was thrown for the user after <kbd>Ctrl</kbd>+<kbd>Z</kbd> command. [#9737](https://github.com/JabRef/jabref/issues/9737)
+- We fixed the citation key generation for [`[authors]`, `[authshort]`, `[authorsAlpha]`, `[authIniN]`, `[authEtAl]`, `[auth.etal]`](https://docs.jabref.org/setup/citationkeypatterns#special-field-markers) to handle `and others` properly. [koppor#626](https://github.com/koppor/jabref/issues/626)
+- We fixed the Save/save as file type shows BIBTEX_DB instead of "Bibtex library". [#9372](https://github.com/JabRef/jabref/issues/9372)
+- We fixed the default main file directory for non-English Linux users. [#8010](https://github.com/JabRef/jabref/issues/8010)
+- We fixed an issue when overwriting the owner was disabled. [#9896](https://github.com/JabRef/jabref/pull/9896)
+- We fixed an issue regarding recording redundant prefixes in search history. [#9685](https://github.com/JabRef/jabref/issues/9685)
+- We fixed an issue where passing a URL containing a DOI led to a "No entry found" notification. [#9821](https://github.com/JabRef/jabref/issues/9821)
+- We fixed some minor visual inconsistencies and issues in the preferences dialog. [#9866](https://github.com/JabRef/jabref/pull/9866)
+- The order of save actions is now retained. [#9890](https://github.com/JabRef/jabref/pull/9890)
+- We fixed an issue where the order of save actions was not retained in the bib file. [#9890](https://github.com/JabRef/jabref/pull/9890)
+- We fixed an issue in the preferences 'External file types' tab ignoring a custom application path in the edit dialog. [#9895](https://github.com/JabRef/jabref/issues/9895)
+- We fixed an issue in the preferences where custom columns could be added to the entry table with no qualifier. [#9913](https://github.com/JabRef/jabref/issues/9913)
+- We fixed an issue where the encoding header in a bib file was not respected when the file contained a BOM (Byte Order Mark). [#9926](https://github.com/JabRef/jabref/issues/9926)
+- We fixed an issue where cli help output for import and export format was inconsistent. [koppor#429](https://github.com/koppor/jabref/issues/429)
+- We fixed an issue where the user could select multiple conflicting options for autocompletion at once. [#10181](https://github.com/JabRef/jabref/issues/10181)
+- We fixed an issue where no preview could be generated for some entry types and led to an exception. [#9947](https://github.com/JabRef/jabref/issues/9947)
+- We fixed an issue where the Linux terminal working directory argument was malformed and therefore ignored upon opening a terminal [#9953](https://github.com/JabRef/jabref/issues/9953)
+- We fixed an issue under Linux where under some systems the file instead of the folder was opened. [#9607](https://github.com/JabRef/jabref/issues/9607)
+- We fixed an issue where an Automatic Keyword Group could not be deleted in the UI. [#9778](https://github.com/JabRef/jabref/issues/9778)
+- We fixed an issue where the citation key pattern `[edtrN_M]` returned the wrong editor. [#9946](https://github.com/JabRef/jabref/pull/9946)
+- We fixed an issue where empty grey containers would remain in the groups panel, if displaying of group item count is turned off. [#9972](https://github.com/JabRef/jabref/issues/9972)
+- We fixed an issue where fetching an ISBN could lead to application freezing when the fetcher did not return any results. [#9979](https://github.com/JabRef/jabref/issues/9979)
+- We fixed an issue where closing a library containing groups and entries caused an exception [#9997](https://github.com/JabRef/jabref/issues/9997)
+- We fixed a bug where the editor for strings in a bibliography file did not sort the entries by their keys [#10083](https://github.com/JabRef/jabref/pull/10083)
+- We fixed an issues where clicking on the empty space of specific context menu entries would not trigger the associated action. [#8388](https://github.com/JabRef/jabref/issues/8388)
+- We fixed an issue where JabRef would not remember whether the window was in fullscreen. [#4939](https://github.com/JabRef/jabref/issues/4939)
+- We fixed an issue where the ACM Portal search sometimes would not return entries for some search queries when the article author had no given name. [#10107](https://github.com/JabRef/jabref/issues/10107)
+- We fixed an issue that caused high CPU usage and a zombie process after quitting JabRef because of author names autocompletion. [#10159](https://github.com/JabRef/jabref/pull/10159)
+- We fixed an issue where files with illegal characters in the filename could be added to JabRef. [#10182](https://github.com/JabRef/jabref/issues/10182)
+- We fixed that checked-out radio buttons under "specified keywords" were not displayed as checked after closing and reopening the "edit group" window. [#10248](https://github.com/JabRef/jabref/issues/10248)
+- We fixed that when editing groups, checked-out properties such as case sensitive and regular expression (under "Free search expression") were not displayed checked. [#10108](https://github.com/JabRef/jabref/issues/10108)
 
 ### Removed
 
 - We removed the support of BibTeXML. [#9540](https://github.com/JabRef/jabref/issues/9540)
 - We removed support for Markdown syntax for strikethrough and task lists in comment fields. [#9726](https://github.com/JabRef/jabref/pull/9726)
 - We removed the options menu, because the two contents were moved to the File menu or the properties of the library. [#9768](https://github.com/JabRef/jabref/pull/9768)
-
-
-
-
+- We removed the 'File' tab in the preferences and moved its contents to the 'Export' tab. [#9839](https://github.com/JabRef/jabref/pull/9839)
+- We removed the "[Collection of Computer Science Bibliographies](https://en.wikipedia.org/wiki/Collection_of_Computer_Science_Bibliographies)" fetcher the websits is no longer available. [#6638](https://github.com/JabRef/jabref/issues/6638)
 
 ## [5.9] - 2023-01-06
 
@@ -93,6 +178,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 - We now have more "dots" in the offered journal abbreviations. [#9504](https://github.com/JabRef/jabref/pull/9504)
 - We now disable the button "Full text search" in the Searchbar by default [#9527](https://github.com/JabRef/jabref/pull/9527)
 
+
 ### Fixed
 
 - The tab "deprecated fields" is shown in biblatex-mode only. [#7757](https://github.com/JabRef/jabref/issues/7757)
@@ -104,9 +190,9 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 - We fixed an issue where entering a date in the format "YYYY/MM" in the entry editor date field caused an exception. [#9492](https://github.com/JabRef/jabref/issues/9492)
 - For portable versions, the `.deb` file now works on plain debian again. [#9472](https://github.com/JabRef/jabref/issues/9472)
 - We fixed an issue where the download of linked online files failed after an import of entries for certain urls. [#9518](https://github.com/JabRef/jabref/issues/9518)
-- We fixed an issue where an exception occured when manually downloading a file from an URL in the entry editor. [#9521](https://github.com/JabRef/jabref/issues/9521)
-- We fixed an issue with open office csv file formatting where commas in the abstract field where not escaped. [#9087][https://github.com/JabRef/jabref/issues/9087]
-- We fixed an issue with deleting groups where subgroups different from the selected group were deleted. [#9281][https://github.com/JabRef/jabref/issues/9281]
+- We fixed an issue where an exception occurred when manually downloading a file from an URL in the entry editor. [#9521](https://github.com/JabRef/jabref/issues/9521)
+- We fixed an issue with open office csv file formatting where commas in the abstract field where not escaped. [#9087](https://github.com/JabRef/jabref/issues/9087)
+- We fixed an issue with deleting groups where subgroups different from the selected group were deleted. [#9281](https://github.com/JabRef/jabref/issues/9281)
 
 ## [5.8] - 2022-12-18
 
@@ -261,6 +347,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 - 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)
 - We fixed an issue where name formatter could not be saved. [#9120](https://github.com/JabRef/jabref/issues/9120)
+- We fixed a bug where after the export of Preferences, custom exports were duplicated. [#10176](https://github.com/JabRef/jabref/issues/10176)
 
 ### Removed
 
@@ -356,7 +443,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 
 ### Added
 
-- We added confirmation dialog when user wants to close a library where any empty entires are detected. [#8096](https://github.com/JabRef/jabref/issues/8096)
+- We added confirmation dialog when user wants to close a library where any empty entries are detected. [#8096](https://github.com/JabRef/jabref/issues/8096)
 - We added import support for CFF files. [#7945](https://github.com/JabRef/jabref/issues/7945)
 - We added the option to copy the DOI of an entry directly from the context menu copy submenu. [#7826](https://github.com/JabRef/jabref/issues/7826)
 - We added a fulltext search feature. [#2838](https://github.com/JabRef/jabref/pull/2838)
@@ -403,7 +490,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 ### Fixed
 
 - We fixed an issue where an exception occurred when pasting an entry with a publication date-range of the form 1910/1917 [#7864](https://github.com/JabRef/jabref/issues/7864)
-- We fixed an issue where an exception occured when a preview style was edited and afterwards another preview style selected. [#8280](https://github.com/JabRef/jabref/issues/8280)
+- We fixed an issue where an exception occurred when a preview style was edited and afterwards another preview style selected. [#8280](https://github.com/JabRef/jabref/issues/8280)
 - We fixed an issue where the actions to move a file to a directory were incorrectly disabled. [#7908](https://github.com/JabRef/jabref/issues/7908)
 - We fixed an issue where an exception occurred when a linked online file was edited in the entry editor [#8008](https://github.com/JabRef/jabref/issues/8008)
 - We fixed an issue when checking for a new version when JabRef is used behind a corporate proxy. [#7884](https://github.com/JabRef/jabref/issues/7884)
@@ -487,11 +574,11 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 
 ### Fixed
 
-- We fixed an isuse where some texts (e.g. descriptionss) in dialogs could not be translated [#7854](https://github.com/JabRef/jabref/issues/7854)
+- We fixed an issue where some texts (e.g. descriptions) in dialogs could not be translated [#7854](https://github.com/JabRef/jabref/issues/7854)
 - We fixed an issue where import hangs for ris files with "ER - " [#7737](https://github.com/JabRef/jabref/issues/7737)
 - We fixed an issue where getting bibliograhpic data from DOI or another identifer did not respect the library mode (BibTeX/biblatex)[#1018](https://github.com/JabRef/jabref/issues/6267)
 - We fixed an issue where importing entries would not respect the library mode (BibTeX/biblatex)[#1018](https://github.com/JabRef/jabref/issues/1018)
-- We fixed an issue where an exception occured when importing entries from a web search [#7606](https://github.com/JabRef/jabref/issues/7606)
+- We fixed an issue where an exception occurred when importing entries from a web search [#7606](https://github.com/JabRef/jabref/issues/7606)
 - We fixed an issue where the table column sort order was not properly stored and resulted in unsorted eports [#7524](https://github.com/JabRef/jabref/issues/7524)
 - We fixed an issue where the value of the field `school` or `institution` would be printed twice in the HTML Export [forum#2634](https://discourse.jabref.org/t/problem-with-exporting-techreport-phdthesis-mastersthesis-to-html/2634)
 - We fixed an issue preventing to connect to a shared database. [#7570](https://github.com/JabRef/jabref/pull/7570)
@@ -716,11 +803,11 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 - We fixed an issue where long directory names created from patterns could create an exception. [#3915](https://github.com/JabRef/jabref/issues/3915)
 - We fixed an issue where sort on numeric cases was broken. [#6349](https://github.com/JabRef/jabref/issues/6349)
 - We fixed an issue where year and month fields were not cleared when converting to biblatex [#6224](https://github.com/JabRef/jabref/issues/6224)
-- We fixed an issue where an "Not on FX thread" exception occured when saving on linux [#6453](https://github.com/JabRef/jabref/issues/6453)
+- We fixed an issue where an "Not on FX thread" exception occurred when saving on linux [#6453](https://github.com/JabRef/jabref/issues/6453)
 - We fixed an issue where the library sort order was lost. [#6091](https://github.com/JabRef/jabref/issues/6091)
 - We fixed an issue where brackets in regular expressions were not working. [6469](https://github.com/JabRef/jabref/pull/6469)
 - We fixed an issue where multiple background task popups stacked over each other.. [#6472](https://github.com/JabRef/jabref/issues/6472)
-- We fixed an issue where LaTeX citations for specific commands (\autocites) of biblatex-mla were not recognized. [#6476](https://github.com/JabRef/jabref/issues/6476)
+- We fixed an issue where LaTeX citations for specific commands (`\autocite`s) of biblatex-mla were not recognized. [#6476](https://github.com/JabRef/jabref/issues/6476)
 - We fixed an issue where drag and drop was not working on empty database. [#6487](https://github.com/JabRef/jabref/issues/6487)
 - We fixed an issue where the name fields were not updated after the preferences changed. [#6515](https://github.com/JabRef/jabref/issues/6515)
 - We fixed an issue where "null" appeared in generated BibTeX keys. [#6459](https://github.com/JabRef/jabref/issues/6459)
@@ -1036,7 +1123,8 @@ 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.9...HEAD
+[Unreleased]: https://github.com/JabRef/jabref/compare/v5.10...HEAD
+[5.10]: https://github.com/JabRef/jabref/compare/v5.9...v5.10
 [5.9]: https://github.com/JabRef/jabref/compare/v5.8...v5.9
 [5.8]: https://github.com/JabRef/jabref/compare/v5.7...v5.8
 [5.7]: https://github.com/JabRef/jabref/compare/v5.6...v5.7
@@ -1049,5 +1137,4 @@ The changelog of JabRef 2.11 and all previous versions is available as [text fil
 [5.0]: https://github.com/JabRef/jabref/compare/v5.0-beta...v5.0
 [5.0-beta]: https://github.com/JabRef/jabref/compare/v5.0-alpha...v5.0-beta
 [5.0-alpha]: https://github.com/JabRef/jabref/compare/v4.3...v5.0-alpha
-
 <!-- markdownlint-disable-file MD012 MD024 MD033 -->
diff --git a/MAINTAINERS b/MAINTAINERS
index b46d397cce9..35e4e365c15 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1,10 +1,8 @@
 Oliver Kopp (since 2011)
-Stefan Kolb (since 2015)
-Matthias Geiger (since 2015)
 Tobias Diez (since 2015)
 Christoph Schwentker (since 2016)
 Carl Christian Snethlage (since 2020)
-Dominik Voigt (since 2020)
-Jonatan Askertop (since 2021)
+Jonatan Asketorp (since 2021)
 Benedikt Tutzer (since 2021)
 Thilo Ertel (since 2021)
+Houssem Nasri (since 2023)
diff --git a/PRIVACY.md b/PRIVACY.md
new file mode 100644
index 00000000000..f5552fed91b
--- /dev/null
+++ b/PRIVACY.md
@@ -0,0 +1,120 @@
+# Privacy Policy
+
+Last updated: 2023-08-24
+
+Your privacy is a fundamental right JabRef e.V. respects and supports.
+By using JabRef and its related online services, you choose to share some of your personal information.
+In this Privacy Policy we explain how we collect, use, and share information about you, along with the choices you have.
+
+The term 'Personal information' in this policy means any information that either directly identifies you or can be somehow linked to you. 'JabRef' refers to the desktop application that is provided by JabRef e.V.
+
+Please remember that no method of transmission over the Internet, or method of electronic storage is absolute secure.
+While we strive to use commercially acceptable means to protect your Personal Data, we cannot guarantee its absolute security.
+Also, whenever you communicate through the internet, your IP-Address will always be transmitted and retained by third parties for technical and in some cases for legal reasons.
+
+## JabRef Desktop Application
+
+### Collecting information
+
+JabRef does not collect any personal information directly linked to you.
+However, on certain occasions JabRef will send some information to the online services of JabRef e.V.:
+
+- On application start, JabRef will check for the latest version online (by default *enabled*).
+- Information about a journal you are citing when looking for more information about this journal, using our journal database (by default *enabled*).
+- A pdf document you automatically want to extract citation information from, using our GROBID service (by default *disabled*).
+- Anonymized statistical data on the use of the graphical user interface for internal analysis purposes (by default *disabled*).
+
+### Storing information
+
+JabRef only stores the following personal information locally on your computer:
+
+- Your proxy username and password, if you decide to store them (by default *disabled*).
+- Any personal API key you use to access third party online services (by default *disabled*).
+
+### Sharing information
+
+Certain operations you perform in JabRef may trigger requests to public third-party services such as Zotero, Crossref or the Library of Congress for metadata retrieval.
+These third parties may log additional information besides your IP address and the search terms (e.g., DOI, ISBN or the current URL) according to their privacy policies.
+
+These third-party services are the following:
+
+| Service                                                                                                         | Privacy Policy |
+|-----------------------------------------------------------------------------------------------------------------|----------------|
+| [ACM](https://www.acm.org/)                                                                                     | <https://www.acm.org/privacy-policy> |
+| [ACS Publications](https://pubs.acs.org/)                                                                       | <https://www.acs.org/privacy.html> |
+| [APS Advancing Physics](https://harvest.aps.org/)                                                               | <https://www.aps.org/about/privacy.cfm#privacy> |
+| [arXiv.org](https://arxiv.org/)                                                                                 | <https://info.arxiv.org/help/policies/privacy_policy.html> |
+| [Bibliotheksverbund Bayern](https://www.bib-bvb.de/)                                                            | <https://www.bib-bvb.de/web/guest/datenschutzerklaerung-bvb-homepage> |
+| [Biodiversity Heritage Library](https://www.biodiversitylibrary.org/)                                           | <https://www.si.edu/Privacy> |
+| [Collection of Computer Science Bibliographies](http://liinwww.ira.uka.de/)                                     | **currently unavailable**, offline  |
+| [CrossRef](https://www.crossref.org/)                                                                           | <https://www.crossref.org/operations-and-sustainability/privacy/> |
+| [dblp](https://dblp.uni-trier.de/)                                                                              | <https://dblp.uni-trier.de/db/about/privacy.html> |
+| [Directory of Open Access Books](https://www.doabooks.org/)                                                     | <https://www.doabooks.org/en/resources/accessibility> |
+| [Digitala Vetenskapliga Arkivet](https://www.diva-portal.org/)                                                  | <https://www.uu.se/en/about-uu/data-protection-policy/> |
+| [DOI Foundation](https://www.doi.org/)                                                                          | <https://www.doi.org/privacy-policy/> |
+| [Elsevier](https://www.elsevier.com/)                                                                           | <https://www.elsevier.com/legal/privacy-policy> |
+| [Google Scholar](https://scholar.google.com/)                                                                   | <https://policies.google.com/privacy> |
+| [Gemeinsamer Verbundkatalog](https://www.gbv.de/)                                                               | <https://www.gbv.de/datenschutz> |
+| [IACR](https://www.iacr.org/)                                                                                   | <https://www.iacr.org/privacy.html> |
+| [IEEEXplore](https://ieeexplore.ieee.org/Xplore/home.jsp)                                                       | <https://www.ieee.org/security-privacy.html> |
+| [INSPIRE](https://inspirehep.net/)                                                                              | <https://cern.service-now.com/service-portal?id=privacy_policy&se=INSPIRE-Online&notice=main> |
+| [JSTOR](https://www.jstor.org/)                                                                                 | <https://www.ithaka.org/privacypolicy/> |
+| [Library of Congress](https://lccn.loc.gov/)                                                                    | <https://www.loc.gov/legal/> |
+| [National Library of Medicine](https://www.ncbi.nlm.nih.gov/)                                                   | <https://www.nlm.nih.gov/web_policies.html> |
+| [MathSciNet](http://www.ams.org/mathscinet)                                                                     | <https://www.ams.org/about-us/privacy> |
+| [mEDRA](https://medra.org/)                                                                                     | <https://www.medra.org/stdoc/en/Servizio_DOI_Informativa_ENG.pdf> |
+| [Mr. DLib](https://mr-dlib.org/) [1]                                                                            | <https://support.dataverse.harvard.edu/harvard-dataverse-privacy-policy> |
+| [Openlibrary](https://openlibrary.org)                                                                          | <https://archive.org/about/terms.php> |
+| [ResearchGate](https://www.researchgate.net/)                                                                   | <https://www.researchgate.net/privacy-policy> |
+| [IETF Datatracker](https://datatracker.ietf.org/)                                                               | <https://www.ietf.org/privacy-statement/> |
+| [Semantic Scholar](https://www.semanticscholar.org/), powered by [Allen Institute for AI](https://allenai.org/) | <https://allenai.org/privacy-policy> |
+| [Springer Nature](https://dev.springernature.com/)                                                              | <https://dev.springernature.com/privacypolicy> |
+| [The SAO/NASA Astrophysics Data System](https://ui.adsabs.harvard.edu/)                                         | <https://ui.adsabs.harvard.edu/help/privacy/> |
+| [Unpaywall](https://unpaywall.org/)                                                                             | <https://unpaywall.org/legal/privacy> |
+| [zbMATH Open](https://www.zbmath.org)                                                                           | <https://zbmath.org/privacy-policy/> |
+
+[1]: *Note: The Mr. DLib service is used for the related articles tab in the entry editor and collects also your language, your browser and operating system (by default*disabled*).*
+
+## JabRef Browser Extension
+
+No personal data (like name, email address, billing address or credit card) is collected by the Browser Extension itself.
+But be aware that the browser Extension uses Zotero services, where [Zotero's Privacy Policy](https://www.zotero.org/support/privacy) applies.
+
+### Collecting information
+
+When actively used, the extension has access to the current website and its content to process citation information. In particular, the following information is used:
+
+- the url of the current website you are visiting,
+- the content of the current website.
+
+### Storing information
+
+No data will be stored by the Browser Extension.
+
+### Sharing information
+
+The Browser Extension does not share any data except with the local instance of the JabRef software application, which stores the citation data as a new entry in its library.
+
+## Links to other Websites
+
+Our Service may contain links to other websites that are not operated by us. If you click on a third party link, you will be directed to that third party's site. We strongly advise you to review the Privacy Policy of every site you visit.
+
+We have no control over and assume no responsibility for the content, privacy policies or practices of any third party sites or services.
+
+## Changes to this Privacy Policy
+
+This privacy policy may be changed eventually.
+We encourage you to check this Privacy Policy periodically for any changes.
+Any material change will be mentioned in the changelog of the desktop application and in our [blog](https://blog.jabref.org/).
+
+This privacy policy is in effect as of the day mentioned as "last updated" above and will remain in effect except with respect to any changes in its provisions in the future, which will be in effect immediately after being posted on this page.
+
+## Contact
+
+If you get in touch with us, we may aks you to provide us with certain personal information (e.g. name and email address) to stay in contact with you.
+For any questions or concerns regarding the privacy policy, please send us an email to <vorstand@jabref.org> or write to
+
+JabRef e.V.  
+Josef-Lanner-Str. 9  
+71069 Sindelfingen  
+Germany
diff --git a/README.md b/README.md
index 9412c88345c..f8e65405ad6 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,8 @@
 JabRef is an open-source, cross-platform citation and reference management tool.
 
 Stay on top of your literature: JabRef helps you to collect and organize sources, find the paper you need and discover the latest research.
-[![main table](docs/images/jabref-mainscreen.png)](http://www.jabref.org/img/jabref-mainscreen.png)
+
+![main table](docs/images/jabref-mainscreen.png)
 
 ## Features
 
@@ -23,7 +24,7 @@ It supports you in every step of your research work.
 
 - Group your research into hierarchical collections and organize research items based on keywords/tags, search terms or your manual assignments
 - Advanced search and filter features
-- Complete and fix bibliographic data by comparing with curated online catalogues such as Google Scholar, Springer or MathSciNet
+- Complete and fix bibliographic data by comparing with curated online catalogs such as Google Scholar, Springer or MathSciNet
 - Customizable citation key generator
 - Customize and add new metadata fields or reference types
 - Find and merge duplicates
@@ -41,7 +42,7 @@ It supports you in every step of your research work.
 ### Share
 
 - Many built-in export options or create your export format
-- Library is saved as a simple text file and thus it is easy to share with others via Dropbox and is version-control friendly
+- Library is saved as a simple text file, and thus it is easy to share with others via Dropbox and is version-control friendly
 - Work in a team: sync the contents of your library via a SQL database
 
 ## Installation
@@ -54,7 +55,7 @@ Please see our [Installation Guide](https://docs.jabref.org/installation).
 ## Bug Reports, Suggestions, Other Feedback
 
 [![Donation](https://img.shields.io/badge/donate%20to-jabref-orange.svg)](https://donations.jabref.org)
-[![Paypal Donate](https://img.shields.io/badge/donate-paypal-00457c.svg?logo=paypal&style=flat-square)](https://paypal.me/JabRef)
+[![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 [the feature section](http://discourse.jabref.org/c/features) of our forum!
@@ -94,10 +95,10 @@ When you want to develop, it is necessary to generate additional sources using `
 and then generate the Eclipse `gradlew eclipse`.
 For IntelliJ IDEA, just import the project via a Gradle Import by pointing at the `build.gradle`.
 
-`gradlew test` executes all tests. We use [Github Actions](https://github.com/JabRef/jabref/actions) for executing the tests after each commit. For developing, it is sufficient to locally only run the associated test for the classes you changed. Github will report any other failure.
+`gradlew test` executes all tests. We use [GitHub Actions](https://github.com/JabRef/jabref/actions) for executing the tests after each commit. For developing, it is sufficient to locally only run the associated test for the classes you changed. Github will report any other failure.
 
 ## Sponsoring
 
-JabRef development is powered by YourKit Java Profiler [![YourKit Java Profiler](https://www.yourkit.com/images/yk_logo.png)](https://www.yourkit.com/java/profiler/)
+JabRef development is powered by YourKit Java Profiler [![YourKit Java Profiler](https://www.yourkit.com/images/yk_logo.svg)](https://www.yourkit.com/java/profiler/)
 
 [JabRef]: https://www.jabref.org
diff --git a/build.gradle b/build.gradle
index e38208a9185..c4ef64f8788 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,11 +8,11 @@ plugins {
 
     id 'com.github.andygoossens.modernizer' version '1.8.0'
 
-    id 'me.champeau.gradle.jmh' version '0.5.3'
+    id 'me.champeau.jmh' version '0.7.1'
 
     id 'org.javamodularity.moduleplugin' version '1.8.12'
 
-    id 'org.openjfx.javafxplugin' version '0.0.13'
+    id 'org.openjfx.javafxplugin' version '0.0.14'
 
     id 'org.beryx.jlink' version '2.26.0'
 
@@ -27,6 +27,8 @@ plugins {
     id 'project-report'
 
     id 'idea'
+
+    id 'org.openrewrite.rewrite' version '6.1.25'
 }
 
 // Enable following for debugging
@@ -45,6 +47,10 @@ java {
     // 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 )
     modularity.inferModulePath.set(false)
+
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(20)
+    }
 }
 
 application {
@@ -82,6 +88,7 @@ repositories {
     maven { url 'https://oss.sonatype.org/content/groups/public' }
     maven { url 'https://s01.oss.sonatype.org/content/repositories/snapshots/' }
     maven { url 'https://jitpack.io' }
+    maven { url 'https://sandec.jfrog.io/artifactory/repo' }
 }
 
 configurations {
@@ -104,45 +111,46 @@ javafx {
 }
 
 jacoco {
-    toolVersion = "0.8.8"
+    toolVersion = "0.8.10"
 }
 
 dependencies {
     // Include all jar-files in the 'lib' folder as dependencies
     implementation fileTree(dir: 'lib', includes: ['*.jar'])
 
-    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.pdfbox:pdfbox:3.0.0'
+    implementation 'org.apache.pdfbox:fontbox:3.0.0'
+    implementation 'org.apache.pdfbox:xmpbox:3.0.0'
 
-    implementation 'org.apache.lucene:lucene-core:9.5.0'
-    implementation 'org.apache.lucene:lucene-queryparser:9.5.0'
-    implementation 'org.apache.lucene:lucene-queries:9.5.0'
-    implementation 'org.apache.lucene:lucene-analysis-common:9.5.0'
-    implementation 'org.apache.lucene:lucene-highlighter:9.5.0'
+    implementation 'org.apache.lucene:lucene-core:9.7.0'
+    implementation 'org.apache.lucene:lucene-queryparser:9.7.0'
+    implementation 'org.apache.lucene:lucene-queries:9.7.0'
+    implementation 'org.apache.lucene:lucene-analysis-common:9.7.0'
+    implementation 'org.apache.lucene:lucene-highlighter:9.7.0'
 
     implementation group: 'org.apache.commons', name: 'commons-csv', version: '1.10.0'
-    implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
-    implementation 'com.h2database:h2-mvstore:2.1.214'
+    implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.13.0'
+    implementation 'com.h2database:h2-mvstore:2.2.220'
 
     // required for reading write-protected PDFs - see https://github.com/JabRef/jabref/pull/942#issuecomment-209252635
-    implementation 'org.bouncycastle:bcprov-jdk18on:1.73'
+    implementation 'org.bouncycastle:bcprov-jdk18on:1.76'
 
     implementation 'commons-cli:commons-cli:1.5.0'
 
-    implementation 'org.libreoffice:unoloader:7.5.1'
-    implementation 'org.libreoffice:libreoffice:7.5.1'
+    implementation 'org.libreoffice:unoloader:7.6.0'
+    implementation 'org.libreoffice:libreoffice:7.5.3'
 
     implementation 'io.github.java-diff-utils:java-diff-utils:4.12'
     implementation 'info.debatty:java-string-similarity:2.0.0'
+    implementation 'com.github.javakeyring:java-keyring:1.0.4'
 
-    antlr4 'org.antlr:antlr4:4.12.0'
-    implementation 'org.antlr:antlr4-runtime:4.12.0'
+    antlr4 'org.antlr:antlr4:4.13.0'
+    implementation 'org.antlr:antlr4-runtime:4.13.0'
 
-    implementation group: 'org.eclipse.jgit', name: 'org.eclipse.jgit', version: '6.5.0.202303070854-r'
+    implementation group: 'org.eclipse.jgit', name: 'org.eclipse.jgit', version: '6.6.0.202305301015-r'
 
-    implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: '2.14.2'
-    implementation group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: '2.14.2'
+    implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: '2.15.2'
+    implementation group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: '2.15.2'
 
     implementation group: 'org.mariadb.jdbc', name: 'mariadb-java-client', version: '2.7.9'
 
@@ -153,7 +161,7 @@ dependencies {
         exclude module: 'oraclepki'
     }
 
-    implementation ('com.google.guava:guava:31.1-jre') {
+    implementation ('com.google.guava:guava:32.1.2-jre') {
         // TODO: Remove this as soon as https://github.com/google/guava/issues/2960 is fixed
         exclude module: "jsr305"
     }
@@ -168,18 +176,23 @@ dependencies {
     implementation 'com.github.sialcasa.mvvmFX:mvvmfx-validation:f195849ca9' //jitpack
     implementation 'de.saxsys:mvvmfx:1.8.0'
     implementation 'com.tobiasdiez:easybind:2.2.1-SNAPSHOT'
-    implementation 'org.fxmisc.flowless:flowless:0.7.0'
-    implementation 'org.fxmisc.richtext:richtextfx:0.11.0'
-    implementation 'com.jfoenix:jfoenix:9.0.10'
+    implementation 'org.fxmisc.flowless:flowless:0.7.1'
+    implementation 'org.fxmisc.richtext:richtextfx:0.11.1'
+    implementation (group: 'com.dlsc.gemsfx', name: 'gemsfx', version: '1.77.0') {
+        exclude module: 'javax.inject' // Split package, use only jakarta.inject
+        exclude group: 'org.apache.logging.log4j'
+    }
+
     implementation 'org.controlsfx:controlsfx:11.1.2'
 
-    implementation 'org.jsoup:jsoup:1.15.4'
-    implementation 'com.konghq:unirest-java:3.14.2'
+    implementation 'org.jsoup:jsoup:1.16.1'
+    implementation 'com.konghq:unirest-java:3.14.5'
 
     implementation 'org.slf4j:slf4j-api:2.0.7'
-    implementation "org.tinylog:tinylog-api:2.6.1"
-    implementation "org.tinylog:slf4j-tinylog:2.6.1"
-    implementation "org.tinylog:tinylog-impl:2.6.1"
+    implementation "org.tinylog:tinylog-api:2.6.2"
+    implementation "org.tinylog:slf4j-tinylog:2.6.2"
+    implementation "org.tinylog:tinylog-impl:2.6.2"
+
     // route all requests to java.util.logging to SLF4J (which in turn routes to tinylog)
     implementation 'org.slf4j:jul-to-slf4j:2.0.7'
 
@@ -198,10 +211,11 @@ dependencies {
         exclude module: "log4j-core"
     }
 
-    implementation 'com.vladsch.flexmark:flexmark:0.64.0'
+    implementation 'com.vladsch.flexmark:flexmark:0.64.8'
 
     implementation group: 'net.harawata', name: 'appdirs', version: '1.2.1'
 
+    implementation group: 'org.jooq', name: 'jool', version: '0.9.15'
     // JAX-RS implemented by Jersey
     // API
     implementation 'jakarta.ws.rs:jakarta.ws.rs-api:3.1.0'
@@ -220,23 +234,27 @@ dependencies {
     // Allow objects "magically" to be mapped to JSON using GSON
     // implementation 'org.glassfish.jersey.media:jersey-media-json-gson:3.1.1'
 
-    testImplementation 'io.github.classgraph:classgraph:4.8.157'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.9.2'
-    testImplementation 'org.junit.platform:junit-platform-launcher:1.9.2'
+    testImplementation 'io.github.classgraph:classgraph:4.8.162'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0'
+    testImplementation 'org.junit.platform:junit-platform-launcher:1.10.0'
 
-    testImplementation 'org.mockito:mockito-core:5.3.0'
+    testImplementation 'org.mockito:mockito-core:5.4.0'
     testImplementation 'org.xmlunit:xmlunit-core:2.9.1'
     testImplementation 'org.xmlunit:xmlunit-matchers:2.9.1'
-    testRuntimeOnly 'com.tngtech.archunit:archunit-junit5-engine:1.0.1'
-    testImplementation 'com.tngtech.archunit:archunit-junit5-api:1.0.1'
+    testRuntimeOnly 'com.tngtech.archunit:archunit-junit5-engine:1.1.0'
+    testImplementation 'com.tngtech.archunit:archunit-junit5-api:1.1.0'
     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:10.9.3'
+    checkstyle 'com.puppycrawl.tools:checkstyle:10.12.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'
+
+    rewrite(platform("org.openrewrite.recipe:rewrite-recipe-bom:2.2.1"))
+    rewrite("org.openrewrite.recipe:rewrite-logging-frameworks")
+    rewrite("org.openrewrite.recipe:rewrite-static-analysis")
 }
 
 clean {
@@ -274,11 +292,10 @@ processResources {
     }
 }
 
-task generateSource(dependsOn: ["generateBstGrammarSource",
-                                "generateSearchGrammarSource",
-                                "generateEndnoteSource",
-                                "generateModsSource",
-                                "generateCitaviSource"]) {
+tasks.register('generateSource') {
+    dependsOn("generateBstGrammarSource",
+            "generateSearchGrammarSource",
+            "generateCitaviSource")
     group = 'JabRef'
     description 'Generates all necessary (Java) source files.'
 }
@@ -295,26 +312,18 @@ tasks.register("generateBstGrammarSource", JavaExec) {
 }
 
 tasks.register("generateSearchGrammarSource", JavaExec) {
-    main = "org.antlr.v4.Tool"
-    classpath = configurations.antlr4
     group = 'JabRef'
     description = "Generates java files for Search.g antlr4."
+    classpath = configurations.antlr4
+    main = "org.antlr.v4.Tool"
 
     inputs.dir("src/main/antlr4/org/jabref/search/")
     outputs.dir("src-gen/main/java/org/jabref/search/")
     args  = ["-o","src-gen/main/java/org/jabref/search" , "-visitor", "-no-listener", "-package", "org.jabref.search", "$projectDir/src/main/antlr4/org/jabref/search/Search.g4"]
 }
 
-task generateEndnoteSource(type: XjcTask) {
-    group = 'JabRef'
-    description = "Generates java files for the endnote importer."
-
-    schemaFile = "src/main/resources/xjc/endnote/endnote.xsd"
-    outputDirectory = "src-gen/main/java/"
-    javaPackage = "org.jabref.logic.importer.fileformat.endnote"
-}
 
-task generateCitaviSource(type: XjcTask) {
+tasks.register('generateCitaviSource', XjcTask) {
     group = 'JabRef'
     description = "Generates java files for the citavi importer."
 
@@ -323,18 +332,7 @@ task generateCitaviSource(type: XjcTask) {
     javaPackage = "org.jabref.logic.importer.fileformat.citavi"
 }
 
-task generateModsSource(type: XjcTask) {
-    group = 'JabRef'
-    description = "Generates java files for the mods importer."
-
-    schemaFile = "src/main/resources/xjc/mods/mods-3-7.xsd"
-    bindingFile = "src/main/resources/xjc/mods/mods-binding.xjb"
-    outputDirectory = "src-gen/main/java"
-    javaPackage = "org.jabref.logic.importer.fileformat.mods"
-    arguments = '-npa'
-}
-
-task generateJournalAbbreviationList(type: JournalAbbreviationConverter) {
+tasks.register('generateJournalAbbreviationList', JournalAbbreviationConverter) {
     group = 'JabRef'
     description = "Converts the comma-separated journal abbreviation file to a H2 MVStore."
 
@@ -345,7 +343,7 @@ task generateJournalAbbreviationList(type: JournalAbbreviationConverter) {
     outputDir = file("src/main/resources/journals")
 }
 
-tasks.withType(JavaCompile) {
+tasks.withType(JavaCompile).configureEach {
     options.encoding = 'UTF-8'
 }
 
@@ -371,8 +369,6 @@ run {
                 'javafx.controls/com.sun.javafx.scene.control' : 'org.jabref',
                 'org.controlsfx.controls/impl.org.controlsfx.skin' : 'org.jabref',
 
-                'javafx.controls/com.sun.javafx.scene.control.behavior' : 'com.jfoenix',
-
                 // Not sure why we need to restate the controlfx exports
                 // Taken from here: https://github.com/controlsfx/controlsfx/blob/9.0.0/build.gradle#L1
                 'javafx.graphics/com.sun.javafx.scene' : 'org.controlsfx.controls',
@@ -393,12 +389,7 @@ run {
                 'javafx.controls/com.sun.javafx.scene.control' : 'org.jabref',
 
                 'javafx.controls/javafx.scene.control.skin' : 'org.controlsfx.controls',
-                'javafx.graphics/javafx.scene' : 'org.controlsfx.controls',
-
-                'javafx.controls/com.sun.javafx.scene.control.behavior' : 'com.jfoenix',
-                'javafx.base/com.sun.javafx.binding' : 'com.jfoenix',
-                'javafx.graphics/com.sun.javafx.stage' : 'com.jfoenix',
-                'javafx.base/com.sun.javafx.event' : 'com.jfoenix'
+                'javafx.graphics/javafx.scene' : 'org.controlsfx.controls'
         ]
     }
 
@@ -412,9 +403,9 @@ run {
 javadoc {
     options {
         encoding = 'UTF-8'
-        version = true
-        author = true
-         addMultilineStringsOption("-add-exports").setValue([
+        version = false
+        author = false
+        addMultilineStringsOption("-add-exports").setValue([
             'javafx.controls/com.sun.javafx.scene.control=org.jabref',
             'org.controlsfx.controls/impl.org.controlsfx.skin=org.jabref'
         ])
@@ -524,8 +515,37 @@ checkstyle {
     sourceSets = []
 }
 
+rewrite {
+    activeRecipe(
+        'org.jabref.config.rewrite.cleanup'
+    )
+    exclusion (
+        "build.gradle",
+        "buildSrc/build.gradle",
+        "eclipse.gradle",
+        "settings.gradle",
+        "src-gen/**",
+        "src/main/resources/**",
+        "src/test/resources/**",
+        "**/module-info.java",
+        "**/*.py",
+        "**/*.xml",
+        "**/*.yml"
+    )
+    plainTextMask("**/*.md")
+    failOnDryRunResults = true
+}
+
+modernizer {
+    failOnViolations = false
+    includeTestClasses = true
+    exclusions = [
+        'java/util/Optional.get:()Ljava/lang/Object;'
+    ]
+}
+
 // Release tasks
-task deleteInstallerTemp(type: Delete) {
+tasks.register('deleteInstallerTemp', Delete) {
     delete "$buildDir/installer"
 }
 
@@ -593,7 +613,8 @@ 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'    }
+                'org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider'
+    }
 
     jpackage {
         outputDir = "distribution"
@@ -615,6 +636,7 @@ jlink {
                     '--win-menu-group', "JabRef",
                     '--temp', "$buildDir/installer",
                     '--resource-dir', "${projectDir}/buildres/windows",
+                    '--license-file', "${projectDir}/buildres/LICENSE_with_Privacy.md",
                     '--file-associations', "${projectDir}/buildres/windows/bibtexAssociations.properties"
             ]
         }
@@ -644,8 +666,7 @@ jlink {
                     '--icon', "${projectDir}/src/main/resources/icons/jabref.icns",
                     '--resource-dir', "${projectDir}/buildres/mac"
             ]
-            // Due to a signing bug in jpackage we have to first resign the created app and therefore build the dmg manually
-            // See https://bugs.openjdk.java.net/browse/JDK-8251892 for details
+            // Notarized mac images and packages are built on the pipeline only
             skipInstaller = true
             installerOptions = [
                     '--verbose',
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index 4d40a0a8944..2618578ed2a 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -1,4 +1,7 @@
-apply plugin: 'java'
+plugins {
+    id 'java'
+    id 'org.openjfx.javafxplugin' version '0.0.14'
+}
 
 repositories {
     mavenLocal()
@@ -6,17 +9,14 @@ repositories {
 }
 
 dependencies {
-    implementation 'com.h2database:h2-mvstore:2.1.214'
+    implementation 'com.h2database:h2-mvstore:2.2.220'
     implementation 'org.apache.commons:commons-csv:1.10.0'
     implementation 'org.slf4j:slf4j-api:2.0.7'
 }
 
-sourceSets{
-    main {
-        java {
-            srcDir "src/copied"
-        }
-    }
+javafx {
+    version = "20"
+    modules = [ 'javafx.base' ]
 }
 
 /**
diff --git a/buildSrc/src/copied/java/org/jabref/logic/journals/JournalAbbreviationPreferences.java b/buildSrc/src/copied/java/org/jabref/logic/journals/JournalAbbreviationPreferences.java
deleted file mode 100644
index 442fda33ddc..00000000000
--- a/buildSrc/src/copied/java/org/jabref/logic/journals/JournalAbbreviationPreferences.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.jabref.logic.journals;
-
-import java.nio.charset.Charset;
-import java.util.List;
-
-public class JournalAbbreviationPreferences {
-
-    private final Charset defaultEncoding;
-    private List<String> externalJournalLists;
-    private boolean useFJournalField;
-
-    public JournalAbbreviationPreferences(List<String> externalJournalLists, Charset defaultEncoding, boolean useFJournalField) {
-        this.externalJournalLists = externalJournalLists;
-        this.defaultEncoding = defaultEncoding;
-        this.useFJournalField = useFJournalField;
-    }
-
-    public List<String> getExternalJournalLists() {
-        return externalJournalLists;
-    }
-
-    public void setExternalJournalLists(List<String> externalJournalLists) {
-        this.externalJournalLists = externalJournalLists;
-    }
-
-    public Charset getDefaultEncoding() {
-        return defaultEncoding;
-    }
-
-    public boolean useAMSFJournalFieldForAbbrevAndUnabbrev() {
-        return useFJournalField;
-    }
-
-    public void setUseAMSFJournalFieldForAbbrevAndUnabbrev(boolean useFJournalField) {
-        this.useFJournalField = useFJournalField;
-    }
-}
diff --git a/buildSrc/src/main/java/module-info.java b/buildSrc/src/main/java/module-info.java
new file mode 100644
index 00000000000..3b5988433e7
--- /dev/null
+++ b/buildSrc/src/main/java/module-info.java
@@ -0,0 +1,3 @@
+open module org.jabref {
+    requires javafx.base;
+}
diff --git a/buildSrc/src/copied/java/org/jabref/logic/journals/Abbreviation.java b/buildSrc/src/main/java/org/jabref/logic/journals/Abbreviation.java
similarity index 100%
rename from buildSrc/src/copied/java/org/jabref/logic/journals/Abbreviation.java
rename to buildSrc/src/main/java/org/jabref/logic/journals/Abbreviation.java
diff --git a/buildSrc/src/copied/java/org/jabref/logic/journals/AbbreviationFormat.java b/buildSrc/src/main/java/org/jabref/logic/journals/AbbreviationFormat.java
similarity index 100%
rename from buildSrc/src/copied/java/org/jabref/logic/journals/AbbreviationFormat.java
rename to buildSrc/src/main/java/org/jabref/logic/journals/AbbreviationFormat.java
diff --git a/buildSrc/src/copied/java/org/jabref/logic/journals/AbbreviationParser.java b/buildSrc/src/main/java/org/jabref/logic/journals/AbbreviationParser.java
similarity index 100%
rename from buildSrc/src/copied/java/org/jabref/logic/journals/AbbreviationParser.java
rename to buildSrc/src/main/java/org/jabref/logic/journals/AbbreviationParser.java
diff --git a/buildSrc/src/copied/java/org/jabref/logic/journals/AbbreviationWriter.java b/buildSrc/src/main/java/org/jabref/logic/journals/AbbreviationWriter.java
similarity index 100%
rename from buildSrc/src/copied/java/org/jabref/logic/journals/AbbreviationWriter.java
rename to buildSrc/src/main/java/org/jabref/logic/journals/AbbreviationWriter.java
diff --git a/buildSrc/src/copied/java/org/jabref/logic/journals/JournalAbbreviationLoader.java b/buildSrc/src/main/java/org/jabref/logic/journals/JournalAbbreviationLoader.java
similarity index 96%
rename from buildSrc/src/copied/java/org/jabref/logic/journals/JournalAbbreviationLoader.java
rename to buildSrc/src/main/java/org/jabref/logic/journals/JournalAbbreviationLoader.java
index 2c67a734a8b..1c0717a943c 100644
--- a/buildSrc/src/copied/java/org/jabref/logic/journals/JournalAbbreviationLoader.java
+++ b/buildSrc/src/main/java/org/jabref/logic/journals/JournalAbbreviationLoader.java
@@ -1,7 +1,6 @@
 package org.jabref.logic.journals;
 
 import java.io.IOException;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Collection;
@@ -62,6 +61,6 @@ public static JournalAbbreviationRepository loadRepository(JournalAbbreviationPr
     }
 
     public static JournalAbbreviationRepository loadBuiltInRepository() {
-        return loadRepository(new JournalAbbreviationPreferences(Collections.emptyList(), StandardCharsets.UTF_8, true));
+        return loadRepository(new JournalAbbreviationPreferences(Collections.emptyList(), true));
     }
 }
diff --git a/buildSrc/src/main/java/org/jabref/logic/journals/JournalAbbreviationPreferences.java b/buildSrc/src/main/java/org/jabref/logic/journals/JournalAbbreviationPreferences.java
new file mode 100644
index 00000000000..fb256bbe8ab
--- /dev/null
+++ b/buildSrc/src/main/java/org/jabref/logic/journals/JournalAbbreviationPreferences.java
@@ -0,0 +1,41 @@
+package org.jabref.logic.journals;
+
+import java.util.List;
+
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+
+public class JournalAbbreviationPreferences {
+
+    private final ObservableList<String> externalJournalLists;
+    private final BooleanProperty useFJournalField;
+
+    public JournalAbbreviationPreferences(List<String> externalJournalLists,
+                                          boolean useFJournalField) {
+        this.externalJournalLists = FXCollections.observableArrayList(externalJournalLists);
+        this.useFJournalField = new SimpleBooleanProperty(useFJournalField);
+    }
+
+    public ObservableList<String> getExternalJournalLists() {
+        return externalJournalLists;
+    }
+
+    public void setExternalJournalLists(List<String> list) {
+        externalJournalLists.clear();
+        externalJournalLists.addAll(list);
+    }
+
+    public boolean shouldUseFJournalField() {
+        return useFJournalField.get();
+    }
+
+    public BooleanProperty useFJournalFieldProperty() {
+        return useFJournalField;
+    }
+
+    public void setUseFJournalField(boolean useFJournalField) {
+        this.useFJournalField.set(useFJournalField);
+    }
+}
diff --git a/buildSrc/src/copied/java/org/jabref/logic/journals/JournalAbbreviationRepository.java b/buildSrc/src/main/java/org/jabref/logic/journals/JournalAbbreviationRepository.java
similarity index 100%
rename from buildSrc/src/copied/java/org/jabref/logic/journals/JournalAbbreviationRepository.java
rename to buildSrc/src/main/java/org/jabref/logic/journals/JournalAbbreviationRepository.java
diff --git a/buildSrc/src/main/java/org/jabref/logic/journals/package-info.java b/buildSrc/src/main/java/org/jabref/logic/journals/package-info.java
new file mode 100644
index 00000000000..4e7e2cbf82a
--- /dev/null
+++ b/buildSrc/src/main/java/org/jabref/logic/journals/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * This code is copied from src/main/java/org/jabref/logic/journals
+ */
+package org.jabref.logic.journals;
diff --git a/buildres/LICENSE_with_Privacy.md b/buildres/LICENSE_with_Privacy.md
new file mode 100644
index 00000000000..41264b1efcc
--- /dev/null
+++ b/buildres/LICENSE_with_Privacy.md
@@ -0,0 +1,179 @@
+MIT License
+
+Copyright © 2003-2021 [JabRef Authors](https://github.com/JabRef/jabref/blob/master/AUTHORS)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+--- Privacy Policy ----
+
+# Privacy Policy
+
+Last updated: 2023-08-24
+
+Your privacy is a fundamental right JabRef e.V. respects and supports.
+By using JabRef and its related online services, you choose to share
+some of your personal information. In this Privacy Policy we explain how
+we collect, use, and share information about you, along with the choices
+you have.
+
+The term \'Personal information\' in this policy means any information
+that either directly identifies you or can be somehow linked to you.
+\'JabRef\' refers to the desktop application that is provided by JabRef
+e.V.
+
+Please remember that no method of transmission over the Internet, or
+method of electronic storage is absolute secure. While we strive to use
+commercially acceptable means to protect your Personal Data, we cannot
+guarantee its absolute security. Also, whenever you communicate through
+the internet, your IP-Address will always be transmitted and retained by
+third parties for technical and in some cases for legal reasons.
+
+## JabRef Desktop Application
+
+### Collecting information
+
+JabRef does not collect any personal information directly linked to you.
+However, on certain occasions JabRef will send some information to the
+online services of JabRef e.V.:
+
+- On application start, JabRef will check for the latest version
+    online (by default *enabled*).
+- Information about a journal you are citing when looking for more
+    information about this journal, using our journal database (by
+    default *enabled*).
+- A pdf document you automatically want to extract citation
+    information from, using our GROBID service (by default *disabled*).
+- Anonymized statistical data on the use of the graphical user
+    interface for internal analysis purposes (by default *disabled*).
+
+### Storing information
+
+JabRef only stores the following personal information locally on your
+computer:
+
+- Your proxy username and password, if you decide to store them (by
+    default *disabled*).
+- Any personal API key you use to access third party online services
+    (by default *disabled*).
+
+### Sharing information
+
+Certain operations you perform in JabRef may trigger requests to public
+third-party services such as Zotero, Crossref or the Library of Congress
+for metadata retrieval. These third parties may log additional
+information besides your IP address and the search terms (e.g., DOI,
+ISBN or the current URL) according to their privacy policies.
+
+These third-party services are the following:
+
+Service;Privacy Policy
+[ACM](https://www.acm.org/);<https://www.acm.org/privacy-policy>
+[ACS Publications](https://pubs.acs.org/);<https://www.acs.org/privacy.html>
+[APS Advancing Physics](https://harvest.aps.org/);<https://www.aps.org/about/privacy.cfm#privacy>
+[arXiv.org](https://arxiv.org/);<https://info.arxiv.org/help/policies/privacy_policy.html>
+[Bibliotheksverbund Bayern](https://www.bib-bvb.de/);<https://www.bib-bvb.de/web/guest/datenschutzerklaerung-bvb-homepage>
+[Biodiversity Heritage Library](https://www.biodiversitylibrary.org/);<https://www.si.edu/Privacy>
+[Collection of Computer Science Bibliographies](http://liinwww.ira.uka.de/);**currently unavailable**, offline
+[CrossRef](https://www.crossref.org/);<https://www.crossref.org/operations-and-sustainability/privacy/>
+[dblp](https://dblp.uni-trier.de/);<https://dblp.uni-trier.de/db/about/privacy.html>
+[Directory of Open Access Books](https://www.doabooks.org/);<https://www.doabooks.org/en/resources/accessibility>
+[Digitala Vetenskapliga Arkivet](https://www.diva-portal.org/);<https://www.uu.se/en/about-uu/data-protection-policy/>
+[DOI Foundation](https://www.doi.org/);<https://www.doi.org/privacy-policy/>
+[Elsevier](https://www.elsevier.com/);<https://www.elsevier.com/legal/privacy-policy>
+[Google Scholar](https://scholar.google.com/);<https://policies.google.com/privacy>
+[Gemeinsamer Verbundkatalog](https://www.gbv.de/);<https://www.gbv.de/datenschutz>
+[IACR](https://www.iacr.org/);<https://www.iacr.org/privacy.html>
+[IEEEXplore](https://ieeexplore.ieee.org/Xplore/home.jsp);<https://www.ieee.org/security-privacy.html>
+[INSPIRE](https://inspirehep.net/);<https://cern.service-now.com/service-portal?id=privacy_policy&se=INSPIRE-Online&notice=main>
+[JSTOR](https://www.jstor.org/);<https://www.ithaka.org/privacypolicy/>
+[Library of Congress](https://lccn.loc.gov/);<https://www.loc.gov/legal/>
+[National Library of Medicine](https://www.ncbi.nlm.nih.gov/);<https://www.nlm.nih.gov/web_policies.html>
+[MathSciNet](http://www.ams.org/mathscinet);<https://www.ams.org/about-us/privacy>
+[mEDRA](https://medra.org/);<https://www.medra.org/stdoc/en/Servizio_DOI_Informativa_ENG.pdf>
+[Mr. DLib](https://mr-dlib.org/) [1];<https://support.dataverse.harvard.edu/harvard-dataverse-privacy-policy>
+[Openlibrary](https://openlibrary.org);<https://archive.org/about/terms.php>
+[ResearchGate](https://www.researchgate.net/);<https://www.researchgate.net/privacy-policy>
+[IETF Datatracker](https://datatracker.ietf.org/);<https://www.ietf.org/privacy-statement/>
+[Semantic Scholar](https://www.semanticscholar.org/), powered by [Allen Institute for AI](https://allenai.org/);<https://allenai.org/privacy-policy>
+[Springer Nature](https://dev.springernature.com/);<https://dev.springernature.com/privacypolicy>
+[The SAO/NASA Astrophysics Data System](https://ui.adsabs.harvard.edu/);<https://ui.adsabs.harvard.edu/help/privacy/>
+[Unpaywall](https://unpaywall.org/);<https://unpaywall.org/legal/privacy>
+[zbMATH Open](https://www.zbmath.org);<https://zbmath.org/privacy-policy/>
+
+[1]: *Note: The Mr. DLib service is used for the related articles tab in the entry editor and collects also your language, your browser and operating system (by default*disabled*).*;
+
+## JabRef Browser Extension
+
+No personal data (like name, email address, billing address or credit
+card) is collected by the Browser Extension itself. But be aware that
+the browser Extension uses Zotero services, where [Zotero\'s Privacy
+Policy](https://www.zotero.org/support/privacy) applies.
+
+### Collecting information
+
+When actively used, the extension has access to the current website and
+its content to process citation information. In particular, the
+following information is used:
+
+- the url of the current website you are visiting,
+- the content of the current website.
+
+### Storing information
+
+No data will be stored by the Browser Extension.
+
+### Sharing information
+
+The Browser Extension does not share any data except with the local
+instance of the JabRef software application, which stores the citation
+data as a new entry in its library.
+
+## Links to other Websites
+
+Our Service may contain links to other websites that are not operated by
+us. If you click on a third party link, you will be directed to that
+third party\'s site. We strongly advise you to review the Privacy Policy
+of every site you visit.
+
+We have no control over and assume no responsibility for the content,
+privacy policies or practices of any third party sites or services.
+
+## Changes to this Privacy Policy
+
+This privacy policy may be changed eventually. We encourage you to check
+this Privacy Policy periodically for any changes. Any material change
+will be mentioned in the changelog of the desktop application and in our
+[blog](https://blog.jabref.org/).
+
+This privacy policy is in effect as of the day mentioned as \"last
+updated\" above and will remain in effect except with respect to any
+changes in its provisions in the future, which will be in effect
+immediately after being posted on this page.
+
+## Contact
+
+If you get in touch with us, we may aks you to provide us with certain
+personal information (e.g. name and email address) to stay in contact
+with you. For any questions or concerns regarding the privacy policy,
+please send us an email to <vorstand@jabref.org> or write to
+
+JabRef e.V.\
+Josef-Lanner-Str. 9\
+71069 Sindelfingen\
+Germany
diff --git a/buildres/csl/csl-locales/locales-ca-AD.xml b/buildres/csl/csl-locales/locales-ca-AD.xml
index d3ada321d48..66aaa0969fa 100644
--- a/buildres/csl/csl-locales/locales-ca-AD.xml
+++ b/buildres/csl/csl-locales/locales-ca-AD.xml
@@ -541,7 +541,7 @@
     <term name="editor" form="verb">editat per</term>
     <term name="editorial-director" form="verb">editat per</term>
     <term name="illustrator" form="verb">il·lustrat per</term>
-    <term name="interviewer" form="verb">entrevistat per</term>
+    <term name="interviewer" form="verb">entrevista feta per</term>
     <term name="recipient" form="verb">a</term>
     <term name="reviewed-author" form="verb">per</term>
     <term name="translator" form="verb">traduït per</term>
diff --git a/buildres/csl/csl-styles/Gemfile.lock b/buildres/csl/csl-styles/Gemfile.lock
index 8414bfbd6a4..f48b77908e0 100644
--- a/buildres/csl/csl-styles/Gemfile.lock
+++ b/buildres/csl/csl-styles/Gemfile.lock
@@ -62,20 +62,20 @@ GEM
       ruby-progressbar (~> 1.4)
     git_diff (0.4.3)
     hashdiff (0.3.7)
-    mini_portile2 (2.8.0)
+    mini_portile2 (2.8.1)
     multipart-post (2.1.1)
     namae (1.1.1)
-    nokogiri (1.13.10)
+    nokogiri (1.14.3)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    nokogiri (1.13.10-x64-mingw32)
+    nokogiri (1.14.3-x64-mingw32)
       racc (~> 1.4)
     octokit (4.21.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
     ostruct (0.5.2)
     public_suffix (4.0.6)
-    racc (1.6.1)
+    racc (1.6.2)
     rake (13.0.6)
     reverse_markdown (2.1.1)
       nokogiri
diff --git a/buildres/csl/csl-styles/acm-sig-proceedings-long-author-list.csl b/buildres/csl/csl-styles/acm-sig-proceedings-long-author-list.csl
index 567c94d5178..11d794706f1 100644
--- a/buildres/csl/csl-styles/acm-sig-proceedings-long-author-list.csl
+++ b/buildres/csl/csl-styles/acm-sig-proceedings-long-author-list.csl
@@ -4,7 +4,7 @@
     <title>ACM SIG Proceedings ("et al." for 15+ authors)</title>
     <id>http://www.zotero.org/styles/acm-sig-proceedings-long-author-list</id>
     <link href="http://www.zotero.org/styles/acm-sig-proceedings-long-author-list" rel="self"/>
-    <link href="http://www.acm.org/sigs/publications/proceedings-templates" rel="documentation"/>
+    <link href="https://www.acm.org/publications/authors/reference-formatting" rel="documentation"/>
     <author>
       <name>Naeem Esfahani</name>
       <email>nesfaha2@gmu.edu</email>
diff --git a/buildres/csl/csl-styles/acm-sig-proceedings.csl b/buildres/csl/csl-styles/acm-sig-proceedings.csl
index 812569bd11b..41ef85c8283 100644
--- a/buildres/csl/csl-styles/acm-sig-proceedings.csl
+++ b/buildres/csl/csl-styles/acm-sig-proceedings.csl
@@ -4,7 +4,7 @@
     <title>ACM SIG Proceedings ("et al." for 3+ authors)</title>
     <id>http://www.zotero.org/styles/acm-sig-proceedings</id>
     <link href="http://www.zotero.org/styles/acm-sig-proceedings" rel="self"/>
-    <link href="http://www.acm.org/sigs/publications/proceedings-templates" rel="documentation"/>
+    <link href="https://www.acm.org/publications/authors/reference-formatting" rel="documentation"/>
     <author>
       <name>Naeem Esfahani</name>
       <email>nesfaha2@gmu.edu</email>
diff --git a/buildres/csl/csl-styles/acta-palaeontologica-polonica.csl b/buildres/csl/csl-styles/acta-palaeontologica-polonica.csl
index 91a25d235ca..2c3605be38d 100644
--- a/buildres/csl/csl-styles/acta-palaeontologica-polonica.csl
+++ b/buildres/csl/csl-styles/acta-palaeontologica-polonica.csl
@@ -8,7 +8,8 @@
     <link href="http://www.app.pan.pl/instruction.html" rel="documentation"/>
     <author>
       <name>Martin R. Smith</name>
-      <email>martins@gmail.com</email>
+      <email>martin.smith@durham.ac.uk</email>
+      <uri>https://smithlabdurham.github.io/</uri>
     </author>
     <contributor>
       <name>Benjamin C. Moon</name>
@@ -84,7 +85,8 @@
         <text macro="year-date"/>
       </group>
       <text variable="year-suffix" font-style="italic"/>
-      <group prefix=": ">
+      <group prefix=": " delimiter=" ">
+        <label variable="locator" form="short"/>
         <text variable="locator"/>
       </group>
     </layout>
diff --git a/buildres/csl/csl-styles/al-jamiah-journal-of-islamic-studies.csl b/buildres/csl/csl-styles/al-jamiah-journal-of-islamic-studies.csl
index aa9b034ef83..f3b0720c038 100644
--- a/buildres/csl/csl-styles/al-jamiah-journal-of-islamic-studies.csl
+++ b/buildres/csl/csl-styles/al-jamiah-journal-of-islamic-studies.csl
@@ -1,11 +1,11 @@
 <?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="4" et-al-use-first="1" et-al-subsequent-min="4" et-al-subsequent-use-first="1" initialize="false" initialize-with="." page-range-format="minimal" demote-non-dropping-particle="sort-only" default-locale="en-GB">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0" and="text" et-al-min="4" et-al-use-first="1" et-al-subsequent-min="4" et-al-subsequent-use-first="1" initialize="false" initialize-with="." page-range-format="minimal" demote-non-dropping-particle="sort-only" default-locale="en-US">
   <info>
     <title>Al-Jami'ah - Journal of Islamic Studies</title>
     <title-short>AJIS</title-short>
     <id>http://www.zotero.org/styles/al-jamiah-journal-of-islamic-studies</id>
     <link href="http://www.zotero.org/styles/al-jamiah-journal-of-islamic-studies" rel="self"/>
-    <link href="http://www.zotero.org/styles/turabian-fullnote-bibliography" rel="template"/>
+    <link href="http://www.zotero.org/styles/chicago-fullnote-bibliography" rel="template"/>
     <link href="http://aljamiah.or.id/index.php/AJIS/about/submissions#authorGuidelines" rel="documentation"/>
     <author>
       <name>Al-Jamiah</name>
diff --git a/buildres/csl/csl-styles/american-journal-of-botany.csl b/buildres/csl/csl-styles/american-journal-of-botany.csl
index b6d8a879034..6d65131227a 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="false" 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" cite-group-delimiter=", ">
     <sort>
       <key macro="year-date"/>
     </sort>
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 833064cd28b..d27978f5e36 100644
--- a/buildres/csl/csl-styles/american-society-for-horticultural-science.csl
+++ b/buildres/csl/csl-styles/american-society-for-horticultural-science.csl
@@ -5,214 +5,196 @@
     <title-short>ASHS</title-short>
     <id>http://www.zotero.org/styles/american-society-for-horticultural-science</id>
     <link href="http://www.zotero.org/styles/american-society-for-horticultural-science" rel="self"/>
-    <link href="http://www.zotero.org/styles/revista-de-biologia-tropical" rel="template"/>
-    <link href="https://aggie-horticulture.tamu.edu/syllabi/423/ASHS%20Publ%20Manual%202002.pdf" rel="documentation"/>
+    <link href="http://www.zotero.org/styles/springer-basic-author-date" rel="template"/>
+    <link href="https://cdn.ymaws.com/ashs.org/resource/resmgr/publications/ashspubsstylemanualweb.pdf" rel="documentation"/>
     <author>
       <name>Patrick O'Brien</name>
     </author>
     <category citation-format="author-date"/>
     <category field="biology"/>
     <category field="botany"/>
-    <updated>2022-06-14T08:25:19+00:00</updated>
+    <updated>2023-05-12T09: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>
-  <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="container">
-    <choose>
-      <if type="chapter paper-conference" match="any">
-        <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"/>
-        </group>
-      </if>
-      <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
-        <group prefix=", " delimiter=", ">
-          <text variable="container-title"/>
-          <text variable="collection-title"/>
-        </group>
-      </else-if>
-      <else>
-        <group delimiter=", " prefix=". ">
-          <text variable="container-title" form="short"/>
-          <text variable="collection-title"/>
-        </group>
-      </else>
-    </choose>
-  </macro>
-  <macro name="author">
+  <locale>
+    <terms>
+      <term name="edition" form="short">edn.</term>
+    </terms>
+  </locale>
+  <macro name="author-short">
     <names variable="author">
-      <name and="text" delimiter-precedes-last="never" initialize-with="." name-as-sort-order="first"/>
-      <label form="short" prefix=" (" suffix=")" text-case="capitalize-first"/>
+      <name form="short" and="text"/>
       <substitute>
         <names variable="editor"/>
         <names variable="translator"/>
-        <text macro="title"/>
+        <text variable="title"/>
       </substitute>
     </names>
   </macro>
-  <macro name="author-short">
+  <macro name="author">
     <names variable="author">
-      <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
-      <et-al font-style="italic"/>
+      <name sort-separator=" " initialize-with="" name-as-sort-order="all" delimiter=", " delimiter-precedes-last="always"/>
+      <label form="short" strip-periods="true" prefix=" (" suffix=")"/>
       <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"/>
-          </else>
-        </choose>
+        <text variable="title"/>
       </substitute>
     </names>
   </macro>
-  <macro name="access">
-    <text variable="URL" prefix="&lt;" suffix="&gt;"/>
-  </macro>
-  <macro name="title">
+  <macro name="edition">
     <choose>
-      <if type="chapter paper-conference" match="any">
-        <group delimiter=", ">
-          <text variable="title"/>
-          <group>
-            <label variable="page" form="short" suffix=" " plural="never"/>
-            <text variable="page"/>
-          </group>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="short"/>
         </group>
       </if>
       <else>
-        <text variable="title"/>
+        <text variable="edition"/>
       </else>
     </choose>
   </macro>
-  <macro name="publisher">
+  <macro name="year">
+    <date variable="issued">
+      <date-part name="year"/>
+    </date>
+  </macro>
+  <macro name="title">
     <choose>
-      <if type="report thesis" match="any">
+      <if type="book">
         <group delimiter=", ">
-          <text variable="publisher"/>
-          <text variable="publisher-place"/>
+          <text variable="title"/>
+          <text macro="edition"/>
         </group>
       </if>
       <else>
-        <group delimiter=", ">
-          <text variable="publisher"/>
-          <text variable="publisher-place"/>
-        </group>
+        <text variable="title"/>
       </else>
     </choose>
   </macro>
-  <macro name="event">
-    <choose>
-      <if variable="event">
-        <text term="presented at" text-case="capitalize-first" suffix=" "/>
-        <text variable="event"/>
-      </if>
-    </choose>
+  <macro name="year-parenth">
+    <date date-parts="year" form="numeric" variable="issued"/>
   </macro>
-  <macro name="issued">
+  <macro name="access">
     <choose>
-      <if variable="issued">
-        <date variable="issued">
-          <date-part name="year"/>
-        </date>
+      <if match="any" variable="DOI">
+        <text variable="DOI" prefix="https://doi.org/"/>
       </if>
-      <else-if variable="accessed">
-        <choose>
-          <if type="webpage">
+      <else-if type="webpage post post-weblog" match="any">
+        <group delimiter=". ">
+          <text variable="URL"/>
+          <group delimiter=" " prefix="[" suffix="]">
+            <text term="accessed"/>
             <date variable="accessed">
+              <date-part name="day" suffix=" "/>
+              <date-part name="month" form="short" suffix=" " strip-periods="true"/>
               <date-part name="year"/>
             </date>
-          </if>
-          <else>
-            <text term="no date" form="short"/>
-          </else>
-        </choose>
-      </else-if>
-      <else>
-        <text term="no date" form="short"/>
-      </else>
-    </choose>
-  </macro>
-  <macro name="locators">
-    <choose>
-      <if type="article-journal article-magazine article-newspaper" match="any">
-        <group delimiter=":" prefix=" ">
-          <text variable="volume"/>
-          <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="edition"/>
-          <text macro="event"/>
-          <text macro="publisher"/>
-          <group>
-            <text variable="genre"/>
-            <text variable="number" prefix=" No. "/>
           </group>
         </group>
       </else-if>
-      <else-if type="chapter paper-conference" match="any">
-        <group delimiter=", " prefix=". ">
-          <text macro="event"/>
-          <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">
+  <macro name="publisher">
+    <group delimiter=", ">
+      <text variable="publisher"/>
+      <text variable="publisher-place"/>
+    </group>
+  </macro>
+  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true">
     <sort>
+      <key variable="issued"/>
       <key macro="author"/>
-      <key macro="issued"/>
     </sort>
-    <layout delimiter="; " prefix="(" suffix=")">
-      <group delimiter=", ">
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=" ">
         <text macro="author-short"/>
-        <text macro="issued"/>
+        <text macro="year"/>
       </group>
     </layout>
   </citation>
-  <bibliography hanging-indent="true" entry-spacing="0" line-spacing="1">
+  <bibliography hanging-indent="true">
     <sort>
       <key macro="author"/>
-      <key macro="issued" sort="ascending"/>
+      <key variable="author" sort="ascending"/>
     </sort>
-    <layout>
-      <group suffix=".">
+    <layout suffix=".">
+      <group delimiter=". ">
         <text macro="author"/>
-        <text macro="issued" prefix=". " suffix=". "/>
-        <group>
-          <text macro="title"/>
-          <text macro="container"/>
-        </group>
-        <text macro="locators"/>
+        <text macro="year-parenth"/>
+        <choose>
+          <if type="chapter paper-conference" match="any">
+            <group delimiter=". ">
+              <group delimiter=", ">
+                <text macro="title"/>
+                <group delimiter=" ">
+                  <label plural="never" strip-periods="true" variable="page" form="short"/>
+                  <text variable="page"/>
+                </group>
+              </group>
+              <group delimiter=": ">
+                <text term="in" text-case="capitalize-first" suffix=":"/>
+                <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=")"/>
+                </names>
+              </group>
+              <text variable="container-title"/>
+              <text macro="edition"/>
+              <group delimiter=", ">
+                <text macro="publisher"/>
+              </group>
+            </group>
+          </if>
+          <else-if type="article-journal">
+            <group delimiter=". ">
+              <text macro="title"/>
+              <group delimiter=". ">
+                <text variable="container-title" form="short" strip-periods="true"/>
+                <group delimiter=":" prefix=" ">
+                  <group>
+                    <text variable="volume"/>
+                    <text variable="issue" prefix="(" suffix=")"/>
+                  </group>
+                  <text variable="page" prefix=":"/>
+                </group>
+              </group>
+            </group>
+          </else-if>
+          <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+            <group delimiter=". ">
+              <text macro="title"/>
+              <text macro="publisher"/>
+            </group>
+          </else-if>
+          <else-if type="webpage post-weblog" match="any">
+            <group delimiter=". ">
+              <text macro="title"/>
+              <text variable="container-title" form="short"/>
+            </group>
+          </else-if>
+          <else-if type="thesis">
+            <group delimiter=". ">
+              <group delimiter=" ">
+                <text macro="title"/>
+                <text variable="genre" text-case="capitalize-first" prefix="(" suffix=")"/>
+              </group>
+              <text macro="publisher"/>
+            </group>
+          </else-if>
+          <else>
+            <group delimiter=" ">
+              <text macro="title"/>
+              <text variable="container-title" form="short"/>
+              <group delimiter=":">
+                <text variable="volume"/>
+                <text variable="page"/>
+              </group>
+            </group>
+          </else>
+        </choose>
+        <text macro="access"/>
       </group>
     </layout>
   </bibliography>
diff --git a/buildres/csl/csl-styles/american-sociological-association.csl b/buildres/csl/csl-styles/american-sociological-association.csl
index 71fc70746ff..15b0f8dba8b 100644
--- a/buildres/csl/csl-styles/american-sociological-association.csl
+++ b/buildres/csl/csl-styles/american-sociological-association.csl
@@ -16,7 +16,7 @@
     <category citation-format="author-date"/>
     <category field="sociology"/>
     <summary>The ASA style following the 6th edition of the Style Guide</summary>
-    <updated>2022-05-08T21:48:56+00:00</updated>
+    <updated>2023-07-16T21:48:56+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <locale xml:lang="en">
@@ -38,8 +38,7 @@
       <name and="text" name-as-sort-order="first" sort-separator=", " delimiter=", " delimiter-precedes-last="always" initialize="false" initialize-with=". "/>
       <label form="short" prefix=", "/>
       <substitute>
-        <names variable="editor"/>
-        <names variable="translator"/>
+        <names variable="editor translator director"/>
         <choose>
           <if type="report">
             <text variable="publisher"/>
@@ -53,8 +52,7 @@
     <names variable="author">
       <name form="short" and="text" delimiter=", " initialize-with=". "/>
       <substitute>
-        <names variable="editor"/>
-        <names variable="translator"/>
+        <names variable="editor director translator"/>
         <choose>
           <if type="report">
             <text variable="publisher"/>
diff --git a/buildres/csl/csl-styles/apa-6th-edition-no-ampersand.csl b/buildres/csl/csl-styles/apa-6th-edition-no-ampersand.csl
index 70e5db1f6ab..1bfd4c29f80 100644
--- a/buildres/csl/csl-styles/apa-6th-edition-no-ampersand.csl
+++ b/buildres/csl/csl-styles/apa-6th-edition-no-ampersand.csl
@@ -1096,14 +1096,8 @@
     <!--This should be localized -->
     <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"/>
+        <text term="original-work-published" text-case="capitalize-first"/>
       </else>
     </choose>
   </macro>
diff --git a/buildres/csl/csl-styles/apa-6th-edition.csl b/buildres/csl/csl-styles/apa-6th-edition.csl
index 82ad9ae3084..201c16c1ce4 100644
--- a/buildres/csl/csl-styles/apa-6th-edition.csl
+++ b/buildres/csl/csl-styles/apa-6th-edition.csl
@@ -1095,14 +1095,8 @@
     <!--This should be localized -->
     <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"/>
+        <text term="original-work-published" text-case="capitalize-first"/>
       </else>
     </choose>
   </macro>
diff --git a/buildres/csl/csl-styles/apa-annotated-bibliography.csl b/buildres/csl/csl-styles/apa-annotated-bibliography.csl
index 9ecfac24bc2..8646210348b 100644
--- a/buildres/csl/csl-styles/apa-annotated-bibliography.csl
+++ b/buildres/csl/csl-styles/apa-annotated-bibliography.csl
@@ -35,295 +35,60 @@
       <term name="circa" form="short">ca.</term>
       <term name="bc"> B.C.E.</term>
       <term name="ad"> C.E.</term>
-      <term name="letter">personal communication</term>
-      <term name="letter" form="short">letter</term>
       <term name="issue" form="long">
         <single>issue</single>
         <multiple>issues</multiple>
       </term>
-    </terms>
-  </locale>
-  <locale xml:lang="af">
-    <terms>
-      <term name="letter">persoonlike kommunikasie</term>
-      <term name="letter" form="short">brief</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ar">
-    <terms>
-      <term name="letter">اتصال شخصي</term>
-      <term name="letter" form="short">خطاب</term>
-    </terms>
-  </locale>
-  <locale xml:lang="bg">
-    <terms>
-      <term name="letter">лична комуникация</term>
-      <term name="letter" form="short">писмо</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ca">
-    <terms>
-      <term name="letter">comunicació personal</term>
-      <term name="letter" form="short">carta</term>
-    </terms>
-  </locale>
-  <locale xml:lang="cs">
-    <terms>
-      <term name="letter">osobní komunikace</term>
-      <term name="letter" form="short">dopis</term>
-    </terms>
-  </locale>
-  <locale xml:lang="cy">
-    <terms>
-      <term name="letter">cyfathrebu personol</term>
-      <term name="letter" form="short">llythyr</term>
+      <term name="software">computer software</term>
     </terms>
   </locale>
   <locale xml:lang="da">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikation</term>
-      <term name="letter" form="short">brev</term>
     </terms>
   </locale>
   <locale xml:lang="de">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">persönliche Kommunikation</term>
-      <term name="letter" form="short">Brief</term>
-    </terms>
-  </locale>
-  <locale xml:lang="el">
-    <terms>
-      <term name="letter">προσωπική επικοινωνία</term>
-      <term name="letter" form="short">επιστολή</term>
     </terms>
   </locale>
   <locale xml:lang="es">
     <terms>
       <term name="from">de</term>
-      <term name="letter">comunicación personal</term>
-      <term name="letter" form="short">carta</term>
-    </terms>
-  </locale>
-  <locale xml:lang="et">
-    <terms>
-      <term name="letter">isiklik suhtlus</term>
-      <term name="letter" form="short">kiri</term>
-    </terms>
-  </locale>
-  <locale xml:lang="eu">
-    <terms>
-      <term name="letter">komunikazio pertsonala</term>
-      <term name="letter" form="short">gutuna</term>
-    </terms>
-  </locale>
-  <locale xml:lang="fa">
-    <terms>
-      <term name="letter">ارتباط شخصی</term>
-      <term name="letter" form="short">نامه</term>
-    </terms>
-  </locale>
-  <locale xml:lang="fi">
-    <terms>
-      <term name="letter">henkilökohtainen viestintä</term>
-      <term name="letter" form="short">kirje</term>
     </terms>
   </locale>
   <locale xml:lang="fr">
     <terms>
-      <term name="letter">communication personnelle</term>
-      <term name="letter" form="short">lettre</term>
       <term name="editor" form="short">
         <single>éd.</single>
         <multiple>éds.</multiple>
       </term>
     </terms>
   </locale>
-  <locale xml:lang="he">
-    <terms>
-      <term name="letter">תקשורת אישית</term>
-      <term name="letter" form="short">מכתב</term>
-    </terms>
-  </locale>
-  <locale xml:lang="hr">
-    <terms>
-      <term name="letter">osobna komunikacija</term>
-      <term name="letter" form="short">pismo</term>
-    </terms>
-  </locale>
-  <locale xml:lang="hu">
-    <terms>
-      <term name="letter">személyes kommunikáció</term>
-      <term name="letter" form="short">levél</term>
-    </terms>
-  </locale>
-  <locale xml:lang="id">
-    <terms>
-      <term name="letter">komunikasi pribadi</term>
-      <term name="letter" form="short">surat</term>
-    </terms>
-  </locale>
-  <locale xml:lang="is">
-    <terms>
-      <term name="letter">persónuleg samskipti</term>
-      <term name="letter" form="short">bréf</term>
-    </terms>
-  </locale>
-  <locale xml:lang="it">
-    <terms>
-      <term name="letter">comunicazione personale</term>
-      <term name="letter" form="short">lettera</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ja">
-    <terms>
-      <term name="letter">個人的なやり取り</term>
-      <term name="letter" form="short">手紙</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ko">
-    <terms>
-      <term name="letter">개인 서신</term>
-      <term name="letter" form="short">편지</term>
-    </terms>
-  </locale>
-  <locale xml:lang="la">
-    <terms>
-      <term name="letter"/>
-      <term name="letter" form="short">epistula</term>
-    </terms>
-  </locale>
-  <locale xml:lang="lt">
-    <terms>
-      <term name="letter">communicationis personalis</term>
-      <term name="letter" form="short"/>
-    </terms>
-  </locale>
-  <locale xml:lang="lv">
-    <terms>
-      <term name="letter">personīga komunikācija</term>
-      <term name="letter" form="short">vēstule</term>
-    </terms>
-  </locale>
-  <locale xml:lang="mn">
-    <terms>
-      <term name="letter">хувийн харилцаа холбоо</term>
-      <term name="letter" form="short">захиа</term>
-    </terms>
-  </locale>
   <locale xml:lang="nb">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikasjon</term>
-      <term name="letter" form="short">brev</term>
     </terms>
   </locale>
   <locale xml:lang="nl">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">persoonlijke communicatie</term>
-      <term name="letter" form="short">brief</term>
     </terms>
   </locale>
   <locale xml:lang="nn">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikasjon</term>
-      <term name="letter" form="short">brev</term>
-    </terms>
-  </locale>
-  <locale xml:lang="pl">
-    <terms>
-      <term name="letter">osobista komunikacja</term>
-      <term name="letter" form="short">list</term>
-    </terms>
-  </locale>
-  <locale xml:lang="pt">
-    <terms>
-      <term name="letter">comunicação pessoal</term>
-      <term name="letter" form="short">carta</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ro">
-    <terms>
-      <term name="letter">comunicare personală</term>
-      <term name="letter" form="short">scrisoare</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ru">
-    <terms>
-      <term name="letter">личная переписка</term>
-      <term name="letter" form="short">письмо</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sk">
-    <terms>
-      <term name="letter">osobná komunikácia</term>
-      <term name="letter" form="short">list</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sl">
-    <terms>
-      <term name="letter">osebna komunikacija</term>
-      <term name="letter" form="short">pismo</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sr">
-    <terms>
-      <term name="letter">лична комуникација</term>
-      <term name="letter" form="short">писмо</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sv">
-    <terms>
-      <term name="letter">personlig kommunikation</term>
-      <term name="letter" form="short">brev</term>
-    </terms>
-  </locale>
-  <locale xml:lang="th">
-    <terms>
-      <term name="letter">การสื่อสารส่วนบุคคล</term>
-      <term name="letter" form="short">จดหมาย</term>
-    </terms>
-  </locale>
-  <locale xml:lang="tr">
-    <terms>
-      <term name="letter">kişisel iletişim</term>
-      <term name="letter" form="short">mektup</term>
-    </terms>
-  </locale>
-  <locale xml:lang="uk">
-    <terms>
-      <term name="letter">особисте спілкування</term>
-      <term name="letter" form="short">лист</term>
-    </terms>
-  </locale>
-  <locale xml:lang="vi">
-    <terms>
-      <term name="letter">giao tiếp cá nhân</term>
-      <term name="letter" form="short">thư</term>
-    </terms>
-  </locale>
-  <locale xml:lang="zh-CN">
-    <terms>
-      <term name="letter">的私人交流</term>
-      <term name="letter" form="short">信函</term>
-    </terms>
-  </locale>
-  <locale xml:lang="zh-TW">
-    <terms>
-      <term name="letter">私人通訊</term>
-      <term name="letter" form="short">信函</term>
     </terms>
   </locale>
   <!-- General categories of item types:
        Periodical: article-journal article-magazine article-newspaper post-weblog review review-book
        Periodical or Booklike: paper-conference
-       Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure
+       Booklike: article book broadcast chapter classic collection dataset document
+                 entry entry-dictionary entry-encyclopedia event figure
                  graphic interview manuscript map motion_picture musical_score pamphlet patent
-                 personal_communication report song speech thesis post webpage
-       Legal: bill legal_case legislation treaty
+                 performance periodical personal_communication post report
+                 software song speech standard thesis webpage
+       Legal: bill hearing legal_case legislation regulation treaty
   -->
   <!-- APA references contain four parts: author, date, title, source -->
   <macro name="author-bib">
@@ -399,8 +164,7 @@
                   <text macro="title-intext"/>
                 </substitute>
               </names>
-              <!-- Replace with term="personal-communication" if that becomes available -->
-              <text term="letter"/>
+              <text term="personal-communication"/>
             </group>
           </if>
           <else>
@@ -501,9 +265,6 @@
       </else>
     </choose>
   </macro>
-  <macro name="date-sort-date">
-    <date variable="issued" form="numeric"/>
-  </macro>
   <macro name="date-intext">
     <choose>
       <if variable="issued">
@@ -641,23 +402,23 @@
       <if variable="title" match="none">
         <text macro="bracketed-intext" prefix="[" suffix="]"/>
       </if>
+      <else-if type="hearing">
+        <!-- Hearings are italicized -->
+        <text variable="title" form="short" font-style="italic" text-case="title"/>
+      </else-if>
       <else-if type="bill">
-        <!-- If a bill has no number or container-title, assume it is a hearing; italic -->
+        <!-- Bills are not italicized and substitute bill number if no title. -->
         <choose>
-          <if variable="number container-title" match="none">
-            <text variable="title" form="short" font-style="italic" text-case="title"/>
-          </if>
-          <else-if variable="title">
+          <if variable="title">
             <text variable="title" form="short" text-case="title"/>
-          </else-if>
+          </if>
           <else>
             <group delimiter=" ">
               <text variable="genre"/>
               <group delimiter=" ">
                 <choose>
                   <if variable="chapter-number container-title" match="none">
-                    <!-- Replace with label variable="number" as that becomes available -->
-                    <text term="issue" form="short"/>
+                    <label variable="number" form="short"/>
                   </if>
                 </choose>
                 <text variable="number"/>
@@ -700,13 +461,11 @@
                 <text variable="genre" text-case="capitalize-first"/>
               </if>
               <else>
-                <!-- This should be localized -->
-                <text value="patent" text-case="capitalize-first"/>
+                <text term="patent" text-case="capitalize-first"/>
               </else>
             </choose>
             <group delimiter=" ">
-              <!-- Replace with label variable="number" if that becomes available -->
-              <text term="issue" form="short" text-case="capitalize-first"/>
+              <label variable="number" form="short" text-case="capitalize-first"/>
               <text variable="number"/>
             </group>
           </group>
@@ -884,7 +643,7 @@
                           <text variable="medium" text-case="capitalize-first"/>
                         </else-if>
                         <else>
-                          <text term="letter" form="short" text-case="capitalize-first"/>
+                          <text term="letter" text-case="capitalize-first"/>
                         </else>
                       </choose>
                     </if>
@@ -894,7 +653,7 @@
                           <text variable="medium" text-case="capitalize-first"/>
                         </if>
                         <else>
-                          <text term="letter" form="short" text-case="capitalize-first"/>
+                          <text term="letter" text-case="capitalize-first"/>
                         </else>
                       </choose>
                     </else>
@@ -995,14 +754,7 @@
                 </if>
               </choose>
             </if>
-            <else-if type="book">
-              <choose>
-                <if variable="version" match="none">
-                  <text macro="format"/>
-                </if>
-              </choose>
-            </else-if>
-            <else-if type="report" match="none">
+            <else-if type="report software" match="none">
               <text macro="format"/>
             </else-if>
           </choose>
@@ -1014,8 +766,10 @@
     <group prefix="[" suffix="]">
       <choose>
         <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
-          <!-- This should be localized -->
-          <text macro="reviewed-title-intext" prefix="Review of "/>
+          <group delimiter=" ">
+            <text term="review-of" text-case="capitalize-first"/>
+            <text macro="reviewed-title-intext"/>
+          </group>
         </if>
         <else-if variable="interviewer" type="interview" match="any">
           <names variable="interviewer">
@@ -1036,7 +790,7 @@
                     <text variable="genre" text-case="capitalize-first"/>
                   </if>
                   <else>
-                    <text term="letter" form="short" text-case="capitalize-first"/>
+                    <text term="letter" text-case="capitalize-first"/>
                   </else>
                 </choose>
                 <names variable="recipient" delimiter=", ">
@@ -1067,7 +821,7 @@
             </if>
           </choose>
         </if>
-        <else-if type="book" variable="version" match="all">
+        <else-if type="software" match="all">
           <!-- For entries in mobile app reference works, place bracketed after the container-title -->
           <text macro="format"/>
         </else-if>
@@ -1175,8 +929,7 @@
             <text variable="genre" text-case="title"/>
             <choose>
               <if is-numeric="number">
-                <!-- Replace with label variable="number" if that becomes available -->
-                <text term="issue" form="short" text-case="capitalize-first"/>
+                <label variable="number" form="short" text-case="capitalize-first"/>
                 <text variable="number"/>
               </if>
               <else>
@@ -1225,8 +978,7 @@
     <choose>
       <if is-numeric="version">
         <group delimiter=" ">
-          <!-- replace with label variable="version" if that becomes available -->
-          <text term="version" text-case="capitalize-first"/>
+          <label variable="version" text-case="capitalize-first"/>
           <text variable="version"/>
         </group>
       </if>
@@ -1274,8 +1026,7 @@
         </if>
         <else>
           <group>
-            <!-- Replace with label variable="number-of-volumes" if that becomes available -->
-            <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+            <label variable="number-of-volumes" form="short" text-case="capitalize-first" suffix=" "/>
             <text term="page-range-delimiter" prefix="1"/>
             <number variable="number-of-volumes" form="numeric"/>
           </group>
@@ -1329,18 +1080,16 @@
         </group>
       </if>
       <!-- Generic labels for specific types -->
-      <!-- These should be localized when possible -->
       <else-if type="dataset">
-        <text value="Data set"/>
+        <text term="dataset"/>
       </else-if>
-      <else-if type="book" variable="version" match="all">
-        <!-- Replace with type="software" and term="software" as that becomes available -->
-        <text value="Computer software"/>
+      <else-if type="software">
+        <text term="software" text-case="capitalize-first"/>
       </else-if>
       <else-if type="interview personal_communication" match="any">
         <choose>
           <if variable="archive container-title DOI publisher URL" match="none">
-            <text term="letter" text-case="capitalize-first"/>
+            <text term="personal-communication" text-case="capitalize-first"/>
           </if>
           <else-if type="interview">
             <text term="interview" text-case="capitalize-first"/>
@@ -1348,7 +1097,7 @@
         </choose>
       </else-if>
       <else-if type="map">
-        <text value="Map"/>
+        <text term="map" text-case="capitalize-first"/>
       </else-if>
     </choose>
   </macro>
@@ -1361,18 +1110,16 @@
         <text variable="medium" text-case="capitalize-first"/>
       </else-if>
       <!-- Generic labels for specific types -->
-      <!-- These should be localized when possible -->
       <else-if type="dataset">
-        <text value="Data set"/>
+        <text term="dataset"/>
       </else-if>
-      <else-if type="book" variable="version" match="all">
-        <!-- Replace with type="software" and term="software" as that becomes available -->
-        <text value="Computer software"/>
+      <else-if type="software">
+        <text term="software" text-case="capitalize-first"/>
       </else-if>
       <else-if type="interview personal_communication" match="any">
         <choose>
           <if variable="archive container-title DOI publisher URL" match="none">
-            <text term="letter" text-case="capitalize-first"/>
+            <text term="personal-communication" text-case="capitalize-first"/>
           </if>
           <else-if type="interview">
             <text term="interview" text-case="capitalize-first"/>
@@ -1380,7 +1127,7 @@
         </choose>
       </else-if>
       <else-if type="map">
-        <text value="Map"/>
+        <text term="map"/>
       </else-if>
     </choose>
   </macro>
@@ -1598,7 +1345,7 @@
             </if>
             <else>
               <group delimiter=" ">
-                <text value="Original work published"/>
+                <text term="original-work-published" text-case="capitalize-first"/>
                 <choose>
                   <if is-uncertain-date="original-date">
                     <text term="circa" form="short"/>
@@ -1619,83 +1366,56 @@
   </macro>
   <!-- Legal citations have their own rules -->
   <macro name="legal-cites">
+    <!-- TODO: Add new item types -->
     <choose>
-      <if type="legal_case">
-        <group delimiter=". ">
-          <group delimiter=", ">
-            <text variable="title"/>
-            <group delimiter=" ">
-              <text macro="container-legal"/>
-              <text macro="date-legal"/>
-            </group>
-            <text variable="references"/>
-          </group>
+      <if type="treaty">
+        <!-- APA generally defers to Bluebook for legal citations, but diverges without
+             explanation for treaty items. The Bluebook format that was used in APA 6th
+             ed. is used here. -->
+        <group delimiter=", ">
+          <text variable="title" text-case="title"/>
+          <names variable="author">
+            <name initialize-with="." form="short" delimiter="-"/>
+          </names>
+          <text macro="date-legal"/>
+          <text macro="container-legal"/>
           <text macro="access"/>
         </group>
       </if>
-      <else-if type="bill">
-        <!-- Currently designed to handle bills, resolutions, hearings, rederal reports. -->
+      <else>
+        <!-- For `bill`: currently designed to handle bills, resolutions, federal reports. -->
+        <!-- For `legislation`: currently designed to handle statutes, codified regulations, executive orders. -->
         <group delimiter=". ">
           <group delimiter=", ">
             <choose>
-              <if variable="number container-title" match="none">
-                <!-- If no number or container-title, then assume it is a hearing -->
-                <text variable="title" font-style="italic"/>
-              </if>
-              <else>
+              <if type="bill legal_case legislation" match="any">
                 <text variable="title"/>
-              </else>
+              </if>
+              <else-if type="hearing">
+                <text variable="title" font-style="italic"/>
+              </else-if>
             </choose>
             <group delimiter=" ">
               <text macro="container-legal"/>
               <text macro="date-legal"/>
               <choose>
-                <if variable="number container-title" match="none">
-                  <!-- If no number or container-title, then assume it is a hearing -->
+                <if type="hearing">
                   <names variable="author" prefix="(testimony of " suffix=")">
+                    <!-- TODO: Localize this with the hearing term. -->
                     <name and="symbol" delimiter=", "/>
                   </names>
                 </if>
-                <else>
+                <else-if type="bill legislation" match="any">
+                  <!-- `legislation`: For uncodified regulations, assume future code section is in status. -->
                   <text variable="status" prefix="(" suffix=")"/>
-                </else>
+                </else-if>
               </choose>
             </group>
             <text variable="references"/>
           </group>
           <text macro="access"/>
         </group>
-      </else-if>
-      <else-if type="legislation">
-        <!-- Currently designed to handle statutes, codified regulations, executive orders.
-             For uncodified regulations, assume future code section is in status. -->
-        <group delimiter=". ">
-          <group delimiter=", ">
-            <text variable="title"/>
-            <group delimiter=" ">
-              <text macro="container-legal"/>
-              <text macro="date-legal"/>
-              <text variable="status" prefix="(" suffix=")"/>
-            </group>
-            <text variable="references"/>
-          </group>
-          <text macro="access"/>
-        </group>
-      </else-if>
-      <else-if type="treaty">
-        <!-- APA generally defers to Bluebook for legal citations, but diverges without
-             explanation for treaty items. The Bluebook format that was used in APA 6th
-             ed. is used here. -->
-        <group delimiter=", ">
-          <text variable="title" text-case="title"/>
-          <names variable="author">
-            <name initialize-with="." form="short" delimiter="-"/>
-          </names>
-          <text macro="date-legal"/>
-          <text macro="container-legal"/>
-          <text macro="access"/>
-        </group>
-      </else-if>
+      </else>
     </choose>
   </macro>
   <macro name="date-legal">
@@ -1714,7 +1434,7 @@
           </choose>
         </group>
       </if>
-      <else-if type="bill legislation" match="any">
+      <else-if type="bill legislation hearing" match="any">
         <group prefix="(" suffix=")" delimiter=" ">
           <group delimiter=" ">
             <date variable="original-date">
@@ -1743,8 +1463,7 @@
                 <text variable="volume"/>
                 <text variable="container-title"/>
                 <group delimiter=" ">
-                  <!-- Change to label variable="section" as that becomes available -->
-                  <text term="section" form="symbol"/>
+                  <label variable="section" form="symbol"/>
                   <text variable="section"/>
                 </group>
                 <choose>
@@ -1761,8 +1480,7 @@
               <group delimiter=" ">
                 <choose>
                   <if is-numeric="number">
-                    <!-- Replace with label variable="number" if that becomes available -->
-                    <text term="issue" form="short" text-case="capitalize-first"/>
+                    <label variable="number" form="short" text-case="capitalize-first"/>
                   </if>
                 </choose>
                 <text variable="number"/>
@@ -1778,8 +1496,7 @@
             <group delimiter=" ">
               <choose>
                 <if variable="chapter-number container-title" match="none">
-                  <!-- Replace with label variable="number" as that becomes available -->
-                  <text term="issue" form="short"/>
+                  <label variable="number" form="short"/>
                 </if>
               </choose>
               <text variable="number"/>
@@ -1814,8 +1531,7 @@
               <choose>
                 <if variable="section">
                   <group delimiter=" ">
-                    <!-- Change to label variable="section" as that becomes available -->
-                    <text term="section" form="symbol"/>
+                    <label variable="section" form="symbol"/>
                     <text variable="section"/>
                   </group>
                 </if>
@@ -1837,8 +1553,7 @@
             </if>
             <else>
               <group delimiter=" ">
-                <!-- Replace with label variable="number" if that becomes available -->
-                <text term="issue" form="short" text-case="capitalize-first"/>
+                <label variable="number" form="short" text-case="capitalize-first"/>
                 <text variable="number"/>
               </group>
             </else>
@@ -1864,7 +1579,7 @@
     <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 macro="date-bib" sort="ascending"/>
       <key variable="status"/>
     </sort>
     <layout prefix="(" suffix=")" delimiter="; ">
@@ -1879,7 +1594,7 @@
     <sort>
       <key macro="author-bib"/>
       <key macro="date-sort-group"/>
-      <key macro="date-sort-date" sort="ascending"/>
+      <key macro="date-bib" sort="ascending"/>
       <key variable="status"/>
       <key macro="title"/>
     </sort>
diff --git a/buildres/csl/csl-styles/apa-cv.csl b/buildres/csl/csl-styles/apa-cv.csl
index 0e9f361e217..dec03fa0e49 100644
--- a/buildres/csl/csl-styles/apa-cv.csl
+++ b/buildres/csl/csl-styles/apa-cv.csl
@@ -35,295 +35,60 @@
       <term name="circa" form="short">ca.</term>
       <term name="bc"> B.C.E.</term>
       <term name="ad"> C.E.</term>
-      <term name="letter">personal communication</term>
-      <term name="letter" form="short">letter</term>
       <term name="issue" form="long">
         <single>issue</single>
         <multiple>issues</multiple>
       </term>
-    </terms>
-  </locale>
-  <locale xml:lang="af">
-    <terms>
-      <term name="letter">persoonlike kommunikasie</term>
-      <term name="letter" form="short">brief</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ar">
-    <terms>
-      <term name="letter">اتصال شخصي</term>
-      <term name="letter" form="short">خطاب</term>
-    </terms>
-  </locale>
-  <locale xml:lang="bg">
-    <terms>
-      <term name="letter">лична комуникация</term>
-      <term name="letter" form="short">писмо</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ca">
-    <terms>
-      <term name="letter">comunicació personal</term>
-      <term name="letter" form="short">carta</term>
-    </terms>
-  </locale>
-  <locale xml:lang="cs">
-    <terms>
-      <term name="letter">osobní komunikace</term>
-      <term name="letter" form="short">dopis</term>
-    </terms>
-  </locale>
-  <locale xml:lang="cy">
-    <terms>
-      <term name="letter">cyfathrebu personol</term>
-      <term name="letter" form="short">llythyr</term>
+      <term name="software">computer software</term>
     </terms>
   </locale>
   <locale xml:lang="da">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikation</term>
-      <term name="letter" form="short">brev</term>
     </terms>
   </locale>
   <locale xml:lang="de">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">persönliche Kommunikation</term>
-      <term name="letter" form="short">Brief</term>
-    </terms>
-  </locale>
-  <locale xml:lang="el">
-    <terms>
-      <term name="letter">προσωπική επικοινωνία</term>
-      <term name="letter" form="short">επιστολή</term>
     </terms>
   </locale>
   <locale xml:lang="es">
     <terms>
       <term name="from">de</term>
-      <term name="letter">comunicación personal</term>
-      <term name="letter" form="short">carta</term>
-    </terms>
-  </locale>
-  <locale xml:lang="et">
-    <terms>
-      <term name="letter">isiklik suhtlus</term>
-      <term name="letter" form="short">kiri</term>
-    </terms>
-  </locale>
-  <locale xml:lang="eu">
-    <terms>
-      <term name="letter">komunikazio pertsonala</term>
-      <term name="letter" form="short">gutuna</term>
-    </terms>
-  </locale>
-  <locale xml:lang="fa">
-    <terms>
-      <term name="letter">ارتباط شخصی</term>
-      <term name="letter" form="short">نامه</term>
-    </terms>
-  </locale>
-  <locale xml:lang="fi">
-    <terms>
-      <term name="letter">henkilökohtainen viestintä</term>
-      <term name="letter" form="short">kirje</term>
     </terms>
   </locale>
   <locale xml:lang="fr">
     <terms>
-      <term name="letter">communication personnelle</term>
-      <term name="letter" form="short">lettre</term>
       <term name="editor" form="short">
         <single>éd.</single>
         <multiple>éds.</multiple>
       </term>
     </terms>
   </locale>
-  <locale xml:lang="he">
-    <terms>
-      <term name="letter">תקשורת אישית</term>
-      <term name="letter" form="short">מכתב</term>
-    </terms>
-  </locale>
-  <locale xml:lang="hr">
-    <terms>
-      <term name="letter">osobna komunikacija</term>
-      <term name="letter" form="short">pismo</term>
-    </terms>
-  </locale>
-  <locale xml:lang="hu">
-    <terms>
-      <term name="letter">személyes kommunikáció</term>
-      <term name="letter" form="short">levél</term>
-    </terms>
-  </locale>
-  <locale xml:lang="id">
-    <terms>
-      <term name="letter">komunikasi pribadi</term>
-      <term name="letter" form="short">surat</term>
-    </terms>
-  </locale>
-  <locale xml:lang="is">
-    <terms>
-      <term name="letter">persónuleg samskipti</term>
-      <term name="letter" form="short">bréf</term>
-    </terms>
-  </locale>
-  <locale xml:lang="it">
-    <terms>
-      <term name="letter">comunicazione personale</term>
-      <term name="letter" form="short">lettera</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ja">
-    <terms>
-      <term name="letter">個人的なやり取り</term>
-      <term name="letter" form="short">手紙</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ko">
-    <terms>
-      <term name="letter">개인 서신</term>
-      <term name="letter" form="short">편지</term>
-    </terms>
-  </locale>
-  <locale xml:lang="la">
-    <terms>
-      <term name="letter"/>
-      <term name="letter" form="short">epistula</term>
-    </terms>
-  </locale>
-  <locale xml:lang="lt">
-    <terms>
-      <term name="letter">communicationis personalis</term>
-      <term name="letter" form="short"/>
-    </terms>
-  </locale>
-  <locale xml:lang="lv">
-    <terms>
-      <term name="letter">personīga komunikācija</term>
-      <term name="letter" form="short">vēstule</term>
-    </terms>
-  </locale>
-  <locale xml:lang="mn">
-    <terms>
-      <term name="letter">хувийн харилцаа холбоо</term>
-      <term name="letter" form="short">захиа</term>
-    </terms>
-  </locale>
   <locale xml:lang="nb">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikasjon</term>
-      <term name="letter" form="short">brev</term>
     </terms>
   </locale>
   <locale xml:lang="nl">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">persoonlijke communicatie</term>
-      <term name="letter" form="short">brief</term>
     </terms>
   </locale>
   <locale xml:lang="nn">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikasjon</term>
-      <term name="letter" form="short">brev</term>
-    </terms>
-  </locale>
-  <locale xml:lang="pl">
-    <terms>
-      <term name="letter">osobista komunikacja</term>
-      <term name="letter" form="short">list</term>
-    </terms>
-  </locale>
-  <locale xml:lang="pt">
-    <terms>
-      <term name="letter">comunicação pessoal</term>
-      <term name="letter" form="short">carta</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ro">
-    <terms>
-      <term name="letter">comunicare personală</term>
-      <term name="letter" form="short">scrisoare</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ru">
-    <terms>
-      <term name="letter">личная переписка</term>
-      <term name="letter" form="short">письмо</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sk">
-    <terms>
-      <term name="letter">osobná komunikácia</term>
-      <term name="letter" form="short">list</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sl">
-    <terms>
-      <term name="letter">osebna komunikacija</term>
-      <term name="letter" form="short">pismo</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sr">
-    <terms>
-      <term name="letter">лична комуникација</term>
-      <term name="letter" form="short">писмо</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sv">
-    <terms>
-      <term name="letter">personlig kommunikation</term>
-      <term name="letter" form="short">brev</term>
-    </terms>
-  </locale>
-  <locale xml:lang="th">
-    <terms>
-      <term name="letter">การสื่อสารส่วนบุคคล</term>
-      <term name="letter" form="short">จดหมาย</term>
-    </terms>
-  </locale>
-  <locale xml:lang="tr">
-    <terms>
-      <term name="letter">kişisel iletişim</term>
-      <term name="letter" form="short">mektup</term>
-    </terms>
-  </locale>
-  <locale xml:lang="uk">
-    <terms>
-      <term name="letter">особисте спілкування</term>
-      <term name="letter" form="short">лист</term>
-    </terms>
-  </locale>
-  <locale xml:lang="vi">
-    <terms>
-      <term name="letter">giao tiếp cá nhân</term>
-      <term name="letter" form="short">thư</term>
-    </terms>
-  </locale>
-  <locale xml:lang="zh-CN">
-    <terms>
-      <term name="letter">的私人交流</term>
-      <term name="letter" form="short">信函</term>
-    </terms>
-  </locale>
-  <locale xml:lang="zh-TW">
-    <terms>
-      <term name="letter">私人通訊</term>
-      <term name="letter" form="short">信函</term>
     </terms>
   </locale>
   <!-- General categories of item types:
-        Periodical: article-journal article-magazine article-newspaper post-weblog review review-book
-        Periodical or Booklike: paper-conference
-        Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure
-                  graphic interview manuscript map motion_picture musical_score pamphlet patent
-                  personal_communication report song speech thesis post webpage
-        Legal: bill legal_case legislation treaty
+       Periodical: article-journal article-magazine article-newspaper post-weblog review review-book
+       Periodical or Booklike: paper-conference
+       Booklike: article book broadcast chapter classic collection dataset document
+                 entry entry-dictionary entry-encyclopedia event figure
+                 graphic interview manuscript map motion_picture musical_score pamphlet patent
+                 performance periodical personal_communication post report
+                 software song speech standard thesis webpage
+       Legal: bill hearing legal_case legislation regulation treaty
   -->
   <!-- APA references contain four parts: author, date, title, source -->
   <macro name="author-bib">
@@ -446,9 +211,6 @@
       </else>
     </choose>
   </macro>
-  <macro name="date-sort-date">
-    <date variable="issued" form="numeric"/>
-  </macro>
   <!-- APA has two description elements following the title:
         title (parenthetical) [bracketed]  -->
   <macro name="title-and-descriptions">
@@ -537,13 +299,11 @@
                 <text variable="genre" text-case="capitalize-first"/>
               </if>
               <else>
-                <!-- This should be localized -->
-                <text value="patent" text-case="capitalize-first"/>
+                <text term="patent" text-case="capitalize-first"/>
               </else>
             </choose>
             <group delimiter=" ">
-              <!-- Replace with label variable="number" if that becomes available -->
-              <text term="issue" form="short" text-case="capitalize-first"/>
+              <label variable="number" form="short" text-case="capitalize-first"/>
               <text variable="number"/>
             </group>
           </group>
@@ -721,7 +481,7 @@
                           <text variable="medium" text-case="capitalize-first"/>
                         </else-if>
                         <else>
-                          <text term="letter" form="short" text-case="capitalize-first"/>
+                          <text term="letter" text-case="capitalize-first"/>
                         </else>
                       </choose>
                     </if>
@@ -731,7 +491,7 @@
                           <text variable="medium" text-case="capitalize-first"/>
                         </if>
                         <else>
-                          <text term="letter" form="short" text-case="capitalize-first"/>
+                          <text term="letter" text-case="capitalize-first"/>
                         </else>
                       </choose>
                     </else>
@@ -832,14 +592,7 @@
                 </if>
               </choose>
             </if>
-            <else-if type="book">
-              <choose>
-                <if variable="version" match="none">
-                  <text macro="format"/>
-                </if>
-              </choose>
-            </else-if>
-            <else-if type="report" match="none">
+            <else-if type="report software" match="none">
               <text macro="format"/>
             </else-if>
           </choose>
@@ -858,7 +611,7 @@
             </if>
           </choose>
         </if>
-        <else-if type="book" variable="version" match="all">
+        <else-if type="software" match="all">
           <!-- For entries in mobile app reference works, place bracketed after the container-title -->
           <text macro="format"/>
         </else-if>
@@ -966,8 +719,7 @@
             <text variable="genre" text-case="title"/>
             <choose>
               <if is-numeric="number">
-                <!-- Replace with label variable="number" if that becomes available -->
-                <text term="issue" form="short" text-case="capitalize-first"/>
+                <label variable="number" form="short" text-case="capitalize-first"/>
                 <text variable="number"/>
               </if>
               <else>
@@ -1016,8 +768,7 @@
     <choose>
       <if is-numeric="version">
         <group delimiter=" ">
-          <!-- replace with label variable="version" if that becomes available -->
-          <text term="version" text-case="capitalize-first"/>
+          <label variable="version" text-case="capitalize-first"/>
           <text variable="version"/>
         </group>
       </if>
@@ -1065,8 +816,7 @@
         </if>
         <else>
           <group>
-            <!-- Replace with label variable="number-of-volumes" if that becomes available -->
-            <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+            <label variable="number-of-volumes" form="short" text-case="capitalize-first" suffix=" "/>
             <text term="page-range-delimiter" prefix="1"/>
             <number variable="number-of-volumes" form="numeric"/>
           </group>
@@ -1108,18 +858,16 @@
         </group>
       </if>
       <!-- Generic labels for specific types -->
-      <!-- These should be localized when possible -->
       <else-if type="dataset">
-        <text value="Data set"/>
+        <text term="dataset"/>
       </else-if>
-      <else-if type="book" variable="version" match="all">
-        <!-- Replace with type="software" and term="software" as that becomes available -->
-        <text value="Computer software"/>
+      <else-if type="software">
+        <text term="software" text-case="capitalize-first"/>
       </else-if>
       <else-if type="interview personal_communication" match="any">
         <choose>
           <if variable="archive container-title DOI publisher URL" match="none">
-            <text term="letter" text-case="capitalize-first"/>
+            <text term="personal-communication" text-case="capitalize-first"/>
           </if>
           <else-if type="interview">
             <text term="interview" text-case="capitalize-first"/>
@@ -1127,7 +875,7 @@
         </choose>
       </else-if>
       <else-if type="map">
-        <text value="Map"/>
+        <text term="map" text-case="capitalize-first"/>
       </else-if>
     </choose>
   </macro>
@@ -1345,7 +1093,7 @@
             </if>
             <else>
               <group delimiter=" ">
-                <text value="Original work published"/>
+                <text term="original-work-published" text-case="capitalize-first"/>
                 <choose>
                   <if is-uncertain-date="original-date">
                     <text term="circa" form="short"/>
@@ -1366,83 +1114,56 @@
   </macro>
   <!-- Legal citations have their own rules -->
   <macro name="legal-cites">
+    <!-- TODO: Add new item types -->
     <choose>
-      <if type="legal_case">
-        <group delimiter=". ">
-          <group delimiter=", ">
-            <text variable="title"/>
-            <group delimiter=" ">
-              <text macro="container-legal"/>
-              <text macro="date-legal"/>
-            </group>
-            <text variable="references"/>
-          </group>
+      <if type="treaty">
+        <!-- APA generally defers to Bluebook for legal citations, but diverges without
+             explanation for treaty items. The Bluebook format that was used in APA 6th
+             ed. is used here. -->
+        <group delimiter=", ">
+          <text variable="title" text-case="title"/>
+          <names variable="author">
+            <name initialize-with="." form="short" delimiter="-"/>
+          </names>
+          <text macro="date-legal"/>
+          <text macro="container-legal"/>
           <text macro="access"/>
         </group>
       </if>
-      <else-if type="bill">
-        <!-- Currently designed to handle bills, resolutions, hearings, rederal reports. -->
+      <else>
+        <!-- For `bill`: currently designed to handle bills, resolutions, federal reports. -->
+        <!-- For `legislation`: currently designed to handle statutes, codified regulations, executive orders. -->
         <group delimiter=". ">
           <group delimiter=", ">
             <choose>
-              <if variable="number container-title" match="none">
-                <!-- If no number or container-title, then assume it is a hearing -->
-                <text variable="title" font-style="italic"/>
-              </if>
-              <else>
+              <if type="bill legal_case legislation" match="any">
                 <text variable="title"/>
-              </else>
+              </if>
+              <else-if type="hearing">
+                <text variable="title" font-style="italic"/>
+              </else-if>
             </choose>
             <group delimiter=" ">
               <text macro="container-legal"/>
               <text macro="date-legal"/>
               <choose>
-                <if variable="number container-title" match="none">
-                  <!-- If no number or container-title, then assume it is a hearing -->
+                <if type="hearing">
                   <names variable="author" prefix="(testimony of " suffix=")">
+                    <!-- TODO: Localize this with the hearing term. -->
                     <name and="symbol" delimiter=", "/>
                   </names>
                 </if>
-                <else>
+                <else-if type="bill legislation" match="any">
+                  <!-- `legislation`: For uncodified regulations, assume future code section is in status. -->
                   <text variable="status" prefix="(" suffix=")"/>
-                </else>
+                </else-if>
               </choose>
             </group>
             <text variable="references"/>
           </group>
           <text macro="access"/>
         </group>
-      </else-if>
-      <else-if type="legislation">
-        <!-- Currently designed to handle statutes, codified regulations, executive orders.
-              For uncodified regulations, assume future code section is in status. -->
-        <group delimiter=". ">
-          <group delimiter=", ">
-            <text variable="title"/>
-            <group delimiter=" ">
-              <text macro="container-legal"/>
-              <text macro="date-legal"/>
-              <text variable="status" prefix="(" suffix=")"/>
-            </group>
-            <text variable="references"/>
-          </group>
-          <text macro="access"/>
-        </group>
-      </else-if>
-      <else-if type="treaty">
-        <!-- APA generally defers to Bluebook for legal citations, but diverges without
-              explanation for treaty items. The Bluebook format that was used in APA 6th
-              ed. is used here. -->
-        <group delimiter=", ">
-          <text variable="title" text-case="title"/>
-          <names variable="author">
-            <name initialize-with="." form="short" delimiter="-"/>
-          </names>
-          <text macro="date-legal"/>
-          <text macro="container-legal"/>
-          <text macro="access"/>
-        </group>
-      </else-if>
+      </else>
     </choose>
   </macro>
   <macro name="date-legal">
@@ -1461,7 +1182,7 @@
           </choose>
         </group>
       </if>
-      <else-if type="bill legislation" match="any">
+      <else-if type="bill legislation hearing" match="any">
         <group prefix="(" suffix=")" delimiter=" ">
           <group delimiter=" ">
             <date variable="original-date">
@@ -1490,8 +1211,7 @@
                 <text variable="volume"/>
                 <text variable="container-title"/>
                 <group delimiter=" ">
-                  <!-- Change to label variable="section" as that becomes available -->
-                  <text term="section" form="symbol"/>
+                  <label variable="section" form="symbol"/>
                   <text variable="section"/>
                 </group>
                 <choose>
@@ -1508,8 +1228,7 @@
               <group delimiter=" ">
                 <choose>
                   <if is-numeric="number">
-                    <!-- Replace with label variable="number" if that becomes available -->
-                    <text term="issue" form="short" text-case="capitalize-first"/>
+                    <label variable="number" form="short" text-case="capitalize-first"/>
                   </if>
                 </choose>
                 <text variable="number"/>
@@ -1525,8 +1244,7 @@
             <group delimiter=" ">
               <choose>
                 <if variable="chapter-number container-title" match="none">
-                  <!-- Replace with label variable="number" as that becomes available -->
-                  <text term="issue" form="short"/>
+                  <label variable="number" form="short"/>
                 </if>
               </choose>
               <text variable="number"/>
@@ -1561,8 +1279,7 @@
               <choose>
                 <if variable="section">
                   <group delimiter=" ">
-                    <!-- Change to label variable="section" as that becomes available -->
-                    <text term="section" form="symbol"/>
+                    <label variable="section" form="symbol"/>
                     <text variable="section"/>
                   </group>
                 </if>
@@ -1584,8 +1301,7 @@
             </if>
             <else>
               <group delimiter=" ">
-                <!-- Replace with label variable="number" if that becomes available -->
-                <text term="issue" form="short" text-case="capitalize-first"/>
+                <label variable="number" form="short" text-case="capitalize-first"/>
                 <text variable="number"/>
               </group>
             </else>
@@ -1597,7 +1313,7 @@
   <citation et-al-min="21" et-al-use-first="19" et-al-use-last="true">
     <sort>
       <key macro="date-sort-group" sort="descending"/>
-      <key macro="date-sort-date" sort="descending"/>
+      <key macro="date-bib" sort="descending"/>
       <key variable="status"/>
       <key macro="author-bib"/>
       <key macro="title"/>
@@ -1636,7 +1352,7 @@
   <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="date-sort-group" sort="descending"/>
-      <key macro="date-sort-date" sort="descending"/>
+      <key macro="date-bib" sort="descending"/>
       <key variable="status"/>
       <key macro="author-bib"/>
       <key macro="title"/>
diff --git a/buildres/csl/csl-styles/apa-eu.csl b/buildres/csl/csl-styles/apa-eu.csl
new file mode 100644
index 00000000000..b08b8464d48
--- /dev/null
+++ b/buildres/csl/csl-styles/apa-eu.csl
@@ -0,0 +1,1584 @@
+<?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>American Psychological Association 7th edition (Basque/Euskara)</title>
+    <title-short>APA</title-short>
+    <id>http://www.zotero.org/styles/apa-eu</id>
+    <link href="http://www.zotero.org/styles/apa-eu" rel="self"/>
+    <link href="http://www.zotero.org/styles/apa" rel="template"/>
+    <link href="https://apastyle.apa.org/style-grammar-guidelines/references/examples" rel="documentation"/>
+    <author>
+      <name>Brenton M. Wiernik</name>
+      <email>zotero@wiernik.org</email>
+    </author>
+    <contributor>
+      <name>Miren Berasategi Zeberio</name>
+      <email>mail@miren.bz</email>
+    </contributor>
+    <category citation-format="author-date"/>
+    <category field="psychology"/>
+    <category field="generic-base"/>
+    <updated>2022-01-31T14:30:00+00:00</updated>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+  </info>
+  <!-- Modifications with respect to 'basic' apa.csl:
+       - date-bib macro: fixed month prefix and added suffix
+       - citation-locator, container-periodical & volume-booklike macros: reversed variable and label for page no.s, added correct delimiter
+       - replaced all instances of and="symbol" with and="text" and changed/added delimiter-precedes-last="never" when necessary
+  -->
+  <!-- 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 classic collection dataset document
+                 entry entry-dictionary entry-encyclopedia event figure
+                 graphic interview manuscript map motion_picture musical_score pamphlet patent
+                 performance periodical personal_communication post report
+                 software song speech standard thesis webpage
+       Legal: bill hearing legal_case legislation regulation treaty
+  -->
+  <!-- APA references contain four parts: author, date, title, source -->
+  <macro name="author-bib">
+    <names variable="composer" delimiter=", ">
+      <name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="never"/>
+      <substitute>
+        <names variable="author"/>
+        <names variable="illustrator"/>
+        <names variable="director">
+          <name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="never"/>
+          <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>
+        <!-- Test for editortranslator and put that first as that becomes available -->
+        <names variable="editor" delimiter=", ">
+          <name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="never"/>
+          <label form="short" prefix=" (" suffix=")" text-case="title"/>
+        </names>
+        <names variable="editorial-director">
+          <name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="never"/>
+          <label form="short" prefix=" (" suffix=")" text-case="title"/>
+        </names>
+        <names variable="collection-editor">
+          <name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="never"/>
+          <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>
+          <!-- 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=", ">
+              <names variable="author">
+                <name and="text" delimiter=", " initialize-with=". "/>
+                <substitute>
+                  <text macro="title-intext"/>
+                </substitute>
+              </names>
+              <text term="personal-communication"/>
+            </group>
+          </if>
+          <else>
+            <names variable="author" delimiter=", ">
+              <name form="short" and="text" delimiter=", " initialize-with=". "/>
+              <substitute>
+                <text macro="title-intext"/>
+              </substitute>
+            </names>
+          </else>
+        </choose>
+      </else-if>
+      <else>
+        <names variable="composer" delimiter=", ">
+          <name form="short" and="text" 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">
+                <!-- Many video and audio examples in manual give full dates. Err on the side of too much information. -->
+                <date variable="issued">
+                  <date-part prefix="(e)ko " name="month" suffix="k"/>
+                  <date-part prefix=" " name="day"/>
+                </date>
+              </if>
+              <else-if type="paper-conference">
+                <!-- Capture 'speech' stored as 'paper-conference' -->
+                <choose>
+                  <if variable="collection-editor editor editorial-director issue page volume" match="none">
+                    <date variable="issued">
+                      <date-part prefix="(e)ko " name="month" suffix="k"/>
+                      <date-part prefix=" " name="day"/>
+                    </date>
+                  </if>
+                </choose>
+              </else-if>
+              <!-- 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>
+          <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">
+    <!-- APA sorts 1. no-date items, 2. items with dates, 3. in-press (status) items -->
+    <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">
+    <date variable="issued" form="numeric"/>
+  </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">
+                      <!-- 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>
+                    <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>
+  <!-- APA has two description elements following the title:
+       title (parenthetical) [bracketed]  -->
+  <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">
+        <!-- Webpages are always italicized -->
+        <text variable="title" font-style="italic"/>
+      </if>
+      <else-if variable="container-title" match="any">
+        <!-- Other types are italicized based on presence of container-title.
+             Assume that review and review-book are published in periodicals/blogs,
+             not just on a web page (ex. 69) -->
+        <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"/>
+                  <!-- Replace with volume-title as that becomes available -->
+                  <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"/>
+              <!-- Replace with volume-title as that becomes available -->
+              <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="hearing">
+        <!-- Hearings are italicized -->
+        <text variable="title" form="short" font-style="italic" text-case="title"/>
+      </else-if>
+      <else-if type="bill">
+        <!-- Bills are not italicized and substitute bill number if no title. -->
+        <choose>
+          <if variable="title">
+            <text variable="title" form="short" text-case="title"/>
+          </if>
+          <else>
+            <group delimiter=" ">
+              <text variable="genre"/>
+              <group delimiter=" ">
+                <choose>
+                  <if variable="chapter-number container-title" match="none">
+                    <label variable="number" form="short"/>
+                  </if>
+                </choose>
+                <text variable="number"/>
+              </group>
+            </group>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="legal_case" match="any">
+        <!-- Cases are italicized -->
+        <text variable="title" font-style="italic"/>
+      </else-if>
+      <else-if type="legislation treaty" match="any">
+        <!-- Legislation and treaties not italicized or quoted -->
+        <text variable="title" form="short" text-case="title"/>
+      </else-if>
+      <else-if type="post webpage" match="any">
+        <!-- Webpages are always italicized -->
+        <text variable="title" form="short" font-style="italic" text-case="title"/>
+      </else-if>
+      <else-if variable="container-title" match="any">
+        <!-- Other types are italicized or quoted based on presence of container-title. As in title macro. -->
+        <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">
+    <!-- (Secondary contributors; Database location; Genre no. 123; Report Series 123, Version, Edition, Volume, Page) -->
+    <group prefix="(" suffix=")">
+      <choose>
+        <if type="patent">
+          <!-- authority: U.S. ; genre: patent ; number: 123,445 -->
+          <group delimiter=" ">
+            <text variable="authority" form="short"/>
+            <choose>
+              <if variable="genre">
+                <text variable="genre" text-case="capitalize-first"/>
+              </if>
+              <else>
+                <text term="patent" text-case="capitalize-first"/>
+              </else>
+            </choose>
+            <group delimiter=" ">
+              <label variable="number" form="short" text-case="capitalize-first"/>
+              <text variable="number"/>
+            </group>
+          </group>
+        </if>
+        <else-if type="post webpage" match="any">
+          <!-- For post webpage, container-title is treated as publisher -->
+          <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">
+                <!-- For audiovisual media, number information comes after title, not container-title -->
+                <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">
+                <!-- For audiovisual media, number information comes after title, not container-title -->
+                <text macro="number"/>
+              </if>
+            </choose>
+            <text macro="locators-booklike"/>
+          </group>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="bracketed">
+    <!-- [Descriptive information] -->
+    <!-- If there is a number, genre is already printed in macro="number" -->
+    <group prefix="[" suffix="]">
+      <choose>
+        <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
+          <!-- Reviewed item -->
+          <group delimiter="; ">
+            <group delimiter=", ">
+              <group delimiter=" ">
+                <!-- Assume that genre is entered as 'Review of the book' or similar -->
+                <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>
+                        <!-- Replace with term="review" as that becomes available -->
+                        <text value="Review of"/>
+                      </else>
+                    </choose>
+                  </if>
+                  <else>
+                    <choose>
+                      <if variable="medium">
+                        <text variable="medium" text-case="capitalize-first"/>
+                      </if>
+                      <else>
+                        <!-- Replace with term="review" as that becomes available -->
+                        <text value="Review of"/>
+                      </else>
+                    </choose>
+                  </else>
+                </choose>
+                <text macro="reviewed-title"/>
+              </group>
+              <names variable="reviewed-author">
+                <label form="verb-short" suffix=" "/>
+                <name and="text" 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">
+          <!-- Thesis type and institution -->
+          <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">
+                      <!-- Include the university in brackets if thesis is published -->
+                      <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">
+          <!-- Interview information -->
+          <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="text" 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="text" 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">
+          <!-- Letter information -->
+          <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" text-case="capitalize-first"/>
+                        </else>
+                      </choose>
+                    </if>
+                    <else>
+                      <choose>
+                        <if variable="medium">
+                          <text variable="medium" text-case="capitalize-first"/>
+                        </if>
+                        <else>
+                          <text term="letter" text-case="capitalize-first"/>
+                        </else>
+                      </choose>
+                    </else>
+                  </choose>
+                  <names variable="recipient" delimiter=", ">
+                    <label form="verb" suffix=" "/>
+                    <name and="text" 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">
+          <!-- Performer of classical music works -->
+          <group delimiter="; ">
+            <choose>
+              <if variable="number" match="none">
+                <group delimiter=" ">
+                  <choose>
+                    <if variable="genre">
+                      <text variable="genre" text-case="capitalize-first"/>
+                      <!-- Replace prefix with performer label as that becomes available -->
+                      <names variable="author" prefix="recorded by ">
+                        <name and="text" initialize-with=". " delimiter=", "/>
+                      </names>
+                    </if>
+                    <else-if variable="medium">
+                      <text variable="medium" text-case="capitalize-first"/>
+                      <!-- Replace prefix with performer label as that becomes available -->
+                      <names variable="author" prefix="recorded by ">
+                        <name and="text" initialize-with=". " delimiter=", "/>
+                      </names>
+                    </else-if>
+                    <else>
+                      <!-- Replace prefix with performer label as that becomes available -->
+                      <names variable="author" prefix="Recorded by ">
+                        <name and="text" initialize-with=". " delimiter=", "/>
+                      </names>
+                    </else>
+                  </choose>
+                </group>
+              </if>
+              <else>
+                <group delimiter=" ">
+                  <choose>
+                    <if variable="medium">
+                      <text variable="medium" text-case="capitalize-first"/>
+                      <!-- Replace prefix with performer label as that becomes available -->
+                      <names variable="author" prefix="recorded by ">
+                        <name and="text" initialize-with=". " delimiter=", "/>
+                      </names>
+                    </if>
+                    <else>
+                      <!-- Replace prefix with performer label as that becomes available -->
+                      <names variable="author" prefix="Recorded by ">
+                        <name and="text" 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">
+          <!-- Other description -->
+          <text macro="format"/>
+        </else-if>
+        <else>
+          <!-- For conference presentations, chapters in reports, software, place bracketed after the container title -->
+          <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="report software" 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">
+          <group delimiter=" ">
+            <text term="review-of" text-case="capitalize-first"/>
+            <text macro="reviewed-title-intext"/>
+          </group>
+        </if>
+        <else-if variable="interviewer" type="interview" match="any">
+          <names variable="interviewer">
+            <label form="verb" suffix=" " text-case="capitalize-first"/>
+            <name and="text" initialize-with=". " delimiter=", "/>
+            <substitute>
+              <text macro="format-intext"/>
+            </substitute>
+          </names>
+        </else-if>
+        <else-if type="personal_communication">
+          <!-- Letter information -->
+          <choose>
+            <if variable="recipient">
+              <group delimiter=" ">
+                <choose>
+                  <if variable="number" match="none">
+                    <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="text" 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">
+          <!-- Conference presentations should describe the session [container] in bracketed unless published in a proceedings -->
+          <choose>
+            <if variable="collection-editor editor editorial-director issue page volume" match="none">
+              <text macro="format"/>
+            </if>
+          </choose>
+        </if>
+        <else-if type="software" match="all">
+          <!-- For entries in mobile app reference works, place bracketed after the container-title -->
+          <text macro="format"/>
+        </else-if>
+        <else-if type="report">
+          <!-- For chapters in reports, place bracketed after the container title -->
+          <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="text" initialize-with=". " delimiter=", "/>
+            <label form="short" prefix=", " text-case="title"/>
+          </names>
+        </if>
+      </choose>
+      <names variable="translator" delimiter="; ">
+        <name and="text" 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="text" initialize-with=". " delimiter=", "/>
+            <label form="short" prefix=", " text-case="title"/>
+          </names>
+        </if>
+      </choose>
+      <!-- When editortranslator becomes available, add a test: variable="editortranslator" match="none"; then print translator -->
+      <choose>
+        <if type="post webpage" match="none">
+          <!-- Webpages treat container-title like publisher -->
+          <choose>
+            <if variable="container-title" match="none">
+              <group delimiter="; ">
+                <names variable="container-author">
+                  <label form="verb-short" suffix=" " text-case="title"/>
+                  <name and="text" initialize-with=". " delimiter=", "/>
+                </names>
+                <names variable="editor translator" delimiter="; ">
+                  <name and="text" 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="text" initialize-with=". " delimiter=", "/>
+            </names>
+            <names variable="editor translator" delimiter="; ">
+              <name and="text" 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">
+        <!-- With `archive-place`: physical archives. Without: online archives. -->
+        <!-- Add archive_collection as that becomes available -->
+        <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">
+                <label variable="number" form="short" text-case="capitalize-first"/>
+                <text variable="number"/>
+              </if>
+              <else>
+                <text variable="number"/>
+              </else>
+            </choose>
+          </group>
+          <choose>
+            <if type="thesis">
+              <choose>
+                <!-- Include the university in brackets if thesis is published -->
+                <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=" ">
+          <label variable="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=", ">
+      <!-- Report series [ex. 52] -->
+      <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>
+            <!-- Non-numeric volumes are already printed as part of the book title -->
+            <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>
+            <label variable="number-of-volumes" form="short" text-case="capitalize-first" suffix=" "/>
+            <text term="page-range-delimiter" prefix="1"/>
+            <number variable="number-of-volumes" form="numeric"/>
+          </group>
+        </else>
+      </choose>
+      <group delimiter=" ">
+        <label variable="issue" text-case="capitalize-first"/>
+        <text variable="issue"/>
+      </group>
+      <group delimiter=". ">
+        <text variable="page"/>
+        <label variable="page" form="short" suffix=""/>
+      </group>
+    </group>
+  </macro>
+  <macro name="reviewed-title">
+    <choose>
+      <if variable="reviewed-title">
+        <!-- Not possible to distinguish TV series episode from other reviewed
+              works [Ex. 69] -->
+        <text variable="reviewed-title" font-style="italic"/>
+      </if>
+      <else>
+        <!-- Assume title is title of reviewed work -->
+        <text variable="title" font-style="italic"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="reviewed-title-intext">
+    <choose>
+      <if variable="reviewed-title">
+        <!-- Not possible to distinguish TV series episode from other reviewed works [Ex. 69] -->
+        <text variable="reviewed-title" form="short" font-style="italic" text-case="title"/>
+      </if>
+      <else>
+        <!-- Assume title is title of reviewed work -->
+        <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>
+      <!-- Generic labels for specific types -->
+      <else-if type="dataset">
+        <text term="dataset"/>
+      </else-if>
+      <else-if type="software">
+        <text term="software" text-case="capitalize-first"/>
+      </else-if>
+      <else-if type="interview personal_communication" match="any">
+        <choose>
+          <if variable="archive container-title DOI publisher URL" match="none">
+            <text term="personal-communication" 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 term="map" text-case="capitalize-first"/>
+      </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>
+      <!-- Generic labels for specific types -->
+      <else-if type="dataset">
+        <text term="dataset"/>
+      </else-if>
+      <else-if type="software">
+        <text term="software" text-case="capitalize-first"/>
+      </else-if>
+      <else-if type="interview personal_communication" match="any">
+        <choose>
+          <if variable="archive container-title DOI publisher URL" match="none">
+            <text term="personal-communication" 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 term="map"/>
+      </else-if>
+    </choose>
+  </macro>
+  <!-- APA 'source' element contains four parts:
+       container, event, publisher, access -->
+  <macro name="container">
+    <choose>
+      <if type="article-journal article-magazine article-newspaper post-weblog review review-book" match="any">
+        <!-- Periodical items -->
+        <text macro="container-periodical"/>
+      </if>
+      <else-if type="paper-conference">
+        <!-- Determine if paper-conference is a periodical or booklike -->
+        <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">
+        <!-- post and webpage treat container-title like publisher -->
+        <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="number">
+            <!-- Ex. 6: Journal article with article number or eLocator -->
+            <!-- This should be localized -->
+            <group delimiter=" ">
+              <text term="article-locator" text-case="capitalize-first"/>
+              <text variable="number"/>
+            </group>
+          </if>
+          <else>
+            <group delimiter=". ">
+              <text variable="page"/>
+              <label variable="page" form="short" suffix=""/>
+            </group>
+          </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=" eta ">
+              <!-- Change to editortranslator and move editor to substitute as that becomes available -->
+              <name and="text" initialize-with=". " delimiter=", " delimiter-precedes-last="never"/>
+              <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"/>
+              <!-- Replace with volume-title as that becomes available -->
+              <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">
+          <!-- For websites, treat container title like publisher -->
+          <group delimiter="; ">
+            <text variable="container-title" text-case="title"/>
+            <text variable="publisher"/>
+          </group>
+        </else-if>
+        <else-if type="paper-conference">
+          <!-- For paper-conference, don't print publisher if in a journal-like proceedings -->
+          <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">
+          <text variable="publisher"/>
+        </else-if>
+      </choose>
+      <group delimiter=", ">
+        <choose>
+          <if variable="archive-place">
+            <!-- With `archive-place`: physical archives. Without: online archives. -->
+            <!-- For physical archives, print the location before the archive name.
+                For electronic archives, these are printed in macro="description". -->
+            <!-- Split "archive_location" into "archive_collection" and "archive_location" as that becomes available -->
+            <!-- Must test for archive_collection:
+                With collection: archive_collection (archive_location), archive, archive-place
+                No collection: archive (archive_location), 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">
+        <text variable="DOI" prefix="https://doi.org/"/>
+      </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 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 macro="event-title"/>
+              <text variable="event-place"/>
+            </group>
+          </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>
+  <!-- After 'source', APA also prints publication history (original publication, reprint info, retraction info) -->
+  <macro name="publication-history">
+    <choose>
+      <if type="patent" match="none">
+        <group prefix="(" suffix=")">
+          <choose>
+            <if variable="references">
+              <!-- 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"/>
+            </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>
+  <!-- Legal citations have their own rules -->
+  <macro name="legal-cites">
+    <!-- TODO: Add new item types -->
+    <choose>
+      <if type="treaty">
+        <!-- APA generally defers to Bluebook for legal citations, but diverges without
+             explanation for treaty items. The Bluebook format that was used in APA 6th
+             ed. is used here. -->
+        <group delimiter=", ">
+          <text variable="title" text-case="title"/>
+          <names variable="author">
+            <name initialize-with="." form="short" delimiter="-"/>
+          </names>
+          <text macro="date-legal"/>
+          <text macro="container-legal"/>
+          <text macro="access"/>
+        </group>
+      </if>
+      <else>
+        <!-- For `bill`: currently designed to handle bills, resolutions, federal reports. -->
+        <!-- For `legislation`: currently designed to handle statutes, codified regulations, executive orders. -->
+        <group delimiter=". ">
+          <group delimiter=", ">
+            <choose>
+              <if type="bill legal_case legislation" match="any">
+                <text variable="title"/>
+              </if>
+              <else-if type="hearing">
+                <text variable="title" font-style="italic"/>
+              </else-if>
+            </choose>
+            <group delimiter=" ">
+              <text macro="container-legal"/>
+              <text macro="date-legal"/>
+              <choose>
+                <if type="hearing">
+                  <names variable="author" prefix="(testimony of " suffix=")">
+                    <!-- TODO: Localize this with the hearing term. -->
+                    <name and="symbol" delimiter=", "/>
+                  </names>
+                </if>
+                <else-if type="bill legislation" match="any">
+                  <!-- `legislation`: For uncodified regulations, assume future code section is in status. -->
+                  <text variable="status" prefix="(" suffix=")"/>
+                </else-if>
+              </choose>
+            </group>
+            <text variable="references"/>
+          </group>
+          <text macro="access"/>
+        </group>
+      </else>
+    </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">
+              <!-- Print only year for cases published in reporters-->
+              <date variable="issued" form="numeric" date-parts="year"/>
+            </if>
+            <else>
+              <date variable="issued" form="text"/>
+            </else>
+          </choose>
+        </group>
+      </if>
+      <else-if type="bill legislation hearing" 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">
+    <!-- Expect legal item container-titles to be stored in short form -->
+    <choose>
+      <if type="legal_case">
+        <group delimiter=" ">
+          <choose>
+            <if variable="container-title">
+              <group delimiter=" ">
+                <text variable="volume"/>
+                <text variable="container-title"/>
+                <group delimiter=" ">
+                  <label variable="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">
+                    <label variable="number" 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">
+                  <label variable="number" 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">
+            <!--There's a public law 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=" ">
+                    <label variable="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=" ">
+                <label variable="number" form="short" text-case="capitalize-first"/>
+                <text variable="number"/>
+              </group>
+            </else>
+          </choose>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="citation-locator">
+    <group delimiter=". ">
+      <text variable="locator"/>
+      <choose>
+        <if locator="chapter">
+          <label variable="locator" text-case="capitalize-first"/>
+        </if>
+        <else>
+          <label variable="locator" form="short"/>
+        </else>
+      </choose>
+    </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">
+          <!-- Legal items have different orders and delimiters -->
+          <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/apa-no-ampersand.csl b/buildres/csl/csl-styles/apa-no-ampersand.csl
index 777cc6d13a6..b26a8426573 100644
--- a/buildres/csl/csl-styles/apa-no-ampersand.csl
+++ b/buildres/csl/csl-styles/apa-no-ampersand.csl
@@ -35,295 +35,60 @@
       <term name="circa" form="short">ca.</term>
       <term name="bc"> B.C.E.</term>
       <term name="ad"> C.E.</term>
-      <term name="letter">personal communication</term>
-      <term name="letter" form="short">letter</term>
       <term name="issue" form="long">
         <single>issue</single>
         <multiple>issues</multiple>
       </term>
-    </terms>
-  </locale>
-  <locale xml:lang="af">
-    <terms>
-      <term name="letter">persoonlike kommunikasie</term>
-      <term name="letter" form="short">brief</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ar">
-    <terms>
-      <term name="letter">اتصال شخصي</term>
-      <term name="letter" form="short">خطاب</term>
-    </terms>
-  </locale>
-  <locale xml:lang="bg">
-    <terms>
-      <term name="letter">лична комуникация</term>
-      <term name="letter" form="short">писмо</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ca">
-    <terms>
-      <term name="letter">comunicació personal</term>
-      <term name="letter" form="short">carta</term>
-    </terms>
-  </locale>
-  <locale xml:lang="cs">
-    <terms>
-      <term name="letter">osobní komunikace</term>
-      <term name="letter" form="short">dopis</term>
-    </terms>
-  </locale>
-  <locale xml:lang="cy">
-    <terms>
-      <term name="letter">cyfathrebu personol</term>
-      <term name="letter" form="short">llythyr</term>
+      <term name="software">computer software</term>
     </terms>
   </locale>
   <locale xml:lang="da">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikation</term>
-      <term name="letter" form="short">brev</term>
     </terms>
   </locale>
   <locale xml:lang="de">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">persönliche Kommunikation</term>
-      <term name="letter" form="short">Brief</term>
-    </terms>
-  </locale>
-  <locale xml:lang="el">
-    <terms>
-      <term name="letter">προσωπική επικοινωνία</term>
-      <term name="letter" form="short">επιστολή</term>
     </terms>
   </locale>
   <locale xml:lang="es">
     <terms>
       <term name="from">de</term>
-      <term name="letter">comunicación personal</term>
-      <term name="letter" form="short">carta</term>
-    </terms>
-  </locale>
-  <locale xml:lang="et">
-    <terms>
-      <term name="letter">isiklik suhtlus</term>
-      <term name="letter" form="short">kiri</term>
-    </terms>
-  </locale>
-  <locale xml:lang="eu">
-    <terms>
-      <term name="letter">komunikazio pertsonala</term>
-      <term name="letter" form="short">gutuna</term>
-    </terms>
-  </locale>
-  <locale xml:lang="fa">
-    <terms>
-      <term name="letter">ارتباط شخصی</term>
-      <term name="letter" form="short">نامه</term>
-    </terms>
-  </locale>
-  <locale xml:lang="fi">
-    <terms>
-      <term name="letter">henkilökohtainen viestintä</term>
-      <term name="letter" form="short">kirje</term>
     </terms>
   </locale>
   <locale xml:lang="fr">
     <terms>
-      <term name="letter">communication personnelle</term>
-      <term name="letter" form="short">lettre</term>
       <term name="editor" form="short">
         <single>éd.</single>
         <multiple>éds.</multiple>
       </term>
     </terms>
   </locale>
-  <locale xml:lang="he">
-    <terms>
-      <term name="letter">תקשורת אישית</term>
-      <term name="letter" form="short">מכתב</term>
-    </terms>
-  </locale>
-  <locale xml:lang="hr">
-    <terms>
-      <term name="letter">osobna komunikacija</term>
-      <term name="letter" form="short">pismo</term>
-    </terms>
-  </locale>
-  <locale xml:lang="hu">
-    <terms>
-      <term name="letter">személyes kommunikáció</term>
-      <term name="letter" form="short">levél</term>
-    </terms>
-  </locale>
-  <locale xml:lang="id">
-    <terms>
-      <term name="letter">komunikasi pribadi</term>
-      <term name="letter" form="short">surat</term>
-    </terms>
-  </locale>
-  <locale xml:lang="is">
-    <terms>
-      <term name="letter">persónuleg samskipti</term>
-      <term name="letter" form="short">bréf</term>
-    </terms>
-  </locale>
-  <locale xml:lang="it">
-    <terms>
-      <term name="letter">comunicazione personale</term>
-      <term name="letter" form="short">lettera</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ja">
-    <terms>
-      <term name="letter">個人的なやり取り</term>
-      <term name="letter" form="short">手紙</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ko">
-    <terms>
-      <term name="letter">개인 서신</term>
-      <term name="letter" form="short">편지</term>
-    </terms>
-  </locale>
-  <locale xml:lang="la">
-    <terms>
-      <term name="letter"/>
-      <term name="letter" form="short">epistula</term>
-    </terms>
-  </locale>
-  <locale xml:lang="lt">
-    <terms>
-      <term name="letter">communicationis personalis</term>
-      <term name="letter" form="short"/>
-    </terms>
-  </locale>
-  <locale xml:lang="lv">
-    <terms>
-      <term name="letter">personīga komunikācija</term>
-      <term name="letter" form="short">vēstule</term>
-    </terms>
-  </locale>
-  <locale xml:lang="mn">
-    <terms>
-      <term name="letter">хувийн харилцаа холбоо</term>
-      <term name="letter" form="short">захиа</term>
-    </terms>
-  </locale>
   <locale xml:lang="nb">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikasjon</term>
-      <term name="letter" form="short">brev</term>
     </terms>
   </locale>
   <locale xml:lang="nl">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">persoonlijke communicatie</term>
-      <term name="letter" form="short">brief</term>
     </terms>
   </locale>
   <locale xml:lang="nn">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikasjon</term>
-      <term name="letter" form="short">brev</term>
-    </terms>
-  </locale>
-  <locale xml:lang="pl">
-    <terms>
-      <term name="letter">osobista komunikacja</term>
-      <term name="letter" form="short">list</term>
-    </terms>
-  </locale>
-  <locale xml:lang="pt">
-    <terms>
-      <term name="letter">comunicação pessoal</term>
-      <term name="letter" form="short">carta</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ro">
-    <terms>
-      <term name="letter">comunicare personală</term>
-      <term name="letter" form="short">scrisoare</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ru">
-    <terms>
-      <term name="letter">личная переписка</term>
-      <term name="letter" form="short">письмо</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sk">
-    <terms>
-      <term name="letter">osobná komunikácia</term>
-      <term name="letter" form="short">list</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sl">
-    <terms>
-      <term name="letter">osebna komunikacija</term>
-      <term name="letter" form="short">pismo</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sr">
-    <terms>
-      <term name="letter">лична комуникација</term>
-      <term name="letter" form="short">писмо</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sv">
-    <terms>
-      <term name="letter">personlig kommunikation</term>
-      <term name="letter" form="short">brev</term>
-    </terms>
-  </locale>
-  <locale xml:lang="th">
-    <terms>
-      <term name="letter">การสื่อสารส่วนบุคคล</term>
-      <term name="letter" form="short">จดหมาย</term>
-    </terms>
-  </locale>
-  <locale xml:lang="tr">
-    <terms>
-      <term name="letter">kişisel iletişim</term>
-      <term name="letter" form="short">mektup</term>
-    </terms>
-  </locale>
-  <locale xml:lang="uk">
-    <terms>
-      <term name="letter">особисте спілкування</term>
-      <term name="letter" form="short">лист</term>
-    </terms>
-  </locale>
-  <locale xml:lang="vi">
-    <terms>
-      <term name="letter">giao tiếp cá nhân</term>
-      <term name="letter" form="short">thư</term>
-    </terms>
-  </locale>
-  <locale xml:lang="zh-CN">
-    <terms>
-      <term name="letter">的私人交流</term>
-      <term name="letter" form="short">信函</term>
-    </terms>
-  </locale>
-  <locale xml:lang="zh-TW">
-    <terms>
-      <term name="letter">私人通訊</term>
-      <term name="letter" form="short">信函</term>
     </terms>
   </locale>
   <!-- General categories of item types:
-        Periodical: article-journal article-magazine article-newspaper post-weblog review review-book
-        Periodical or Booklike: paper-conference
-        Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure
-                  graphic interview manuscript map motion_picture musical_score pamphlet patent
-                  personal_communication report song speech thesis post webpage
-        Legal: bill legal_case legislation treaty
+       Periodical: article-journal article-magazine article-newspaper post-weblog review review-book
+       Periodical or Booklike: paper-conference
+       Booklike: article book broadcast chapter classic collection dataset document
+                 entry entry-dictionary entry-encyclopedia event figure
+                 graphic interview manuscript map motion_picture musical_score pamphlet patent
+                 performance periodical personal_communication post report
+                 software song speech standard thesis webpage
+       Legal: bill hearing legal_case legislation regulation treaty
   -->
   <!-- APA references contain four parts: author, date, title, source -->
   <macro name="author-bib">
@@ -399,8 +164,7 @@
                   <text macro="title-intext"/>
                 </substitute>
               </names>
-              <!-- Replace with term="personal-communication" if that becomes available -->
-              <text term="letter"/>
+              <text term="personal-communication"/>
             </group>
           </if>
           <else>
@@ -501,9 +265,6 @@
       </else>
     </choose>
   </macro>
-  <macro name="date-sort-date">
-    <date variable="issued" form="numeric"/>
-  </macro>
   <macro name="date-intext">
     <choose>
       <if variable="issued">
@@ -641,23 +402,23 @@
       <if variable="title" match="none">
         <text macro="bracketed-intext" prefix="[" suffix="]"/>
       </if>
+      <else-if type="hearing">
+        <!-- Hearings are italicized -->
+        <text variable="title" form="short" font-style="italic" text-case="title"/>
+      </else-if>
       <else-if type="bill">
-        <!-- If a bill has no number or container-title, assume it is a hearing; italic -->
+        <!-- Bills are not italicized and substitute bill number if no title. -->
         <choose>
-          <if variable="number container-title" match="none">
-            <text variable="title" form="short" font-style="italic" text-case="title"/>
-          </if>
-          <else-if variable="title">
+          <if variable="title">
             <text variable="title" form="short" text-case="title"/>
-          </else-if>
+          </if>
           <else>
             <group delimiter=" ">
               <text variable="genre"/>
               <group delimiter=" ">
                 <choose>
                   <if variable="chapter-number container-title" match="none">
-                    <!-- Replace with label variable="number" as that becomes available -->
-                    <text term="issue" form="short"/>
+                    <label variable="number" form="short"/>
                   </if>
                 </choose>
                 <text variable="number"/>
@@ -700,13 +461,11 @@
                 <text variable="genre" text-case="capitalize-first"/>
               </if>
               <else>
-                <!-- This should be localized -->
-                <text value="patent" text-case="capitalize-first"/>
+                <text term="patent" text-case="capitalize-first"/>
               </else>
             </choose>
             <group delimiter=" ">
-              <!-- Replace with label variable="number" if that becomes available -->
-              <text term="issue" form="short" text-case="capitalize-first"/>
+              <label variable="number" form="short" text-case="capitalize-first"/>
               <text variable="number"/>
             </group>
           </group>
@@ -884,7 +643,7 @@
                           <text variable="medium" text-case="capitalize-first"/>
                         </else-if>
                         <else>
-                          <text term="letter" form="short" text-case="capitalize-first"/>
+                          <text term="letter" text-case="capitalize-first"/>
                         </else>
                       </choose>
                     </if>
@@ -894,7 +653,7 @@
                           <text variable="medium" text-case="capitalize-first"/>
                         </if>
                         <else>
-                          <text term="letter" form="short" text-case="capitalize-first"/>
+                          <text term="letter" text-case="capitalize-first"/>
                         </else>
                       </choose>
                     </else>
@@ -995,14 +754,7 @@
                 </if>
               </choose>
             </if>
-            <else-if type="book">
-              <choose>
-                <if variable="version" match="none">
-                  <text macro="format"/>
-                </if>
-              </choose>
-            </else-if>
-            <else-if type="report" match="none">
+            <else-if type="report software" match="none">
               <text macro="format"/>
             </else-if>
           </choose>
@@ -1014,8 +766,10 @@
     <group prefix="[" suffix="]">
       <choose>
         <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
-          <!-- This should be localized -->
-          <text macro="reviewed-title-intext" prefix="Review of "/>
+          <group delimiter=" ">
+            <text term="review-of" text-case="capitalize-first"/>
+            <text macro="reviewed-title-intext"/>
+          </group>
         </if>
         <else-if variable="interviewer" type="interview" match="any">
           <names variable="interviewer">
@@ -1036,7 +790,7 @@
                     <text variable="genre" text-case="capitalize-first"/>
                   </if>
                   <else>
-                    <text term="letter" form="short" text-case="capitalize-first"/>
+                    <text term="letter" text-case="capitalize-first"/>
                   </else>
                 </choose>
                 <names variable="recipient" delimiter=", ">
@@ -1067,7 +821,7 @@
             </if>
           </choose>
         </if>
-        <else-if type="book" variable="version" match="all">
+        <else-if type="software" match="all">
           <!-- For entries in mobile app reference works, place bracketed after the container-title -->
           <text macro="format"/>
         </else-if>
@@ -1175,8 +929,7 @@
             <text variable="genre" text-case="title"/>
             <choose>
               <if is-numeric="number">
-                <!-- Replace with label variable="number" if that becomes available -->
-                <text term="issue" form="short" text-case="capitalize-first"/>
+                <label variable="number" form="short" text-case="capitalize-first"/>
                 <text variable="number"/>
               </if>
               <else>
@@ -1225,8 +978,7 @@
     <choose>
       <if is-numeric="version">
         <group delimiter=" ">
-          <!-- replace with label variable="version" if that becomes available -->
-          <text term="version" text-case="capitalize-first"/>
+          <label variable="version" text-case="capitalize-first"/>
           <text variable="version"/>
         </group>
       </if>
@@ -1274,8 +1026,7 @@
         </if>
         <else>
           <group>
-            <!-- Replace with label variable="number-of-volumes" if that becomes available -->
-            <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+            <label variable="number-of-volumes" form="short" text-case="capitalize-first" suffix=" "/>
             <text term="page-range-delimiter" prefix="1"/>
             <number variable="number-of-volumes" form="numeric"/>
           </group>
@@ -1329,18 +1080,16 @@
         </group>
       </if>
       <!-- Generic labels for specific types -->
-      <!-- These should be localized when possible -->
       <else-if type="dataset">
-        <text value="Data set"/>
+        <text term="dataset"/>
       </else-if>
-      <else-if type="book" variable="version" match="all">
-        <!-- Replace with type="software" and term="software" as that becomes available -->
-        <text value="Computer software"/>
+      <else-if type="software">
+        <text term="software" text-case="capitalize-first"/>
       </else-if>
       <else-if type="interview personal_communication" match="any">
         <choose>
           <if variable="archive container-title DOI publisher URL" match="none">
-            <text term="letter" text-case="capitalize-first"/>
+            <text term="personal-communication" text-case="capitalize-first"/>
           </if>
           <else-if type="interview">
             <text term="interview" text-case="capitalize-first"/>
@@ -1348,7 +1097,7 @@
         </choose>
       </else-if>
       <else-if type="map">
-        <text value="Map"/>
+        <text term="map" text-case="capitalize-first"/>
       </else-if>
     </choose>
   </macro>
@@ -1361,18 +1110,16 @@
         <text variable="medium" text-case="capitalize-first"/>
       </else-if>
       <!-- Generic labels for specific types -->
-      <!-- These should be localized when possible -->
       <else-if type="dataset">
-        <text value="Data set"/>
+        <text term="dataset"/>
       </else-if>
-      <else-if type="book" variable="version" match="all">
-        <!-- Replace with type="software" and term="software" as that becomes available -->
-        <text value="Computer software"/>
+      <else-if type="software">
+        <text term="software" text-case="capitalize-first"/>
       </else-if>
       <else-if type="interview personal_communication" match="any">
         <choose>
           <if variable="archive container-title DOI publisher URL" match="none">
-            <text term="letter" text-case="capitalize-first"/>
+            <text term="personal-communication" text-case="capitalize-first"/>
           </if>
           <else-if type="interview">
             <text term="interview" text-case="capitalize-first"/>
@@ -1380,7 +1127,7 @@
         </choose>
       </else-if>
       <else-if type="map">
-        <text value="Map"/>
+        <text term="map"/>
       </else-if>
     </choose>
   </macro>
@@ -1598,7 +1345,7 @@
             </if>
             <else>
               <group delimiter=" ">
-                <text value="Original work published"/>
+                <text term="original-work-published" text-case="capitalize-first"/>
                 <choose>
                   <if is-uncertain-date="original-date">
                     <text term="circa" form="short"/>
@@ -1619,83 +1366,56 @@
   </macro>
   <!-- Legal citations have their own rules -->
   <macro name="legal-cites">
+    <!-- TODO: Add new item types -->
     <choose>
-      <if type="legal_case">
-        <group delimiter=". ">
-          <group delimiter=", ">
-            <text variable="title"/>
-            <group delimiter=" ">
-              <text macro="container-legal"/>
-              <text macro="date-legal"/>
-            </group>
-            <text variable="references"/>
-          </group>
+      <if type="treaty">
+        <!-- APA generally defers to Bluebook for legal citations, but diverges without
+             explanation for treaty items. The Bluebook format that was used in APA 6th
+             ed. is used here. -->
+        <group delimiter=", ">
+          <text variable="title" text-case="title"/>
+          <names variable="author">
+            <name initialize-with="." form="short" delimiter="-"/>
+          </names>
+          <text macro="date-legal"/>
+          <text macro="container-legal"/>
           <text macro="access"/>
         </group>
       </if>
-      <else-if type="bill">
-        <!-- Currently designed to handle bills, resolutions, hearings, rederal reports. -->
+      <else>
+        <!-- For `bill`: currently designed to handle bills, resolutions, federal reports. -->
+        <!-- For `legislation`: currently designed to handle statutes, codified regulations, executive orders. -->
         <group delimiter=". ">
           <group delimiter=", ">
             <choose>
-              <if variable="number container-title" match="none">
-                <!-- If no number or container-title, then assume it is a hearing -->
-                <text variable="title" font-style="italic"/>
-              </if>
-              <else>
+              <if type="bill legal_case legislation" match="any">
                 <text variable="title"/>
-              </else>
+              </if>
+              <else-if type="hearing">
+                <text variable="title" font-style="italic"/>
+              </else-if>
             </choose>
             <group delimiter=" ">
               <text macro="container-legal"/>
               <text macro="date-legal"/>
               <choose>
-                <if variable="number container-title" match="none">
-                  <!-- If no number or container-title, then assume it is a hearing -->
+                <if type="hearing">
                   <names variable="author" prefix="(testimony of " suffix=")">
-                    <name and="text" delimiter=", "/>
+                    <!-- TODO: Localize this with the hearing term. -->
+                    <name and="symbol" delimiter=", "/>
                   </names>
                 </if>
-                <else>
+                <else-if type="bill legislation" match="any">
+                  <!-- `legislation`: For uncodified regulations, assume future code section is in status. -->
                   <text variable="status" prefix="(" suffix=")"/>
-                </else>
+                </else-if>
               </choose>
             </group>
             <text variable="references"/>
           </group>
           <text macro="access"/>
         </group>
-      </else-if>
-      <else-if type="legislation">
-        <!-- Currently designed to handle statutes, codified regulations, executive orders.
-              For uncodified regulations, assume future code section is in status. -->
-        <group delimiter=". ">
-          <group delimiter=", ">
-            <text variable="title"/>
-            <group delimiter=" ">
-              <text macro="container-legal"/>
-              <text macro="date-legal"/>
-              <text variable="status" prefix="(" suffix=")"/>
-            </group>
-            <text variable="references"/>
-          </group>
-          <text macro="access"/>
-        </group>
-      </else-if>
-      <else-if type="treaty">
-        <!-- APA generally defers to Bluebook for legal citations, but diverges without
-              explanation for treaty items. The Bluebook format that was used in APA 6th
-              ed. is used here. -->
-        <group delimiter=", ">
-          <text variable="title" text-case="title"/>
-          <names variable="author">
-            <name initialize-with="." form="short" delimiter="-"/>
-          </names>
-          <text macro="date-legal"/>
-          <text macro="container-legal"/>
-          <text macro="access"/>
-        </group>
-      </else-if>
+      </else>
     </choose>
   </macro>
   <macro name="date-legal">
@@ -1714,7 +1434,7 @@
           </choose>
         </group>
       </if>
-      <else-if type="bill legislation" match="any">
+      <else-if type="bill legislation hearing" match="any">
         <group prefix="(" suffix=")" delimiter=" ">
           <group delimiter=" ">
             <date variable="original-date">
@@ -1743,8 +1463,7 @@
                 <text variable="volume"/>
                 <text variable="container-title"/>
                 <group delimiter=" ">
-                  <!-- Change to label variable="section" as that becomes available -->
-                  <text term="section" form="symbol"/>
+                  <label variable="section" form="symbol"/>
                   <text variable="section"/>
                 </group>
                 <choose>
@@ -1761,8 +1480,7 @@
               <group delimiter=" ">
                 <choose>
                   <if is-numeric="number">
-                    <!-- Replace with label variable="number" if that becomes available -->
-                    <text term="issue" form="short" text-case="capitalize-first"/>
+                    <label variable="number" form="short" text-case="capitalize-first"/>
                   </if>
                 </choose>
                 <text variable="number"/>
@@ -1778,8 +1496,7 @@
             <group delimiter=" ">
               <choose>
                 <if variable="chapter-number container-title" match="none">
-                  <!-- Replace with label variable="number" as that becomes available -->
-                  <text term="issue" form="short"/>
+                  <label variable="number" form="short"/>
                 </if>
               </choose>
               <text variable="number"/>
@@ -1814,8 +1531,7 @@
               <choose>
                 <if variable="section">
                   <group delimiter=" ">
-                    <!-- Change to label variable="section" as that becomes available -->
-                    <text term="section" form="symbol"/>
+                    <label variable="section" form="symbol"/>
                     <text variable="section"/>
                   </group>
                 </if>
@@ -1837,8 +1553,7 @@
             </if>
             <else>
               <group delimiter=" ">
-                <!-- Replace with label variable="number" if that becomes available -->
-                <text term="issue" form="short" text-case="capitalize-first"/>
+                <label variable="number" form="short" text-case="capitalize-first"/>
                 <text variable="number"/>
               </group>
             </else>
@@ -1864,7 +1579,7 @@
     <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 macro="date-bib" sort="ascending"/>
       <key variable="status"/>
     </sort>
     <layout prefix="(" suffix=")" delimiter="; ">
@@ -1879,7 +1594,7 @@
     <sort>
       <key macro="author-bib"/>
       <key macro="date-sort-group"/>
-      <key macro="date-sort-date" sort="ascending"/>
+      <key macro="date-bib" sort="ascending"/>
       <key variable="status"/>
       <key macro="title"/>
     </sort>
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 5c314996729..d3dffbf8ff1 100644
--- a/buildres/csl/csl-styles/apa-no-doi-no-issue.csl
+++ b/buildres/csl/csl-styles/apa-no-doi-no-issue.csl
@@ -1102,14 +1102,8 @@
     <!--This should be localized -->
     <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"/>
+        <text term="original-work-published" text-case="capitalize-first"/>
       </else>
     </choose>
   </macro>
diff --git a/buildres/csl/csl-styles/apa-no-initials.csl b/buildres/csl/csl-styles/apa-no-initials.csl
index b844044aa18..4fc744b9b03 100644
--- a/buildres/csl/csl-styles/apa-no-initials.csl
+++ b/buildres/csl/csl-styles/apa-no-initials.csl
@@ -35,295 +35,60 @@
       <term name="circa" form="short">ca.</term>
       <term name="bc"> B.C.E.</term>
       <term name="ad"> C.E.</term>
-      <term name="letter">personal communication</term>
-      <term name="letter" form="short">letter</term>
       <term name="issue" form="long">
         <single>issue</single>
         <multiple>issues</multiple>
       </term>
-    </terms>
-  </locale>
-  <locale xml:lang="af">
-    <terms>
-      <term name="letter">persoonlike kommunikasie</term>
-      <term name="letter" form="short">brief</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ar">
-    <terms>
-      <term name="letter">اتصال شخصي</term>
-      <term name="letter" form="short">خطاب</term>
-    </terms>
-  </locale>
-  <locale xml:lang="bg">
-    <terms>
-      <term name="letter">лична комуникация</term>
-      <term name="letter" form="short">писмо</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ca">
-    <terms>
-      <term name="letter">comunicació personal</term>
-      <term name="letter" form="short">carta</term>
-    </terms>
-  </locale>
-  <locale xml:lang="cs">
-    <terms>
-      <term name="letter">osobní komunikace</term>
-      <term name="letter" form="short">dopis</term>
-    </terms>
-  </locale>
-  <locale xml:lang="cy">
-    <terms>
-      <term name="letter">cyfathrebu personol</term>
-      <term name="letter" form="short">llythyr</term>
+      <term name="software">computer software</term>
     </terms>
   </locale>
   <locale xml:lang="da">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikation</term>
-      <term name="letter" form="short">brev</term>
     </terms>
   </locale>
   <locale xml:lang="de">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">persönliche Kommunikation</term>
-      <term name="letter" form="short">Brief</term>
-    </terms>
-  </locale>
-  <locale xml:lang="el">
-    <terms>
-      <term name="letter">προσωπική επικοινωνία</term>
-      <term name="letter" form="short">επιστολή</term>
     </terms>
   </locale>
   <locale xml:lang="es">
     <terms>
       <term name="from">de</term>
-      <term name="letter">comunicación personal</term>
-      <term name="letter" form="short">carta</term>
-    </terms>
-  </locale>
-  <locale xml:lang="et">
-    <terms>
-      <term name="letter">isiklik suhtlus</term>
-      <term name="letter" form="short">kiri</term>
-    </terms>
-  </locale>
-  <locale xml:lang="eu">
-    <terms>
-      <term name="letter">komunikazio pertsonala</term>
-      <term name="letter" form="short">gutuna</term>
-    </terms>
-  </locale>
-  <locale xml:lang="fa">
-    <terms>
-      <term name="letter">ارتباط شخصی</term>
-      <term name="letter" form="short">نامه</term>
-    </terms>
-  </locale>
-  <locale xml:lang="fi">
-    <terms>
-      <term name="letter">henkilökohtainen viestintä</term>
-      <term name="letter" form="short">kirje</term>
     </terms>
   </locale>
   <locale xml:lang="fr">
     <terms>
-      <term name="letter">communication personnelle</term>
-      <term name="letter" form="short">lettre</term>
       <term name="editor" form="short">
         <single>éd.</single>
         <multiple>éds.</multiple>
       </term>
     </terms>
   </locale>
-  <locale xml:lang="he">
-    <terms>
-      <term name="letter">תקשורת אישית</term>
-      <term name="letter" form="short">מכתב</term>
-    </terms>
-  </locale>
-  <locale xml:lang="hr">
-    <terms>
-      <term name="letter">osobna komunikacija</term>
-      <term name="letter" form="short">pismo</term>
-    </terms>
-  </locale>
-  <locale xml:lang="hu">
-    <terms>
-      <term name="letter">személyes kommunikáció</term>
-      <term name="letter" form="short">levél</term>
-    </terms>
-  </locale>
-  <locale xml:lang="id">
-    <terms>
-      <term name="letter">komunikasi pribadi</term>
-      <term name="letter" form="short">surat</term>
-    </terms>
-  </locale>
-  <locale xml:lang="is">
-    <terms>
-      <term name="letter">persónuleg samskipti</term>
-      <term name="letter" form="short">bréf</term>
-    </terms>
-  </locale>
-  <locale xml:lang="it">
-    <terms>
-      <term name="letter">comunicazione personale</term>
-      <term name="letter" form="short">lettera</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ja">
-    <terms>
-      <term name="letter">個人的なやり取り</term>
-      <term name="letter" form="short">手紙</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ko">
-    <terms>
-      <term name="letter">개인 서신</term>
-      <term name="letter" form="short">편지</term>
-    </terms>
-  </locale>
-  <locale xml:lang="la">
-    <terms>
-      <term name="letter"/>
-      <term name="letter" form="short">epistula</term>
-    </terms>
-  </locale>
-  <locale xml:lang="lt">
-    <terms>
-      <term name="letter">communicationis personalis</term>
-      <term name="letter" form="short"/>
-    </terms>
-  </locale>
-  <locale xml:lang="lv">
-    <terms>
-      <term name="letter">personīga komunikācija</term>
-      <term name="letter" form="short">vēstule</term>
-    </terms>
-  </locale>
-  <locale xml:lang="mn">
-    <terms>
-      <term name="letter">хувийн харилцаа холбоо</term>
-      <term name="letter" form="short">захиа</term>
-    </terms>
-  </locale>
   <locale xml:lang="nb">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikasjon</term>
-      <term name="letter" form="short">brev</term>
     </terms>
   </locale>
   <locale xml:lang="nl">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">persoonlijke communicatie</term>
-      <term name="letter" form="short">brief</term>
     </terms>
   </locale>
   <locale xml:lang="nn">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikasjon</term>
-      <term name="letter" form="short">brev</term>
-    </terms>
-  </locale>
-  <locale xml:lang="pl">
-    <terms>
-      <term name="letter">osobista komunikacja</term>
-      <term name="letter" form="short">list</term>
-    </terms>
-  </locale>
-  <locale xml:lang="pt">
-    <terms>
-      <term name="letter">comunicação pessoal</term>
-      <term name="letter" form="short">carta</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ro">
-    <terms>
-      <term name="letter">comunicare personală</term>
-      <term name="letter" form="short">scrisoare</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ru">
-    <terms>
-      <term name="letter">личная переписка</term>
-      <term name="letter" form="short">письмо</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sk">
-    <terms>
-      <term name="letter">osobná komunikácia</term>
-      <term name="letter" form="short">list</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sl">
-    <terms>
-      <term name="letter">osebna komunikacija</term>
-      <term name="letter" form="short">pismo</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sr">
-    <terms>
-      <term name="letter">лична комуникација</term>
-      <term name="letter" form="short">писмо</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sv">
-    <terms>
-      <term name="letter">personlig kommunikation</term>
-      <term name="letter" form="short">brev</term>
-    </terms>
-  </locale>
-  <locale xml:lang="th">
-    <terms>
-      <term name="letter">การสื่อสารส่วนบุคคล</term>
-      <term name="letter" form="short">จดหมาย</term>
-    </terms>
-  </locale>
-  <locale xml:lang="tr">
-    <terms>
-      <term name="letter">kişisel iletişim</term>
-      <term name="letter" form="short">mektup</term>
-    </terms>
-  </locale>
-  <locale xml:lang="uk">
-    <terms>
-      <term name="letter">особисте спілкування</term>
-      <term name="letter" form="short">лист</term>
-    </terms>
-  </locale>
-  <locale xml:lang="vi">
-    <terms>
-      <term name="letter">giao tiếp cá nhân</term>
-      <term name="letter" form="short">thư</term>
-    </terms>
-  </locale>
-  <locale xml:lang="zh-CN">
-    <terms>
-      <term name="letter">的私人交流</term>
-      <term name="letter" form="short">信函</term>
-    </terms>
-  </locale>
-  <locale xml:lang="zh-TW">
-    <terms>
-      <term name="letter">私人通訊</term>
-      <term name="letter" form="short">信函</term>
     </terms>
   </locale>
   <!-- General categories of item types:
        Periodical: article-journal article-magazine article-newspaper post-weblog review review-book
        Periodical or Booklike: paper-conference
-       Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure
+       Booklike: article book broadcast chapter classic collection dataset document
+                 entry entry-dictionary entry-encyclopedia event figure
                  graphic interview manuscript map motion_picture musical_score pamphlet patent
-                 personal_communication report song speech thesis post webpage
-       Legal: bill legal_case legislation treaty
+                 performance periodical personal_communication post report
+                 software song speech standard thesis webpage
+       Legal: bill hearing legal_case legislation regulation treaty
   -->
   <!-- APA references contain four parts: author, date, title, source -->
   <macro name="author-bib">
@@ -399,8 +164,7 @@
                   <text macro="title-intext"/>
                 </substitute>
               </names>
-              <!-- Replace with term="personal-communication" if that becomes available -->
-              <text term="letter"/>
+              <text term="personal-communication"/>
             </group>
           </if>
           <else>
@@ -501,9 +265,6 @@
       </else>
     </choose>
   </macro>
-  <macro name="date-sort-date">
-    <date variable="issued" form="numeric"/>
-  </macro>
   <macro name="date-intext">
     <choose>
       <if variable="issued">
@@ -641,23 +402,23 @@
       <if variable="title" match="none">
         <text macro="bracketed-intext" prefix="[" suffix="]"/>
       </if>
+      <else-if type="hearing">
+        <!-- Hearings are italicized -->
+        <text variable="title" form="short" font-style="italic" text-case="title"/>
+      </else-if>
       <else-if type="bill">
-        <!-- If a bill has no number or container-title, assume it is a hearing; italic -->
+        <!-- Bills are not italicized and substitute bill number if no title. -->
         <choose>
-          <if variable="number container-title" match="none">
-            <text variable="title" form="short" font-style="italic" text-case="title"/>
-          </if>
-          <else-if variable="title">
+          <if variable="title">
             <text variable="title" form="short" text-case="title"/>
-          </else-if>
+          </if>
           <else>
             <group delimiter=" ">
               <text variable="genre"/>
               <group delimiter=" ">
                 <choose>
                   <if variable="chapter-number container-title" match="none">
-                    <!-- Replace with label variable="number" as that becomes available -->
-                    <text term="issue" form="short"/>
+                    <label variable="number" form="short"/>
                   </if>
                 </choose>
                 <text variable="number"/>
@@ -700,13 +461,11 @@
                 <text variable="genre" text-case="capitalize-first"/>
               </if>
               <else>
-                <!-- This should be localized -->
-                <text value="patent" text-case="capitalize-first"/>
+                <text term="patent" text-case="capitalize-first"/>
               </else>
             </choose>
             <group delimiter=" ">
-              <!-- Replace with label variable="number" if that becomes available -->
-              <text term="issue" form="short" text-case="capitalize-first"/>
+              <label variable="number" form="short" text-case="capitalize-first"/>
               <text variable="number"/>
             </group>
           </group>
@@ -884,7 +643,7 @@
                           <text variable="medium" text-case="capitalize-first"/>
                         </else-if>
                         <else>
-                          <text term="letter" form="short" text-case="capitalize-first"/>
+                          <text term="letter" text-case="capitalize-first"/>
                         </else>
                       </choose>
                     </if>
@@ -894,7 +653,7 @@
                           <text variable="medium" text-case="capitalize-first"/>
                         </if>
                         <else>
-                          <text term="letter" form="short" text-case="capitalize-first"/>
+                          <text term="letter" text-case="capitalize-first"/>
                         </else>
                       </choose>
                     </else>
@@ -995,14 +754,7 @@
                 </if>
               </choose>
             </if>
-            <else-if type="book">
-              <choose>
-                <if variable="version" match="none">
-                  <text macro="format"/>
-                </if>
-              </choose>
-            </else-if>
-            <else-if type="report" match="none">
+            <else-if type="report software" match="none">
               <text macro="format"/>
             </else-if>
           </choose>
@@ -1014,8 +766,10 @@
     <group prefix="[" suffix="]">
       <choose>
         <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
-          <!-- This should be localized -->
-          <text macro="reviewed-title-intext" prefix="Review of "/>
+          <group delimiter=" ">
+            <text term="review-of" text-case="capitalize-first"/>
+            <text macro="reviewed-title-intext"/>
+          </group>
         </if>
         <else-if variable="interviewer" type="interview" match="any">
           <names variable="interviewer">
@@ -1036,7 +790,7 @@
                     <text variable="genre" text-case="capitalize-first"/>
                   </if>
                   <else>
-                    <text term="letter" form="short" text-case="capitalize-first"/>
+                    <text term="letter" text-case="capitalize-first"/>
                   </else>
                 </choose>
                 <names variable="recipient" delimiter=", ">
@@ -1067,7 +821,7 @@
             </if>
           </choose>
         </if>
-        <else-if type="book" variable="version" match="all">
+        <else-if type="software" match="all">
           <!-- For entries in mobile app reference works, place bracketed after the container-title -->
           <text macro="format"/>
         </else-if>
@@ -1175,8 +929,7 @@
             <text variable="genre" text-case="title"/>
             <choose>
               <if is-numeric="number">
-                <!-- Replace with label variable="number" if that becomes available -->
-                <text term="issue" form="short" text-case="capitalize-first"/>
+                <label variable="number" form="short" text-case="capitalize-first"/>
                 <text variable="number"/>
               </if>
               <else>
@@ -1225,8 +978,7 @@
     <choose>
       <if is-numeric="version">
         <group delimiter=" ">
-          <!-- replace with label variable="version" if that becomes available -->
-          <text term="version" text-case="capitalize-first"/>
+          <label variable="version" text-case="capitalize-first"/>
           <text variable="version"/>
         </group>
       </if>
@@ -1274,8 +1026,7 @@
         </if>
         <else>
           <group>
-            <!-- Replace with label variable="number-of-volumes" if that becomes available -->
-            <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+            <label variable="number-of-volumes" form="short" text-case="capitalize-first" suffix=" "/>
             <text term="page-range-delimiter" prefix="1"/>
             <number variable="number-of-volumes" form="numeric"/>
           </group>
@@ -1329,18 +1080,16 @@
         </group>
       </if>
       <!-- Generic labels for specific types -->
-      <!-- These should be localized when possible -->
       <else-if type="dataset">
-        <text value="Data set"/>
+        <text term="dataset"/>
       </else-if>
-      <else-if type="book" variable="version" match="all">
-        <!-- Replace with type="software" and term="software" as that becomes available -->
-        <text value="Computer software"/>
+      <else-if type="software">
+        <text term="software" text-case="capitalize-first"/>
       </else-if>
       <else-if type="interview personal_communication" match="any">
         <choose>
           <if variable="archive container-title DOI publisher URL" match="none">
-            <text term="letter" text-case="capitalize-first"/>
+            <text term="personal-communication" text-case="capitalize-first"/>
           </if>
           <else-if type="interview">
             <text term="interview" text-case="capitalize-first"/>
@@ -1348,7 +1097,7 @@
         </choose>
       </else-if>
       <else-if type="map">
-        <text value="Map"/>
+        <text term="map" text-case="capitalize-first"/>
       </else-if>
     </choose>
   </macro>
@@ -1361,18 +1110,16 @@
         <text variable="medium" text-case="capitalize-first"/>
       </else-if>
       <!-- Generic labels for specific types -->
-      <!-- These should be localized when possible -->
       <else-if type="dataset">
-        <text value="Data set"/>
+        <text term="dataset"/>
       </else-if>
-      <else-if type="book" variable="version" match="all">
-        <!-- Replace with type="software" and term="software" as that becomes available -->
-        <text value="Computer software"/>
+      <else-if type="software">
+        <text term="software" text-case="capitalize-first"/>
       </else-if>
       <else-if type="interview personal_communication" match="any">
         <choose>
           <if variable="archive container-title DOI publisher URL" match="none">
-            <text term="letter" text-case="capitalize-first"/>
+            <text term="personal-communication" text-case="capitalize-first"/>
           </if>
           <else-if type="interview">
             <text term="interview" text-case="capitalize-first"/>
@@ -1380,7 +1127,7 @@
         </choose>
       </else-if>
       <else-if type="map">
-        <text value="Map"/>
+        <text term="map"/>
       </else-if>
     </choose>
   </macro>
@@ -1598,7 +1345,7 @@
             </if>
             <else>
               <group delimiter=" ">
-                <text value="Original work published"/>
+                <text term="original-work-published" text-case="capitalize-first"/>
                 <choose>
                   <if is-uncertain-date="original-date">
                     <text term="circa" form="short"/>
@@ -1619,83 +1366,56 @@
   </macro>
   <!-- Legal citations have their own rules -->
   <macro name="legal-cites">
+    <!-- TODO: Add new item types -->
     <choose>
-      <if type="legal_case">
-        <group delimiter=". ">
-          <group delimiter=", ">
-            <text variable="title"/>
-            <group delimiter=" ">
-              <text macro="container-legal"/>
-              <text macro="date-legal"/>
-            </group>
-            <text variable="references"/>
-          </group>
+      <if type="treaty">
+        <!-- APA generally defers to Bluebook for legal citations, but diverges without
+             explanation for treaty items. The Bluebook format that was used in APA 6th
+             ed. is used here. -->
+        <group delimiter=", ">
+          <text variable="title" text-case="title"/>
+          <names variable="author">
+            <name initialize-with="." form="short" delimiter="-"/>
+          </names>
+          <text macro="date-legal"/>
+          <text macro="container-legal"/>
           <text macro="access"/>
         </group>
       </if>
-      <else-if type="bill">
-        <!-- Currently designed to handle bills, resolutions, hearings, rederal reports. -->
+      <else>
+        <!-- For `bill`: currently designed to handle bills, resolutions, federal reports. -->
+        <!-- For `legislation`: currently designed to handle statutes, codified regulations, executive orders. -->
         <group delimiter=". ">
           <group delimiter=", ">
             <choose>
-              <if variable="number container-title" match="none">
-                <!-- If no number or container-title, then assume it is a hearing -->
-                <text variable="title" font-style="italic"/>
-              </if>
-              <else>
+              <if type="bill legal_case legislation" match="any">
                 <text variable="title"/>
-              </else>
+              </if>
+              <else-if type="hearing">
+                <text variable="title" font-style="italic"/>
+              </else-if>
             </choose>
             <group delimiter=" ">
               <text macro="container-legal"/>
               <text macro="date-legal"/>
               <choose>
-                <if variable="number container-title" match="none">
-                  <!-- If no number or container-title, then assume it is a hearing -->
+                <if type="hearing">
                   <names variable="author" prefix="(testimony of " suffix=")">
+                    <!-- TODO: Localize this with the hearing term. -->
                     <name and="symbol" delimiter=", "/>
                   </names>
                 </if>
-                <else>
+                <else-if type="bill legislation" match="any">
+                  <!-- `legislation`: For uncodified regulations, assume future code section is in status. -->
                   <text variable="status" prefix="(" suffix=")"/>
-                </else>
+                </else-if>
               </choose>
             </group>
             <text variable="references"/>
           </group>
           <text macro="access"/>
         </group>
-      </else-if>
-      <else-if type="legislation">
-        <!-- Currently designed to handle statutes, codified regulations, executive orders.
-             For uncodified regulations, assume future code section is in status. -->
-        <group delimiter=". ">
-          <group delimiter=", ">
-            <text variable="title"/>
-            <group delimiter=" ">
-              <text macro="container-legal"/>
-              <text macro="date-legal"/>
-              <text variable="status" prefix="(" suffix=")"/>
-            </group>
-            <text variable="references"/>
-          </group>
-          <text macro="access"/>
-        </group>
-      </else-if>
-      <else-if type="treaty">
-        <!-- APA generally defers to Bluebook for legal citations, but diverges without
-             explanation for treaty items. The Bluebook format that was used in APA 6th
-             ed. is used here. -->
-        <group delimiter=", ">
-          <text variable="title" text-case="title"/>
-          <names variable="author">
-            <name initialize="false" initialize-with="." form="short" delimiter="-"/>
-          </names>
-          <text macro="date-legal"/>
-          <text macro="container-legal"/>
-          <text macro="access"/>
-        </group>
-      </else-if>
+      </else>
     </choose>
   </macro>
   <macro name="date-legal">
@@ -1714,7 +1434,7 @@
           </choose>
         </group>
       </if>
-      <else-if type="bill legislation" match="any">
+      <else-if type="bill legislation hearing" match="any">
         <group prefix="(" suffix=")" delimiter=" ">
           <group delimiter=" ">
             <date variable="original-date">
@@ -1743,8 +1463,7 @@
                 <text variable="volume"/>
                 <text variable="container-title"/>
                 <group delimiter=" ">
-                  <!-- Change to label variable="section" as that becomes available -->
-                  <text term="section" form="symbol"/>
+                  <label variable="section" form="symbol"/>
                   <text variable="section"/>
                 </group>
                 <choose>
@@ -1761,8 +1480,7 @@
               <group delimiter=" ">
                 <choose>
                   <if is-numeric="number">
-                    <!-- Replace with label variable="number" if that becomes available -->
-                    <text term="issue" form="short" text-case="capitalize-first"/>
+                    <label variable="number" form="short" text-case="capitalize-first"/>
                   </if>
                 </choose>
                 <text variable="number"/>
@@ -1778,8 +1496,7 @@
             <group delimiter=" ">
               <choose>
                 <if variable="chapter-number container-title" match="none">
-                  <!-- Replace with label variable="number" as that becomes available -->
-                  <text term="issue" form="short"/>
+                  <label variable="number" form="short"/>
                 </if>
               </choose>
               <text variable="number"/>
@@ -1814,8 +1531,7 @@
               <choose>
                 <if variable="section">
                   <group delimiter=" ">
-                    <!-- Change to label variable="section" as that becomes available -->
-                    <text term="section" form="symbol"/>
+                    <label variable="section" form="symbol"/>
                     <text variable="section"/>
                   </group>
                 </if>
@@ -1837,8 +1553,7 @@
             </if>
             <else>
               <group delimiter=" ">
-                <!-- Replace with label variable="number" if that becomes available -->
-                <text term="issue" form="short" text-case="capitalize-first"/>
+                <label variable="number" form="short" text-case="capitalize-first"/>
                 <text variable="number"/>
               </group>
             </else>
@@ -1864,7 +1579,7 @@
     <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 macro="date-bib" sort="ascending"/>
       <key variable="status"/>
     </sort>
     <layout prefix="(" suffix=")" delimiter="; ">
@@ -1879,7 +1594,7 @@
     <sort>
       <key macro="author-bib"/>
       <key macro="date-sort-group"/>
-      <key macro="date-sort-date" sort="ascending"/>
+      <key macro="date-bib" sort="ascending"/>
       <key variable="status"/>
       <key macro="title"/>
     </sort>
diff --git a/buildres/csl/csl-styles/apa-numeric-superscript-brackets.csl b/buildres/csl/csl-styles/apa-numeric-superscript-brackets.csl
index d9134ea1435..53c2f69fed4 100644
--- a/buildres/csl/csl-styles/apa-numeric-superscript-brackets.csl
+++ b/buildres/csl/csl-styles/apa-numeric-superscript-brackets.csl
@@ -36,51 +36,30 @@
       <term name="circa" form="short">ca.</term>
       <term name="bc"> B.C.E.</term>
       <term name="ad"> C.E.</term>
-      <term name="letter">personal communication</term>
-      <term name="letter" form="short">letter</term>
       <term name="issue" form="long">
         <single>issue</single>
         <multiple>issues</multiple>
       </term>
-    </terms>
-  </locale>
-  <locale xml:lang="af">
-    <terms>
-      <term name="letter">persoonlike kommunikasie</term>
-      <term name="letter" form="short">brief</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ar">
-    <terms>
-      <term name="letter">اتصال شخصي</term>
-      <term name="letter" form="short">خطاب</term>
+      <term name="software">computer software</term>
     </terms>
   </locale>
   <locale xml:lang="da">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikation</term>
-      <term name="letter" form="short">brev</term>
     </terms>
   </locale>
   <locale xml:lang="de">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">persönliche Kommunikation</term>
-      <term name="letter" form="short">Brief</term>
     </terms>
   </locale>
   <locale xml:lang="es">
     <terms>
       <term name="from">de</term>
-      <term name="letter">comunicación personal</term>
-      <term name="letter" form="short">carta</term>
     </terms>
   </locale>
   <locale xml:lang="fr">
     <terms>
-      <term name="letter">communication personnelle</term>
-      <term name="letter" form="short">lettre</term>
       <term name="editor" form="short">
         <single>éd.</single>
         <multiple>éds.</multiple>
@@ -90,43 +69,27 @@
   <locale xml:lang="nb">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikasjon</term>
-      <term name="letter" form="short">brev</term>
     </terms>
   </locale>
   <locale xml:lang="nl">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">persoonlijke communicatie</term>
-      <term name="letter" form="short">brief</term>
     </terms>
   </locale>
   <locale xml:lang="nn">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikasjon</term>
-      <term name="letter" form="short">brev</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ru">
-    <terms>
-      <term name="letter">личная переписка</term>
-      <term name="letter" form="short">письмо</term>
-    </terms>
-  </locale>
-  <locale xml:lang="tr">
-    <terms>
-      <term name="letter">kişisel iletişim</term>
-      <term name="letter" form="short">mektup</term>
     </terms>
   </locale>
   <!-- General categories of item types:
        Periodical: article-journal article-magazine article-newspaper post-weblog review review-book
        Periodical or Booklike: paper-conference
-       Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure
+       Booklike: article book broadcast chapter classic collection dataset document
+                 entry entry-dictionary entry-encyclopedia event figure
                  graphic interview manuscript map motion_picture musical_score pamphlet patent
-                 personal_communication report song speech thesis post webpage
-       Legal: bill legal_case legislation treaty
+                 performance periodical personal_communication post report
+                 software song speech standard thesis webpage
+       Legal: bill hearing legal_case legislation regulation treaty
   -->
   <!-- APA references contain four parts: author, date, title, source -->
   <macro name="author-bib">
@@ -202,8 +165,7 @@
                   <text macro="title-intext"/>
                 </substitute>
               </names>
-              <!-- Replace with term="personal-communication" if that becomes available -->
-              <text term="letter"/>
+              <text term="personal-communication"/>
             </group>
           </if>
           <else>
@@ -304,9 +266,6 @@
       </else>
     </choose>
   </macro>
-  <macro name="date-sort-date">
-    <date variable="issued" form="numeric"/>
-  </macro>
   <macro name="date-intext">
     <choose>
       <if variable="issued">
@@ -444,23 +403,23 @@
       <if variable="title" match="none">
         <text macro="bracketed-intext" prefix="[" suffix="]"/>
       </if>
+      <else-if type="hearing">
+        <!-- Hearings are italicized -->
+        <text variable="title" form="short" font-style="italic" text-case="title"/>
+      </else-if>
       <else-if type="bill">
-        <!-- If a bill has no number or container-title, assume it is a hearing; italic and title case -->
+        <!-- Bills are not italicized and substitute bill number if no title. -->
         <choose>
-          <if variable="number container-title" match="none">
-            <text variable="title" form="short" font-style="italic" text-case="title"/>
+          <if variable="title">
+            <text variable="title" form="short" text-case="title"/>
           </if>
-          <else-if variable="title">
-            <text variable="title" form="short"/>
-          </else-if>
           <else>
             <group delimiter=" ">
               <text variable="genre"/>
               <group delimiter=" ">
                 <choose>
                   <if variable="chapter-number container-title" match="none">
-                    <!-- Replace with label variable="number" as that becomes available -->
-                    <text term="issue" form="short"/>
+                    <label variable="number" form="short"/>
                   </if>
                 </choose>
                 <text variable="number"/>
@@ -503,13 +462,11 @@
                 <text variable="genre" text-case="capitalize-first"/>
               </if>
               <else>
-                <!-- This should be localized -->
-                <text value="patent" text-case="capitalize-first"/>
+                <text term="patent" text-case="capitalize-first"/>
               </else>
             </choose>
             <group delimiter=" ">
-              <!-- Replace with label variable="number" if that becomes available -->
-              <text term="issue" form="short" text-case="capitalize-first"/>
+              <label variable="number" form="short" text-case="capitalize-first"/>
               <text variable="number"/>
             </group>
           </group>
@@ -687,7 +644,7 @@
                           <text variable="medium" text-case="capitalize-first"/>
                         </else-if>
                         <else>
-                          <text term="letter" form="short" text-case="capitalize-first"/>
+                          <text term="letter" text-case="capitalize-first"/>
                         </else>
                       </choose>
                     </if>
@@ -697,7 +654,7 @@
                           <text variable="medium" text-case="capitalize-first"/>
                         </if>
                         <else>
-                          <text term="letter" form="short" text-case="capitalize-first"/>
+                          <text term="letter" text-case="capitalize-first"/>
                         </else>
                       </choose>
                     </else>
@@ -798,14 +755,7 @@
                 </if>
               </choose>
             </if>
-            <else-if type="book">
-              <choose>
-                <if variable="version" match="none">
-                  <text macro="format"/>
-                </if>
-              </choose>
-            </else-if>
-            <else-if type="report" match="none">
+            <else-if type="report software" match="none">
               <text macro="format"/>
             </else-if>
           </choose>
@@ -817,8 +767,10 @@
     <group prefix="[" suffix="]">
       <choose>
         <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
-          <!-- This should be localized -->
-          <text macro="reviewed-title-intext" prefix="Review of "/>
+          <group delimiter=" ">
+            <text term="review-of" text-case="capitalize-first"/>
+            <text macro="reviewed-title-intext"/>
+          </group>
         </if>
         <else-if variable="interviewer" type="interview" match="any">
           <names variable="interviewer">
@@ -839,7 +791,7 @@
                     <text variable="genre" text-case="capitalize-first"/>
                   </if>
                   <else>
-                    <text term="letter" form="short" text-case="capitalize-first"/>
+                    <text term="letter" text-case="capitalize-first"/>
                   </else>
                 </choose>
                 <names variable="recipient" delimiter=", ">
@@ -870,7 +822,7 @@
             </if>
           </choose>
         </if>
-        <else-if type="book" variable="version" match="all">
+        <else-if type="software" match="all">
           <!-- For entries in mobile app reference works, place bracketed after the container-title -->
           <text macro="format"/>
         </else-if>
@@ -978,8 +930,7 @@
             <text variable="genre" text-case="title"/>
             <choose>
               <if is-numeric="number">
-                <!-- Replace with label variable="number" if that becomes available -->
-                <text term="issue" form="short" text-case="capitalize-first"/>
+                <label variable="number" form="short" text-case="capitalize-first"/>
                 <text variable="number"/>
               </if>
               <else>
@@ -1028,8 +979,7 @@
     <choose>
       <if is-numeric="version">
         <group delimiter=" ">
-          <!-- replace with label variable="version" if that becomes available -->
-          <text term="version" text-case="capitalize-first"/>
+          <label variable="version" text-case="capitalize-first"/>
           <text variable="version"/>
         </group>
       </if>
@@ -1077,8 +1027,7 @@
         </if>
         <else>
           <group>
-            <!-- Replace with label variable="number-of-volumes" if that becomes available -->
-            <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+            <label variable="number-of-volumes" form="short" text-case="capitalize-first" suffix=" "/>
             <text term="page-range-delimiter" prefix="1"/>
             <number variable="number-of-volumes" form="numeric"/>
           </group>
@@ -1132,18 +1081,16 @@
         </group>
       </if>
       <!-- Generic labels for specific types -->
-      <!-- These should be localized when possible -->
       <else-if type="dataset">
-        <text value="Data set"/>
+        <text term="dataset"/>
       </else-if>
-      <else-if type="book" variable="version" match="all">
-        <!-- Replace with type="software" and term="software" as that becomes available -->
-        <text value="Computer software"/>
+      <else-if type="software">
+        <text term="software" text-case="capitalize-first"/>
       </else-if>
       <else-if type="interview personal_communication" match="any">
         <choose>
           <if variable="archive container-title DOI publisher URL" match="none">
-            <text term="letter" text-case="capitalize-first"/>
+            <text term="personal-communication" text-case="capitalize-first"/>
           </if>
           <else-if type="interview">
             <text term="interview" text-case="capitalize-first"/>
@@ -1151,7 +1098,7 @@
         </choose>
       </else-if>
       <else-if type="map">
-        <text value="Map"/>
+        <text term="map" text-case="capitalize-first"/>
       </else-if>
     </choose>
   </macro>
@@ -1164,18 +1111,16 @@
         <text variable="medium" text-case="capitalize-first"/>
       </else-if>
       <!-- Generic labels for specific types -->
-      <!-- These should be localized when possible -->
       <else-if type="dataset">
-        <text value="Data set"/>
+        <text term="dataset"/>
       </else-if>
-      <else-if type="book" variable="version" match="all">
-        <!-- Replace with type="software" and term="software" as that becomes available -->
-        <text value="Computer software"/>
+      <else-if type="software">
+        <text term="software" text-case="capitalize-first"/>
       </else-if>
       <else-if type="interview personal_communication" match="any">
         <choose>
           <if variable="archive container-title DOI publisher URL" match="none">
-            <text term="letter" text-case="capitalize-first"/>
+            <text term="personal-communication" text-case="capitalize-first"/>
           </if>
           <else-if type="interview">
             <text term="interview" text-case="capitalize-first"/>
@@ -1183,7 +1128,7 @@
         </choose>
       </else-if>
       <else-if type="map">
-        <text value="Map"/>
+        <text term="map"/>
       </else-if>
     </choose>
   </macro>
@@ -1401,7 +1346,7 @@
             </if>
             <else>
               <group delimiter=" ">
-                <text value="Original work published"/>
+                <text term="original-work-published" text-case="capitalize-first"/>
                 <choose>
                   <if is-uncertain-date="original-date">
                     <text term="circa" form="short"/>
@@ -1422,83 +1367,56 @@
   </macro>
   <!-- Legal citations have their own rules -->
   <macro name="legal-cites">
+    <!-- TODO: Add new item types -->
     <choose>
-      <if type="legal_case">
-        <group delimiter=". ">
-          <group delimiter=", ">
-            <text variable="title"/>
-            <group delimiter=" ">
-              <text macro="container-legal"/>
-              <text macro="date-legal"/>
-            </group>
-            <text variable="references"/>
-          </group>
+      <if type="treaty">
+        <!-- APA generally defers to Bluebook for legal citations, but diverges without
+             explanation for treaty items. The Bluebook format that was used in APA 6th
+             ed. is used here. -->
+        <group delimiter=", ">
+          <text variable="title" text-case="title"/>
+          <names variable="author">
+            <name initialize-with="." form="short" delimiter="-"/>
+          </names>
+          <text macro="date-legal"/>
+          <text macro="container-legal"/>
           <text macro="access"/>
         </group>
       </if>
-      <else-if type="bill">
-        <!-- Currently designed to handle bills, resolutions, hearings, rederal reports. -->
+      <else>
+        <!-- For `bill`: currently designed to handle bills, resolutions, federal reports. -->
+        <!-- For `legislation`: currently designed to handle statutes, codified regulations, executive orders. -->
         <group delimiter=". ">
           <group delimiter=", ">
             <choose>
-              <if variable="number container-title" match="none">
-                <!-- If no number or container-title, then assume it is a hearing -->
-                <text variable="title" font-style="italic"/>
-              </if>
-              <else>
+              <if type="bill legal_case legislation" match="any">
                 <text variable="title"/>
-              </else>
+              </if>
+              <else-if type="hearing">
+                <text variable="title" font-style="italic"/>
+              </else-if>
             </choose>
             <group delimiter=" ">
               <text macro="container-legal"/>
               <text macro="date-legal"/>
               <choose>
-                <if variable="number container-title" match="none">
-                  <!-- If no number or container-title, then assume it is a hearing -->
+                <if type="hearing">
                   <names variable="author" prefix="(testimony of " suffix=")">
+                    <!-- TODO: Localize this with the hearing term. -->
                     <name and="symbol" delimiter=", "/>
                   </names>
                 </if>
-                <else>
+                <else-if type="bill legislation" match="any">
+                  <!-- `legislation`: For uncodified regulations, assume future code section is in status. -->
                   <text variable="status" prefix="(" suffix=")"/>
-                </else>
+                </else-if>
               </choose>
             </group>
             <text variable="references"/>
           </group>
           <text macro="access"/>
         </group>
-      </else-if>
-      <else-if type="legislation">
-        <!-- Currently designed to handle statutes, codified regulations, executive orders.
-             For uncodified regulations, assume future code section is in status. -->
-        <group delimiter=". ">
-          <group delimiter=", ">
-            <text variable="title"/>
-            <group delimiter=" ">
-              <text macro="container-legal"/>
-              <text macro="date-legal"/>
-              <text variable="status" prefix="(" suffix=")"/>
-            </group>
-            <text variable="references"/>
-          </group>
-          <text macro="access"/>
-        </group>
-      </else-if>
-      <else-if type="treaty">
-        <!-- APA generally defers to Bluebook for legal citations, but diverges without
-             explanation for treaty items. The Bluebook format that was used in APA 6th
-             ed. is used here. -->
-        <group delimiter=", ">
-          <text variable="title" text-case="title"/>
-          <names variable="author">
-            <name initialize-with="." form="short" delimiter="-"/>
-          </names>
-          <text macro="date-legal"/>
-          <text macro="container-legal"/>
-          <text macro="access"/>
-        </group>
-      </else-if>
+      </else>
     </choose>
   </macro>
   <macro name="date-legal">
@@ -1517,7 +1435,7 @@
           </choose>
         </group>
       </if>
-      <else-if type="bill legislation" match="any">
+      <else-if type="bill legislation hearing" match="any">
         <group prefix="(" suffix=")" delimiter=" ">
           <group delimiter=" ">
             <date variable="original-date">
@@ -1546,8 +1464,7 @@
                 <text variable="volume"/>
                 <text variable="container-title"/>
                 <group delimiter=" ">
-                  <!-- Change to label variable="section" as that becomes available -->
-                  <text term="section" form="symbol"/>
+                  <label variable="section" form="symbol"/>
                   <text variable="section"/>
                 </group>
                 <choose>
@@ -1564,8 +1481,7 @@
               <group delimiter=" ">
                 <choose>
                   <if is-numeric="number">
-                    <!-- Replace with label variable="number" if that becomes available -->
-                    <text term="issue" form="short" text-case="capitalize-first"/>
+                    <label variable="number" form="short" text-case="capitalize-first"/>
                   </if>
                 </choose>
                 <text variable="number"/>
@@ -1581,8 +1497,7 @@
             <group delimiter=" ">
               <choose>
                 <if variable="chapter-number container-title" match="none">
-                  <!-- Replace with label variable="number" as that becomes available -->
-                  <text term="issue" form="short"/>
+                  <label variable="number" form="short"/>
                 </if>
               </choose>
               <text variable="number"/>
@@ -1617,8 +1532,7 @@
               <choose>
                 <if variable="section">
                   <group delimiter=" ">
-                    <!-- Change to label variable="section" as that becomes available -->
-                    <text term="section" form="symbol"/>
+                    <label variable="section" form="symbol"/>
                     <text variable="section"/>
                   </group>
                 </if>
@@ -1640,8 +1554,7 @@
             </if>
             <else>
               <group delimiter=" ">
-                <!-- Replace with label variable="number" if that becomes available -->
-                <text term="issue" form="short" text-case="capitalize-first"/>
+                <label variable="number" form="short" text-case="capitalize-first"/>
                 <text variable="number"/>
               </group>
             </else>
diff --git a/buildres/csl/csl-styles/apa-numeric-superscript.csl b/buildres/csl/csl-styles/apa-numeric-superscript.csl
index 42b9b90fa01..5e15fc48c4f 100644
--- a/buildres/csl/csl-styles/apa-numeric-superscript.csl
+++ b/buildres/csl/csl-styles/apa-numeric-superscript.csl
@@ -36,51 +36,30 @@
       <term name="circa" form="short">ca.</term>
       <term name="bc"> B.C.E.</term>
       <term name="ad"> C.E.</term>
-      <term name="letter">personal communication</term>
-      <term name="letter" form="short">letter</term>
       <term name="issue" form="long">
         <single>issue</single>
         <multiple>issues</multiple>
       </term>
-    </terms>
-  </locale>
-  <locale xml:lang="af">
-    <terms>
-      <term name="letter">persoonlike kommunikasie</term>
-      <term name="letter" form="short">brief</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ar">
-    <terms>
-      <term name="letter">اتصال شخصي</term>
-      <term name="letter" form="short">خطاب</term>
+      <term name="software">computer software</term>
     </terms>
   </locale>
   <locale xml:lang="da">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikation</term>
-      <term name="letter" form="short">brev</term>
     </terms>
   </locale>
   <locale xml:lang="de">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">persönliche Kommunikation</term>
-      <term name="letter" form="short">Brief</term>
     </terms>
   </locale>
   <locale xml:lang="es">
     <terms>
       <term name="from">de</term>
-      <term name="letter">comunicación personal</term>
-      <term name="letter" form="short">carta</term>
     </terms>
   </locale>
   <locale xml:lang="fr">
     <terms>
-      <term name="letter">communication personnelle</term>
-      <term name="letter" form="short">lettre</term>
       <term name="editor" form="short">
         <single>éd.</single>
         <multiple>éds.</multiple>
@@ -90,43 +69,27 @@
   <locale xml:lang="nb">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikasjon</term>
-      <term name="letter" form="short">brev</term>
     </terms>
   </locale>
   <locale xml:lang="nl">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">persoonlijke communicatie</term>
-      <term name="letter" form="short">brief</term>
     </terms>
   </locale>
   <locale xml:lang="nn">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikasjon</term>
-      <term name="letter" form="short">brev</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ru">
-    <terms>
-      <term name="letter">личная переписка</term>
-      <term name="letter" form="short">письмо</term>
-    </terms>
-  </locale>
-  <locale xml:lang="tr">
-    <terms>
-      <term name="letter">kişisel iletişim</term>
-      <term name="letter" form="short">mektup</term>
     </terms>
   </locale>
   <!-- General categories of item types:
        Periodical: article-journal article-magazine article-newspaper post-weblog review review-book
        Periodical or Booklike: paper-conference
-       Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure
+       Booklike: article book broadcast chapter classic collection dataset document
+                 entry entry-dictionary entry-encyclopedia event figure
                  graphic interview manuscript map motion_picture musical_score pamphlet patent
-                 personal_communication report song speech thesis post webpage
-       Legal: bill legal_case legislation treaty
+                 performance periodical personal_communication post report
+                 software song speech standard thesis webpage
+       Legal: bill hearing legal_case legislation regulation treaty
   -->
   <!-- APA references contain four parts: author, date, title, source -->
   <macro name="author-bib">
@@ -202,8 +165,7 @@
                   <text macro="title-intext"/>
                 </substitute>
               </names>
-              <!-- Replace with term="personal-communication" if that becomes available -->
-              <text term="letter"/>
+              <text term="personal-communication"/>
             </group>
           </if>
           <else>
@@ -304,9 +266,6 @@
       </else>
     </choose>
   </macro>
-  <macro name="date-sort-date">
-    <date variable="issued" form="numeric"/>
-  </macro>
   <macro name="date-intext">
     <choose>
       <if variable="issued">
@@ -444,23 +403,23 @@
       <if variable="title" match="none">
         <text macro="bracketed-intext" prefix="[" suffix="]"/>
       </if>
+      <else-if type="hearing">
+        <!-- Hearings are italicized -->
+        <text variable="title" form="short" font-style="italic" text-case="title"/>
+      </else-if>
       <else-if type="bill">
-        <!-- If a bill has no number or container-title, assume it is a hearing; italic and title case -->
+        <!-- Bills are not italicized and substitute bill number if no title. -->
         <choose>
-          <if variable="number container-title" match="none">
-            <text variable="title" form="short" font-style="italic" text-case="title"/>
+          <if variable="title">
+            <text variable="title" form="short" text-case="title"/>
           </if>
-          <else-if variable="title">
-            <text variable="title" form="short"/>
-          </else-if>
           <else>
             <group delimiter=" ">
               <text variable="genre"/>
               <group delimiter=" ">
                 <choose>
                   <if variable="chapter-number container-title" match="none">
-                    <!-- Replace with label variable="number" as that becomes available -->
-                    <text term="issue" form="short"/>
+                    <label variable="number" form="short"/>
                   </if>
                 </choose>
                 <text variable="number"/>
@@ -503,13 +462,11 @@
                 <text variable="genre" text-case="capitalize-first"/>
               </if>
               <else>
-                <!-- This should be localized -->
-                <text value="patent" text-case="capitalize-first"/>
+                <text term="patent" text-case="capitalize-first"/>
               </else>
             </choose>
             <group delimiter=" ">
-              <!-- Replace with label variable="number" if that becomes available -->
-              <text term="issue" form="short" text-case="capitalize-first"/>
+              <label variable="number" form="short" text-case="capitalize-first"/>
               <text variable="number"/>
             </group>
           </group>
@@ -687,7 +644,7 @@
                           <text variable="medium" text-case="capitalize-first"/>
                         </else-if>
                         <else>
-                          <text term="letter" form="short" text-case="capitalize-first"/>
+                          <text term="letter" text-case="capitalize-first"/>
                         </else>
                       </choose>
                     </if>
@@ -697,7 +654,7 @@
                           <text variable="medium" text-case="capitalize-first"/>
                         </if>
                         <else>
-                          <text term="letter" form="short" text-case="capitalize-first"/>
+                          <text term="letter" text-case="capitalize-first"/>
                         </else>
                       </choose>
                     </else>
@@ -798,14 +755,7 @@
                 </if>
               </choose>
             </if>
-            <else-if type="book">
-              <choose>
-                <if variable="version" match="none">
-                  <text macro="format"/>
-                </if>
-              </choose>
-            </else-if>
-            <else-if type="report" match="none">
+            <else-if type="report software" match="none">
               <text macro="format"/>
             </else-if>
           </choose>
@@ -817,8 +767,10 @@
     <group prefix="[" suffix="]">
       <choose>
         <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
-          <!-- This should be localized -->
-          <text macro="reviewed-title-intext" prefix="Review of "/>
+          <group delimiter=" ">
+            <text term="review-of" text-case="capitalize-first"/>
+            <text macro="reviewed-title-intext"/>
+          </group>
         </if>
         <else-if variable="interviewer" type="interview" match="any">
           <names variable="interviewer">
@@ -839,7 +791,7 @@
                     <text variable="genre" text-case="capitalize-first"/>
                   </if>
                   <else>
-                    <text term="letter" form="short" text-case="capitalize-first"/>
+                    <text term="letter" text-case="capitalize-first"/>
                   </else>
                 </choose>
                 <names variable="recipient" delimiter=", ">
@@ -870,7 +822,7 @@
             </if>
           </choose>
         </if>
-        <else-if type="book" variable="version" match="all">
+        <else-if type="software" match="all">
           <!-- For entries in mobile app reference works, place bracketed after the container-title -->
           <text macro="format"/>
         </else-if>
@@ -978,8 +930,7 @@
             <text variable="genre" text-case="title"/>
             <choose>
               <if is-numeric="number">
-                <!-- Replace with label variable="number" if that becomes available -->
-                <text term="issue" form="short" text-case="capitalize-first"/>
+                <label variable="number" form="short" text-case="capitalize-first"/>
                 <text variable="number"/>
               </if>
               <else>
@@ -1028,8 +979,7 @@
     <choose>
       <if is-numeric="version">
         <group delimiter=" ">
-          <!-- replace with label variable="version" if that becomes available -->
-          <text term="version" text-case="capitalize-first"/>
+          <label variable="version" text-case="capitalize-first"/>
           <text variable="version"/>
         </group>
       </if>
@@ -1077,8 +1027,7 @@
         </if>
         <else>
           <group>
-            <!-- Replace with label variable="number-of-volumes" if that becomes available -->
-            <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+            <label variable="number-of-volumes" form="short" text-case="capitalize-first" suffix=" "/>
             <text term="page-range-delimiter" prefix="1"/>
             <number variable="number-of-volumes" form="numeric"/>
           </group>
@@ -1132,18 +1081,16 @@
         </group>
       </if>
       <!-- Generic labels for specific types -->
-      <!-- These should be localized when possible -->
       <else-if type="dataset">
-        <text value="Data set"/>
+        <text term="dataset"/>
       </else-if>
-      <else-if type="book" variable="version" match="all">
-        <!-- Replace with type="software" and term="software" as that becomes available -->
-        <text value="Computer software"/>
+      <else-if type="software">
+        <text term="software" text-case="capitalize-first"/>
       </else-if>
       <else-if type="interview personal_communication" match="any">
         <choose>
           <if variable="archive container-title DOI publisher URL" match="none">
-            <text term="letter" text-case="capitalize-first"/>
+            <text term="personal-communication" text-case="capitalize-first"/>
           </if>
           <else-if type="interview">
             <text term="interview" text-case="capitalize-first"/>
@@ -1151,7 +1098,7 @@
         </choose>
       </else-if>
       <else-if type="map">
-        <text value="Map"/>
+        <text term="map" text-case="capitalize-first"/>
       </else-if>
     </choose>
   </macro>
@@ -1164,18 +1111,16 @@
         <text variable="medium" text-case="capitalize-first"/>
       </else-if>
       <!-- Generic labels for specific types -->
-      <!-- These should be localized when possible -->
       <else-if type="dataset">
-        <text value="Data set"/>
+        <text term="dataset"/>
       </else-if>
-      <else-if type="book" variable="version" match="all">
-        <!-- Replace with type="software" and term="software" as that becomes available -->
-        <text value="Computer software"/>
+      <else-if type="software">
+        <text term="software" text-case="capitalize-first"/>
       </else-if>
       <else-if type="interview personal_communication" match="any">
         <choose>
           <if variable="archive container-title DOI publisher URL" match="none">
-            <text term="letter" text-case="capitalize-first"/>
+            <text term="personal-communication" text-case="capitalize-first"/>
           </if>
           <else-if type="interview">
             <text term="interview" text-case="capitalize-first"/>
@@ -1183,7 +1128,7 @@
         </choose>
       </else-if>
       <else-if type="map">
-        <text value="Map"/>
+        <text term="map"/>
       </else-if>
     </choose>
   </macro>
@@ -1401,7 +1346,7 @@
             </if>
             <else>
               <group delimiter=" ">
-                <text value="Original work published"/>
+                <text term="original-work-published" text-case="capitalize-first"/>
                 <choose>
                   <if is-uncertain-date="original-date">
                     <text term="circa" form="short"/>
@@ -1422,83 +1367,56 @@
   </macro>
   <!-- Legal citations have their own rules -->
   <macro name="legal-cites">
+    <!-- TODO: Add new item types -->
     <choose>
-      <if type="legal_case">
-        <group delimiter=". ">
-          <group delimiter=", ">
-            <text variable="title"/>
-            <group delimiter=" ">
-              <text macro="container-legal"/>
-              <text macro="date-legal"/>
-            </group>
-            <text variable="references"/>
-          </group>
+      <if type="treaty">
+        <!-- APA generally defers to Bluebook for legal citations, but diverges without
+             explanation for treaty items. The Bluebook format that was used in APA 6th
+             ed. is used here. -->
+        <group delimiter=", ">
+          <text variable="title" text-case="title"/>
+          <names variable="author">
+            <name initialize-with="." form="short" delimiter="-"/>
+          </names>
+          <text macro="date-legal"/>
+          <text macro="container-legal"/>
           <text macro="access"/>
         </group>
       </if>
-      <else-if type="bill">
-        <!-- Currently designed to handle bills, resolutions, hearings, rederal reports. -->
+      <else>
+        <!-- For `bill`: currently designed to handle bills, resolutions, federal reports. -->
+        <!-- For `legislation`: currently designed to handle statutes, codified regulations, executive orders. -->
         <group delimiter=". ">
           <group delimiter=", ">
             <choose>
-              <if variable="number container-title" match="none">
-                <!-- If no number or container-title, then assume it is a hearing -->
-                <text variable="title" font-style="italic"/>
-              </if>
-              <else>
+              <if type="bill legal_case legislation" match="any">
                 <text variable="title"/>
-              </else>
+              </if>
+              <else-if type="hearing">
+                <text variable="title" font-style="italic"/>
+              </else-if>
             </choose>
             <group delimiter=" ">
               <text macro="container-legal"/>
               <text macro="date-legal"/>
               <choose>
-                <if variable="number container-title" match="none">
-                  <!-- If no number or container-title, then assume it is a hearing -->
+                <if type="hearing">
                   <names variable="author" prefix="(testimony of " suffix=")">
+                    <!-- TODO: Localize this with the hearing term. -->
                     <name and="symbol" delimiter=", "/>
                   </names>
                 </if>
-                <else>
+                <else-if type="bill legislation" match="any">
+                  <!-- `legislation`: For uncodified regulations, assume future code section is in status. -->
                   <text variable="status" prefix="(" suffix=")"/>
-                </else>
+                </else-if>
               </choose>
             </group>
             <text variable="references"/>
           </group>
           <text macro="access"/>
         </group>
-      </else-if>
-      <else-if type="legislation">
-        <!-- Currently designed to handle statutes, codified regulations, executive orders.
-             For uncodified regulations, assume future code section is in status. -->
-        <group delimiter=". ">
-          <group delimiter=", ">
-            <text variable="title"/>
-            <group delimiter=" ">
-              <text macro="container-legal"/>
-              <text macro="date-legal"/>
-              <text variable="status" prefix="(" suffix=")"/>
-            </group>
-            <text variable="references"/>
-          </group>
-          <text macro="access"/>
-        </group>
-      </else-if>
-      <else-if type="treaty">
-        <!-- APA generally defers to Bluebook for legal citations, but diverges without
-             explanation for treaty items. The Bluebook format that was used in APA 6th
-             ed. is used here. -->
-        <group delimiter=", ">
-          <text variable="title" text-case="title"/>
-          <names variable="author">
-            <name initialize-with="." form="short" delimiter="-"/>
-          </names>
-          <text macro="date-legal"/>
-          <text macro="container-legal"/>
-          <text macro="access"/>
-        </group>
-      </else-if>
+      </else>
     </choose>
   </macro>
   <macro name="date-legal">
@@ -1517,7 +1435,7 @@
           </choose>
         </group>
       </if>
-      <else-if type="bill legislation" match="any">
+      <else-if type="bill legislation hearing" match="any">
         <group prefix="(" suffix=")" delimiter=" ">
           <group delimiter=" ">
             <date variable="original-date">
@@ -1546,8 +1464,7 @@
                 <text variable="volume"/>
                 <text variable="container-title"/>
                 <group delimiter=" ">
-                  <!-- Change to label variable="section" as that becomes available -->
-                  <text term="section" form="symbol"/>
+                  <label variable="section" form="symbol"/>
                   <text variable="section"/>
                 </group>
                 <choose>
@@ -1564,8 +1481,7 @@
               <group delimiter=" ">
                 <choose>
                   <if is-numeric="number">
-                    <!-- Replace with label variable="number" if that becomes available -->
-                    <text term="issue" form="short" text-case="capitalize-first"/>
+                    <label variable="number" form="short" text-case="capitalize-first"/>
                   </if>
                 </choose>
                 <text variable="number"/>
@@ -1581,8 +1497,7 @@
             <group delimiter=" ">
               <choose>
                 <if variable="chapter-number container-title" match="none">
-                  <!-- Replace with label variable="number" as that becomes available -->
-                  <text term="issue" form="short"/>
+                  <label variable="number" form="short"/>
                 </if>
               </choose>
               <text variable="number"/>
@@ -1617,8 +1532,7 @@
               <choose>
                 <if variable="section">
                   <group delimiter=" ">
-                    <!-- Change to label variable="section" as that becomes available -->
-                    <text term="section" form="symbol"/>
+                    <label variable="section" form="symbol"/>
                     <text variable="section"/>
                   </group>
                 </if>
@@ -1640,8 +1554,7 @@
             </if>
             <else>
               <group delimiter=" ">
-                <!-- Replace with label variable="number" if that becomes available -->
-                <text term="issue" form="short" text-case="capitalize-first"/>
+                <label variable="number" form="short" text-case="capitalize-first"/>
                 <text variable="number"/>
               </group>
             </else>
diff --git a/buildres/csl/csl-styles/apa-old-doi-prefix.csl b/buildres/csl/csl-styles/apa-old-doi-prefix.csl
index 2ede590912d..f25d36c0971 100644
--- a/buildres/csl/csl-styles/apa-old-doi-prefix.csl
+++ b/buildres/csl/csl-styles/apa-old-doi-prefix.csl
@@ -1096,14 +1096,8 @@
     <!--This should be localized -->
     <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"/>
+        <text term="original-work-published" text-case="capitalize-first"/>
       </else>
     </choose>
   </macro>
diff --git a/buildres/csl/csl-styles/apa-single-spaced.csl b/buildres/csl/csl-styles/apa-single-spaced.csl
index be5cd95adbd..2793e6ac5eb 100644
--- a/buildres/csl/csl-styles/apa-single-spaced.csl
+++ b/buildres/csl/csl-styles/apa-single-spaced.csl
@@ -35,295 +35,60 @@
       <term name="circa" form="short">ca.</term>
       <term name="bc"> B.C.E.</term>
       <term name="ad"> C.E.</term>
-      <term name="letter">personal communication</term>
-      <term name="letter" form="short">letter</term>
       <term name="issue" form="long">
         <single>issue</single>
         <multiple>issues</multiple>
       </term>
-    </terms>
-  </locale>
-  <locale xml:lang="af">
-    <terms>
-      <term name="letter">persoonlike kommunikasie</term>
-      <term name="letter" form="short">brief</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ar">
-    <terms>
-      <term name="letter">اتصال شخصي</term>
-      <term name="letter" form="short">خطاب</term>
-    </terms>
-  </locale>
-  <locale xml:lang="bg">
-    <terms>
-      <term name="letter">лична комуникация</term>
-      <term name="letter" form="short">писмо</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ca">
-    <terms>
-      <term name="letter">comunicació personal</term>
-      <term name="letter" form="short">carta</term>
-    </terms>
-  </locale>
-  <locale xml:lang="cs">
-    <terms>
-      <term name="letter">osobní komunikace</term>
-      <term name="letter" form="short">dopis</term>
-    </terms>
-  </locale>
-  <locale xml:lang="cy">
-    <terms>
-      <term name="letter">cyfathrebu personol</term>
-      <term name="letter" form="short">llythyr</term>
+      <term name="software">computer software</term>
     </terms>
   </locale>
   <locale xml:lang="da">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikation</term>
-      <term name="letter" form="short">brev</term>
     </terms>
   </locale>
   <locale xml:lang="de">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">persönliche Kommunikation</term>
-      <term name="letter" form="short">Brief</term>
-    </terms>
-  </locale>
-  <locale xml:lang="el">
-    <terms>
-      <term name="letter">προσωπική επικοινωνία</term>
-      <term name="letter" form="short">επιστολή</term>
     </terms>
   </locale>
   <locale xml:lang="es">
     <terms>
       <term name="from">de</term>
-      <term name="letter">comunicación personal</term>
-      <term name="letter" form="short">carta</term>
-    </terms>
-  </locale>
-  <locale xml:lang="et">
-    <terms>
-      <term name="letter">isiklik suhtlus</term>
-      <term name="letter" form="short">kiri</term>
-    </terms>
-  </locale>
-  <locale xml:lang="eu">
-    <terms>
-      <term name="letter">komunikazio pertsonala</term>
-      <term name="letter" form="short">gutuna</term>
-    </terms>
-  </locale>
-  <locale xml:lang="fa">
-    <terms>
-      <term name="letter">ارتباط شخصی</term>
-      <term name="letter" form="short">نامه</term>
-    </terms>
-  </locale>
-  <locale xml:lang="fi">
-    <terms>
-      <term name="letter">henkilökohtainen viestintä</term>
-      <term name="letter" form="short">kirje</term>
     </terms>
   </locale>
   <locale xml:lang="fr">
     <terms>
-      <term name="letter">communication personnelle</term>
-      <term name="letter" form="short">lettre</term>
       <term name="editor" form="short">
         <single>éd.</single>
         <multiple>éds.</multiple>
       </term>
     </terms>
   </locale>
-  <locale xml:lang="he">
-    <terms>
-      <term name="letter">תקשורת אישית</term>
-      <term name="letter" form="short">מכתב</term>
-    </terms>
-  </locale>
-  <locale xml:lang="hr">
-    <terms>
-      <term name="letter">osobna komunikacija</term>
-      <term name="letter" form="short">pismo</term>
-    </terms>
-  </locale>
-  <locale xml:lang="hu">
-    <terms>
-      <term name="letter">személyes kommunikáció</term>
-      <term name="letter" form="short">levél</term>
-    </terms>
-  </locale>
-  <locale xml:lang="id">
-    <terms>
-      <term name="letter">komunikasi pribadi</term>
-      <term name="letter" form="short">surat</term>
-    </terms>
-  </locale>
-  <locale xml:lang="is">
-    <terms>
-      <term name="letter">persónuleg samskipti</term>
-      <term name="letter" form="short">bréf</term>
-    </terms>
-  </locale>
-  <locale xml:lang="it">
-    <terms>
-      <term name="letter">comunicazione personale</term>
-      <term name="letter" form="short">lettera</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ja">
-    <terms>
-      <term name="letter">個人的なやり取り</term>
-      <term name="letter" form="short">手紙</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ko">
-    <terms>
-      <term name="letter">개인 서신</term>
-      <term name="letter" form="short">편지</term>
-    </terms>
-  </locale>
-  <locale xml:lang="la">
-    <terms>
-      <term name="letter"/>
-      <term name="letter" form="short">epistula</term>
-    </terms>
-  </locale>
-  <locale xml:lang="lt">
-    <terms>
-      <term name="letter">communicationis personalis</term>
-      <term name="letter" form="short"/>
-    </terms>
-  </locale>
-  <locale xml:lang="lv">
-    <terms>
-      <term name="letter">personīga komunikācija</term>
-      <term name="letter" form="short">vēstule</term>
-    </terms>
-  </locale>
-  <locale xml:lang="mn">
-    <terms>
-      <term name="letter">хувийн харилцаа холбоо</term>
-      <term name="letter" form="short">захиа</term>
-    </terms>
-  </locale>
   <locale xml:lang="nb">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikasjon</term>
-      <term name="letter" form="short">brev</term>
     </terms>
   </locale>
   <locale xml:lang="nl">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">persoonlijke communicatie</term>
-      <term name="letter" form="short">brief</term>
     </terms>
   </locale>
   <locale xml:lang="nn">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikasjon</term>
-      <term name="letter" form="short">brev</term>
-    </terms>
-  </locale>
-  <locale xml:lang="pl">
-    <terms>
-      <term name="letter">osobista komunikacja</term>
-      <term name="letter" form="short">list</term>
-    </terms>
-  </locale>
-  <locale xml:lang="pt">
-    <terms>
-      <term name="letter">comunicação pessoal</term>
-      <term name="letter" form="short">carta</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ro">
-    <terms>
-      <term name="letter">comunicare personală</term>
-      <term name="letter" form="short">scrisoare</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ru">
-    <terms>
-      <term name="letter">личная переписка</term>
-      <term name="letter" form="short">письмо</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sk">
-    <terms>
-      <term name="letter">osobná komunikácia</term>
-      <term name="letter" form="short">list</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sl">
-    <terms>
-      <term name="letter">osebna komunikacija</term>
-      <term name="letter" form="short">pismo</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sr">
-    <terms>
-      <term name="letter">лична комуникација</term>
-      <term name="letter" form="short">писмо</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sv">
-    <terms>
-      <term name="letter">personlig kommunikation</term>
-      <term name="letter" form="short">brev</term>
-    </terms>
-  </locale>
-  <locale xml:lang="th">
-    <terms>
-      <term name="letter">การสื่อสารส่วนบุคคล</term>
-      <term name="letter" form="short">จดหมาย</term>
-    </terms>
-  </locale>
-  <locale xml:lang="tr">
-    <terms>
-      <term name="letter">kişisel iletişim</term>
-      <term name="letter" form="short">mektup</term>
-    </terms>
-  </locale>
-  <locale xml:lang="uk">
-    <terms>
-      <term name="letter">особисте спілкування</term>
-      <term name="letter" form="short">лист</term>
-    </terms>
-  </locale>
-  <locale xml:lang="vi">
-    <terms>
-      <term name="letter">giao tiếp cá nhân</term>
-      <term name="letter" form="short">thư</term>
-    </terms>
-  </locale>
-  <locale xml:lang="zh-CN">
-    <terms>
-      <term name="letter">的私人交流</term>
-      <term name="letter" form="short">信函</term>
-    </terms>
-  </locale>
-  <locale xml:lang="zh-TW">
-    <terms>
-      <term name="letter">私人通訊</term>
-      <term name="letter" form="short">信函</term>
     </terms>
   </locale>
   <!-- General categories of item types:
-        Periodical: article-journal article-magazine article-newspaper post-weblog review review-book
-        Periodical or Booklike: paper-conference
-        Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure
-                  graphic interview manuscript map motion_picture musical_score pamphlet patent
-                  personal_communication report song speech thesis post webpage
-        Legal: bill legal_case legislation treaty
+       Periodical: article-journal article-magazine article-newspaper post-weblog review review-book
+       Periodical or Booklike: paper-conference
+       Booklike: article book broadcast chapter classic collection dataset document
+                 entry entry-dictionary entry-encyclopedia event figure
+                 graphic interview manuscript map motion_picture musical_score pamphlet patent
+                 performance periodical personal_communication post report
+                 software song speech standard thesis webpage
+       Legal: bill hearing legal_case legislation regulation treaty
   -->
   <!-- APA references contain four parts: author, date, title, source -->
   <macro name="author-bib">
@@ -399,8 +164,7 @@
                   <text macro="title-intext"/>
                 </substitute>
               </names>
-              <!-- Replace with term="personal-communication" if that becomes available -->
-              <text term="letter"/>
+              <text term="personal-communication"/>
             </group>
           </if>
           <else>
@@ -501,9 +265,6 @@
       </else>
     </choose>
   </macro>
-  <macro name="date-sort-date">
-    <date variable="issued" form="numeric"/>
-  </macro>
   <macro name="date-intext">
     <choose>
       <if variable="issued">
@@ -641,23 +402,23 @@
       <if variable="title" match="none">
         <text macro="bracketed-intext" prefix="[" suffix="]"/>
       </if>
+      <else-if type="hearing">
+        <!-- Hearings are italicized -->
+        <text variable="title" form="short" font-style="italic" text-case="title"/>
+      </else-if>
       <else-if type="bill">
-        <!-- If a bill has no number or container-title, assume it is a hearing; italic -->
+        <!-- Bills are not italicized and substitute bill number if no title. -->
         <choose>
-          <if variable="number container-title" match="none">
-            <text variable="title" form="short" font-style="italic" text-case="title"/>
-          </if>
-          <else-if variable="title">
+          <if variable="title">
             <text variable="title" form="short" text-case="title"/>
-          </else-if>
+          </if>
           <else>
             <group delimiter=" ">
               <text variable="genre"/>
               <group delimiter=" ">
                 <choose>
                   <if variable="chapter-number container-title" match="none">
-                    <!-- Replace with label variable="number" as that becomes available -->
-                    <text term="issue" form="short"/>
+                    <label variable="number" form="short"/>
                   </if>
                 </choose>
                 <text variable="number"/>
@@ -700,13 +461,11 @@
                 <text variable="genre" text-case="capitalize-first"/>
               </if>
               <else>
-                <!-- This should be localized -->
-                <text value="patent" text-case="capitalize-first"/>
+                <text term="patent" text-case="capitalize-first"/>
               </else>
             </choose>
             <group delimiter=" ">
-              <!-- Replace with label variable="number" if that becomes available -->
-              <text term="issue" form="short" text-case="capitalize-first"/>
+              <label variable="number" form="short" text-case="capitalize-first"/>
               <text variable="number"/>
             </group>
           </group>
@@ -884,7 +643,7 @@
                           <text variable="medium" text-case="capitalize-first"/>
                         </else-if>
                         <else>
-                          <text term="letter" form="short" text-case="capitalize-first"/>
+                          <text term="letter" text-case="capitalize-first"/>
                         </else>
                       </choose>
                     </if>
@@ -894,7 +653,7 @@
                           <text variable="medium" text-case="capitalize-first"/>
                         </if>
                         <else>
-                          <text term="letter" form="short" text-case="capitalize-first"/>
+                          <text term="letter" text-case="capitalize-first"/>
                         </else>
                       </choose>
                     </else>
@@ -995,14 +754,7 @@
                 </if>
               </choose>
             </if>
-            <else-if type="book">
-              <choose>
-                <if variable="version" match="none">
-                  <text macro="format"/>
-                </if>
-              </choose>
-            </else-if>
-            <else-if type="report" match="none">
+            <else-if type="report software" match="none">
               <text macro="format"/>
             </else-if>
           </choose>
@@ -1014,8 +766,10 @@
     <group prefix="[" suffix="]">
       <choose>
         <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
-          <!-- This should be localized -->
-          <text macro="reviewed-title-intext" prefix="Review of "/>
+          <group delimiter=" ">
+            <text term="review-of" text-case="capitalize-first"/>
+            <text macro="reviewed-title-intext"/>
+          </group>
         </if>
         <else-if variable="interviewer" type="interview" match="any">
           <names variable="interviewer">
@@ -1036,7 +790,7 @@
                     <text variable="genre" text-case="capitalize-first"/>
                   </if>
                   <else>
-                    <text term="letter" form="short" text-case="capitalize-first"/>
+                    <text term="letter" text-case="capitalize-first"/>
                   </else>
                 </choose>
                 <names variable="recipient" delimiter=", ">
@@ -1067,7 +821,7 @@
             </if>
           </choose>
         </if>
-        <else-if type="book" variable="version" match="all">
+        <else-if type="software" match="all">
           <!-- For entries in mobile app reference works, place bracketed after the container-title -->
           <text macro="format"/>
         </else-if>
@@ -1175,8 +929,7 @@
             <text variable="genre" text-case="title"/>
             <choose>
               <if is-numeric="number">
-                <!-- Replace with label variable="number" if that becomes available -->
-                <text term="issue" form="short" text-case="capitalize-first"/>
+                <label variable="number" form="short" text-case="capitalize-first"/>
                 <text variable="number"/>
               </if>
               <else>
@@ -1225,8 +978,7 @@
     <choose>
       <if is-numeric="version">
         <group delimiter=" ">
-          <!-- replace with label variable="version" if that becomes available -->
-          <text term="version" text-case="capitalize-first"/>
+          <label variable="version" text-case="capitalize-first"/>
           <text variable="version"/>
         </group>
       </if>
@@ -1274,8 +1026,7 @@
         </if>
         <else>
           <group>
-            <!-- Replace with label variable="number-of-volumes" if that becomes available -->
-            <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+            <label variable="number-of-volumes" form="short" text-case="capitalize-first" suffix=" "/>
             <text term="page-range-delimiter" prefix="1"/>
             <number variable="number-of-volumes" form="numeric"/>
           </group>
@@ -1329,18 +1080,16 @@
         </group>
       </if>
       <!-- Generic labels for specific types -->
-      <!-- These should be localized when possible -->
       <else-if type="dataset">
-        <text value="Data set"/>
+        <text term="dataset"/>
       </else-if>
-      <else-if type="book" variable="version" match="all">
-        <!-- Replace with type="software" and term="software" as that becomes available -->
-        <text value="Computer software"/>
+      <else-if type="software">
+        <text term="software" text-case="capitalize-first"/>
       </else-if>
       <else-if type="interview personal_communication" match="any">
         <choose>
           <if variable="archive container-title DOI publisher URL" match="none">
-            <text term="letter" text-case="capitalize-first"/>
+            <text term="personal-communication" text-case="capitalize-first"/>
           </if>
           <else-if type="interview">
             <text term="interview" text-case="capitalize-first"/>
@@ -1348,7 +1097,7 @@
         </choose>
       </else-if>
       <else-if type="map">
-        <text value="Map"/>
+        <text term="map" text-case="capitalize-first"/>
       </else-if>
     </choose>
   </macro>
@@ -1361,18 +1110,16 @@
         <text variable="medium" text-case="capitalize-first"/>
       </else-if>
       <!-- Generic labels for specific types -->
-      <!-- These should be localized when possible -->
       <else-if type="dataset">
-        <text value="Data set"/>
+        <text term="dataset"/>
       </else-if>
-      <else-if type="book" variable="version" match="all">
-        <!-- Replace with type="software" and term="software" as that becomes available -->
-        <text value="Computer software"/>
+      <else-if type="software">
+        <text term="software" text-case="capitalize-first"/>
       </else-if>
       <else-if type="interview personal_communication" match="any">
         <choose>
           <if variable="archive container-title DOI publisher URL" match="none">
-            <text term="letter" text-case="capitalize-first"/>
+            <text term="personal-communication" text-case="capitalize-first"/>
           </if>
           <else-if type="interview">
             <text term="interview" text-case="capitalize-first"/>
@@ -1380,7 +1127,7 @@
         </choose>
       </else-if>
       <else-if type="map">
-        <text value="Map"/>
+        <text term="map"/>
       </else-if>
     </choose>
   </macro>
@@ -1598,7 +1345,7 @@
             </if>
             <else>
               <group delimiter=" ">
-                <text value="Original work published"/>
+                <text term="original-work-published" text-case="capitalize-first"/>
                 <choose>
                   <if is-uncertain-date="original-date">
                     <text term="circa" form="short"/>
@@ -1619,83 +1366,56 @@
   </macro>
   <!-- Legal citations have their own rules -->
   <macro name="legal-cites">
+    <!-- TODO: Add new item types -->
     <choose>
-      <if type="legal_case">
-        <group delimiter=". ">
-          <group delimiter=", ">
-            <text variable="title"/>
-            <group delimiter=" ">
-              <text macro="container-legal"/>
-              <text macro="date-legal"/>
-            </group>
-            <text variable="references"/>
-          </group>
+      <if type="treaty">
+        <!-- APA generally defers to Bluebook for legal citations, but diverges without
+             explanation for treaty items. The Bluebook format that was used in APA 6th
+             ed. is used here. -->
+        <group delimiter=", ">
+          <text variable="title" text-case="title"/>
+          <names variable="author">
+            <name initialize-with="." form="short" delimiter="-"/>
+          </names>
+          <text macro="date-legal"/>
+          <text macro="container-legal"/>
           <text macro="access"/>
         </group>
       </if>
-      <else-if type="bill">
-        <!-- Currently designed to handle bills, resolutions, hearings, rederal reports. -->
+      <else>
+        <!-- For `bill`: currently designed to handle bills, resolutions, federal reports. -->
+        <!-- For `legislation`: currently designed to handle statutes, codified regulations, executive orders. -->
         <group delimiter=". ">
           <group delimiter=", ">
             <choose>
-              <if variable="number container-title" match="none">
-                <!-- If no number or container-title, then assume it is a hearing -->
-                <text variable="title" font-style="italic"/>
-              </if>
-              <else>
+              <if type="bill legal_case legislation" match="any">
                 <text variable="title"/>
-              </else>
+              </if>
+              <else-if type="hearing">
+                <text variable="title" font-style="italic"/>
+              </else-if>
             </choose>
             <group delimiter=" ">
               <text macro="container-legal"/>
               <text macro="date-legal"/>
               <choose>
-                <if variable="number container-title" match="none">
-                  <!-- If no number or container-title, then assume it is a hearing -->
+                <if type="hearing">
                   <names variable="author" prefix="(testimony of " suffix=")">
+                    <!-- TODO: Localize this with the hearing term. -->
                     <name and="symbol" delimiter=", "/>
                   </names>
                 </if>
-                <else>
+                <else-if type="bill legislation" match="any">
+                  <!-- `legislation`: For uncodified regulations, assume future code section is in status. -->
                   <text variable="status" prefix="(" suffix=")"/>
-                </else>
+                </else-if>
               </choose>
             </group>
             <text variable="references"/>
           </group>
           <text macro="access"/>
         </group>
-      </else-if>
-      <else-if type="legislation">
-        <!-- Currently designed to handle statutes, codified regulations, executive orders.
-              For uncodified regulations, assume future code section is in status. -->
-        <group delimiter=". ">
-          <group delimiter=", ">
-            <text variable="title"/>
-            <group delimiter=" ">
-              <text macro="container-legal"/>
-              <text macro="date-legal"/>
-              <text variable="status" prefix="(" suffix=")"/>
-            </group>
-            <text variable="references"/>
-          </group>
-          <text macro="access"/>
-        </group>
-      </else-if>
-      <else-if type="treaty">
-        <!-- APA generally defers to Bluebook for legal citations, but diverges without
-              explanation for treaty items. The Bluebook format that was used in APA 6th
-              ed. is used here. -->
-        <group delimiter=", ">
-          <text variable="title" text-case="title"/>
-          <names variable="author">
-            <name initialize-with="." form="short" delimiter="-"/>
-          </names>
-          <text macro="date-legal"/>
-          <text macro="container-legal"/>
-          <text macro="access"/>
-        </group>
-      </else-if>
+      </else>
     </choose>
   </macro>
   <macro name="date-legal">
@@ -1714,7 +1434,7 @@
           </choose>
         </group>
       </if>
-      <else-if type="bill legislation" match="any">
+      <else-if type="bill legislation hearing" match="any">
         <group prefix="(" suffix=")" delimiter=" ">
           <group delimiter=" ">
             <date variable="original-date">
@@ -1743,8 +1463,7 @@
                 <text variable="volume"/>
                 <text variable="container-title"/>
                 <group delimiter=" ">
-                  <!-- Change to label variable="section" as that becomes available -->
-                  <text term="section" form="symbol"/>
+                  <label variable="section" form="symbol"/>
                   <text variable="section"/>
                 </group>
                 <choose>
@@ -1761,8 +1480,7 @@
               <group delimiter=" ">
                 <choose>
                   <if is-numeric="number">
-                    <!-- Replace with label variable="number" if that becomes available -->
-                    <text term="issue" form="short" text-case="capitalize-first"/>
+                    <label variable="number" form="short" text-case="capitalize-first"/>
                   </if>
                 </choose>
                 <text variable="number"/>
@@ -1778,8 +1496,7 @@
             <group delimiter=" ">
               <choose>
                 <if variable="chapter-number container-title" match="none">
-                  <!-- Replace with label variable="number" as that becomes available -->
-                  <text term="issue" form="short"/>
+                  <label variable="number" form="short"/>
                 </if>
               </choose>
               <text variable="number"/>
@@ -1814,8 +1531,7 @@
               <choose>
                 <if variable="section">
                   <group delimiter=" ">
-                    <!-- Change to label variable="section" as that becomes available -->
-                    <text term="section" form="symbol"/>
+                    <label variable="section" form="symbol"/>
                     <text variable="section"/>
                   </group>
                 </if>
@@ -1837,8 +1553,7 @@
             </if>
             <else>
               <group delimiter=" ">
-                <!-- Replace with label variable="number" if that becomes available -->
-                <text term="issue" form="short" text-case="capitalize-first"/>
+                <label variable="number" form="short" text-case="capitalize-first"/>
                 <text variable="number"/>
               </group>
             </else>
@@ -1864,7 +1579,7 @@
     <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 macro="date-bib" sort="ascending"/>
       <key variable="status"/>
     </sort>
     <layout prefix="(" suffix=")" delimiter="; ">
@@ -1879,7 +1594,7 @@
     <sort>
       <key macro="author-bib"/>
       <key macro="date-sort-group"/>
-      <key macro="date-sort-date" sort="ascending"/>
+      <key macro="date-bib" sort="ascending"/>
       <key variable="status"/>
       <key macro="title"/>
     </sort>
diff --git a/buildres/csl/csl-styles/apa-with-abstract.csl b/buildres/csl/csl-styles/apa-with-abstract.csl
index 9524f1928d5..d16cd2cbcf7 100644
--- a/buildres/csl/csl-styles/apa-with-abstract.csl
+++ b/buildres/csl/csl-styles/apa-with-abstract.csl
@@ -35,295 +35,60 @@
       <term name="circa" form="short">ca.</term>
       <term name="bc"> B.C.E.</term>
       <term name="ad"> C.E.</term>
-      <term name="letter">personal communication</term>
-      <term name="letter" form="short">letter</term>
       <term name="issue" form="long">
         <single>issue</single>
         <multiple>issues</multiple>
       </term>
-    </terms>
-  </locale>
-  <locale xml:lang="af">
-    <terms>
-      <term name="letter">persoonlike kommunikasie</term>
-      <term name="letter" form="short">brief</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ar">
-    <terms>
-      <term name="letter">اتصال شخصي</term>
-      <term name="letter" form="short">خطاب</term>
-    </terms>
-  </locale>
-  <locale xml:lang="bg">
-    <terms>
-      <term name="letter">лична комуникация</term>
-      <term name="letter" form="short">писмо</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ca">
-    <terms>
-      <term name="letter">comunicació personal</term>
-      <term name="letter" form="short">carta</term>
-    </terms>
-  </locale>
-  <locale xml:lang="cs">
-    <terms>
-      <term name="letter">osobní komunikace</term>
-      <term name="letter" form="short">dopis</term>
-    </terms>
-  </locale>
-  <locale xml:lang="cy">
-    <terms>
-      <term name="letter">cyfathrebu personol</term>
-      <term name="letter" form="short">llythyr</term>
+      <term name="software">computer software</term>
     </terms>
   </locale>
   <locale xml:lang="da">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikation</term>
-      <term name="letter" form="short">brev</term>
     </terms>
   </locale>
   <locale xml:lang="de">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">persönliche Kommunikation</term>
-      <term name="letter" form="short">Brief</term>
-    </terms>
-  </locale>
-  <locale xml:lang="el">
-    <terms>
-      <term name="letter">προσωπική επικοινωνία</term>
-      <term name="letter" form="short">επιστολή</term>
     </terms>
   </locale>
   <locale xml:lang="es">
     <terms>
       <term name="from">de</term>
-      <term name="letter">comunicación personal</term>
-      <term name="letter" form="short">carta</term>
-    </terms>
-  </locale>
-  <locale xml:lang="et">
-    <terms>
-      <term name="letter">isiklik suhtlus</term>
-      <term name="letter" form="short">kiri</term>
-    </terms>
-  </locale>
-  <locale xml:lang="eu">
-    <terms>
-      <term name="letter">komunikazio pertsonala</term>
-      <term name="letter" form="short">gutuna</term>
-    </terms>
-  </locale>
-  <locale xml:lang="fa">
-    <terms>
-      <term name="letter">ارتباط شخصی</term>
-      <term name="letter" form="short">نامه</term>
-    </terms>
-  </locale>
-  <locale xml:lang="fi">
-    <terms>
-      <term name="letter">henkilökohtainen viestintä</term>
-      <term name="letter" form="short">kirje</term>
     </terms>
   </locale>
   <locale xml:lang="fr">
     <terms>
-      <term name="letter">communication personnelle</term>
-      <term name="letter" form="short">lettre</term>
       <term name="editor" form="short">
         <single>éd.</single>
         <multiple>éds.</multiple>
       </term>
     </terms>
   </locale>
-  <locale xml:lang="he">
-    <terms>
-      <term name="letter">תקשורת אישית</term>
-      <term name="letter" form="short">מכתב</term>
-    </terms>
-  </locale>
-  <locale xml:lang="hr">
-    <terms>
-      <term name="letter">osobna komunikacija</term>
-      <term name="letter" form="short">pismo</term>
-    </terms>
-  </locale>
-  <locale xml:lang="hu">
-    <terms>
-      <term name="letter">személyes kommunikáció</term>
-      <term name="letter" form="short">levél</term>
-    </terms>
-  </locale>
-  <locale xml:lang="id">
-    <terms>
-      <term name="letter">komunikasi pribadi</term>
-      <term name="letter" form="short">surat</term>
-    </terms>
-  </locale>
-  <locale xml:lang="is">
-    <terms>
-      <term name="letter">persónuleg samskipti</term>
-      <term name="letter" form="short">bréf</term>
-    </terms>
-  </locale>
-  <locale xml:lang="it">
-    <terms>
-      <term name="letter">comunicazione personale</term>
-      <term name="letter" form="short">lettera</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ja">
-    <terms>
-      <term name="letter">個人的なやり取り</term>
-      <term name="letter" form="short">手紙</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ko">
-    <terms>
-      <term name="letter">개인 서신</term>
-      <term name="letter" form="short">편지</term>
-    </terms>
-  </locale>
-  <locale xml:lang="la">
-    <terms>
-      <term name="letter"/>
-      <term name="letter" form="short">epistula</term>
-    </terms>
-  </locale>
-  <locale xml:lang="lt">
-    <terms>
-      <term name="letter">communicationis personalis</term>
-      <term name="letter" form="short"/>
-    </terms>
-  </locale>
-  <locale xml:lang="lv">
-    <terms>
-      <term name="letter">personīga komunikācija</term>
-      <term name="letter" form="short">vēstule</term>
-    </terms>
-  </locale>
-  <locale xml:lang="mn">
-    <terms>
-      <term name="letter">хувийн харилцаа холбоо</term>
-      <term name="letter" form="short">захиа</term>
-    </terms>
-  </locale>
   <locale xml:lang="nb">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikasjon</term>
-      <term name="letter" form="short">brev</term>
     </terms>
   </locale>
   <locale xml:lang="nl">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">persoonlijke communicatie</term>
-      <term name="letter" form="short">brief</term>
     </terms>
   </locale>
   <locale xml:lang="nn">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikasjon</term>
-      <term name="letter" form="short">brev</term>
-    </terms>
-  </locale>
-  <locale xml:lang="pl">
-    <terms>
-      <term name="letter">osobista komunikacja</term>
-      <term name="letter" form="short">list</term>
-    </terms>
-  </locale>
-  <locale xml:lang="pt">
-    <terms>
-      <term name="letter">comunicação pessoal</term>
-      <term name="letter" form="short">carta</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ro">
-    <terms>
-      <term name="letter">comunicare personală</term>
-      <term name="letter" form="short">scrisoare</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ru">
-    <terms>
-      <term name="letter">личная переписка</term>
-      <term name="letter" form="short">письмо</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sk">
-    <terms>
-      <term name="letter">osobná komunikácia</term>
-      <term name="letter" form="short">list</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sl">
-    <terms>
-      <term name="letter">osebna komunikacija</term>
-      <term name="letter" form="short">pismo</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sr">
-    <terms>
-      <term name="letter">лична комуникација</term>
-      <term name="letter" form="short">писмо</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sv">
-    <terms>
-      <term name="letter">personlig kommunikation</term>
-      <term name="letter" form="short">brev</term>
-    </terms>
-  </locale>
-  <locale xml:lang="th">
-    <terms>
-      <term name="letter">การสื่อสารส่วนบุคคล</term>
-      <term name="letter" form="short">จดหมาย</term>
-    </terms>
-  </locale>
-  <locale xml:lang="tr">
-    <terms>
-      <term name="letter">kişisel iletişim</term>
-      <term name="letter" form="short">mektup</term>
-    </terms>
-  </locale>
-  <locale xml:lang="uk">
-    <terms>
-      <term name="letter">особисте спілкування</term>
-      <term name="letter" form="short">лист</term>
-    </terms>
-  </locale>
-  <locale xml:lang="vi">
-    <terms>
-      <term name="letter">giao tiếp cá nhân</term>
-      <term name="letter" form="short">thư</term>
-    </terms>
-  </locale>
-  <locale xml:lang="zh-CN">
-    <terms>
-      <term name="letter">的私人交流</term>
-      <term name="letter" form="short">信函</term>
-    </terms>
-  </locale>
-  <locale xml:lang="zh-TW">
-    <terms>
-      <term name="letter">私人通訊</term>
-      <term name="letter" form="short">信函</term>
     </terms>
   </locale>
   <!-- General categories of item types:
        Periodical: article-journal article-magazine article-newspaper post-weblog review review-book
        Periodical or Booklike: paper-conference
-       Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure
+       Booklike: article book broadcast chapter classic collection dataset document
+                 entry entry-dictionary entry-encyclopedia event figure
                  graphic interview manuscript map motion_picture musical_score pamphlet patent
-                 personal_communication report song speech thesis post webpage
-       Legal: bill legal_case legislation treaty
+                 performance periodical personal_communication post report
+                 software song speech standard thesis webpage
+       Legal: bill hearing legal_case legislation regulation treaty
   -->
   <!-- APA references contain four parts: author, date, title, source -->
   <macro name="author-bib">
@@ -399,8 +164,7 @@
                   <text macro="title-intext"/>
                 </substitute>
               </names>
-              <!-- Replace with term="personal-communication" if that becomes available -->
-              <text term="letter"/>
+              <text term="personal-communication"/>
             </group>
           </if>
           <else>
@@ -501,9 +265,6 @@
       </else>
     </choose>
   </macro>
-  <macro name="date-sort-date">
-    <date variable="issued" form="numeric"/>
-  </macro>
   <macro name="date-intext">
     <choose>
       <if variable="issued">
@@ -641,23 +402,23 @@
       <if variable="title" match="none">
         <text macro="bracketed-intext" prefix="[" suffix="]"/>
       </if>
+      <else-if type="hearing">
+        <!-- Hearings are italicized -->
+        <text variable="title" form="short" font-style="italic" text-case="title"/>
+      </else-if>
       <else-if type="bill">
-        <!-- If a bill has no number or container-title, assume it is a hearing; italic -->
+        <!-- Bills are not italicized and substitute bill number if no title. -->
         <choose>
-          <if variable="number container-title" match="none">
-            <text variable="title" form="short" font-style="italic" text-case="title"/>
-          </if>
-          <else-if variable="title">
+          <if variable="title">
             <text variable="title" form="short" text-case="title"/>
-          </else-if>
+          </if>
           <else>
             <group delimiter=" ">
               <text variable="genre"/>
               <group delimiter=" ">
                 <choose>
                   <if variable="chapter-number container-title" match="none">
-                    <!-- Replace with label variable="number" as that becomes available -->
-                    <text term="issue" form="short"/>
+                    <label variable="number" form="short"/>
                   </if>
                 </choose>
                 <text variable="number"/>
@@ -700,13 +461,11 @@
                 <text variable="genre" text-case="capitalize-first"/>
               </if>
               <else>
-                <!-- This should be localized -->
-                <text value="patent" text-case="capitalize-first"/>
+                <text term="patent" text-case="capitalize-first"/>
               </else>
             </choose>
             <group delimiter=" ">
-              <!-- Replace with label variable="number" if that becomes available -->
-              <text term="issue" form="short" text-case="capitalize-first"/>
+              <label variable="number" form="short" text-case="capitalize-first"/>
               <text variable="number"/>
             </group>
           </group>
@@ -884,7 +643,7 @@
                           <text variable="medium" text-case="capitalize-first"/>
                         </else-if>
                         <else>
-                          <text term="letter" form="short" text-case="capitalize-first"/>
+                          <text term="letter" text-case="capitalize-first"/>
                         </else>
                       </choose>
                     </if>
@@ -894,7 +653,7 @@
                           <text variable="medium" text-case="capitalize-first"/>
                         </if>
                         <else>
-                          <text term="letter" form="short" text-case="capitalize-first"/>
+                          <text term="letter" text-case="capitalize-first"/>
                         </else>
                       </choose>
                     </else>
@@ -995,14 +754,7 @@
                 </if>
               </choose>
             </if>
-            <else-if type="book">
-              <choose>
-                <if variable="version" match="none">
-                  <text macro="format"/>
-                </if>
-              </choose>
-            </else-if>
-            <else-if type="report" match="none">
+            <else-if type="report software" match="none">
               <text macro="format"/>
             </else-if>
           </choose>
@@ -1014,8 +766,10 @@
     <group prefix="[" suffix="]">
       <choose>
         <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
-          <!-- This should be localized -->
-          <text macro="reviewed-title-intext" prefix="Review of "/>
+          <group delimiter=" ">
+            <text term="review-of" text-case="capitalize-first"/>
+            <text macro="reviewed-title-intext"/>
+          </group>
         </if>
         <else-if variable="interviewer" type="interview" match="any">
           <names variable="interviewer">
@@ -1036,7 +790,7 @@
                     <text variable="genre" text-case="capitalize-first"/>
                   </if>
                   <else>
-                    <text term="letter" form="short" text-case="capitalize-first"/>
+                    <text term="letter" text-case="capitalize-first"/>
                   </else>
                 </choose>
                 <names variable="recipient" delimiter=", ">
@@ -1067,7 +821,7 @@
             </if>
           </choose>
         </if>
-        <else-if type="book" variable="version" match="all">
+        <else-if type="software" match="all">
           <!-- For entries in mobile app reference works, place bracketed after the container-title -->
           <text macro="format"/>
         </else-if>
@@ -1175,8 +929,7 @@
             <text variable="genre" text-case="title"/>
             <choose>
               <if is-numeric="number">
-                <!-- Replace with label variable="number" if that becomes available -->
-                <text term="issue" form="short" text-case="capitalize-first"/>
+                <label variable="number" form="short" text-case="capitalize-first"/>
                 <text variable="number"/>
               </if>
               <else>
@@ -1225,8 +978,7 @@
     <choose>
       <if is-numeric="version">
         <group delimiter=" ">
-          <!-- replace with label variable="version" if that becomes available -->
-          <text term="version" text-case="capitalize-first"/>
+          <label variable="version" text-case="capitalize-first"/>
           <text variable="version"/>
         </group>
       </if>
@@ -1274,8 +1026,7 @@
         </if>
         <else>
           <group>
-            <!-- Replace with label variable="number-of-volumes" if that becomes available -->
-            <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+            <label variable="number-of-volumes" form="short" text-case="capitalize-first" suffix=" "/>
             <text term="page-range-delimiter" prefix="1"/>
             <number variable="number-of-volumes" form="numeric"/>
           </group>
@@ -1329,18 +1080,16 @@
         </group>
       </if>
       <!-- Generic labels for specific types -->
-      <!-- These should be localized when possible -->
       <else-if type="dataset">
-        <text value="Data set"/>
+        <text term="dataset"/>
       </else-if>
-      <else-if type="book" variable="version" match="all">
-        <!-- Replace with type="software" and term="software" as that becomes available -->
-        <text value="Computer software"/>
+      <else-if type="software">
+        <text term="software" text-case="capitalize-first"/>
       </else-if>
       <else-if type="interview personal_communication" match="any">
         <choose>
           <if variable="archive container-title DOI publisher URL" match="none">
-            <text term="letter" text-case="capitalize-first"/>
+            <text term="personal-communication" text-case="capitalize-first"/>
           </if>
           <else-if type="interview">
             <text term="interview" text-case="capitalize-first"/>
@@ -1348,7 +1097,7 @@
         </choose>
       </else-if>
       <else-if type="map">
-        <text value="Map"/>
+        <text term="map" text-case="capitalize-first"/>
       </else-if>
     </choose>
   </macro>
@@ -1361,18 +1110,16 @@
         <text variable="medium" text-case="capitalize-first"/>
       </else-if>
       <!-- Generic labels for specific types -->
-      <!-- These should be localized when possible -->
       <else-if type="dataset">
-        <text value="Data set"/>
+        <text term="dataset"/>
       </else-if>
-      <else-if type="book" variable="version" match="all">
-        <!-- Replace with type="software" and term="software" as that becomes available -->
-        <text value="Computer software"/>
+      <else-if type="software">
+        <text term="software" text-case="capitalize-first"/>
       </else-if>
       <else-if type="interview personal_communication" match="any">
         <choose>
           <if variable="archive container-title DOI publisher URL" match="none">
-            <text term="letter" text-case="capitalize-first"/>
+            <text term="personal-communication" text-case="capitalize-first"/>
           </if>
           <else-if type="interview">
             <text term="interview" text-case="capitalize-first"/>
@@ -1380,7 +1127,7 @@
         </choose>
       </else-if>
       <else-if type="map">
-        <text value="Map"/>
+        <text term="map"/>
       </else-if>
     </choose>
   </macro>
@@ -1598,7 +1345,7 @@
             </if>
             <else>
               <group delimiter=" ">
-                <text value="Original work published"/>
+                <text term="original-work-published" text-case="capitalize-first"/>
                 <choose>
                   <if is-uncertain-date="original-date">
                     <text term="circa" form="short"/>
@@ -1619,83 +1366,56 @@
   </macro>
   <!-- Legal citations have their own rules -->
   <macro name="legal-cites">
+    <!-- TODO: Add new item types -->
     <choose>
-      <if type="legal_case">
-        <group delimiter=". ">
-          <group delimiter=", ">
-            <text variable="title"/>
-            <group delimiter=" ">
-              <text macro="container-legal"/>
-              <text macro="date-legal"/>
-            </group>
-            <text variable="references"/>
-          </group>
+      <if type="treaty">
+        <!-- APA generally defers to Bluebook for legal citations, but diverges without
+             explanation for treaty items. The Bluebook format that was used in APA 6th
+             ed. is used here. -->
+        <group delimiter=", ">
+          <text variable="title" text-case="title"/>
+          <names variable="author">
+            <name initialize-with="." form="short" delimiter="-"/>
+          </names>
+          <text macro="date-legal"/>
+          <text macro="container-legal"/>
           <text macro="access"/>
         </group>
       </if>
-      <else-if type="bill">
-        <!-- Currently designed to handle bills, resolutions, hearings, rederal reports. -->
+      <else>
+        <!-- For `bill`: currently designed to handle bills, resolutions, federal reports. -->
+        <!-- For `legislation`: currently designed to handle statutes, codified regulations, executive orders. -->
         <group delimiter=". ">
           <group delimiter=", ">
             <choose>
-              <if variable="number container-title" match="none">
-                <!-- If no number or container-title, then assume it is a hearing -->
-                <text variable="title" font-style="italic"/>
-              </if>
-              <else>
+              <if type="bill legal_case legislation" match="any">
                 <text variable="title"/>
-              </else>
+              </if>
+              <else-if type="hearing">
+                <text variable="title" font-style="italic"/>
+              </else-if>
             </choose>
             <group delimiter=" ">
               <text macro="container-legal"/>
               <text macro="date-legal"/>
               <choose>
-                <if variable="number container-title" match="none">
-                  <!-- If no number or container-title, then assume it is a hearing -->
+                <if type="hearing">
                   <names variable="author" prefix="(testimony of " suffix=")">
+                    <!-- TODO: Localize this with the hearing term. -->
                     <name and="symbol" delimiter=", "/>
                   </names>
                 </if>
-                <else>
+                <else-if type="bill legislation" match="any">
+                  <!-- `legislation`: For uncodified regulations, assume future code section is in status. -->
                   <text variable="status" prefix="(" suffix=")"/>
-                </else>
+                </else-if>
               </choose>
             </group>
             <text variable="references"/>
           </group>
           <text macro="access"/>
         </group>
-      </else-if>
-      <else-if type="legislation">
-        <!-- Currently designed to handle statutes, codified regulations, executive orders.
-             For uncodified regulations, assume future code section is in status. -->
-        <group delimiter=". ">
-          <group delimiter=", ">
-            <text variable="title"/>
-            <group delimiter=" ">
-              <text macro="container-legal"/>
-              <text macro="date-legal"/>
-              <text variable="status" prefix="(" suffix=")"/>
-            </group>
-            <text variable="references"/>
-          </group>
-          <text macro="access"/>
-        </group>
-      </else-if>
-      <else-if type="treaty">
-        <!-- APA generally defers to Bluebook for legal citations, but diverges without
-             explanation for treaty items. The Bluebook format that was used in APA 6th
-             ed. is used here. -->
-        <group delimiter=", ">
-          <text variable="title" text-case="title"/>
-          <names variable="author">
-            <name initialize-with="." form="short" delimiter="-"/>
-          </names>
-          <text macro="date-legal"/>
-          <text macro="container-legal"/>
-          <text macro="access"/>
-        </group>
-      </else-if>
+      </else>
     </choose>
   </macro>
   <macro name="date-legal">
@@ -1714,7 +1434,7 @@
           </choose>
         </group>
       </if>
-      <else-if type="bill legislation" match="any">
+      <else-if type="bill legislation hearing" match="any">
         <group prefix="(" suffix=")" delimiter=" ">
           <group delimiter=" ">
             <date variable="original-date">
@@ -1743,8 +1463,7 @@
                 <text variable="volume"/>
                 <text variable="container-title"/>
                 <group delimiter=" ">
-                  <!-- Change to label variable="section" as that becomes available -->
-                  <text term="section" form="symbol"/>
+                  <label variable="section" form="symbol"/>
                   <text variable="section"/>
                 </group>
                 <choose>
@@ -1761,8 +1480,7 @@
               <group delimiter=" ">
                 <choose>
                   <if is-numeric="number">
-                    <!-- Replace with label variable="number" if that becomes available -->
-                    <text term="issue" form="short" text-case="capitalize-first"/>
+                    <label variable="number" form="short" text-case="capitalize-first"/>
                   </if>
                 </choose>
                 <text variable="number"/>
@@ -1778,8 +1496,7 @@
             <group delimiter=" ">
               <choose>
                 <if variable="chapter-number container-title" match="none">
-                  <!-- Replace with label variable="number" as that becomes available -->
-                  <text term="issue" form="short"/>
+                  <label variable="number" form="short"/>
                 </if>
               </choose>
               <text variable="number"/>
@@ -1814,8 +1531,7 @@
               <choose>
                 <if variable="section">
                   <group delimiter=" ">
-                    <!-- Change to label variable="section" as that becomes available -->
-                    <text term="section" form="symbol"/>
+                    <label variable="section" form="symbol"/>
                     <text variable="section"/>
                   </group>
                 </if>
@@ -1837,8 +1553,7 @@
             </if>
             <else>
               <group delimiter=" ">
-                <!-- Replace with label variable="number" if that becomes available -->
-                <text term="issue" form="short" text-case="capitalize-first"/>
+                <label variable="number" form="short" text-case="capitalize-first"/>
                 <text variable="number"/>
               </group>
             </else>
@@ -1864,7 +1579,7 @@
     <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 macro="date-bib" sort="ascending"/>
       <key variable="status"/>
     </sort>
     <layout prefix="(" suffix=")" delimiter="; ">
@@ -1879,7 +1594,7 @@
     <sort>
       <key macro="author-bib"/>
       <key macro="date-sort-group"/>
-      <key macro="date-sort-date" sort="ascending"/>
+      <key macro="date-bib" sort="ascending"/>
       <key variable="status"/>
       <key macro="title"/>
     </sort>
diff --git a/buildres/csl/csl-styles/apa.csl b/buildres/csl/csl-styles/apa.csl
index e8cd9ae64f2..772c25e3345 100644
--- a/buildres/csl/csl-styles/apa.csl
+++ b/buildres/csl/csl-styles/apa.csl
@@ -14,7 +14,7 @@
     <category citation-format="author-date"/>
     <category field="psychology"/>
     <category field="generic-base"/>
-    <updated>2022-01-31T14:30:00+00:00</updated>
+    <updated>2022-10-02T20:08:41+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <locale xml:lang="en">
@@ -35,298 +35,88 @@
       <term name="circa" form="short">ca.</term>
       <term name="bc"> B.C.E.</term>
       <term name="ad"> C.E.</term>
-      <term name="letter">personal communication</term>
-      <term name="letter" form="short">letter</term>
       <term name="issue" form="long">
         <single>issue</single>
         <multiple>issues</multiple>
       </term>
-    </terms>
-  </locale>
-  <locale xml:lang="af">
-    <terms>
-      <term name="letter">persoonlike kommunikasie</term>
-      <term name="letter" form="short">brief</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ar">
-    <terms>
-      <term name="letter">اتصال شخصي</term>
-      <term name="letter" form="short">خطاب</term>
-    </terms>
-  </locale>
-  <locale xml:lang="bg">
-    <terms>
-      <term name="letter">лична комуникация</term>
-      <term name="letter" form="short">писмо</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ca">
-    <terms>
-      <term name="letter">comunicació personal</term>
-      <term name="letter" form="short">carta</term>
-    </terms>
-  </locale>
-  <locale xml:lang="cs">
-    <terms>
-      <term name="letter">osobní komunikace</term>
-      <term name="letter" form="short">dopis</term>
-    </terms>
-  </locale>
-  <locale xml:lang="cy">
-    <terms>
-      <term name="letter">cyfathrebu personol</term>
-      <term name="letter" form="short">llythyr</term>
+      <term name="software">computer software</term>
     </terms>
   </locale>
   <locale xml:lang="da">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikation</term>
-      <term name="letter" form="short">brev</term>
     </terms>
   </locale>
   <locale xml:lang="de">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">persönliche Kommunikation</term>
-      <term name="letter" form="short">Brief</term>
-    </terms>
-  </locale>
-  <locale xml:lang="el">
-    <terms>
-      <term name="letter">προσωπική επικοινωνία</term>
-      <term name="letter" form="short">επιστολή</term>
     </terms>
   </locale>
   <locale xml:lang="es">
     <terms>
       <term name="from">de</term>
-      <term name="letter">comunicación personal</term>
-      <term name="letter" form="short">carta</term>
-    </terms>
-  </locale>
-  <locale xml:lang="et">
-    <terms>
-      <term name="letter">isiklik suhtlus</term>
-      <term name="letter" form="short">kiri</term>
-    </terms>
-  </locale>
-  <locale xml:lang="eu">
-    <terms>
-      <term name="letter">komunikazio pertsonala</term>
-      <term name="letter" form="short">gutuna</term>
-    </terms>
-  </locale>
-  <locale xml:lang="fa">
-    <terms>
-      <term name="letter">ارتباط شخصی</term>
-      <term name="letter" form="short">نامه</term>
-    </terms>
-  </locale>
-  <locale xml:lang="fi">
-    <terms>
-      <term name="letter">henkilökohtainen viestintä</term>
-      <term name="letter" form="short">kirje</term>
     </terms>
   </locale>
   <locale xml:lang="fr">
     <terms>
-      <term name="letter">communication personnelle</term>
-      <term name="letter" form="short">lettre</term>
       <term name="editor" form="short">
         <single>éd.</single>
         <multiple>éds.</multiple>
       </term>
     </terms>
   </locale>
-  <locale xml:lang="he">
-    <terms>
-      <term name="letter">תקשורת אישית</term>
-      <term name="letter" form="short">מכתב</term>
-    </terms>
-  </locale>
-  <locale xml:lang="hr">
-    <terms>
-      <term name="letter">osobna komunikacija</term>
-      <term name="letter" form="short">pismo</term>
-    </terms>
-  </locale>
-  <locale xml:lang="hu">
-    <terms>
-      <term name="letter">személyes kommunikáció</term>
-      <term name="letter" form="short">levél</term>
-    </terms>
-  </locale>
-  <locale xml:lang="id">
-    <terms>
-      <term name="letter">komunikasi pribadi</term>
-      <term name="letter" form="short">surat</term>
-    </terms>
-  </locale>
-  <locale xml:lang="is">
-    <terms>
-      <term name="letter">persónuleg samskipti</term>
-      <term name="letter" form="short">bréf</term>
-    </terms>
-  </locale>
-  <locale xml:lang="it">
-    <terms>
-      <term name="letter">comunicazione personale</term>
-      <term name="letter" form="short">lettera</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ja">
-    <terms>
-      <term name="letter">個人的なやり取り</term>
-      <term name="letter" form="short">手紙</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ko">
-    <terms>
-      <term name="letter">개인 서신</term>
-      <term name="letter" form="short">편지</term>
-    </terms>
-  </locale>
-  <locale xml:lang="la">
-    <terms>
-      <term name="letter"/>
-      <term name="letter" form="short">epistula</term>
-    </terms>
-  </locale>
-  <locale xml:lang="lt">
-    <terms>
-      <term name="letter">communicationis personalis</term>
-      <term name="letter" form="short"/>
-    </terms>
-  </locale>
-  <locale xml:lang="lv">
-    <terms>
-      <term name="letter">personīga komunikācija</term>
-      <term name="letter" form="short">vēstule</term>
-    </terms>
-  </locale>
-  <locale xml:lang="mn">
-    <terms>
-      <term name="letter">хувийн харилцаа холбоо</term>
-      <term name="letter" form="short">захиа</term>
-    </terms>
-  </locale>
   <locale xml:lang="nb">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikasjon</term>
-      <term name="letter" form="short">brev</term>
     </terms>
   </locale>
   <locale xml:lang="nl">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">persoonlijke communicatie</term>
-      <term name="letter" form="short">brief</term>
     </terms>
   </locale>
   <locale xml:lang="nn">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikasjon</term>
-      <term name="letter" form="short">brev</term>
-    </terms>
-  </locale>
-  <locale xml:lang="pl">
-    <terms>
-      <term name="letter">osobista komunikacja</term>
-      <term name="letter" form="short">list</term>
-    </terms>
-  </locale>
-  <locale xml:lang="pt">
-    <terms>
-      <term name="letter">comunicação pessoal</term>
-      <term name="letter" form="short">carta</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ro">
-    <terms>
-      <term name="letter">comunicare personală</term>
-      <term name="letter" form="short">scrisoare</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ru">
-    <terms>
-      <term name="letter">личная переписка</term>
-      <term name="letter" form="short">письмо</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sk">
-    <terms>
-      <term name="letter">osobná komunikácia</term>
-      <term name="letter" form="short">list</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sl">
-    <terms>
-      <term name="letter">osebna komunikacija</term>
-      <term name="letter" form="short">pismo</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sr">
-    <terms>
-      <term name="letter">лична комуникација</term>
-      <term name="letter" form="short">писмо</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sv">
-    <terms>
-      <term name="letter">personlig kommunikation</term>
-      <term name="letter" form="short">brev</term>
-    </terms>
-  </locale>
-  <locale xml:lang="th">
-    <terms>
-      <term name="letter">การสื่อสารส่วนบุคคล</term>
-      <term name="letter" form="short">จดหมาย</term>
-    </terms>
-  </locale>
-  <locale xml:lang="tr">
-    <terms>
-      <term name="letter">kişisel iletişim</term>
-      <term name="letter" form="short">mektup</term>
-    </terms>
-  </locale>
-  <locale xml:lang="uk">
-    <terms>
-      <term name="letter">особисте спілкування</term>
-      <term name="letter" form="short">лист</term>
-    </terms>
-  </locale>
-  <locale xml:lang="vi">
-    <terms>
-      <term name="letter">giao tiếp cá nhân</term>
-      <term name="letter" form="short">thư</term>
-    </terms>
-  </locale>
-  <locale xml:lang="zh-CN">
-    <terms>
-      <term name="letter">的私人交流</term>
-      <term name="letter" form="short">信函</term>
-    </terms>
-  </locale>
-  <locale xml:lang="zh-TW">
-    <terms>
-      <term name="letter">私人通訊</term>
-      <term name="letter" form="short">信函</term>
     </terms>
   </locale>
+  <!-- TODO: New types: classic collection document event hearing performance periodical regulation -software- standard -->
+  <!-- TODO: New creator roles: chair compiler contributor curator executive-producer guest host narrator organizer performer producer script-writer series-creator -->
+  <!-- TODO: New variables:
+         available-date submitted
+         part-number printing-number supplement-number
+         part-title volume-title
+         archive_collection
+         division jurisdiction
+         event-title
+         language
+         license
+         reviewed-genre
+  -->
+  <!-- TODO: New terms:
+         advance-online-publication
+         album on audio-recording
+         original-work-published
+         personal-communication
+         preprint
+         review-of
+         item types
+  -->
+  <!-- TODO: Check Indigeneous Knowledge format -->
   <!-- General categories of item types:
        Periodical: article-journal article-magazine article-newspaper post-weblog review review-book
        Periodical or Booklike: paper-conference
-       Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure
+       Booklike: article book broadcast chapter classic collection dataset document
+                 entry entry-dictionary entry-encyclopedia event figure
                  graphic interview manuscript map motion_picture musical_score pamphlet patent
-                 personal_communication report song speech thesis post webpage
-       Legal: bill legal_case legislation treaty
+                 performance periodical personal_communication post report
+                 software song speech standard thesis webpage
+       Legal: bill hearing legal_case legislation regulation treaty
   -->
   <!-- APA references contain four parts: author, date, title, source -->
   <macro name="author-bib">
+    <!-- TODO: New creator roles (media, contributor) -->
+    <!-- TODO: Add new item types -->
     <names variable="composer" delimiter=", ">
       <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
       <substitute>
@@ -355,7 +145,7 @@
             </choose>
           </if>
         </choose>
-        <!-- Test for editortranslator and put that first as that becomes available -->
+        <!-- TODO: Test for editortranslator and put that first as that becomes available -->
         <names variable="editor" delimiter=", ">
           <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
           <label form="short" prefix=" (" suffix=")" text-case="title"/>
@@ -383,6 +173,8 @@
     </names>
   </macro>
   <macro name="author-intext">
+    <!-- TODO: New creator roles -->
+    <!-- TODO: Add new item types -->
     <choose>
       <if type="bill legal_case legislation treaty" match="any">
         <text macro="title-intext"/>
@@ -399,8 +191,7 @@
                   <text macro="title-intext"/>
                 </substitute>
               </names>
-              <!-- Replace with term="personal-communication" if that becomes available -->
-              <text term="letter"/>
+              <text term="personal-communication"/>
             </group>
           </if>
           <else>
@@ -438,6 +229,7 @@
     </choose>
   </macro>
   <macro name="date-bib">
+    <!-- TODO: Add new item types -->
     <group delimiter=" " prefix="(" suffix=")">
       <choose>
         <if is-uncertain-date="issued">
@@ -476,6 +268,7 @@
           </if>
           <else-if variable="status">
             <group>
+              <!-- TODO: Should I print status as-is, or should I print the in-press term? -->
               <text variable="status" text-case="lowercase"/>
               <text variable="year-suffix" prefix="-"/>
             </group>
@@ -502,10 +295,8 @@
       </else>
     </choose>
   </macro>
-  <macro name="date-sort-date">
-    <date variable="issued" form="numeric"/>
-  </macro>
   <macro name="date-intext">
+    <!-- TODO: Add new item types -->
     <choose>
       <if variable="issued">
         <group delimiter="/">
@@ -553,6 +344,7 @@
         </group>
       </if>
       <else-if variable="status">
+        <!-- TODO: Should I print status as-is, or should I print the in-press term? -->
         <text variable="status" text-case="lowercase"/>
         <text variable="year-suffix" prefix="-"/>
       </else-if>
@@ -582,6 +374,7 @@
     </choose>
   </macro>
   <macro name="title">
+    <!-- TODO: Add new item types -->
     <choose>
       <if type="post webpage" match="any">
         <!-- Webpages are always italicized -->
@@ -603,7 +396,7 @@
               <if variable="collection-editor editor editorial-director" match="any">
                 <group delimiter=": " font-style="italic">
                   <text variable="title"/>
-                  <!-- Replace with volume-title as that becomes available -->
+                  <!-- TODO: Replace with volume-title -->
                   <choose>
                     <if is-numeric="volume" match="none">
                       <group delimiter=" ">
@@ -622,7 +415,7 @@
           <else>
             <group delimiter=": " font-style="italic">
               <text variable="title"/>
-              <!-- Replace with volume-title as that becomes available -->
+              <!-- TODO: Replace with volume-title -->
               <choose>
                 <if is-numeric="volume" match="none">
                   <group delimiter=" ">
@@ -638,27 +431,28 @@
     </choose>
   </macro>
   <macro name="title-intext">
+    <!-- TODO: Add new item types -->
     <choose>
       <if variable="title" match="none">
         <text macro="bracketed-intext" prefix="[" suffix="]"/>
       </if>
+      <else-if type="hearing">
+        <!-- Hearings are italicized -->
+        <text variable="title" form="short" font-style="italic" text-case="title"/>
+      </else-if>
       <else-if type="bill">
-        <!-- If a bill has no number or container-title, assume it is a hearing; italic -->
+        <!-- Bills are not italicized and substitute bill number if no title. -->
         <choose>
-          <if variable="number container-title" match="none">
-            <text variable="title" form="short" font-style="italic" text-case="title"/>
-          </if>
-          <else-if variable="title">
+          <if variable="title">
             <text variable="title" form="short" text-case="title"/>
-          </else-if>
+          </if>
           <else>
             <group delimiter=" ">
               <text variable="genre"/>
               <group delimiter=" ">
                 <choose>
                   <if variable="chapter-number container-title" match="none">
-                    <!-- Replace with label variable="number" as that becomes available -->
-                    <text term="issue" form="short"/>
+                    <label variable="number" form="short"/>
                   </if>
                 </choose>
                 <text variable="number"/>
@@ -689,6 +483,7 @@
     </choose>
   </macro>
   <macro name="parenthetical">
+    <!-- TODO: Add new item types -->
     <!-- (Secondary contributors; Database location; Genre no. 123; Report Series 123, Version, Edition, Volume, Page) -->
     <group prefix="(" suffix=")">
       <choose>
@@ -701,13 +496,11 @@
                 <text variable="genre" text-case="capitalize-first"/>
               </if>
               <else>
-                <!-- This should be localized -->
-                <text value="patent" text-case="capitalize-first"/>
+                <text term="patent" text-case="capitalize-first"/>
               </else>
             </choose>
             <group delimiter=" ">
-              <!-- Replace with label variable="number" if that becomes available -->
-              <text term="issue" form="short" text-case="capitalize-first"/>
+              <label variable="number" form="short" text-case="capitalize-first"/>
               <text variable="number"/>
             </group>
           </group>
@@ -744,6 +537,7 @@
     </group>
   </macro>
   <macro name="parenthetical-container">
+    <!-- TODO: Add new item types -->
     <choose>
       <if variable="container-title" match="any">
         <group prefix="(" suffix=")">
@@ -762,6 +556,7 @@
     </choose>
   </macro>
   <macro name="bracketed">
+    <!-- TODO: Add new item types -->
     <!-- [Descriptive information] -->
     <!-- If there is a number, genre is already printed in macro="number" -->
     <group prefix="[" suffix="]">
@@ -782,7 +577,9 @@
                         <text variable="medium" text-case="capitalize-first"/>
                       </else-if>
                       <else>
-                        <!-- Replace with term="review" as that becomes available -->
+                        <!-- TODO: Replace with term="review" -->
+                        <!-- TODO: Handle review vs review-of depending on presence of reviewed-title -->
+                        <!-- TODO: Add reviewed-genre -->
                         <text value="Review of"/>
                       </else>
                     </choose>
@@ -793,7 +590,9 @@
                         <text variable="medium" text-case="capitalize-first"/>
                       </if>
                       <else>
-                        <!-- Replace with term="review" as that becomes available -->
+                        <!-- TODO: Replace with term="review" -->
+                        <!-- TODO: Handle review vs review-of depending on presence of reviewed-title -->
+                        <!-- TODO: Add reviewed-genre -->
                         <text value="Review of"/>
                       </else>
                     </choose>
@@ -885,7 +684,7 @@
                           <text variable="medium" text-case="capitalize-first"/>
                         </else-if>
                         <else>
-                          <text term="letter" form="short" text-case="capitalize-first"/>
+                          <text term="letter" text-case="capitalize-first"/>
                         </else>
                       </choose>
                     </if>
@@ -895,7 +694,7 @@
                           <text variable="medium" text-case="capitalize-first"/>
                         </if>
                         <else>
-                          <text term="letter" form="short" text-case="capitalize-first"/>
+                          <text term="letter" text-case="capitalize-first"/>
                         </else>
                       </choose>
                     </else>
@@ -930,20 +729,20 @@
                   <choose>
                     <if variable="genre">
                       <text variable="genre" text-case="capitalize-first"/>
-                      <!-- Replace prefix with performer label as that becomes available -->
+                      <!-- TODO: Replace prefix with performer label -->
                       <names variable="author" prefix="recorded by ">
                         <name and="symbol" initialize-with=". " delimiter=", "/>
                       </names>
                     </if>
                     <else-if variable="medium">
                       <text variable="medium" text-case="capitalize-first"/>
-                      <!-- Replace prefix with performer label as that becomes available -->
+                      <!-- TODO: Replace prefix with performer label -->
                       <names variable="author" prefix="recorded by ">
                         <name and="symbol" initialize-with=". " delimiter=", "/>
                       </names>
                     </else-if>
                     <else>
-                      <!-- Replace prefix with performer label as that becomes available -->
+                      <!-- TODO: Replace prefix with performer label -->
                       <names variable="author" prefix="Recorded by ">
                         <name and="symbol" initialize-with=". " delimiter=", "/>
                       </names>
@@ -956,13 +755,13 @@
                   <choose>
                     <if variable="medium">
                       <text variable="medium" text-case="capitalize-first"/>
-                      <!-- Replace prefix with performer label as that becomes available -->
+                      <!-- TODO: Replace prefix with performer label -->
                       <names variable="author" prefix="recorded by ">
                         <name and="symbol" initialize-with=". " delimiter=", "/>
                       </names>
                     </if>
                     <else>
-                      <!-- Replace prefix with performer label as that becomes available -->
+                      <!-- TODO: Replace prefix with performer label -->
                       <names variable="author" prefix="Recorded by ">
                         <name and="symbol" initialize-with=". " delimiter=", "/>
                       </names>
@@ -996,14 +795,7 @@
                 </if>
               </choose>
             </if>
-            <else-if type="book">
-              <choose>
-                <if variable="version" match="none">
-                  <text macro="format"/>
-                </if>
-              </choose>
-            </else-if>
-            <else-if type="report" match="none">
+            <else-if type="report software" match="none">
               <text macro="format"/>
             </else-if>
           </choose>
@@ -1012,11 +804,14 @@
     </group>
   </macro>
   <macro name="bracketed-intext">
+    <!-- TODO: Add new item types -->
     <group prefix="[" suffix="]">
       <choose>
         <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
-          <!-- This should be localized -->
-          <text macro="reviewed-title-intext" prefix="Review of "/>
+          <group delimiter=" ">
+            <text term="review-of" text-case="capitalize-first"/>
+            <text macro="reviewed-title-intext"/>
+          </group>
         </if>
         <else-if variable="interviewer" type="interview" match="any">
           <names variable="interviewer">
@@ -1037,7 +832,7 @@
                     <text variable="genre" text-case="capitalize-first"/>
                   </if>
                   <else>
-                    <text term="letter" form="short" text-case="capitalize-first"/>
+                    <text term="letter" text-case="capitalize-first"/>
                   </else>
                 </choose>
                 <names variable="recipient" delimiter=", ">
@@ -1058,6 +853,7 @@
     </group>
   </macro>
   <macro name="bracketed-container">
+    <!-- TODO: Add new item types -->
     <group prefix="[" suffix="]">
       <choose>
         <if type="paper-conference speech" match="any">
@@ -1068,7 +864,7 @@
             </if>
           </choose>
         </if>
-        <else-if type="book" variable="version" match="all">
+        <else-if type="software" match="all">
           <!-- For entries in mobile app reference works, place bracketed after the container-title -->
           <text macro="format"/>
         </else-if>
@@ -1080,6 +876,8 @@
     </group>
   </macro>
   <macro name="secondary-contributors">
+    <!-- TODO: Add new item types -->
+    <!-- TODO: Add new creator roles -->
     <choose>
       <if type="article-journal article-magazine article-newspaper post-weblog review review-book" match="any">
         <text macro="secondary-contributors-periodical"/>
@@ -1116,6 +914,7 @@
     </group>
   </macro>
   <macro name="secondary-contributors-booklike">
+    <!-- TODO: Add new item types -->
     <group delimiter="; ">
       <choose>
         <if variable="title">
@@ -1125,7 +924,7 @@
           </names>
         </if>
       </choose>
-      <!-- When editortranslator becomes available, add a test: variable="editortranslator" match="none"; then print translator -->
+      <!-- TODO: When editortranslator becomes available, add a test: variable="editortranslator" match="none"; then print translator -->
       <choose>
         <if type="post webpage" match="none">
           <!-- Webpages treat container-title like publisher -->
@@ -1163,12 +962,13 @@
     <choose>
       <if variable="archive-place" match="none">
         <!-- With `archive-place`: physical archives. Without: online archives. -->
-        <!-- Add archive_collection as that becomes available -->
+        <!-- TODO: Add archive_collection -->
         <text variable="archive_location"/>
       </if>
     </choose>
   </macro>
   <macro name="number">
+    <!-- TODO: Add new item types -->
     <choose>
       <if variable="number">
         <group delimiter=", ">
@@ -1176,8 +976,7 @@
             <text variable="genre" text-case="title"/>
             <choose>
               <if is-numeric="number">
-                <!-- Replace with label variable="number" if that becomes available -->
-                <text term="issue" form="short" text-case="capitalize-first"/>
+                <label variable="number" form="short" text-case="capitalize-first"/>
                 <text variable="number"/>
               </if>
               <else>
@@ -1200,6 +999,7 @@
     </choose>
   </macro>
   <macro name="locators-booklike">
+    <!-- TODO: Add new item types -->
     <choose>
       <if type="article-journal article-magazine article-newspaper broadcast interview patent post post-weblog review review-book speech webpage" match="any"/>
       <else-if type="paper-conference">
@@ -1226,8 +1026,7 @@
     <choose>
       <if is-numeric="version">
         <group delimiter=" ">
-          <!-- replace with label variable="version" if that becomes available -->
-          <text term="version" text-case="capitalize-first"/>
+          <label variable="version" text-case="capitalize-first"/>
           <text variable="version"/>
         </group>
       </if>
@@ -1250,6 +1049,7 @@
     </choose>
   </macro>
   <macro name="volume-booklike">
+    <!-- TODO: Add new item types -->
     <group delimiter=", ">
       <!-- Report series [ex. 52] -->
       <choose>
@@ -1262,6 +1062,7 @@
       </choose>
       <choose>
         <if variable="volume" match="any">
+          <!-- TODO: Update using volume-title -->
           <choose>
             <!-- Non-numeric volumes are already printed as part of the book title -->
             <if is-numeric="volume" match="none"/>
@@ -1275,8 +1076,7 @@
         </if>
         <else>
           <group>
-            <!-- Replace with label variable="number-of-volumes" if that becomes available -->
-            <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+            <label variable="number-of-volumes" form="short" text-case="capitalize-first" suffix=" "/>
             <text term="page-range-delimiter" prefix="1"/>
             <number variable="number-of-volumes" form="numeric"/>
           </group>
@@ -1318,6 +1118,7 @@
     </choose>
   </macro>
   <macro name="format">
+    <!-- TODO: Add new item types -->
     <choose>
       <if variable="genre medium" match="any">
         <group delimiter="; ">
@@ -1330,18 +1131,17 @@
         </group>
       </if>
       <!-- Generic labels for specific types -->
-      <!-- These should be localized when possible -->
+      <!-- TODO: Add terms for other types? -->
       <else-if type="dataset">
-        <text value="Data set"/>
+        <text term="dataset"/>
       </else-if>
-      <else-if type="book" variable="version" match="all">
-        <!-- Replace with type="software" and term="software" as that becomes available -->
-        <text value="Computer software"/>
+      <else-if type="software">
+        <text term="software" text-case="capitalize-first"/>
       </else-if>
       <else-if type="interview personal_communication" match="any">
         <choose>
           <if variable="archive container-title DOI publisher URL" match="none">
-            <text term="letter" text-case="capitalize-first"/>
+            <text term="personal-communication" text-case="capitalize-first"/>
           </if>
           <else-if type="interview">
             <text term="interview" text-case="capitalize-first"/>
@@ -1349,11 +1149,12 @@
         </choose>
       </else-if>
       <else-if type="map">
-        <text value="Map"/>
+        <text term="map" text-case="capitalize-first"/>
       </else-if>
     </choose>
   </macro>
   <macro name="format-intext">
+    <!-- TODO: Add new item types -->
     <choose>
       <if variable="genre" match="any">
         <text variable="genre" text-case="capitalize-first"/>
@@ -1362,18 +1163,17 @@
         <text variable="medium" text-case="capitalize-first"/>
       </else-if>
       <!-- Generic labels for specific types -->
-      <!-- These should be localized when possible -->
+      <!-- TODO: Add terms for other types? -->
       <else-if type="dataset">
-        <text value="Data set"/>
+        <text term="dataset"/>
       </else-if>
-      <else-if type="book" variable="version" match="all">
-        <!-- Replace with type="software" and term="software" as that becomes available -->
-        <text value="Computer software"/>
+      <else-if type="software">
+        <text term="software" text-case="capitalize-first"/>
       </else-if>
       <else-if type="interview personal_communication" match="any">
         <choose>
           <if variable="archive container-title DOI publisher URL" match="none">
-            <text term="letter" text-case="capitalize-first"/>
+            <text term="personal-communication" text-case="capitalize-first"/>
           </if>
           <else-if type="interview">
             <text term="interview" text-case="capitalize-first"/>
@@ -1381,13 +1181,14 @@
         </choose>
       </else-if>
       <else-if type="map">
-        <text value="Map"/>
+        <text term="map"/>
       </else-if>
     </choose>
   </macro>
   <!-- APA 'source' element contains four parts:
        container, event, publisher, access -->
   <macro name="container">
+    <!-- TODO: Add new item types -->
     <choose>
       <if type="article-journal article-magazine article-newspaper post-weblog review review-book" match="any">
         <!-- Periodical items -->
@@ -1443,6 +1244,7 @@
         <if variable="issued">
           <choose>
             <if variable="issue page volume" match="none">
+              <!-- TODO: Should I print status as-is, or should I print the in-press term? -->
               <text variable="status" text-case="capitalize-first"/>
             </if>
           </choose>
@@ -1451,13 +1253,14 @@
     </group>
   </macro>
   <macro name="container-booklike">
+    <!-- TODO: Add new item types -->
     <choose>
       <if variable="container-title" match="any">
         <group delimiter=" ">
           <text term="in" text-case="capitalize-first"/>
           <group delimiter=", ">
             <names variable="editor translator" delimiter=", &amp; ">
-              <!-- Change to editortranslator and move editor to substitute as that becomes available -->
+              <!-- TODO: Change to editortranslator and move editor to substitute -->
               <name and="symbol" initialize-with=". " delimiter=", "/>
               <label form="short" text-case="title" prefix=" (" suffix=")"/>
               <substitute>
@@ -1468,7 +1271,7 @@
             </names>
             <group delimiter=": " font-style="italic">
               <text variable="container-title"/>
-              <!-- Replace with volume-title as that becomes available -->
+              <!-- TODO: Replace with volume-title -->
               <choose>
                 <if is-numeric="volume" match="none">
                   <group delimiter=" ">
@@ -1486,6 +1289,7 @@
     </choose>
   </macro>
   <macro name="publisher">
+    <!-- TODO: Add new item types -->
     <group delimiter="; ">
       <choose>
         <if type="thesis">
@@ -1520,7 +1324,7 @@
             <!-- With `archive-place`: physical archives. Without: online archives. -->
             <!-- For physical archives, print the location before the archive name.
                 For electronic archives, these are printed in macro="description". -->
-            <!-- Split "archive_location" into "archive_collection" and "archive_location" as that becomes available -->
+            <!-- TODO: Split "archive_location" into "archive_collection" and "archive_location" -->
             <!-- Must test for archive_collection:
                 With collection: archive_collection (archive_location), archive, archive-place
                 No collection: archive (archive_location), archive-place
@@ -1555,6 +1359,7 @@
     </choose>
   </macro>
   <macro name="event">
+    <!-- TODO: Add new item types (e.g., event, collection, performance) -->
     <choose>
       <if variable="event event-title" match="any">
         <!-- To prevent Zotero from printing event-place due to its double-mapping of all 'place' to
@@ -1587,6 +1392,7 @@
   </macro>
   <!-- After 'source', APA also prints publication history (original publication, reprint info, retraction info) -->
   <macro name="publication-history">
+    <!-- TODO: Add new item types -->
     <choose>
       <if type="patent" match="none">
         <group prefix="(" suffix=")">
@@ -1598,8 +1404,9 @@
               <text variable="references"/>
             </if>
             <else>
+              <!-- TODO: Replace these with terms -->
               <group delimiter=" ">
-                <text value="Original work published"/>
+                <text term="original-work-published" text-case="capitalize-first"/>
                 <choose>
                   <if is-uncertain-date="original-date">
                     <text term="circa" form="short"/>
@@ -1620,86 +1427,60 @@
   </macro>
   <!-- Legal citations have their own rules -->
   <macro name="legal-cites">
+    <!-- TODO: Add new item types -->
     <choose>
-      <if type="legal_case">
-        <group delimiter=". ">
-          <group delimiter=", ">
-            <text variable="title"/>
-            <group delimiter=" ">
-              <text macro="container-legal"/>
-              <text macro="date-legal"/>
-            </group>
-            <text variable="references"/>
-          </group>
+      <if type="treaty">
+        <!-- APA generally defers to Bluebook for legal citations, but diverges without
+             explanation for treaty items. The Bluebook format that was used in APA 6th
+             ed. is used here. -->
+        <group delimiter=", ">
+          <text variable="title" text-case="title"/>
+          <names variable="author">
+            <name initialize-with="." form="short" delimiter="-"/>
+          </names>
+          <text macro="date-legal"/>
+          <text macro="container-legal"/>
           <text macro="access"/>
         </group>
       </if>
-      <else-if type="bill">
-        <!-- Currently designed to handle bills, resolutions, hearings, rederal reports. -->
+      <else>
+        <!-- For `bill`: currently designed to handle bills, resolutions, federal reports. -->
+        <!-- For `legislation`: currently designed to handle statutes, codified regulations, executive orders. -->
         <group delimiter=". ">
           <group delimiter=", ">
             <choose>
-              <if variable="number container-title" match="none">
-                <!-- If no number or container-title, then assume it is a hearing -->
-                <text variable="title" font-style="italic"/>
-              </if>
-              <else>
+              <if type="bill legal_case legislation" match="any">
                 <text variable="title"/>
-              </else>
+              </if>
+              <else-if type="hearing">
+                <text variable="title" font-style="italic"/>
+              </else-if>
             </choose>
             <group delimiter=" ">
               <text macro="container-legal"/>
               <text macro="date-legal"/>
               <choose>
-                <if variable="number container-title" match="none">
-                  <!-- If no number or container-title, then assume it is a hearing -->
+                <if type="hearing">
                   <names variable="author" prefix="(testimony of " suffix=")">
+                    <!-- TODO: Localize this with the hearing term. -->
                     <name and="symbol" delimiter=", "/>
                   </names>
                 </if>
-                <else>
+                <else-if type="bill legislation" match="any">
+                  <!-- `legislation`: For uncodified regulations, assume future code section is in status. -->
                   <text variable="status" prefix="(" suffix=")"/>
-                </else>
+                </else-if>
               </choose>
             </group>
             <text variable="references"/>
           </group>
           <text macro="access"/>
         </group>
-      </else-if>
-      <else-if type="legislation">
-        <!-- Currently designed to handle statutes, codified regulations, executive orders.
-             For uncodified regulations, assume future code section is in status. -->
-        <group delimiter=". ">
-          <group delimiter=", ">
-            <text variable="title"/>
-            <group delimiter=" ">
-              <text macro="container-legal"/>
-              <text macro="date-legal"/>
-              <text variable="status" prefix="(" suffix=")"/>
-            </group>
-            <text variable="references"/>
-          </group>
-          <text macro="access"/>
-        </group>
-      </else-if>
-      <else-if type="treaty">
-        <!-- APA generally defers to Bluebook for legal citations, but diverges without
-             explanation for treaty items. The Bluebook format that was used in APA 6th
-             ed. is used here. -->
-        <group delimiter=", ">
-          <text variable="title" text-case="title"/>
-          <names variable="author">
-            <name initialize-with="." form="short" delimiter="-"/>
-          </names>
-          <text macro="date-legal"/>
-          <text macro="container-legal"/>
-          <text macro="access"/>
-        </group>
-      </else-if>
+      </else>
     </choose>
   </macro>
   <macro name="date-legal">
+    <!-- TODO: Add new item types -->
     <choose>
       <if type="legal_case">
         <group prefix="(" suffix=")" delimiter=" ">
@@ -1715,7 +1496,7 @@
           </choose>
         </group>
       </if>
-      <else-if type="bill legislation" match="any">
+      <else-if type="bill legislation hearing" match="any">
         <group prefix="(" suffix=")" delimiter=" ">
           <group delimiter=" ">
             <date variable="original-date">
@@ -1734,6 +1515,7 @@
     </choose>
   </macro>
   <macro name="container-legal">
+    <!-- TODO: Add new item types -->
     <!-- Expect legal item container-titles to be stored in short form -->
     <choose>
       <if type="legal_case">
@@ -1744,8 +1526,7 @@
                 <text variable="volume"/>
                 <text variable="container-title"/>
                 <group delimiter=" ">
-                  <!-- Change to label variable="section" as that becomes available -->
-                  <text term="section" form="symbol"/>
+                  <label variable="section" form="symbol"/>
                   <text variable="section"/>
                 </group>
                 <choose>
@@ -1762,8 +1543,7 @@
               <group delimiter=" ">
                 <choose>
                   <if is-numeric="number">
-                    <!-- Replace with label variable="number" if that becomes available -->
-                    <text term="issue" form="short" text-case="capitalize-first"/>
+                    <label variable="number" form="short" text-case="capitalize-first"/>
                   </if>
                 </choose>
                 <text variable="number"/>
@@ -1779,8 +1559,7 @@
             <group delimiter=" ">
               <choose>
                 <if variable="chapter-number container-title" match="none">
-                  <!-- Replace with label variable="number" as that becomes available -->
-                  <text term="issue" form="short"/>
+                  <label variable="number" form="short"/>
                 </if>
               </choose>
               <text variable="number"/>
@@ -1815,7 +1594,7 @@
               <choose>
                 <if variable="section">
                   <group delimiter=" ">
-                    <!-- Change to label variable="section" as that becomes available -->
+                    <!-- TODO: Change to label variable="section" -->
                     <text term="section" form="symbol"/>
                     <text variable="section"/>
                   </group>
@@ -1838,8 +1617,7 @@
             </if>
             <else>
               <group delimiter=" ">
-                <!-- Replace with label variable="number" if that becomes available -->
-                <text term="issue" form="short" text-case="capitalize-first"/>
+                <label variable="number" form="short" text-case="capitalize-first"/>
                 <text variable="number"/>
               </group>
             </else>
@@ -1849,6 +1627,7 @@
     </choose>
   </macro>
   <macro name="citation-locator">
+    <!-- TODO: Add new locator types? -->
     <group delimiter=" ">
       <choose>
         <if locator="chapter">
@@ -1865,7 +1644,7 @@
     <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 macro="date-bib" sort="ascending"/>
       <key variable="status"/>
     </sort>
     <layout prefix="(" suffix=")" delimiter="; ">
@@ -1880,12 +1659,13 @@
     <sort>
       <key macro="author-bib"/>
       <key macro="date-sort-group"/>
-      <key macro="date-sort-date" sort="ascending"/>
+      <key macro="date-bib" sort="ascending"/>
       <key variable="status"/>
       <key macro="title"/>
     </sort>
     <layout>
       <choose>
+        <!-- TODO: Add new item types -->
         <if type="bill legal_case legislation treaty" match="any">
           <!-- Legal items have different orders and delimiters -->
           <choose>
diff --git a/buildres/csl/csl-styles/arachnologische-mitteilungen.csl b/buildres/csl/csl-styles/arachnologische-mitteilungen.csl
new file mode 100644
index 00000000000..d7551bbebd2
--- /dev/null
+++ b/buildres/csl/csl-styles/arachnologische-mitteilungen.csl
@@ -0,0 +1,251 @@
+<?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>Arachnologische Mitteilungen</title>
+    <title-short>AraMit</title-short>
+    <id>http://www.zotero.org/styles/arachnologische-mitteilungen</id>
+    <link href="http://www.zotero.org/styles/arachnologische-mitteilungen" rel="self"/>
+    <link href="http://www.zotero.org/styles/zootaxa" rel="template"/>
+    <link href="https://arages.de/zeitschrift/hinweise-fuer-autoren" rel="documentation"/>
+    <author>
+      <name>Hubert Höfer</name>
+    </author>
+    <category citation-format="author-date"/>
+    <category field="biology"/>
+    <summary>Zitierstil der Arachnologischen Mitteilungen (Arachnolgy Letters)</summary>
+    <updated>2023-01-16T08:06: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>
+  <locale xml:lang="en-US">
+    <date form="text">
+      <date-part name="month" suffix=" "/>
+      <date-part name="day" suffix=", "/>
+      <date-part name="year"/>
+    </date>
+  </locale>
+  <macro name="editor">
+    <names variable="editor" delimiter=",">
+      <name and="symbol" delimiter-precedes-last="never" et-al-use-last="true" initialize-with="" name-as-sort-order="all" sort-separator=" "/>
+      <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 and="symbol" delimiter-precedes-last="never" et-al-use-last="true" initialize-with="" name-as-sort-order="all" sort-separator=" "/>
+      <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=", " 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="DOI">
+        <text variable="DOI" prefix="&#8211; doi: "/>
+      </if>
+      <else>
+        <choose>
+          <if variable="URL">
+            <group delimiter=" " prefix="&#8211; ">
+              <text term="internet" text-case="capitalize-first" suffix=":"/>
+              <text variable="URL"/>
+              <group prefix="(" suffix=")">
+                <date form="numeric" variable="accessed"/>
+              </group>
+            </group>
+          </if>
+        </choose>
+      </else>
+    </choose>
+  </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="legal_case">
+    <group prefix=" " delimiter=" ">
+      <text variable="volume"/>
+      <text variable="container-title"/>
+    </group>
+    <text variable="authority" prefix=" (" suffix=")"/>
+  </macro>
+  <macro name="publisher">
+    <choose>
+      <if type="thesis" match="none">
+        <group delimiter=", " suffix=".">
+          <text variable="publisher"/>
+          <text variable="publisher-place"/>
+        </group>
+        <text variable="genre" prefix=". "/>
+      </if>
+      <else>
+        <group delimiter=". ">
+          <text variable="genre"/>
+          <text variable="publisher"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="year-date">
+    <choose>
+      <if variable="issued">
+        <group>
+          <date variable="issued">
+            <date-part name="year"/>
+          </date>
+        </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="issue" suffix=":"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="locator">
+    <choose>
+      <if locator="page">
+        <text variable="locator"/>
+      </if>
+      <else>
+        <group delimiter=" ">
+          <label variable="locator" form="short"/>
+          <text variable="locator"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="container-volume">
+    <text variable="container-title"/>
+    <text variable="volume" prefix=" "/>
+  </macro>
+  <macro name="collection">
+    <text variable="collection-title"/>
+    <text variable="collection-number" prefix=" "/>
+  </macro>
+  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" collapse="year-suffix" givenname-disambiguation-rule="primary-name">
+    <sort>
+      <key macro="author-short"/>
+      <key macro="year-date"/>
+    </sort>
+    <layout delimiter=", " prefix="(" suffix=")">
+      <group delimiter=": ">
+        <group delimiter=" ">
+          <text macro="author-short"/>
+          <text macro="year-date"/>
+        </group>
+        <text macro="locator"/>
+      </group>
+    </layout>
+  </citation>
+  <bibliography hanging-indent="true">
+    <sort>
+      <key macro="author"/>
+      <key macro="year-date"/>
+      <key variable="title"/>
+    </sort>
+    <layout suffix=" ">
+      <text macro="author" suffix=" "/>
+      <date variable="issued">
+        <date-part name="year"/>
+      </date>
+      <choose>
+        <if type="book" match="any">
+          <group delimiter=" " prefix=" ">
+            <text macro="title" suffix="."/>
+            <text macro="edition"/>
+            <text macro="editor" suffix="."/>
+            <text macro="collection" prefix="&#8211; " suffix=", "/>
+          </group>
+          <group delimiter=". " prefix=" ">
+            <text macro="publisher"/>
+            <group delimiter=" ">
+              <text variable="number-of-pages"/>
+              <text term="page" plural="true" form="short"/>
+            </group>
+          </group>
+        </if>
+        <else-if type="chapter paper-conference" match="any">
+          <text macro="title" prefix=" " suffix="."/>
+          <group delimiter=" " prefix=" In: ">
+            <text macro="editor"/>
+            <text macro="container-volume" suffix="."/>
+            <text variable="collection-title" suffix="."/>
+            <group>
+              <text macro="publisher"/>
+              <group delimiter=" " prefix=" ">
+                <label variable="page" form="short"/>
+                <text variable="page"/>
+              </group>
+            </group>
+          </group>
+        </else-if>
+        <else-if type="bill graphic legal_case legislation manuscript motion_picture report song thesis" match="any">
+          <text macro="legal_case"/>
+          <group prefix=" " delimiter=" ">
+            <text macro="title" suffix="."/>
+            <text macro="edition"/>
+            <text macro="editor" suffix="."/>
+          </group>
+          <group delimiter=", " prefix=" ">
+            <text macro="publisher"/>
+            <group delimiter=" ">
+              <text variable="page"/>
+              <text term="page" plural="true" form="short"/>
+            </group>
+          </group>
+        </else-if>
+        <else>
+          <group prefix=" " delimiter=" " suffix=".">
+            <text macro="title"/>
+            <text macro="editor"/>
+          </group>
+          <group prefix=" - ">
+            <text variable="container-title"/>
+            <group prefix=" ">
+              <text variable="volume"/>
+              <choose>
+                <if match="none" variable="issue">
+                  <text variable="issue" form="short"/>
+                </if>
+              </choose>
+            </group>
+            <text variable="page" prefix=": "/>
+          </group>
+        </else>
+      </choose>
+      <text macro="access" prefix=" "/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/csl/csl-styles/association-for-computational-linguistics.csl b/buildres/csl/csl-styles/association-for-computational-linguistics.csl
index 0fd76b842e5..a8e47c05f63 100644
--- a/buildres/csl/csl-styles/association-for-computational-linguistics.csl
+++ b/buildres/csl/csl-styles/association-for-computational-linguistics.csl
@@ -169,8 +169,10 @@
   <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true">
     <!-- no sorting for citation -->
     <layout prefix="(" suffix=")" delimiter="; ">
-      <text macro="author-short"/>
-      <text macro="year-date" prefix=", "/>
+      <group delimiter=", ">
+        <text macro="author-short"/>
+        <text macro="year-date"/>
+      </group>
     </layout>
   </citation>
   <bibliography et-al-min="20" et-al-use-first="19">
diff --git a/buildres/csl/csl-styles/begell-house-apa.csl b/buildres/csl/csl-styles/begell-house-apa.csl
index cd632d19ef4..425f7d514fb 100644
--- a/buildres/csl/csl-styles/begell-house-apa.csl
+++ b/buildres/csl/csl-styles/begell-house-apa.csl
@@ -41,8 +41,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
   -->
@@ -110,7 +110,7 @@
       </if>
       <else-if type="interview personal_communication">
         <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=", ">
@@ -191,7 +191,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>
@@ -224,9 +224,6 @@
       </else>
     </choose>
   </macro>
-  <macro name="date-sort-date">
-    <date variable="issued" form="numeric"/>
-  </macro>
   <macro name="date-intext">
     <choose>
       <if variable="issued">
@@ -252,7 +249,7 @@
                 <if type="interview personal_communication">
                   <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>
@@ -997,7 +994,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>
@@ -1298,7 +1295,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"/>
@@ -1571,7 +1568,7 @@
     <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 macro="date-bib" sort="ascending"/>
       <key variable="status"/>
     </sort>
     <layout prefix="(" suffix=")" delimiter="; ">
@@ -1586,7 +1583,7 @@
     <sort>
       <key macro="author-bib"/>
       <key macro="date-sort-group"/>
-      <key macro="date-sort-date" sort="ascending"/>
+      <key macro="date-bib" sort="ascending"/>
       <key variable="status"/>
       <key macro="title"/>
     </sort>
diff --git a/buildres/csl/csl-styles/berghahn-books-author-date-en-gb.csl b/buildres/csl/csl-styles/berghahn-books-author-date-en-gb.csl
index 9dd055b11c4..f36983db553 100644
--- a/buildres/csl/csl-styles/berghahn-books-author-date-en-gb.csl
+++ b/buildres/csl/csl-styles/berghahn-books-author-date-en-gb.csl
@@ -6,14 +6,14 @@
     <link href="http://www.zotero.org/styles/berghahn-books-author-date-en-gb" rel="self"/>
     <link href="http://www.zotero.org/styles/development-and-change" rel="template"/>
     <link href="https://www.berghahnbooks.com/authors/" rel="documentation"/>
+    <link href="https://www.berghahnbooks.com/uploads/authors/doc_style_UK.pdf" rel="documentation"/>
     <author>
       <name>Patrick O'Brien</name>
-      <email>obrienpat86@gmail.com</email>
     </author>
     <category citation-format="author-date"/>
     <category field="humanities"/>
     <category field="social_science"/>
-    <updated>2019-06-25T08:15:30+00:00</updated>
+    <updated>2023-08-13T15:57: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-GB">
@@ -33,7 +33,7 @@
       <if type="chapter paper-conference" match="any">
         <text term="in" suffix=" "/>
         <names variable="editor" delimiter=", ">
-          <name and="text" et-al-min="3" et-al-use-first="1" initialize-with="."/>
+          <name and="text" et-al-min="3" et-al-use-first="1"/>
           <label form="short" prefix=" (" suffix=")"/>
           <substitute>
             <names variable="translator"/>
@@ -57,7 +57,7 @@
   </macro>
   <macro name="author">
     <names variable="author" font-variant="normal">
-      <name and="text" delimiter-precedes-last="always" et-al-min="3" et-al-use-first="1" initialize-with="." name-as-sort-order="first"/>
+      <name and="text" delimiter-precedes-last="always" et-al-min="3" et-al-use-first="1" name-as-sort-order="first"/>
       <label form="short" prefix=" (" suffix=")"/>
       <substitute>
         <names variable="editor"/>
diff --git a/buildres/csl/csl-styles/bern-university-of-applied-sciences-school-of-agricultural-forest-and-food-sciences-hafl.csl b/buildres/csl/csl-styles/bern-university-of-applied-sciences-school-of-agricultural-forest-and-food-sciences-hafl.csl
index a372a9e4ef4..bdabde4ff85 100644
--- a/buildres/csl/csl-styles/bern-university-of-applied-sciences-school-of-agricultural-forest-and-food-sciences-hafl.csl
+++ b/buildres/csl/csl-styles/bern-university-of-applied-sciences-school-of-agricultural-forest-and-food-sciences-hafl.csl
@@ -12,13 +12,14 @@
     </author>
     <category citation-format="author-date"/>
     <category field="generic-base"/>
-    <updated>2021-10-25T15:32:58+00:00</updated>
+    <updated>2023-05-17T07:55: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="de">
     <terms>
       <term name="et-al">et al.</term>
       <term name="in">In</term>
+      <term name="from">vom</term>
       <term name="accessed">abgerufen am</term>
     </terms>
   </locale>
@@ -58,7 +59,7 @@
   <macro name="author">
     <names variable="author" delimiter="; ">
       <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
-      <label form="long" prefix=", " strip-periods="true"/>
+      <label form="short" strip-periods="false" prefix=" (" suffix=")"/>
       <substitute>
         <names variable="editor translator"/>
         <text variable="title"/>
@@ -71,7 +72,7 @@
       <substitute>
         <names variable="editor"/>
         <names variable="translator"/>
-        <text variable="title-short"/>
+        <text variable="title" form="short"/>
       </substitute>
     </names>
   </macro>
@@ -184,6 +185,11 @@
           <text macro="author-short"/>
           <text macro="year-date"/>
         </group>
+        <choose>
+          <if type="interview" match="any">
+            <text term="interview"/>
+          </if>
+        </choose>
         <text variable="locator"/>
       </group>
     </layout>
@@ -260,6 +266,13 @@
             <else-if type="webpage post post-weblog" match="any">
               <date form="numeric" variable="issued"/>
             </else-if>
+            <else-if type="interview" match="any">
+              <group delimiter=" ">
+                <text term="interview" text-case="capitalize-first"/>
+                <text term="from"/>
+                <date form="numeric" variable="issued"/>
+              </group>
+            </else-if>
             <else>
               <text macro="editor" suffix="." prefix=" "/>
               <group delimiter=", " prefix=" ">
diff --git a/buildres/csl/csl-styles/bibliothek-forschung-und-praxis.csl b/buildres/csl/csl-styles/bibliothek-forschung-und-praxis.csl
index 065d25cb847..dd1f70804f2 100644
--- a/buildres/csl/csl-styles/bibliothek-forschung-und-praxis.csl
+++ b/buildres/csl/csl-styles/bibliothek-forschung-und-praxis.csl
@@ -425,12 +425,15 @@
             <date-part name="year"/>
           </date>
         </group>
+        <text variable="year-suffix"/>
       </if>
       <else-if variable="status">
         <text variable="status" text-case="capitalize-first"/>
+        <text variable="year-suffix" prefix=" "/>
       </else-if>
       <else>
         <text term="no date" form="short"/>
+        <text variable="year-suffix" prefix=" "/>
       </else>
     </choose>
   </macro>
@@ -443,12 +446,15 @@
             <date-part name="year"/>
           </date>
         </group>
+        <text variable="year-suffix"/>
       </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>
diff --git a/buildres/csl/csl-styles/bio-protocol.csl b/buildres/csl/csl-styles/bio-protocol.csl
index 83048b66b4e..32f36b13174 100644
--- a/buildres/csl/csl-styles/bio-protocol.csl
+++ b/buildres/csl/csl-styles/bio-protocol.csl
@@ -220,9 +220,6 @@
       </else>
     </choose>
   </macro>
-  <macro name="date-sort-date">
-    <date variable="issued" form="numeric"/>
-  </macro>
   <macro name="date-intext">
     <choose>
       <if variable="issued">
@@ -1359,7 +1356,7 @@
     <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 macro="date-bib" sort="ascending"/>
       <key variable="status"/>
     </sort>
     <layout prefix="(" suffix=")" delimiter="; ">
@@ -1374,7 +1371,7 @@
     <sort>
       <key macro="author-bib"/>
       <key macro="date-sort-group"/>
-      <key macro="date-sort-date" sort="ascending"/>
+      <key macro="date-bib" sort="ascending"/>
       <key variable="status"/>
       <key macro="title"/>
     </sort>
diff --git a/buildres/csl/csl-styles/bluebook-law-review.csl b/buildres/csl/csl-styles/bluebook-law-review.csl
index 0aa30af6bd5..21d9aaea164 100644
--- a/buildres/csl/csl-styles/bluebook-law-review.csl
+++ b/buildres/csl/csl-styles/bluebook-law-review.csl
@@ -19,7 +19,7 @@
     <category citation-format="note"/>
     <category field="law"/>
     <summary>The Bluebook legal citation style for law reviews.</summary>
-    <updated>2022-03-09T09:33:23+00:00</updated>
+    <updated>2023-06-28T09: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>
@@ -111,7 +111,7 @@
       <if type="article-journal" match="any">
         <group delimiter=" ">
           <group delimiter=", ">
-            <text variable="title" font-style="italic"/>
+            <text variable="title" text-case="title" font-style="italic"/>
             <group delimiter=" ">
               <text variable="volume"/>
               <text macro="container"/>
@@ -125,7 +125,7 @@
       <else-if type="legal_case">
         <group delimiter=" ">
           <group delimiter=", ">
-            <text variable="title"/>
+            <text variable="title" text-case="title"/>
             <text variable="volume"/>
           </group>
           <text macro="container"/>
@@ -138,7 +138,7 @@
       </else-if>
       <else-if type="article-newspaper article-magazine thesis" match="any">
         <group delimiter=", ">
-          <text variable="title" font-style="italic"/>
+          <text variable="title" text-case="title" font-style="italic"/>
           <group delimiter=" ">
             <text variable="volume"/>
             <text macro="container"/>
@@ -151,7 +151,7 @@
         </group>
       </else-if>
       <else-if type="chapter paper-conference" match="any">
-        <text variable="title" font-style="italic"/>
+        <text variable="title" text-case="title" font-style="italic"/>
         <group prefix=", " delimiter=" " suffix=" ">
           <text variable="volume"/>
           <text macro="container"/>
@@ -161,13 +161,13 @@
         <text macro="issuance" prefix=" (" suffix=")"/>
       </else-if>
       <else-if type="book" match="any">
-        <text variable="title" font-variant="small-caps"/>
+        <text variable="title" text-case="title" font-variant="small-caps"/>
         <text variable="locator" prefix=" "/>
         <text macro="issuance" prefix=" (" suffix=")"/>
       </else-if>
       <else>
         <group delimiter=", ">
-          <text variable="title" font-style="italic"/>
+          <text variable="title" text-case="title" font-style="italic"/>
           <group delimiter=" ">
             <text variable="volume"/>
             <text macro="container"/>
@@ -181,10 +181,10 @@
   </macro>
   <macro name="issuance">
     <choose>
-      <if type="article-journal article-magazine article-newspaper broadcast interview manuscript map patent personal_communication song speech thesis webpage" match="any">
+      <if type="article-journal article-magazine article-newspaper broadcast interview manuscript map patent personal_communication song speech thesis webpage post-weblog" match="any">
         <group>
           <choose>
-            <if type="article-newspaper thesis" match="any">
+            <if type="article-newspaper thesis post-weblog" match="any">
               <group suffix=", ">
                 <date variable="issued">
                   <date-part name="month" form="short"/>
diff --git a/buildres/csl/csl-styles/cardiff-university-harvard.csl b/buildres/csl/csl-styles/cardiff-university-harvard.csl
index 401e2abd744..68703b4f79e 100644
--- a/buildres/csl/csl-styles/cardiff-university-harvard.csl
+++ b/buildres/csl/csl-styles/cardiff-university-harvard.csl
@@ -14,10 +14,13 @@
     <author>
       <name>Lewys Peters</name>
     </author>
+    <contributor>
+      <name>Patrick O'Brien</name>
+    </contributor>
     <category citation-format="author-date"/>
     <category field="generic-base"/>
     <summary>The Harvard author-date style - adapted for Cardiff University</summary>
-    <updated>2022-08-22T08:20:08+00:00</updated>
+    <updated>2023-04-05T08:14: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="editor">
@@ -85,7 +88,7 @@
   </macro>
   <macro name="title">
     <choose>
-      <if type="bill book graphic legal_case legislation motion_picture report song thesis patent" match="any">
+      <if type="bill book graphic legal_case legislation motion_picture report song thesis patent post post-weblog webpage" match="any">
         <text variable="title" font-style="italic"/>
       </if>
       <else>
@@ -101,20 +104,16 @@
   </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 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>
   </macro>
   <macro name="published-date">
@@ -141,13 +140,12 @@
     </choose>
   </macro>
   <macro name="pages">
+    <group>
+      <label variable="page" form="short" suffix=" "/>
+      <text variable="page"/>
+    </group>
     <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>
+      <if type="article article-journal article-magazine article-newspaper book review review-book report" match="any"/>
     </choose>
   </macro>
   <macro name="bill-detail">
@@ -188,69 +186,82 @@
       <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=", ">
+      <group delimiter=". ">
+        <text macro="author"/>
+        <text macro="year-date"/>
+        <choose>
+          <if type="bill book graphic legal_case legislation motion_picture report song entry-encyclopedia entry-dictionary" match="any">
+            <group delimiter=". " suffix=".">
+              <text macro="title"/>
+              <text macro="edition"/>
+              <text macro="editor"/>
               <text macro="publisher"/>
+              <text macro="bill-detail"/>
+              <text macro="pages"/>
             </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 post post-weblog" match="any">
-          <group delimiter=". " prefix=" " suffix=".">
-            <text macro="title"/>
-          </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>
+          </if>
+          <else-if type="chapter paper-conference" match="any">
+            <group delimiter=". " suffix=".">
+              <text macro="title"/>
+              <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=", ">
+                  <date form="text" variable="event-date"/>
+                  <text macro="publisher"/>
+                  <text macro="pages"/>
+                </group>
+              </group>
+            </group>
+          </else-if>
+          <else-if type="thesis">
+            <group delimiter=". " suffix=".">
+              <text macro="title"/>
+              <text macro="edition"/>
+              <group prefix=" " delimiter=", ">
+                <text variable="genre"/>
+                <text macro="publisher"/>
+              </group>
+            </group>
+          </else-if>
+          <else-if type="webpage post post-weblog" match="any">
+            <group delimiter=". " suffix=".">
+              <text macro="title"/>
+            </group>
+          </else-if>
+          <else-if type="patent" match="any">
+            <group delimiter=" " suffix=".">
+              <text macro="title"/>
+              <text macro="patent"/>
+            </group>
+          </else-if>
+          <else>
+            <group delimiter=". " suffix=".">
+              <group>
+                <text macro="title"/>
+                <text macro="editor" prefix=" "/>
+              </group>
+              <group delimiter=", ">
+                <group delimiter=" ">
+                  <text variable="container-title" font-style="italic"/>
+                  <group>
+                    <text variable="volume"/>
+                    <text variable="issue" prefix="(" suffix=")"/>
+                  </group>
+                </group>
+                <text macro="pages"/>
+              </group>
+            </group>
+          </else>
+        </choose>
+      </group>
+      <group suffix=".">
         <text macro="published-date"/>
-        <text macro="pages" prefix=", "/>
         <text prefix=". " macro="access" suffix="."/>
       </group>
     </layout>
diff --git a/buildres/csl/csl-styles/chicago-author-date.csl b/buildres/csl/csl-styles/chicago-author-date.csl
index 4ea0eb2cde0..ec19900821b 100644
--- a/buildres/csl/csl-styles/chicago-author-date.csl
+++ b/buildres/csl/csl-styles/chicago-author-date.csl
@@ -217,7 +217,7 @@
     <choose>
       <if variable="title" match="none">
         <choose>
-          <if type="personal_communication" match="none">
+          <if type="personal_communication speech thesis" match="none">
             <text variable="genre" text-case="capitalize-first"/>
           </if>
         </choose>
diff --git a/buildres/csl/csl-styles/citation-compass-apa-note.csl b/buildres/csl/csl-styles/citation-compass-apa-note.csl
index 5844fa346ad..4e379fb20b4 100644
--- a/buildres/csl/csl-styles/citation-compass-apa-note.csl
+++ b/buildres/csl/csl-styles/citation-compass-apa-note.csl
@@ -54,8 +54,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
   -->
@@ -123,7 +123,7 @@
       </if>
       <else-if type="interview personal_communication">
         <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=", ">
@@ -204,7 +204,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>
@@ -237,9 +237,6 @@
       </else>
     </choose>
   </macro>
-  <macro name="date-sort-date">
-    <date variable="issued" form="numeric"/>
-  </macro>
   <macro name="date-intext">
     <choose>
       <if variable="issued">
@@ -265,7 +262,7 @@
                 <if type="interview personal_communication">
                   <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>
@@ -1030,7 +1027,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>
@@ -1310,7 +1307,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"/>
@@ -1580,7 +1577,7 @@
     <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 macro="date-bib" sort="ascending"/>
       <key variable="status"/>
     </sort>
     <layout delimiter="; ">
@@ -1597,7 +1594,7 @@
     <sort>
       <key macro="author-bib"/>
       <key macro="date-sort-group"/>
-      <key macro="date-sort-date" sort="ascending"/>
+      <key macro="date-bib" sort="ascending"/>
       <key variable="status"/>
       <key macro="title"/>
     </sort>
diff --git a/buildres/csl/csl-styles/dependent/energy-research-and-social-science.csl b/buildres/csl/csl-styles/dependent/energy-research-and-social-science.csl
deleted file mode 100644
index 5ccd3c089d6..00000000000
--- a/buildres/csl/csl-styles/dependent/energy-research-and-social-science.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>Energy Research &amp; Social Science</title>
-    <id>http://www.zotero.org/styles/energy-research-and-social-science</id>
-    <link href="http://www.zotero.org/styles/energy-research-and-social-science" rel="self"/>
-    <link href="http://www.zotero.org/styles/elsevier-with-titles" rel="independent-parent"/>
-    <category citation-format="numeric"/>
-    <issn>2214-6296</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/harvard-the-university-of-melbourne.csl b/buildres/csl/csl-styles/dependent/harvard-the-university-of-melbourne.csl
new file mode 100644
index 00000000000..eea8e1fc539
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/harvard-the-university-of-melbourne.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>The University of Melbourne - Harvard</title>
+    <id>http://www.zotero.org/styles/harvard-the-university-of-melbourne</id>
+    <link href="http://www.zotero.org/styles/harvard-the-university-of-melbourne" rel="self"/>
+    <link href="http://www.zotero.org/styles/style-manual-australian-government" rel="independent-parent"/>
+    <link href="https://library.unimelb.edu.au/recite/referencing-styles/harvard" rel="documentation"/>
+    <category citation-format="author-date"/>
+    <category field="generic-base"/>
+    <updated>2023-05-15T12: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/jci-insight.csl b/buildres/csl/csl-styles/dependent/jci-insight.csl
new file mode 100644
index 00000000000..4dc8ede77f0
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/jci-insight.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>JCI Insight</title>
+    <id>http://www.zotero.org/styles/jci-insight</id>
+    <link href="http://www.zotero.org/styles/jci-insight" rel="self"/>
+    <link href="http://www.zotero.org/styles/the-journal-of-clinical-investigation" rel="independent-parent"/>
+    <link href="https://insight.jci.org/kiosk/publish/examples" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="medicine"/>
+    <eissn>2379-3708</eissn>    
+    <updated>2023-07-24T23:50: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>
+</style>
diff --git a/buildres/csl/csl-styles/dependent/magnetic-resonance-in-medicine.csl b/buildres/csl/csl-styles/dependent/magnetic-resonance-in-medicine.csl
new file mode 100644
index 00000000000..5fdd285e808
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/magnetic-resonance-in-medicine.csl
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <info>
+    <title>Magnetic Resonance in Medicine</title>
+    <id>http://www.zotero.org/styles/magnetic-resonance-in-medicine</id>
+    <link href="http://www.zotero.org/styles/magnetic-resonance-in-medicine" rel="self"/>
+    <link href="http://www.zotero.org/styles/american-medical-association-10th-edition" rel="independent-parent"/>
+    <link href="https://onlinelibrary.wiley.com/journal/15222594" rel="documentation"/>
+    <link href="https://onlinelibrary.wiley.com/pb-assets/assets/15222594/authorguidelinesdec22-1671206311.pdf" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="medicine"/>
+    <issn>0740-3194</issn>
+    <eissn>1522-2594</eissn>
+    <updated>2023-02-27T21: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/molecular-physics.csl b/buildres/csl/csl-styles/dependent/molecular-physics.csl
new file mode 100644
index 00000000000..a8cc54bcf7b
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/molecular-physics.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>Molecular Physics</title>
+    <id>http://www.zotero.org/styles/molecular-physics</id>
+    <link href="http://www.zotero.org/styles/molecular-physics" rel="self"/>
+    <link href="http://www.zotero.org/styles/taylor-and-francis-aip" rel="independent-parent"/>
+    <link href="https://www.tandfonline.com/action/authorSubmission?show=instructions&amp;journalCode=tmph20#references" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="physics"/>
+    <issn>0026-8976</issn>
+    <eissn>1362-3028</eissn>
+    <updated>2014-05-15T12: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/retina.csl b/buildres/csl/csl-styles/dependent/retina.csl
deleted file mode 100644
index 853f2bf8394..00000000000
--- a/buildres/csl/csl-styles/dependent/retina.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>Retina</title>
-    <id>http://www.zotero.org/styles/retina</id>
-    <link href="http://www.zotero.org/styles/retina" rel="self"/>
-    <link href="http://www.zotero.org/styles/american-medical-association" rel="independent-parent"/>
-    <link href="http://edmgr.ovid.com/retina/accounts/ifauth.htm" rel="documentation"/>
-    <category citation-format="numeric"/>
-    <category field="medicine"/>
-    <issn>0275-004X</issn>
-    <eissn>1539-2864</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>
-</style>
diff --git a/buildres/csl/csl-styles/dependent/turabian-fullnote-bibliography.csl b/buildres/csl/csl-styles/dependent/turabian-fullnote-bibliography.csl
new file mode 100644
index 00000000000..67f916a42c5
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/turabian-fullnote-bibliography.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>Turabian 9th edition (full note)</title>
+    <id>http://www.zotero.org/styles/turabian-fullnote-bibliography</id>
+    <link href="http://www.zotero.org/styles/turabian-fullnote-bibliography" rel="self"/>
+    <link href="http://www.zotero.org/styles/chicago-fullnote-bibliography" rel="self"/>
+    <link href="http://www.zotero.org/styles/chicago-fullnote-bibliography" rel="independent-parent"/>
+    <link href="http://www.press.uchicago.edu/books/turabian/turabian_citationguide.html" rel="documentation"/>
+    <category citation-format="note"/>
+    <category field="generic-base"/>
+    <updated>2023-05-11T12: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/duale-hochschule-baden-wurttemberg-department-of-international-business.csl b/buildres/csl/csl-styles/duale-hochschule-baden-wurttemberg-department-of-international-business.csl
new file mode 100644
index 00000000000..16d4c4d1454
--- /dev/null
+++ b/buildres/csl/csl-styles/duale-hochschule-baden-wurttemberg-department-of-international-business.csl
@@ -0,0 +1,331 @@
+<?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-GB">
+  <info>
+    <title>Duale Hochschule Baden-Württemberg - Department of International Business</title>
+    <id>http://www.zotero.org/styles/duale-hochschule-baden-wurttemberg-department-of-international-business</id>
+    <link href="http://www.zotero.org/styles/duale-hochschule-baden-wurttemberg-department-of-international-business" rel="self"/>
+    <link href="http://www.zotero.org/styles/wiesbaden-business-school" rel="template"/>
+    <link href="https://www.dhbw-stuttgart.de/studierendenportale/bwl-ib/Zitierrichtlinien/Guidelines_for_Academic_Writing_v1.7.1.pdf" rel="documentation"/>
+    <author>
+      <name>Patrick O'Brien, PhD</name>
+    </author>
+    <category citation-format="note"/>
+    <category field="humanities"/>
+    <summary>Based on the Guidelines for Academic Writing as of December 2022 (version 1.7).</summary>
+    <updated>2023-08-08T10:40: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>
+  <locale xml:lang="en">
+    <terms>
+      <term name="accessed" form="long">status as of</term>
+      <term name="on">of</term>
+    </terms>
+  </locale>
+  <locale xml:lang="de">
+    <terms>
+      <term name="et-al">et al.</term>
+      <term name="volume" form="short">Jg.</term>
+      <term name="issue" form="long">Heft</term>
+      <term name="retrieved">zugegriffen am</term>
+      <term name="anonymous" form="short">o.V.</term>
+      <term name="accessed">Stand</term>
+      <term name="section" form="short">
+        <single>Abs.</single>
+        <multiple>Abs.</multiple>
+      </term>
+    </terms>
+  </locale>
+  <macro name="author">
+    <names variable="author">
+      <name delimiter="; " delimiter-precedes-last="never" initialize-with=". " name-as-sort-order="all"/>
+      <label form="short" prefix=" (" suffix=")"/>
+      <substitute>
+        <names variable="editor"/>
+        <choose>
+          <if type="entry-dictionary entry-encyclopedia" match="any">
+            <text variable="container-title"/>
+          </if>
+        </choose>
+        <text macro="anonymous"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="anonymous">
+    <text term="anonymous" form="short" text-case="capitalize-first" strip-periods="true"/>
+  </macro>
+  <macro name="author-short">
+    <names variable="author" delimiter=", ">
+      <name delimiter="; " delimiter-precedes-last="never" initialize-with=". " name-as-sort-order="all"/>
+      <label form="short"/>
+      <substitute>
+        <names variable="editor translator"/>
+        <text macro="anonymous" strip-periods="false"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="editor">
+    <names variable="editor" delimiter="; ">
+      <name delimiter="; " delimiter-precedes-last="never" initialize-with=". " name-as-sort-order="all"/>
+      <label form="short" prefix=" (" suffix=")"/>
+    </names>
+  </macro>
+  <macro name="access">
+    <group delimiter=" ">
+      <text variable="URL"/>
+      <group delimiter=" " prefix="(" suffix=")">
+        <text term="accessed"/>
+        <date variable="accessed">
+          <date-part name="month" suffix=" "/>
+          <date-part name="day" suffix=", "/>
+          <date-part form="long" name="year"/>
+        </date>
+      </group>
+    </group>
+  </macro>
+  <macro name="date">
+    <choose>
+      <if variable="issued">
+        <date variable="issued">
+          <date-part form="numeric" name="day" suffix="."/>
+          <date-part form="numeric" name="month" suffix="."/>
+          <date-part form="long" name="year"/>
+        </date>
+      </if>
+      <else>
+        <date variable="accessed">
+          <date-part form="numeric" name="day" suffix="."/>
+          <date-part form="numeric" name="month" suffix="."/>
+          <date-part form="long" name="year"/>
+        </date>
+      </else>
+    </choose>
+  </macro>
+  <macro name="year-date">
+    <choose>
+      <if match="any" is-uncertain-date="issued">
+        <text term="no date"/>
+      </if>
+      <else>
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+      </else>
+    </choose>
+    <choose>
+      <if type="interview" match="any">
+        <text variable="medium" prefix=", "/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="pages">
+    <group delimiter=" ">
+      <label strip-periods="false" variable="page" form="short"/>
+      <text variable="page"/>
+    </group>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=", ">
+      <choose>
+        <if type="report" match="any">
+          <text variable="publisher"/>
+        </if>
+      </choose>
+      <text variable="publisher-place"/>
+    </group>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if match="any" is-numeric="edition">
+        <group delimiter=". ">
+          <number variable="edition"/>
+          <label text-case="capitalize-first" variable="edition"/>
+        </group>
+      </if>
+      <else>
+        <text variable="edition"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="type-sort">
+    <choose>
+      <if type="webpage post post-weblog" match="any">
+        <text value="X"/>
+      </if>
+      <else-if type="legal_case legislation" match="any">
+        <text value="Y"/>
+      </else-if>
+      <else-if type="interview" match="any">
+        <text value="Z"/>
+      </else-if>
+      <else>
+        <text value="A"/>
+      </else>
+    </choose>
+  </macro>
+  <citation et-al-min="4" et-al-use-first="1" disambiguate-add-year-suffix="true">
+    <layout delimiter="; " suffix=".">
+      <group delimiter=", ">
+        <group delimiter=" ">
+          <text macro="author-short"/>
+          <text macro="year-date" prefix="(" suffix=")"/>
+        </group>
+        <choose>
+          <if type="post post-weblog webpage" match="any">
+            <text macro="access"/>
+          </if>
+          <else-if type="interview" match="any">
+            <group delimiter=", ">
+              <text variable="genre"/>
+              <date form="text" date-parts="year-month-day" variable="issued"/>
+            </group>
+          </else-if>
+          <else-if type="entry-dictionary" match="any">
+            <text variable="title"/>
+          </else-if>
+        </choose>
+        <group delimiter=" ">
+          <label variable="locator" form="short"/>
+          <text variable="locator"/>
+        </group>
+      </group>
+    </layout>
+  </citation>
+  <bibliography>
+    <sort>
+      <key macro="type-sort"/>
+      <key macro="author"/>
+      <key macro="date"/>
+    </sort>
+    <layout suffix=".">
+      <choose>
+        <if type="legal_case" match="any">
+          <group delimiter=", ">
+            <group delimiter=" ">
+              <text variable="title" font-weight="bold"/>
+              <text term="from"/>
+              <date form="numeric" variable="issued"/>
+            </group>
+            <text variable="authority"/>
+            <text variable="number"/>
+            <group delimiter=" ">
+              <text variable="container-title"/>
+              <text variable="volume"/>
+            </group>
+            <group delimiter=" ">
+              <label variable="page" form="short"/>
+              <text variable="page-first"/>
+            </group>
+          </group>
+        </if>
+        <else>
+          <group>
+            <group delimiter=" ">
+              <group font-weight="bold">
+                <text macro="author"/>
+                <text macro="year-date" prefix=" (" suffix="):"/>
+              </group>
+              <text variable="title"/>
+            </group>
+            <choose>
+              <if type="webpage post-weblog post" match="any">
+                <group delimiter=". " prefix=", ">
+                  <text variable="container-title"/>
+                  <text macro="access"/>
+                </group>
+              </if>
+              <else-if type="speech" match="any">
+                <group delimiter=", " prefix=". ">
+                  <text variable="publisher-place"/>
+                  <text macro="date" prefix=", "/>
+                  <text macro="access" prefix=", "/>
+                </group>
+              </else-if>
+              <else-if type="article-journal" match="any">
+                <group delimiter=", " prefix=". ">
+                  <text variable="container-title"/>
+                  <group delimiter=". ">
+                    <label variable="volume" form="short"/>
+                    <text variable="volume"/>
+                  </group>
+                  <group delimiter=" ">
+                    <label variable="issue" form="short"/>
+                    <text variable="issue"/>
+                  </group>
+                  <text macro="pages"/>
+                </group>
+              </else-if>
+              <else-if type="article-newspaper article-magazine" match="any">
+                <group delimiter=", " prefix=". ">
+                  <text variable="container-title"/>
+                  <group delimiter=" ">
+                    <group delimiter=" ">
+                      <label text-case="capitalize-first" variable="issue" form="short"/>
+                      <text variable="issue"/>
+                    </group>
+                    <text term="on"/>
+                    <date form="text" variable="issued"/>
+                  </group>
+                  <text macro="pages"/>
+                </group>
+              </else-if>
+              <else-if type="chapter paper-conference" match="any">
+                <group delimiter=". " prefix=". ">
+                  <group delimiter=": ">
+                    <text term="in" text-case="capitalize-first"/>
+                    <text macro="editor"/>
+                    <text variable="container-title" font-style="normal"/>
+                  </group>
+                  <group delimiter=", ">
+                    <text macro="edition"/>
+                    <text macro="publisher"/>
+                    <text macro="pages"/>
+                  </group>
+                </group>
+              </else-if>
+              <else-if type="thesis" match="any">
+                <group delimiter=", " prefix=". ">
+                  <text variable="genre"/>
+                  <text macro="publisher"/>
+                </group>
+              </else-if>
+              <else-if type="interview" match="any">
+                <group delimiter=" " prefix=", ">
+                  <text variable="genre"/>
+                  <date form="text" variable="issued" prefix=" on "/>
+                  <group delimiter=" ">
+                    <text term="in"/>
+                    <text variable="publisher-place"/>
+                  </group>
+                </group>
+              </else-if>
+              <else-if type="report" match="any">
+                <group delimiter=", " prefix=". ">
+                  <group delimiter=" ">
+                    <text variable="genre"/>
+                    <group delimiter=" ">
+                      <label text-case="capitalize-first" variable="issue" form="short"/>
+                      <text variable="number"/>
+                    </group>
+                  </group>
+                  <text macro="publisher"/>
+                </group>
+              </else-if>
+              <else-if type="entry-dictionary entry-encyclopedia" match="any">
+                <group delimiter=", " prefix=", ">
+                  <text macro="edition"/>
+                  <text macro="publisher"/>
+                </group>
+              </else-if>
+              <else>
+                <group delimiter=", " prefix=". ">
+                  <text macro="edition"/>
+                  <text macro="publisher"/>
+                </group>
+              </else>
+            </choose>
+          </group>
+        </else>
+      </choose>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/csl/csl-styles/ecosistemas.csl b/buildres/csl/csl-styles/ecosistemas.csl
index 0c8fb185859..d7db55aa527 100644
--- a/buildres/csl/csl-styles/ecosistemas.csl
+++ b/buildres/csl/csl-styles/ecosistemas.csl
@@ -6,8 +6,8 @@
     <id>http://www.zotero.org/styles/ecosistemas</id>
     <link href="http://www.zotero.org/styles/ecosistemas" rel="self"/>
     <link href="http://www.zotero.org/styles/american-journal-of-botany" rel="template"/>
-    <link href="http://www.revistaecosistemas.net/public/journals/1/docs/Normasparaautores_RevistaEcosistemas.pdf" rel="documentation"/>
-    <link href="http://www.revistaecosistemas.net/index.php/ecosistemas/about/submissions#authorGuidelines" rel="documentation"/>
+    <link href="https://www.revistaecosistemas.net/public/journals/1/docs/Normasparaautores_RevistaEcosistemas.pdf" rel="documentation"/>
+    <link href="https://www.revistaecosistemas.net/index.php/ecosistemas/about/submissions" rel="documentation"/>
     <author>
       <name>Francisco Rodriguez-Sanchez</name>
       <email>f.rodriguez.sanc@gmail.com</email>
@@ -113,7 +113,7 @@
     </sort>
     <layout prefix="(" suffix=")" delimiter="; ">
       <group delimiter=" ">
-        <group delimiter=", ">
+        <group delimiter=" ">
           <text macro="author-short"/>
           <text macro="year-date"/>
         </group>
diff --git a/buildres/csl/csl-styles/energy-research-and-social-science.csl b/buildres/csl/csl-styles/energy-research-and-social-science.csl
new file mode 100644
index 00000000000..e3c4a246a53
--- /dev/null
+++ b/buildres/csl/csl-styles/energy-research-and-social-science.csl
@@ -0,0 +1,342 @@
+<?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" initialize-with-hyphen="false" page-range-format="minimal">
+  <info>
+    <title>Energy Research &amp; Social Science</title>
+    <id>http://www.zotero.org/styles/energy-research-and-social-science</id>
+    <link rel="self" href="http://www.zotero.org/styles/energy-research-and-social-science"/>
+    <link href="http://www.zotero.org/styles/vancouver" rel="template"/>
+    <link href="https://www.elsevier.com/journals/energy-research-and-social-science/2214-6296/guide-for-authors" rel="documentation"/>
+    <author>
+      <name>Patrick O'Brien</name>
+    </author>
+    <category citation-format="numeric"/>
+    <category field="medicine"/>
+    <issn>2214-6296</issn>
+    <updated>2023-06-07T13:49: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">
+    <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>
+    </terms>
+  </locale>
+  <locale xml:lang="fr">
+    <date form="text" delimiter=" ">
+      <date-part name="day"/>
+      <date-part name="month" form="short" strip-periods="true"/>
+      <date-part name="year"/>
+    </date>
+  </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>
+        <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="long" 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 variable="URL">
+        <group delimiter=": ">
+          <text term="available at" text-case="capitalize-first"/>
+          <text variable="URL"/>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="accessed-date">
+    <choose>
+      <if variable="URL">
+        <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 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>
+        <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 suffix=";" delimiter=" ">
+          <date variable="issued" form="text"/>
+          <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>
+    <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>
+      <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"/>
+          </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/environmental-and-engineering-geoscience.csl b/buildres/csl/csl-styles/environmental-and-engineering-geoscience.csl
index fcf83490e56..e7235a005b8 100644
--- a/buildres/csl/csl-styles/environmental-and-engineering-geoscience.csl
+++ b/buildres/csl/csl-styles/environmental-and-engineering-geoscience.csl
@@ -2,9 +2,10 @@
 <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>Environmental &amp; Engineering Geoscience</title>
+    <title-short>EEG</title-short>
     <id>http://www.zotero.org/styles/environmental-and-engineering-geoscience</id>
     <link href="http://www.zotero.org/styles/environmental-and-engineering-geoscience" rel="self"/>
-    <link href="http://eeg.allentrack.net/html/eeginstr.pdf" rel="documentation"/>
+    <link href="https://aeg.memberclicks.net/assets/docs/Publications/EEG-Author-Instructions.pdf" rel="documentation"/>
     <author>
       <name>Aditi Bhaskar</name>
     </author>
@@ -14,21 +15,38 @@
     <contributor>
       <name>Rintze Zelle</name>
     </contributor>
+    <contributor>
+      <name>Patrick O'Brien</name>
+    </contributor>
     <category citation-format="author-date"/>
     <category field="geology"/>
     <issn>1078-7275</issn>
-    <updated>2012-09-27T22:06:38+00:00</updated>
+    <summary>Style based on guidelines from January, 2021.</summary>
+    <updated>2023-04-22T13:06: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="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="editor-translator">
     <names variable="editor translator" prefix="(" suffix=")" delimiter=", ">
       <name and="symbol" initialize-with=". " delimiter=", "/>
-      <label form="short" prefix=", " text-case="capitalize-first"/>
+      <label text-case="capitalize-first" prefix=" (" suffix=")"/>
     </names>
   </macro>
   <macro name="author">
-    <names variable="author">
-      <name name-as-sort-order="all" and="text" sort-separator=", " initialize-with="." delimiter=", " delimiter-precedes-last="always"/>
+    <names variable="author" font-variant="small-caps">
+      <name delimiter="; " and="text" delimiter-precedes-last="always" initialize-with="." name-as-sort-order="all"/>
       <label form="short" prefix=" (" suffix=")" text-case="capitalize-first"/>
       <substitute>
         <names variable="editor"/>
@@ -60,7 +78,23 @@
       <text variable="publisher-place"/>
     </group>
   </macro>
+  <macro name="pages">
+    <group delimiter=" ">
+      <label variable="page" form="short"/>
+      <text variable="page"/>
+    </group>
+  </macro>
+  <macro name="number-of-pages">
+    <group delimiter=" ">
+      <text variable="number-of-pages"/>
+      <label plural="never" 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">
+    <sort>
+      <key macro="author"/>
+      <key variable="issued"/>
+    </sort>
     <layout prefix="(" suffix=")" delimiter="; ">
       <group delimiter=", ">
         <text macro="author-short"/>
@@ -82,70 +116,103 @@
     <layout suffix=".">
       <group delimiter=", ">
         <text macro="author"/>
-        <date variable="issued" suffix=",">
+        <date variable="issued">
           <date-part name="year"/>
         </date>
-      </group>
-      <choose>
-        <if type="report">
-          <text variable="title" prefix=" " suffix=":"/>
-          <text variable="publisher" prefix=" " suffix=","/>
-          <text variable="collection-title" prefix=" "/>
-        </if>
-        <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
-          <group suffix=":">
-            <text variable="title" prefix=" "/>
-            <text macro="editor-translator" prefix=" "/>
-          </group>
-          <text prefix=" " suffix="." macro="publisher"/>
-        </else-if>
-        <else-if type="chapter paper-conference" match="any">
-          <text variable="title" prefix=" "/>
-          <group prefix=", ">
-            <text term="in" font-style="italic"/>
-            <names variable="editor translator" prefix=" " suffix="," delimiter=", ">
-              <name and="text" sort-separator=", " initialize-with="." name-as-sort-order="all"/>
-              <label form="short" prefix=" "/>
-            </names>
-            <text variable="container-title" prefix=" " suffix=","/>
-            <text variable="collection-title" prefix=" " suffix=","/>
-            <group suffix=".">
-              <text macro="publisher" prefix=" "/>
-              <group prefix=", ">
-                <text variable="page" prefix="p. "/>
+        <choose>
+          <if type="report">
+            <group delimiter=", ">
+              <group delimiter=": ">
+                <text variable="title" font-style="italic" suffix=":"/>
+                <group delimiter=" ">
+                  <text variable="genre" prefix=" "/>
+                  <text variable="number"/>
+                </group>
               </group>
+              <text macro="number-of-pages" prefix=" " suffix=","/>
+            </group>
+          </if>
+          <else-if type="bill book graphic legal_case legislation motion_picture song" match="any">
+            <group delimiter=": ">
+              <group delimiter=", " suffix=":">
+                <text variable="title" text-case="title"/>
+                <text macro="edition"/>
+                <text macro="editor-translator"/>
+              </group>
+              <group delimiter=", ">
+                <text macro="publisher"/>
+                <text macro="number-of-pages"/>
+              </group>
+            </group>
+          </else-if>
+          <else-if type="chapter paper-conference" match="any">
+            <group delimiter=". ">
+              <text variable="title"/>
+              <group delimiter=", ">
+                <group delimiter=" ">
+                  <text term="in" text-case="capitalize-first" font-style="normal"/>
+                  <names variable="editor translator" delimiter=", ">
+                    <name and="text" initialize-with=". " name-as-sort-order="all"/>
+                    <label text-case="capitalize-first" prefix=" (" suffix=")"/>
+                  </names>
+                </group>
+                <text variable="container-title"/>
+                <text variable="collection-title"/>
+              </group>
+              <group delimiter=", ">
+                <text macro="publisher"/>
+                <text macro="pages"/>
+              </group>
+            </group>
+          </else-if>
+          <else-if type="map">
+            <text variable="title"/>
+            <text variable="collection-title" prefix=": "/>
+            <text variable="note" prefix=", scale "/>
+          </else-if>
+          <else-if type="thesis">
+            <group delimiter=", ">
+              <text variable="title" text-case="title" font-style="italic"/>
+              <group delimiter=": ">
+                <text variable="publisher-place" font-style="italic"/>
+                <text variable="genre"/>
+              </group>
+              <text macro="number-of-pages"/>
             </group>
-          </group>
-        </else-if>
-        <else-if type="map">
-          <text variable="title" prefix=" "/>
-          <text variable="collection-title" prefix=": "/>
-          <text variable="note" prefix=", scale "/>
-        </else-if>
-        <else-if type="thesis">
-          <text variable="title" prefix=" "/>
-          <text variable="genre" prefix=" [" suffix="]"/>
-          <group prefix=": " delimiter=", ">
-            <!--text variable="place" -->
             <text variable="publisher"/>
-            <!--text variable="number-of-pages" suffix=" p."-->
-          </group>
-        </else-if>
-        <else>
-          <group suffix=":">
-            <text variable="title" prefix=" "/>
-            <text macro="editor-translator" prefix=" "/>
-          </group>
-          <group prefix=" " suffix=".">
-            <text variable="container-title" suffix="," font-style="italic"/>
-            <group prefix=" ">
-              <text variable="volume" prefix="v. "/>
-              <text variable="issue" prefix=", no. "/>
+          </else-if>
+          <else-if type="webpage post post-weblog" match="any">
+            <group delimiter=", ">
+              <group delimiter=": ">
+                <text variable="title" text-case="title"/>
+                <text variable="genre"/>
+              </group>
+              <group delimiter=" ">
+                <text term="available at"/>
+                <text variable="URL"/>
+              </group>
             </group>
-            <text variable="page" prefix=", p. "/>
-          </group>
-        </else>
-      </choose>
+          </else-if>
+          <else>
+            <group>
+              <text variable="title"/>
+              <text macro="editor-translator" prefix=" "/>
+            </group>
+            <group delimiter=", ">
+              <text variable="container-title" suffix="," font-style="italic"/>
+              <group delimiter=" " prefix=" ">
+                <label text-case="capitalize-first" variable="volume" form="short"/>
+                <text variable="volume"/>
+              </group>
+              <group delimiter=" ">
+                <label text-case="capitalize-first" variable="issue" form="short"/>
+                <text variable="issue"/>
+              </group>
+              <text macro="pages"/>
+            </group>
+          </else>
+        </choose>
+      </group>
     </layout>
   </bibliography>
 </style>
diff --git a/buildres/csl/csl-styles/european-review-of-agricultural-economics.csl b/buildres/csl/csl-styles/european-review-of-agricultural-economics.csl
index 80d5b9700d1..9945751671f 100644
--- a/buildres/csl/csl-styles/european-review-of-agricultural-economics.csl
+++ b/buildres/csl/csl-styles/european-review-of-agricultural-economics.csl
@@ -214,9 +214,6 @@
       </else>
     </choose>
   </macro>
-  <macro name="date-sort-date">
-    <date variable="issued" form="numeric"/>
-  </macro>
   <macro name="date-intext">
     <choose>
       <if variable="issued">
@@ -1227,7 +1224,7 @@
     <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 macro="date-bib" sort="ascending"/>
       <key variable="status"/>
     </sort>
     <layout prefix="(" suffix=")" delimiter="; ">
@@ -1242,7 +1239,7 @@
     <sort>
       <key macro="author-bib"/>
       <key macro="date-sort-group"/>
-      <key macro="date-sort-date" sort="ascending"/>
+      <key macro="date-bib" sort="ascending"/>
       <key variable="status"/>
       <key macro="title"/>
     </sort>
diff --git a/buildres/csl/csl-styles/food-and-agriculture-organization-of-the-united-nations-numeric.csl b/buildres/csl/csl-styles/food-and-agriculture-organization-of-the-united-nations-numeric.csl
new file mode 100644
index 00000000000..6e985542482
--- /dev/null
+++ b/buildres/csl/csl-styles/food-and-agriculture-organization-of-the-united-nations-numeric.csl
@@ -0,0 +1,377 @@
+<?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 (http://editor.citationstyles.org/visualEditor/) -->
+  <info>
+    <title>Food and Agriculture Organization of the United Nations (numeric)</title>
+    <title-short>FAO (numeric)</title-short>
+    <id>http://www.zotero.org/styles/food-and-agriculture-organization-of-the-united-nations-numeric</id>
+    <link href="http://www.zotero.org/styles/food-and-agriculture-organization-of-the-united-nations-numeric" rel="self"/>
+    <link href="https://www.fao.org/3/cb8081en/cb8081en.pdf" rel="documentation"/>
+    <author>
+      <name>Bin Liu</name>
+      <email>lieubean@gmail.com</email>
+      <uri>https://www.linkedin.com/in/lieubean/</uri>
+    </author>
+    <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: February 2022.</summary>
+    <updated>2023-05-12T10:12: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 settings for English. Settings for other languages could be added later to this section. -->
+  <locale xml:lang="en">
+    <style-options punctuation-in-quote="false"/>
+    <terms>
+      <term name="no date">undated</term>
+      <term name="presented at">Presentation at</term>
+      <term name="by">Adopted</term>
+    </terms>
+    <date delimiter=" " form="text">
+      <date-part name="day"/>
+      <date-part name="month"/>
+      <date-part name="year"/>
+    </date>
+  </locale>
+  <!-- Macros -->
+  <macro name="anonymous">
+    <text term="anonymous" text-case="capitalize-first"/>
+  </macro>
+  <macro name="editor">
+    <!-- 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=", "/>
+    </names>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name and="symbol" delimiter-precedes-et-al="never" delimiter-precedes-last="never" initialize-with="." name-as-sort-order="all"/>
+      <et-al font-style="italic"/>
+      <label form="short" prefix=", "/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text macro="anonymous"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="date">
+    <!-- date format: year / undated / put "forthcoming" or else in "Date" field when needed. -->
+    <choose>
+      <if match="none" variable="issued">
+        <text term="no date"/>
+      </if>
+      <else>
+        <date date-parts="year" form="text" variable="issued"/>
+      </else>
+    </choose>
+  </macro>
+  <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">
+    <!-- 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">
+    <!-- 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="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>
+        <text variable="URL"/>
+      </else>
+    </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>
+  <!-- in-line citation: superscript number, separated by a comma followed by a space. -->
+  <citation collapse="citation-number">
+    <sort>
+      <key variable="citation-number"/>
+    </sort>
+    <layout delimiter=", " vertical-align="sup">
+      <text variable="citation-number"/>
+    </layout>
+  </citation>
+  <!-- bibliography -->
+  <bibliography entry-spacing="0" second-field-align="flush" line-spacing="1" et-al-min="10" et-al-use-first="7">
+    <layout>
+      <text variable="citation-number" suffix="."/>
+      <choose>
+        <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. -->
+                <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"/>
+                <text macro="vol"/>
+                <text macro="series-and-number"/>
+                <text macro="publisher-and-place"/>
+                <text macro="DOI-or-URL"/>
+              </if>
+              <else-if type="chapter">
+                <!-- book section -->
+                <text variable="title"/>
+                <text macro="in-and-container"/>
+                <group delimiter=" ">
+                  <text macro="edition" suffix=","/>
+                  <label variable="page" form="short"/>
+                  <text variable="page"/>
+                </group>
+                <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">
+                <!-- journal article -->
+                <text variable="title"/>
+                <text macro="periodical"/>
+                <text macro="DOI-or-URL"/>
+              </else-if>
+              <else-if type="article-magazine">
+                <!-- magazine article -->
+                <text variable="title"/>
+                <text macro="periodical"/>
+                <text macro="Cite-and-URL"/>
+              </else-if>
+              <else-if type="article-newspaper">
+                <!-- newspaper article -->
+                <text variable="title"/>
+                <group delimiter=", " suffix=".">
+                  <text variable="container-title" font-style="italic"/>
+                  <date form="text" variable="issued"/>
+                </group>
+                <text macro="Cite-and-URL"/>
+              </else-if>
+              <else-if type="webpage post-weblog" match="any">
+                <!-- 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" 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" 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 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="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 delimiter=" ">
+                  <text term="presented at"/>
+                  <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" font-style="italic"/>
+                <text macro="in-and-container"/>
+                <text variable="collection-title"/>
+                <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-URL"/>
+              </else-if>
+              <else>
+                <!-- other item types -->
+                <text variable="title"/>
+                <text variable="genre"/>
+                <text macro="publisher-and-place"/>
+                <text macro="Cite-and-URL"/>
+              </else>
+            </choose>
+          </group>
+        </if>
+        <else-if type="legal_case">
+          <!-- case -->
+          <group delimiter=" ">
+            <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-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>
+</style>
diff --git a/buildres/csl/csl-styles/fundamental-and-applied-limnology.csl b/buildres/csl/csl-styles/fundamental-and-applied-limnology.csl
index 8777a232882..de3f1c499c8 100644
--- a/buildres/csl/csl-styles/fundamental-and-applied-limnology.csl
+++ b/buildres/csl/csl-styles/fundamental-and-applied-limnology.csl
@@ -47,8 +47,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
   -->
@@ -116,7 +116,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=", ">
@@ -197,7 +197,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>
@@ -230,9 +230,6 @@
       </else>
     </choose>
   </macro>
-  <macro name="date-sort-date">
-    <date variable="issued" form="numeric"/>
-  </macro>
   <macro name="date-intext">
     <choose>
       <if variable="issued">
@@ -258,7 +255,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>
@@ -1023,7 +1020,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>
@@ -1303,7 +1300,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"/>
@@ -1576,7 +1573,7 @@
     <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 macro="date-bib" sort="ascending"/>
       <key variable="status"/>
     </sort>
     <layout prefix="(" suffix=")" delimiter="; ">
@@ -1593,7 +1590,7 @@
     <sort>
       <key macro="author-bib"/>
       <key macro="date-sort-group"/>
-      <key macro="date-sort-date" sort="ascending"/>
+      <key macro="date-bib" sort="ascending"/>
       <key variable="status"/>
       <key macro="title"/>
     </sort>
diff --git a/buildres/csl/csl-styles/geographie-et-cultures.csl b/buildres/csl/csl-styles/geographie-et-cultures.csl
index 6c7d8699c18..86a87c32fc5 100644
--- a/buildres/csl/csl-styles/geographie-et-cultures.csl
+++ b/buildres/csl/csl-styles/geographie-et-cultures.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="never" default-locale="fr-FR">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" and="text" delimiter-precedes-last="never" demote-non-dropping-particle="never" default-locale="fr-FR">
   <info>
     <title>Géographie et cultures (Français)</title>
     <id>http://www.zotero.org/styles/geographie-et-cultures</id>
@@ -9,24 +9,27 @@
     <author>
       <name>Martine Drozdz</name>
     </author>
+    <contributor>
+      <name>Patrick O'Brien</name>
+    </contributor>
     <category citation-format="author-date"/>
     <category field="geography"/>
     <issn>1165-0354</issn>
     <eissn>2267-6759</eissn>
-    <updated>2019-01-11T04:00:34+00:00</updated>
+    <updated>2023-05-30T10:07: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="fr">
     <terms>
-      <term name="issue" form="short">No.</term>
+      <term name="editor" form="short">dir.</term>
     </terms>
   </locale>
   <macro name="container-contributors">
     <choose>
       <if type="chapter paper-conference entry-dictionary entry-encyclopedia" match="any">
         <names variable="editor translator container-author" delimiter=", " suffix=", ">
-          <name and="symbol" initialize-with=". " delimiter=", "/>
-          <label form="short" prefix=" (" text-case="title" suffix=")"/>
+          <name/>
+          <label form="short" prefix=" (" suffix=")"/>
         </names>
       </if>
     </choose>
@@ -34,19 +37,19 @@
   <macro name="secondary-contributors">
     <choose>
       <if type="article-journal chapter paper-conference entry-dictionary entry-encyclopedia" match="none">
-        <names variable="translator editor container-author" delimiter=", " prefix=" (" suffix=")">
+        <names variable="translator editor container-author" delimiter="; " prefix=" (" suffix=")">
           <name and="symbol" initialize-with=". " delimiter=", "/>
-          <label form="short" prefix=", " text-case="title"/>
+          <label form="short" prefix=", "/>
         </names>
       </if>
     </choose>
   </macro>
   <macro name="author">
     <names variable="author">
-      <name and="symbol" delimiter-precedes-last="always" initialize-with=" " name-as-sort-order="all" sort-separator=" ">
+      <name name-as-sort-order="all" sort-separator=" ">
         <name-part name="family" text-case="uppercase"/>
       </name>
-      <label form="short" prefix=" (" suffix=")" text-case="capitalize-first"/>
+      <label form="short" prefix=" (" suffix=")"/>
       <substitute>
         <names variable="editor"/>
         <names variable="translator"/>
@@ -64,7 +67,8 @@
   </macro>
   <macro name="author-short">
     <names variable="author">
-      <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
+      <name form="short" initialize-with=". "/>
+      <et-al font-style="italic"/>
       <substitute>
         <names variable="editor"/>
         <names variable="translator"/>
@@ -143,7 +147,7 @@
   </macro>
   <macro name="title">
     <choose>
-      <if type="report thesis book graphic motion_picture report song manuscript speech" match="any">
+      <if type="report thesis book graphic motion_picture report song manuscript speech post post-weblog" match="any">
         <choose>
           <if variable="version" type="book" match="any">
             <text variable="title" font-style="italic"/>
@@ -154,7 +158,7 @@
         </choose>
       </if>
       <else>
-        <text variable="title"/>
+        <text variable="title" quotes="true"/>
       </else>
     </choose>
   </macro>
@@ -196,7 +200,7 @@
           <text variable="publisher-place"/>
         </group>
       </else-if>
-      <else-if type="post-weblog webpage" match="none">
+      <else-if type="post-weblog webpage post" match="none">
         <group delimiter=", ">
           <choose>
             <if variable="event version" type="speech" match="none">
@@ -253,7 +257,7 @@
       <if type="bill legal_case legislation" match="none">
         <choose>
           <if variable="issued">
-            <group prefix=" (" suffix=")">
+            <group>
               <date variable="issued">
                 <date-part name="year"/>
               </date>
@@ -343,23 +347,17 @@
   </macro>
   <macro name="locators">
     <choose>
-      <if type="article-journal article-magazine" match="any">
-        <group prefix=", " delimiter=", ">
+      <if type="article-journal article-magazine article-newspaper" match="any">
+        <group delimiter=", ">
           <group delimiter=" ">
-            <label text-case="capitalize-first" variable="volume" form="short"/>
+            <label variable="volume" form="short"/>
             <text variable="volume" font-style="normal"/>
           </group>
           <group delimiter=" ">
             <label variable="issue" form="short"/>
             <text variable="issue"/>
           </group>
-          <group delimiter=" ">
-            <label plural="never" variable="page" form="short"/>
-            <text variable="page"/>
-          </group>
-          <date delimiter="" variable="issued">
-            <date-part name="month"/>
-          </date>
+          <text macro="pages"/>
         </group>
         <choose>
           <if variable="issued">
@@ -371,14 +369,8 @@
           </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 prefix=" (" suffix=")" delimiter=", ">
+        <group delimiter=", ">
           <text macro="edition"/>
           <choose>
             <if variable="volume" match="any">
@@ -394,10 +386,13 @@
               </group>
             </else>
           </choose>
-          <group>
-            <label variable="page" form="short" suffix=" "/>
-            <text variable="page"/>
+          <text macro="publisher"/>
+          <text macro="pages"/>
+          <group delimiter=" ">
+            <text variable="number-of-pages"/>
+            <label variable="number-of-pages" form="short"/>
           </group>
+          <text macro="event"/>
         </group>
       </else-if>
       <else-if type="legal_case">
@@ -432,7 +427,7 @@
         <group>
           <choose>
             <if type="chapter paper-conference entry-encyclopedia" match="any">
-              <text term="in" text-case="capitalize-first" suffix=" "/>
+              <text term="in" suffix=" "/>
             </if>
           </choose>
           <text macro="container-contributors"/>
@@ -495,12 +490,18 @@
       </if>
     </choose>
   </macro>
+  <macro name="pages">
+    <group>
+      <label variable="page" form="short" suffix=" "/>
+      <text variable="page"/>
+    </group>
+  </macro>
   <citation et-al-min="3" et-al-use-first="1" et-al-subsequent-min="3" et-al-subsequent-use-first="1" disambiguate-add-names="true" disambiguate-add-givenname="true" disambiguate-add-year-suffix="true" givenname-disambiguation-rule="primary-name" collapse="year">
     <sort>
-      <key macro="author"/>
       <key macro="issued-sort"/>
+      <key macro="author"/>
     </sort>
-    <layout prefix="(" suffix=")" delimiter="; ">
+    <layout delimiter=" ; " prefix="(" suffix=")">
       <group delimiter=", ">
         <text macro="author-short"/>
         <text macro="issued-year"/>
@@ -508,15 +509,15 @@
       </group>
     </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">
+  <bibliography 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=". ">
+      <group delimiter=", " suffix=".">
+        <group delimiter=", ">
           <text macro="author"/>
           <text macro="issued"/>
           <text macro="title-plus-extra"/>
@@ -524,10 +525,6 @@
         </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=" "/>
diff --git a/buildres/csl/csl-styles/german-council-of-economic-experts.csl b/buildres/csl/csl-styles/german-council-of-economic-experts.csl
index df8463fa1fa..f7df9274351 100644
--- a/buildres/csl/csl-styles/german-council-of-economic-experts.csl
+++ b/buildres/csl/csl-styles/german-council-of-economic-experts.csl
@@ -30,7 +30,7 @@
     <category citation-format="author-date"/>
     <category field="political_science"/>
     <summary>Style for the German Council of Economic Experts</summary>
-    <updated>2021-09-13T14:00:00+02:00</updated>
+    <updated>2023-05-26T14: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="de">
@@ -64,7 +64,7 @@
         <choose>
           <if type="book">
             <names variable="editor">
-              <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="never"/>
+              <name and="text" delimiter-precedes-last="never" initialize-with="." name-as-sort-order="first"/>
               <label prefix=" (" form="short" suffix=".)"/>
             </names>
           </if>
@@ -111,7 +111,7 @@
         <choose>
           <if type="chapter">
             <names variable="editor">
-              <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="never" initialize-with=". "/>
+              <name and="text" delimiter-precedes-last="never" initialize-with="." name-as-sort-order="first"/>
               <label prefix=" (" form="short" suffix=".)"/>
             </names>
           </if>
diff --git a/buildres/csl/csl-styles/harvard-deakin-university.csl b/buildres/csl/csl-styles/harvard-deakin-university.csl
index 0ede477a1e5..771504ed934 100644
--- a/buildres/csl/csl-styles/harvard-deakin-university.csl
+++ b/buildres/csl/csl-styles/harvard-deakin-university.csl
@@ -4,7 +4,7 @@
     <title>Deakin University - Harvard</title>
     <id>http://www.zotero.org/styles/harvard-deakin-university</id>
     <link href="http://www.zotero.org/styles/harvard-deakin-university" rel="self"/>
-    <link href="http://www.zotero.org/styles/harvard-the-university-of-melbourne" rel="template"/>
+    <link href="http://www.zotero.org/styles/style-manual-australian-government" rel="template"/>
     <link href="http://www.deakin.edu.au/students/studying/study-support/referencing/harvard" rel="documentation"/>
     <author>
       <name>simtyrell</name>
diff --git a/buildres/csl/csl-styles/harvard-the-university-of-melbourne.csl b/buildres/csl/csl-styles/harvard-the-university-of-melbourne.csl
deleted file mode 100644
index 585b9d1a8da..00000000000
--- a/buildres/csl/csl-styles/harvard-the-university-of-melbourne.csl
+++ /dev/null
@@ -1,222 +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>The University of Melbourne - Harvard</title>
-    <id>http://www.zotero.org/styles/harvard-the-university-of-melbourne</id>
-    <link href="http://www.zotero.org/styles/harvard-the-university-of-melbourne" rel="self"/>
-    <link href="http://www.library.unimelb.edu.au/cite/" rel="documentation"/>
-    <author>
-      <name>Julian Onions</name>
-      <email>julian.onions@gmail.com</email>
-    </author>
-    <contributor>
-      <name>Sebastian Karcher</name>
-      <email>karcher@u.northwestern.edu</email>
-    </contributor>
-    <category citation-format="author-date"/>
-    <category field="generic-base"/>
-    <summary>Style for The University of Melbourne</summary>
-    <updated>2013-04-19T02: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">
-    <terms>
-      <term name="page">
-        <single>page</single>
-        <multiple>pages</multiple>
-      </term>
-      <term name="page" form="short">
-        <single>p.</single>
-        <multiple>pp.</multiple>
-      </term>
-      <term name="no date">n.d.</term>
-      <term name="et-al">et al.</term>
-      <term name="editor" form="short">
-        <single>ed.</single>
-        <multiple>eds</multiple>
-      </term>
-      <term name="translator" form="short">
-        <single>trans.</single>
-        <multiple>trans</multiple>
-      </term>
-      <term name="edition" form="short">edn</term>
-      <term name="volume" form="short">vol.</term>
-      <term name="chapter" form="short">ch.</term>
-    </terms>
-  </locale>
-  <macro name="editor">
-    <names variable="editor" delimiter=", ">
-      <name and="symbol" initialize-with="" delimiter=", "/>
-      <label form="short" prefix=" (" suffix=")" strip-periods="true"/>
-    </names>
-  </macro>
-  <macro name="noauthor_title">
-    <!-- This macro is only called when author is empty and the trick with substitute automatically suppresses repeating elements -->
-    <choose>
-      <if type="article-newspaper">
-        <names variable="author">
-          <name/>
-          <substitute>
-            <text variable="container-title" font-style="italic"/>
-          </substitute>
-        </names>
-      </if>
-      <else>
-        <names variable="author">
-          <name/>
-          <substitute>
-            <text macro="title" font-style="normal"/>
-          </substitute>
-        </names>
-      </else>
-    </choose>
-  </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"/>
-        <names variable="translator"/>
-        <text macro="noauthor_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 macro="noauthor_title"/>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="access">
-    <choose>
-      <if variable="URL">
-        <text term="accessed"/>
-        <group prefix=" " delimiter=", ">
-          <date variable="accessed">
-            <date-part name="month" suffix=" "/>
-            <date-part name="day" suffix=", "/>
-            <date-part name="year"/>
-          </date>
-          <group>
-            <text term="from"/>
-            <text variable="URL" prefix=" &lt;" suffix="&gt;"/>
-          </group>
-        </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="italic"/>
-      </if>
-      <else>
-        <text variable="title" quotes="true"/>
-      </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="pages">
-    <label variable="page" form="short" suffix=" "/>
-    <text variable="page"/>
-  </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="4" et-al-use-first="1" 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>
-          <label variable="locator" form="short"/>
-          <text variable="locator"/>
-        </group>
-      </group>
-    </layout>
-  </citation>
-  <bibliography hanging-indent="true">
-    <sort>
-      <key macro="author"/>
-      <key macro="year-date"/>
-    </sort>
-    <layout suffix=".">
-      <text macro="author"/>
-      <date variable="issued" prefix=" " suffix=",">
-        <date-part name="year"/>
-      </date>
-      <choose>
-        <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
-          <group prefix=" " delimiter=" " suffix=",">
-            <text macro="title"/>
-            <text macro="edition"/>
-            <text macro="editor"/>
-          </group>
-          <text prefix=" " macro="publisher"/>
-        </if>
-        <else-if type="chapter paper-conference" match="any">
-          <text macro="title" prefix=" "/>
-          <group delimiter=" " prefix=", ">
-            <text term="in"/>
-            <group delimiter=", ">
-              <text macro="editor"/>
-              <text variable="container-title" font-style="italic"/>
-              <text variable="collection-title"/>
-              <text macro="publisher"/>
-              <text macro="pages"/>
-            </group>
-          </group>
-        </else-if>
-        <else>
-          <group suffix=",">
-            <text macro="title" prefix=" "/>
-            <text macro="editor" prefix=" "/>
-          </group>
-          <group prefix=" ">
-            <text variable="container-title" font-style="italic"/>
-            <group prefix=", " delimiter=", ">
-              <text variable="volume" prefix="vol. "/>
-              <text variable="issue" prefix="no. "/>
-              <text macro="pages"/>
-            </group>
-          </group>
-        </else>
-      </choose>
-      <text prefix=", " macro="access"/>
-    </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 e5bdfcb075c..408d51fd9bf 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
@@ -12,13 +12,18 @@
     </contributor>
     <category citation-format="author-date"/>
     <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>
+    <updated>2023-05-02T13:01: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">
+    <terms>
+      <term name="available at">available from</term>
+    </terms>
+  </locale>
   <macro name="editor">
     <names delimiter=", " variable="editor">
       <name and="text" delimiter-precedes-last="never" initialize-with="." name-as-sort-order="all"/>
-      <label form="short" suffix=")" prefix=" ("/>
+      <label form="short" prefix=", "/>
     </names>
   </macro>
   <macro name="author">
@@ -42,29 +47,18 @@
     </names>
   </macro>
   <macro name="available-from-access">
-    <choose>
-      <if match="any" variable="URL">
-        <group>
-          <text value="Available from: "/>
-          <choose>
-            <if variable="URL">
-              <text variable="URL"/>
-            </if>
-            <else>
-              <text variable="URL"/>
-            </else>
-          </choose>
-          <group suffix="]" prefix=" [">
-            <text suffix=" " text-case="capitalize-first" term="accessed"/>
-            <date variable="accessed">
-              <date-part name="day" suffix=" "/>
-              <date-part name="month" suffix=" "/>
-              <date-part name="year"/>
-            </date>
-          </group>
-        </group>
-      </if>
-    </choose>
+    <group delimiter=": ">
+      <text term="available at" text-case="capitalize-first"/>
+      <text variable="URL"/>
+    </group>
+    <group suffix="]" prefix=" [">
+      <text suffix=" " text-case="capitalize-first" term="accessed"/>
+      <date variable="accessed">
+        <date-part name="day" suffix=" "/>
+        <date-part name="month" suffix=" "/>
+        <date-part name="year"/>
+      </date>
+    </group>
   </macro>
   <macro name="italicised-title">
     <text variable="title" font-style="italic"/>
@@ -98,12 +92,10 @@
     </choose>
   </macro>
   <macro name="pages">
-    <choose>
-      <if type="article-journal" match="any">
-        <label text-case="lowercase" variable="page" form="short" plural="contextual"/>
-      </if>
-    </choose>
-    <text variable="page"/>
+    <group delimiter=" ">
+      <label text-case="lowercase" variable="page" form="short" plural="contextual"/>
+      <text variable="page"/>
+    </group>
   </macro>
   <macro name="medium-online">
     <choose>
@@ -113,7 +105,7 @@
       <else>
         <choose>
           <if match="any" variable="DOI URL">
-            <text value="[online]. "/>
+            <text value="[online]"/>
           </if>
         </choose>
       </else>
@@ -280,7 +272,7 @@
       <key macro="author"/>
       <key variable="title"/>
     </sort>
-    <layout>
+    <layout suffix=".">
       <text macro="author" font-style="normal"/>
       <text macro="year-date-bibliography" prefix=" (" suffix=")"/>
       <choose>
@@ -310,10 +302,10 @@
       <text macro="translator" prefix=" "/>
       <choose>
         <if type="chapter" match="any">
-          <text term="in" text-case="capitalize-first" suffix=":"/>
+          <text term="in" text-case="capitalize-first" prefix=". " suffix=":"/>
         </if>
         <else-if type="paper-conference" match="all" variable="container-title">
-          <text term="in" text-case="capitalize-first" suffix=": "/>
+          <text term="in" text-case="capitalize-first" prefix=". " suffix=": "/>
         </else-if>
       </choose>
       <choose>
@@ -321,9 +313,9 @@
           <text macro="editor" prefix=" "/>
         </if>
       </choose>
-      <group delimiter=" for " suffix=".">
+      <group delimiter=" for ">
         <text macro="interviewer" prefix=" "/>
-        <text macro="container-title" prefix=" " suffix="."/>
+        <text macro="container-title" prefix=" "/>
       </group>
       <text macro="collection-title"/>
       <text macro="series-episode"/>
@@ -331,7 +323,7 @@
       <text macro="genre"/>
       <text macro="recipient" prefix=" " suffix=","/>
       <text macro="broadcast-details" prefix=" "/>
-      <text macro="day-month"/>
+      <text macro="day-month" prefix=". "/>
       <text macro="medium-online" prefix=" "/>
       <group>
         <text macro="event-name"/>
@@ -344,19 +336,25 @@
       </group>
       <choose>
         <if type="broadcast interview" match="none">
-          <group delimiter=", " prefix=" " suffix=".">
+          <group delimiter=", " prefix=". " suffix=".">
             <group>
               <text macro="volume-number" prefix=" "/>
               <text macro="issue-number" prefix=" "/>
             </group>
-            <text variable="publisher-place"/>
-            <text variable="publisher" prefix=" "/>
+            <choose>
+              <if type="book chapter paper-conference report thesis" match="any">
+                <group delimiter=", ">
+                  <text variable="publisher-place"/>
+                  <text variable="publisher" prefix=" "/>
+                </group>
+              </if>
+            </choose>
             <text macro="pages" prefix=" "/>
             <text macro="graph-or-figure" prefix=" " suffix="."/>
           </group>
         </if>
       </choose>
-      <text suffix="." prefix=" " macro="available-from-access"/>
+      <text macro="available-from-access" prefix=". "/>
     </layout>
   </bibliography>
 </style>
diff --git a/buildres/csl/csl-styles/harvard-xi-an-jiaotong-liverpool-university.csl b/buildres/csl/csl-styles/harvard-xi-an-jiaotong-liverpool-university.csl
new file mode 100644
index 00000000000..82d137effce
--- /dev/null
+++ b/buildres/csl/csl-styles/harvard-xi-an-jiaotong-liverpool-university.csl
@@ -0,0 +1,225 @@
+<?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>Xi'an Jiaotong-Liverpool University (XJTLU) - Harvard</title>
+    <id>http://www.zotero.org/styles/harvard-xi-an-jiaotong-liverpool-university</id>
+    <link href="http://www.zotero.org/styles/harvard-xi-an-jiaotong-liverpool-university" rel="self"/>
+    <link href="https://libguides.lib.xjtlu.edu.cn/ld.php?content_id=5887149" rel="documentation"/>
+    <author>
+      <name>ous50</name>
+      <email>zotero@ous50.moe</email>
+    </author>
+    <category citation-format="author-date"/>
+    <category field="generic-base"/>
+    <summary>The Harvard author-date style for XJTLU</summary>
+    <updated>2022-08-16T10:14: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>
+  <macro name="editor">
+    <names variable="editor" delimiter=", ">
+      <name and="symbol" initialize-with=". " delimiter=", "/>
+      <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">
+    <names variable="author">
+      <name and="text" delimiter-precedes-last="never" initialize-with="." name-as-sort-order="all"/>
+      <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="text" delimiter-precedes-last="never" initialize-with="."/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text macro="anon"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if type="article article-journal article-magazine" match="none">
+        <choose>
+          <if variable="URL">
+            <text value="Available from:" suffix=" "/>
+            <text variable="URL"/>
+            <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>
+      </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">
+    <group delimiter=": ">
+      <text variable="publisher-place"/>
+      <text variable="publisher"/>
+    </group>
+  </macro>
+  <macro name="year-date">
+    <group>
+      <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="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="page">
+    <choose>
+      <if is-numeric="page">
+        <label variable="page" form="short"/>
+        <text variable="page"/>
+      </if>
+      <else>
+        <text variable="page"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="locator-with-label">
+    <choose>
+      <if locator="page">
+        <choose>
+          <if is-numeric="locator">
+            <label variable="locator" form="short"/>
+            <text variable="locator"/>
+          </if>
+          <else>
+            <text variable="locator"/>
+          </else>
+        </choose>
+      </if>
+      <else>
+        <label variable="locator" form="short"/>
+        <text variable="locator" 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">
+    <sort>
+      <key variable="issued"/>
+    </sort>
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=" ">
+        <group delimiter=", ">
+          <text macro="author-short"/>
+          <text macro="year-date"/>
+          <text macro="locator-with-label"/>
+        </group>
+      </group>
+    </layout>
+  </citation>
+  <bibliography hanging-indent="true">
+    <sort>
+      <key macro="author"/>
+      <key variable="title"/>
+    </sort>
+    <layout>
+      <group delimiter=" " suffix=".">
+        <text macro="author"/>
+        <text macro="year-date"/>
+      </group>
+      <choose>
+        <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+          <group prefix=" " delimiter=" " suffix=".">
+            <text macro="title" font-style="italic"/>
+            <text macro="edition"/>
+            <text macro="editor" prefix="(" suffix=")"/>
+          </group>
+          <text prefix=" " suffix="." macro="publisher"/>
+        </if>
+        <else-if type="thesis" match="any">
+          <text macro="title" font-style="italic" prefix=" " suffix="."/>
+          <group prefix=" " delimiter=", " suffix=".">
+            <text variable="genre"/>
+            <text macro="publisher"/>
+          </group>
+        </else-if>
+        <else-if type="chapter paper-conference" match="any">
+          <text macro="title" font-style="italic" prefix=" "/>
+          <group prefix=" ">
+            <text term="in" text-case="capitalize-first" font-style="italic" suffix=":"/>
+            <names variable="editor" delimiter=", " prefix=" " suffix=".">
+              <name and="text" delimiter-precedes-last="never" initialize-with=". "/>
+              <label form="short" strip-periods="false" prefix=", "/>
+            </names>
+            <group prefix=" " suffix="." delimiter=" ">
+              <text variable="container-title" font-style="italic"/>
+            </group>
+            <text variable="collection-title" prefix=" " suffix="."/>
+            <group suffix=".">
+              <text macro="publisher" prefix=" "/>
+              <group prefix=", ">
+                <text macro="page"/>
+              </group>
+            </group>
+          </group>
+        </else-if>
+        <else>
+          <group suffix=".">
+            <text macro="title" font-style="italic" prefix=" "/>
+            <text macro="editor" prefix=" "/>
+          </group>
+          <group prefix=" " suffix=".">
+            <group delimiter=" ">
+              <text variable="container-title" font-style="italic" suffix="."/>
+              <choose>
+                <if type="article article-journal article-magazine" match="none"/>
+              </choose>
+            </group>
+            <group prefix=". ">
+              <text variable="volume" font-weight="bold"/>
+              <text variable="issue" prefix="(" suffix=")"/>
+            </group>
+            <group prefix=", ">
+              <text macro="page"/>
+            </group>
+          </group>
+        </else>
+      </choose>
+      <text prefix=" " macro="access" suffix="."/>
+    </layout>
+  </bibliography>
+</style>
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 4698051bdad..20fde1b70a0 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
@@ -7,34 +7,39 @@
     <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/campus/infotheque/citations-et-references-bibliographiques" rel="documentation"/>
-    <author>
-      <name>Melissa Paez</name>
-      <email>paez.melissa@gmail.com</email>
-    </author>
     <author>
       <name>Raphael Grolimund</name>
       <email>grolimur@protonmail.ch</email>
     </author>
+    <contributor>
+      <name>Melissa Paez</name>
+      <email>paez.melissa@gmail.com</email>
+    </contributor>
     <category citation-format="author-date"/>
     <category field="generic-base"/>
-    <updated>2022-03-21T10:00:00+00:00</updated>
+    <updated>2023-08-08T00:29: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="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="online">en&#160;ligne</term>
+      <term name="accessed">consulté le</term>
       <term name="retrieved">disponible</term>
       <term name="from">à l'adresse</term>
       <term name="translator" form="short">trad.</term>
+      <term name="issue">no</term>
       <term name="editor" form="short">éd.</term>
+      <term name="page" form="short">
+        <single>p.</single>
+        <multiple>pp.</multiple>
+      </term>
     </terms>
   </locale>
   <locale xml:lang="en-US">
     <terms>
-      <term name="online">Online</term>
+      <term name="issue">no.</term>
     </terms>
   </locale>
   <macro name="editor">
@@ -54,7 +59,7 @@
     </names>
   </macro>
   <macro name="responsability">
-    <names variable="author">
+    <names variable="author director">
       <name and="text" name-as-sort-order="all" sort-separator=", " delimiter=", " delimiter-precedes-last="never">
         <name-part name="family" text-case="uppercase"/>
       </name>
@@ -65,13 +70,13 @@
       </substitute>
     </names>
     <choose>
-      <if variable="author editor translator" match="any">
+      <if variable="author editor translator director" match="any">
         <text macro="year-date" prefix=", "/>
       </if>
     </choose>
   </macro>
   <macro name="author-citation">
-    <names variable="author">
+    <names variable="author director">
       <name form="short"/>
       <substitute>
         <names variable="editor"/>
@@ -114,30 +119,33 @@
   </macro>
   <macro name="title">
     <choose>
-      <if type="book thesis map motion_picture song manuscript" match="any">
+      <if type="book thesis map motion_picture song manuscript speech" match="any">
         <choose>
-          <if variable="author editor translator" match="any">
-            <text variable="title" font-style="italic" suffix="."/>
+          <if variable="author editor translator director" match="any">
+            <text variable="title" font-style="italic"/>
           </if>
           <else>
             <text variable="title" font-style="italic" suffix=", "/>
-            <text macro="year-date" suffix=". "/>
+            <text macro="year-date"/>
           </else>
         </choose>
       </if>
-      <else-if type="paper-conference speech chapter article-journal article-magazine article-newspaper entry entry-dictionary entry-encyclopedia post-weblog post webpage broadcast" match="any">
+      <else-if type="software">
+        <text variable="title" font-style="italic" suffix=" [logiciel]"/>
+      </else-if>
+      <else-if type="paper-conference chapter article-journal article-magazine article-newspaper entry entry-dictionary entry-encyclopedia post-weblog post webpage broadcast" match="any">
         <choose>
-          <if variable="author editor translator" match="any">
+          <if variable="author editor translator director" match="any">
             <text variable="title" suffix=". "/>
           </if>
           <else>
             <text variable="title" suffix=", "/>
-            <text macro="year-date" suffix=". "/>
+            <text macro="year-date"/>
           </else>
         </choose>
         <choose>
           <if type="chapter paper-conference" match="any">
-            <text term="in" text-case="capitalize-first" suffix=": "/>
+            <text term="in" text-case="capitalize-first" suffix="&#160;: "/>
           </if>
         </choose>
         <choose>
@@ -152,10 +160,18 @@
         </choose>
         <choose>
           <if variable="container-title">
-            <text variable="container-title" font-style="italic" suffix="."/>
+            <text variable="container-title" font-style="italic"/>
+            <choose>
+              <if type="chapter paper-conference" match="any">
+                <group delimiter="&#160;" prefix=", ">
+                  <label variable="page" form="short"/>
+                  <text variable="page"/>
+                </group>
+              </if>
+            </choose>
           </if>
           <else>
-            <text variable="event" font-style="italic" suffix="."/>
+            <text variable="event" font-style="italic"/>
           </else>
         </choose>
       </else-if>
@@ -165,38 +181,49 @@
             <text variable="title" font-style="italic"/>
           </if>
           <else>
-            <text variable="number" suffix=": "/>
+            <text variable="number" suffix="&#160;: "/>
             <text variable="title" font-style="italic" suffix=", "/>
-            <text macro="year-date" suffix=". "/>
+            <text macro="year-date"/>
           </else>
         </choose>
       </else-if>
       <else-if type="patent">
         <choose>
           <if variable="author editor translator" match="any">
-            <text variable="title"/>
+            <text variable="title" font-style="italic"/>
           </if>
           <else>
             <text variable="title" suffix=", "/>
-            <text macro="year-date" suffix=". "/>
+            <text macro="year-date"/>
           </else>
         </choose>
       </else-if>
       <else>
         <choose>
-          <if variable="author editor translator" match="any">
-            <text variable="title" font-style="italic" suffix=". "/>
+          <if variable="author editor translator director" match="any">
+            <text variable="title" font-style="italic"/>
           </if>
           <else>
             <text variable="title" font-style="italic" suffix=", "/>
-            <text macro="year-date" suffix=". "/>
+            <text macro="year-date"/>
           </else>
         </choose>
       </else>
     </choose>
     <choose>
-      <if variable="URL">
-        <text term="online" prefix=" "/>
+      <if variable="DOI version" match="none">
+        <choose>
+          <if variable="URL">
+            <text term="online" prefix=" [" suffix="]"/>
+          </if>
+          <else>
+            <choose>
+              <if type="broadcast motion_picture song book chapter article-journal article-magazine article-newspaper patent" match="none">
+                <text value=". "/>
+              </if>
+            </choose>
+          </else>
+        </choose>
       </if>
     </choose>
   </macro>
@@ -206,6 +233,12 @@
   <macro name="medium">
     <text variable="medium" prefix=" [" suffix="]"/>
   </macro>
+  <macro name="legislation-number">
+    <group delimiter=" ">
+      <text variable="container-title"/>
+      <text variable="volume"/>
+    </group>
+  </macro>
   <macro name="genre">
     <choose>
       <if type="map">
@@ -218,57 +251,108 @@
           </else>
         </choose>
       </if>
+      <else>
+        <text variable="genre" suffix=" "/>
+        <text variable="number"/>
+      </else>
     </choose>
   </macro>
   <macro name="date">
     <choose>
-      <if variable="issued">
-        <date variable="issued">
-          <date-part name="day" suffix=" "/>
-          <date-part name="month" suffix=" "/>
-          <date-part name="year"/>
-        </date>
+      <if type="patent">
+        <group delimiter=" et " prefix="Brevet ">
+          <date variable="submitted" prefix="déposé le ">
+            <date-part name="day" suffix="&#160;"/>
+            <date-part name="month" suffix="&#160;"/>
+            <date-part name="year"/>
+          </date>
+          <date variable="issued" prefix="publié le ">
+            <date-part name="day" suffix="&#160;"/>
+            <date-part name="month" suffix="&#160;"/>
+            <date-part name="year"/>
+          </date>
+        </group>
       </if>
+      <else>
+        <choose>
+          <if variable="issued">
+            <date variable="issued">
+              <date-part name="day" suffix="&#160;"/>
+              <date-part name="month" suffix="&#160;"/>
+              <date-part name="year"/>
+            </date>
+          </if>
+        </choose>
+      </else>
     </choose>
   </macro>
   <macro name="edition">
     <text variable="edition" form="long"/>
   </macro>
   <macro name="publisher-group">
-    <group delimiter=": ">
-      <text variable="publisher-place"/>
-      <text variable="publisher"/>
-    </group>
+    <choose>
+      <if type="speech" match="any">
+        <group delimiter=", ">
+          <text variable="event"/>
+          <text variable="publisher-place"/>
+        </group>
+      </if>
+      <else>
+        <group delimiter="&#160;: ">
+          <text variable="publisher-place"/>
+          <text variable="publisher"/>
+        </group>
+      </else>
+    </choose>
   </macro>
   <macro name="issue">
     <group delimiter=", ">
       <text variable="volume" prefix="Vol.&#160;"/>
       <choose>
         <if variable="volume">
-          <text variable="issue" prefix="no.&#160;"/>
-          <text variable="page" prefix="pp.&#160;"/>
+          <group delimiter="&#160;">
+            <text term="issue"/>
+            <text variable="issue"/>
+          </group>
+          <group delimiter="&#160;">
+            <label variable="page" form="short"/>
+            <text variable="page"/>
+          </group>
         </if>
         <else-if variable="issue">
-          <text variable="issue" prefix="No.&#160;"/>
-          <text variable="page" prefix="pp.&#160;"/>
+          <group delimiter="&#160;">
+            <text term="issue" text-case="capitalize-first"/>
+            <text variable="issue"/>
+          </group>
+          <group delimiter="&#160;">
+            <label variable="page" form="short"/>
+            <text variable="page"/>
+          </group>
         </else-if>
         <else>
-          <text variable="page" prefix="pp.&#160;"/>
+          <group delimiter="&#160;">
+            <label variable="page" form="short"/>
+            <text variable="page"/>
+          </group>
         </else>
       </choose>
     </group>
   </macro>
   <macro name="accessed">
     <choose>
-      <if variable="URL">
-        <group prefix=" [" suffix="]">
-          <text term="accessed" text-case="capitalize-first"/>
-          <date variable="accessed">
-            <date-part name="day" prefix="&#160;"/>
-            <date-part name="month" prefix="&#160;"/>
-            <date-part name="year" prefix="&#160;"/>
-          </date>
-        </group>
+      <if variable="DOI" match="none">
+        <choose>
+          <if variable="URL">
+            <group prefix=" [" suffix="]">
+              <text term="accessed"/>
+              <date variable="accessed">
+                <date-part name="day" prefix=" "/>
+                <date-part name="month" prefix="&#160;"/>
+                <date-part name="year" prefix="&#160;"/>
+              </date>
+            </group>
+          </if>
+        </choose>
       </if>
     </choose>
   </macro>
@@ -279,17 +363,7 @@
     </group>
   </macro>
   <macro name="page">
-    <choose>
-      <if type="book thesis manuscript" match="any">
-        <text variable="number-of-pages" suffix="&#160;p"/>
-      </if>
-      <else-if type="chapter paper-conference article-newspaper" match="any">
-        <text variable="page" prefix="pp.&#160;"/>
-      </else-if>
-      <else-if type="report patent" match="any">
-        <text variable="page" suffix="&#160;p"/>
-      </else-if>
-    </choose>
+    <text variable="number-of-pages" suffix="&#160;p"/>
   </macro>
   <macro name="isbn">
     <text variable="ISBN" prefix="ISBN&#160;"/>
@@ -304,7 +378,7 @@
           <if variable="URL">
             <group>
               <text term="retrieved" suffix=" " text-case="capitalize-first"/>
-              <text term="from" suffix=": "/>
+              <text term="from" suffix="&#160;: "/>
               <text variable="URL"/>
             </group>
           </if>
@@ -312,22 +386,6 @@
       </if>
     </choose>
   </macro>
-  <macro name="archive">
-    <group delimiter=":&#160;">
-      <text variable="archive"/>
-      <text macro="archive_location"/>
-    </group>
-  </macro>
-  <macro name="archive_location">
-    <choose>
-      <if variable="archive_location">
-        <text variable="archive_location"/>
-      </if>
-      <else>
-        <text variable="call-number"/>
-      </else>
-    </choose>
-  </macro>
   <citation et-al-min="4" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" collapse="year" year-suffix-delimiter=", " after-collapse-delimiter="; ">
     <layout prefix="(" suffix=")" delimiter="; ">
       <group delimiter=", ">
@@ -342,7 +400,7 @@
       </group>
     </layout>
   </citation>
-  <bibliography>
+  <bibliography et-al-min="4" et-al-use-first="1">
     <sort>
       <key macro="responsability"/>
       <key macro="year-date"/>
@@ -356,15 +414,12 @@
               <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=". "/>
-          <text macro="accessed" suffix=". "/>
           <text macro="collection" suffix=". "/>
           <text macro="isbn" suffix=". "/>
           <text macro="url"/>
+          <text macro="accessed" suffix=". "/>
         </if>
         <else-if type="article-journal article-magazine" match="any">
           <text macro="responsability" suffix=". "/>
@@ -374,11 +429,10 @@
             </if>
           </choose>
           <text macro="edition" suffix=". "/>
-          <text macro="date" suffix=". "/>
           <text macro="issue" suffix=". "/>
-          <text macro="accessed" suffix=". "/>
           <text macro="doi" suffix=". "/>
           <text macro="url"/>
+          <text macro="accessed" suffix=". "/>
         </else-if>
         <else-if type="article-newspaper">
           <text macro="responsability" suffix=". "/>
@@ -391,8 +445,8 @@
           <text macro="publisher-group" suffix=", "/>
           <text macro="date" suffix=". "/>
           <text macro="page" suffix=". "/>
-          <text macro="accessed" suffix=". "/>
           <text macro="url"/>
+          <text macro="accessed" suffix=". "/>
         </else-if>
         <else-if type="chapter entry entry-dictionary entry-encyclopedia" match="any">
           <text macro="responsability" suffix=". "/>
@@ -403,11 +457,11 @@
           </choose>
           <text macro="edition" suffix=". "/>
           <text macro="publisher-group" suffix=". "/>
-          <text macro="page" suffix=". "/>
           <text macro="collection" suffix=". "/>
-          <text macro="accessed" suffix=". "/>
           <text macro="isbn" suffix=". "/>
+          <text macro="doi" suffix=". "/>
           <text macro="url"/>
+          <text macro="accessed" suffix=". "/>
         </else-if>
         <else-if type="speech">
           <text macro="responsability" suffix=". "/>
@@ -419,9 +473,9 @@
           <text macro="genre" suffix=". "/>
           <text macro="publisher-group" suffix=". "/>
           <text macro="date" suffix=". "/>
-          <text macro="accessed" suffix=". "/>
           <text macro="page" suffix=". "/>
           <text macro="url"/>
+          <text macro="accessed" suffix=". "/>
         </else-if>
         <else-if type="paper-conference">
           <text macro="responsability" suffix=". "/>
@@ -434,11 +488,11 @@
           <text macro="publisher-group" suffix=". "/>
           <text macro="date" suffix=". "/>
           <text macro="page" suffix=". "/>
-          <text macro="accessed" suffix=". "/>
           <text macro="collection" suffix=". "/>
           <text macro="isbn" suffix=". "/>
           <text macro="doi" suffix=". "/>
           <text macro="url"/>
+          <text macro="accessed" suffix=". "/>
         </else-if>
         <else-if type="thesis">
           <text macro="responsability" suffix=". "/>
@@ -449,8 +503,9 @@
           </choose>
           <text macro="genre" suffix=". "/>
           <text macro="publisher-group" suffix=". "/>
-          <text macro="accessed" suffix=". "/>
+          <text macro="doi" suffix=". "/>
           <text macro="url"/>
+          <text macro="accessed" suffix=". "/>
         </else-if>
         <else-if type="post-weblog post webpage" match="any">
           <text macro="responsability" suffix=". "/>
@@ -460,23 +515,24 @@
             </if>
           </choose>
           <text macro="date" suffix=". "/>
-          <text macro="accessed" suffix=". "/>
+          <text macro="doi" suffix=". "/>
           <text macro="url"/>
+          <text macro="accessed" suffix=". "/>
         </else-if>
         <else-if type="broadcast motion_picture song" match="any">
           <text macro="responsability" suffix=". "/>
           <choose>
-            <if variable="author editor translator" match="any">
+            <if variable="author editor translator director" match="any">
               <text macro="title" suffix=". "/>
             </if>
           </choose>
           <text macro="medium" suffix=". "/>
           <text macro="publisher-group" suffix=", "/>
           <text macro="date" suffix=". "/>
-          <text macro="accessed" suffix=". "/>
           <text macro="collection" suffix=". "/>
           <text macro="isbn" suffix=". "/>
           <text macro="url"/>
+          <text macro="accessed" suffix=". "/>
         </else-if>
         <else-if type="report">
           <text macro="responsability" suffix=". "/>
@@ -485,12 +541,12 @@
               <text macro="title" suffix=". "/>
             </if>
           </choose>
-          <text macro="genre" suffix=". "/>
-          <text macro="edition" suffix=". "/>
           <text macro="publisher-group" suffix=". "/>
-          <text macro="accessed" suffix=". "/>
+          <text macro="genre" suffix=". "/>
           <text macro="collection" suffix=". "/>
+          <text macro="doi" suffix=". "/>
           <text macro="url"/>
+          <text macro="accessed" suffix=". "/>
         </else-if>
         <else-if type="manuscript">
           <text macro="responsability" suffix=". "/>
@@ -502,9 +558,9 @@
           <text macro="genre" suffix=". "/>
           <text macro="edition" suffix=". "/>
           <text macro="publisher-group" suffix=". "/>
-          <text macro="accessed" suffix=". "/>
           <text macro="collection" suffix=". "/>
           <text macro="url"/>
+          <text macro="accessed" suffix=". "/>
         </else-if>
         <else-if type="patent">
           <text macro="responsability" suffix=". "/>
@@ -513,12 +569,11 @@
               <text macro="title" suffix=". "/>
             </if>
           </choose>
-          <text macro="number" suffix=". "/>
           <text macro="date" suffix=". "/>
           <text macro="publisher-group" suffix=". "/>
-          <text macro="accessed" suffix=". "/>
           <text macro="collection" suffix=". "/>
           <text macro="url"/>
+          <text macro="number" suffix=". "/>
         </else-if>
         <else-if type="software">
           <text macro="responsability" suffix=". "/>
@@ -527,11 +582,13 @@
               <text macro="title" suffix=". "/>
             </if>
           </choose>
-          <text variable="version" prefix="version " suffix=". "/>
+          <text variable="version" prefix="Version " suffix=". "/>
           <text macro="date" suffix=". "/>
           <text macro="publisher-group" suffix=". "/>
           <text macro="accessed" suffix=". "/>
+          <text macro="doi" suffix=". "/>
           <text macro="url"/>
+          <text macro="accessed" suffix=". "/>
         </else-if>
         <else>
           <text macro="responsability" suffix=". "/>
@@ -542,21 +599,20 @@
           </choose>
           <text macro="medium" suffix=". "/>
           <text macro="genre" suffix=". "/>
-          <text macro="date" suffix=". "/>
+          <text variable="authority" suffix=". "/>
           <text macro="edition" suffix=". "/>
           <text macro="publisher-group" suffix=". "/>
           <text macro="number" suffix=". "/>
-          <text macro="accessed" suffix=". "/>
+          <text macro="legislation-number" suffix=". "/>
           <text macro="collection" suffix=". "/>
           <text macro="page" suffix=". "/>
           <text macro="isbn" suffix=". "/>
+          <text macro="doi" suffix=". "/>
           <text macro="url"/>
+          <text macro="accessed" suffix=". "/>
         </else>
       </choose>
       <text variable="note"/>
-      <group display="right-inline">
-        <text macro="archive"/>
-      </group>
     </layout>
   </bibliography>
 </style>
diff --git a/buildres/csl/csl-styles/howard-hughes-medical-institute.csl b/buildres/csl/csl-styles/howard-hughes-medical-institute.csl
new file mode 100644
index 00000000000..b89783be917
--- /dev/null
+++ b/buildres/csl/csl-styles/howard-hughes-medical-institute.csl
@@ -0,0 +1,102 @@
+<?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>Howard Hughes Medical Institute</title>
+    <title-short>HHMI</title-short>
+    <id>http://www.zotero.org/styles/howard-hughes-medical-institute</id>
+    <link href="http://www.zotero.org/styles/howard-hughes-medical-institute" rel="self"/>
+    <link href="http://www.zotero.org/styles/arcadia-science" rel="template"/>
+    <link href="https://www.hhmi.org/about/policies/scientific-publishing" rel="documentation"/>
+    <author>
+      <name>Michele Avissar-Whiting</name>
+      <email>awm@hhmi.org</email>
+    </author>
+    <category citation-format="numeric"/>
+    <category field="medicine"/>
+    <summary>HHMI's CSL style is a simplified version of the Arcadia Science CSL style that can be found at http://www.zotero.org/styles/arcadia-science"</summary>
+    <updated>2023-06-21T02:49: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>
+  <macro name="isbn">
+    <text variable="ISBN" prefix=" ISBN: "/>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name delimiter-precedes-last="always" initialize-with=" " name-as-sort-order="all" sort-separator=" " and="text"/>
+      <label prefix=", "/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text macro="title"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if variable="PMID">
+        <text variable="PMID" prefix="PMID: "/>
+      </if>
+      <else-if variable="DOI">
+        <text variable="DOI" prefix="DOI: http://doi.org/"/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="report thesis" match="any">
+        <text variable="title"/>
+        <group prefix=" (" suffix=")" delimiter=" ">
+          <text variable="genre"/>
+          <text variable="number" prefix="No. "/>
+        </group>
+      </if>
+      <else-if type="bill book graphic legal_case legislation motion_picture report song speech" match="any">
+        <text variable="title"/>
+      </else-if>
+      <else-if type="webpage">
+        <text variable="title"/>
+      </else-if>
+      <else>
+        <text variable="title"/>
+      </else>
+    </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>
+  <citation collapse="citation-number">
+    <sort>
+      <key variable="citation-number"/>
+    </sort>
+    <layout delimiter="," vertical-align="sup">
+      <text variable="citation-number"/>
+    </layout>
+  </citation>
+  <bibliography hanging-indent="true" entry-spacing="0" line-spacing="1">
+    <sort>
+      <key macro="author"/>
+      <key macro="issued" sort="descending"/>
+    </sort>
+    <layout>
+      <text variable="citation-number" suffix=". "/>
+      <group>
+        <text macro="author" suffix="."/>
+        <group prefix=" " suffix=".">
+          <text macro="title"/>
+        </group>
+        <text macro="issued" strip-periods="false" prefix=" (" suffix=")"/>
+      </group>
+      <text macro="access" prefix=" "/>
+      <text macro="isbn"/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/csl/csl-styles/ieee-with-url.csl b/buildres/csl/csl-styles/ieee-with-url.csl
index 26dbc82af21..63d871fbc99 100644
--- a/buildres/csl/csl-styles/ieee-with-url.csl
+++ b/buildres/csl/csl-styles/ieee-with-url.csl
@@ -4,7 +4,9 @@
     <title>IEEE (with URL)</title>
     <id>http://www.zotero.org/styles/ieee-with-url</id>
     <link href="http://www.zotero.org/styles/ieee-with-url" rel="self"/>
-    <link href="https://ieeeauthorcenter.ieee.org/wp-content/uploads/IEEE-Reference-Guide.pdf" rel="documentation"/>
+    <link href="http://www.zotero.org/styles/ieee" rel="template"/>
+    <!-- <link href="https://ieeeauthorcenter.ieee.org/wp-content/uploads/IEEE-Reference-Guide.pdf" rel="documentation"/> - 2018 guidelines -->
+    <link href="http://journals.ieeeauthorcenter.ieee.org/wp-content/uploads/sites/7/IEEE_Reference_Guide.pdf" rel="documentation"/>
     <link href="https://journals.ieeeauthorcenter.ieee.org/your-role-in-article-production/ieee-editorial-style-manual/" rel="documentation"/>
     <author>
       <name>Michael Berkowitz</name>
@@ -25,11 +27,26 @@
     <contributor>
       <name>Sebastian Karcher</name>
     </contributor>
+    <contributor>
+      <name>Giuseppe Silano</name>
+      <email>g.silano89@gmail.com</email>
+      <uri>http://giuseppesilano.net</uri>
+    </contributor>
+    <contributor>
+      <name>Patrick O'Brien</name>
+    </contributor>
+    <contributor>
+      <name>Brenton M. Wiernik</name>
+    </contributor>
+    <contributor>
+      <name>Oliver Couch</name>
+      <email>oliver.couch@gmail.com</email>
+    </contributor>
     <category citation-format="numeric"/>
     <category field="engineering"/>
     <category field="generic-base"/>
-    <summary>IEEE style with URLs as per the 2018 guidelines, V 11.12.2018.</summary>
-    <updated>2019-12-20T09:20:25+00:00</updated>
+    <summary>IEEE style as per the 2021 guidelines, V 01.29.2021.</summary>
+    <updated>2023-04-23T03:05: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">
@@ -45,6 +62,13 @@
     </terms>
   </locale>
   <!-- Macros -->
+  <macro name="status">
+    <choose>
+      <if variable="page issue volume" match="none">
+        <text variable="status" text-case="capitalize-first" suffix="" font-weight="bold"/>
+      </if>
+    </choose>
+  </macro>
   <macro name="edition">
     <choose>
       <if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
@@ -151,26 +175,20 @@
   </macro>
   <macro name="event">
     <choose>
+      <!-- Published Conference Paper -->
       <if type="paper-conference speech" match="any">
         <choose>
-          <!-- Published Conference Paper -->
-          <if variable="container-title">
-            <group delimiter=", ">
-              <group delimiter=" ">
-                <text term="in"/>
-                <text variable="container-title" font-style="italic"/>
-              </group>
-              <text variable="event-place"/>
+          <if variable="container-title" match="any">
+            <group delimiter=" ">
+              <text term="in"/>
+              <text variable="container-title" font-style="italic"/>
             </group>
           </if>
           <!-- Unpublished Conference Paper -->
           <else>
-            <group delimiter=", ">
-              <group delimiter=" ">
-                <text term="presented at"/>
-                <text variable="event"/>
-              </group>
-              <text variable="event-place"/>
+            <group delimiter=" ">
+              <text term="presented at"/>
+              <text variable="event"/>
             </group>
           </else>
         </choose>
@@ -178,27 +196,41 @@
     </choose>
   </macro>
   <macro name="access">
-    <choose>
-      <if variable="URL">
-        <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" form="text"/>
+    <group delimiter=". " prefix=" ">
+      <text variable="DOI" prefix="doi: "/>
+      <choose>
+        <if variable="URL">
+          <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" form="text"/>
+            </group>
           </group>
+        </if>
+      </choose>
+    </group>
+  </macro>
+  <macro name="page">
+    <choose>
+      <if type="article-journal" variable="number" match="all">
+        <group delimiter=" ">
+          <text value="Art."/>
+          <text term="issue" form="short"/>
+          <text variable="number"/>
         </group>
       </if>
+      <else>
+        <group delimiter=" ">
+          <label variable="page" form="short"/>
+          <text variable="page"/>
+        </group>
+      </else>
     </choose>
   </macro>
-  <macro name="page">
-    <group>
-      <label variable="page" form="short" suffix=" "/>
-      <text variable="page"/>
-    </group>
-  </macro>
   <macro name="citation-locator">
     <group delimiter=" ">
       <choose>
@@ -212,8 +244,30 @@
       <text variable="locator"/>
     </group>
   </macro>
-  <macro name="doi">
-    <text variable="DOI" prefix="doi: "/>
+  <macro name="geographic-location">
+    <group delimiter=", " suffix=".">
+      <choose>
+        <if variable="publisher-place">
+          <text variable="publisher-place" text-case="title"/>
+        </if>
+        <else-if variable="event-place">
+          <text variable="event-place" text-case="title"/>
+        </else-if>
+      </choose>
+    </group>
+  </macro>
+  <!-- Series -->
+  <macro name="collection">
+    <choose>
+      <if variable="collection-title" match="any">
+        <text term="in" suffix=" "/>
+        <group delimiter=", " suffix=". ">
+          <text variable="collection-title"/>
+          <text variable="collection-number" prefix="no. "/>
+          <text variable="volume" prefix="vol. "/>
+        </group>
+      </if>
+    </choose>
   </macro>
   <!-- Citation -->
   <citation collapse="citation-number">
@@ -235,118 +289,146 @@
       <!-- Author(s) -->
       <text macro="author" suffix=", "/>
       <!-- Rest of Citation -->
-      <group suffix=". ">
-        <choose>
-          <!-- Specific Formats -->
-          <if type="article-journal">
-            <group delimiter=", ">
-              <text macro="title"/>
-              <text variable="container-title" font-style="italic" form="short"/>
-              <text macro="locators"/>
-              <text macro="page"/>
-              <text macro="issued"/>
-              <text macro="doi" suffix="."/>
-            </group>
-          </if>
-          <else-if type="paper-conference">
-            <group delimiter=", ">
-              <text macro="title"/>
-              <text macro="event"/>
-              <text macro="issued"/>
-              <text macro="locators"/>
-              <text macro="page"/>
-              <text macro="doi"/>
-            </group>
-          </else-if>
-          <else-if type="report">
-            <group delimiter=", ">
-              <text macro="title"/>
-              <text macro="publisher"/>
-              <group delimiter=" ">
-                <text variable="genre"/>
-                <text variable="number"/>
-              </group>
-              <text macro="issued"/>
+      <choose>
+        <!-- Specific Formats -->
+        <if type="article-journal">
+          <group delimiter=", ">
+            <text macro="title"/>
+            <text variable="container-title" font-style="italic" form="short"/>
+            <text macro="locators"/>
+            <text macro="page"/>
+            <text macro="issued"/>
+            <text macro="status"/>
+          </group>
+          <choose>
+            <if variable="URL DOI" match="none">
+              <text value="."/>
+            </if>
+            <else>
+              <text value=","/>
+            </else>
+          </choose>
+          <text macro="access"/>
+        </if>
+        <else-if type="paper-conference speech" match="any">
+          <group delimiter=", " suffix=", ">
+            <text macro="title"/>
+            <text macro="event"/>
+            <text macro="editor"/>
+          </group>
+          <text macro="collection"/>
+          <group delimiter=", " suffix=".">
+            <text macro="publisher"/>
+            <text macro="issued"/>
+            <text macro="page"/>
+            <text macro="status"/>
+          </group>
+          <text macro="access"/>
+        </else-if>
+        <else-if type="chapter">
+          <group delimiter=", " suffix=", ">
+            <text macro="title"/>
+            <group delimiter=" ">
+              <text term="in" suffix=" "/>
+              <text variable="container-title" font-style="italic"/>
             </group>
-          </else-if>
-          <else-if type="thesis">
-            <group delimiter=", ">
-              <text macro="title"/>
+          </group>
+          <text macro="editor" suffix=", "/>
+          <text macro="edition"/>
+          <text macro="collection"/>
+          <group delimiter=", " suffix=".">
+            <text macro="publisher"/>
+            <text macro="issued"/>
+            <text macro="page"/>
+          </group>
+          <text macro="access"/>
+        </else-if>
+        <else-if type="report">
+          <group delimiter=", " suffix=".">
+            <text macro="title"/>
+            <text macro="publisher"/>
+            <group delimiter=" ">
               <text variable="genre"/>
-              <text macro="publisher"/>
-              <text macro="issued"/>
-            </group>
-          </else-if>
-          <else-if type="webpage post post-weblog" match="any">
-            <group delimiter=", " suffix=". ">
-              <text macro="title"/>
-              <text variable="container-title" font-style="italic"/>
-              <text macro="issued"/>
+              <text variable="number"/>
             </group>
-          </else-if>
-          <else-if type="patent">
-            <text macro="title" suffix=", "/>
+            <text macro="issued"/>
+          </group>
+          <text macro="access"/>
+        </else-if>
+        <else-if type="thesis">
+          <group delimiter=", " suffix=".">
+            <text macro="title"/>
+            <text variable="genre"/>
+            <text macro="publisher"/>
+            <text macro="issued"/>
+          </group>
+          <text macro="access"/>
+        </else-if>
+        <else-if type="webpage post-weblog post" match="any">
+          <group delimiter=", " suffix=".">
+            <text macro="title"/>
+            <text variable="container-title" font-style="italic"/>
+            <text macro="issued"/>
+          </group>
+          <text macro="access"/>
+        </else-if>
+        <else-if type="patent">
+          <group delimiter=", ">
+            <text macro="title"/>
             <text variable="number"/>
             <text macro="issued"/>
-          </else-if>
-          <!-- Generic/Fallback Formats -->
-          <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
-            <group delimiter=", " suffix=". ">
-              <text macro="title"/>
-              <text macro="locators"/>
-            </group>
-            <group delimiter=", ">
-              <text macro="publisher"/>
-              <text macro="issued"/>
-              <text macro="page"/>
-            </group>
-          </else-if>
-          <else-if type="article-magazine article-newspaper broadcast interview manuscript map patent personal_communication song speech thesis webpage" match="any">
-            <group delimiter=", ">
-              <text macro="title"/>
-              <text variable="container-title" font-style="italic"/>
-              <text macro="locators"/>
-              <text macro="publisher"/>
-              <text macro="page"/>
-              <text macro="issued"/>
-            </group>
-          </else-if>
-          <else-if type="chapter paper-conference" match="any">
-            <group delimiter=", " suffix=", ">
-              <text macro="title"/>
-              <group delimiter=" ">
-                <text term="in"/>
-                <text variable="container-title" font-style="italic"/>
-              </group>
-              <text macro="locators"/>
-            </group>
-            <text macro="editor" suffix=" "/>
-            <group delimiter=", ">
-              <text macro="publisher"/>
-              <text macro="issued"/>
-              <text macro="page"/>
-            </group>
-          </else-if>
-          <else>
-            <group delimiter=", " suffix=". ">
-              <text macro="title"/>
-              <text variable="container-title" font-style="italic"/>
-              <text macro="locators"/>
-            </group>
-            <group delimiter=", ">
-              <text macro="publisher"/>
-              <text macro="page"/>
-              <text macro="issued"/>
-            </group>
-          </else>
-        </choose>
-        <choose>
-          <if variable="URL">
-            <text value=" [Online]"/>
-          </if>
-        </choose>
-      </group>
-      <text macro="access"/>
+          </group>
+          <text macro="access"/>
+        </else-if>
+        <!-- Online Video -->
+        <else-if type="motion_picture">
+          <text macro="geographic-location" suffix=". "/>
+          <group delimiter=", " suffix=".">
+            <text macro="title"/>
+            <text macro="issued"/>
+          </group>
+          <text macro="access"/>
+        </else-if>
+        <!-- Generic/Fallback Formats -->
+        <else-if type="bill book graphic legal_case legislation report song" match="any">
+          <group delimiter=", " suffix=". ">
+            <text macro="title"/>
+            <text macro="locators"/>
+          </group>
+          <text macro="collection"/>
+          <group delimiter=", " suffix=".">
+            <text macro="publisher"/>
+            <text macro="issued"/>
+            <text macro="page"/>
+          </group>
+          <text macro="access"/>
+        </else-if>
+        <else-if type="article-magazine article-newspaper broadcast interview manuscript map patent personal_communication song speech thesis webpage" match="any">
+          <group delimiter=", " suffix=".">
+            <text macro="title"/>
+            <text variable="container-title" font-style="italic"/>
+            <text macro="locators"/>
+            <text macro="publisher"/>
+            <text macro="page"/>
+            <text macro="issued"/>
+          </group>
+          <text macro="access"/>
+        </else-if>
+        <else>
+          <group delimiter=", " suffix=". ">
+            <text macro="title"/>
+            <text variable="container-title" font-style="italic"/>
+            <text macro="locators"/>
+          </group>
+          <text macro="collection"/>
+          <group delimiter=", " suffix=".">
+            <text macro="publisher"/>
+            <text macro="page"/>
+            <text macro="issued"/>
+          </group>
+          <text macro="access"/>
+        </else>
+      </choose>
     </layout>
   </bibliography>
 </style>
diff --git a/buildres/csl/csl-styles/ieee.csl b/buildres/csl/csl-styles/ieee.csl
index 19081952c37..04c375f09b7 100644
--- a/buildres/csl/csl-styles/ieee.csl
+++ b/buildres/csl/csl-styles/ieee.csl
@@ -45,7 +45,7 @@
     <category field="engineering"/>
     <category field="generic-base"/>
     <summary>IEEE style as per the 2021 guidelines, V 01.29.2021.</summary>
-    <updated>2022-10-11T00:52:46+10:00</updated>
+    <updated>2023-04-18T00:52:46+10:00</updated>
     <rights 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">
@@ -174,25 +174,20 @@
   </macro>
   <macro name="event">
     <choose>
+      <!-- Published Conference Paper -->
       <if type="paper-conference speech" match="any">
         <choose>
-          <!-- Published Conference Paper -->
           <if variable="container-title" match="any">
-            <group delimiter=", ">
-              <group delimiter=" ">
-                <text term="in"/>
-                <text variable="container-title" font-style="italic"/>
-              </group>
+            <group delimiter=" ">
+              <text term="in"/>
+              <text variable="container-title" font-style="italic"/>
             </group>
           </if>
           <!-- Unpublished Conference Paper -->
           <else>
-            <group delimiter=", ">
-              <group delimiter=" ">
-                <text term="presented at"/>
-                <text variable="event"/>
-              </group>
-              <text variable="event-place"/>
+            <group delimiter=" ">
+              <text term="presented at"/>
+              <text variable="event"/>
             </group>
           </else>
         </choose>
diff --git a/buildres/csl/csl-styles/isara-iso-690.csl b/buildres/csl/csl-styles/isara-iso-690.csl
index 115558fcbad..2a4f2cc7b99 100644
--- a/buildres/csl/csl-styles/isara-iso-690.csl
+++ b/buildres/csl/csl-styles/isara-iso-690.csl
@@ -16,7 +16,7 @@
     <category citation-format="author-date"/>
     <category field="generic-base"/>
     <summary>Style based on ISO 690:2010(F), V1, derived from Mellifluo, Grolimund, Hardegger and Giraud version.</summary>
-    <updated>2022-08-31T02:31:25+00:00</updated>
+    <updated>2023-06-23T10:13: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>
@@ -327,7 +327,7 @@
       </else>
     </choose>
   </macro>
-  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" collapse="year" year-suffix-delimiter=", " after-collapse-delimiter="; ">
+  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="false" disambiguate-add-givenname="true" collapse="year" year-suffix-delimiter=", " after-collapse-delimiter="; ">
     <layout prefix="(" suffix=")" delimiter="; ">
       <group delimiter=", ">
         <group delimiter=", ">
diff --git a/buildres/csl/csl-styles/jci-insight.csl b/buildres/csl/csl-styles/jci-insight.csl
deleted file mode 100644
index adbd5781319..00000000000
--- a/buildres/csl/csl-styles/jci-insight.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="sort-only" default-locale="en-US">
-  <info>
-    <title>JCI Insight</title>
-    <id>http://www.zotero.org/styles/jci-insight</id>
-    <link href="http://www.zotero.org/styles/jci-insight" rel="self"/>
-    <link href="http://www.zotero.org/styles/the-journal-of-clinical-investigation" rel="template"/>
-    <link href="https://insight.jci.org/kiosks/authors" rel="documentation"/>
-    <author>
-      <name>Patrick O'Brien</name>
-    </author>
-    <category citation-format="numeric"/>
-    <category field="medicine"/>
-    <eissn>2379-3708</eissn>
-    <updated>2021-04-28T10:25: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">
-    <terms>
-      <term name="et-al">et al</term>
-    </terms>
-  </locale>
-  <macro name="author">
-    <names variable="author">
-      <name delimiter-precedes-et-al="always" initialize-with="" name-as-sort-order="all" sort-separator=" "/>
-      <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=", " delimiter-precedes-last="always"/>
-      <label form="short" prefix=" " suffix="."/>
-    </names>
-  </macro>
-  <macro name="publisher">
-    <group>
-      <text variable="publisher-place" suffix=": "/>
-      <text variable="publisher" suffix="; "/>
-      <date variable="issued">
-        <date-part name="year" suffix=":"/>
-      </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">
-            <group delimiter=" ">
-              <text variable="URL" suffix=". "/>
-              <text term="cited"/>
-              <date variable="accessed">
-                <date-part name="month"/>
-                <date-part name="day" prefix=" "/>
-                <date-part name="year" prefix=", "/>
-              </date>
-            </group>
-          </else-if>
-        </choose>
-      </if>
-    </choose>
-  </macro>
-  <macro name="title">
-    <group delimiter=" ">
-      <text variable="title"/>
-    </group>
-  </macro>
-  <macro name="date">
-    <choose>
-      <if type="article-journal">
-        <choose>
-          <if variable="volume page" match="none">
-            <choose>
-              <if variable="DOI URL" match="any">
-                <group prefix="[published online ahead of print: " suffix="]">
-                  <date variable="issued" delimiter=" ">
-                    <date-part name="month" form="long" text-case="capitalize-first"/>
-                    <date-part name="day" suffix=", "/>
-                    <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>
-  <citation collapse="citation-number">
-    <sort>
-      <key variable="citation-number"/>
-    </sort>
-    <layout prefix="(" suffix=")" delimiter=", ">
-      <text variable="citation-number"/>
-    </layout>
-  </citation>
-  <bibliography delimiter-precedes-last="always" et-al-min="4" et-al-use-first="1" second-field-align="flush" line-spacing="2">
-    <layout>
-      <text variable="citation-number" suffix=". "/>
-      <text macro="author" suffix=". "/>
-      <choose>
-        <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
-          <text macro="title" font-style="italic"/>
-          <text macro="publisher" prefix=". "/>
-        </if>
-        <else-if type="chapter paper-conference" match="any">
-          <text macro="title"/>
-          <text term="in" suffix=": " prefix=". " text-case="capitalize-first"/>
-          <group delimiter=". " suffix=". ">
-            <text macro="editor"/>
-            <text variable="container-title" font-style="italic"/>
-          </group>
-          <text macro="publisher"/>
-          <text variable="page"/>
-        </else-if>
-        <else>
-          <text macro="title"/>
-          <text variable="container-title" suffix=" " prefix=". " form="short" font-style="italic"/>
-          <text macro="date" suffix=";"/>
-          <group suffix=".">
-            <text variable="volume"/>
-            <text variable="issue" prefix="(" suffix=")"/>
-            <text variable="page" prefix=":"/>
-          </group>
-          <text macro="access"/>
-        </else>
-      </choose>
-    </layout>
-  </bibliography>
-</style>
diff --git a/buildres/csl/csl-styles/journal-of-dental-traumatology.csl b/buildres/csl/csl-styles/journal-of-dental-traumatology.csl
new file mode 100644
index 00000000000..784a3d393e5
--- /dev/null
+++ b/buildres/csl/csl-styles/journal-of-dental-traumatology.csl
@@ -0,0 +1,204 @@
+<?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>Journal of Dental Traumatology</title>
+    <title-short>JDT</title-short>
+    <id>http://www.zotero.org/styles/journal-of-dental-traumatology</id>
+    <link href="http://www.zotero.org/styles/journal-of-dental-traumatology" rel="self"/>
+    <link href="http://www.zotero.org/styles/mary-ann-liebert-vancouver" rel="template"/>
+    <link href="https://onlinelibrary.wiley.com/page/journal/16009657/homepage/forauthors.html" rel="documentation"/>
+    <author>
+      <name>Patrick O'Brien</name>
+    </author>
+    <category citation-format="numeric"/>
+    <category field="biology"/>
+    <category field="medicine"/>
+    <issn>1600-4469</issn>
+    <eissn>1600-9657</eissn>
+    <updated>2023-02-08T11:31: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="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"/>
+      <label form="short" strip-periods="false" 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"/>
+      <label form="short" strip-periods="false" prefix=", "/>
+    </names>
+  </macro>
+  <macro name="date">
+    <choose>
+      <if type="article-newspaper report" match="any">
+        <date variable="issued" form="text"/>
+      </if>
+      <else>
+        <date variable="issued" form="text" date-parts="year"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <group delimiter="; ">
+      <group delimiter=" ">
+        <text variable="genre" text-case="title"/>
+        <text variable="number"/>
+      </group>
+      <group delimiter=": ">
+        <choose>
+          <if type="thesis" match="none">
+            <text variable="publisher-place"/>
+          </if>
+        </choose>
+        <text variable="publisher"/>
+      </group>
+      <choose>
+        <if variable="URL" match="none">
+          <text macro="date"/>
+        </if>
+      </choose>
+    </group>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if variable="page" match="none">
+        <choose>
+          <if variable="DOI" match="any">
+            <group prefix=". " delimiter=". ">
+              <date variable="issued" form="text" prefix="Epub ahead of print "/>
+              <text variable="DOI" prefix="DOI: "/>
+            </group>
+          </if>
+          <else>
+            <group delimiter=". ">
+              <group delimiter=": ">
+                <text term="available at" text-case="capitalize-first"/>
+                <text variable="URL"/>
+              </group>
+              <text macro="accessed-date"/>
+            </group>
+          </else>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="accessed-date">
+    <choose>
+      <if variable="URL">
+        <group delimiter=". ">
+          <text macro="date"/>
+          <group delimiter=" ">
+            <text term="accessed" text-case="capitalize-first"/>
+            <date variable="accessed" form="text"/>
+          </group>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="container-title">
+    <choose>
+      <if type="article-journal" match="any">
+        <text variable="container-title" form="short" strip-periods="true" font-style="normal"/>
+      </if>
+      <else>
+        <text variable="container-title" font-style="italic"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="book patent report thesis" match="any">
+        <text variable="title"/>
+      </if>
+      <else>
+        <text variable="title"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="page">
+    <text variable="page"/>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="short"/>
+        </group>
+      </if>
+      <else>
+        <text variable="edition" suffix="."/>
+      </else>
+    </choose>
+  </macro>
+  <citation collapse="citation-number">
+    <sort>
+      <key variable="citation-number"/>
+    </sort>
+    <layout delimiter="," vertical-align="sup">
+      <text variable="citation-number"/>
+    </layout>
+  </citation>
+  <bibliography delimiter-precedes-et-al="always" et-al-min="7" et-al-use-first="6" second-field-align="flush" line-spacing="2">
+    <layout suffix=".">
+      <text variable="citation-number" suffix=". "/>
+      <text macro="author"/>
+      <text macro="title"/>
+      <choose>
+        <if type="bill book graphic legal_case legislation motion_picture patent report song thesis" match="any">
+          <group delimiter=". " prefix=". ">
+            <text macro="edition"/>
+            <text macro="publisher"/>
+          </group>
+        </if>
+        <else-if type="chapter paper-conference" match="any">
+          <group delimiter=":" prefix=". ">
+            <group delimiter=". ">
+              <group delimiter=" ">
+                <text term="in" suffix=":" text-case="capitalize-first"/>
+                <text macro="editor"/>
+                <text variable="container-title" font-style="normal"/>
+              </group>
+              <text macro="publisher"/>
+            </group>
+            <text macro="page"/>
+          </group>
+        </else-if>
+        <else-if type="article-newspaper article-magazine" match="any">
+          <group delimiter=", " prefix=". ">
+            <text macro="container-title"/>
+            <text macro="date"/>
+            <text macro="page"/>
+          </group>
+        </else-if>
+        <else>
+          <group delimiter=";" prefix=". ">
+            <group delimiter=". ">
+              <text macro="container-title"/>
+              <choose>
+                <if variable="page" match="any">
+                  <text macro="date"/>
+                </if>
+              </choose>
+            </group>
+            <group delimiter=":">
+              <text variable="volume"/>
+              <text variable="page"/>
+            </group>
+          </group>
+        </else>
+      </choose>
+      <text macro="access" prefix=" "/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/csl/csl-styles/journal-of-emerging-investigators.csl b/buildres/csl/csl-styles/journal-of-emerging-investigators.csl
new file mode 100644
index 00000000000..81b661b22a6
--- /dev/null
+++ b/buildres/csl/csl-styles/journal-of-emerging-investigators.csl
@@ -0,0 +1,324 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="never" page-range-format="minimal-two">
+  <!-- STYLE META DATA -->
+  <info>
+    <title>Journal of Emerging Investigators</title>
+    <title-short>JEI</title-short>
+    <id>http://www.zotero.org/styles/journal-of-emerging-investigators</id>
+    <link href="http://www.zotero.org/styles/journal-of-emerging-investigators" rel="self"/>
+    <link href="https://github.com/SirohiKumar/MANUSCRIPT-FORMATTING/blob/main/documentation.html" rel="documentation"/>
+    <contributor>
+      <name>Sirohi Kumar</name>
+      <email>sirohigkumar@icloud.com</email>
+    </contributor>
+    <category citation-format="author"/>
+    <category field="generic-base"/>
+    <summary>This style is based on the MLA 9th edition handbook, with adaptations made to the in-text citation style, following the guidelines of the Journal of Emerging Investigators.</summary>
+    <updated>2023-07-07T23:56:30+00:00</updated>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+  </info>
+  <!-- MACROS -->
+  <locale xml:lang="en">
+    <date form="text">
+      <date-part name="day" suffix=" "/>
+      <date-part name="month" suffix=" " form="short"/>
+      <date-part name="year"/>
+    </date>
+    <terms>
+      <term name="month-01" form="short">Jan.</term>
+      <term name="month-02" form="short">Feb.</term>
+      <term name="month-03" form="short">Mar.</term>
+      <term name="month-04" form="short">Apr.</term>
+      <term name="month-05" form="short">May</term>
+      <term name="month-06" form="short">June</term>
+      <term name="month-07" form="short">July</term>
+      <term name="month-08" form="short">Aug.</term>
+      <term name="month-09" form="short">Sept.</term>
+      <term name="month-10" form="short">Oct.</term>
+      <term name="month-11" form="short">Nov.</term>
+      <term name="month-12" form="short">Dec.</term>
+      <term name="translator" form="short">trans.</term>
+    </terms>
+  </locale>
+  <macro name="author">
+    <names variable="author">
+      <name name-as-sort-order="first" and="text" delimiter-precedes-last="always" delimiter-precedes-et-al="always" initialize="false" initialize-with=". "/>
+      <label form="long" prefix=", "/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text macro="title"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if variable="container-title" match="any">
+        <text variable="title" quotes="true" text-case="title"/>
+      </if>
+      <else>
+        <text variable="title" font-style="italic" text-case="title"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="container-title">
+    <text variable="container-title" font-style="italic" text-case="title"/>
+  </macro>
+  <macro name="other-contributors">
+    <choose>
+      <if variable="container-title" match="any">
+        <group delimiter=", ">
+          <names variable="container-author" delimiter=", ">
+            <label form="verb" suffix=" "/>
+            <name and="text"/>
+          </names>
+          <names variable="editor translator" delimiter=", ">
+            <label form="verb" suffix=" "/>
+            <name and="text"/>
+          </names>
+          <names variable="director illustrator interviewer" delimiter=", ">
+            <label form="verb" suffix=" "/>
+            <name and="text"/>
+          </names>
+        </group>
+      </if>
+      <else>
+        <group delimiter=", ">
+          <names variable="container-author" delimiter=", ">
+            <label form="verb" suffix=" " text-case="capitalize-first"/>
+            <name and="text"/>
+          </names>
+          <names variable="editor translator" delimiter=", ">
+            <label form="verb" suffix=" " text-case="capitalize-first"/>
+            <name and="text"/>
+          </names>
+          <names variable="director illustrator interviewer" delimiter=", ">
+            <label form="verb" suffix=" " text-case="capitalize-first"/>
+            <name and="text"/>
+          </names>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="version">
+    <group delimiter=", ">
+      <choose>
+        <if is-numeric="edition">
+          <group delimiter=" ">
+            <number variable="edition" form="ordinal"/>
+            <text term="edition" form="short"/>
+          </group>
+        </if>
+        <else>
+          <text variable="edition" text-case="capitalize-first"/>
+        </else>
+      </choose>
+      <text variable="version"/>
+      <text variable="medium"/>
+    </group>
+  </macro>
+  <macro name="volume-lowercase">
+    <group delimiter=" ">
+      <text term="volume" form="short"/>
+      <text variable="volume"/>
+    </group>
+  </macro>
+  <macro name="number">
+    <group delimiter=", ">
+      <group>
+        <choose>
+          <!--lowercase if we have a preceding element-->
+          <if variable="edition container-title" match="any">
+            <text macro="volume-lowercase"/>
+          </if>
+          <!--other contributors preceding the volume-->
+          <else-if variable="author" match="all">
+            <choose>
+              <if variable="editor translator container-author illustrator interviewer director" match="any">
+                <text macro="volume-lowercase"/>
+              </if>
+            </choose>
+          </else-if>
+          <else-if variable="editor" match="all">
+            <choose>
+              <if variable="translator container-author illustrator interviewer director" match="any">
+                <text macro="volume-lowercase"/>
+              </if>
+            </choose>
+          </else-if>
+          <else-if variable="container-author illustrator interviewer director" match="any">
+            <text macro="volume-lowercase"/>
+          </else-if>
+          <else>
+            <group delimiter=" ">
+              <text term="volume" form="short" text-case="capitalize-first"/>
+              <text variable="volume"/>
+            </group>
+          </else>
+        </choose>
+      </group>
+      <group delimiter=" ">
+        <text term="issue" form="short"/>
+        <text variable="issue"/>
+      </group>
+      <choose>
+        <if type="report">
+          <text variable="genre"/>
+        </if>
+      </choose>
+      <text variable="number"/>
+    </group>
+  </macro>
+  <macro name="publisher">
+    <choose>
+      <if type="article-magazine article-newspaper article-journal" match="none">
+        <text variable="publisher"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="publication-date">
+    <choose>
+      <if type="book chapter paper-conference motion_picture" match="any">
+        <date variable="issued" form="numeric" date-parts="year"/>
+      </if>
+      <else-if type="article-journal" match="any">
+        <date variable="issued" form="text" date-parts="year-month"/>
+      </else-if>
+      <else-if type="speech" match="none">
+        <date variable="issued" form="text"/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="location">
+    <group delimiter=", ">
+      <group delimiter=" ">
+        <label variable="page" form="short"/>
+        <text variable="page"/>
+      </group>
+      <choose>
+        <if variable="source" match="none">
+          <text macro="URI"/>
+        </if>
+      </choose>
+    </group>
+  </macro>
+  <macro name="container2-title">
+    <group delimiter=", ">
+      <choose>
+        <if type="speech">
+          <text variable="event"/>
+          <date variable="event-date" form="text"/>
+          <text variable="event-place"/>
+        </if>
+      </choose>
+      <text variable="archive"/>
+      <text variable="archive-place"/>
+      <text variable="archive_location"/>
+    </group>
+  </macro>
+  <macro name="container2-location">
+    <choose>
+      <if variable="source">
+        <choose>
+          <if variable="DOI URL" match="any">
+            <group delimiter=", ">
+              <text variable="source" font-style="italic"/>
+              <text macro="URI"/>
+            </group>
+          </if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="URI">
+    <choose>
+      <if variable="DOI">
+        <text variable="DOI" prefix="https://doi.org/"/>
+      </if>
+      <else>
+        <text variable="URL"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="accessed">
+    <!--using accessed where we don't have an issued date; follows recommendation on p. 53 -->
+    <choose>
+      <if variable="issued" match="none">
+        <group delimiter=" ">
+          <text term="accessed" text-case="capitalize-first"/>
+          <date variable="accessed" form="text"/>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="citation-locator">
+    <group delimiter=" ">
+      <choose>
+        <if locator="page">
+          <label variable="locator" form="short"/>
+        </if>
+        <else>
+          <label variable="locator" form="short" text-case="capitalize-first"/>
+        </else>
+      </choose>
+      <text variable="locator"/>
+    </group>
+  </macro>
+  <!-- IN TEXT CITATION -->
+  <citation collapse="citation-number">
+    <sort>
+      <key variable="citation-number"/>
+    </sort>
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <choose>
+        <if locator="page line" match="any">
+          <group delimiter=" ">
+            <text variable="citation-number"/>
+            <text macro="citation-locator"/>
+          </group>
+        </if>
+        <else>
+          <group delimiter=", ">
+            <text macro="citation-locator"/>
+            <group>
+              <label variable="citation-number"/>
+              <text variable="citation-number"/>
+            </group>
+          </group>
+        </else>
+      </choose>
+    </layout>
+  </citation>
+  <!-- BIBLIOGRAPHY -->
+  <bibliography hanging-indent="true" et-al-min="2" et-al-use-first="1" line-spacing="2" entry-spacing="0" subsequent-author-substitute="---">
+    <sort>
+      <key variable="citation-number"/>
+      <key macro="citation-locator"/>
+    </sort>
+    <layout suffix=".">
+      <text variable="citation-number" prefix="" suffix=") "/>
+      <group delimiter=". ">
+        <text macro="author"/>
+        <text macro="title"/>
+        <date variable="original-date" form="numeric" date-parts="year"/>
+        <group delimiter=", ">
+          <!---This group corresponds to MLA's "Container 1"-->
+          <text macro="container-title"/>
+          <text macro="other-contributors"/>
+          <text macro="version"/>
+          <text macro="number"/>
+          <text macro="publisher"/>
+          <text macro="publication-date"/>
+          <text macro="location"/>
+        </group>
+        <group delimiter=", ">
+          <!---This group corresponds to MLA's "Container 2"-->
+          <!--currently just using this one for archival info-->
+          <text macro="container2-title"/>
+          <text macro="container2-location"/>
+        </group>
+        <text macro="accessed"/>
+      </group>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/csl/csl-styles/journal-of-experimental-botany.csl b/buildres/csl/csl-styles/journal-of-experimental-botany.csl
index 3b2791df719..7d736286ee7 100644
--- a/buildres/csl/csl-styles/journal-of-experimental-botany.csl
+++ b/buildres/csl/csl-styles/journal-of-experimental-botany.csl
@@ -2,18 +2,23 @@
 <style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" default-locale="en-GB">
   <info>
     <title>Journal of Experimental Botany</title>
+    <title-short>JXB</title-short>
     <id>http://www.zotero.org/styles/journal-of-experimental-botany</id>
     <link href="http://www.zotero.org/styles/journal-of-experimental-botany" rel="self"/>
     <link href="http://www.oxfordjournals.org/our_journals/exbotj/for_authors/index.html" rel="documentation"/>
+    <link href="https://academic.oup.com/jxb/pages/manuscript-preparation?login=false#References" rel="documentation"/>
     <author>
       <name>Johan Asplund</name>
       <email>asplundj@gmail.com</email>
     </author>
+    <contributor>
+      <name>Patrick O'Brien</name>
+    </contributor>
     <category citation-format="author-date"/>
     <category field="biology"/>
     <issn>0022-0957</issn>
     <eissn>1460-2431</eissn>
-    <updated>2013-08-29T04:18:55+00:00</updated>
+    <updated>2023-07-18T12:32:23+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <macro name="editor-translator">
@@ -69,79 +74,134 @@
       <text variable="publisher"/>
     </group>
   </macro>
+  <macro name="access">
+    <choose>
+      <if type="article-journal article" match="any">
+        <choose>
+          <if match="none" variable="volume page">
+            <choose>
+              <if match="any" variable="DOI">
+                <text variable="DOI" prefix="doi: "/>
+                <choose>
+                  <if type="article" match="any">
+                    <text term="preprint" text-case="capitalize-first" prefix=". [" suffix="]"/>
+                  </if>
+                </choose>
+              </if>
+              <else>
+                <text term="in press" font-style="italic"/>
+              </else>
+            </choose>
+          </if>
+        </choose>
+      </if>
+      <else-if type="webpage post post-weblog" match="any">
+        <group delimiter=". ">
+          <text variable="URL"/>
+          <group delimiter=" ">
+            <text term="accessed" text-case="capitalize-first"/>
+            <date date-parts="year-month" form="text" variable="accessed"/>
+          </group>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="year-date">
+    <date variable="issued">
+      <date-part name="year"/>
+    </date>
+  </macro>
   <citation collapse="year-suffix" et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" year-suffix-delimiter=",">
     <sort>
-      <key variable="issued"/>
+      <key macro="year-date"/>
       <key variable="author"/>
     </sort>
     <layout prefix="(" suffix=")" delimiter="; ">
       <group delimiter=", ">
         <text macro="author-short"/>
         <group>
-          <date variable="issued">
-            <date-part name="year"/>
-          </date>
+          <text macro="year-date"/>
           <text variable="year-suffix" font-style="italic"/>
         </group>
         <group>
           <label variable="locator"/>
           <text variable="locator" prefix=" "/>
         </group>
+        <choose>
+          <if type="article" match="any">
+            <text term="preprint" text-case="capitalize-first"/>
+          </if>
+        </choose>
       </group>
     </layout>
   </citation>
   <bibliography et-al-min="11" et-al-use-first="3" hanging-indent="false">
     <sort>
       <key macro="author-short"/>
-      <key variable="issued"/>
+      <key macro="year-date"/>
     </sort>
-    <layout>
-      <text macro="author" suffix=". " font-weight="bold"/>
-      <group suffix=".">
-        <date variable="issued">
-          <date-part name="year"/>
-        </date>
-        <text variable="year-suffix" font-style="italic"/>
-      </group>
-      <choose>
-        <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
-          <group suffix=".">
-            <text macro="title" prefix=" "/>
-            <text macro="editor-translator" prefix=" "/>
-          </group>
-          <text prefix=" " suffix="." macro="publisher"/>
-        </if>
-        <else-if type="chapter paper-conference" match="any">
-          <text macro="title" prefix=" "/>
-          <group prefix=".">
-            <group>
-              <group suffix=".">
+    <layout suffix=".">
+      <group delimiter=". ">
+        <text macro="author" font-weight="bold"/>
+        <group>
+          <text macro="year-date"/>
+          <text variable="year-suffix" font-style="italic"/>
+        </group>
+        <text macro="title"/>
+        <choose>
+          <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+            <group suffix=".">
+              <text macro="editor-translator" prefix=" "/>
+            </group>
+            <text prefix=" " suffix="." macro="publisher"/>
+          </if>
+          <else-if type="chapter paper-conference" match="any">
+            <group delimiter=". ">
+              <group delimiter=": ">
+                <text term="in" text-case="capitalize-first"/>
                 <names variable="editor translator">
-                  <name prefix=" In: " suffix="," delimiter-precedes-last="always" initialize-with="" name-as-sort-order="all" sort-separator=" "/>
-                  <label form="short" prefix=" "/>
+                  <name delimiter-precedes-last="always" initialize-with="" name-as-sort-order="all" sort-separator=" "/>
+                  <label form="short" prefix=", "/>
                 </names>
-                <text variable="collection-title" prefix=" " suffix="."/>
-                <text variable="container-title" prefix=" " suffix="."/>
-                <text macro="publisher" prefix=" " suffix=", "/>
-                <text variable="page" suffix="."/>
+              </group>
+              <text variable="collection-title" prefix=" " suffix="."/>
+              <text variable="container-title" prefix=" " suffix="."/>
+              <group delimiter=", ">
+                <text macro="publisher"/>
+                <text variable="page"/>
               </group>
             </group>
-          </group>
-        </else-if>
-        <else>
-          <group suffix=".">
-            <text macro="title" prefix=" "/>
-            <text macro="editor-translator" prefix=" "/>
-          </group>
-          <group prefix=" " suffix=".">
-            <text variable="container-title"/>
-            <group prefix=" ">
-              <text variable="volume" font-weight="bold"/>
+          </else-if>
+          <else-if type="article" match="any">
+            <group delimiter=" ">
+              <text variable="publisher"/>
+              <text macro="access"/>
             </group>
-            <text variable="page" prefix=", "/>
-          </group>
-        </else>
-      </choose>
+          </else-if>
+          <else-if type="thesis" match="any">
+            <group delimiter=", ">
+              <text variable="genre"/>
+              <text variable="publisher"/>
+            </group>
+          </else-if>
+          <else-if type="webpage post post-weblog" match="any">
+            <text macro="access"/>
+          </else-if>
+          <else>
+            <group delimiter=". " suffix=".">
+              <text macro="editor-translator"/>
+              <group delimiter=", ">
+                <group delimiter=" " prefix=" ">
+                  <text variable="container-title"/>
+                  <text variable="volume" font-weight="bold"/>
+                  <text macro="access"/>
+                </group>
+                <text variable="page"/>
+              </group>
+            </group>
+          </else>
+        </choose>
+      </group>
     </layout>
   </bibliography>
 </style>
diff --git a/buildres/csl/csl-styles/journal-of-paleontology.csl b/buildres/csl/csl-styles/journal-of-paleontology.csl
index 1f1fdcefdeb..6570974cc02 100644
--- a/buildres/csl/csl-styles/journal-of-paleontology.csl
+++ b/buildres/csl/csl-styles/journal-of-paleontology.csl
@@ -9,8 +9,8 @@
     <link href="https://www.cambridge.org/core/services/aop-file-manager/file/5c94f7029ab84c5f086928bb" rel="documentation"/>
     <author>
       <name>Martin R. Smith</name>
-      <email>martins@gmail.com</email>
-      <uri>https://community.dur.ac.uk/martin.smith/</uri>
+      <email>martin.smith@durham.ac.uk</email>
+      <uri>https://smithlabdurham.github.io/</uri>
     </author>
     <category citation-format="author-date"/>
     <category field="biology"/>
@@ -107,11 +107,19 @@
       <key macro="author-short"/>
     </sort>
     <layout prefix="(" suffix=")" delimiter="; ">
-      <group delimiter=", ">
-        <text macro="author-short"/>
-        <text macro="year-date"/>
+      <group delimiter=" ">
+        <group delimiter="">
+          <group delimiter=" ">
+            <text macro="author-short"/>
+            <text macro="year-date"/>
+          </group>
+          <text variable="year-suffix"/>
+        </group>
+        <group delimiter=" ">
+          <label variable="locator" form="short"/>
+          <text variable="locator"/>
+        </group>
       </group>
-      <text variable="locator"/>
     </layout>
   </citation>
   <bibliography entry-spacing="0" hanging-indent="true">
diff --git a/buildres/csl/csl-styles/journal-of-the-american-philosophical-association.csl b/buildres/csl/csl-styles/journal-of-the-american-philosophical-association.csl
new file mode 100644
index 00000000000..39ef20eab02
--- /dev/null
+++ b/buildres/csl/csl-styles/journal-of-the-american-philosophical-association.csl
@@ -0,0 +1,188 @@
+<?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">
+  <info>
+    <title>Journal of the American Philosophical Association</title>
+    <id>http://www.zotero.org/styles/journal-of-the-american-philosophical-association</id>
+    <link href="http://www.zotero.org/styles/journal-of-the-american-philosophical-association" rel="self"/>
+    <link href="http://www.zotero.org/styles/karstenia" rel="template"/>
+    <link href="https://www.cambridge.org/core/journals/journal-of-the-american-philosophical-association/information/author-instructions/preparing-your-materials" rel="documentation"/>
+    <author>
+      <name>Patrick O'Brien</name>
+    </author>
+    <category citation-format="author-date"/>
+    <category field="humanities"/>
+    <issn>2053-4477</issn>
+    <eissn>2053-4485</eissn>
+    <updated>2023-05-25T18:05: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="editor">
+    <names variable="editor">
+      <name and="symbol"/>
+      <label form="short" prefix=" (" suffix=")"/>
+    </names>
+  </macro>
+  <macro name="anon">
+    <text term="anonymous" form="short" text-case="capitalize-first"/>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name and="symbol" delimiter-precedes-last="never" name-as-sort-order="all"/>
+      <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" et-al-min="3" et-al-use-first="1" initialize-with=". "/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text macro="anon"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="book thesis" match="any">
+        <text variable="title" font-style="italic"/>
+      </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"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition"/>
+        </group>
+      </if>
+      <else>
+        <text variable="edition"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="pages">
+    <text variable="page"/>
+  </macro>
+  <macro name="cite-locator">
+    <group delimiter=" ">
+      <choose>
+        <if match="none" locator="page">
+          <label variable="locator" form="short"/>
+        </if>
+      </choose>
+      <text variable="locator"/>
+    </group>
+  </macro>
+  <macro name="secondary-contributors">
+    <names variable="editor translator" delimiter="; ">
+      <label form="verb" text-case="capitalize-first" suffix=" "/>
+      <name/>
+    </names>
+  </macro>
+  <macro name="volume">
+    <group delimiter=" ">
+      <label variable="volume" form="short"/>
+      <number variable="volume" form="numeric"/>
+    </group>
+  </macro>
+  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-names="true" disambiguate-add-givenname="true" disambiguate-add-year-suffix="true" collapse="year">
+    <sort>
+      <key macro="year-date"/>
+      <key macro="author"/>
+    </sort>
+    <layout delimiter="; " prefix="(" suffix=")">
+      <group delimiter=": ">
+        <group delimiter=" ">
+          <text macro="author-short"/>
+          <text macro="year-date"/>
+        </group>
+        <text macro="cite-locator"/>
+      </group>
+    </layout>
+  </citation>
+  <bibliography hanging-indent="true">
+    <sort>
+      <key macro="author"/>
+      <key macro="year-date"/>
+    </sort>
+    <layout suffix=".">
+      <group delimiter=" ">
+        <group delimiter=". ">
+          <text macro="author"/>
+          <date variable="issued" prefix="(" suffix=")">
+            <date-part name="year"/>
+          </date>
+        </group>
+        <choose>
+          <if type="book thesis" match="any">
+            <group delimiter=". ">
+              <text macro="title"/>
+              <text macro="edition"/>
+              <text macro="secondary-contributors"/>
+              <text macro="publisher"/>
+              <text macro="volume"/>
+            </group>
+          </if>
+          <else-if type="chapter">
+            <group delimiter=". ">
+              <text macro="title"/>
+              <group delimiter=" ">
+                <text term="in" text-case="capitalize-first"/>
+                <text macro="editor" text-case="capitalize-all"/>
+              </group>
+              <group delimiter=" ">
+                <group delimiter=", ">
+                  <group delimiter=". ">
+                    <text variable="container-title" font-style="italic"/>
+                    <text variable="collection-title"/>
+                  </group>
+                  <text macro="volume"/>
+                </group>
+                <group delimiter=", ">
+                  <text macro="publisher" prefix="(" suffix=")"/>
+                  <text macro="pages"/>
+                </group>
+              </group>
+            </group>
+          </else-if>
+          <else>
+            <group delimiter=". ">
+              <text macro="title"/>
+              <group delimiter=", ">
+                <text variable="container-title" font-style="italic"/>
+                <text variable="volume"/>
+                <text macro="pages"/>
+              </group>
+            </group>
+          </else>
+        </choose>
+      </group>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/csl/csl-styles/jurnal-teknik-mesin-indonesia.csl b/buildres/csl/csl-styles/jurnal-teknik-mesin-indonesia.csl
new file mode 100644
index 00000000000..23240785f36
--- /dev/null
+++ b/buildres/csl/csl-styles/jurnal-teknik-mesin-indonesia.csl
@@ -0,0 +1,154 @@
+<?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="id-ID">
+  <info>
+    <title>Jurnal Teknik Mesin Indonesia (Bahasa Indonesia)</title>
+    <title-short>JTMI</title-short>
+    <id>http://www.zotero.org/styles/jurnal-teknik-mesin-indonesia</id>
+    <link href="http://www.zotero.org/styles/jurnal-teknik-mesin-indonesia" rel="self"/>
+    <link href="http://jurnal.bkstm.org/public/site/doc/JTMI_GUIDELINES_2018.docx" rel="documentation"/>
+    <author>
+      <name>Nikolas Fernandez</name>
+    </author>
+    <category citation-format="numeric"/>
+    <category field="engineering"/>
+    <issn>1907-350X</issn>
+    <eissn>2597-7563</eissn>
+    <summary>Sitasi JTMI publikasi BKSTM hingga 6 September 2022</summary>
+    <updated>2022-09-06T07:44: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="id">
+    <date form="text">
+      <date-part name="day" form="numeric-leading-zeros" suffix=" "/>
+      <date-part name="month" suffix=" "/>
+      <date-part name="year"/>
+    </date>
+    <terms>
+      <term name="accessed">diakses</term>
+      <term name="month-01">Januari</term>
+      <term name="month-02">Februari</term>
+      <term name="month-03">Maret</term>
+      <term name="month-04">April</term>
+      <term name="month-05">Mei</term>
+      <term name="month-06">Juni</term>
+      <term name="month-07">Juli</term>
+      <term name="month-08">Agustus</term>
+      <term name="month-09">September</term>
+      <term name="month-10">Oktober</term>
+      <term name="month-11">November</term>
+      <term name="month-12">Desember</term>
+    </terms>
+  </locale>
+  <!-- MACROS -->
+  <macro name="author">
+    <names variable="author">
+      <name et-al-min="19" et-al-use-first="1" initialize-with=". "/>
+      <label form="short" prefix=", " text-case="capitalize-first"/>
+      <et-al font-style="italic"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="thesis paper-conference" match="any">
+        <text variable="title" suffix=". "/>
+      </if>
+      <else-if type="article-journal">
+        <text variable="title" quotes="true" suffix="."/>
+      </else-if>
+      <else>
+        <text variable="title" font-style="italic" suffix=". "/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="locators">
+    <group delimiter=", " suffix=". ">
+      <group delimiter=" ">
+        <text term="volume" form="short"/>
+        <number variable="volume" form="numeric"/>
+      </group>
+      <group delimiter=" ">
+        <text term="issue" form="short"/>
+        <number variable="issue" form="numeric"/>
+      </group>
+      <text variable="page"/>
+    </group>
+  </macro>
+  <macro name="published-year">
+    <date variable="issued">
+      <date-part name="year"/>
+    </date>
+  </macro>
+  <macro name="proceeding">
+    <group delimiter=", ">
+      <text variable="event-title" font-style="italic"/>
+      <text variable="event-place"/>
+      <date variable="event-date" delimiter=" ">
+        <date-part name="day"/>
+        <date-part name="month"/>
+      </date>
+      <text variable="page"/>
+    </group>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=", " suffix=". ">
+      <text variable="publisher"/>
+      <text variable="publisher-place"/>
+    </group>
+  </macro>
+  <macro name="internet">
+    <group delimiter=", " suffix=".">
+      <text variable="URL"/>
+      <group delimiter=" ">
+        <text term="accessed"/>
+        <date variable="accessed" form="text"/>
+      </group>
+    </group>
+  </macro>
+  <!-- CITATIONS -->
+  <citation collapse="citation-number">
+    <sort>
+      <key variable="citation-number"/>
+    </sort>
+    <layout prefix="[" suffix="]" delimiter=", ">
+      <text variable="citation-number"/>
+    </layout>
+  </citation>
+  <!-- BIBLIOGRAPHY -->
+  <bibliography entry-spacing="0" second-field-align="flush">
+    <layout>
+      <text variable="citation-number" prefix="[" suffix="]"/>
+      <text macro="author" suffix=". "/>
+      <text macro="published-year" suffix=", "/>
+      <text macro="title"/>
+      <choose>
+        <if type="article article-journal" match="any">
+          <text variable="container-title" font-style="italic" prefix=" " suffix=". "/>
+          <text macro="locators"/>
+        </if>
+        <else-if type="paper-conference">
+          <text macro="proceeding"/>
+        </else-if>
+        <else-if type="book">
+          <text macro="publisher"/>
+        </else-if>
+        <else-if type="thesis">
+          <text variable="genre" font-style="italic" suffix=", "/>
+          <text macro="publisher"/>
+        </else-if>
+        <else-if type="patent">
+          <group delimiter=", " suffix=".">
+            <text variable="jurisdiction"/>
+            <text variable="number" form="long"/>
+          </group>
+        </else-if>
+        <else-if type="webpage post-weblog report" match="any">
+          <text macro="internet"/>
+        </else-if>
+      </choose>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/csl/csl-styles/la-nouvelle-revue-du-travail.csl b/buildres/csl/csl-styles/la-nouvelle-revue-du-travail.csl
new file mode 100644
index 00000000000..e244ac652a0
--- /dev/null
+++ b/buildres/csl/csl-styles/la-nouvelle-revue-du-travail.csl
@@ -0,0 +1,207 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" name-as-sort-order="all" sort-separator=" " 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>la Nouvelle Revue du Travail (Français)</title>
+    <title-short>NRT</title-short>
+    <id>http://www.zotero.org/styles/la-nouvelle-revue-du-travail</id>
+    <link href="http://www.zotero.org/styles/la-nouvelle-revue-du-travail" rel="self"/>
+    <link href="http://www.zotero.org/styles/revista-portuguesa-de-arqueologia" rel="template"/>
+    <link href="https://journals.openedition.org/nrt/531" rel="documentation"/>
+    <author>
+      <name>Célia Bouchet</name>
+      <email>celia.bouchet@sciencespo.fr</email>
+    </author>
+    <category citation-format="author-date"/>
+    <category field="sociology"/>
+    <issn>2495-7593</issn>
+    <eissn>2263-8989</eissn>
+    <updated>2023-02-07T12:40: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>
+  <macro name="container-contributors">
+    <choose>
+      <if type="chapter paper-conference" match="any">
+        <text value="dans" text-case="lowercase" suffix=" "/>
+        <names variable="director editor" delimiter=", " suffix=",">
+          <name and="symbol" delimiter-precedes-last="never" name-as-sort-order="all">
+            <name-part name="family" text-case="capitalize-first" font-variant="small-caps"/>
+            <name-part name="given"/>
+          </name>
+          <label form="short" prefix=" (" suffix=")"/>
+        </names>
+      </if>
+    </choose>
+  </macro>
+  <macro name="author">
+    <names variable="author" font-variant="normal">
+      <name and="symbol" delimiter-precedes-last="never" name-as-sort-order="all" sort-separator=" ">
+        <name-part name="family" text-case="capitalize-first" font-variant="small-caps"/>
+      </name>
+      <label form="short" text-case="capitalize-first" prefix=" (" suffix=")"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text variable="title" quotes="true"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="author-short">
+    <names variable="author" suffix=", ">
+      <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <choose>
+          <if type="book" match="any">
+            <text variable="title" form="short" font-style="italic"/>
+          </if>
+          <else>
+            <text variable="title" form="short"/>
+          </else>
+        </choose>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=", ">
+      <text variable="publisher-place"/>
+      <text variable="publisher"/>
+    </group>
+  </macro>
+  <macro name="issued">
+    <choose>
+      <if variable="issued">
+        <group>
+          <date variable="issued">
+            <date-part name="year"/>
+          </date>
+          <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 prefix=", " name="month"/>
+                <date-part prefix=" " name="day"/>
+              </date>
+            </if>
+          </choose>
+          <choose>
+            <if match="any" variable="original-date">
+              <date date-parts="year" form="text" variable="original-date" prefix="[" suffix="]"/>
+            </if>
+          </choose>
+        </group>
+      </if>
+      <else>
+        <text term="no date" form="short"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="issued-year">
+    <choose>
+      <if variable="issued">
+        <group>
+          <date variable="issued" prefix=" ">
+            <date-part name="year"/>
+          </date>
+          <choose>
+            <if match="any" variable="original-date">
+              <date date-parts="year" form="numeric" variable="original-date" prefix="[" suffix="]"/>
+            </if>
+          </choose>
+        </group>
+      </if>
+      <else>
+        <text term="no date" form="short"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="book">
+        <text variable="title" font-style="italic"/>
+      </if>
+      <else>
+        <text variable="title" quotes="true"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="locators">
+    <choose>
+      <if type="article-journal article-magazine article-newspaper" match="any">
+        <group delimiter=", ">
+          <text variable="container-title" font-style="italic"/>
+          <group delimiter=", ">
+            <group>
+              <label variable="volume" form="short"/>
+              <text variable="volume" prefix=" " suffix=", "/>
+              <label variable="issue" form="short"/>
+              <text variable="issue"/>
+            </group>
+            <group delimiter=" ">
+              <text variable="page"/>
+            </group>
+          </group>
+        </group>
+      </if>
+      <else-if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
+        <group delimiter=" ">
+          <text macro="container-contributors"/>
+          <text variable="container-title" font-style="italic" suffix=","/>
+          <group delimiter=", ">
+            <text macro="publisher"/>
+            <text variable="page"/>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="webpage" match="any">
+        <group>
+          <text term="online" text-case="capitalize-first" prefix="[" suffix="], "/>
+          <choose>
+            <if match="any" variable="available-date">
+              <text value="Mis en ligne le"/>
+              <date form="text" variable="available-date" suffix=","/>
+            </if>
+          </choose>
+          <text term="accessed" text-case="capitalize-first" suffix=" "/>
+          <date form="text" variable="accessed" suffix=","/>
+          <text variable="URL" prefix=" URL : "/>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="citation-locator">
+    <group>
+      <label variable="locator" form="short"/>
+      <text variable="locator" prefix=" "/>
+    </group>
+  </macro>
+  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" collapse="year">
+    <sort>
+      <key variable="issued"/>
+      <key macro="author"/>
+    </sort>
+    <layout prefix="(" suffix=")" delimiter=", ">
+      <group delimiter=" ">
+        <text macro="author-short"/>
+        <text macro="issued-year"/>
+        <text macro="citation-locator"/>
+      </group>
+    </layout>
+  </citation>
+  <bibliography hanging-indent="true" entry-spacing="0">
+    <sort>
+      <key macro="author"/>
+      <key variable="issued"/>
+    </sort>
+    <layout suffix=".">
+      <group delimiter=", ">
+        <group delimiter=" ">
+          <text macro="author"/>
+          <text macro="issued" prefix="(" suffix=")"/>
+        </group>
+        <text macro="title"/>
+      </group>
+      <text macro="locators" prefix=", "/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/csl/csl-styles/lethaia.csl b/buildres/csl/csl-styles/lethaia.csl
index fe99d3419ed..c8043a0335f 100644
--- a/buildres/csl/csl-styles/lethaia.csl
+++ b/buildres/csl/csl-styles/lethaia.csl
@@ -5,29 +5,31 @@
     <id>http://www.zotero.org/styles/lethaia</id>
     <link href="http://www.zotero.org/styles/lethaia" rel="self"/>
     <link href="http://www.zotero.org/styles/palaeontology" rel="template"/>
-    <link href="http://onlinelibrary.wiley.com/journal/10.1111/%28ISSN%291502-3931/homepage/ForAuthors.html" rel="documentation"/>
+    <link href="https://www.idunn.no/page/let/author" rel="documentation"/>
     <author>
       <name>Martin R. Smith</name>
-      <email>martins@gmail.com</email>
+      <email>martin.smith@durham.ac.uk</email>
+      <uri>https://smithlabdurham.github.io/</uri>
     </author>
+    <contributor>
+      <name>Patrick O'Brien</name>
+    </contributor>
     <category citation-format="author-date"/>
     <category field="biology"/>
     <issn>0024-1164</issn>
     <eissn>1502-3931</eissn>
-    <updated>2012-09-27T22:06:38+00:00</updated>
+    <updated>2023-08-28T08:59: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">
-    <names variable="author" suffix=".">
-      <name sort-separator=", " initialize-with="." and="text" name-as-sort-order="all" delimiter=", " delimiter-precedes-last="never" form="long">
-      </name>
+    <names variable="author">
+      <name and="symbol" delimiter-precedes-last="never" initialize-with="." name-as-sort-order="all"/>
     </names>
   </macro>
   <macro name="editor">
     <names variable="editor">
-      <name sort-separator=", " initialize-with=". " name-as-sort-order="all" delimiter=", " delimiter-precedes-last="always">
-      </name>
-      <label form="short" prefix=" (" suffix=".)"/>
+      <name delimiter-precedes-last="always" initialize-with="." name-as-sort-order="all"/>
+      <label form="short" text-case="capitalize-first" prefix=" (" suffix=")"/>
     </names>
   </macro>
   <macro name="author-short">
@@ -72,18 +74,35 @@
       <text variable="publisher-place"/>
     </group>
   </macro>
+  <macro name="access">
+    <choose>
+      <if match="any" variable="DOI">
+        <text variable="DOI" prefix="https://doi.org/"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="pages">
+    <text variable="page"/>
+  </macro>
   <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="false" disambiguate-add-givenname="false" collapse="year-suffix" year-suffix-delimiter=", ">
     <sort>
       <key macro="year-date"/>
       <key macro="author-short"/>
     </sort>
     <layout prefix="(" suffix=")" delimiter="; ">
-      <group delimiter=" ">
-        <text macro="author-short"/>
-        <text macro="year-date"/>
+      <group delimiter=", ">
+        <group delimiter="">
+          <group delimiter=" ">
+            <text macro="author-short"/>
+            <text macro="year-date"/>
+          </group>
+          <text variable="year-suffix" font-style="italic"/>
+        </group>
+        <group delimiter=" ">
+          <label variable="locator" form="short"/>
+          <text variable="locator"/>
+        </group>
       </group>
-      <text variable="locator"/>
-      <text variable="year-suffix" font-style="italic"/>
     </layout>
   </citation>
   <bibliography entry-spacing="0" hanging-indent="true">
@@ -92,52 +111,47 @@
       <key macro="author-count"/>
       <key macro="year-date"/>
     </sort>
-    <layout suffix=".">
-      <group>
-        <text macro="author" suffix=" "/>
-        <choose>
-          <if variable="issued">
-            <date variable="issued">
-              <date-part name="year"/>
-            </date>
-          </if>
-          <else-if type="book chapter webpage" variable="container-title volume page" match="none">
-            <text term="forthcoming" text-case="capitalize-first"/>
-          </else-if>
-          <else-if type="book chapter webpage" variable="volume page" match="none">
-            <text term="in press" text-case="capitalize-first"/>
-          </else-if>
-        </choose>
-        <text variable="year-suffix"/>
-        <text value=": "/>
+    <layout>
+      <group delimiter=": " suffix=".">
+        <group delimiter=". ">
+          <text macro="author"/>
+          <group>
+            <choose>
+              <if variable="issued">
+                <date variable="issued">
+                  <date-part name="year"/>
+                </date>
+              </if>
+              <else-if type="book chapter webpage" variable="container-title volume page" match="none">
+                <text term="forthcoming" text-case="capitalize-first"/>
+              </else-if>
+              <else-if type="book chapter webpage" variable="volume page" match="none">
+                <text term="in press" text-case="capitalize-first"/>
+              </else-if>
+            </choose>
+            <text variable="year-suffix"/>
+          </group>
+        </group>
         <choose>
           <if type="bill book graphic legal_case motion_picture report song" match="any">
-            <group suffix=".">
-              <group>
-                <text variable="title" font-style="italic" text-case="capitalize-first" suffix=". "/>
+            <group delimiter=". ">
+              <text variable="title" text-case="capitalize-first" font-style="italic"/>
+              <group delimiter=", ">
+                <text macro="editor"/>
+                <text variable="collection-title" font-style="italic" text-case="title" suffix=". "/>
                 <choose>
-                  <if variable="editor collection-title" match="any">
-                    <text value="In" font-style="italic" suffix=" "/>
+                  <if is-numeric="volume">
+                    <group delimiter=" ">
+                      <text value="Vol. "/>
+                      <number variable="volume" suffix="." form="numeric"/>
+                    </group>
                   </if>
+                  <else>
+                    <text variable="volume" suffix="."/>
+                  </else>
                 </choose>
-                <text macro="editor" suffix=" "/>
-                <group>
-                  <text variable="collection-title" font-style="italic" text-case="title" suffix=". "/>
-                  <choose>
-                    <if is-numeric="volume">
-                      <group delimiter=" ">
-                        <text value="Vol. "/>
-                        <number variable="volume" suffix="." form="numeric"/>
-                      </group>
-                    </if>
-                    <else>
-                      <text variable="volume" suffix="."/>
-                    </else>
-                  </choose>
-                </group>
               </group>
-              <text prefix=" " suffix=", " macro="publisher"/>
-              <text variable="page" suffix=" pp"/>
+              <text macro="publisher" prefix=" "/>
             </group>
           </if>
           <else-if type="thesis" match="any">
@@ -150,13 +164,22 @@
             <text term="page" form="short" prefix="p"/>
           </else-if>
           <else-if type="chapter" match="any">
-            <text variable="title" suffix=". "/>
-            <text variable="issue" suffix=". "/>
+            <group delimiter=". ">
+              <group delimiter=", ">
+                <text variable="title"/>
+                <text variable="page"/>
+              </group>
+              <group delimiter=", ">
+                <group delimiter=": ">
+                  <text term="in" text-case="capitalize-first" font-style="italic"/>
+                  <text macro="editor"/>
+                </group>
+                <text variable="container-title" text-case="title" font-style="italic"/>
+              </group>
+              <text macro="publisher"/>
+            </group>
             <group>
-              <text value="In" font-style="italic" suffix=" "/>
-              <text macro="editor" suffix=", "/>
               <group font-style="italic">
-                <text variable="container-title" text-case="title" suffix=", "/>
                 <choose>
                   <if is-numeric="volume">
                     <group delimiter=" ">
@@ -169,13 +192,9 @@
                   </else>
                 </choose>
               </group>
-              <group delimiter=" ">
-                <text variable="page" suffix=". "/>
-                <text macro="publisher"/>
-              </group>
             </group>
           </else-if>
-          <else-if type="webpage" match="any">
+          <else-if type="webpage post post-weblog" match="any">
             <group>
               <text variable="title" font-style="italic" suffix=". "/>
               <text variable="container-title" form="long" suffix=". "/>
@@ -186,20 +205,22 @@
                 <date-part name="year" suffix="."/>
               </date>
             </group>
-            <text prefix=" " macro="publisher"/>
           </else-if>
           <else>
-            <text variable="title" suffix=". "/>
-            <group delimiter=", ">
-              <group font-style="italic">
-                <text variable="container-title" form="long" text-case="capitalize-first"/>
-                <text variable="volume" prefix=" "/>
+            <group delimiter=". ">
+              <text variable="title"/>
+              <group delimiter=", ">
+                <group font-style="italic" delimiter=" ">
+                  <text variable="container-title" form="long" text-case="capitalize-first"/>
+                  <text variable="volume" prefix=" "/>
+                </group>
+                <text macro="pages"/>
               </group>
-              <text variable="page"/>
             </group>
           </else>
         </choose>
       </group>
+      <text macro="access" prefix=". "/>
     </layout>
   </bibliography>
 </style>
diff --git a/buildres/csl/csl-styles/magnetic-resonance-in-medicine.csl b/buildres/csl/csl-styles/magnetic-resonance-in-medicine.csl
deleted file mode 100644
index aef8b689b23..00000000000
--- a/buildres/csl/csl-styles/magnetic-resonance-in-medicine.csl
+++ /dev/null
@@ -1,172 +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://steveridout.com/csl/visualEditor/) -->
-  <info>
-    <title>Magnetic Resonance in Medicine</title>
-    <id>http://www.zotero.org/styles/magnetic-resonance-in-medicine</id>
-    <link href="http://www.zotero.org/styles/magnetic-resonance-in-medicine" rel="self"/>
-    <link href="http://www.zotero.org/styles/council-of-science-editors" rel="template"/>
-    <link href="http://onlinelibrary.wiley.com/journal/15222594" rel="documentation"/>
-    <author>
-      <name>Andrew Priest</name>
-    </author>
-    <contributor>
-      <name>Francesco Santini</name>
-    </contributor>
-    <category citation-format="numeric"/>
-    <category field="science"/>
-    <issn>0740-3194</issn>
-    <eissn>1522-2594</eissn>
-    <summary>Magnetic Resonance in Medicine style</summary>
-    <updated>2018-08-09T10:00:00</updated>
-    <rights 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="long" prefix=", " suffix="."/>
-    </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=" " strip-periods="true"/>
-        <substitute>
-          <names variable="editor"/>
-          <text macro="title"/>
-        </substitute>
-      </names>
-    </group>
-  </macro>
-  <macro name="access">
-    <group>
-      <choose>
-        <if variable="DOI">
-          <text variable="DOI" prefix="doi: " suffix="."/>
-        </if>
-      </choose>
-    </group>
-  </macro>
-  <macro name="title">
-    <group delimiter=" ">
-      <text variable="title"/>
-      <choose>
-        <if type="thesis" match="any">
-          <text variable="genre" form="long" prefix="[" suffix="]"/>
-        </if>
-      </choose>
-    </group>
-  </macro>
-  <macro name="publisher">
-    <group delimiter=": ">
-      <text variable="publisher-place"/>
-      <text variable="publisher"/>
-    </group>
-  </macro>
-  <macro name="issued">
-    <date variable="issued" delimiter=" ">
-      <date-part name="year"/>
-    </date>
-  </macro>
-  <macro name="pages">
-    <label variable="page" form="short" suffix=" "/>
-    <text variable="page"/>
-  </macro>
-  <macro name="journal">
-    <text variable="container-title" form="short"/>
-  </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: added by ANP, copying from Vancouver -->
-  <citation collapse="citation-number">
-    <sort>
-      <key variable="citation-number"/>
-    </sort>
-    <layout prefix="(" suffix=")" delimiter=",">
-      <text variable="citation-number"/>
-    </layout>
-  </citation>
-  <bibliography hanging-indent="false" et-al-min="7" et-al-use-first="3">
-    <layout suffix=".">
-      <text variable="citation-number" suffix=". "/>
-      <text macro="author"/>
-      <choose>
-        <if type="bill book graphic legal_case legislation motion_picture report song thesis" match="any">
-          <group prefix=" " delimiter=" ">
-            <text macro="title" suffix="."/>
-            <text macro="edition"/>
-            <text macro="editor" prefix="(" suffix=")"/>
-          </group>
-          <text prefix=" " macro="publisher"/>
-          <group suffix="." prefix="; " delimiter=" ">
-            <date variable="issued">
-              <date-part name="year"/>
-            </date>
-            <text macro="pages"/>
-          </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" suffix="."/>
-            <text variable="volume" prefix="Vol. " suffix="."/>
-            <text macro="edition"/>
-            <text variable="collection-title" suffix="."/>
-            <group>
-              <text macro="publisher"/>
-              <group suffix="." prefix="; " delimiter=". ">
-                <date variable="issued">
-                  <date-part name="year"/>
-                </date>
-                <text macro="pages"/>
-              </group>
-            </group>
-          </group>
-        </else-if>
-        <else-if type="webpage" match="any">
-          <group delimiter=". " prefix=" ">
-            <text variable="title"/>
-            <text variable="container-title"/>
-            <text variable="URL"/>
-            <date form="text" variable="issued" prefix="Published "/>
-            <group delimiter=" ">
-              <text term="accessed" text-case="capitalize-first"/>
-              <date form="text" variable="accessed"/>
-            </group>
-          </group>
-        </else-if>
-        <else>
-          <group suffix=".">
-            <text macro="title" prefix=" "/>
-            <text macro="editor" prefix=" "/>
-          </group>
-          <group prefix=" ">
-            <text macro="journal"/>
-            <group delimiter=";" prefix=" ">
-              <text macro="issued"/>
-              <group>
-                <text variable="volume"/>
-              </group>
-            </group>
-            <text variable="page" prefix=":"/>
-          </group>
-        </else>
-      </choose>
-      <text prefix=" " macro="access"/>
-    </layout>
-  </bibliography>
-</style>
diff --git a/buildres/csl/csl-styles/masarykova-univerzita-pravnicka-fakulta.csl b/buildres/csl/csl-styles/masarykova-univerzita-pravnicka-fakulta.csl
index 4e714b408eb..858adf43197 100644
--- a/buildres/csl/csl-styles/masarykova-univerzita-pravnicka-fakulta.csl
+++ b/buildres/csl/csl-styles/masarykova-univerzita-pravnicka-fakulta.csl
@@ -9,12 +9,12 @@
     <author>
       <name>Oldrich Tristan Florian</name>
       <email>oldrich.florian@gmail.com</email>
-      <uri>http://otristan.com</uri>
+      <uri>http://otflorian.com</uri>
     </author>
     <category citation-format="note"/>
     <category field="law"/>
     <summary>Masaryk University, Faculty of Law</summary>
-    <updated>2021-10-07T10:00:00+00:00</updated>
+    <updated>2023-07-01T10: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">
@@ -146,11 +146,6 @@
   <macro name="title-long">
     <text variable="title"/>
   </macro>
-  <macro name="title-short">
-    <group delimiter=". ">
-      <text variable="title" form="short"/>
-    </group>
-  </macro>
   <macro name="container">
     <choose>
       <if type="chapter entry entry-dictionary entry-encyclopedia webpage post-weblog" match="any">
@@ -338,7 +333,7 @@
         </else-if>
         <else-if position="subsequent">
           <text macro="contributors-short" suffix=". "/>
-          <text macro="title-short" font-style="italic"/>
+          <text macro="title-long" font-style="italic"/>
           <choose>
             <if variable="author" match="none">
               <text prefix=", " macro="issued-year"/>
@@ -521,11 +516,11 @@
           <choose>
             <if variable="URL" match="any">
               <text prefix=", " macro="page-range"/>
-                <choose>
-                  <if type="webpage post-weblog" match="any">
-                    <text prefix=" " macro="quoted"/>
-                  </if>
-                </choose>
+              <choose>
+                <if type="webpage post-weblog" match="any">
+                  <text prefix=" " macro="quoted"/>
+                </if>
+              </choose>
               <text prefix=". " macro="identifier"/>
             </if>
             <else>
diff --git a/buildres/csl/csl-styles/medizinische-universitat-innsbruck-vancouver.csl b/buildres/csl/csl-styles/medizinische-universitat-innsbruck-vancouver.csl
new file mode 100644
index 00000000000..b615bd3a045
--- /dev/null
+++ b/buildres/csl/csl-styles/medizinische-universitat-innsbruck-vancouver.csl
@@ -0,0 +1,328 @@
+<?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" initialize-with-hyphen="false" page-range-format="minimal" default-locale="de-DE">
+  <info>
+    <title>Medizinische Universität Innsbruck - Vancouver (Deutsch)</title>
+    <id>http://www.zotero.org/styles/medizinische-universitat-innsbruck-vancouver</id>
+    <link href="http://www.zotero.org/styles/medizinische-universitat-innsbruck-vancouver" rel="self"/>
+    <link href="https://www.i-med.ac.at/studium/studierende/diplomarbeit_human.html" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="medicine"/>
+    <updated>2023-03-29T19:42:04+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="de">
+    <date form="numeric" delimiter=".">
+      <date-part name="day" form="numeric-leading-zeros"/>
+      <date-part name="month" form="numeric-leading-zeros" strip-periods="true"/>
+      <date-part name="year"/>
+    </date>
+    <terms>
+      <term name="collection-editor" form="long">
+        <single>editor</single>
+        <multiple>editors</multiple>
+      </term>
+      <term name="internet">Online</term>
+      <term name="et-al">et al.</term>
+      <term name="cited">zuletzt aufgerufen am</term>
+      <term name="available at">Verfügbar unter</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>
+        <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="long" 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>
+      <!--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="URL">
+        <group delimiter=": " suffix=".">
+          <text term="available at" text-case="capitalize-first"/>
+          <text variable="URL"/>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="accessed-date">
+    <choose>
+      <if variable="URL">
+        <group prefix="[" suffix="]" delimiter=" ">
+          <text term="cited" text-case="lowercase"/>
+          <date variable="accessed" form="numeric"/>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="container-title">
+    <choose>
+      <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>
+      <!--add event-name and event-place once they become available-->
+      <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>
+        <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 suffix=";" delimiter=" ">
+          <date variable="issued">
+            <date-part name="year"/>
+          </date>
+          <text macro="accessed-date"/>
+        </group>
+      </if>
+      <else-if type="bill legislation" match="any">
+        <group delimiter=", ">
+          <date variable="issued">
+            <date-part name="year"/>
+          </date>
+        </group>
+      </else-if>
+      <else-if type="report">
+        <date variable="issued" delimiter=" ">
+          <date-part name="year"/>
+        </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>
+            <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 prefix="(" suffix=")" delimiter=",">
+      <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="."/>
+      <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/modern-language-association.csl b/buildres/csl/csl-styles/modern-language-association.csl
index 26b92bdff12..4530d255dad 100644
--- a/buildres/csl/csl-styles/modern-language-association.csl
+++ b/buildres/csl/csl-styles/modern-language-association.csl
@@ -9,10 +9,13 @@
     <author>
       <name>Sebastian Karcher</name>
     </author>
+    <contributor>
+      <name>Patrick O'Brien</name>
+    </contributor>
     <category citation-format="author"/>
     <category field="generic-base"/>
     <summary>This style adheres to the MLA 9th edition handbook. Follows the structure of references as outlined in the MLA Manual closely</summary>
-    <updated>2021-07-13T20:05:10+00:00</updated>
+    <updated>2023-07-21T20:05:10+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <locale xml:lang="en">
@@ -195,9 +198,18 @@
   </macro>
   <macro name="publisher">
     <choose>
-      <if type="article-magazine article-newspaper article-journal" match="none">
-        <text variable="publisher"/>
+      <if type="thesis" match="any">
+        <group delimiter=". ">
+          <date variable="issued" form="numeric" date-parts="year"/>
+          <group delimiter=", ">
+            <text variable="publisher"/>
+            <text variable="genre"/>
+          </group>
+        </group>
       </if>
+      <else-if type="article-magazine article-newspaper article-journal" match="none">
+        <text variable="publisher"/>
+      </else-if>
     </choose>
   </macro>
   <macro name="publication-date">
@@ -208,7 +220,7 @@
       <else-if type="article-journal" match="any">
         <date variable="issued" form="text" date-parts="year-month"/>
       </else-if>
-      <else-if type="speech" match="none">
+      <else-if type="speech thesis" match="none">
         <date variable="issued" form="text"/>
       </else-if>
     </choose>
diff --git a/buildres/csl/csl-styles/mots.csl b/buildres/csl/csl-styles/mots.csl
index f6a0b1f2ad4..f1d6d822a6a 100644
--- a/buildres/csl/csl-styles/mots.csl
+++ b/buildres/csl/csl-styles/mots.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" demote-non-dropping-particle="sort-only" default-locale="fr-FR">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" default-locale="fr-FR">
   <!--
 
 Feuille de style CSL 
@@ -20,7 +20,7 @@ réalisée par Louis Autin (louis.autin@sorbonne-universite.fr / SU)
       <name>Louis Autin (SU)</name>
       <email>louis.autin@sorbonne-universite.fr</email>
     </author>
-    <category citation-format="note"/>
+    <category citation-format="author-date"/>
     <category field="humanities"/>
     <issn>0243-6450</issn>
     <eissn>1960-6001</eissn>
diff --git a/buildres/csl/csl-styles/norsk-apa-manual-note.csl b/buildres/csl/csl-styles/norsk-apa-manual-note.csl
index fe4cddf45ef..187fcb5d146 100644
--- a/buildres/csl/csl-styles/norsk-apa-manual-note.csl
+++ b/buildres/csl/csl-styles/norsk-apa-manual-note.csl
@@ -28,8 +28,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
   -->
@@ -97,7 +97,7 @@
       </if>
       <else-if type="interview personal_communication">
         <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=", ">
@@ -178,7 +178,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>
@@ -211,9 +211,6 @@
       </else>
     </choose>
   </macro>
-  <macro name="date-sort-date">
-    <date variable="issued" form="numeric"/>
-  </macro>
   <macro name="date-intext">
     <choose>
       <if variable="issued">
@@ -239,7 +236,7 @@
                 <if type="interview personal_communication">
                   <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>
@@ -1004,7 +1001,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>
@@ -1284,7 +1281,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"/>
@@ -1554,7 +1551,7 @@
     <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 macro="date-bib" sort="ascending"/>
       <key variable="status"/>
     </sort>
     <layout delimiter="; ">
@@ -1571,7 +1568,7 @@
     <sort>
       <key macro="author-bib"/>
       <key macro="date-sort-group"/>
-      <key macro="date-sort-date" sort="ascending"/>
+      <key macro="date-bib" sort="ascending"/>
       <key variable="status"/>
       <key macro="title"/>
     </sort>
diff --git a/buildres/csl/csl-styles/norsk-apa-manual.csl b/buildres/csl/csl-styles/norsk-apa-manual.csl
index cbfec7058ed..fffa47855ae 100644
--- a/buildres/csl/csl-styles/norsk-apa-manual.csl
+++ b/buildres/csl/csl-styles/norsk-apa-manual.csl
@@ -56,8 +56,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
   -->
@@ -125,7 +125,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=", ">
@@ -206,7 +206,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>
@@ -239,9 +239,6 @@
       </else>
     </choose>
   </macro>
-  <macro name="date-sort-date">
-    <date variable="issued" form="numeric"/>
-  </macro>
   <macro name="date-intext">
     <choose>
       <if variable="issued">
@@ -267,7 +264,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>
@@ -1032,7 +1029,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>
@@ -1312,7 +1309,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"/>
@@ -1585,7 +1582,7 @@
     <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 macro="date-bib" sort="ascending"/>
       <key variable="status"/>
     </sort>
     <layout prefix="(" suffix=")" delimiter="; ">
@@ -1600,7 +1597,7 @@
     <sort>
       <key macro="author-bib"/>
       <key macro="date-sort-group"/>
-      <key macro="date-sort-date" sort="ascending"/>
+      <key macro="date-bib" sort="ascending"/>
       <key variable="status"/>
       <key macro="title"/>
     </sort>
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 1a9517a9f90..540f5ea61fc 100644
--- a/buildres/csl/csl-styles/norsk-henvisningsstandard-for-rettsvitenskapelige-tekster.csl
+++ b/buildres/csl/csl-styles/norsk-henvisningsstandard-for-rettsvitenskapelige-tekster.csl
@@ -292,8 +292,8 @@
             <text macro="author-full"/>
             <text prefix=", " macro="title"/>
             <text prefix=" " font-style="italic" variable="container-title"/>
-            <text prefix=" " macro="issued"/>
-            <group delimiter=" " prefix=" ">
+            <text prefix=" " macro="issued-no-parenthesis"/>
+            <group delimiter=" " prefix=", ">
               <text term="page" form="short"/>
               <text variable="page"/>
             </group>
diff --git a/buildres/csl/csl-styles/north-pacific-anadromous-fish-commission-bulletin.csl b/buildres/csl/csl-styles/north-pacific-anadromous-fish-commission-bulletin.csl
new file mode 100644
index 00000000000..598de36b812
--- /dev/null
+++ b/buildres/csl/csl-styles/north-pacific-anadromous-fish-commission-bulletin.csl
@@ -0,0 +1,521 @@
+<?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/) -->
+  <info>
+    <title>North Pacific Anadromous Fish Commission Bulletin</title>
+    <title-short>NPAFC-Bulletin</title-short>
+    <id>http://www.zotero.org/styles/north-pacific-anadromous-fish-commission-bulletin</id>
+    <link href="http://www.zotero.org/styles/north-pacific-anadromous-fish-commission-bulletin" rel="self"/>
+    <link href="http://www.zotero.org/styles/water-alternatives" rel="template"/>
+    <link href="https://npafc.org/bulletin/" rel="documentation"/>
+    <link href="https://github.com/citation-style-language/styles/pull/6436#issue-1603667772" rel="documentation"/>
+    <author>
+      <name>Brett Johnson</name>
+      <email>brett.johnson@hakai.org</email>
+    </author>
+    <category citation-format="author-date"/>
+    <category field="biology"/>
+    <issn>1028-9127</issn>
+    <summary>Style for NPAFC Bulletin</summary>
+    <updated>2023-03-22T15:42: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-US">
+    <date form="numeric">
+      <date-part name="day" suffix=" " range-delimiter="-"/>
+      <date-part name="month" suffix=" "/>
+      <date-part name="year" range-delimiter="/"/>
+    </date>
+    <terms>
+      <term name="editor" form="short">
+        <single>Ed</single>
+        <multiple>Eds</multiple>
+      </term>
+    </terms>
+  </locale>
+  <macro name="container">
+    <choose>
+      <if type="paper-conference speech" match="any">
+        <choose>
+          <if variable="container-title event" match="any">
+            <text value="In " font-style="normal"/>
+          </if>
+        </choose>
+        <group delimiter=", ">
+          <names variable="editor translator" delimiter=", ">
+            <name name-as-sort-order="all" sort-separator=", " initialize-with="." delimiter="; " and="text" delimiter-precedes-last="never"/>
+            <label form="short" prefix=" (" suffix=")"/>
+          </names>
+          <group delimiter=" ">
+            <choose>
+              <if variable="ISBN ISSN container-title" match="any">
+                <group font-style="normal">
+                  <choose>
+                    <if variable="container-title">
+                      <text variable="container-title"/>
+                    </if>
+                    <else>
+                      <text variable="event"/>
+                    </else>
+                  </choose>
+                  <text variable="genre"/>
+                  <text variable="collection-title"/>
+                </group>
+              </if>
+              <else>
+                <choose>
+                  <if variable="container-title">
+                    <text variable="container-title"/>
+                  </if>
+                  <else>
+                    <text variable="event"/>
+                  </else>
+                </choose>
+                <text variable="genre"/>
+                <text variable="collection-title"/>
+              </else>
+            </choose>
+          </group>
+        </group>
+      </if>
+      <else-if type="chapter" match="any">
+        <group delimiter=", " prefix="In ">
+          <group delimiter=" ">
+            <choose>
+              <if variable="ISBN" match="any" type="chapter">
+                <text variable="container-title" text-case="title" font-style="normal"/>
+                <text variable="collection-number"/>
+                <text variable="issue"/>
+              </if>
+              <else>
+                <text variable="container-title"/>
+                <text variable="collection-title" prefix=", "/>
+                <text variable="collection-number"/>
+                <text variable="issue"/>
+              </else>
+            </choose>
+          </group>
+          <names variable="editor translator" delimiter=", ">
+            <label form="short" text-case="lowercase" prefix=" " suffix=". "/>
+            <name delimiter="; " and="text" delimiter-precedes-last="never" initialize-with="."/>
+          </names>
+        </group>
+      </else-if>
+      <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+        <text variable="container-title"/>
+        <group delimiter=" ">
+          <text variable="collection-title"/>
+          <group delimiter="/">
+            <text variable="volume"/>
+            <text variable="collection-number"/>
+          </group>
+          <text variable="issue"/>
+        </group>
+      </else-if>
+      <else-if type="broadcast">
+        <choose>
+          <if variable="container-title">
+            <group delimiter=", ">
+              <text variable="number" prefix="Episode "/>
+              <text variable="title" text-case="capitalize-first"/>
+            </group>
+          </if>
+        </choose>
+      </else-if>
+      <else-if type="article">
+        <group delimiter=" " suffix=", ">
+          <choose>
+            <if variable="ISBN ISSN" match="any">
+              <text variable="container-title" font-style="normal"/>
+              <text variable="genre"/>
+              <text variable="collection-title"/>
+              <text variable="collection-number"/>
+              <text variable="issue"/>
+            </if>
+            <else>
+              <text variable="container-title"/>
+              <text variable="genre"/>
+              <text variable="collection-title"/>
+              <text variable="collection-number"/>
+              <text variable="issue"/>
+            </else>
+          </choose>
+        </group>
+      </else-if>
+      <else-if type="article-newspaper">
+        <choose>
+          <if variable="author editor translator" match="any">
+            <text variable="container-title" text-case="capitalize-first" font-style="normal"/>
+          </if>
+        </choose>
+      </else-if>
+      <else>
+        <text variable="container-title" form="short" text-case="title" font-style="normal"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="author">
+    <choose>
+      <if type="motion_picture broadcast article-newspaper article-magazine" match="none">
+        <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"/>
+            <names variable="translator"/>
+            <text macro="title"/>
+          </substitute>
+        </names>
+      </if>
+      <else-if type="article-newspaper article-magazine" match="any">
+        <choose>
+          <if variable="author editor translator" match="any">
+            <names variable="author">
+              <name delimiter="; " 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"/>
+              </substitute>
+            </names>
+          </if>
+          <else>
+            <text variable="container-title"/>
+          </else>
+        </choose>
+      </else-if>
+      <else>
+        <choose>
+          <if variable="container-title">
+            <text variable="container-title" font-style="normal"/>
+          </if>
+          <else>
+            <text variable="title" font-style="normal"/>
+          </else>
+        </choose>
+      </else>
+    </choose>
+  </macro>
+  <macro name="author-short">
+    <names variable="author">
+      <name form="short" and="text" et-al-min="3" et-al-use-first="1" initialize-with=". " name-as-sort-order="first"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <choose>
+          <if type="bill book graphic legal_case legislation motion_picture song" match="any">
+            <text variable="title" form="short"/>
+          </if>
+          <else>
+            <text variable="container-title" form="short"/>
+          </else>
+        </choose>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="accessed">
+    <choose>
+      <if type="article-journal book chapter" match="any"/>
+      <else-if variable="URL DOI" match="any">
+        <group prefix=" (" suffix=")">
+          <date variable="accessed">
+            <date-part name="year"/>
+            <date-part name="month" form="numeric" prefix="/" suffix="/"/>
+            <date-part name="day"/>
+          </date>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="report" match="any">
+        <group delimiter=".  ">
+          <choose>
+            <if variable="ISBN ISSN" match="any">
+              <text variable="title" font-style="normal" text-case="capitalize-first"/>
+            </if>
+            <else>
+              <text variable="title" text-case="capitalize-first"/>
+            </else>
+          </choose>
+          <group delimiter=" ">
+            <text variable="genre"/>
+            <text variable="number"/>
+          </group>
+        </group>
+      </if>
+      <else-if type="thesis" match="any">
+        <group delimiter=".  ">
+          <choose>
+            <if variable="ISBN ISSN" match="any">
+              <text variable="title" font-style="normal" text-case="capitalize-first"/>
+              <text variable="genre"/>
+            </if>
+            <else>
+              <text variable="title" text-case="capitalize-first" prefix="  "/>
+              <text variable="genre"/>
+            </else>
+          </choose>
+        </group>
+      </else-if>
+      <else-if type="bill book graphic legal_case legislation song" match="any">
+        <group delimiter=".  ">
+          <choose>
+            <if variable="publisher ISBN ISSN" match="any">
+              <text variable="title" text-case="title" font-style="normal"/>
+            </if>
+            <else>
+              <text variable="title" text-case="capitalize-first" font-style="normal"/>
+            </else>
+          </choose>
+          <text macro="edition"/>
+        </group>
+      </else-if>
+      <else-if type="webpage chapter paper-conference article-journal article-magazine article-newspaper" match="any">
+        <text variable="title"/>
+      </else-if>
+      <else-if type="patent">
+        <group delimiter=".  ">
+          <text variable="title"/>
+          <group delimiter=", ">
+            <text variable="authority"/>
+            <text variable="number"/>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="motion_picture broadcast" match="any"/>
+      <else>
+        <choose>
+          <if variable="ISBN ISSN" match="any">
+            <text variable="title" font-style="normal" text-case="capitalize-first"/>
+          </if>
+          <else>
+            <text variable="title" text-case="capitalize-first"/>
+          </else>
+        </choose>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <choose>
+      <if type="thesis" match="any">
+        <group delimiter=", ">
+          <text variable="publisher"/>
+          <text variable="publisher-place"/>
+        </group>
+      </if>
+      <else>
+        <group delimiter=": ">
+          <text variable="publisher-place"/>
+          <text variable="publisher"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="event">
+    <choose>
+      <if variable="editor" match="any">
+        <text variable="event" font-style="normal"/>
+      </if>
+      <else>
+        <text variable="event"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="issued">
+    <choose>
+      <if variable="issued">
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+      </if>
+      <else-if variable="accessed">
+        <choose>
+          <if type="webpage">
+            <date variable="accessed">
+              <date-part name="year"/>
+            </date>
+          </if>
+          <else>
+            <text term="no date" form="short"/>
+          </else>
+        </choose>
+      </else-if>
+      <else>
+        <text term="no date" form="short"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="edition">
+    <group delimiter=" ">
+      <choose>
+        <if is-numeric="edition">
+          <group delimiter=" ">
+            <number variable="edition" form="ordinal"/>
+            <text term="edition"/>
+          </group>
+        </if>
+        <else>
+          <text variable="edition" suffix="."/>
+        </else>
+      </choose>
+    </group>
+  </macro>
+  <macro name="web_availibility">
+    <choose>
+      <if variable="DOI">
+        <text variable="DOI" prefix="https://doi.org/"/>
+        <text macro="accessed"/>
+      </if>
+      <else-if variable="URL">
+        <text variable="URL"/>
+        <text macro="accessed"/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="locators">
+    <choose>
+      <if type="article-journal article-magazine" match="any">
+        <group prefix=" " delimiter=": ">
+          <group delimiter="">
+            <text variable="volume"/>
+            <text variable="issue" prefix="(" suffix=")"/>
+          </group>
+          <group delimiter=", ">
+            <text variable="page"/>
+          </group>
+        </group>
+      </if>
+      <else-if type="webpage"/>
+      <else-if type="article-newspaper" match="any">
+        <date variable="issued" prefix=". ">
+          <date-part name="day" suffix=" " range-delimiter="-"/>
+          <date-part name="month" suffix=" "/>
+          <date-part name="year" range-delimiter="/"/>
+        </date>
+      </else-if>
+      <else-if type="article" match="any">
+        <group delimiter=", ">
+          <group delimiter=". ">
+            <group delimiter=" ">
+              <label variable="page" form="short"/>
+              <text variable="page"/>
+            </group>
+            <text macro="publisher"/>
+          </group>
+          <date variable="issued">
+            <date-part name="day" prefix=" " suffix=" " range-delimiter="-"/>
+            <date-part name="month" suffix=" "/>
+            <date-part name="year" range-delimiter="/"/>
+          </date>
+        </group>
+      </else-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>
+      </else-if>
+      <else-if type="broadcast">
+        <group delimiter=". " prefix=", ">
+          <text variable="publisher"/>
+          <date variable="issued">
+            <date-part name="day" suffix=" " range-delimiter="-"/>
+            <date-part name="month" suffix=" "/>
+            <date-part name="year" range-delimiter="/"/>
+          </date>
+        </group>
+      </else-if>
+      <else-if type="chapter" match="any">
+        <group delimiter=". " prefix=", ">
+          <group delimiter=" ">
+            <text variable="page" form="short"/>
+          </group>
+          <text macro="event"/>
+          <text macro="publisher"/>
+        </group>
+      </else-if>
+      <else-if type="paper-conference speech" match="any">
+        <group delimiter=", " prefix=", ">
+          <group delimiter=". ">
+            <group delimiter=" ">
+              <text variable="page"/>
+            </group>
+            <text macro="publisher"/>
+          </group>
+          <date variable="event-date">
+            <date-part name="day" suffix=" " range-delimiter="-"/>
+            <date-part name="month" suffix=" "/>
+            <date-part name="year" range-delimiter="/"/>
+          </date>
+        </group>
+      </else-if>
+      <else-if type="interview personal_communication" match="any">
+        <group delimiter=". " prefix=". ">
+          <choose>
+            <if variable="title" match="none">
+              <text value="Personal communication"/>
+            </if>
+          </choose>
+          <text variable="medium" text-case="lowercase" prefix="By "/>
+          <date variable="issued">
+            <date-part name="day" suffix=" " range-delimiter="-"/>
+            <date-part name="month" suffix=" "/>
+            <date-part name="year" range-delimiter="/"/>
+          </date>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="false" cite-group-delimiter=", " collapse="year">
+    <sort>
+      <key macro="author-short"/>
+    </sort>
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=": ">
+        <group delimiter=" ">
+          <text macro="author-short"/>
+          <text macro="issued"/>
+        </group>
+        <text variable="locator"/>
+      </group>
+    </layout>
+  </citation>
+  <bibliography hanging-indent="true" entry-spacing="0" line-spacing="1">
+    <sort>
+      <key macro="author"/>
+      <key macro="issued" sort="ascending"/>
+    </sort>
+    <layout>
+      <text macro="author" suffix=".  "/>
+      <group delimiter=".  ">
+        <text macro="issued"/>
+        <text macro="title"/>
+        <text macro="container"/>
+      </group>
+      <text macro="locators"/>
+      <choose>
+        <if type="webpage">
+          <text macro="web_availibility" prefix=". "/>
+        </if>
+        <else>
+          <text macro="web_availibility" prefix=". "/>
+        </else>
+      </choose>
+      <choose>
+        <if variable="URL DOI" match="any">
+          <choose>
+            <if variable="accessed" match="none">
+              <text value="."/>
+            </if>
+          </choose>
+        </if>
+        <else>
+          <text value="."/>
+        </else>
+      </choose>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/csl/csl-styles/organization-studies.csl b/buildres/csl/csl-styles/organization-studies.csl
index 912345484b3..13a9e79bff9 100644
--- a/buildres/csl/csl-styles/organization-studies.csl
+++ b/buildres/csl/csl-styles/organization-studies.csl
@@ -211,23 +211,6 @@
       </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">
@@ -1468,7 +1451,7 @@
     <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 macro="date-bib" sort="ascending"/>
       <key variable="status"/>
     </sort>
     <layout prefix="(" suffix=")" delimiter="; ">
@@ -1483,7 +1466,7 @@
     <sort>
       <key macro="author-bib"/>
       <key macro="date-sort-group"/>
-      <key macro="date-sort-date" sort="ascending"/>
+      <key macro="date-bib" sort="ascending"/>
       <key variable="status"/>
       <key macro="title"/>
     </sort>
diff --git a/buildres/csl/csl-styles/palaeontology.csl b/buildres/csl/csl-styles/palaeontology.csl
index f0e71ab0906..2b8452e9d98 100644
--- a/buildres/csl/csl-styles/palaeontology.csl
+++ b/buildres/csl/csl-styles/palaeontology.csl
@@ -12,8 +12,8 @@
     </author>
     <contributor>
       <name>Martin R. Smith</name>
-      <email>martins@gmail.com</email>
-      <uri>https://community.dur.ac.uk/martin.smith/</uri>
+      <email>martin.smith@durham.ac.uk</email>
+      <uri>https://smithlabdurham.github.io/</uri>
     </contributor>
     <category citation-format="author-date"/>
     <category field="biology"/>
@@ -80,11 +80,18 @@
     </sort>
     <layout prefix="(" suffix=")" delimiter="; ">
       <group delimiter=" ">
-        <text macro="author-short"/>
-        <text macro="year-date"/>
+        <group delimiter="">
+          <group delimiter=" ">
+            <text macro="author-short"/>
+            <text macro="year-date"/>
+          </group>
+          <text variable="year-suffix" font-style="italic"/>
+        </group>
+        <group delimiter=" ">
+          <label variable="locator" form="short"/>
+          <text variable="locator"/>
+        </group>
       </group>
-      <text variable="locator"/>
-      <text variable="year-suffix" font-style="italic"/>
     </layout>
   </citation>
   <bibliography entry-spacing="0" hanging-indent="true" subsequent-author-substitute-rule="partial-each" subsequent-author-substitute="&#8212;&#8212;&#8212;">
diff --git a/buildres/csl/csl-styles/paleobiology.csl b/buildres/csl/csl-styles/paleobiology.csl
index 0acc365760e..97887076167 100644
--- a/buildres/csl/csl-styles/paleobiology.csl
+++ b/buildres/csl/csl-styles/paleobiology.csl
@@ -8,8 +8,8 @@
     <link href="http://www.paleosoc.org/content/AuthorContribInstr.html" rel="documentation"/>
     <author>
       <name>Martin R. Smith</name>
-      <email>martins@gmail.com</email>
-      <uri>https://plus.google.com/u/0/108450310917386384868</uri>
+      <email>martin.smith@durham.ac.uk</email>
+      <uri>https://smithlabdurham.github.io/</uri>
     </author>
     <category citation-format="author-date"/>
     <category field="biology"/>
@@ -20,14 +20,12 @@
   </info>
   <macro name="author">
     <names variable="author" suffix=".">
-      <name sort-separator=", " initialize-with=". " and="text" name-as-sort-order="first" delimiter=", " delimiter-precedes-last="always" form="long">
-      </name>
+      <name sort-separator=", " initialize-with=". " and="text" name-as-sort-order="first" delimiter=", " delimiter-precedes-last="always" form="long"/>
     </names>
   </macro>
   <macro name="editor">
     <names variable="editor">
-      <name sort-separator=", " initialize-with=". " delimiter=", " and="text" delimiter-precedes-last="contextual">
-      </name>
+      <name sort-separator=", " initialize-with=". " delimiter=", " and="text" delimiter-precedes-last="contextual"/>
       <label form="short" prefix=", " suffix="."/>
     </names>
   </macro>
@@ -79,11 +77,18 @@
     </sort>
     <layout prefix="(" suffix=")" delimiter="; ">
       <group delimiter=" ">
-        <text macro="author-short"/>
-        <text macro="year-date"/>
+        <group delimiter="">
+          <group delimiter=" ">
+            <text macro="author-short"/>
+            <text macro="year-date"/>
+          </group>
+          <text variable="year-suffix" font-style="italic"/>
+        </group>
+        <group delimiter=" ">
+          <label variable="locator" form="short"/>
+          <text variable="locator"/>
+        </group>
       </group>
-      <text variable="locator"/>
-      <text variable="year-suffix" font-style="italic"/>
     </layout>
   </citation>
   <bibliography entry-spacing="0" hanging-indent="true" subsequent-author-substitute="&#8212;&#8212;&#8212;">
diff --git a/buildres/csl/csl-styles/polish-archives-of-internal-medicine.csl b/buildres/csl/csl-styles/polish-archives-of-internal-medicine.csl
new file mode 100644
index 00000000000..1f8198d3a71
--- /dev/null
+++ b/buildres/csl/csl-styles/polish-archives-of-internal-medicine.csl
@@ -0,0 +1,144 @@
+<?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>Polish Archives of Internal Medicine</title>
+    <title-short>Pol Arch Intern Med</title-short>
+    <id>http://www.zotero.org/styles/polish-archives-of-internal-medicine</id>
+    <link href="http://www.zotero.org/styles/polish-archives-of-internal-medicine" rel="self"/>
+    <link href="https://www.mp.pl/paim/for-authors/" rel="documentation"/>
+    <author>
+      <name>Katarzyna Toffel</name>
+    </author>
+    <category citation-format="numeric"/>
+    <category field="medicine"/>
+    <issn>0032-3772</issn>
+    <eissn>1897-9483</eissn>
+    <updated>2023-02-07T12:33: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">
+    <terms>
+      <term name="page-range-delimiter">-</term>
+    </terms>
+  </locale>
+  <macro name="author">
+    <group suffix=".">
+      <names variable="author">
+        <name font-variant="normal" delimiter-precedes-et-al="always" delimiter-precedes-last="always" initialize-with="" name-as-sort-order="all" sort-separator=" "/>
+        <label form="short" prefix=", "/>
+        <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="long" 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" suffix="."/>
+      <text macro="year" suffix=";"/>
+      <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="5" 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" strip-periods="false" 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/publicatiewijzer-voor-de-archeologie.csl b/buildres/csl/csl-styles/publicatiewijzer-voor-de-archeologie.csl
index b93dcd6f80e..2fa8e7a9374 100644
--- a/buildres/csl/csl-styles/publicatiewijzer-voor-de-archeologie.csl
+++ b/buildres/csl/csl-styles/publicatiewijzer-voor-de-archeologie.csl
@@ -12,9 +12,14 @@
     <category citation-format="note"/>
     <category field="humanities"/>
     <summary>Style as prescribed in Diepeveen-Jansen, M./J. Kaarsemaker, 2004: Publicatiewijzer voor de archeologie, Amsterdam (Themata 1).</summary>
-    <updated>2022-11-28T02:10:01+00:00</updated>
+    <updated>2023-06-16T14:26: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="nl">
+    <terms>
+      <term name="et-al">et al.</term>
+    </terms>
+  </locale>
   <macro name="container-contributors">
     <choose>
       <if type="chapter paper-conference" match="any">
@@ -33,7 +38,7 @@
     <choose>
       <if type="chapter paper-conference" match="none">
         <names variable="translator" delimiter=", " prefix=" (" suffix=")">
-          <name and="symbol" initialize-with="." delimiter=", "/>
+          <name initialize-with="." delimiter=", "/>
           <label form="short" prefix=", " text-case="capitalize-first"/>
           <substitute>
             <names variable="editor"/>
@@ -65,7 +70,7 @@
   </macro>
   <macro name="author-short">
     <names variable="author">
-      <name form="short" and="text">
+      <name form="short" delimiter="/">
         <name-part name="family" text-case="capitalize-first"/>
       </name>
       <substitute>
diff --git a/buildres/csl/csl-styles/retina.csl b/buildres/csl/csl-styles/retina.csl
new file mode 100644
index 00000000000..0ea770faf4f
--- /dev/null
+++ b/buildres/csl/csl-styles/retina.csl
@@ -0,0 +1,272 @@
+<?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>Retina</title>
+    <id>http://www.zotero.org/styles/retina</id>
+    <link href="http://www.zotero.org/styles/retina" rel="self"/>
+    <link href="http://www.zotero.org/styles/american-medical-association" rel="template"/>
+    <link href="http://edmgr.ovid.com/retina/accounts/ifauth.htm" rel="documentation"/>
+    <author>
+      <name>Patrick O'Brien</name>
+    </author>
+    <category citation-format="numeric"/>
+    <category field="medicine"/>
+    <issn>0275-004X</issn>
+    <eissn>1539-2864</eissn>
+    <updated>2023-06-01T10:34: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">
+    <terms>
+      <term name="page-range-delimiter">-</term>
+      <term name="presented at">presented at</term>
+    </terms>
+  </locale>
+  <macro name="editor">
+    <names variable="editor">
+      <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
+      <label form="short" prefix=", "/>
+    </names>
+  </macro>
+  <macro name="author">
+    <group suffix=".">
+      <names variable="author">
+        <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
+        <label form="short" prefix=", "/>
+        <substitute>
+          <names variable="editor"/>
+          <text macro="title"/>
+        </substitute>
+      </names>
+    </group>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if type="article-newspaper" match="none">
+        <choose>
+          <if variable="DOI">
+            <text value="doi:"/>
+            <text variable="DOI"/>
+          </if>
+          <else-if variable="URL">
+            <group delimiter=". ">
+              <choose>
+                <if type="webpage post post-weblog" match="any">
+                  <date variable="issued" prefix="Published " form="text"/>
+                </if>
+              </choose>
+              <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" text-case="title"/>
+      </if>
+      <else>
+        <text variable="title"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <text variable="publisher"/>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="short"/>
+        </group>
+      </if>
+      <else>
+        <text variable="edition" suffix="."/>
+      </else>
+    </choose>
+  </macro>
+  <citation collapse="citation-number">
+    <sort>
+      <key variable="citation-number"/>
+    </sort>
+    <layout delimiter="," vertical-align="sup">
+      <text variable="citation-number"/>
+      <group prefix="(" suffix=")">
+        <label variable="locator" form="short" strip-periods="true"/>
+        <text variable="locator"/>
+      </group>
+    </layout>
+  </citation>
+  <bibliography hanging-indent="false" et-al-min="5" 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" 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" 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" 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>
+              <text variable="volume"/>
+            </group>
+            <text variable="page" prefix=":"/>
+          </group>
+        </else>
+      </choose>
+      <text prefix=" " macro="access"/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/csl/csl-styles/sage-harvard.csl b/buildres/csl/csl-styles/sage-harvard.csl
index 488dfbc6202..60b44bcbf04 100644
--- a/buildres/csl/csl-styles/sage-harvard.csl
+++ b/buildres/csl/csl-styles/sage-harvard.csl
@@ -12,7 +12,7 @@
     <category citation-format="author-date"/>
     <category field="generic-base"/>
     <summary>The SAGE Harvard author-date style</summary>
-    <updated>2017-05-18T15:23:08+00:00</updated>
+    <updated>2023-08-31T08:13:20+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <locale xml:lang="en-GB">
@@ -21,6 +21,7 @@
         <single>ed.</single>
         <multiple>eds</multiple>
       </term>
+      <term name="forthcoming">Epub ahead of print</term>
     </terms>
   </locale>
   <macro name="editor">
@@ -74,8 +75,18 @@
   </macro>
   <macro name="access">
     <choose>
-      <if variable="DOI">
-        <text variable="DOI" prefix="DOI: "/>
+      <if type="article-journal">
+        <choose>
+          <if match="none" variable="volume page">
+            <group delimiter=". ">
+              <group delimiter=" ">
+                <text term="forthcoming"/>
+                <date form="text" date-parts="year-month-day" variable="issued"/>
+              </group>
+              <text variable="DOI" prefix="DOI: "/>
+            </group>
+          </if>
+        </choose>
       </if>
       <else-if variable="URL">
         <text value="Available at: "/>
diff --git a/buildres/csl/csl-styles/silva-fennica.csl b/buildres/csl/csl-styles/silva-fennica.csl
new file mode 100644
index 00000000000..4e2233f0180
--- /dev/null
+++ b/buildres/csl/csl-styles/silva-fennica.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="never" default-locale="en-US">
+  <info>
+    <title>Silva Fennica</title>
+    <id>http://www.zotero.org/styles/silva-fennica</id>
+    <link href="http://www.zotero.org/styles/silva-fennica" rel="self"/>
+    <link href="http://www.zotero.org/styles/journal-of-soil-science-and-plant-nutrition" rel="template"/>
+    <link href="https://silvafennica.fi/page/authors" rel="documentation"/>
+    <author>
+      <name>Patrick O'Brien</name>
+    </author>
+    <category citation-format="author-date"/>
+    <category field="biology"/>
+    <issn>2242-4075</issn>
+    <updated>2023-06-07T14:07: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>
+    <terms>
+      <term name="edition" form="short">edn.</term>
+    </terms>
+  </locale>
+  <macro name="author-short">
+    <names variable="author">
+      <name form="short" and="text"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text variable="title"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name sort-separator=" " initialize-with="" name-as-sort-order="all" delimiter=", " delimiter-precedes-last="always"/>
+      <label form="short" strip-periods="true" prefix=" (" suffix=")"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text variable="title"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="author-count">
+    <names variable="author">
+      <name form="count"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition"/>
+        </group>
+      </if>
+      <else>
+        <text variable="edition"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="year">
+    <date variable="issued">
+      <date-part name="year"/>
+    </date>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="book">
+        <group delimiter=". ">
+          <group delimiter=", ">
+            <text variable="title"/>
+            <text macro="edition"/>
+          </group>
+          <choose>
+            <if type="book" match="any" variable="version">
+              <text variable="version" prefix="Version "/>
+            </if>
+          </choose>
+        </group>
+      </if>
+      <else>
+        <text variable="title"/>
+      </else>
+    </choose>
+    <text variable="original-title" prefix=" [" suffix="]"/>
+  </macro>
+  <macro name="year-parenth">
+    <date prefix="(" suffix=")" variable="issued">
+      <date-part name="year"/>
+    </date>
+  </macro>
+  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" collapse="year-suffix" cite-group-delimiter=", ">
+    <sort>
+      <key macro="author"/>
+      <key variable="author" sort="ascending"/>
+      <key variable="issued"/>
+    </sort>
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=", ">
+        <group delimiter=" ">
+          <text macro="author-short"/>
+          <text macro="year"/>
+        </group>
+        <group delimiter=" ">
+          <label variable="locator" form="short"/>
+          <text variable="locator"/>
+        </group>
+      </group>
+    </layout>
+  </citation>
+  <bibliography hanging-indent="true">
+    <sort>
+      <key macro="author" 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="year"/>
+      <key macro="title"/>
+    </sort>
+    <layout>
+      <group delimiter=" ">
+        <text macro="author"/>
+        <text macro="year-parenth"/>
+        <text macro="title"/>
+      </group>
+      <choose>
+        <if type="chapter paper-conference" match="any">
+          <group delimiter=" " prefix=". ">
+            <text term="in" text-case="capitalize-first" suffix=":"/>
+            <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=")"/>
+            </names>
+            <group delimiter=", ">
+              <text variable="container-title"/>
+              <text macro="edition"/>
+            </group>
+          </group>
+          <group prefix=". " delimiter=", ">
+            <text variable="publisher"/>
+            <text variable="publisher-place"/>
+            <group delimiter=" ">
+              <label variable="page" form="short" strip-periods="true"/>
+              <text variable="page"/>
+            </group>
+          </group>
+        </if>
+        <else-if type="article-journal">
+          <choose>
+            <if variable="page volume" match="any">
+              <group prefix=". " delimiter=". ">
+                <group delimiter=" ">
+                  <text variable="container-title" form="short" strip-periods="true"/>
+                  <group delimiter=": ">
+                    <text variable="volume"/>
+                    <text variable="page"/>
+                  </group>
+                </group>
+                <text prefix="https://doi.org/" variable="DOI"/>
+              </group>
+            </if>
+            <else>
+              <group prefix=". " delimiter=". ">
+                <text variable="container-title" form="short" strip-periods="true"/>
+                <text prefix="https://doi.org/" variable="DOI"/>
+              </group>
+            </else>
+          </choose>
+        </else-if>
+        <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+          <group delimiter=". ">
+            <group prefix=". " delimiter=", ">
+              <text variable="publisher"/>
+              <text variable="publisher-place"/>
+            </group>
+            <group>
+              <choose>
+                <if match="any" variable="version">
+                  <text variable="URL" prefix="URL "/>
+                </if>
+              </choose>
+            </group>
+          </group>
+        </else-if>
+        <else-if type="webpage post-weblog post" match="any">
+          <group prefix=". " delimiter=". ">
+            <text variable="container-title" form="short"/>
+            <text variable="URL"/>
+            <date variable="accessed">
+              <date-part prefix="Accessed " name="day" suffix=" "/>
+              <date-part name="month" strip-periods="false" suffix=" "/>
+              <date-part name="year"/>
+            </date>
+          </group>
+        </else-if>
+        <else-if type="thesis">
+          <group prefix=". " delimiter=", ">
+            <text variable="genre" text-case="capitalize-first"/>
+            <text variable="publisher"/>
+          </group>
+        </else-if>
+        <else>
+          <group prefix=". " delimiter=" ">
+            <text variable="container-title" form="short"/>
+            <group delimiter=":">
+              <text variable="volume"/>
+              <text variable="page"/>
+            </group>
+          </group>
+        </else>
+      </choose>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/csl/csl-styles/slovensko-drustvo-za-medicinsko-informatiko.csl b/buildres/csl/csl-styles/slovensko-drustvo-za-medicinsko-informatiko.csl
new file mode 100644
index 00000000000..c8639ec6255
--- /dev/null
+++ b/buildres/csl/csl-styles/slovensko-drustvo-za-medicinsko-informatiko.csl
@@ -0,0 +1,175 @@
+<?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/) -->
+  <info>
+    <title>Slovensko društvo za medicinsko informatiko</title>
+    <title-short>SDMI</title-short>
+    <id>http://www.zotero.org/styles/slovensko-drustvo-za-medicinsko-informatiko</id>
+    <link href="http://www.zotero.org/styles/slovensko-drustvo-za-medicinsko-informatiko" rel="self"/>
+    <link href="http://www.zotero.org/styles/american-medical-association" rel="template"/>
+    <link href="https://docs.google.com/document/d/1upCPedxqcE0mPUBRWWyPMjuUCEdk7hIl/edit?usp=sharing&amp;ouid=108060715168109961711&amp;rtpof=true&amp;sd=true" rel="documentation"/>
+    <author>
+      <name>Luka Petravić</name>
+      <email>lpetravic@me.com</email>
+    </author>
+    <category citation-format="numeric"/>
+    <category field="medicine"/>
+    <summary>SDMI style for SDMI congress.</summary>
+    <published>2022-07-06T09:20:38+00:00</published>
+    <updated>2022-07-06T09:20: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">
+    <names variable="editor" prefix="In: ">
+      <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
+      <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">
+    <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>
+      <text variable="publisher-place" suffix=": "/>
+      <date variable="issued" suffix=": ">
+        <date-part name="year"/>
+      </date>
+      <text variable="publisher" prefix=" "/>
+    </group>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number prefix="(" variable="edition" form="ordinal"/>
+          <text term="edition" form="short" suffix=")"/>
+        </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="6" et-al-use-first="3" second-field-align="margin" entry-spacing="0">
+    <layout>
+      <text variable="citation-number" suffix=". "/>
+      <text macro="author"/>
+      <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"/>
+          </group>
+          <text prefix=" " macro="publisher"/>
+          <group suffix="." prefix="; ">
+            <text variable="page" prefix=":"/>
+          </group>
+        </if>
+        <else-if type="chapter paper-conference" match="any">
+          <group prefix=" ">
+            <text value="" 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 suffix=".">
+              <text macro="publisher" prefix=" "/>
+              <group suffix=".">
+                <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="webpage" match="any">
+          <text variable="URL" font-weight="bold"/>
+          <date form="numeric" variable="accessed" prefix="(" suffix=")"/>
+        </else-if>
+        <else>
+          <text macro="editor" prefix=" " suffix="."/>
+          <group prefix=" " suffix=".">
+            <text variable="container-title" font-style="italic" form="short"/>
+            <group delimiter=";" prefix=" ">
+              <date variable="issued">
+                <date-part name="year"/>
+              </date>
+              <group>
+                <text variable="volume" font-style="italic"/>
+                <text variable="issue" prefix="(" suffix=")"/>
+              </group>
+            </group>
+            <text variable="page" prefix=": "/>
+          </group>
+        </else>
+      </choose>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/csl/csl-styles/springer-vancouver-brackets.csl b/buildres/csl/csl-styles/springer-vancouver-brackets.csl
index afceecf8bb2..41bcda899c0 100644
--- a/buildres/csl/csl-styles/springer-vancouver-brackets.csl
+++ b/buildres/csl/csl-styles/springer-vancouver-brackets.csl
@@ -5,7 +5,6 @@
     <id>http://www.zotero.org/styles/springer-vancouver-brackets</id>
     <link href="http://www.zotero.org/styles/springer-vancouver-brackets" rel="self"/>
     <link href="http://www.zotero.org/styles/vancouver" rel="template"/>
-    <!-- This style corresponds to 'Springer Vancouver' in the pdf document 'Key Style Points' at this url -->
     <link href="http://www.springer.com/cda/content/document/cda_downloaddocument/manuscript-guidelines-1.0.pdf" rel="documentation"/>
     <link href="http://www.springer.com/cda/content/document/cda_downloaddocument/Key_Style_Points_1.0.pdf" rel="documentation"/>
     <author>
@@ -16,7 +15,7 @@
     <category citation-format="numeric"/>
     <category field="generic-base"/>
     <summary>This style based on the NLM guidelines Citing Medicine is very similar to Vancouver and is used by a number of Springer publications.</summary>
-    <updated>2018-01-29T19:38:34+00:00</updated>
+    <updated>2023-05-14T09:16: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">
@@ -70,17 +69,21 @@
     </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>
+    <choose>
+      <if type="article-journal article-newspaper article-magazine" match="none">
+        <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>
+      </if>
+    </choose>
   </macro>
   <macro name="access">
     <choose>
@@ -118,7 +121,6 @@
         </group>
         <text macro="edition" prefix=" "/>
       </if>
-      <!--add event-name and event-place once they become available-->
       <else-if type="bill legislation" match="any">
         <group delimiter=", ">
           <group delimiter=". ">
diff --git a/buildres/csl/csl-styles/studii-teologice.csl b/buildres/csl/csl-styles/studii-teologice.csl
index 18089cfed74..75300e87325 100644
--- a/buildres/csl/csl-styles/studii-teologice.csl
+++ b/buildres/csl/csl-styles/studii-teologice.csl
@@ -1,6 +1,7 @@
 <?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">
   <!-- Polyglot; journal publishes in English, French, German, and Romanian -->
+  <!-- This style was edited with the Visual CSL Editor (https://editor.citationstyles.org/visualEditor/) -->
   <info>
     <title>Studii Teologice</title>
     <id>http://www.zotero.org/styles/studii-teologice</id>
@@ -14,7 +15,7 @@
     <category field="theology"/>
     <issn>1011-8845</issn>
     <summary>Studii Teologice Review, full notes</summary>
-    <updated>2013-04-02T16:01:03+00:00</updated>
+    <updated>2023-07-02T18:43:58+00:00</updated>
     <rights 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="ro">
@@ -198,6 +199,27 @@
       <text variable="volume"/>
     </group>
   </macro>
+  <macro name="author-bib">
+    <choose>
+      <if match="all" variable="author">
+        <names variable="author">
+          <name delimiter="; " delimiter-precedes-last="always" name-as-sort-order="all">
+            <name-part name="family" font-variant="small-caps"/>
+          </name>
+        </names>
+      </if>
+    </choose>
+    <choose>
+      <if match="none" variable="author">
+        <names variable="editor">
+          <name delimiter="; " delimiter-precedes-last="always" name-as-sort-order="all">
+            <name-part name="family" font-variant="small-caps"/>
+          </name>
+          <label form="short" text-case="lowercase" prefix=" (" suffix=")"/>
+        </names>
+      </if>
+    </choose>
+  </macro>
   <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="false" disambiguate-add-names="true" disambiguate-add-givenname="true">
     <layout suffix="." delimiter="; ">
       <choose>
@@ -360,4 +382,83 @@
       </choose>
     </layout>
   </citation>
+  <bibliography>
+    <layout suffix=".">
+      <text macro="author-bib" suffix=", "/>
+      <text macro="title"/>
+      <choose>
+        <if type="chapter paper-conference" match="any">
+          <group>
+            <text term="in" text-case="lowercase" prefix=", " suffix=":"/>
+            <group delimiter=", " prefix=" ">
+              <text variable="container-title" font-style="italic"/>
+              <text macro="editor-short"/>
+              <text macro="book-author"/>
+            </group>
+            <text macro="volume" prefix=", "/>
+            <text macro="collection" prefix=", "/>
+          </group>
+          <text macro="translator" prefix=", "/>
+          <text variable="edition" prefix=", "/>
+          <text macro="publisher" prefix=", "/>
+          <text macro="issued" prefix=", "/>
+        </if>
+        <else-if type="article-journal" match="any">
+          <group>
+            <text term="in" text-case="lowercase" prefix=", " suffix=":"/>
+            <group prefix=" ">
+              <text variable="container-title" font-style="italic"/>
+              <group delimiter=", " prefix=", ">
+                <text variable="volume"/>
+                <text variable="issue"/>
+              </group>
+              <text macro="issued" prefix=" (" suffix=")"/>
+            </group>
+            <text macro="editor" prefix=", "/>
+            <text macro="translator" prefix=", "/>
+            <text variable="edition" prefix=", "/>
+            <text macro="publisher" prefix=", "/>
+          </group>
+        </else-if>
+        <else-if type="article-newspaper article-magazine" match="any">
+          <group>
+            <text term="in" text-case="lowercase" prefix=", " suffix=":"/>
+            <group prefix=" ">
+              <text variable="container-title" font-style="italic"/>
+              <group delimiter=", " prefix=", ">
+                <text variable="volume"/>
+                <text variable="issue"/>
+              </group>
+              <text macro="issued" prefix=", "/>
+            </group>
+            <text macro="editor" prefix=", "/>
+            <text macro="translator" prefix=", "/>
+            <text variable="edition" prefix=", "/>
+            <text macro="publisher" prefix=", "/>
+          </group>
+        </else-if>
+        <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+          <text macro="volume" prefix=", "/>
+          <text macro="collection" prefix=", "/>
+          <text macro="translator" prefix=", "/>
+          <choose>
+            <if match="any" variable="author">
+              <text macro="editor" prefix=", "/>
+            </if>
+          </choose>
+          <text variable="edition" prefix=", "/>
+          <text macro="publisher" prefix=", "/>
+          <text macro="issued" prefix=", "/>
+        </else-if>
+        <else>
+          <group>
+            <text variable="container-title" font-style="italic" prefix=", "/>
+            <text variable="volume" prefix=" "/>
+            <text variable="issue" prefix=", "/>
+          </group>
+        </else>
+      </choose>
+      <text macro="access" prefix=", "/>
+    </layout>
+  </bibliography>
 </style>
diff --git a/buildres/csl/csl-styles/taylor-and-francis-aip.csl b/buildres/csl/csl-styles/taylor-and-francis-aip.csl
new file mode 100644
index 00000000000..a894588435c
--- /dev/null
+++ b/buildres/csl/csl-styles/taylor-and-francis-aip.csl
@@ -0,0 +1,158 @@
+<?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>Taylor &amp; Francis - American Institute of Physics</title>
+    <title-short>AIP</title-short>
+    <id>http://www.zotero.org/styles/taylor-and-francis-aip</id>
+    <link href="http://www.zotero.org/styles/taylor-and-francis-aip" rel="self"/>
+    <link href="http://www.zotero.org/styles/american-institute-of-physics" rel="template"/>
+    <link href="http://www.tandf.co.uk/journals/authors/style/reference/tf_O.pdf" rel="documentation"/>
+    <!-- No attempt to make compound citations is made here <http://forums.zotero.org/discussion/4288/>-->
+    <author>
+      <name>Sebastian Karcher</name>
+    </author>
+    <category citation-format="numeric"/>
+    <category field="physics"/>
+    <!--<category term="materials science"/>-->
+    <summary>Common style use by AIP publications.</summary>
+    <updated>2022-05-16T00:04: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">
+    <names variable="author">
+      <name delimiter=", " initialize-with="." and="text"/>
+      <label form="long" prefix=", " suffix=" "/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="editor">
+    <names variable="editor">
+      <label form="verb" suffix=" "/>
+      <name delimiter=", " initialize-with="." and="text"/>
+    </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="day-date">
+    <choose>
+      <if variable="issued">
+        <date variable="issued">
+          <date-part name="day" suffix=" "/>
+          <date-part name="month" form="long" suffix=" "/>
+          <date-part name="year"/>
+        </date>
+      </if>
+      <else>
+        <text term="no date" form="short"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <group prefix="(" suffix=")" delimiter=", ">
+      <text variable="publisher"/>
+      <text variable="publisher-place" text-case="title"/>
+      <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>
+  <citation collapse="citation-number">
+    <sort>
+      <key variable="citation-number"/>
+    </sort>
+    <layout delimiter=",">
+      <text variable="citation-number" prefix="[" suffix="]"/>
+    </layout>
+  </citation>
+  <bibliography entry-spacing="0">
+    <layout suffix=".">
+      <!-- Citation Number -->
+      <text variable="citation-number" prefix="[" suffix="]"/>
+      <text macro="author" prefix=" " 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="edition"/>
+            </group>
+            <group delimiter=", ">
+              <text macro="publisher"/>
+              <group delimiter=" ">
+                <label variable="page" form="short"/>
+                <text variable="page"/>
+              </group>
+            </group>
+          </group>
+        </if>
+        <else-if type="chapter paper-conference" match="any">
+          <group delimiter=" ">
+            <text term="in"/>
+            <group delimiter=", ">
+              <text variable="container-title" form="short" text-case="title" font-style="italic"/>
+              <text macro="editor"/>
+              <text macro="edition"/>
+            </group>
+            <group delimiter=", ">
+              <text macro="publisher"/>
+              <group delimiter=" ">
+                <label variable="page" form="short"/>
+                <text variable="page"/>
+              </group>
+            </group>
+          </group>
+        </else-if>
+        <else-if type="patent">
+          <group delimiter=" ">
+            <text variable="number" prefix=" "/>
+            <text macro="day-date" prefix="(" suffix=")"/>
+          </group>
+        </else-if>
+        <else-if type="thesis">
+          <group delimiter=", ">
+            <text variable="title" text-case="title"/>
+            <text variable="genre"/>
+            <text variable="publisher"/>
+            <text macro="year-date"/>
+          </group>
+        </else-if>
+        <else>
+          <group delimiter=" ">
+            <text variable="container-title" form="short" text-case="title"/>
+            <group delimiter=", ">
+              <text variable="volume" font-weight="bold"/>
+              <group delimiter=" ">
+                <text variable="page-first"/>
+                <text macro="year-date" prefix="(" suffix=")"/>
+              </group>
+            </group>
+          </group>
+        </else>
+      </choose>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/csl/csl-styles/technische-universitat-dresden-betriebswirtschaftslehre-rechnungswesen-controlling.csl b/buildres/csl/csl-styles/technische-universitat-dresden-betriebswirtschaftslehre-rechnungswesen-controlling.csl
index e65048a4e50..09439bf9fb7 100644
--- a/buildres/csl/csl-styles/technische-universitat-dresden-betriebswirtschaftslehre-rechnungswesen-controlling.csl
+++ b/buildres/csl/csl-styles/technische-universitat-dresden-betriebswirtschaftslehre-rechnungswesen-controlling.csl
@@ -38,8 +38,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
   -->
@@ -107,7 +107,7 @@
       </if>
       <else-if type="interview personal_communication">
         <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=", ">
@@ -188,7 +188,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>
@@ -221,9 +221,6 @@
       </else>
     </choose>
   </macro>
-  <macro name="date-sort-date">
-    <date variable="issued" form="numeric"/>
-  </macro>
   <macro name="date-intext">
     <choose>
       <if variable="issued">
@@ -249,7 +246,7 @@
                 <if type="interview personal_communication">
                   <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>
@@ -1014,7 +1011,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>
@@ -1317,7 +1314,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"/>
@@ -1590,7 +1587,7 @@
     <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 macro="date-bib" sort="ascending"/>
       <key variable="status"/>
     </sort>
     <layout prefix="(" suffix=")" delimiter="; ">
@@ -1605,7 +1602,7 @@
     <sort>
       <key macro="author-bib"/>
       <key macro="date-sort-group"/>
-      <key macro="date-sort-date" sort="ascending"/>
+      <key macro="date-bib" sort="ascending"/>
       <key variable="status"/>
       <key macro="title"/>
     </sort>
diff --git a/buildres/csl/csl-styles/the-accounting-review.csl b/buildres/csl/csl-styles/the-accounting-review.csl
index 64133cc8699..de71d02fccb 100644
--- a/buildres/csl/csl-styles/the-accounting-review.csl
+++ b/buildres/csl/csl-styles/the-accounting-review.csl
@@ -395,7 +395,7 @@
       </else>
     </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-names="true" disambiguate-add-givenname="true" disambiguate-add-year-suffix="true">
+  <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-givenname="true" disambiguate-add-year-suffix="true" collapse="year">
     <layout prefix="(" suffix=")" delimiter="; ">
       <group delimiter=", ">
         <group delimiter=" ">
diff --git a/buildres/csl/csl-styles/the-journal-of-clinical-investigation.csl b/buildres/csl/csl-styles/the-journal-of-clinical-investigation.csl
index 48a0ce90c09..9212d87f9a3 100644
--- a/buildres/csl/csl-styles/the-journal-of-clinical-investigation.csl
+++ b/buildres/csl/csl-styles/the-journal-of-clinical-investigation.csl
@@ -2,30 +2,29 @@
 <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>The Journal of Clinical Investigation</title>
+    <title-short>JCI</title-short>
     <id>http://www.zotero.org/styles/the-journal-of-clinical-investigation</id>
     <link href="http://www.zotero.org/styles/the-journal-of-clinical-investigation" rel="self"/>
     <link href="http://www.zotero.org/styles/journal-of-clinical-oncology" rel="template"/>
-    <link href="http://www.jci.org/kiosk/publish" rel="documentation"/>
+    <link href="https://www.jci.org/kiosks/publish/examples" rel="documentation"/>
     <author>
       <name>Francesco Caiazza</name>
       <email>francesco.caiazza@gmail.com</email>
     </author>
+    <contributor>
+      <name>Patrick O'Brien</name>
+    </contributor>
     <category citation-format="numeric"/>
     <category field="medicine"/>
     <issn>0021-9738</issn>
     <eissn>1558-8238</eissn>
-    <updated>2012-09-27T22:06:38+00:00</updated>
+    <updated>2023-07-23T11:49: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="et-al">et al</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=" (" suffix=")" strip-periods="true"/>
+      <label form="short" strip-periods="true" prefix=", "/>
       <substitute>
         <names variable="editor"/>
         <names variable="translator"/>
@@ -35,7 +34,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" prefix=" " suffix="."/>
+      <label form="short" prefix=", " suffix="."/>
     </names>
   </macro>
   <macro name="publisher">
@@ -43,7 +42,7 @@
       <text variable="publisher-place" suffix=": "/>
       <text variable="publisher" suffix="; "/>
       <date variable="issued">
-        <date-part name="year" suffix=":"/>
+        <date-part name="year"/>
       </date>
     </group>
   </macro>
@@ -52,17 +51,19 @@
       <if variable="page" match="none">
         <choose>
           <if variable="DOI">
-            <text variable="DOI" prefix=" doi:"/>
+            <text variable="DOI" prefix=" https://doi.org/"/>
           </if>
           <else-if variable="URL">
-            <group delimiter=" ">
+            <group delimiter=". ">
               <text variable="URL" suffix=". "/>
-              <text term="cited"/>
-              <date variable="accessed">
-                <date-part name="month"/>
-                <date-part name="day" prefix=" "/>
-                <date-part name="year" prefix=", "/>
-              </date>
+              <group delimiter=" ">
+                <text term="accessed" text-case="capitalize-first"/>
+                <date variable="accessed">
+                  <date-part name="month"/>
+                  <date-part name="day" prefix=" "/>
+                  <date-part name="year" prefix=", "/>
+                </date>
+              </group>
             </group>
           </else-if>
         </choose>
@@ -73,9 +74,12 @@
     <group delimiter=" ">
       <text variable="title"/>
       <choose>
-        <if variable="URL">
-          <text term="internet" prefix="[" suffix="]" text-case="capitalize-first"/>
+        <if type="article">
+          <text term="preprint" prefix="[" suffix="]"/>
         </if>
+        <else-if match="any" type="webpage post post-weblog">
+          <text term="internet" prefix="[" suffix="]" text-case="capitalize-first"/>
+        </else-if>
       </choose>
     </group>
   </macro>
@@ -123,7 +127,7 @@
       <text variable="citation-number"/>
     </layout>
   </citation>
-  <bibliography et-al-min="6" et-al-use-first="1" line-spacing="2">
+  <bibliography delimiter-precedes-et-al="always" et-al-min="4" et-al-use-first="1" line-spacing="2">
     <layout>
       <text variable="citation-number" suffix=". "/>
       <text macro="author" suffix=". "/>
@@ -133,19 +137,25 @@
           <text macro="publisher" prefix=". "/>
         </if>
         <else-if type="chapter paper-conference" match="any">
-          <text macro="title"/>
-          <text term="in" suffix=": " prefix=". " text-case="capitalize-first"/>
-          <group delimiter=". " suffix=". ">
-            <text macro="editor"/>
+          <group delimiter=". ">
+            <text macro="title"/>
+            <group delimiter=": ">
+              <text term="in" text-case="capitalize-first"/>
+              <text macro="editor"/>
+            </group>
             <text variable="container-title" font-style="italic"/>
+            <group delimiter=":">
+              <text macro="publisher"/>
+              <text variable="page"/>
+            </group>
           </group>
-          <text macro="publisher"/>
-          <text variable="page"/>
         </else-if>
         <else>
-          <text macro="title"/>
-          <text variable="container-title" suffix=" " prefix=". " form="short" font-style="italic"/>
-          <text macro="date" suffix=";"/>
+          <group delimiter=". ">
+            <text macro="title"/>
+            <text variable="container-title" form="short" strip-periods="true" font-style="italic"/>
+            <text macro="date" suffix=";"/>
+          </group>
           <group suffix=".">
             <text variable="volume"/>
             <text variable="issue" prefix="(" suffix=")"/>
diff --git a/buildres/csl/csl-styles/the-quarterly-journal-of-economics.csl b/buildres/csl/csl-styles/the-quarterly-journal-of-economics.csl
index a7951a22647..479752f450c 100644
--- a/buildres/csl/csl-styles/the-quarterly-journal-of-economics.csl
+++ b/buildres/csl/csl-styles/the-quarterly-journal-of-economics.csl
@@ -39,7 +39,7 @@
   </macro>
   <macro name="author">
     <names variable="author">
-      <name and="text" delimiter-precedes-last="always" name-as-sort-order="all"/>
+      <name and="text" delimiter-precedes-last="always" name-as-sort-order="first"/>
       <label form="short" prefix=", "/>
       <substitute>
         <names variable="editor"/>
@@ -73,7 +73,7 @@
       <text variable="publisher-place"/>
       <text variable="publisher"/>
       <choose>
-        <if type="article-journal" match="none">
+        <if type="book chapter" match="any">
           <text macro="issued-year"/>
         </if>
       </choose>
@@ -105,6 +105,9 @@
       <else-if type="webpage post post-weblog">
         <text variable="URL" prefix="&lt;" suffix="&gt;"/>
       </else-if>
+      <else-if type="article-journal article-magazine article-newspaper book chapter webpage post post-weblog" match="none">
+        <text macro="issued-year"/>
+      </else-if>
     </choose>
   </macro>
   <macro name="citation-locator">
diff --git a/buildres/csl/csl-styles/turabian-fullnote-bibliography.csl b/buildres/csl/csl-styles/turabian-fullnote-bibliography-8th-edition.csl
similarity index 99%
rename from buildres/csl/csl-styles/turabian-fullnote-bibliography.csl
rename to buildres/csl/csl-styles/turabian-fullnote-bibliography-8th-edition.csl
index 6a1c7debbca..db76c0327e5 100644
--- a/buildres/csl/csl-styles/turabian-fullnote-bibliography.csl
+++ b/buildres/csl/csl-styles/turabian-fullnote-bibliography-8th-edition.csl
@@ -2,8 +2,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>Turabian 8th edition (full note)</title>
-    <id>http://www.zotero.org/styles/turabian-fullnote-bibliography</id>
-    <link href="http://www.zotero.org/styles/turabian-fullnote-bibliography" rel="self"/>
+    <id>http://www.zotero.org/styles/turabian-fullnote-bibliography-8th-edition</id>
+    <link href="http://www.zotero.org/styles/turabian-fullnote-bibliography-8th-edition" rel="self"/>
     <link href="http://www.press.uchicago.edu/books/turabian/turabian_citationguide.html" rel="documentation"/>
     <author>
       <name>Elena Razlogova</name>
@@ -18,7 +18,7 @@
     <category citation-format="note"/>
     <category field="history"/>
     <summary>Turabian note style, a variant of Chicago for students</summary>
-    <updated>2012-10-25T21:15:26+00:00</updated>
+    <updated>2021-12-31T11:50: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>
diff --git a/buildres/csl/csl-styles/turcica.csl b/buildres/csl/csl-styles/turcica.csl
new file mode 100644
index 00000000000..b97d1f1d91d
--- /dev/null
+++ b/buildres/csl/csl-styles/turcica.csl
@@ -0,0 +1,163 @@
+<?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">
+  <!-- This style was edited with the Visual CSL Editor (https://editor.citationstyles.org/visualEditor/) -->
+  <info>
+    <title>Turcica</title>
+    <id>http://www.zotero.org/styles/turcica</id>
+    <link href="http://www.zotero.org/styles/turcica" rel="self"/>
+    <link href="https://www.peeters-leuven.be/pdf/Turcica_Instructions_FR.pdf" rel="documentation"/>
+    <author>
+      <name>Lucas Equinoxe</name>
+      <email>lucas.equinoxe@college-de-france.fr</email>
+    </author>
+    <category citation-format="note"/>
+    <category field="humanities"/>
+    <issn>0082-6847</issn>
+    <eissn>1783-1822</eissn>
+    <updated>2022-09-23T07:46:36+00:00</updated>
+    <rights 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="short-author">
+    <names variable="author" suffix=", ">
+      <name form="short" sort-separator=","/>
+    </names>
+  </macro>
+  <macro name="author">
+    <names variable="author" suffix=", ">
+      <name name-as-sort-order="all" sort-separator=" ">
+        <name-part name="given" prefix="(" suffix=")"/>
+      </name>
+    </names>
+  </macro>
+  <macro name="locators">
+    <group prefix=", " delimiter=" ">
+      <label variable="locator" form="short"/>
+      <text variable="locator"/>
+    </group>
+  </macro>
+  <macro name="collection">
+    <group prefix="(" suffix=") ">
+      <text variable="collection-title"/>
+      <text variable="collection-number" prefix=", "/>
+    </group>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="book" match="any">
+        <text variable="title" form="short" font-style="italic"/>
+      </if>
+      <else>
+        <text variable="title" quotes="true"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="title-short">
+    <choose>
+      <if type="book" match="any">
+        <text variable="title" form="short" font-style="italic"/>
+      </if>
+      <else>
+        <text variable="title" form="short" quotes="true"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="year-date">
+    <date variable="issued" form="numeric" date-parts="year"/>
+  </macro>
+  <macro name="translator">
+    <names variable="translator">
+      <name name-as-sort-order="all" sort-separator=" ">
+        <name-part name="given" prefix="(" suffix=")"/>
+      </name>
+      <label form="short" prefix=" "/>
+    </names>
+  </macro>
+  <macro name="page-bibliography">
+    <choose>
+      <if type="article article-journal article-magazine article-newspaper chapter" match="any">
+        <text variable="page" prefix="p. "/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="Title-bibliography">
+    <choose>
+      <if type="chapter" match="all">
+        <group>
+          <text term="in" font-style="italic" prefix=", " suffix=" "/>
+          <group>
+            <names variable="editor">
+              <name name-as-sort-order="all" sort-separator=" ">
+                <name-part name="given" prefix="(" suffix=")"/>
+              </name>
+              <label form="short" prefix=" " suffix=", "/>
+            </names>
+            <group>
+              <text variable="container-title" font-style="italic" suffix=", "/>
+              <text variable="publisher-place" suffix=", "/>
+              <text variable="publisher" suffix=", "/>
+            </group>
+          </group>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="publisher-place">
+    <choose>
+      <if type="book" match="any">
+        <text variable="publisher-place"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <choose>
+      <if type="book" match="any">
+        <text variable="publisher" form="short" suffix=", "/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="container-title">
+    <choose>
+      <if type="article article-journal article-magazine article-newspaper" match="any">
+        <text variable="container-title" font-style="italic" prefix=", " suffix=" "/>
+        <text variable="volume" form="short" suffix=" "/>
+        <date date-parts="year" form="text" variable="issued" prefix="(" suffix="), "/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="URL">
+    <choose>
+      <if match="any" variable="URL">
+        <text variable="URL" prefix=" URL : " suffix="."/>
+      </if>
+      <else-if match="none" variable="URL">
+        <text variable="DOI" prefix=" DOI : " suffix="."/>
+      </else-if>
+    </choose>
+  </macro>
+  <citation>
+    <layout delimiter="; " suffix=".">
+      <text macro="short-author"/>
+      <text macro="title-short"/>
+      <text macro="locators"/>
+    </layout>
+  </citation>
+  <bibliography>
+    <sort>
+      <key macro="author"/>
+      <key variable="issued"/>
+    </sort>
+    <layout>
+      <text macro="author"/>
+      <text macro="title"/>
+      <text macro="container-title"/>
+      <text macro="Title-bibliography"/>
+      <text macro="translator"/>
+      <text macro="publisher-place" suffix=", "/>
+      <text macro="publisher"/>
+      <text macro="year-date"/>
+      <text macro="collection"/>
+      <text macro="page-bibliography" suffix="."/>
+      <text macro="URL"/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/csl/csl-styles/ucl-university-college-apa.csl b/buildres/csl/csl-styles/ucl-university-college-apa.csl
index 7f514e6fbfb..532675eba82 100644
--- a/buildres/csl/csl-styles/ucl-university-college-apa.csl
+++ b/buildres/csl/csl-styles/ucl-university-college-apa.csl
@@ -30,8 +30,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
   -->
@@ -99,7 +99,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=", ">
@@ -180,7 +180,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>
@@ -213,9 +213,6 @@
       </else>
     </choose>
   </macro>
-  <macro name="date-sort-date">
-    <date variable="issued" form="numeric"/>
-  </macro>
   <macro name="date-intext">
     <choose>
       <if variable="issued">
@@ -241,7 +238,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>
@@ -1006,7 +1003,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>
@@ -1286,7 +1283,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"/>
@@ -1566,7 +1563,7 @@
     <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 macro="date-bib" sort="ascending"/>
       <key variable="status"/>
     </sort>
     <layout prefix="(" suffix=")" delimiter="; ">
@@ -1582,7 +1579,7 @@
     <sort>
       <key macro="author-bib"/>
       <key macro="date-sort-group"/>
-      <key macro="date-sort-date" sort="ascending"/>
+      <key macro="date-bib" sort="ascending"/>
       <key variable="status"/>
       <key macro="title"/>
     </sort>
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 a361dab0b1c..f63961767b4 100644
--- a/buildres/csl/csl-styles/united-states-international-trade-commission.csl
+++ b/buildres/csl/csl-styles/united-states-international-trade-commission.csl
@@ -24,10 +24,14 @@
       <name>Peg Hausman</name>
       <email>Margaret.Hausman@usitc.gov</email>
     </contributor>
+    <contributor>
+      <name>Brian Rose</name>
+      <email>Brian.Rose@usitc.gov</email>
+    </contributor>
     <category citation-format="note"/>
     <category field="generic-base"/>
     <summary>A bibliographical style file for the United States International Trade Commission</summary>
-    <updated>2022-08-17T18:21:43+00:00</updated>
+    <updated>2023-05-10T12:30: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>
   <locale xml:lang="en">
@@ -126,9 +130,12 @@
   <macro name="contributors-note">
     <group delimiter=" ">
       <choose>
-        <if match="any" variable="note">
-          <text variable="note"/>
+        <if match="all" variable="note" type="speech">
+          <text value="Warning: the 'extra' field does not populate correctly with presentation citation item types. Please edit this citation item in the Zotero app to resolve. A manual overwrite may be needed for abbreviated names." strip-periods="false" font-weight="normal"/>
         </if>
+        <else-if match="any" variable="note">
+          <text variable="note"/>
+        </else-if>
         <else-if type="webpage" match="any"/>
         <else-if type="article-magazine" match="all">
           <choose>
@@ -146,8 +153,19 @@
             </else>
           </choose>
         </else-if>
+        <else-if type="broadcast motion_picture" match="any">
+          <names variable="director">
+            <name form="short" delimiter=", " and="text" sort-separator=" "/>
+          </names>
+          <text variable="volume"/>
+        </else-if>
+        <else-if type="speech" match="any">
+          <names variable="author contributor" delimiter=", ">
+            <name/>
+          </names>
+        </else-if>
         <else>
-          <names variable="author">
+          <names variable="author contributor">
             <name form="short" and="text" sort-separator=""/>
             <label form="short" prefix=", "/>
             <substitute>
@@ -209,8 +227,18 @@
             </else>
           </choose>
         </if>
+        <else-if type="motion_picture" match="any">
+          <names variable="director">
+            <name and="text" delimiter-precedes-last="always" name-as-sort-order="first"/>
+          </names>
+        </else-if>
+        <else-if type="broadcast" match="any">
+          <names variable="director">
+            <name and="text" delimiter-precedes-last="always" name-as-sort-order="first"/>
+          </names>
+        </else-if>
         <else>
-          <names variable="author">
+          <names variable="author contributor">
             <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
             <substitute>
               <text macro="editor"/>
@@ -239,8 +267,7 @@
   </macro>
   <macro name="interviewer-note">
     <names variable="interviewer" delimiter=", ">
-      <label form="verb" text-case="lowercase" suffix=" "/>
-      <name and="text" delimiter=", "/>
+      <name prefix="by " and="text"/>
     </names>
   </macro>
   <macro name="interviewer">
@@ -260,24 +287,10 @@
             <text variable="genre"/>
           </if>
           <else-if type="legislation bill" match="any">
-            <choose>
-              <if match="any" variable="title-short">
-                <text variable="title-short" text-case="title"/>
-              </if>
-              <else>
-                <text variable="title"/>
-              </else>
-            </choose>
+            <text variable="title" form="short"/>
           </else-if>
           <else-if type="book graphic map song" match="any">
-            <choose>
-              <if match="any" variable="title-short">
-                <text variable="title-short" text-case="title" suffix=","/>
-              </if>
-              <else>
-                <text variable="title" form="short" text-case="title" font-style="italic"/>
-              </else>
-            </choose>
+            <text variable="title" form="short" text-case="title" font-style="italic"/>
             <group>
               <text term="version"/>
               <text variable="version"/>
@@ -290,77 +303,56 @@
             <text variable="title" text-case="title" font-style="italic" prefix="review of "/>
           </else-if>
           <else-if type="webpage" match="all">
-            <choose>
-              <if match="any" variable="title-short">
-                <text variable="title-short" text-case="title" quotes="true"/>
-              </if>
-              <else>
-                <text variable="title" form="short" text-case="title" quotes="true"/>
-              </else>
-            </choose>
+            <text variable="title" form="short" text-case="title" quotes="true"/>
           </else-if>
           <else-if type="motion_picture" match="any">
             <group>
-              <choose>
-                <if match="any" variable="title-short">
-                  <text variable="title-short" text-case="title"/>
-                  <date form="text" variable="issued" prefix=", "/>
-                </if>
-                <else>
-                  <text variable="title" text-case="title" quotes="true"/>
-                  <date form="text" variable="issued" prefix=", "/>
-                </else>
-              </choose>
+              <text variable="title" form="short" text-case="title" quotes="true"/>
+              <date form="text" variable="issued" prefix=", "/>
             </group>
           </else-if>
           <else-if type="report" match="any">
-            <choose>
-              <if match="any" variable="title-short">
-                <text variable="title-short" text-case="title" font-style="italic"/>
-              </if>
-              <else>
-                <text variable="title" text-case="title" font-style="italic"/>
-              </else>
-            </choose>
+            <text variable="title" form="short" text-case="title" font-style="italic"/>
+          </else-if>
+          <else-if type="software dataset" match="any">
+            <text variable="title" form="short"/>
+          </else-if>
+          <else-if type="speech" match="any"/>
+          <else-if type="hearing" match="any">
+            <text variable="title" form="short"/>
           </else-if>
           <else>
-            <choose>
-              <if match="any" variable="title-short">
-                <text variable="title-short" form="short" text-case="title" quotes="true"/>
-              </if>
-              <else>
-                <text variable="title" form="short" text-case="title" quotes="true"/>
-              </else>
-            </choose>
+            <text variable="title" form="short" text-case="title" quotes="true"/>
           </else>
         </choose>
       </else-if>
       <else-if type="legislation bill" match="any">
-        <choose>
-          <if match="any" variable="title-short">
-            <text variable="title" form="short" text-case="title"/>
-          </if>
-          <else>
-            <text variable="title"/>
-          </else>
-        </choose>
+        <text variable="title" form="short"/>
       </else-if>
       <else-if type="book graphic map song" match="any">
         <choose>
-          <if match="any" variable="title-short">
-            <text variable="title-short" form="short" text-case="title" quotes="false" font-style="italic" suffix=","/>
+          <if match="any" variable="version">
+            <group delimiter=" " prefix=", ">
+              <text term="version"/>
+              <text variable="version"/>
+            </group>
+            <text variable="title" form="short" text-case="title" font-style="italic"/>
           </if>
+          <else-if match="any" variable="volume">
+            <group delimiter="; ">
+              <text variable="volume" font-style="italic"/>
+            </group>
+          </else-if>
           <else>
-            <text variable="title" form="short" text-case="title" quotes="false" font-style="italic"/>
+            <text variable="title" form="short" font-style="italic"/>
           </else>
         </choose>
-        <group delimiter=" " prefix=", ">
-          <text term="version"/>
-          <text variable="version"/>
-        </group>
       </else-if>
       <else-if type="interview patent" match="any">
-        <text variable="title" text-case="title"/>
+        <group delimiter=" ">
+          <text variable="title" form="short"/>
+          <text macro="interviewer-note"/>
+        </group>
       </else-if>
       <else-if variable="reviewed-author">
         <text variable="title" text-case="title" font-style="italic" prefix="review of "/>
@@ -371,108 +363,110 @@
         </names>
         <text variable="title" form="short" text-case="title" quotes="true"/>
       </else-if>
-      <else-if type="webpage" match="any"/>
+      <else-if type="post-weblog" match="all" variable="author">
+        <text variable="title" form="short" text-case="title" quotes="true"/>
+      </else-if>
+      <else-if type="webpage post-weblog" match="any"/>
       <else-if type="article" match="any"/>
       <else-if type="motion_picture" match="any">
         <group>
-          <choose>
-            <if match="any" variable="title-short">
-              <text variable="title-short" text-case="title"/>
-            </if>
-            <else>
-              <text variable="title" text-case="title" quotes="true"/>
-            </else>
-          </choose>
+          <text variable="title" form="short" text-case="title" quotes="true"/>
         </group>
       </else-if>
       <else-if type="report" match="any">
-        <choose>
-          <if match="any" variable="title-short">
-            <text variable="title-short" text-case="title" font-style="italic"/>
-          </if>
-          <else>
-            <text variable="title" text-case="title" font-style="italic"/>
-          </else>
-        </choose>
+        <text variable="title" form="short" text-case="title" font-style="italic"/>
       </else-if>
       <else-if type="legal_case" match="any">
         <text variable="title" form="short" font-style="italic"/>
       </else-if>
-      <else>
-        <choose>
-          <if match="any" variable="title-short">
-            <text variable="title-short" form="short" text-case="title" quotes="true"/>
-          </if>
-          <else>
-            <text variable="title" form="short" text-case="title" quotes="true"/>
-          </else>
-        </choose>
-      </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="book graphic song" match="any">
-        <text variable="title" text-case="title" quotes="false" font-style="italic"/>
-        <group prefix=" (" suffix=")" delimiter=" ">
-          <text term="version"/>
-          <text variable="version"/>
-        </group>
-      </else-if>
-      <else-if variable="reviewed-author">
-        <group delimiter=", ">
-          <text variable="title" 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-if>
-      <else-if type="bill legislation interview patent" match="any">
-        <text variable="title" text-case="title"/>
-      </else-if>
-      <else-if type="motion_picture" match="all">
-        <choose>
-          <if match="any" variable="issued">
-            <group delimiter=". ">
-              <text variable="title" text-case="title" quotes="true"/>
-              <text variable="dimensions" prefix="Video, "/>
-            </group>
-          </if>
-          <else-if match="any" variable="accessed">
-            <group>
-              <text variable="title" text-case="title" quotes="true" suffix=","/>
-              <date form="text" variable="accessed" prefix=" accessed " suffix=". "/>
-              <text variable="dimensions" prefix="Video, "/>
-            </group>
-          </else-if>
-          <else>
-            <text variable="title" text-case="title"/>
-          </else>
-        </choose>
-      </else-if>
-      <else-if type="report" match="any">
-        <text variable="title" text-case="title" font-style="italic"/>
+      <else-if type="software personal_communication dataset" match="any">
+        <text variable="title" form="short"/>
       </else-if>
-      <else-if type="legal_case" match="any">
-        <text variable="title" font-style="italic"/>
+      <else-if type="speech" match="any">
+        <text variable="title" form="short" quotes="false"/>
+        <date form="text" variable="issued" prefix=", "/>
       </else-if>
       <else>
-        <text variable="title" text-case="title" quotes="true"/>
+        <text variable="title" form="short" text-case="title" quotes="true"/>
       </else>
     </choose>
   </macro>
+  <macro name="title">
+    <group delimiter=". ">
+      <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="book graphic song" match="any">
+          <choose>
+            <if match="any" variable="volume">
+              <group delimiter="; ">
+                <text variable="title" font-style="italic"/>
+                <text variable="volume" font-style="italic"/>
+              </group>
+            </if>
+            <else>
+              <text variable="title" text-case="title" quotes="false" font-style="italic"/>
+              <group prefix=" (" suffix=")" delimiter=" ">
+                <text term="version"/>
+                <text variable="version"/>
+              </group>
+            </else>
+          </choose>
+        </else-if>
+        <else-if variable="reviewed-author">
+          <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-if>
+        <else-if type="bill legislation interview patent" match="any">
+          <text variable="title" text-case="title"/>
+        </else-if>
+        <else-if type="motion_picture" match="all">
+          <choose>
+            <if match="any" variable="issued">
+              <group delimiter=". ">
+                <text variable="title" text-case="title" quotes="true"/>
+                <text variable="dimensions" prefix="Video, "/>
+              </group>
+            </if>
+            <else-if match="any" variable="accessed">
+              <group>
+                <text variable="title" text-case="title" quotes="true" suffix=","/>
+                <date form="text" variable="accessed" prefix=" accessed " suffix=". "/>
+                <text variable="dimensions" prefix="Video, "/>
+              </group>
+            </else-if>
+            <else>
+              <text variable="title" text-case="title"/>
+            </else>
+          </choose>
+        </else-if>
+        <else-if type="report" match="any">
+          <text variable="title" text-case="title" font-style="italic"/>
+        </else-if>
+        <else-if type="legal_case" match="any">
+          <text variable="title" font-style="italic"/>
+        </else-if>
+        <else-if type="software speech dataset" match="any">
+          <text variable="title"/>
+        </else-if>
+        <else>
+          <text variable="title" text-case="title" quotes="true"/>
+        </else>
+      </choose>
+    </group>
+  </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"/>
@@ -482,6 +476,9 @@
             <text variable="number"/>
           </group>
         </else-if>
+        <else-if type="interview" match="any">
+          <text variable="medium"/>
+        </else-if>
       </choose>
       <choose>
         <if type="map">
@@ -531,9 +528,13 @@
       </choose>
       <choose>
         <if type="webpage" variable="author"/>
-        <else-if type="webpage" match="any">
+        <else-if type="post-weblog" match="all" variable="author"/>
+        <else-if type="webpage post-weblog" match="any">
           <text variable="container-title" suffix=","/>
-          <text variable="title" text-case="title" quotes="true"/>
+          <text variable="title" form="short" text-case="title" quotes="true"/>
+        </else-if>
+        <else-if type="broadcast" match="any">
+          <text variable="container-title" form="short" font-style="normal"/>
         </else-if>
         <else-if type="bill legislation legal_case" match="none"/>
       </choose>
@@ -573,12 +574,20 @@
     <choose>
       <if match="none" type="article-journal">
         <choose>
-          <if match="none" is-numeric="collection-number">
+          <if match="none" is-numeric="collection-number" type="software dataset">
             <group delimiter=", ">
               <text variable="collection-title" text-case="title"/>
               <text variable="collection-number"/>
             </group>
           </if>
+          <else-if type="software" match="any">
+            <group>
+              <text variable="collection-title" text-case="capitalize-first" quotes="true"/>
+            </group>
+          </else-if>
+          <else-if type="dataset" match="any">
+            <text variable="number" quotes="true"/>
+          </else-if>
           <else>
             <group delimiter=" ">
               <text variable="collection-title" text-case="title"/>
@@ -681,15 +690,11 @@
           <else>
             <group delimiter=", ">
               <text macro="edition-note"/>
-              <group delimiter=" ">
-                <text term="volume" form="short"/>
-                <number variable="volume" form="numeric"/>
-              </group>
               <choose>
                 <if variable="locator" match="none">
                   <group delimiter=" ">
+                    <text term="volume" form="short" text-case="lowercase"/>
                     <number variable="number-of-volumes" form="numeric"/>
-                    <text term="volume" form="short" plural="true"/>
                   </group>
                 </if>
               </choose>
@@ -804,12 +809,8 @@
         <group delimiter=". ">
           <text macro="edition"/>
           <group delimiter=" ">
-            <text term="volume" form="short" text-case="capitalize-first"/>
-            <number variable="volume" form="numeric"/>
-          </group>
-          <group delimiter=" ">
+            <text term="volume" form="short" text-case="title"/>
             <number variable="number-of-volumes" form="numeric"/>
-            <text term="volume" form="short" plural="true"/>
           </group>
         </group>
       </else-if>
@@ -978,6 +979,7 @@
               <date form="text" date-parts="year-month-day" variable="issued"/>
             </group>
           </else-if>
+          <else-if type="software" match="any"/>
           <else>
             <choose>
               <if is-uncertain-date="issued">
@@ -994,6 +996,7 @@
         <text variable="status"/>
       </else-if>
       <else-if variable="accessed URL" match="all"/>
+      <else-if type="software dataset" match="any"/>
       <else>
         <text term="no date" form="short"/>
       </else>
@@ -1028,9 +1031,7 @@
     <choose>
       <if variable="locator" match="none">
         <choose>
-          <if type="article-journal chapter paper-conference" match="any">
-            <text variable="page"/>
-          </if>
+          <if type="article-journal chapter paper-conference" match="any"/>
         </choose>
       </if>
       <else-if type="article-journal">
@@ -1065,7 +1066,6 @@
             <choose>
               <if variable="page">
                 <text variable="volume" suffix=":"/>
-                <text variable="page"/>
               </if>
             </choose>
           </else>
@@ -1180,9 +1180,6 @@
       <if type="bill legislation legal_case" match="any">
         <text macro="issued-note"/>
       </if>
-      <else-if type="speech" match="any">
-        <date form="text" date-parts="year-month-day" variable="issued"/>
-      </else-if>
       <else-if type="article-journal">
         <choose>
           <if variable="volume issue" match="any">
@@ -1196,7 +1193,7 @@
       <else-if type="article-newspaper">
         <text macro="issued-note"/>
       </else-if>
-      <else-if type="manuscript thesis speech" match="any">
+      <else-if type="manuscript thesis" match="any">
         <group delimiter=", ">
           <choose>
             <if variable="title" match="any"/>
@@ -1348,7 +1345,7 @@
         </else-if>
       </choose>
       <choose>
-        <if variable="issued" match="none" type="legislation">
+        <if variable="issued" match="none" type="legislation software">
           <group font-variant="normal" delimiter=" ">
             <text term="accessed" text-case="lowercase"/>
             <date variable="accessed" form="text"/>
@@ -1357,6 +1354,21 @@
         <else-if type="motion_picture" match="all" is-uncertain-date="accessed">
           <date form="text" date-parts="year-month-day" variable="issued"/>
         </else-if>
+        <else-if type="software" match="all">
+          <group>
+            <choose>
+              <if match="any" variable="issued"/>
+              <else-if match="any" variable="accessed">
+                <text term="accessed" suffix=" "/>
+                <date form="text" variable="accessed"/>
+              </else-if>
+              <else>
+                <text value="accessed" suffix=" "/>
+                <date form="text" date-parts="year-month-day" variable="issued"/>
+              </else>
+            </choose>
+          </group>
+        </else-if>
       </choose>
       <choose>
         <if type="legislation" match="any">
@@ -1366,6 +1378,9 @@
           </group>
         </if>
         <else-if type="legal_case" match="none"/>
+        <else-if type="software" match="any">
+          <date form="text" date-parts="year-month-day" variable="issued"/>
+        </else-if>
       </choose>
     </group>
   </macro>
@@ -1380,7 +1395,7 @@
         </else-if>
       </choose>
       <choose>
-        <if variable="issued" match="none" type="legislation motion_picture">
+        <if variable="issued" match="none" type="legislation motion_picture software">
           <group delimiter=" " suffix=".">
             <text term="accessed" text-case="title"/>
             <date form="text" variable="accessed"/>
@@ -1393,6 +1408,22 @@
             <if variable="DOI">
               <text variable="DOI" prefix="https://doi.org/"/>
             </if>
+            <else-if type="software" match="any">
+              <group>
+                <choose>
+                  <if match="any" variable="issued">
+                    <date form="text" variable="issued"/>
+                  </if>
+                  <else-if match="any" variable="accessed">
+                    <date form="text" variable="accessed" prefix="Accessed "/>
+                  </else-if>
+                  <else>
+                    <text value="(accessed various dates)"/>
+                  </else>
+                </choose>
+              </group>
+              <text variable="URL"/>
+            </else-if>
             <else>
               <text variable="URL"/>
             </else>
@@ -1414,12 +1445,27 @@
   </macro>
   <macro name="editor-note">
     <names variable="editor">
-      <name form="short" and="text" delimiter-precedes-last="always" name-as-sort-order="first"/>
+      <name form="short" and="text" et-al-min="4" et-al-use-first="1" name-as-sort-order="first"/>
     </names>
   </macro>
   <macro name="collection-title-note">
     <choose>
       <if type="article-journal report book" match="any"/>
+      <else-if type="chapter" match="any">
+        <group prefix="in ">
+          <text variable="container-title" font-style="italic"/>
+        </group>
+      </else-if>
+      <else-if type="paper-conference" match="any"/>
+      <else-if type="software" match="any">
+        <group>
+          <text variable="collection-title" quotes="true"/>
+          <text variable="collection-number"/>
+        </group>
+      </else-if>
+      <else-if type="dataset" match="any">
+        <text variable="number"/>
+      </else-if>
       <else>
         <choose>
           <if match="none" is-numeric="collection-number">
@@ -1455,7 +1501,7 @@
               </choose>
             </group>
           </if>
-          <else-if type="article book bill chapter motion_picture paper-conference song thesis" match="any">
+          <else-if type="article book bill chapter paper-conference song thesis motion_picture" match="any">
             <choose>
               <if match="all" is-uncertain-date="issued">
                 <date form="text" date-parts="year-month-day" variable="issued"/>
@@ -1502,6 +1548,8 @@
               <if match="all" is-uncertain-date="issued">
                 <date form="text" variable="issued" prefix="[" suffix="?]"/>
               </if>
+              <else-if type="speech" match="any"/>
+              <else-if type="motion_picture" match="any"/>
               <else>
                 <date form="text" date-parts="year-month-day" variable="issued"/>
               </else>
@@ -1514,6 +1562,9 @@
       </else-if>
       <else-if match="all" variable="accessed URL"/>
       <else-if type="legislation" match="any"/>
+      <else-if type="software dataset" match="any">
+        <date form="text" date-parts="year-month-day" variable="issued"/>
+      </else-if>
       <else>
         <text term="no date"/>
       </else>
@@ -1546,9 +1597,9 @@
               </group>
               <text macro="issue-note-join-with-space"/>
             </group>
-            <text macro="point-locators-join-with-comma"/>
           </group>
           <text macro="point-locators-join-with-colon"/>
+          <text macro="point-locators-join-with-comma"/>
         </group>
         <text macro="access-note"/>
       </group>
@@ -1564,60 +1615,120 @@
     <layout suffix=".">
       <group delimiter=". ">
         <group delimiter=": ">
-          <group delimiter=", ">
-            <group delimiter=". ">
+          <choose>
+            <if type="webpage post-weblog personal_communication dataset" match="any">
               <group delimiter=". ">
-                <group delimiter=" ">
-                  <group delimiter=", ">
-                    <choose>
-                      <if type="report" match="any">
-                        <group delimiter=", ">
-                          <group delimiter=". ">
-                            <text macro="contributors"/>
-                            <text macro="title"/>
-                            <text macro="issue-map-graphic"/>
-                          </group>
-                          <text macro="description" text-case="capitalize-first"/>
-                          <text macro="secondary-contributors"/>
-                          <group delimiter=", ">
-                            <text macro="container-title"/>
-                            <text macro="container-contributors"/>
-                            <text macro="locators-chapter"/>
-                          </group>
-                          <text macro="locators-join-with-period"/>
-                        </group>
-                      </if>
-                      <else>
-                        <group delimiter=". ">
-                          <group delimiter=". ">
-                            <text macro="contributors"/>
-                            <text macro="title"/>
-                            <text macro="issue-map-graphic"/>
-                          </group>
-                          <text macro="description"/>
-                          <text macro="secondary-contributors"/>
-                          <group delimiter=", ">
-                            <text macro="container-title"/>
-                            <text macro="container-contributors"/>
-                            <text macro="locators-chapter"/>
-                          </group>
-                          <text macro="locators-join-with-period"/>
-                        </group>
-                      </else>
-                    </choose>
-                    <text macro="locators-join-with-comma"/>
+                <group delimiter=". ">
+                  <group delimiter=". ">
+                    <group delimiter=" ">
+                      <group delimiter=", ">
+                        <choose>
+                          <if type="report" match="any">
+                            <group delimiter=". ">
+                              <group delimiter=". ">
+                                <text macro="contributors"/>
+                                <text macro="title"/>
+                                <text macro="issue-map-graphic"/>
+                              </group>
+                              <text macro="description" text-case="capitalize-first"/>
+                              <text macro="secondary-contributors"/>
+                              <group delimiter=", ">
+                                <text macro="container-title"/>
+                                <text macro="container-contributors"/>
+                                <text macro="locators-chapter"/>
+                              </group>
+                              <text macro="locators-join-with-period"/>
+                            </group>
+                          </if>
+                          <else>
+                            <group delimiter=". ">
+                              <group delimiter=". ">
+                                <text macro="contributors"/>
+                                <text macro="title"/>
+                                <text macro="issue-map-graphic"/>
+                              </group>
+                              <text macro="description"/>
+                              <text macro="secondary-contributors"/>
+                              <group delimiter=", ">
+                                <text macro="container-title"/>
+                                <text macro="container-contributors"/>
+                                <text macro="locators-chapter"/>
+                              </group>
+                              <text macro="locators-join-with-period"/>
+                            </group>
+                          </else>
+                        </choose>
+                        <text macro="locators-join-with-comma"/>
+                      </group>
+                      <text macro="locators-join-with-space"/>
+                    </group>
+                    <text macro="collection-title"/>
+                    <text macro="issue-join-with-period"/>
                   </group>
-                  <text macro="locators-join-with-space"/>
+                  <text macro="issue-join-with-space"/>
                 </group>
-                <text macro="collection-title"/>
-                <text macro="issue-join-with-period"/>
+                <text macro="issue-join-with-comma"/>
+                <text macro="locators-journal-join-with-comma"/>
+                <text macro="locators-newspaper"/>
               </group>
-              <text macro="issue-join-with-space"/>
-            </group>
-            <text macro="issue-join-with-comma"/>
-            <text macro="locators-journal-join-with-comma"/>
-            <text macro="locators-newspaper"/>
-          </group>
+            </if>
+            <else>
+              <group delimiter=", ">
+                <group delimiter=". ">
+                  <group delimiter=". ">
+                    <group delimiter=" ">
+                      <group delimiter=", ">
+                        <choose>
+                          <if type="report" match="any">
+                            <group delimiter=". ">
+                              <group delimiter=". ">
+                                <text macro="contributors"/>
+                                <text macro="title"/>
+                                <text macro="issue-map-graphic"/>
+                              </group>
+                              <text macro="description" text-case="capitalize-first"/>
+                              <text macro="secondary-contributors"/>
+                              <group delimiter=", ">
+                                <text macro="container-title"/>
+                                <text macro="container-contributors"/>
+                                <text macro="locators-chapter"/>
+                              </group>
+                              <text macro="locators-join-with-period"/>
+                            </group>
+                          </if>
+                          <else>
+                            <group delimiter=". ">
+                              <group delimiter=". ">
+                                <text macro="contributors"/>
+                                <text macro="title"/>
+                                <text macro="issue-map-graphic"/>
+                              </group>
+                              <text macro="description"/>
+                              <text macro="secondary-contributors"/>
+                              <group delimiter=", ">
+                                <text macro="container-title"/>
+                                <text macro="container-contributors"/>
+                                <text macro="locators-chapter"/>
+                              </group>
+                              <text macro="locators-join-with-period"/>
+                            </group>
+                          </else>
+                        </choose>
+                        <text macro="locators-join-with-comma"/>
+                      </group>
+                      <text macro="locators-join-with-space"/>
+                    </group>
+                    <text macro="collection-title"/>
+                    <text macro="issue-join-with-period"/>
+                  </group>
+                  <text macro="issue-join-with-space"/>
+                </group>
+                <text macro="issue-join-with-comma"/>
+                <text macro="locators-journal-join-with-comma"/>
+                <text macro="locators-newspaper"/>
+              </group>
+            </else>
+          </choose>
           <text macro="locators-journal-join-with-colon"/>
         </group>
         <text macro="access"/>
diff --git a/buildres/csl/csl-styles/universitat-basel-iberoromanistik.csl b/buildres/csl/csl-styles/universitat-basel-iberoromanistik.csl
index 1f62279ec14..1129be4510a 100644
--- a/buildres/csl/csl-styles/universitat-basel-iberoromanistik.csl
+++ b/buildres/csl/csl-styles/universitat-basel-iberoromanistik.csl
@@ -5,7 +5,7 @@
     <id>http://www.zotero.org/styles/universitat-basel-iberoromanistik</id>
     <link href="http://www.zotero.org/styles/universitat-basel-iberoromanistik" rel="self"/>
     <link href="http://www.zotero.org/styles/universitat-bremen-institut-fur-politikwissenschaft" rel="template"/>
-    <link href="https://iberoromanistik.philhist.unibas.ch/fileadmin/user_upload/iberoromanistik/pdf-Dokumente/documentos_download/Normas_trabajos_escritos_7a_ed_2018.pdf" rel="documentation"/>
+    <link href="https://iberoromanistik.philhist.unibas.ch/fileadmin/user_upload/iberoromanistik/pdf-Dokumente/documentos_download/Normas_trabajos_escritos_8a_ed_2023.pdf" rel="documentation"/>
     <author>
       <name>Patrick O'Brien, PhD</name>
     </author>
@@ -13,7 +13,7 @@
     <category field="linguistics"/>
     <category field="humanities"/>
     <summary>Citation style as per the guidelines from the 7th edition, Oct 2018.</summary>
-    <updated>2021-02-09T11:21:54+00:00</updated>
+    <updated>2023-06-26T09:54: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="es">
@@ -74,7 +74,10 @@
   </macro>
   <macro name="access">
     <choose>
-      <if type="webpage post-weblog" match="any">
+      <if match="any" variable="DOI">
+        <text variable="DOI" prefix="https://doi.org/"/>
+      </if>
+      <else>
         <group delimiter=" ">
           <text variable="URL"/>
           <group delimiter=": " prefix="[" suffix="]">
@@ -82,7 +85,7 @@
             <date form="text" variable="accessed"/>
           </group>
         </group>
-      </if>
+      </else>
     </choose>
   </macro>
   <macro name="title">
@@ -142,17 +145,10 @@
   <macro name="locator">
     <choose>
       <if type="article-journal">
-        <choose>
-          <if variable="volume" match="none">
-            <text variable="DOI" prefix="DOI: "/>
-          </if>
-          <else>
-            <group delimiter=".">
-              <text variable="volume"/>
-              <text variable="issue"/>
-            </group>
-          </else>
-        </choose>
+        <group delimiter=".">
+          <text variable="volume"/>
+          <text variable="issue"/>
+        </group>
       </if>
     </choose>
   </macro>
@@ -270,8 +266,8 @@
             <text macro="locator"/>
             <text macro="published-date"/>
             <text macro="pages"/>
+            <text macro="access"/>
           </group>
-          <text macro="access"/>
         </group>
         <text variable="note"/>
       </group>
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 ae3ec2afa17..ec26af6f39f 100644
--- a/buildres/csl/csl-styles/universitat-bern-institut-fur-sozialanthropologie.csl
+++ b/buildres/csl/csl-styles/universitat-bern-institut-fur-sozialanthropologie.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="4" et-al-use-first="1" page-range-format="expanded" demote-non-dropping-particle="never" default-locale="de-CH">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" and="text" page-range-format="expanded" demote-non-dropping-particle="never" default-locale="de-CH">
   <!-- This style was edited with the Visual CSL Editor (https://editor.citationstyles.org/visualEditor/) -->
   <info>
     <title>Universität Bern - Institut für Sozialanthropologie (Deutsch - Schweiz)</title>
@@ -24,6 +24,7 @@
   <locale xml:lang="de-CH">
     <terms>
       <term name="editor" form="symbol">Hg.</term>
+      <term name="et-al">et al.</term>
       <term name="collection-number" form="symbol">Nr.</term>
     </terms>
   </locale>
@@ -32,11 +33,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=", "/>
             <label form="short" prefix=" (" text-case="title" suffix=")"/>
           </names>
           <names variable="editor translator" delimiter=", ">
-            <name and="symbol" name-as-sort-order="first"/>
+            <name name-as-sort-order="first"/>
             <label form="symbol" prefix=" (" suffix=")"/>
           </names>
         </group>
@@ -48,11 +49,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=", "/>
             <label form="short" prefix=", " text-case="title"/>
           </names>
           <names variable="editor translator" delimiter=", ">
-            <name and="symbol" initialize-with=". " delimiter=", "/>
+            <name initialize-with=". " delimiter=", "/>
             <label form="short" prefix=", " text-case="title"/>
           </names>
         </group>
@@ -61,7 +62,7 @@
   </macro>
   <macro name="author">
     <names variable="author">
-      <name and="text" delimiter-precedes-last="never" initialize="false" initialize-with="." name-as-sort-order="first"/>
+      <name delimiter-precedes-last="never" initialize="false" initialize-with="." name-as-sort-order="first"/>
       <label form="symbol" prefix=" (" suffix=")"/>
       <substitute>
         <names variable="editor"/>
@@ -80,7 +81,7 @@
   </macro>
   <macro name="author-short">
     <names variable="author">
-      <name form="short" and="text" initialize-with=". "/>
+      <name form="short" initialize-with=". "/>
       <substitute>
         <names variable="editor"/>
         <choose>
@@ -180,7 +181,7 @@
                 <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=", "/>
+                  <name initialize-with=". " delimiter=", "/>
                 </names>
               </group>
             </group>
@@ -190,7 +191,7 @@
               <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=", "/>
+                <name initialize-with=". " delimiter=", "/>
               </names>
             </group>
           </else>
@@ -590,7 +591,7 @@
       </if>
     </choose>
   </macro>
-  <citation and="text" delimiter-precedes-last="never" et-al-min="4" et-al-use-first="1" disambiguate-add-year-suffix="true" givenname-disambiguation-rule="primary-name" collapse="year-suffix" cite-group-delimiter="; ">
+  <citation delimiter-precedes-last="never" et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" givenname-disambiguation-rule="primary-name" collapse="year-suffix" cite-group-delimiter="; ">
     <sort>
       <key macro="issued-sort"/>
       <key macro="author"/>
@@ -610,7 +611,7 @@
       <text macro="citation-locator" prefix=": "/>
     </layout>
   </citation>
-  <bibliography et-al-min="4" et-al-use-first="1" et-al-use-last="true" entry-spacing="0" line-spacing="2" hanging-indent="true">
+  <bibliography entry-spacing="0" line-spacing="2" hanging-indent="true">
     <sort>
       <key macro="author"/>
       <key macro="issued-sort" sort="ascending"/>
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 a17324264e4..d9f825d19d3 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
@@ -8,7 +8,7 @@
     <link href="https://documentation-style-csl-ed-droit-ubx.readthedocs.io" rel="documentation"/>
     <author>
       <name>Pierre Gravier</name>
-      <email>pierre.gravier@u-bordeaux.fr</email>
+      <email>pierre.gravier@free.fr</email>
     </author>
     <author>
       <name>Frédérique Flamerie</name>
@@ -16,7 +16,7 @@
     </author>
     <category citation-format="note"/>
     <category field="law"/>
-    <updated>2019-11-07T04:39:48+00:00</updated>
+    <updated>2022-05-09T18:35: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">
@@ -25,7 +25,6 @@
       <term name="ordinal-99">e</term>
       <term name="ordinal-01" gender-form="feminine">re</term>
       <term name="ordinal-01" gender-form="masculine">er</term>
-      <term name="cited">op.&#160;cit.</term>
       <term name="page" form="short">p.</term>
       <term name="online">en&#160;ligne</term>
       <term name="editorial-director" form="short">préf.</term>
@@ -131,17 +130,29 @@
   </macro>
   <!-- Mise en forme des préfaciers-->
   <macro name="preface-author">
-    <names variable="editorial-director">
-      <name and="text" delimiter-precedes-last="never" name-as-sort-order="all" sort-separator=" "/>
-      <label form="short" prefix=" (" suffix=".)"/>
-    </names>
+    <choose>
+      <if type="book chapter" match="any">
+        <group delimiter=" ">
+          <names variable="contributor">
+            <name and="text" delimiter-precedes-last="never" name-as-sort-order="all" sort-separator=" "/>
+          </names>
+          <text term="editorial-director" form="short" prefix=" (" suffix=")"/>
+        </group>
+      </if>
+    </choose>
   </macro>
   <!-- Mise en forme des directeurs de thèse-->
   <macro name="thesis-director">
-    <names variable="director">
-      <name and="text" delimiter-precedes-last="never" name-as-sort-order="all" sort-separator=" "/>
-      <label form="short" prefix=" (" suffix=".)"/>
-    </names>
+    <choose>
+      <if type="thesis" match="any">
+        <group delimiter=" ">
+          <names variable="contributor">
+            <name and="text" delimiter-precedes-last="never" name-as-sort-order="all" sort-separator=" "/>
+          </names>
+          <text term="director" form="short" prefix=" (" suffix=")"/>
+        </group>
+      </if>
+    </choose>
   </macro>
   <!--Mise en forme des titres dans la bibliographie - pour les entretiens oraux inclut l'interviewer et les autres informations concernant l'entretien -->
   <macro name="title">
@@ -678,7 +689,7 @@
             <else>
               <group delimiter=", ">
                 <text macro="author"/>
-                <text term="cited" font-style="italic"/>
+                <text term="op-cit" font-style="italic"/>
                 <text macro="locator"/>
               </group>
             </else>
diff --git a/buildres/csl/csl-styles/universite-du-quebec-a-montreal-etudes-litteraires-et-semiologie.csl b/buildres/csl/csl-styles/universite-du-quebec-a-montreal-etudes-litteraires-et-semiologie.csl
index a94d029dea5..e9c8d17f69d 100644
--- a/buildres/csl/csl-styles/universite-du-quebec-a-montreal-etudes-litteraires-et-semiologie.csl
+++ b/buildres/csl/csl-styles/universite-du-quebec-a-montreal-etudes-litteraires-et-semiologie.csl
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0" and="text" initialize="false" demote-non-dropping-particle="never" default-locale="fr-CA">
-  <!-- This style was edited with the Visual CSL Editor (http://editor.citationstyles.org/visualEditor/) -->
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0" and="text" et-al-min="4" et-al-use-first="1" initialize="false" default-locale="fr-CA">
   <info>
     <title>Université du Québec à Montréal - Études littéraires et sémiologie (Français - Canada)</title>
     <title-short>UQAM - litterature</title-short>
     <id>http://www.zotero.org/styles/universite-du-quebec-a-montreal-etudes-litteraires-et-semiologie</id>
     <link href="http://www.zotero.org/styles/universite-du-quebec-a-montreal-etudes-litteraires-et-semiologie" rel="self"/>
     <link href="http://www.zotero.org/styles/universite-du-quebec-a-montreal" rel="template"/>
-    <link href="https://litterature.uqam.ca/wp-content/uploads/sites/52/prsentation_et_mthodologie_modifi.pdf" rel="documentation"/>
+    <link href="https://litterature.uqam.ca/wp-content/uploads/sites/52/Guide-pre%CC%81sentation-travaux-DEL.pdf" rel="documentation"/>
     <author>
       <name>Jean-Jacques Rondeau</name>
       <email>rondeau.jean-jacques@uqam.ca</email>
@@ -16,7 +15,7 @@
     <category field="humanities"/>
     <category field="literature"/>
     <summary>Ce style est basé sur les règles décrites dans le document « Présentation et méthodologie : Mémoires et thèses en études littéraires et en sémiologie UQAM (novembre 2010) ».</summary>
-    <updated>2018-12-12T21:34:27+00:00</updated>
+    <updated>2023-04-11T21:38: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="fr">
@@ -26,15 +25,17 @@
       <term name="translator" form="verb-short">trad. par</term>
       <term name="translator" form="short">traduction</term>
       <term name="interviewer" form="verb">entretien réalisé par</term>
-      <term name="in">dans&#160;</term>
+      <term name="in">dans</term>
       <term name="edition">édition</term>
       <term name="accessed">consulté le</term>
-      <term name="at">disponible sur&#160;:</term>
       <term name="et-al">et al.</term>
       <term name="ibid" form="short">ibid</term>
       <term name="issue" form="short">nᵒ</term>
       <term name="collection-number" form="short">nᵒ</term>
       <term name="chapter-number" form="short">chap.</term>
+      <term name="circa">vers</term>
+      <term name="translator" form="short">trad.</term>
+      <term name="review-of">compte-rendu de</term>
     </terms>
   </locale>
   <macro name="contributors">
@@ -45,8 +46,8 @@
         </names>
       </if>
       <else>
-        <names variable="author">
-          <name and="text" delimiter-precedes-last="never" initialize="false" name-as-sort-order="all">
+        <names variable="author director container-author" delimiter=", ">
+          <name and="text" delimiter-precedes-last="never" initialize="false" name-as-sort-order="first">
             <name-part name="family"/>
           </name>
           <substitute>
@@ -72,8 +73,8 @@
         </names>
       </if>
       <else>
-        <names variable="author composer">
-          <name and="text" delimiter-precedes-last="never" et-al-min="4" et-al-use-first="3" initialize="false"/>
+        <names variable="author composer director container-author">
+          <name and="text" delimiter-precedes-last="never" initialize="false"/>
           <substitute>
             <choose>
               <if type="webpage">
@@ -95,7 +96,7 @@
         <names variable="composer"/>
       </if>
       <else>
-        <names variable="author editor">
+        <names variable="author editor director container-author">
           <substitute>
             <text macro="title"/>
             <text macro="container-title"/>
@@ -106,14 +107,14 @@
   </macro>
   <macro name="translator">
     <names variable="translator">
-      <label form="verb" suffix=" "/>
-      <name and="text" delimiter-precedes-last="never" initialize="false" sort-separator=" "/>
+      <label form="short" suffix=" "/>
+      <name and="text" delimiter-precedes-last="never" et-al-min="4" et-al-use-first="1" initialize="false" sort-separator=" "/>
     </names>
   </macro>
   <macro name="editor">
     <group>
       <names variable="editor" delimiter=", ">
-        <name and="text" delimiter-precedes-last="never" initialize="false" name-as-sort-order="all">
+        <name and="text" delimiter-precedes-last="never" et-al-min="4" et-al-use-first="1" initialize="false" name-as-sort-order="first">
           <name-part name="family"/>
         </name>
         <label form="short" prefix=" (" suffix=")"/>
@@ -132,35 +133,30 @@
   </macro>
   <macro name="container-contributors">
     <choose>
-      <if variable="editor container-author" match="any">
-        <text term="in" text-case="lowercase"/>
-        <choose>
-          <if variable="container-author">
-            <names variable="container-author">
-              <name and="text" delimiter-precedes-last="never" initialize="false">
-                <name-part name="family"/>
-              </name>
-            </names>
-          </if>
-          <else-if variable="editor">
-            <group>
-              <names variable="editor" delimiter=" ">
-                <name and="text" delimiter-precedes-last="never" initialize="false">
-                  <name-part name="family"/>
-                </name>
-                <label form="short" prefix=" (" suffix=")"/>
-              </names>
-            </group>
-          </else-if>
-        </choose>
+      <if variable="editor" match="any">
+        <text term="in" text-case="lowercase" suffix=" "/>
+        <group>
+          <names variable="editor" delimiter=" ">
+            <name and="text" delimiter-precedes-last="never" et-al-min="4" et-al-use-first="1" initialize="false">
+              <name-part name="family"/>
+            </name>
+            <label form="short" prefix=" (" suffix=")"/>
+          </names>
+        </group>
       </if>
     </choose>
   </macro>
   <macro name="title">
     <choose>
-      <if type="thesis" match="any" variable="container-title">
-        <text variable="title" text-case="capitalize-first" quotes="true" font-style="normal"/>
+      <if type="review-book" match="any">
+        <group delimiter=" " prefix="« " suffix=" »">
+          <text variable="title"/>
+          <text macro="reviewed-title"/>
+        </group>
       </if>
+      <else-if type="thesis" match="any" variable="container-title">
+        <text variable="title" text-case="capitalize-first" quotes="true" font-style="normal"/>
+      </else-if>
       <else>
         <text variable="title" text-case="capitalize-first" quotes="false" font-style="italic"/>
       </else>
@@ -192,10 +188,17 @@
               <text value="s. l."/>
             </if>
             <else>
-              <group delimiter=", ">
-                <text variable="publisher-place"/>
-                <text variable="publisher"/>
-              </group>
+              <choose>
+                <if type="thesis" match="any">
+                  <text variable="publisher"/>
+                </if>
+                <else>
+                  <group delimiter=", ">
+                    <text variable="publisher-place"/>
+                    <text variable="publisher"/>
+                  </group>
+                </else>
+              </choose>
             </else>
           </choose>
         </group>
@@ -250,10 +253,7 @@
         <text variable="collection-title" quotes="true"/>
       </if>
       <else>
-        <group delimiter=", " prefix="coll. ">
-          <text variable="collection-title" text-case="capitalize-first" quotes="true"/>
-          <text variable="collection-number" prefix="nᵒ "/>
-        </group>
+        <text variable="collection-title" text-case="capitalize-first" quotes="true" prefix="coll. "/>
       </else>
     </choose>
   </macro>
@@ -275,6 +275,9 @@
           <text term="edition" form="short"/>
         </group>
       </if>
+      <else-if type="motion_picture" match="any">
+        <date form="text" variable="event-date"/>
+      </else-if>
       <else>
         <text variable="edition"/>
       </else>
@@ -282,7 +285,7 @@
   </macro>
   <macro name="date">
     <choose>
-      <if type="article-journal" match="any">
+      <if type="article-journal review-book" match="any">
         <date variable="issued">
           <date-part name="month" form="long" suffix=" "/>
           <date-part name="year"/>
@@ -292,13 +295,16 @@
         <date form="text" variable="issued"/>
       </else-if>
       <else-if match="any" is-uncertain-date="issued">
-        <date form="text" variable="issued" prefix="[" suffix="?]">
-          <date-part name="year"/>
-        </date>
+        <group delimiter=" " prefix="[" suffix="]">
+          <text term="circa"/>
+          <date form="text" variable="issued">
+            <date-part name="year"/>
+          </date>
+        </group>
       </else-if>
       <else-if match="none" variable="issued">
         <choose>
-          <if type="book" match="any">
+          <if type="book entry-dictionary entry-encyclopedia" match="any">
             <text term="no date" form="short"/>
           </if>
           <else-if type="manuscript" match="any">
@@ -308,12 +314,24 @@
       </else-if>
       <else>
         <group delimiter=" ">
-          <date variable="issued">
-            <date-part name="year"/>
-          </date>
-          <date form="text" variable="original-date" prefix="[" suffix="]">
-            <date-part name="year"/>
-          </date>
+          <choose>
+            <if type="webpage" match="all" variable="edition">
+              <group>
+                <text variable="edition" prefix="mis à jour le "/>
+              </group>
+            </if>
+            <else-if type="webpage" match="any">
+              <date form="text" variable="issued"/>
+            </else-if>
+            <else>
+              <date variable="issued">
+                <date-part name="year"/>
+              </date>
+              <date form="text" variable="original-date" prefix="[" suffix="]">
+                <date-part name="year"/>
+              </date>
+            </else>
+          </choose>
         </group>
       </else>
     </choose>
@@ -337,52 +355,39 @@
   </macro>
   <macro name="page-book">
     <choose>
-      <if match="any" variable="page">
-        <group delimiter=" ">
-          <choose>
-            <if type="thesis" match="any">
-              <text value="f."/>
-            </if>
-            <else>
-              <label variable="page" form="short"/>
-            </else>
-          </choose>
-          <text variable="page"/>
-        </group>
-      </if>
-      <else-if match="any" variable="number-of-pages">
+      <if type="book thesis" match="any">
         <choose>
-          <if match="none" locator="page">
+          <if match="none" variable="locator">
             <choose>
-              <if type="thesis" match="any">
-                <text variable="number-of-pages" suffix=" f."/>
+              <if match="any" variable="number-of-pages">
+                <choose>
+                  <if type="thesis" match="any">
+                    <text variable="number-of-pages" suffix=" f."/>
+                  </if>
+                  <else>
+                    <group delimiter=" ">
+                      <text variable="number-of-pages"/>
+                      <label variable="number-of-pages" form="short"/>
+                    </group>
+                  </else>
+                </choose>
               </if>
               <else>
-                <group delimiter=" ">
-                  <text variable="number-of-pages"/>
-                  <label variable="number-of-pages" form="short"/>
-                </group>
+                <text value="s. p."/>
               </else>
             </choose>
           </if>
         </choose>
-      </else-if>
+      </if>
     </choose>
   </macro>
   <macro name="container-title">
     <choose>
       <if match="none" variable="editor container-author">
-        <choose>
-          <if type="entry-dictionary entry-encyclopedia" match="any">
-            <group>
-              <text term="in"/>
-              <text variable="container-title" font-style="italic"/>
-            </group>
-          </if>
-          <else>
-            <text variable="container-title" font-style="italic"/>
-          </else>
-        </choose>
+        <group>
+          <text term="in" suffix=" "/>
+          <text variable="container-title" font-style="italic"/>
+        </group>
       </if>
     </choose>
   </macro>
@@ -391,7 +396,6 @@
       <if type="motion_picture broadcast song graphic" match="any">
         <group delimiter=", ">
           <text variable="dimensions"/>
-          <text variable="medium"/>
         </group>
       </if>
     </choose>
@@ -410,16 +414,16 @@
     </group>
   </macro>
   <macro name="reviewed-title">
-    <choose>
-      <if type="review-book" match="any">
-        <group delimiter=", ">
-          <text variable="reviewed-title" font-style="italic" prefix="Compte rendu de "/>
-          <names variable="reviewed-author" delimiter=", " prefix="de ">
-            <name and="text" delimiter-precedes-last="never" et-al-min="4" et-al-use-first="3" initialize="false"/>
-          </names>
-        </group>
-      </if>
-    </choose>
+    <group delimiter=" " prefix="[" suffix="]">
+      <text term="review-of"/>
+      <group delimiter=", ">
+        <names variable="reviewed-author" delimiter=", ">
+          <name and="text" delimiter-precedes-last="never" et-al-min="4" et-al-use-first="3" initialize="false"/>
+        </names>
+        <text variable="reviewed-title" font-style="italic"/>
+        <text variable="reviewed-genre"/>
+      </group>
+    </group>
   </macro>
   <macro name="performer">
     <choose>
@@ -457,29 +461,66 @@
       </if>
     </choose>
   </macro>
+  <macro name="container-author-title">
+    <choose>
+      <if match="any" variable="container-author">
+        <group delimiter=" ">
+          <text term="in"/>
+          <text variable="container-title" font-style="italic"/>
+        </group>
+      </if>
+      <else>
+        <choose>
+          <if type="post-weblog motion_picture song entry-dictionary entry-encyclopedia" match="any">
+            <group delimiter=" ">
+              <text term="in"/>
+              <text variable="container-title" font-style="italic"/>
+            </group>
+          </if>
+          <else>
+            <text variable="container-title" font-style="italic"/>
+          </else>
+        </choose>
+      </else>
+    </choose>
+  </macro>
+  <macro name="genre">
+    <choose>
+      <if type="book" match="any">
+        <text variable="genre" prefix="[" suffix="]"/>
+      </if>
+      <else>
+        <text variable="genre"/>
+      </else>
+    </choose>
+  </macro>
   <citation>
     <layout delimiter="; " suffix=".">
       <choose>
         <if position="first">
           <text macro="contributors-notes" font-variant="normal" suffix=", "/>
           <choose>
-            <if type="chapter article-journal article-magazine article-newspaper broadcast entry-encyclopedia entry-dictionary paper-conference post post-weblog review-book song interview" match="any">
+            <if type="chapter article-journal article-magazine article-newspaper broadcast paper-conference post post-weblog review-book song interview motion_picture speech graphic" match="any">
               <group delimiter=", ">
                 <text macro="title"/>
                 <text macro="container-contributors"/>
-                <text variable="container-title" font-style="italic"/>
+                <text macro="container-author-title"/>
                 <text macro="volume-issue" text-case="capitalize-first"/>
                 <text macro="translator" text-case="capitalize-first"/>
                 <text macro="edition"/>
                 <text macro="volume"/>
+                <text variable="medium" prefix="[" suffix="]"/>
                 <text macro="publisher"/>
                 <text macro="collection"/>
                 <text macro="date"/>
                 <text macro="chapter-number"/>
                 <text macro="page-chapter"/>
+                <text macro="description"/>
+                <text macro="online"/>
+                <text macro="access"/>
               </group>
             </if>
-            <else-if type="webpage">
+            <else-if type="webpage entry-dictionary entry-encyclopedia" match="any">
               <group delimiter=", ">
                 <text macro="title" suffix=","/>
                 <text macro="container-contributors"/>
@@ -493,7 +534,7 @@
               <group delimiter=", ">
                 <text macro="title"/>
                 <text macro="version"/>
-                <text variable="genre"/>
+                <text macro="genre"/>
                 <text macro="translator" text-case="capitalize-first"/>
                 <text macro="edition" text-case="capitalize-first"/>
                 <text macro="volume" text-case="capitalize-first"/>
@@ -519,11 +560,7 @@
         <else-if position="subsequent">
           <group delimiter=", ">
             <text macro="contributors-notes" font-variant="normal"/>
-            <choose>
-              <if match="any" disambiguate="true">
-                <text macro="short-title"/>
-              </if>
-            </choose>
+            <text macro="short-title"/>
             <choose>
               <if type="article-journal article-magazine article-newspaper" match="any">
                 <text value="loc. cit." font-style="italic"/>
@@ -531,9 +568,6 @@
               <else-if type="book report thesis chapter entry-encyclopedia entry-dictionary" match="any">
                 <text value="op.&#160;cit." font-style="italic"/>
               </else-if>
-              <else>
-                <text macro="short-title"/>
-              </else>
             </choose>
           </group>
           <text macro="locator"/>
@@ -541,7 +575,7 @@
       </choose>
     </layout>
   </citation>
-  <bibliography delimiter-precedes-last="never" et-al-min="11" et-al-use-first="7" initialize="false" subsequent-author-substitute="&#8212;&#8212;&#8212;" hanging-indent="true">
+  <bibliography delimiter-precedes-last="never" initialize="false" subsequent-author-substitute="&#8212;&#8212;&#8212;" hanging-indent="true">
     <sort>
       <key macro="contributors-sort"/>
       <key variable="issued"/>
@@ -553,13 +587,13 @@
       <group delimiter=", ">
         <text macro="contributors"/>
         <choose>
-          <if type="chapter article-journal article-magazine article-newspaper broadcast entry-encyclopedia entry-dictionary paper-conference post post-weblog review-book song interview" match="any">
+          <if type="chapter article-journal article-magazine article-newspaper broadcast entry-encyclopedia entry-dictionary paper-conference post post-weblog review-book song interview speech motion_picture graphic" match="any">
             <group delimiter=", ">
               <text macro="title"/>
               <text macro="performer"/>
-              <text macro="reviewed-title"/>
               <text macro="container-contributors"/>
-              <text variable="container-title" font-style="italic"/>
+              <text macro="container-author-title"/>
+              <text variable="medium" prefix="[" suffix="]"/>
               <text macro="volume-issue" text-case="capitalize-first"/>
               <text macro="translator" text-case="capitalize-first"/>
               <text macro="edition"/>
@@ -571,7 +605,7 @@
               <text macro="page-chapter"/>
               <text macro="description"/>
               <choose>
-                <if type="post post-weblog" match="any">
+                <if type="post post-weblog review-book speech motion_picture broadcast chapter entry-dictionary entry-encyclopedia article-journal graphic" match="any">
                   <text macro="online"/>
                   <text macro="access"/>
                 </if>
@@ -592,7 +626,7 @@
             <group delimiter=", ">
               <text macro="title"/>
               <text macro="version"/>
-              <text variable="genre"/>
+              <text macro="genre"/>
               <text macro="translator" text-case="capitalize-first"/>
               <text macro="edition" text-case="capitalize-first"/>
               <text macro="volume" text-case="capitalize-first"/>
diff --git a/buildres/csl/csl-styles/university-of-gothenburg-apa-7th-edition-swedish-legislations.csl b/buildres/csl/csl-styles/university-of-gothenburg-apa-7th-edition-swedish-legislations.csl
index 286d38b9a05..bd252cbe262 100644
--- a/buildres/csl/csl-styles/university-of-gothenburg-apa-7th-edition-swedish-legislations.csl
+++ b/buildres/csl/csl-styles/university-of-gothenburg-apa-7th-edition-swedish-legislations.csl
@@ -187,9 +187,6 @@
       </else>
     </choose>
   </macro>
-  <macro name="date-sort-date">
-    <date variable="issued" form="numeric"/>
-  </macro>
   <macro name="date-intext">
     <choose>
       <if variable="issued">
@@ -1213,7 +1210,7 @@
     <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 macro="date-bib" sort="ascending"/>
       <key variable="status"/>
     </sort>
     <layout prefix="(" suffix=")" delimiter="; ">
@@ -1228,7 +1225,7 @@
     <sort>
       <key macro="author-bib"/>
       <key macro="date-sort-group"/>
-      <key macro="date-sort-date" sort="ascending"/>
+      <key macro="date-bib" sort="ascending"/>
       <key variable="status"/>
       <key macro="title"/>
     </sort>
diff --git a/buildres/csl/csl-styles/uppsala-university-library-harvard.csl b/buildres/csl/csl-styles/uppsala-university-library-harvard.csl
new file mode 100644
index 00000000000..484ee338f8e
--- /dev/null
+++ b/buildres/csl/csl-styles/uppsala-university-library-harvard.csl
@@ -0,0 +1,358 @@
+<?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>Uppsala University Library - Harvard</title>
+    <id>http://www.zotero.org/styles/uppsala-university-library-harvard</id>
+    <link href="http://www.zotero.org/styles/uppsala-university-library-harvard" rel="self"/>
+    <link href="http://www.zotero.org/styles/karlstad-universitet-harvard" rel="template"/>
+    <link href="https://libguides-en.ub.uu.se/harvard" rel="documentation"/>
+    <link href="https://libguides.ub.uu.se/harvard" rel="documentation"/>
+    <author>
+      <name>Zandra Flygh</name>
+    </author>
+    <author>
+      <name>Maria Berg Andersson</name>
+    </author>
+    <category citation-format="author-date"/>
+    <category field="generic-base"/>
+    <updated>2023-06-14T11:38: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>
+  </info>
+  <locale xml:lang="sv">
+    <terms>
+      <term name="et-al">m.fl.</term>
+      <term name="page" form="short">s.</term>
+      <term name="number-of-pages" form="short">s.</term>
+      <term name="accessed">Hämtad</term>
+    </terms>
+  </locale>
+  <macro name="author">
+    <choose>
+      <if type="motion_picture broadcast" match="none">
+        <names variable="author">
+          <name and="text" delimiter-precedes-last="never" initialize="false" initialize-with=". " name-as-sort-order="all"/>
+          <label form="short" prefix=" "/>
+          <et-al font-style="italic"/>
+          <substitute>
+            <names variable="editor"/>
+            <names variable="translator"/>
+            <text macro="anon"/>
+          </substitute>
+        </names>
+      </if>
+      <else>
+        <choose>
+          <if variable="container-title">
+            <text variable="container-title" font-style="italic"/>
+          </if>
+          <else>
+            <text variable="title" font-style="italic"/>
+          </else>
+        </choose>
+      </else>
+    </choose>
+    <choose>
+      <if type="article-newspaper entry-dictionary entry-encyclopedia" match="any">
+        <choose>
+          <if variable="author editor" match="none">
+            <text variable="container-title"/>
+          </if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="author-short">
+    <choose>
+      <if type="motion_picture broadcast" match="none">
+        <names variable="author" suffix=",">
+          <name form="short" and="text" delimiter-precedes-last="never" et-al-min="4" et-al-use-first="1" initialize-with=". " name-as-sort-order="all"/>
+          <substitute>
+            <names variable="editor"/>
+            <names variable="translator"/>
+            <text macro="anon"/>
+          </substitute>
+        </names>
+      </if>
+      <else>
+        <choose>
+          <if variable="container-title">
+            <text variable="container-title" font-style="italic"/>
+          </if>
+          <else>
+            <text variable="title" font-style="italic"/>
+          </else>
+        </choose>
+      </else>
+    </choose>
+    <choose>
+      <if type="article-newspaper entry-dictionary entry-encyclopedia" match="any">
+        <choose>
+          <if variable="author editor" match="none">
+            <text variable="container-title"/>
+          </if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="anon">
+    <choose>
+      <if type="motion_picture broadcast article-newspaper entry-dictionary entry-encyclopedia" match="none">
+        <text term="anonymous" form="short" text-case="capitalize-first"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if variable="URL">
+        <choose>
+          <if type="webpage post-weblog" match="any">
+            <group>
+              <text variable="URL"/>
+            </group>
+            <group prefix=" [" suffix="]" delimiter=" ">
+              <text term="accessed" text-case="capitalize-first" suffix=":"/>
+              <date variable="accessed" delimiter="-">
+                <date-part name="year"/>
+                <date-part name="month" form="numeric-leading-zeros" strip-periods="true"/>
+                <date-part name="day" form="numeric-leading-zeros"/>
+              </date>
+            </group>
+          </if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="thesis" match="any">
+        <group delimiter=". ">
+          <text variable="title" font-style="italic"/>
+          <group>
+            <text variable="genre"/>
+            <text variable="number" prefix=" No. "/>
+          </group>
+        </group>
+      </if>
+      <else-if type="bill book graphic legal_case legislation map report song speech webpage" match="any">
+        <group delimiter=". ">
+          <group delimiter=", ">
+            <group delimiter=" ">
+              <text variable="title" strip-periods="false" font-style="italic"/>
+            </group>
+            <text variable="scale"/>
+          </group>
+          <text macro="edition"/>
+        </group>
+      </else-if>
+      <else-if type="motion_picture broadcast" match="any"/>
+      <else-if type="patent" match="any">
+        <text variable="title" font-style="italic" suffix=". "/>
+      </else-if>
+      <else>
+        <text variable="title"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="container">
+    <choose>
+      <if type="chapter paper-conference" match="any">
+        <text term="in" text-case="capitalize-first" font-style="normal" suffix=": "/>
+        <group delimiter=" ">
+          <names variable="editor translator" delimiter=", ">
+            <name and="text" initialize="false" initialize-with=". " name-as-sort-order="all"/>
+            <label form="short" prefix=" (" suffix=")"/>
+          </names>
+          <group delimiter=" ">
+            <text variable="container-title" font-style="italic"/>
+          </group>
+        </group>
+      </if>
+      <else-if type="bill book graphic legal_case legislation map motion_picture report song" match="any">
+        <text variable="container-title"/>
+      </else-if>
+      <else-if type="broadcast">
+        <choose>
+          <if variable="container-title">
+            <group delimiter=", ">
+              <text variable="number" prefix="Episode "/>
+              <text variable="title"/>
+            </group>
+          </if>
+        </choose>
+      </else-if>
+      <else-if type="webpage">
+        <text variable="container-title"/>
+      </else-if>
+      <else>
+        <group delimiter=" ">
+          <text variable="container-title" font-style="italic"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="report-details">
+    <choose>
+      <if type="report">
+        <group>
+          <text variable="genre"/>
+          <text variable="number" prefix=" No. "/>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <choose>
+      <if type="thesis" match="any">
+        <group delimiter=", ">
+          <text variable="publisher"/>
+          <text variable="publisher-place"/>
+        </group>
+      </if>
+      <else>
+        <group delimiter=". ">
+          <group delimiter=": ">
+            <text variable="publisher-place"/>
+            <text variable="publisher"/>
+          </group>
+          <text macro="report-details"/>
+        </group>
+      </else>
+    </choose>
+  </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">
+          <group delimiter=" ">
+            <number suffix="." variable="edition"/>
+            <text term="edition" form="short"/>
+          </group>
+        </if>
+        <else>
+          <text variable="edition" suffix="."/>
+        </else>
+      </choose>
+    </group>
+  </macro>
+  <macro name="locators">
+    <choose>
+      <if type="article-journal article-magazine" match="any">
+        <group prefix=", " delimiter=", ">
+          <group delimiter="">
+            <text variable="volume"/>
+            <text variable="issue" prefix="(" suffix=")"/>
+          </group>
+          <group>
+            <label plural="never" variable="page" form="short"/>
+            <text variable="page" prefix=" "/>
+          </group>
+          <group>
+            <text variable="DOI" prefix="doi:"/>
+          </group>
+        </group>
+      </if>
+      <else-if type="article-newspaper" match="any">
+        <date delimiter="-" variable="issued" prefix=", ">
+          <date-part name="year"/>
+          <date-part name="month" form="numeric-leading-zeros"/>
+          <date-part name="day" form="numeric-leading-zeros"/>
+        </date>
+        <group delimiter=" " prefix=", ">
+          <label variable="page" form="short"/>
+          <text variable="page"/>
+        </group>
+      </else-if>
+      <else-if type="bill  book graphic legal_case legislation map motion_picture report song thesis" match="any">
+        <group delimiter=", " prefix=". ">
+          <text macro="event"/>
+          <text macro="publisher"/>
+        </group>
+      </else-if>
+      <else-if type="broadcast">
+        <group delimiter=". " prefix=", ">
+          <text variable="publisher"/>
+          <date variable="issued" delimiter=" ">
+            <date-part name="month" form="short" strip-periods="true"/>
+            <date-part name="day"/>
+          </date>
+        </group>
+      </else-if>
+      <else-if type="chapter paper-conference" match="any">
+        <group delimiter=", " prefix=". ">
+          <text macro="event"/>
+          <text macro="publisher"/>
+          <group>
+            <label plural="never" suffix=" " variable="page" form="short"/>
+            <text variable="page"/>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="patent" match="any">
+        <group>
+          <text variable="authority" suffix=": "/>
+          <text variable="number" suffix=", "/>
+          <date delimiter="-" variable="issued">
+            <date-part name="year"/>
+            <date-part name="month" form="numeric-leading-zeros"/>
+            <date-part name="day" form="numeric-leading-zeros"/>
+          </date>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <citation and="symbol" et-al-min="6" et-al-use-first="1" et-al-subsequent-min="4" et-al-subsequent-use-first="1" disambiguate-add-names="true" disambiguate-add-givenname="true" disambiguate-add-year-suffix="true" givenname-disambiguation-rule="primary-name" collapse="year">
+    <sort>
+      <key macro="issued"/>
+      <key macro="author"/>
+    </sort>
+    <layout delimiter="; " prefix="(" suffix=")">
+      <group delimiter=", ">
+        <group delimiter=" ">
+          <text macro="author-short"/>
+          <text macro="issued"/>
+        </group>
+        <group delimiter=" ">
+          <label plural="never" variable="locator" form="short"/>
+          <text variable="locator"/>
+        </group>
+      </group>
+    </layout>
+  </citation>
+  <bibliography>
+    <sort>
+      <key macro="author"/>
+      <key macro="issued" sort="ascending"/>
+    </sort>
+    <layout suffix=".">
+      <text macro="author"/>
+      <group delimiter=". " prefix=" ">
+        <text macro="issued" prefix="(" suffix=")"/>
+        <text macro="title"/>
+        <text macro="container"/>
+        <text variable="medium"/>
+      </group>
+      <text macro="locators"/>
+      <text macro="access" prefix=". "/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/csl/csl-styles/van-yuzuncu-yil-universitesi-fen-bilimleri-enstitusu.csl b/buildres/csl/csl-styles/van-yuzuncu-yil-universitesi-fen-bilimleri-enstitusu.csl
new file mode 100644
index 00000000000..bf31b33b1b5
--- /dev/null
+++ b/buildres/csl/csl-styles/van-yuzuncu-yil-universitesi-fen-bilimleri-enstitusu.csl
@@ -0,0 +1,500 @@
+<?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="tr-TR">
+  <info>
+    <title>Van Yüzüncü Yıl Üniversitesi Fen Bilimleri Enstitüsü - Tez Yazım Stili (Türkçe)</title>
+    <title-short>vanyyufbetez</title-short>
+    <id>http://www.zotero.org/styles/van-yuzuncu-yil-universitesi-fen-bilimleri-enstitusu</id>
+    <link href="http://www.zotero.org/styles/van-yuzuncu-yil-universitesi-fen-bilimleri-enstitusu" rel="self"/>
+    <link href="http://www.zotero.org/styles/apa" rel="template"/>
+    <link href="https://www.yyu.edu.tr/images/files/Thesis_Writing_Rules(1).pdf" rel="documentation"/>
+    <contributor>
+      <name>Ömer Faruk Özdemir</name>
+      <email>ofozdemir@yyu.edu.tr</email>
+    </contributor>
+    <category citation-format="author-date"/>
+    <category field="psychology"/>
+    <category field="generic-base"/>
+    <summary>APA’nın Türkçeye uyarlandığı bu çalışma Kurbanoğlu (2004) tarafından hazırlanan “kaynakça gösterme el kitabı”ndan yararlanılmıştır. APA’da kullanılan “and, n.d., et al., p., pp., eds., trans., ed., unpublished” etiketleri sırasıyla “ve, t.y., ve diğerleri, s., ss., ed., çev., bs., yayımlanmamış” şeklinde tercümesi yapılmıştır. Üç ve daha fazla yazarlı eserlerde “and” etiketi önünde kullanılan “,” karakteri kullanılmamıştır. İngilizcede sırasal rakam ile birlikte kullanılan son ek yerine Türkçede geçerli olan “.” işareti kullanılmıştır. APA’da künye içerisinde eserin yayın tarihi, erişim tarihi verilmektedir. Bazı eserlerde yayın tarihi için kullanılan “yıl, ay gün” biçimi APA-TR’de “yıl, gün ay” şeklinde kullanılmıştır. Erişim tarihi için kullanılan “ay gün, yıl” biçimi yerine de “gün ay yıl” biçimi seçilmiştir. APA’da elektronik yayınlarda kullanılan “Retrieved ……… from……..” etiketi yerine “……… tarihinde ……… adresinden erişildi” etiketi kullanılmıştır. CSL dilinde “retrieved”, “from” etiketleri ayrı olduğu için çalışmamızda “retrieved” etiketi “tarihinde”, “from” etiketi ise “adresinden erişildi” şeklinde yerelleştirilmesi yapılmıştır. APA’da bir kitap içerisinde yayımlanan yayına yapılan atıflarda eser adında önce kullanılan “in” etiketi, Türkçeye “içinde” olarak tercümesi yapılmış ve eser adından sonra kullanılmıştır. Dolayısıyla “tarih”, “tarihinde”, “adresinden erişildi”, “içinde” etiketlerinin künye içerisindeki yerleri değiştirilmiştir. Öneriler: “vol., vols.” etiketleri “c.”; toplantı adından önce kullanılan “Presented at the……” ifadesi “…….., sunulmuş bildiri” olarak kullanılmıştır. Çalışmada elektronik kaynaklar ve diğer değişen kurallar için APA’nın 6. versiyondaki kurallar öngörülmüştür. Lütfen tespit ettiğiniz sorunlar ve öneriler için kbinici@atauni.edu.tr adresine yazınız. Kasım Binici.</summary>
+    <updated>2022-09-19T15:40: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="tr-TR">
+    <terms>
+      <term name="no date">t.y.</term>
+      <term name="et-al">vd.</term>
+      <term name="and">ve</term>
+      <term name="in">in</term>
+      <term name="retrieved">erişildi</term>
+      <term name="from">adresinden</term>
+      <term name="presented at">sunulmuş bildiri</term>
+      <term name="edition">basım</term>
+      <term name="edition" form="short">ed.</term>
+      <term name="page">
+        <single>page</single>
+        <multiple>pages</multiple>
+      </term>
+      <term name="page" form="short">
+        <single>p.</single>
+        <multiple>pp.</multiple>
+      </term>
+      <term name="volume" form="short">Vol.</term>
+      <term name="translator" form="short">çev.</term>
+      <term name="editor" form="short">ed.</term>
+      <term name="ordinal-01">.</term>
+      <term name="ordinal-02">.</term>
+      <term name="ordinal-03">.</term>
+      <term name="ordinal-04">.</term>
+      <term name="month-01">Ocak</term>
+      <term name="month-02">Şubat</term>
+      <term name="month-03">Mart</term>
+      <term name="month-04">Nisan</term>
+      <term name="month-05">Mayıs</term>
+      <term name="month-06">Haziran</term>
+      <term name="month-07">Temmuz</term>
+      <term name="month-08">Ağustos</term>
+      <term name="month-09">Eylül</term>
+      <term name="month-10">Ekim</term>
+      <term name="month-11">Kasım</term>
+      <term name="month-12">Aralık</term>
+    </terms>
+  </locale>
+  <macro name="container-contributors">
+    <choose>
+      <if type="chapter paper-conference" match="any">
+        <names variable="editor" delimiter=", " prefix=" In " suffix=", ">
+          <name and="text" delimiter-precedes-last="never" et-al-min="3" et-al-use-first="1" initialize-with=". "/>
+          <label form="short" prefix=" (" text-case="capitalize-first" suffix=")"/>
+          <substitute>
+            <names variable="translator"/>
+          </substitute>
+        </names>
+      </if>
+    </choose>
+  </macro>
+  <macro name="secondary-contributors">
+    <choose>
+      <if type="article-journal chapter paper-conference" match="none">
+        <names variable="translator" delimiter=", " prefix="(" suffix=").">
+          <name and="text" initialize-with=". " delimiter=", " delimiter-precedes-last="never"/>
+          <label form="short" prefix=", " text-case="capitalize-first"/>
+          <substitute>
+            <names variable="editor"/>
+          </substitute>
+        </names>
+      </if>
+    </choose>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name delimiter-precedes-et-al="never" delimiter-precedes-last="never" initialize-with=". " name-as-sort-order="all"/>
+      <label form="short" prefix=" (" suffix=")" text-case="capitalize-first"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <choose>
+          <if type="report">
+            <text variable="publisher"/>
+            <text macro="title" text-case="capitalize-first"/>
+          </if>
+          <else>
+            <text macro="title" text-case="capitalize-first"/>
+          </else>
+        </choose>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="author-short">
+    <names variable="author">
+      <name form="short" and="text" delimiter-precedes-last="never" et-al-min="3" et-al-use-first="1" 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="bill book graphic legal_case legislation motion_picture song" match="any">
+            <text variable="title" form="short" font-style="italic"/>
+          </else-if>
+          <else>
+            <text variable="title" form="short" quotes="true"/>
+          </else>
+        </choose>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if type="thesis">
+        <choose>
+          <if variable="archive" match="any">
+            <group>
+              <text variable="archive"/>
+              <text variable="archive_location" prefix=" (" suffix=")"/>
+            </group>
+          </if>
+          <else>
+            <group>
+              <text variable="URL"/>
+            </group>
+          </else>
+        </choose>
+      </if>
+      <else>
+        <choose>
+          <if variable="DOI">
+            <text variable="DOI" prefix="doi:"/>
+          </if>
+          <else>
+            <choose>
+              <if type="webpage">
+                <group delimiter=" " suffix=".">
+                  <group>
+                    <date variable="accessed" prefix="Erişim tarihi: " suffix=".">
+                      <date-part name="day" suffix=" "/>
+                      <date-part name="month" suffix=" "/>
+                      <date-part name="year"/>
+                    </date>
+                  </group>
+                  <text variable="URL" prefix="Erişim adresi: "/>
+                </group>
+              </if>
+              <else>
+                <group delimiter=" " suffix=".">
+                  <text variable="URL"/>
+                </group>
+              </else>
+            </choose>
+          </else>
+        </choose>
+      </else>
+    </choose>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="report">
+        <text variable="title" text-case="capitalize-first" font-style="italic" suffix="."/>
+        <group prefix=" (" suffix=")">
+          <text variable="collection-title" text-case="capitalize-first"/>
+          <text variable="genre"/>
+          <text variable="number" prefix=" No: "/>
+        </group>
+      </if>
+      <else-if type="graphic motion_picture report song manuscript speech" match="any">
+        <text variable="title" text-case="capitalize-first" font-style="italic" font-variant="normal" font-weight="bold"/>
+      </else-if>
+      <else-if type="chapter" match="any">
+        <group suffix=".">
+          <text variable="title" text-case="capitalize-first" font-variant="normal"/>
+        </group>
+      </else-if>
+      <else-if type="paper-conference" match="any">
+        <text variable="title" suffix=". "/>
+      </else-if>
+      <else-if type="thesis" match="any">
+        <text variable="title" font-style="italic"/>
+      </else-if>
+      <else-if type="book" match="any">
+        <group suffix=".">
+          <text variable="title" font-style="italic" font-weight="bold"/>
+          <choose>
+            <if match="any" is-numeric="edition">
+              <group prefix=" (" suffix=").">
+                <number suffix=". " variable="edition"/>
+                <text term="edition" form="short"/>
+              </group>
+            </if>
+          </choose>
+        </group>
+      </else-if>
+      <else>
+        <text variable="title" text-case="capitalize-first" font-style="normal" font-weight="normal" suffix="."/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <choose>
+      <if type="report">
+        <group delimiter=": ">
+          <text variable="publisher"/>
+          <text variable="publisher-place"/>
+        </group>
+      </if>
+      <else-if type="thesis">
+        <choose>
+          <if variable="archive URL" match="any">
+            <text variable="genre" text-case="capitalize-first" prefix=" (" suffix=")"/>
+          </if>
+          <else>
+            <text variable="genre" text-case="lowercase" prefix=" (" suffix="). "/>
+            <group delimiter=", ">
+              <text variable="publisher"/>
+              <text variable="publisher-place"/>
+            </group>
+          </else>
+        </choose>
+      </else-if>
+      <else>
+        <group delimiter=", ">
+          <choose>
+            <if variable="event" match="none">
+              <text variable="genre"/>
+            </if>
+          </choose>
+          <choose>
+            <if type="article-journal article-magazine" match="none">
+              <group delimiter=": ">
+                <text variable="publisher"/>
+                <text variable="publisher-place"/>
+              </group>
+            </if>
+          </choose>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="event">
+    <choose>
+      <if variable="event">
+        <choose>
+          <if variable="genre" match="none">
+            <text variable="event"/>
+            <text term="presented at" prefix=", "/>
+          </if>
+          <else>
+            <group delimiter=" ">
+              <text variable="event"/>
+              <text variable="genre"/>
+            </group>
+          </else>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="issued">
+    <choose>
+      <if type="bill legal_case legislation" match="none">
+        <choose>
+          <if variable="issued">
+            <group prefix=" (" suffix=").">
+              <date variable="issued">
+                <date-part name="year"/>
+              </date>
+              <text variable="year-suffix"/>
+              <choose>
+                <if type="bill book graphic legal_case legislation motion_picture report song article-journal chapter paper-conference" match="none">
+                  <date variable="issued" prefix=",">
+                    <date-part prefix=" " name="day"/>
+                    <date-part prefix=" " name="month"/>
+                  </date>
+                </if>
+              </choose>
+            </group>
+          </if>
+          <else>
+            <group prefix=" (" suffix=").">
+              <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" match="none">
+        <date variable="issued">
+          <date-part name="year"/>
+          <date-part prefix=", " name="day"/>
+          <date-part prefix=" " name="month"/>
+        </date>
+      </if>
+      <else>
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+      </else>
+    </choose>
+  </macro>
+  <macro name="issued-year">
+    <choose>
+      <if variable="issued">
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+        <text variable="year-suffix"/>
+      </if>
+      <else>
+        <text term="no date" form="short"/>
+        <text variable="year-suffix" prefix="-"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="short"/>
+        </group>
+      </if>
+      <else>
+        <text variable="edition" suffix="."/>
+      </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"/>
+            <text variable="issue" prefix="(" suffix=")"/>
+          </group>
+          <text variable="page"/>
+        </group>
+      </if>
+      <else-if type="article-newspaper">
+        <group delimiter=" " prefix=", ">
+          <label variable="page" form="short"/>
+          <text variable="page"/>
+        </group>
+      </else-if>
+      <else-if type="graphic motion_picture report song chapter" match="any">
+        <group delimiter=", " prefix=" (" suffix=").">
+          <text macro="edition"/>
+          <group>
+            <text term="volume" form="short" plural="true" text-case="capitalize-first" suffix=" "/>
+            <number variable="number-of-volumes" form="numeric" prefix="1-"/>
+          </group>
+          <group>
+            <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+            <number variable="volume" form="numeric"/>
+          </group>
+          <group>
+            <label variable="page" form="short" suffix=" "/>
+            <text variable="page"/>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="legal_case">
+        <group prefix=" (" suffix=")" delimiter=" ">
+          <text variable="authority"/>
+          <date variable="issued" delimiter=" ">
+            <date-part name="month" form="short"/>
+            <date-part name="day" suffix=","/>
+            <date-part name="year"/>
+          </date>
+        </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>
+      <label variable="locator" form="short"/>
+      <text variable="locator" prefix=" "/>
+    </group>
+  </macro>
+  <macro name="container">
+    <choose>
+      <if type="article-journal legal_case legislation thesis paper-conference" match="none">
+        <text variable="container-title" text-case="capitalize-first" font-style="italic" font-weight="bold" prefix=" "/>
+      </if>
+      <else-if type="paper-conference" match="any">
+        <group>
+          <text variable="container-title" font-weight="bold" suffix=","/>
+        </group>
+      </else-if>
+      <else>
+        <group delimiter=" " prefix=" ">
+          <choose>
+            <if variable="container-title">
+              <text variable="container-title" text-case="capitalize-first" font-style="italic" text-decoration="none"/>
+              <group delimiter=" ">
+                <text term="section" form="symbol"/>
+                <text variable="section"/>
+              </group>
+            </if>
+            <else>
+              <choose>
+                <if type="legal_case">
+                  <text variable="number" prefix="No. "/>
+                </if>
+                <else>
+                  <text variable="number" prefix="Pub. L. No. "/>
+                  <group delimiter=" ">
+                    <text term="section" form="symbol"/>
+                    <text variable="section"/>
+                  </group>
+                </else>
+              </choose>
+            </else>
+          </choose>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <citation and="text" 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" cite-group-delimiter="; ">
+    <sort>
+      <key macro="issued"/>
+      <key macro="issued-sort"/>
+    </sort>
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=", ">
+        <choose>
+          <if type="personal_communication interview" match="any">
+            <names variable="author">
+              <name form="short" and="text" et-al-min="3" et-al-use-first="1" initialize-with=". "/>
+            </names>
+            <text value="kişisel iletişim"/>
+            <date variable="issued">
+              <date-part prefix=" " name="day"/>
+              <date-part prefix=" " name="month"/>
+              <date-part prefix=" " name="year"/>
+            </date>
+          </if>
+          <else>
+            <text macro="author-short"/>
+            <text macro="issued-year"/>
+          </else>
+        </choose>
+        <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"/>
+    </sort>
+    <layout font-variant="normal">
+      <group suffix=".">
+        <text macro="author" suffix=". "/>
+        <text macro="issued"/>
+        <group>
+          <text macro="title" text-case="capitalize-first" font-variant="normal" prefix=" "/>
+          <text macro="container-contributors"/>
+          <group>
+            <group delimiter=",">
+              <text macro="container" text-case="capitalize-first"/>
+            </group>
+            <text macro="secondary-contributors"/>
+          </group>
+        </group>
+        <text macro="locators"/>
+        <group delimiter=", " prefix=" ">
+          <text macro="event"/>
+          <text macro="publisher"/>
+        </group>
+      </group>
+      <text macro="access" prefix=" "/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/csl/csl-styles/vancouver.csl b/buildres/csl/csl-styles/vancouver.csl
index e39efa8d842..bd8ac3fe56f 100644
--- a/buildres/csl/csl-styles/vancouver.csl
+++ b/buildres/csl/csl-styles/vancouver.csl
@@ -19,7 +19,7 @@
     <category citation-format="numeric"/>
     <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>2014-09-06T16:03:01+00:00</updated>
+    <updated>2022-09-28T11:33: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">
@@ -50,6 +50,7 @@
       <name sort-separator=" " initialize-with="" name-as-sort-order="all" delimiter=", " delimiter-precedes-last="always"/>
       <label form="long" prefix=", "/>
       <substitute>
+        <text macro="webpage-title"/>
         <names variable="editor"/>
       </substitute>
     </names>
@@ -67,6 +68,17 @@
       </if>
     </choose>
   </macro>
+  <macro name="webpage-title">
+    <!--If a webpage has a container, we're assuming the citation is "part of a website" as per ch. 25 Citing Medicine https://www.ncbi.nlm.nih.gov/books/NBK7274/?report=reader -->
+    <choose>
+      <if type="webpage" variable="container-title" match="all">
+        <group delimiter=" ">
+          <text variable="container-title"/>
+          <text term="internet" prefix="[" suffix="]" text-case="capitalize-first"/>
+        </group>
+      </if>
+    </choose>
+  </macro>
   <macro name="publisher">
     <choose>
       <!--discard publisher info for articles-->
@@ -164,16 +176,21 @@
     </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">
+      <if type="webpage" variable="container-title" match="all"/>
+      <else>
+        <text variable="title"/>
         <choose>
-          <if variable="URL">
-            <text term="internet" prefix=" [" suffix="]" text-case="capitalize-first"/>
+          <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>
-        <text macro="edition" prefix=". "/>
-      </if>
+      </else>
     </choose>
     <choose>
       <if type="thesis">
@@ -283,6 +300,13 @@
       </if>
     </choose>
   </macro>
+  <macro name="webpage-part">
+    <choose>
+      <if type="webpage" variable="container-title" match="all">
+        <text variable="title"/>
+      </if>
+    </choose>
+  </macro>
   <macro name="collection-details">
     <choose>
       <if type="article-journal article-magazine article-newspaper review review-book" match="none">
@@ -342,6 +366,7 @@
           <text macro="journal-location"/>
           <text macro="pages"/>
         </group>
+        <text macro="webpage-part"/>
       </group>
       <text macro="collection-details" suffix=". "/>
       <text macro="report-details" suffix=". "/>
diff --git a/buildres/csl/csl-styles/veterinary-clinical-pathology.csl b/buildres/csl/csl-styles/veterinary-clinical-pathology.csl
new file mode 100644
index 00000000000..c2779e801e4
--- /dev/null
+++ b/buildres/csl/csl-styles/veterinary-clinical-pathology.csl
@@ -0,0 +1,260 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" page-range-format="expanded" default-locale="en-US">
+  <info>
+    <title>Veterinary Clinical Pathology</title>
+    <title-short>VCP</title-short>
+    <id>http://www.zotero.org/styles/veterinary-clinical-pathology</id>
+    <link href="http://www.zotero.org/styles/veterinary-clinical-pathology" rel="self"/>
+    <link href="http://www.zotero.org/styles/pediatric-infectious-disease-journal" rel="template"/>
+    <link href="https://onlinelibrary.wiley.com/page/journal/1939165x/homepage/forauthors.html" rel="documentation"/>
+    <author>
+      <name>Patrick O'Brien</name>
+    </author>
+    <category citation-format="numeric"/>
+    <category field="biology"/>
+    <issn>0275-6382</issn>
+    <eissn>1939-165X</eissn>
+    <updated>2023-01-14T10:34: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>
+  <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"/>
+          <else-if variable="URL">
+            <group delimiter=". " suffix=".">
+              <text variable="URL"/>
+              <choose>
+                <if type="webpage">
+                  <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>
+            </group>
+          </else-if>
+        </choose>
+      </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="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 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">
+          <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" strip-periods="true" suffix="."/>
+            <group delimiter=";" prefix=" ">
+              <choose>
+                <if variable="issue volume" match="any">
+                  <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>
+      <text prefix=" " macro="access"/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/csl/csl-styles/zoological-journal-of-the-linnean-society.csl b/buildres/csl/csl-styles/zoological-journal-of-the-linnean-society.csl
index 2b656e9182a..0786f46e0b8 100644
--- a/buildres/csl/csl-styles/zoological-journal-of-the-linnean-society.csl
+++ b/buildres/csl/csl-styles/zoological-journal-of-the-linnean-society.csl
@@ -9,8 +9,8 @@
     <link href="https://academic.oup.com/zoolinnean/pages/General_Instructions" rel="documentation"/>
     <author>
       <name>Martin R. Smith</name>
-      <email>martins@gmail.com</email>
-      <uri>http://sn.im/martin-smith</uri>
+      <email>martin.smith@durham.ac.uk</email>
+      <uri>https://smithlabdurham.github.io/</uri>
     </author>
     <category citation-format="author-date"/>
     <category field="biology"/>
@@ -83,9 +83,9 @@
         <date variable="issued">
           <date-part name="year"/>
         </date>
-        <group>
+        <group delimiter=" ">
           <label variable="locator" form="short"/>
-          <text variable="locator" prefix=" "/>
+          <text variable="locator"/>
         </group>
       </group>
     </layout>
diff --git a/docs/Gemfile b/docs/Gemfile
index 3056e5acfb5..289a8081022 100644
--- a/docs/Gemfile
+++ b/docs/Gemfile
@@ -5,7 +5,7 @@ gem "jekyll", "~> 4.3" # installed by `gem jekyll`
 # Homepage: https://github.com/paulrobertlloyd/jekyll-figure#jekyll-figure
 gem 'jekyll-figure'
 
-gem "just-the-docs", "0.4.2"
+gem "just-the-docs", "0.5.0"
 
 gem "jekyll-remote-theme"
 
diff --git a/docs/_config.yml b/docs/_config.yml
index 8683352bc58..8f1aaafc637 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -1,9 +1,9 @@
 repository: JabRef/jabref
 title: "Developer Documentation"
-remote_theme: just-the-docs/just-the-docs@v0.4.0.rc3
+remote_theme: just-the-docs/just-the-docs@v0.5.0
 color_scheme: light
 
-exclude: [CNAME, README.md, mkdocs-custom.css]
+exclude: [_config.yml, .dockerignore, .gitignore, CNAME, Dockerfile, Gemfile, Gemfile.lock, README.md, mkdocs-custom.css]
 
 # 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/
diff --git a/docs/code-howtos/IntelliJ.md b/docs/code-howtos/IntelliJ.md
new file mode 100644
index 00000000000..9af29ef2b22
--- /dev/null
+++ b/docs/code-howtos/IntelliJ.md
@@ -0,0 +1,85 @@
+---
+parent: Code Howtos
+---
+
+# IntelliJ Hints
+
+{: .highlight }
+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>?
+
+## Key hints for IntelliJ
+
+* <kbd>Shift</kbd>+<kbd>Shift</kbd> (AKA double-shift): Open the search dialog.
+* <kbd>Ctrl</kbd>+<kbd>N</kbd>: Open the search dialog and select search for a class.
+* <kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>F</kbd>: Search everywhere in the code base.
+* <kbd>Alt</kbd>+<kbd>F1</kbd> and then <kbd>Enter</kbd>: Locate the file in the search bar on the left side.
+* <kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>T</kbd>: Navigate from a class to the test class.
+
+---
+parent: Set up a local workspace
+grand_parent: Getting into the code
+nav_order: 49
+---
+
+## Other notes on IntelliJ
+
+{: .note}
+Here, some notes on IntelliJ setup are written down.
+These are intended for pro users.
+
+You should use IntelliJ IDEA's internal build system for compiling and running JabRef tests during development, because it is usually more responsive.
+Essentially, you now have the best of both worlds:
+You can run Gradle tasks using the Gradle Tool Window.
+You can compile and run tests with IntelliJ's faster internal build system
+(unless you haven't made changes to input files that generate sources).
+
+{: .important}
+When using IntelliJ's build system, **it is important** that you understand that JabRef relies on generated sources which are only built through Gradle.
+Therefore, to build or update these dependencies you need to run the `run` (or `assemble`) Gradle task at least once.
+When you followed this guide, you should have done it in the Gradle setup.
+
+Running JabRef itself through IntelliJ's build system is **not** possible as we encounter difficulties when reading resources though `.class.getResource(...)`.
+Although solutions are discussed in length [on stackoverflow](https://stackoverflow.com/q/26328040/873282), there is no "good" solution for us.
+
+## Running JabRef using IntelliJ's build system
+
+{ :note }
+Maybe does not work
+
+To run JabRef from IntelliJ, we let IntelliJ create a launch configuration:
+
+Locate the class `Launcher`:
+Press <kbd>Ctrl</kbd>+<kbd>N</kbd>.
+Then, the "Search for classes dialog" pops up.
+Enter `Launcher`.
+Now, only one class should have been found:
+
+{% figure caption:"IntelliJ search for class “Launcher”" %}
+![IntelliJ search for class "Launcher"](../images/intellij-search-for-launcher.png)
+{% endfigure %}
+
+Press <kbd>Enter</kbd> to jump to that class.
+
+Hover on the green play button.
+
+{% figure caption:"However on green play" %}
+![However on green play](../images/intellij-hover-on-play-button.png)
+{% endfigure %}
+
+Then, click on it.
+A popup menu opens.
+Choose the first entry and click on it.
+
+{% figure caption:"Run JabRef via launcher" %}
+![Popup menu - Run JabRef via launcher](../images/intellij-run-jabref-from-launcher.png)
+{% endfigure %}
+
+Then, JabRef starts.
+
+You also have an entry in the Launch configurations to directly launch the JabRef GUI:
+
+{% figure caption:"Launch menu contains “Launcher”" %}
+![Launch menu contains launcher](../images/intellij-run-launcher.png)
+{% endfigure %}
+
+You can also click on the debug symbol next to it to enable stopping at breakpoints.
diff --git a/docs/code-howtos/code-quality.md b/docs/code-howtos/code-quality.md
index 350331a7602..755b0e1d500 100644
--- a/docs/code-howtos/code-quality.md
+++ b/docs/code-howtos/code-quality.md
@@ -7,9 +7,9 @@ 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/?).
+* [Teamscale](https://www.cqse.eu/en/teamscale/overview/) is a popular German product analyzing code quality. The analysis results are available at <https://demo.teamscale.com/findings.html#/jabref/?>.
 
-We strongly recommend to read following two books on code quality:
+We strongly recommend reading following two books on code quality:
 
 * [Java by Comparison](http://java.by-comparison.com) is a book by three JabRef developers which focuses on code improvements close to single statements. It is fast to read and one gains much information from each recommendation discussed in the book.
 * [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)?
diff --git a/docs/code-howtos/javafx.md b/docs/code-howtos/javafx.md
index c08fe96b489..c5faee31d74 100644
--- a/docs/code-howtos/javafx.md
+++ b/docs/code-howtos/javafx.md
@@ -201,7 +201,6 @@ JabRef makes heavy use of Properties and Bindings. These are wrappers around Obs
 * [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
diff --git a/docs/code-howtos/tools.md b/docs/code-howtos/tools.md
index 8d39a161c34..c4e9853a21f 100644
--- a/docs/code-howtos/tools.md
+++ b/docs/code-howtos/tools.md
@@ -10,7 +10,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
 
@@ -37,23 +37,23 @@ See also: [https://help.github.com/articles/syncing-a-fork/](https://help.github
 (As Administrator - one time)
 
 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 temurin`
+2. `choco install git.install -y --params "/GitAndUnixToolsOnPath /WindowsTerminal`
+3. `choco install notepadplusplus`
+4. 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.
+Then, each weak do `choco upgrade all` to ensure all tooling is kept updated.
 
 ### General git tooling on Windows
 
 * 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
+  * [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`
 
 ### Better console applications
 
 #### ConEmu plus clink
 
+* `choco install conemu clink`
 * [ConEmu](http://conemu.github.io) -> Preview Version - Aim: Colorful console with tabs
   * At first start:
     * "Choose your startup task ...": \`{Bash::Git bash\}}
@@ -61,11 +61,11 @@ Then, each weak do `choco upgrade all` to ensure all tooling is uptodate.
     * 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 (<kbd>Alt</kbd>+<kbd>B</kbd>, <kbd>Ctrl</kbd>+<kbd>S</kbd>, etc.) also available at the prompt of `cmd.exe`
 
 #### Other bundles
 
-* [Cmder](http://cmder.net) - bundles ConEmu plus clink
+* [Cmder](https://cmder.app/) - bundles ConEmu plus clink
 
 ### Tools for working with XMP
 
@@ -76,4 +76,4 @@ Then, each weak do `choco upgrade all` to ensure all tooling is uptodate.
 * [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 <kbd>Win</kbd>+<kbd>R</kbd>: `shell:startup`
diff --git a/docs/contributing.md b/docs/contributing.md
index 7b1423836d4..d3e078a2d0d 100644
--- a/docs/contributing.md
+++ b/docs/contributing.md
@@ -13,7 +13,7 @@ nav_order: 2
 
 We welcome contributions to JabRef and encourage you to follow the GitHub workflow specified below. If you are not familiar with this type of workflow, take a look at GitHub's excellent overview on the [GitHub flow](https://guides.github.com/introduction/flow/index.html) and the explanation of [Feature Branch Workflow](https://atlassian.com/git/tutorials/comparing-workflows#feature-branch-workflow) for the idea behind this kind of development.
 
-1. Get the JabRef code on your local machine. Detailed instructions about this step can be found in our [guidelines for setting up a local workspace](getting-into-the-code/guidelines-for-setting-up-a-local-workspace.md).
+1. Get the JabRef code on your local machine. Detailed instructions about this step can be found in our [guidelines for setting up a local workspace](getting-into-the-code/guidelines-for-setting-up-a-local-workspace/).
    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.
diff --git a/docs/decisions/0020-use-Jackson-to-parse-study-yml.md b/docs/decisions/0020-use-Jackson-to-parse-study-yml.md
index ac58c3f7689..6f0dbee85d7 100644
--- a/docs/decisions/0020-use-Jackson-to-parse-study-yml.md
+++ b/docs/decisions/0020-use-Jackson-to-parse-study-yml.md
@@ -13,7 +13,7 @@ What parser should be used to parse YAML files?
 ## Considered Options
 
 * [Jackson](https://github.com/FasterXML/jackson-dataformat-yaml)
-* [SnakeYAML Engine](https://bitbucket.org/asomov/snakeyaml)
+* [SnakeYAML Engine](https://bitbucket.org/snakeyaml/snakeyaml-engine/src/master/)
 * [yamlbeans](https://github.com/EsotericSoftware/yamlbeans)
 * [eo-yaml](https://github.com/decorators-squad/eo-yaml)
 * Self-written parser
@@ -34,7 +34,7 @@ Chosen option: Jackson, because as it is a dedicated library for parsing YAML. `
 
 * Good, because established YAML parser library
 * Good, because supports YAML 1.2
-* Bad, because cannot parse YAML into Java DTOs, only into [basic Java structures](https://bitbucket.org/asomov/snakeyaml-engine/src/master/), this then has to be assembled into DTOs
+* Bad, because cannot parse YAML into Java DTOs, only into [basic Java structures](https://bitbucket.org/snakeyaml/snakeyaml-engine/src/master/), this then has to be assembled into DTOs
 
 ### yamlbeans
 
diff --git a/docs/decisions/0026-use-jna-to-determine-default-directory.md b/docs/decisions/0026-use-jna-to-determine-default-directory.md
index 40b76f03e39..210be28eb59 100644
--- a/docs/decisions/0026-use-jna-to-determine-default-directory.md
+++ b/docs/decisions/0026-use-jna-to-determine-default-directory.md
@@ -34,8 +34,10 @@ Swing's FileChooser implemented a very decent directory determination algorithm.
 It thereby uses `sun.awt.shell.ShellFolder`.
 
 * Good, because provides best results on most platforms.
+* Good, because also supports localization of the folder name. E.g., `~/Dokumente` in Germany.
 * Bad, because introduces a dependency on Swing and thereby contradicts the second decision driver.
-* Bad, because GraalVM's support Swing is experimental
+* Bad, because GraalVM's support Swing is experimental.
+* Bad, because handles localization only on Windows.
 
 ### Use `user.home`
 
@@ -44,25 +46,17 @@ There is `System.getProperty("user.home");`.
 * Bad, because "The concept of a HOME directory seems to be a bit vague when it comes to Windows". See <https://stackoverflow.com/a/586917/873282> for details.
 * Bad, because it does not include `Documents`:
   As of 2022, `System.getProperty("user.home")` returns `c:\Users\USERNAME` on Windows 10, whereas
-  `FileSystemView` returns `C:\Users\USERNAME\Documents`, which is the "better" directory
+  `FileSystemView` returns `C:\Users\USERNAME\Documents`, which is the "better" directory.
 
 ### AppDirs
 
 > AppDirs is a small java library which provides a path to the platform dependent special folder/directory.
 
-* Good, because already used in JabRef
-* Bad, because does not use `Documents` on Windows, but rather `C:\Users\<Account>\AppData\<AppAuthor>\<AppName>` as basis
+* Good, because already used in JabRef.
+* Bad, because does not use `Documents` on Windows, but rather `C:\Users\<Account>\AppData\<AppAuthor>\<AppName>` as basis.
 
 ### Java Native Access
 
-* Good, because no additional dependency required, as it is already loaded by AppDirs
-* Good, because it is well maintained and widely used
-* Good, because it provides direct access to `Documents` and other system variables
-
-## 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.}
+* Good, because no additional dependency required, as it is already loaded by AppDirs.
+* Good, because it is well maintained and widely used.
+* Good, because it provides direct access to `Documents` and other system variables.
diff --git a/docs/getting-into-the-code/development-strategy.md b/docs/getting-into-the-code/development-strategy.md
index 84a6fea798b..8fddcd79b47 100644
--- a/docs/getting-into-the-code/development-strategy.md
+++ b/docs/getting-into-the-code/development-strategy.md
@@ -18,7 +18,14 @@ Read on about our automated quality checks at [Code Quality](../code-howtos/code
 
 ## Continuous integration
 
-Since end of 2019, we just use GitHub actions to execute our tests and to creates binaries. The binaries are created using [gradle](https://gradle.org) and are uploaded to [https://builds.jabref.org](https://builds.jabref.org). These binaries are created without any checks to have them available as quickly as possible, even if the localization or some fetchers are broken. Deep link: [https://github.com/JabRef/jabref/actions?workflow=Deployment](https://github.com/JabRef/jabref/actions?workflow=Deployment).
+JabRef has automatic checks using GitHub actions in place.
+One of them is checking for the formatting of the code.
+Consistent formatting ensures more easy reading of the code.
+Thus, we pay attention that JabRef's code follows the same code style.
+
+Binaries are created using [gradle](https://gradle.org) and are uploaded to [https://builds.jabref.org](https://builds.jabref.org).
+These binaries are created without any checks to have them available as quickly as possible, even if the localization or some fetchers are broken.
+Deep link to the action: [https://github.com/JabRef/jabref/actions?workflow=Deployment](https://github.com/JabRef/jabref/actions?workflow=Deployment).
 
 ## Branches
 
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
deleted file mode 100644
index b7a5b5ae5de..00000000000
--- a/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace.md
+++ /dev/null
@@ -1,732 +0,0 @@
----
-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.
-
-{: .highlight }
-The most important step is to configure your IDE.
-If you know how to fork and check out JabRef's code,
-already have an IDE installed, then
-please scroll down to the [IDE setup](#Get the code into your IDE).
-Otherwise, please keep on reading.
-
-## Prerequisites
-
-This section list the prerequisites you need to get started to develop JabRef. After this section, you are ready to get the code.
-
-### GitHub Account
-
-If you do not yet have a GitHub account, please [create one](https://github.com/join).
-
-Proposals for account names:
-
-* Login similar to your university account. Example: `koppor`
-* Use your last name prefixed by the first letter of your first name. Example: `okopp`
-* Use `firstname.lastname`. Example: `oliver.kopp`
-
-You can hide your email address by following the recommendations at [https://saraford.net/2017/02/19/how-to-hide-your-email-address-in-your-git-commits-but-still-get-contributions-to-show-up-on-your-github-profile-050/](https://saraford.net/2017/02/19/how-to-hide-your-email-address-in-your-git-commits-but-still-get-contributions-to-show-up-on-your-github-profile-050/).
-
-Most developers, though, do not hide their email address. They use one which may get public. Mostly, they create a new email account for development only. That account then be used for development mailing lists, mail exchange with other developers, etc.
-
-Examples:
-
-* Same login as in GitHub (see above). Example: `koppor@gmail.com`
-* "`it`" in the name. Example: `kopp.it@gmail.com`
-* Use the university login. Example: `st342435@stud.uni-stuttgart.de`
-
-### git
-
-It is strongly recommended that you have git installed.
-
-* On Debian-based distros: `sudo apt-get install git`
-* On Windows: [Download the installer](http://git-scm.com/download/win) and install it. Using [chocolatey](https://chocolatey.org/), you can run `choco install git.install -y --params "/GitAndUnixToolsOnPath /WindowsTerminal` to a) install git and b) have Linux commands such as `grep` available in your `PATH`.
-* [Official installation instructions](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git)
-
-### Installed IDE
-
-We suggest [IntelliJ IDEA](https://www.jetbrains.com/idea/?from=jabref).
-The Community Edition works well.
-Most contributors use the Ultimate Edition, because they are students getting that edition for free.
-
-For advanced users, [Eclipse](https://eclipse.org) (`2023-03` or newer) is also possible. For JDK20 you need to install the addtional [support for jdk20 as extension](https://marketplace.eclipse.org/content/java-20-support-eclipse-2023-03-427)). 
-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.
-
-### Java Development Kit 20
-
-For Eclipse, a working Java (Development Kit) 20 installation is required.
-In the case of IntelliJ, this will be downloaded inside the IDE (if you follow the steps below).
-
-In the command line (terminal in Linux, cmd in Windows) run `javac -version` and make sure that the reported version is Java 20 (e.g., `javac 20`).
-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.
-Please head to <https://adoptium.net/de/temurin/releases> to download JDK 20.
-
-
-## Get the code
-
-This section explains how you get the JabRef code onto your machine in a form allowing you to make contributions.
-
-### Fork JabRef into your GitHub account
-
-1. Log into your GitHub account
-2. Go to [https://github.com/JabRef/jabref](https://github.com/JabRef/jabref)
-3. Create a fork by clicking at fork button on the right top corner
-4. A fork repository will be created under your account `https://github.com/YOUR_USERNAME/jabref`.
-
-### 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 choosing a path that does not contain any special (non-ASCII or whitespace) characters.
-In the following, we will use `c:\git-repositories` as base folder:
-
-```cmd
-cd \
-mkdir git-repositories
-cd git-repositories
-```
-
-**Note that putting the repo jabref directly under `C:\` or any other drive letter under windows causes compile errors**
-
-Initial cloning might be very slow (`27.00 KiB/s`).
-
-To prevent this, execute the following steps:
-
-```cmd
-git clone --depth=10 https://github.com/JabRef/jabref.git
-cd jabref
-git remote rename origin upstream
-git remote add origin 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.
-
-Now, you have two remote repositories, where `origin` is yours and `upstream` is the one of the JabRef organization.
-
-You can see it with `git remote -v`:
-
-```cmd
-c:\git-repositories\jabref> git remote -v
-origin     https://github.com/YOURUSERNAME/jabref.git (fetch)
-origin     https://github.com/YOURUSERNAME/jabref.git (push)
-upstream     https://github.com/jabref/jabref.git (fetch)
-upstream     https://github.com/jabref/jabref.git (push)
-```
-
-### Generate source code
-
-{: .note }
-This is required for Eclipse only.
-In IntelliJ, this will be done in the IDE.
-
-Generate additional source code: `gradlew assemble` (on Linux/Mac: `./gradlew assemble`).
-
-The directory `src-gen` is now filled.
-
-## Get the code into your IDE
-
-Start IntelliJ.
-
-IntelliJ shows the following window:
-
-{% figure caption:"IntelliJ Start Window" %}
-![IntelliJ Start Window](guidelines-intellij-start-window.png)
-{% endfigure %}
-
-Click on "Open"
-
-Choose `build.gradle` in the root of the jabref source folder:
-
-{% figure caption:"Choose `build.gradle` in the “Open Project or File” dialog" %}
-![Open File or Project dialog](guidelines-intellij-choose-build-gradle.png)
-{% endfigure %}
-
-After pressing "OK", IntelliJ asks how that file should be opened.
-Answer: "Open as Project"
-
-{% figure caption:"Choose “Open as Project” in the Open Project dialog" %}
-![Open Project dialog](guidelines-choose-open-as-project.png)
-{% endfigure %}
-
-Then, trust the project:
-
-{% figure caption:"Choose “Trust Project” in the “Trust and Open Project” dialog" %}
-![Trust and Open Project dialog](guidelines-trust-project.png)
-{% endfigure %}
-
-## Configuration of IntelliJ IDEA
-
-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>?
-
-IntelliJ IDEA fully supports Gradle as a build tool, but also has an internal build system which is usually faster. For JabRef, Gradle is required to make a full build.
-Once set up, IntelliJ IDEA's internal system can be used for subsequent builds.
-
-In case IntelliJ's internal build system does not work, just stick with using Gradle.
-
-### Ensure that JDK 20 is available to IntelliJ
-
-Ensure you have a Java 20 SDK configured by navigating to **File > Project Structure... > Platform Settings > SDKs**.
-
-{% figure caption:"JDKs 11, 14, and 15 shown in available SDKs. JDK 20 is missing." %}
-![Plattform Settings - SDKs](../images/intellij-choose-jdk-adoptopenjdk-on-windows-project-settings.png)
-{% endfigure %}
-
-If there is another JDK than JDK 20 selected, click on the plus button and choose "Download JDK..."
-
-{% figure caption:"Download JDK..." %}
-![Plattform Settings - SDKs - plus button - Download JDK...](guidelines-select-download-jdk.png)
-{% endfigure %}
-
-Select JDK version 20 and then Eclipse Temurin (showing JDK 18 as example).
-
-{% figure caption:"Example for JDK 18 - Choose Eclipse Temurin" %}
-![Download Eclipse Temurin](guidelines-select-jdk-18-eclipse-temurin.png)
-{% endfigure %}
-
-After clicking "Download", IntelliJ installs Eclipse Temurin:
-
-{% figure caption:"IntelliJ installs Eclipse Temurin" %}
-![IntelliJ installs Eclipse Temurin](guidelines-intellij-installs-temurin.png)
-{% endfigure %}
-
-Navigate to **Project Settings > Project** and ensure that the projects' SDK is Java 20
-
-{% figure caption:"Project SDK is pinned to the downloaded SDK (showing JDK 18 as example)" %}
-![Project SDK is JDK 18](guidelines-intellij-project-settings-jdk18.png)
-{% endfigure %}
-
-Click "OK" to store the changes.
-
-### Configure the Build System
-
-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 20.
-
-{% figure caption:"Gradle JVM is project SDK (showing JDK 18 as example)" %}
-![Gradle JVM is project SDK](guidelines-settings-gradle-gradlejvm-is-projectjvm.png)
-{% endfigure %}
-
-To prepare IntelliJ's build system additional steps are required:
-
-Navigate to **Build, Execution, Deployment > Compiler > Java Compiler**, and under "Override compiler parameters per-module", click add (\[+]) and choose `JabRef.main`:
-
-{% figure caption:"Choose JabRef.main" %}
-![Gradle JVM is project SDK](guidelines-choose-module.png)
-{% endfigure %}
-
-Then double click inside the cell "Compilation options" and enter following parameters:
-
-```text
---add-exports=javafx.controls/com.sun.javafx.scene.control=org.jabref
---add-exports=org.controlsfx.controls/impl.org.controlsfx.skin=org.jabref
-```
-
-Press <kbd>Enter</kbd> to have the value really stored.
-Otherwise, it seems like the setting is stored, but it is not there if you re-open this preference dialog.
-Then click on "Apply" to store the setting.
-
-{% figure caption:"Resulting settings for module JabRef.main" %}
-![Overridden compiler parameters](guidelines-overridden-compiler-parameters.png)
-{% endfigure %}
-
-If this step is omited, 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)`.
-
-Enable annotation processors by navigating to **Build, Execution, Deployment > Compiler > Annotation processors** and check "Enable annotation processing"
-
-{% figure caption:"Enabled annotation processing" %}
-![Enable annotation processing](guidelines-intellij-enable-annotation-processing.png)
-{% endfigure %}
-
-### 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.
-
-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.
-
-{% figure caption:"Reload of Gradle project" %}
-![Highlighted reload button](guidelines-gradle-tool-windows-refresh.png)
-{% endfigure %}
-
-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**.
-
-{% figure caption:"JabRef > Tasks > application > run" %}
-![JabRef > Tasks > application > run](guidelines-gradle-run.png)
-{% endfigure %}
-
-The Gradle run window opens, shows compilation and then the output of JabRef.
-The spinner will run as long as JabRef is opened.
-
-{% figure caption:"Gradle run Window" %}
-![Gradle run window](guidelines-gradle-run-output.png)
-{% endfigure %}
-
-You can close JabRef again.
-
-After that a new entry called "jabref \[run]" appears 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`.
-
-### Using IntelliJ's internal build system for tests
-
-You should use IntelliJ IDEA's internal build system for compiling and running JabRef tests during development, because it is usually more responsive.
-
-{: .important}
-When using IntelliJ's build system, **it is important** that you understand that JabRef relies on generated sources which are only built through Gradle.
-Therefore, to build or update these dependencies you need to run the `run` (or `assemble`) Gradle task at least once.
-When you followed this guide, you should have done it in the Gradle setup.
-
-{: .note}
-Running JabRef itself through IntellIJ's build system is **not** possible as we encounter difficulties when reading resources though `.class.getResource(...)`.
-Although solutions are discussed in length [on stackoverflow](https://stackoverflow.com/q/26328040/873282), there is no "good" solution for us.
-
-In **File > Settings... > Build, Execution, Deployment > Build Tools > Gradle** the setting "Run tests using:" is set to "IntelliJ IDEA".
-
-{% figure caption:"IntelliJ setting: Run tests using IntelliJ" %}
-![IntelliJ setting: Run tests using IntelliJ"](guidelines-intellij-settings-run-tests-using-intellij.png)
-{% endfigure %}
-
-**In case there are difficulties later, this is the place to switch back to gradle.**
-
-Click "OK" to close the preference dialog.
-
-In the menubar, select **Build > Rebuild project**.
-
-IntelliJ now compiles JabRef.
-This should happen without any error.
-
-Now you can use IntelliJ IDEA's internal build system by using **Build > Build Project**.
-
-To run an example test from IntelliJ, we let IntelliJ create a launch configuration:
-
-Locate the class `BibEntryTest`:
-Press <kbd>Ctrl</kbd>+<kbd>N</kbd>.
-Then, the "Search for classes dialog" pops up.
-Enter `bibenrytest`.
-Now, `BibEntryTest` should appear first:
-
-{% figure caption:"IntelliJ search for class “BibEntryTest”" %}
-![IntelliJ search for class "BibEntryTest"](guidelines-intellij-locate-bibentrytest.png)
-{% endfigure %}
-
-Press <kbd>Enter</kbd> to jump to that class.
-
-Hover on the green play button on `testDefaultConstructor`:
-
-{% figure caption:"However on green play button" %}
-![However on green play button](guidelines-intellij-run-single-test.png)
-{% endfigure %}
-
-Then, click on it.
-A popup menu opens.
-Choose the first entry "Run testDefaultConstructor" and click on it.
-
-{% figure caption:"Run testDefaultConstructor" %}
-![Popup menu - Run testDefaultConstructor](guidelines-intellij-run-single-test-launch-config.png)
-{% endfigure %}
-
-Then, the single test starts.
-
-You also have an entry in the Launch configurations to directly launch the test.
-You can also click on the debug symbol next to it to enable stopping at breakpoints.
-
-{% figure caption:"Launch menu contains BibEntry test case" %}
-![Launch menu contains BibEntry test case](guidelines-intellij-run-bibentry-test.png)
-{% endfigure %}
-
-The tests are green after the run.
-You can also use the play button there to re-execute the tests.
-A right-click on "BibEntryTests" enables to start the debugger.
-
-{% figure caption:"Run window for the BibEntry test case" %}
-![Run window for the BibEntry test case](guidelines-intellij-tests-are-green.png)
-{% endfigure %}
-
-{: .note }
-Essentially, you now have the best of both worlds:
-You can run Gradle tasks using the Gradle Tool Window.
-You can compile and run tests with IntelliJ's faster internal build system
-(unless you haven't made changes to input files that generate sources).
-
-### Using JabRef's code style
-
-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:
-Navigate to **File > Settings... > Plugins"**.
-On the top, click on "Marketplace".
-Then, search for "Checkstyle".
-Click on "Install" choose "CheckStyle-IDEA".
-
-{% figure caption:"Install CheckStyle" %}
-![Install CheckStyle](guidelines-intellij-install-checkstyle.png)
-{% endfigure %}
-
-After clicking, IntelliJ asks for confirmation:
-
-{% figure caption:"Third Party Plugin Privacy Notice" %}
-![Third Party Plugin Privacy Notice](guidelines-intellij-checkstyle-confirmation.png)
-{% endfigure %}
-
-If you agree, click on "Agree" and you can continue.
-
-Afterwards, use the "Restart IDE" button to restart IntelliJ.
-
-{% figure caption:"IntelliJ restart IDE" %}
-![IntelliJ restart IDE](guidelines-intellij-checkstyle-restart-ide.png)
-{% endfigure %}
-
-Click on "Restart" to finally restart.
-
-Wait for IntelliJ coming up again.
-
-Go to **File > Settings... > Editor > Code Style**
-
-Click on the settings wheel (next to the scheme chooser),
-then click "Import Scheme >",
-then click "IntelliJ IDEA code style XML"
-
-{% figure caption:"Location of “Import Scheme > IntelliJ IDEA code style XML”" %}
-![Location of IntelliJ IDEA code style XML](guidelines-intellij-codestyle-import.png)
-{% endfigure %}
-
-You have to browse for the directory `config` in JabRef's code.
-There is an `IntelliJ Code Style.xml`.
-
-{% figure caption:"Browsing for `config/IntelliJ Code Style.xml`" %}
-![Browsing for config/IntelliJ Code Style.xml](guidelines-intellij-codestyle-import-select-xml-file.png)
-{% endfigure %}
-
-Click "OK".
-
-At following dialog is "Import Scheme".
-Click there "OK", too.
-
-{% figure caption:"Import to JabRef" %}
-![Import to JabRef](guidelines-intellij-codestyle-import-as-jabref.png)
-{% endfigure %}
-
-Click on "Apply" to store the preferences.
-
-### Put JabRef's checkstyle configuration in place
-
-Now, put the checkstyle configuration file is in place:
-
-Go to **File > Settings... > Tools > Checkstyle > Configuration File**
-
-Trigger the import dialog of a CheckStyle style by clicking the \[+] button:
-
-{% figure caption:"Trigger the rule import dialog" %}
-![Trigger the rule import dialog](guidelines-intellij-checkstyle-start-import.png)
-{% endfigure %}
-
-Then:
-
-* Put "JabRef" as description.
-* Browse for `config/checkstyle/checkstyle.xml`
-* Tick "Store relative to project location"
-* Click "Next"
-
-{% figure caption:"Filled Rule Import Dialog" %}
-![Filled Rule Import Dialog](guidelines-intellij-checkstyle-import-file.png)
-{% endfigure %}
-
-Click on "Finish"
-
-Activate the CheckStyle configuration file by ticking it in the list
-
-{% figure caption:"JabRef's checkstyle config is activated" %}
-![JabRef's checkstyle config is activated](guidelines-intellij-checkstyle-jabref-active.png)
-{% endfigure %}
-
-Ensure that the [latest CheckStyle version](https://checkstyle.org/releasenotes.html) is selected (10.3.4 or higher).
-Also, set the "Scan Scope" to "Only Java sources (including tests)".
-
-{% figure caption:"Checkstyle is the highest version - and tests are also scanned" %}
-![Checkstyle is the highest version - and tests are also scanned](guidelines-intellij-checkstyle-final-settings.png)
-{% endfigure %}
-
-Save settings by clicking "Apply" and then "OK"
-
-In the lower part of IntelliJ's window, click on "Checkstyle".
-In "Rules", change to "JabRef".
-Then, you can run a check on all modified files.
-
-{% figure caption:"JabRef's style is active - and we are ready to run a check on all modified files" %}
-![JabRef's style is active - and we are ready to run a check on all modified files](guidelines-intellij-checkstyle-window.png)
-{% endfigure %}
-
-### Have auto format working properly in JavaDoc
-
-To have auto format working properly in the context of JavaDoc and line wrapping, "Wrap at right margin" has to be disabled. Details are found in [IntelliJ issue 240517](https://youtrack.jetbrains.com/issue/IDEA-240517).
-
-Go to **File > Settings... > Editor > Code Style > Java > JavaDoc**.
-
-At "Other", disable "Wrap at right margin"
-
-{% figure caption:"”Wrap at right margin” disabled" %}
-!["Wrap at right margin" disabled](guidelines-intellij-editor-javadoc-do-not-wrap.png)
-{% endfigure %}
-
-### Enable proper import cleanup
-
-To enable "magic" creation and auto cleanup of imports, go to **File > Settings... > Editor > General > Auto Import**.
-There, enable both "Add unambiguous imports on the fly" and "Optimize imports on the fly"
-(Source: [JetBrains help](https://www.jetbrains.com/help/idea/creating-and-optimizing-imports.html#automatically-add-import-statements)).
-
-{% figure caption:"Auto import enabled" %}
-![Enable auto import](guidelines-intellij-editor-autoimport.png)
-{% endfigure %}
-
-Press "OK".
-
-### Disable too advanced code folding
-
-Go to **File > Settings... > Editor > General > Code Folding**.
-At "Java", disable "General > File header", "General > Imports", and "Java > One-line methods".
-
-{% figure caption:"Code foldings disabled" %}
-![Code foldings disabled](guidelines-settings-intellij-code-foldings.png)
-{% endfigure %}
-
-Press "OK".
-
-{: .highlight }
-> Now you have configured IntelliJ completely.
-> You can run the main application using Gradle and the test cases using IntelliJ.
-> The code formatting rules are imported - and the most common styling issue at imports is automatically resolved by IntelliJ.
-> Finally, you have Checkstyle running locally so that you can check for styling errors before submitting the pull request.
->
-> We wish you a successful contribution!
-
-### Key hints for IntelliJ
-
-* <kbd>Shift</kbd>+<kbd>Shift</kbd> (AKA double-shift): Open the search dialog.
-* <kbd>Ctrl</kbd>+<kbd>N</kbd>: Open the search dialog and select search for a class.
-* <kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>F</kbd>: Search everywhere in the code base.
-* <kbd>Alt</kbd>+<kbd>F1</kbd> and then <kbd>Enter</kbd>: Locate the file in the search bar on the left side.
-* <kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>T</kbd>: Navigate from a class to the test class.
-
-## Setup for Eclipse
-
-Make sure your Eclipse installation us up to date.
-
-1. Run `./gradlew run` to generate all resources and to check if JabRef runs.
-   * The JabRef GUI should finally appear.
-   * This step is only required once.
-2. Run `./gradlew eclipse`
-   * **This must always be executed, when there are new upstream changes.**
-3. Open or import the existing project in Eclipse as Java project.
-   * Remark: Importing it as gradle project will not work correctly.
-   * Refresh the project in Eclipse
-4. Create a run/debug configuration for the main class `org.jabref.cli.Launcher` 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. `Launcher` or JabRefMain) otherwise it will not work.
-
-       ![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:
-
-       ```text
-          --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
-          --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-exports javafx.controls/com.sun.javafx.scene.control.behavior=com.jfoenix
-          --add-exports javafx.graphics/com.sun.javafx.stage=com.jfoenix
-          --add-exports com.oracle.truffle.regex/com.oracle.truffle.regex=org.graalvm.truffle
-          --patch-module org.jabref=build/resources/main
-       ```
-
-   * In the tab "Dependencies" of the run/debug configuration tick the checkbox "Exclude test code"
-5. Optional: Install the [e(fx)clipse plugin](http://www.eclipse.org/efxclipse/index.html) from the Eclipse marketplace: 1. Help -> Eclipse Marketplace... -> Search tab 2. Enter "e(fx)clipse" in the search dialogue 3. Click "Go" 4. Click "Install" button next to the plugin 5. Click "Finish"
-6. Now you can build and run/debug the application by either using `Launcher` or `JabRefMain`. This is the recommended way, since the application starts quite fast.
-
-### Localization Test Configuration (Eclipse)
-
-To run the `LocalizationConsistencyTest` you need to add some extra module information: Right-click on the file -> "Run/Debug as JUnit test". Go to the Run/debug configuration created for that file and in the arguments tab under VM-configurations add:
-
-```text
---add-exports javafx.graphics/com.sun.javafx.application=ALL-UNNAMED
---add-exports javafx.graphics/com.sun.javafx.stage=ALL-UNNAMED
---add-exports javafx.graphics/com.sun.javafx.stage=com.jfoenix
-```
-
-## Final comments
-
-Got it running? GREAT! You are ready to lurk the code and contribute to JabRef. Please make sure to also read our [contribution guide](https://github.com/JabRef/jabref/blob/main/CONTRIBUTING.md).
-
-### Other tooling
-
-We collected some other tooling recommendations.
-We invite you to read on at our [tool recommendations](../code-howtos/tools.md).
-
-## Common issues
-
-### Java installation
-
-An indication that `JAVA_HOME` is not correctly set or no JDK 20 is installed is following error message:
-
-```text
-compileJava FAILED
-
-FAILURE: Build failed with an exception.
-
-* What went wrong:
-Execution failed for task ':compileJava'.
-> java.lang.ExceptionInInitializerError (no error message)
-```
-
-Another indication is following output
-
-```text
-java.lang.UnsupportedClassVersionError: org/javamodularity/moduleplugin/ModuleSystemPlugin has been compiled by a more recent version of the Java Runtime (class file version 55.0), this version of the Java Runtime only recognizes class file versions up to 52.0
-```
-
-### Issues with generated source files
-
-In rare cases you might encounter problems due to out-dated automatically generated source files. Running `./gradlew clean` deletes these old copies. Do not forget to run at least `./gradlew eclipse` or `./gradlew build` afterwards to regenerate the source files.
-
-### Issues with `buildSrc`
-
-1. Open the context menu of `buildSrc`.
-2. Select "Load/Unload modules".
-3. Unload `jabRef.buildSrc`.
-
-### Issue with "Module org.jsoup" not found, required by org.jabref
-
-Following error message appears:
-
-```text
-Error occurred during initialization of boot layer
-java.lang.module.FindException: Module org.jsoup not found, required by org.jabref
-```
-
-This can include different modules.
-
-1. Go to File -> Invalidate caches...
-2. Check "Clear file system cache and Local History".
-3. Check "Clear VCS Log caches and indexes".
-4. Uncheck the others.
-5. Click on "Invalidate and Restart".
-6. After IntelliJ restarted, you have to do the "buildSrc", "Log4JAppender", and "src-gen" steps again.
-
-### Issues with OpenJFX libraries in local maven repository
-
-There might be problems with building if you have OpenJFX libraries in local maven repository, resulting in errors like this:
-
-```text
- > Could not find javafx-fxml-20-mac.jar (org.openjfx:javafx-fxml:20).
-     Searched in the following locations:
-         file:<your local maven repository path>/repository/org/openjfx/javafx-fxml/20/javafx-fxml-20-mac.jar
-```
-
-As a workaround, you can remove all local OpenJFX artifacts by deleting the whole OpenJFX folder from specified location.
-
-### Issues with `JournalAbbreviationLoader`
-
-In case of a NPE at `Files.copy` at `org.jabref.logic.journals.JournalAbbreviationLoader.loadRepository(JournalAbbreviationLoader.java:30) ~[classes/:?]`, invalidate caches and restart IntelliJ. Then, Build -> Rebuild Project.
-
-If that does not help:
-
-1. Save/Commit all your work
-2. Close IntelliJ
-3. Delete all non-versioned items: `git clean -xdf`. This really destroys data
-4. Execute `./gradlew run`
-5. Start IntelliJ and try again.
-
-### Hints for IntelliJ 2021
-
-In older IntelliJ setups, more things were necessary:
-
-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"](../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
-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.
-
-~~Note that the above steps might not work on IntelliJ 2020.x.\*\*. You have to keep using gradle for executing tasks. See~~ [~~IDEA-249391~~](https://youtrack.jetbrains.com/issue/IDEA-249391) ~~for details.~~
-
-In case all steps are followed, and there are still issues with `SearchBaseVisitor` (e.g., `Error:(16, 25) java: package org.jabref.search does not exist`), you have to delete `src\main\generated\org\jabref\gui\logging\plugins\Log4jPlugins.java`. This is independent of having enabled or disabled Annotation Processing (see above at "Enable Annotation Processing").
-
----
-
-In **File > Settings... > Build, Execution, Deployment > Build Tools > Gradle** the setting "Build and run using" and "Test using" is set to "IntelliJ IDEA".
-
-{% figure caption:"IntelliJ setting: Build and run using IntelliJ" %}
-![IntelliJ setting: Build and run using IntelliJ"](guidelines-intellij-settings-build-and-run-intellij.png)
-{% endfigure %}
-
-**In case there are difficulties later, this is the place to switch back to gradle.**
-
-Click "OK" to close the preference dialog.
-
-In the menubar, select **Build > Rebuild project**.
-
-IntelliJ now compiles JabRef.
-This should happen without any error.
-
-Now you can use IntelliJ IDEA's internal build system by using **Build > Build Project**.
-
-To run JabRef from IntelliJ, we let IntelliJ create a launch configuration:
-
-Locate the class `Launcher`:
-Press <kbd>Ctrl</kbd>+<kbd>N</kbd>.
-Then, the "Search for classes dialog" pops up.
-Enter `Launcher`.
-Now, only one class should have been found:
-
-{% figure caption:"IntelliJ search for class “Launcher”" %}
-![IntelliJ search for class "Launcher"](guidelines-intellij-search-for-launcher.png)
-{% endfigure %}
-
-Press <kbd>Enter</kbd> to jump to that class.
-
-Hover on the green play button.
-
-{% figure caption:"However on green play" %}
-![However on green play](guidelines-intellij-hover-on-play-button.png)
-{% endfigure %}
-
-Then, click on it.
-A popup menu opens.
-Choose the first entry and click on it.
-
-{% figure caption:"Run JabRef via launcher" %}
-![Popup menu - Run JabRef via launcher](guidelines-intellij-run-jabref-from-launcher.png)
-{% endfigure %}
-
-Then, JabRef starts.
-
-You also have an entry in the Launch configurations to directly launch the JabRef GUI:
-
-{% figure caption:"Launch menu contains “Launcher”" %}
-![Launch menu contains launcher](intellij-run-launcher.png)
-{% endfigure %}
-
-You can also click on the debug symbol next to it to enable stopping at breakpoints.
diff --git a/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/eclipse.md b/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/eclipse.md
new file mode 100644
index 00000000000..19fcd469db1
--- /dev/null
+++ b/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/eclipse.md
@@ -0,0 +1,70 @@
+---
+parent: Set up a local workspace
+grand_parent: Getting into the code
+nav_order: 90
+---
+
+# Advanced: Eclipse as IDE
+
+For advanced users, [Eclipse](https://eclipse.org) (`2023-03` or newer) is also possible.
+For JDK20 you need to install the additional [support for jdk20 as extension](https://marketplace.eclipse.org/content/java-20-support-eclipse-2023-03-427)).
+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.
+
+For Eclipse, a working Java (Development Kit) 20 installation is required.
+In the case of IntelliJ, this will be downloaded inside the IDE (if you follow the steps below).
+
+In the command line (terminal in Linux, cmd in Windows) run `javac -version` and make sure that the reported version is Java 20 (e.g., `javac 20`).
+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.
+Please head to <https://adoptium.net/de/temurin/releases> to download JDK 20.
+
+Always make sure your Eclipse installation us up to date.
+
+1. Run `./gradlew run` to generate all resources and to check if JabRef runs.
+   * The JabRef GUI should finally appear.
+   * This step is only required once.
+   * The directory `src-gen` is now filled.
+2. Run `./gradlew eclipse`
+   * **This must always be executed, when there are new upstream changes.**
+3. Open or import the existing project in Eclipse as Java project.
+   * Remark: Importing it as gradle project will not work correctly.
+   * Refresh the project in Eclipse
+4. Create a run/debug configuration for the main class `org.jabref.cli.Launcher` 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. `Launcher` or JabRefMain) otherwise it will not work.
+
+       ![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:
+
+       ```text
+          --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
+          --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-exports javafx.controls/com.sun.javafx.scene.control.behavior=com.jfoenix
+          --add-exports javafx.graphics/com.sun.javafx.stage=com.jfoenix
+          --add-exports com.oracle.truffle.regex/com.oracle.truffle.regex=org.graalvm.truffle
+          --patch-module org.jabref=build/resources/main
+       ```
+
+   * In the tab "Dependencies" of the run/debug configuration tick the checkbox "Exclude test code"
+5. Optional: Install the [e(fx)clipse plugin](http://www.eclipse.org/efxclipse/index.html) from the Eclipse marketplace: 1. Help -> Eclipse Marketplace... -> Search tab 2. Enter "e(fx)clipse" in the search dialogue 3. Click "Go" 4. Click "Install" button next to the plugin 5. Click "Finish"
+6. Now you can build and run/debug the application by either using `Launcher` or `JabRefMain`. This is the recommended way, since the application starts quite fast.
+
+## Localization Test Configuration (Eclipse)
+
+To run the `LocalizationConsistencyTest` you need to add some extra module information: Right-click on the file -> "Run/Debug as JUnit test". Go to the Run/debug configuration created for that file and in the arguments tab under VM-configurations add:
+
+```text
+--add-exports javafx.graphics/com.sun.javafx.application=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.stage=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.stage=com.jfoenix
+```
diff --git a/docs/getting-into-the-code/guidelines-choose-module.png b/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/guidelines-choose-module.png
similarity index 100%
rename from docs/getting-into-the-code/guidelines-choose-module.png
rename to docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/guidelines-choose-module.png
diff --git a/docs/getting-into-the-code/guidelines-choose-open-as-project.png b/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/guidelines-choose-open-as-project.png
similarity index 100%
rename from docs/getting-into-the-code/guidelines-choose-open-as-project.png
rename to docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/guidelines-choose-open-as-project.png
diff --git a/docs/getting-into-the-code/guidelines-gradle-run-output.png b/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/guidelines-gradle-run-output.png
similarity index 100%
rename from docs/getting-into-the-code/guidelines-gradle-run-output.png
rename to docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/guidelines-gradle-run-output.png
diff --git a/docs/getting-into-the-code/guidelines-gradle-run.png b/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/guidelines-gradle-run.png
similarity index 100%
rename from docs/getting-into-the-code/guidelines-gradle-run.png
rename to docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/guidelines-gradle-run.png
diff --git a/docs/getting-into-the-code/guidelines-gradle-tool-windows-refresh.png b/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/guidelines-gradle-tool-windows-refresh.png
similarity index 100%
rename from docs/getting-into-the-code/guidelines-gradle-tool-windows-refresh.png
rename to docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/guidelines-gradle-tool-windows-refresh.png
diff --git a/docs/getting-into-the-code/guidelines-intellij-checkstyle-confirmation.png b/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/guidelines-intellij-checkstyle-confirmation.png
similarity index 100%
rename from docs/getting-into-the-code/guidelines-intellij-checkstyle-confirmation.png
rename to docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/guidelines-intellij-checkstyle-confirmation.png
diff --git a/docs/getting-into-the-code/guidelines-intellij-checkstyle-final-settings.png b/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/guidelines-intellij-checkstyle-final-settings.png
similarity index 100%
rename from docs/getting-into-the-code/guidelines-intellij-checkstyle-final-settings.png
rename to docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/guidelines-intellij-checkstyle-final-settings.png
diff --git a/docs/getting-into-the-code/guidelines-intellij-checkstyle-import-file.png b/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/guidelines-intellij-checkstyle-import-file.png
similarity index 100%
rename from docs/getting-into-the-code/guidelines-intellij-checkstyle-import-file.png
rename to docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/guidelines-intellij-checkstyle-import-file.png
diff --git a/docs/getting-into-the-code/guidelines-intellij-checkstyle-jabref-active.png b/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/guidelines-intellij-checkstyle-jabref-active.png
similarity index 100%
rename from docs/getting-into-the-code/guidelines-intellij-checkstyle-jabref-active.png
rename to docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/guidelines-intellij-checkstyle-jabref-active.png
diff --git a/docs/getting-into-the-code/guidelines-intellij-checkstyle-restart-ide.png b/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/guidelines-intellij-checkstyle-restart-ide.png
similarity index 100%
rename from docs/getting-into-the-code/guidelines-intellij-checkstyle-restart-ide.png
rename to docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/guidelines-intellij-checkstyle-restart-ide.png
diff --git a/docs/getting-into-the-code/guidelines-intellij-checkstyle-start-import.png b/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/guidelines-intellij-checkstyle-start-import.png
similarity index 100%
rename from docs/getting-into-the-code/guidelines-intellij-checkstyle-start-import.png
rename to docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/guidelines-intellij-checkstyle-start-import.png
diff --git a/docs/getting-into-the-code/guidelines-intellij-checkstyle-window.png b/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/guidelines-intellij-checkstyle-window.png
similarity index 100%
rename from docs/getting-into-the-code/guidelines-intellij-checkstyle-window.png
rename to docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/guidelines-intellij-checkstyle-window.png
diff --git a/docs/getting-into-the-code/guidelines-intellij-choose-build-gradle.png b/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/guidelines-intellij-choose-build-gradle.png
similarity index 100%
rename from docs/getting-into-the-code/guidelines-intellij-choose-build-gradle.png
rename to docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/guidelines-intellij-choose-build-gradle.png
diff --git a/docs/getting-into-the-code/guidelines-intellij-codestyle-import-as-jabref.png b/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/guidelines-intellij-codestyle-import-as-jabref.png
similarity index 100%
rename from docs/getting-into-the-code/guidelines-intellij-codestyle-import-as-jabref.png
rename to docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/guidelines-intellij-codestyle-import-as-jabref.png
diff --git a/docs/getting-into-the-code/guidelines-intellij-codestyle-import-select-xml-file.png b/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/guidelines-intellij-codestyle-import-select-xml-file.png
similarity index 100%
rename from docs/getting-into-the-code/guidelines-intellij-codestyle-import-select-xml-file.png
rename to docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/guidelines-intellij-codestyle-import-select-xml-file.png
diff --git a/docs/getting-into-the-code/guidelines-intellij-codestyle-import.png b/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/guidelines-intellij-codestyle-import.png
similarity index 100%
rename from docs/getting-into-the-code/guidelines-intellij-codestyle-import.png
rename to docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/guidelines-intellij-codestyle-import.png
diff --git a/docs/getting-into-the-code/guidelines-intellij-editor-autoimport.png b/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/guidelines-intellij-editor-autoimport.png
similarity index 100%
rename from docs/getting-into-the-code/guidelines-intellij-editor-autoimport.png
rename to docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/guidelines-intellij-editor-autoimport.png
diff --git a/docs/getting-into-the-code/guidelines-intellij-editor-javadoc-do-not-wrap.png b/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/guidelines-intellij-editor-javadoc-do-not-wrap.png
similarity index 100%
rename from docs/getting-into-the-code/guidelines-intellij-editor-javadoc-do-not-wrap.png
rename to docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/guidelines-intellij-editor-javadoc-do-not-wrap.png
diff --git a/docs/getting-into-the-code/guidelines-intellij-enable-annotation-processing.png b/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/guidelines-intellij-enable-annotation-processing.png
similarity index 100%
rename from docs/getting-into-the-code/guidelines-intellij-enable-annotation-processing.png
rename to docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/guidelines-intellij-enable-annotation-processing.png
diff --git a/docs/getting-into-the-code/guidelines-intellij-install-checkstyle.png b/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/guidelines-intellij-install-checkstyle.png
similarity index 100%
rename from docs/getting-into-the-code/guidelines-intellij-install-checkstyle.png
rename to docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/guidelines-intellij-install-checkstyle.png
diff --git a/docs/getting-into-the-code/guidelines-intellij-installs-temurin.png b/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/guidelines-intellij-installs-temurin.png
similarity index 100%
rename from docs/getting-into-the-code/guidelines-intellij-installs-temurin.png
rename to docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/guidelines-intellij-installs-temurin.png
diff --git a/docs/getting-into-the-code/guidelines-intellij-locate-bibentrytest.png b/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/guidelines-intellij-locate-bibentrytest.png
similarity index 100%
rename from docs/getting-into-the-code/guidelines-intellij-locate-bibentrytest.png
rename to docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/guidelines-intellij-locate-bibentrytest.png
diff --git a/docs/getting-into-the-code/guidelines-intellij-project-settings-jdk18.png b/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/guidelines-intellij-project-settings-jdk18.png
similarity index 100%
rename from docs/getting-into-the-code/guidelines-intellij-project-settings-jdk18.png
rename to docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/guidelines-intellij-project-settings-jdk18.png
diff --git a/docs/getting-into-the-code/guidelines-intellij-run-bibentry-test.png b/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/guidelines-intellij-run-bibentry-test.png
similarity index 100%
rename from docs/getting-into-the-code/guidelines-intellij-run-bibentry-test.png
rename to docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/guidelines-intellij-run-bibentry-test.png
diff --git a/docs/getting-into-the-code/guidelines-intellij-run-single-test-launch-config.png b/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/guidelines-intellij-run-single-test-launch-config.png
similarity index 100%
rename from docs/getting-into-the-code/guidelines-intellij-run-single-test-launch-config.png
rename to docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/guidelines-intellij-run-single-test-launch-config.png
diff --git a/docs/getting-into-the-code/guidelines-intellij-run-single-test.png b/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/guidelines-intellij-run-single-test.png
similarity index 100%
rename from docs/getting-into-the-code/guidelines-intellij-run-single-test.png
rename to docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/guidelines-intellij-run-single-test.png
diff --git a/docs/getting-into-the-code/guidelines-intellij-settings-build-and-run-intellij.png b/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/guidelines-intellij-settings-build-and-run-intellij.png
similarity index 100%
rename from docs/getting-into-the-code/guidelines-intellij-settings-build-and-run-intellij.png
rename to docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/guidelines-intellij-settings-build-and-run-intellij.png
diff --git a/docs/getting-into-the-code/guidelines-intellij-settings-run-tests-using-intellij.png b/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/guidelines-intellij-settings-run-tests-using-intellij.png
similarity index 100%
rename from docs/getting-into-the-code/guidelines-intellij-settings-run-tests-using-intellij.png
rename to docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/guidelines-intellij-settings-run-tests-using-intellij.png
diff --git a/docs/getting-into-the-code/guidelines-intellij-start-window.png b/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/guidelines-intellij-start-window.png
similarity index 100%
rename from docs/getting-into-the-code/guidelines-intellij-start-window.png
rename to docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/guidelines-intellij-start-window.png
diff --git a/docs/getting-into-the-code/guidelines-intellij-tests-are-green.png b/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/guidelines-intellij-tests-are-green.png
similarity index 100%
rename from docs/getting-into-the-code/guidelines-intellij-tests-are-green.png
rename to docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/guidelines-intellij-tests-are-green.png
diff --git a/docs/getting-into-the-code/guidelines-overridden-compiler-parameters.png b/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/guidelines-overridden-compiler-parameters.png
similarity index 100%
rename from docs/getting-into-the-code/guidelines-overridden-compiler-parameters.png
rename to docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/guidelines-overridden-compiler-parameters.png
diff --git a/docs/getting-into-the-code/guidelines-select-download-jdk.png b/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/guidelines-select-download-jdk.png
similarity index 100%
rename from docs/getting-into-the-code/guidelines-select-download-jdk.png
rename to docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/guidelines-select-download-jdk.png
diff --git a/docs/getting-into-the-code/guidelines-select-jdk-18-eclipse-temurin.png b/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/guidelines-select-jdk-18-eclipse-temurin.png
similarity index 100%
rename from docs/getting-into-the-code/guidelines-select-jdk-18-eclipse-temurin.png
rename to docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/guidelines-select-jdk-18-eclipse-temurin.png
diff --git a/docs/getting-into-the-code/guidelines-settings-gradle-gradlejvm-is-projectjvm.png b/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/guidelines-settings-gradle-gradlejvm-is-projectjvm.png
similarity index 100%
rename from docs/getting-into-the-code/guidelines-settings-gradle-gradlejvm-is-projectjvm.png
rename to docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/guidelines-settings-gradle-gradlejvm-is-projectjvm.png
diff --git a/docs/getting-into-the-code/guidelines-settings-intellij-code-foldings.png b/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/guidelines-settings-intellij-code-foldings.png
similarity index 100%
rename from docs/getting-into-the-code/guidelines-settings-intellij-code-foldings.png
rename to docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/guidelines-settings-intellij-code-foldings.png
diff --git a/docs/getting-into-the-code/guidelines-trust-project.png b/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/guidelines-trust-project.png
similarity index 100%
rename from docs/getting-into-the-code/guidelines-trust-project.png
rename to docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/guidelines-trust-project.png
diff --git a/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/index.md b/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/index.md
new file mode 100644
index 00000000000..cfdec7620ca
--- /dev/null
+++ b/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/index.md
@@ -0,0 +1,14 @@
+---
+parent: Getting into the code
+has_children: true
+nav_order: 2
+---
+# Set up a local workspace
+
+{: .important }
+These steps are very important. They allow you to focus on the content and ensure that the code formatting always goes well.
+
+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. Please follow the steps one-by-one.
+
+First, we work on prerequisites (software, account, code fork) you need to get started to develop JabRef.
+Then, we work on a proper IDE setup.
diff --git a/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/intellij-11-code-into-ide.md b/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/intellij-11-code-into-ide.md
new file mode 100644
index 00000000000..9d8edbed39e
--- /dev/null
+++ b/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/intellij-11-code-into-ide.md
@@ -0,0 +1,36 @@
+---
+parent: Set up a local workspace
+grand_parent: Getting into the code
+nav_order: 11
+---
+
+# Step 1: Get the code into IntelliJ
+
+Start IntelliJ.
+
+IntelliJ shows the following window:
+
+{% figure caption:"IntelliJ Start Window" %}
+![IntelliJ Start Window](guidelines-intellij-start-window.png)
+{% endfigure %}
+
+Click on "Open"
+
+Choose `build.gradle` in the root of the jabref source folder:
+
+{% figure caption:"Choose `build.gradle` in the “Open Project or File” dialog" %}
+![Open File or Project dialog](guidelines-intellij-choose-build-gradle.png)
+{% endfigure %}
+
+After pressing "OK", IntelliJ asks how that file should be opened.
+Answer: "Open as Project"
+
+{% figure caption:"Choose “Open as Project” in the Open Project dialog" %}
+![Open Project dialog](guidelines-choose-open-as-project.png)
+{% endfigure %}
+
+Then, trust the project:
+
+{% figure caption:"Choose “Trust Project” in the “Trust and Open Project” dialog" %}
+![Trust and Open Project dialog](guidelines-trust-project.png)
+{% endfigure %}
diff --git a/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/intellij-12-build.md b/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/intellij-12-build.md
new file mode 100644
index 00000000000..e1feb9355a7
--- /dev/null
+++ b/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/intellij-12-build.md
@@ -0,0 +1,182 @@
+---
+parent: Set up a local workspace
+grand_parent: Getting into the code
+nav_order: 12
+---
+
+# Step 2: Setup the build system: JDK and Gradle
+
+## Ensure that JDK 20 is available to IntelliJ
+
+Ensure you have a Java 20 SDK configured by navigating to **File > Project Structure... > Platform Settings > SDKs**.
+
+{% figure caption:"JDKs 11, 14, and 15 shown in available SDKs. JDK 20 is missing." %}
+![Plattform Settings - SDKs](../../images/intellij-choose-jdk-adoptopenjdk-on-windows-project-settings.png)
+{% endfigure %}
+
+If there is another JDK than JDK 20 selected, click on the plus button and choose "Download JDK..."
+
+{% figure caption:"Download JDK..." %}
+![Plattform Settings - SDKs - plus button - Download JDK...](guidelines-select-download-jdk.png)
+{% endfigure %}
+
+Select JDK version 20 and then Eclipse Temurin (showing JDK 18 as example).
+
+{% figure caption:"Example for JDK 18 - Choose Eclipse Temurin" %}
+![Download Eclipse Temurin](guidelines-select-jdk-18-eclipse-temurin.png)
+{% endfigure %}
+
+After clicking "Download", IntelliJ installs Eclipse Temurin:
+
+{% figure caption:"IntelliJ installs Eclipse Temurin" %}
+![IntelliJ installs Eclipse Temurin](guidelines-intellij-installs-temurin.png)
+{% endfigure %}
+
+Navigate to **Project Settings > Project** and ensure that the projects' SDK is Java 20
+
+{% figure caption:"Project SDK is pinned to the downloaded SDK (showing JDK 18 as example)" %}
+![Project SDK is JDK 18](guidelines-intellij-project-settings-jdk18.png)
+{% endfigure %}
+
+Click "OK" to store the changes.
+
+## Configure the Build System
+
+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 20.
+
+{% figure caption:"Gradle JVM is project SDK (showing JDK 18 as example)" %}
+![Gradle JVM is project SDK](guidelines-settings-gradle-gradlejvm-is-projectjvm.png)
+{% endfigure %}
+
+To prepare IntelliJ's build system additional steps are required:
+
+Navigate to **Build, Execution, Deployment > Compiler > Java Compiler**, and under "Override compiler parameters per-module", click add (\[+]) and choose `JabRef.main`:
+
+{% figure caption:"Choose JabRef.main" %}
+![Gradle JVM is project SDK](guidelines-choose-module.png)
+{% endfigure %}
+
+Then double click inside the cell "Compilation options" and enter following parameters:
+
+```text
+--add-exports=javafx.controls/com.sun.javafx.scene.control=org.jabref
+--add-exports=org.controlsfx.controls/impl.org.controlsfx.skin=org.jabref
+```
+
+Press <kbd>Enter</kbd> to have the value really stored.
+Otherwise, it seems like the setting is stored, but it is not there if you re-open this preference dialog.
+Then click on "Apply" to store the setting.
+
+{% figure caption:"Resulting settings for module JabRef.main" %}
+![Overridden compiler parameters](guidelines-overridden-compiler-parameters.png)
+{% endfigure %}
+
+If this step is omited, 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)`.
+
+Enable annotation processors by navigating to **Build, Execution, Deployment > Compiler > Annotation processors** and check "Enable annotation processing"
+
+{% figure caption:"Enabled annotation processing" %}
+![Enable annotation processing](guidelines-intellij-enable-annotation-processing.png)
+{% endfigure %}
+
+## Using Gradle from within IntelliJ IDEA
+
+{: .note }
+Ensuring JabRef builds with Gradle should always the first step because, e.g. it generates additional sources that are required for compiling the code.
+
+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.
+
+{% figure caption:"Reload of Gradle project" %}
+![Highlighted reload button](guidelines-gradle-tool-windows-refresh.png)
+{% endfigure %}
+
+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**.
+
+{% figure caption:"JabRef > Tasks > application > run" %}
+![JabRef > Tasks > application > run](guidelines-gradle-run.png)
+{% endfigure %}
+
+The Gradle run window opens, shows compilation and then the output of JabRef.
+The spinner will run as long as JabRef is opened.
+
+{% figure caption:"Gradle run Window" %}
+![Gradle run window](guidelines-gradle-run-output.png)
+{% endfigure %}
+
+You can close JabRef again.
+
+After that a new entry called "jabref \[run]" appears in the run configurations.
+Now you can also select "jabref \[run]" and either run or debug the application from within IntelliJ.
+
+{: .note }
+You can run any other development task in a similar way.
+
+## Using IntelliJ's internal build system for tests
+
+In **File > Settings... > Build, Execution, Deployment > Build Tools > Gradle** the setting "Run tests using:" is set to "IntelliJ IDEA".
+
+{% figure caption:"IntelliJ setting: Run tests using IntelliJ" %}
+![IntelliJ setting: Run tests using IntelliJ"](guidelines-intellij-settings-run-tests-using-intellij.png)
+{% endfigure %}
+
+{: .note }
+In case there are difficulties later, this is the place to switch back to gradle.
+
+Click "OK" to close the preference dialog.
+
+In the menubar, select **Build > Rebuild project**.
+
+IntelliJ now compiles JabRef.
+This should happen without any error.
+
+Now you can use IntelliJ IDEA's internal build system by using **Build > Build Project**.
+
+## Final build system checks (optional)
+
+To run an example test from IntelliJ, we let IntelliJ create a launch configuration:
+
+Locate the class `BibEntryTest`:
+Press <kbd>Ctrl</kbd>+<kbd>N</kbd>.
+Then, the "Search for classes dialog" pops up.
+Enter `bibenrytest`.
+Now, `BibEntryTest` should appear first:
+
+{% figure caption:"IntelliJ search for class “BibEntryTest”" %}
+![IntelliJ search for class "BibEntryTest"](guidelines-intellij-locate-bibentrytest.png)
+{% endfigure %}
+
+Press <kbd>Enter</kbd> to jump to that class.
+
+Hover on the green play button on `testDefaultConstructor`:
+
+{% figure caption:"However on green play button" %}
+![However on green play button](guidelines-intellij-run-single-test.png)
+{% endfigure %}
+
+Then, click on it.
+A popup menu opens.
+Choose the first entry "Run testDefaultConstructor" and click on it.
+
+{% figure caption:"Run testDefaultConstructor" %}
+![Popup menu - Run testDefaultConstructor](guidelines-intellij-run-single-test-launch-config.png)
+{% endfigure %}
+
+Then, the single test starts.
+
+You also have an entry in the Launch configurations to directly launch the test.
+You can also click on the debug symbol next to it to enable stopping at breakpoints.
+
+{% figure caption:"Launch menu contains BibEntry test case" %}
+![Launch menu contains BibEntry test case](guidelines-intellij-run-bibentry-test.png)
+{% endfigure %}
+
+The tests are green after the run.
+You can also use the play button there to re-execute the tests.
+A right-click on "BibEntryTests" enables to start the debugger.
+
+{% figure caption:"Run window for the BibEntry test case" %}
+![Run window for the BibEntry test case](guidelines-intellij-tests-are-green.png)
+{% endfigure %}
diff --git a/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/intellij-13-code-style.md b/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/intellij-13-code-style.md
new file mode 100644
index 00000000000..510edaba7c0
--- /dev/null
+++ b/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/intellij-13-code-style.md
@@ -0,0 +1,158 @@
+---
+parent: Set up a local workspace
+grand_parent: Getting into the code
+nav_order: 13
+---
+
+# Step 3: Using JabRef's code style
+
+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:
+Navigate to **File > Settings... > Plugins"**.
+On the top, click on "Marketplace".
+Then, search for "Checkstyle".
+Click on "Install" choose "CheckStyle-IDEA".
+
+{% figure caption:"Install CheckStyle" %}
+![Install CheckStyle](guidelines-intellij-install-checkstyle.png)
+{% endfigure %}
+
+After clicking, IntelliJ asks for confirmation:
+
+{% figure caption:"Third Party Plugin Privacy Notice" %}
+![Third Party Plugin Privacy Notice](guidelines-intellij-checkstyle-confirmation.png)
+{% endfigure %}
+
+If you agree, click on "Agree" and you can continue.
+
+Afterwards, use the "Restart IDE" button to restart IntelliJ.
+
+{% figure caption:"IntelliJ restart IDE" %}
+![IntelliJ restart IDE](guidelines-intellij-checkstyle-restart-ide.png)
+{% endfigure %}
+
+Click on "Restart" to finally restart.
+
+Wait for IntelliJ coming up again.
+
+Go to **File > Settings... > Editor > Code Style**
+
+Click on the settings wheel (next to the scheme chooser),
+then click "Import Scheme >",
+then click "IntelliJ IDEA code style XML"
+
+{% figure caption:"Location of “Import Scheme > IntelliJ IDEA code style XML”" %}
+![Location of IntelliJ IDEA code style XML](guidelines-intellij-codestyle-import.png)
+{% endfigure %}
+
+You have to browse for the directory `config` in JabRef's code.
+There is an `IntelliJ Code Style.xml`.
+
+{% figure caption:"Browsing for `config/IntelliJ Code Style.xml`" %}
+![Browsing for config/IntelliJ Code Style.xml](guidelines-intellij-codestyle-import-select-xml-file.png)
+{% endfigure %}
+
+Click "OK".
+
+At following dialog is "Import Scheme".
+Click there "OK", too.
+
+{% figure caption:"Import to JabRef" %}
+![Import to JabRef](guidelines-intellij-codestyle-import-as-jabref.png)
+{% endfigure %}
+
+Click on "Apply" to store the preferences.
+
+## Put JabRef's checkstyle configuration in place
+
+Now, put the checkstyle configuration file is in place:
+
+Go to **File > Settings... > Tools > Checkstyle > Configuration File**
+
+Trigger the import dialog of a CheckStyle style by clicking the \[+] button:
+
+{% figure caption:"Trigger the rule import dialog" %}
+![Trigger the rule import dialog](guidelines-intellij-checkstyle-start-import.png)
+{% endfigure %}
+
+Then:
+
+* Put "JabRef" as description.
+* Browse for `config/checkstyle/checkstyle.xml`
+* Tick "Store relative to project location"
+* Click "Next"
+
+{% figure caption:"Filled Rule Import Dialog" %}
+![Filled Rule Import Dialog](guidelines-intellij-checkstyle-import-file.png)
+{% endfigure %}
+
+Click on "Finish"
+
+Activate the CheckStyle configuration file by ticking it in the list
+
+{% figure caption:"JabRef's checkstyle config is activated" %}
+![JabRef's checkstyle config is activated](guidelines-intellij-checkstyle-jabref-active.png)
+{% endfigure %}
+
+Ensure that the [latest CheckStyle version](https://checkstyle.org/releasenotes.html) is selected (10.3.4 or higher).
+Also, set the "Scan Scope" to "Only Java sources (including tests)".
+
+{% figure caption:"Checkstyle is the highest version - and tests are also scanned" %}
+![Checkstyle is the highest version - and tests are also scanned](guidelines-intellij-checkstyle-final-settings.png)
+{% endfigure %}
+
+Save settings by clicking "Apply" and then "OK"
+
+In the lower part of IntelliJ's window, click on "Checkstyle".
+In "Rules", change to "JabRef".
+Then, you can run a check on all modified files.
+
+{% figure caption:"JabRef's style is active - and we are ready to run a check on all modified files" %}
+![JabRef's style is active - and we are ready to run a check on all modified files](guidelines-intellij-checkstyle-window.png)
+{% endfigure %}
+
+## Have auto format working properly in JavaDoc
+
+To have auto format working properly in the context of JavaDoc and line wrapping, "Wrap at right margin" has to be disabled. Details are found in [IntelliJ issue 240517](https://youtrack.jetbrains.com/issue/IDEA-240517).
+
+Go to **File > Settings... > Editor > Code Style > Java > JavaDoc**.
+
+At "Other", disable "Wrap at right margin"
+
+{% figure caption:"”Wrap at right margin” disabled" %}
+!["Wrap at right margin" disabled](guidelines-intellij-editor-javadoc-do-not-wrap.png)
+{% endfigure %}
+
+## Enable proper import cleanup
+
+To enable "magic" creation and auto cleanup of imports, go to **File > Settings... > Editor > General > Auto Import**.
+There, enable both "Add unambiguous imports on the fly" and "Optimize imports on the fly"
+(Source: [JetBrains help](https://www.jetbrains.com/help/idea/creating-and-optimizing-imports.html#automatically-add-import-statements)).
+
+{% figure caption:"Auto import enabled" %}
+![Enable auto import](guidelines-intellij-editor-autoimport.png)
+{% endfigure %}
+
+Press "OK".
+
+## Disable too advanced code folding
+
+Go to **File > Settings... > Editor > General > Code Folding**.
+At "Java", disable "General > File header", "General > Imports", and "Java > One-line methods".
+
+{% figure caption:"Code foldings disabled" %}
+![Code foldings disabled](guidelines-settings-intellij-code-foldings.png)
+{% endfigure %}
+
+Press "OK".
+
+## Final comments
+
+{: .highlight }
+> Now you have configured IntelliJ completely.
+> You can run the main application using Gradle and the test cases using IntelliJ.
+> The code formatting rules are imported - and the most common styling issue at imports is automatically resolved by IntelliJ.
+> Finally, you have Checkstyle running locally so that you can check for styling errors before submitting the pull request.
+
+Got it running? GREAT! You are ready to lurk the code and contribute to JabRef. Please make sure to also read our [contribution guide](https://github.com/JabRef/jabref/blob/main/CONTRIBUTING.md).
diff --git a/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/pre-01-github-account.md b/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/pre-01-github-account.md
new file mode 100644
index 00000000000..3b9c939b027
--- /dev/null
+++ b/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/pre-01-github-account.md
@@ -0,0 +1,25 @@
+---
+parent: Set up a local workspace
+grand_parent: Getting into the code
+nav_order: 1
+---
+
+# Pre Condition 1: GitHub Account
+
+If you do not yet have a GitHub account, please [create one](https://github.com/join).
+
+Proposals for account names:
+
+* Login similar to your university account. Example: `koppor`
+* Use your last name prefixed by the first letter of your first name. Example: `okopp`
+* Use `firstname.lastname`. Example: `oliver.kopp`
+
+You can hide your email address by following the recommendations at [https://saraford.net/2017/02/19/how-to-hide-your-email-address-in-your-git-commits-but-still-get-contributions-to-show-up-on-your-github-profile-050/](https://saraford.net/2017/02/19/how-to-hide-your-email-address-in-your-git-commits-but-still-get-contributions-to-show-up-on-your-github-profile-050/).
+
+Most developers, though, do not hide their email address. They use one which may get public. Mostly, they create a new email account for development only. That account then be used for development mailing lists, mail exchange with other developers, etc.
+
+Examples:
+
+* Same login as in GitHub (see above). Example: `koppor@gmail.com`
+* "`it`" in the name. Example: `kopp.it@gmail.com`
+* Use the university login. Example: `st342435@stud.uni-stuttgart.de`
diff --git a/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/pre-02-software.md b/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/pre-02-software.md
new file mode 100644
index 00000000000..fb3cd441352
--- /dev/null
+++ b/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/pre-02-software.md
@@ -0,0 +1,31 @@
+---
+parent: Set up a local workspace
+grand_parent: Getting into the code
+nav_order: 2
+---
+
+# Pre Condition 2: Required Software
+
+## git
+
+It is strongly recommended that you have git installed.
+
+* On Debian-based distros: `sudo apt-get install git`
+* On Windows: [Download the installer](http://git-scm.com/download/win) and install it. Using [chocolatey](https://chocolatey.org/), you can run `choco install git.install -y --params "/GitAndUnixToolsOnPath /WindowsTerminal` to a) install git and b) have Linux commands such as `grep` available in your `PATH`.
+* [Official installation instructions](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git)
+
+## Installed IDE
+
+We suggest [IntelliJ IDEA](https://www.jetbrains.com/idea/?from=jabref).
+The Community Edition works well.
+Most contributors use the Ultimate Edition, because they are students getting that edition for free.
+
+{: .highlight }
+Currently, the 2023.1 version does **not** work for initial setup.
+Please head to <https://www.jetbrains.com/idea/download/other.html> and get 2022.3.3.
+You can update the IDE after a proper setup to the newest version.
+
+## Other Tooling
+
+We collected some other tooling recommendations.
+We invite you to read on at our [tool recommendations](../../code-howtos/tools.md).
diff --git a/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/pre-03-code.md b/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/pre-03-code.md
new file mode 100644
index 00000000000..eaab5a062de
--- /dev/null
+++ b/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/pre-03-code.md
@@ -0,0 +1,61 @@
+---
+parent: Set up a local workspace
+grand_parent: Getting into the code
+nav_order: 3
+---
+
+# Pre Condition 3: Code on the local machine
+
+This section explains how you get the JabRef code onto your machine in a form allowing you to make contributions.
+
+## Fork JabRef into your GitHub account
+
+1. Log into your GitHub account
+2. Go to [https://github.com/JabRef/jabref](https://github.com/JabRef/jabref)
+3. Create a fork by clicking at fork button on the right top corner
+4. A fork repository will be created under your account `https://github.com/YOUR_USERNAME/jabref`.
+
+## 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 choosing a path that does not contain any special (non-ASCII or whitespace) characters.
+In the following, we will use `c:\git-repositories` as base folder:
+
+```cmd
+cd \
+mkdir git-repositories
+cd git-repositories
+git clone --depth=10 https://github.com/JabRef/jabref.git
+cd jabref
+git remote rename origin upstream
+git remote add origin https://github.com/YOUR_USERNAME/jabref.git
+git branch --set-upstream-to=origin/main main
+```
+
+{: .important }
+> Note that putting the repo JabRef directly on `C:\` or any other drive letter on Windows causes compile errors (**negative example**: `C:\jabref`).
+>
+> Further, if you are building on Windows, make sure that the absolute path to the location of the clone does not contain folders starting with '`u`' (**negative example**: `C:\university\jabref`) as this may currently also cause [compile errors](https://github.com/JabRef/jabref/issues/9783).
+
+{: .note-title }
+> Background
+>
+> Initial cloning might be very slow (`27.00 KiB/s`).
+>
+> To prevent this, first the `upstream` repository is cloned.
+> This repository seems to live in the caches of GitHub.
+>
+> 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.
+>
+> Now, you have two remote repositories, where `origin` is yours and `upstream` is the one of the JabRef organization.
+>
+> You can see it with `git remote -v`:
+>
+> ```cmd
+> c:\git-repositories\jabref> git remote -v
+> origin     https://github.com/YOURUSERNAME/jabref.git (fetch)
+> origin     https://github.com/YOURUSERNAME/jabref.git (push)
+> upstream     https://github.com/jabref/jabref.git (fetch)
+> upstream     https://github.com/jabref/jabref.git (push)
+> ```
diff --git a/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/trouble-shooting.md b/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/trouble-shooting.md
new file mode 100644
index 00000000000..54316245203
--- /dev/null
+++ b/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/trouble-shooting.md
@@ -0,0 +1,105 @@
+---
+parent: Set up a local workspace
+grand_parent: Getting into the code
+nav_order: 99
+---
+
+# Trouble shooting
+
+## Issues with `buildSrc`
+
+1. Open the context menu of `buildSrc`.
+2. Select "Load/Unload modules".
+3. Unload `jabRef.buildSrc`.
+
+## Issues with generated source files
+
+In rare cases you might encounter problems due to out-dated automatically generated source files. Running gradle task "clean" (Command line: `./gradlew clean`) deletes these old copies. Do not forget to run at least `./gradlew assemble` or `./gradlew eclipse` afterwards to regenerate the source files.
+
+## Issue with "Module org.jsoup" not found, required by org.jabref
+
+Following error message appears:
+
+```text
+Error occurred during initialization of boot layer
+java.lang.module.FindException: Module org.jsoup not found, required by org.jabref
+```
+
+This can include different modules.
+
+1. Go to File -> Invalidate caches...
+2. Check "Clear file system cache and Local History".
+3. Check "Clear VCS Log caches and indexes".
+4. Uncheck the others.
+5. Click on "Invalidate and Restart".
+6. After IntelliJ restarted, you have to do the "buildSrc", "Log4JAppender", and "src-gen" steps again.
+
+## Issues with OpenJFX libraries in local maven repository
+
+There might be problems with building if you have OpenJFX libraries in local maven repository, resulting in errors like this:
+
+```text
+ > Could not find javafx-fxml-20-mac.jar (org.openjfx:javafx-fxml:20).
+     Searched in the following locations:
+         file:<your local maven repository path>/repository/org/openjfx/javafx-fxml/20/javafx-fxml-20-mac.jar
+```
+
+As a workaround, you can remove all local OpenJFX artifacts by deleting the whole OpenJFX folder from specified location.
+
+## Issues with `JournalAbbreviationLoader`
+
+In case of a NPE at `Files.copy` at `org.jabref.logic.journals.JournalAbbreviationLoader.loadRepository(JournalAbbreviationLoader.java:30) ~[classes/:?]`, invalidate caches and restart IntelliJ. Then, Build -> Rebuild Project.
+
+If that does not help:
+
+1. Save/Commit all your work
+2. Close IntelliJ
+3. Delete all non-versioned items: `git clean -xdf`. This really destroys data
+4. Execute `./gradlew run`
+5. Start IntelliJ and try again.
+
+## Hints for IntelliJ 2021
+
+In older IntelliJ setups, more things were necessary:
+
+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"](../../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
+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.
+
+~~Note that the above steps might not work on IntelliJ 2020.x.\*\*. You have to keep using gradle for executing tasks. See~~ [~~IDEA-249391~~](https://youtrack.jetbrains.com/issue/IDEA-249391) ~~for details.~~
+
+In case all steps are followed, and there are still issues with `SearchBaseVisitor` (e.g., `Error:(16, 25) java: package org.jabref.search does not exist`), you have to delete `src\main\generated\org\jabref\gui\logging\plugins\Log4jPlugins.java`. This is independent of having enabled or disabled Annotation Processing (see above at "Enable Annotation Processing").
+
+## Java installation
+
+An indication that `JAVA_HOME` is not correctly set or no JDK 20 is installed in the IDE is following error message:
+
+```text
+compileJava FAILED
+
+FAILURE: Build failed with an exception.
+
+* What went wrong:
+Execution failed for task ':compileJava'.
+> java.lang.ExceptionInInitializerError (no error message)
+```
+
+Another indication is following output
+
+```text
+java.lang.UnsupportedClassVersionError: org/javamodularity/moduleplugin/ModuleSystemPlugin has been compiled by a more recent version of the Java Runtime (class file version 55.0), this version of the Java Runtime only recognizes class file versions up to 52.0
+```
diff --git a/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/vscode.md b/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/vscode.md
new file mode 100644
index 00000000000..f2dfde15afc
--- /dev/null
+++ b/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/vscode.md
@@ -0,0 +1,56 @@
+---
+parent: Set up a local workspace
+grand_parent: Getting into the code
+nav_order: 91
+---
+
+# Advanced: VS Code as IDE
+
+We are working on supporting VS Code for development.
+There is basic support, but important things such as our code conventions are not in place.
+Thus, use at your own risk.
+
+Quick howto:
+
+1. Start VS Code in the JabRef directory: `code .`.
+2. There will be a poup asking "Reopen in Container". Click on that link.
+3. VS Code restarts. Wait about 3 minutes until the dev container is build. You can click on "Starting Dev Container (show log)" to see the progress.
+4. Afterwards, the Java project is imported. You can open the log (Click on "Check details"). Do that.
+5. The terminal (tab "Java Build Status") will show some project synchronization and hang at `80% [797/1000]`.
+   It keeps hanging at `Importing root project: 80% Refreshing '/jabref'`.
+   Just wait.
+   Then it hangs at `Synchronizing Gradle build at /workspaces/jabref: 80%`.
+   Just wait.
+   Then it takes long for `Refreshing workspace:`.
+   Just wait.
+   **Note:** If you had the project opened in IntelliJ before, this might cause issues (as outlined at <https://issuetracker.google.com/issues/255903901?pli=1>).
+   Close everything, ensure that you committed your changes (if any), then execute `git clean -xdf` to wipe out all changes and created files - and start from step 1 again.
+6. On the left, you will see a gradle button.
+7. Click on the gradle button and open **JabRef -&gt; Tasks -&gt; application**.
+8. Double click on **run**.
+9. In the terminal, a new tab "run" opens.
+10. On your desktop machine, open <http://127.0.0.1:6080/> in a web browser.
+   Do not open the proposed port `6050`.
+   This is JabRef's remote command port.
+11. Use `vscode` as password.
+12. You will see an opened JabRef.
+
+Alternative to steps 9 to 10:
+
+In case interaction using the web browser is too slow, you can use a VNC connection:
+
+1. Install [VNC Connect](https://www.realvnc.com/en/connect/)
+2. Use `vscode` as password
+
+## Trouble shooting
+
+In case there are reading errors on the file system, the docker container probably is out of order.
+Close VS Code.
+Stop the docker container, kill docker process in the Task Manager (if necessary).
+Start docker again.
+Start VS Code again.
+
+## Background
+
+We use VS Code's [Dev Containers](https://code.visualstudio.com/docs/devcontainers/containers) feature.
+Thereby, we use [desktop-lite](https://github.com/devcontainers/features/tree/main/src/desktop-lite#options) to enable viewing the JabRef app.
diff --git a/docs/getting-into-the-code/guidelines-intellij-hover-on-play-button.png b/docs/images/intellij-hover-on-play-button.png
similarity index 100%
rename from docs/getting-into-the-code/guidelines-intellij-hover-on-play-button.png
rename to docs/images/intellij-hover-on-play-button.png
diff --git a/docs/getting-into-the-code/guidelines-intellij-run-jabref-from-launcher.png b/docs/images/intellij-run-jabref-from-launcher.png
similarity index 100%
rename from docs/getting-into-the-code/guidelines-intellij-run-jabref-from-launcher.png
rename to docs/images/intellij-run-jabref-from-launcher.png
diff --git a/docs/getting-into-the-code/intellij-run-launcher.png b/docs/images/intellij-run-launcher.png
similarity index 100%
rename from docs/getting-into-the-code/intellij-run-launcher.png
rename to docs/images/intellij-run-launcher.png
diff --git a/docs/getting-into-the-code/guidelines-intellij-search-for-launcher.png b/docs/images/intellij-search-for-launcher.png
similarity index 100%
rename from docs/getting-into-the-code/guidelines-intellij-search-for-launcher.png
rename to docs/images/intellij-search-for-launcher.png
diff --git a/docs/teaching.md b/docs/teaching.md
index d2f46159b49..8840772dc1b 100644
--- a/docs/teaching.md
+++ b/docs/teaching.md
@@ -106,7 +106,7 @@ Course [10915-01: Software Engineering](https://dmi.unibas.ch/de/studium/compute
 
 #### University of Stuttgart, Germany
 
-Course "Softwarepraktikum" as part of the [BSc Informatik](https://www.f05.uni-stuttgart.de/informatik/interessierte/bachelor/informatik/)
+Course "Softwarepraktikum" as part of the [BSc Informatik](https://www.uni-stuttgart.de/studium/bachelor/informatik-b.sc./)
 
 * Summary: A group of three students experienced the full software engineering process within one semester. They worked part-time for the project.
 * Successfully run in 2012
diff --git a/eclipse.gradle b/eclipse.gradle
index dab4df54bb6..9d61901d09e 100644
--- a/eclipse.gradle
+++ b/eclipse.gradle
@@ -25,12 +25,11 @@ 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:javafx.controls/com.sun.javafx.scene.control.behavior=com.jfoenix';
+                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-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:';
diff --git a/external-libraries.md b/external-libraries.md
index fce62adf6fd..e71e0f24bf1 100644
--- a/external-libraries.md
+++ b/external-libraries.md
@@ -42,6 +42,34 @@ Note:    It is important to include v1.5.54 or later as v1.5.54 is the first ver
 
 (Sorted alphabetically by Id)
 
+```yaml
+Id:      at.favre.lib
+Project: HMAC-based Key Derivation Function (HKDF) RFC 5869
+URL:     https://github.com/patrickfav/hkdf
+License: Apache-2.0
+```
+
+```yaml
+Id:      com.dlsc.gemsfx:gemsfx
+Project: GemsFX
+URL:     https://github.com/dlsc-software-consulting-gmbh/GemsFX
+License: Apache-2.0
+```
+
+```yaml
+Id:      com.dlsc.pickerfx:pickerfx
+Project: GemsFX
+URL:     https://github.com/dlsc-software-consulting-gmbh/PickerFX
+License: Apache-2.0
+```
+
+```yaml
+Id:      com.dlsc.unitfx:unitfx
+Project: UnitFX
+URL:     https://github.com/dlsc-software-consulting-gmbh/UnitFX
+License: Apache-2.0
+```
+
 ```yaml
 Id:      com.fasterxml.jackson
 Project: Jackson Project
@@ -49,6 +77,27 @@ URL:     https://github.com/FasterXML/jackson
 License: Apache-2.0
 ```
 
+```yaml
+Id:      com.github.hypfvieh.dbus-java
+Project: dbus-java
+URL:     https://github.com/hypfvieh/dbus-java
+License: MIT
+```
+
+```yaml
+Id:      com.github.hypfvieh.java-utils
+Project: java-utils
+URL:     https://github.com/hypfvieh/java-utils
+License: MIT
+```
+
+```yaml
+Id:      com.github.javakeyring
+Project: Java Keyring
+URL:     https://github.com/javakeyring/java-keyring
+License: BSD-3-Clause
+```
+
 ```yaml
 Id:      com.github.JabRef
 Project: afterburner.fx
@@ -99,13 +148,6 @@ URL:     https://github.com/lemire/javaewah
 License: Apache-2.0
 ```
 
-```yaml
-Id:      com.jfoenix:jfoenix
-Project: JavaFX MAterial Design Library
-URL:     https://github.com/jfoenixadmin/JFoenix
-License: Apache-2.0
-```
-
 ```yaml
 Id:      com.konghq.unirest
 Project: Unirest for Java
@@ -134,6 +176,27 @@ URL:     https://repo1.maven.org/maven2/com/oracle/ojdbc/ojdbc10/19.3.0.0/ojdbc1
 License: Oracle Free Use Terms and Conditions (FUTC)
 ```
 
+```yaml
+Id:      com.squareup.okhttp3:okhttp
+Project: OkHttp
+URL:     https://square.github.io/okhttp/
+License: Apache-2.0
+```
+
+```yaml
+Id:      com.squareup.okio:okio
+Project: OkHttp
+URL:     https://github.com/square/okio/
+License: Apache-2.0
+```
+
+```yaml
+Id:      com.squareup.retrofit2:retrofit
+Project: Retrofit 2
+URL:     https://github.com/square/retrofit
+License: Apache-2.0
+```
+
 ```yaml
 Id:      com.sun.istack:istack-commons-runtime
 Project: iStack Common Utility Code
@@ -155,6 +218,13 @@ URL:     https://github.com/vsch/flexmark-java
 License: BSD-2-Clause
 ```
 
+```yaml
+Id:      commons-beanutils:commons-beanutils
+Project: Apache Commons Beanutils
+URL:     https://commons.apache.org/proper/commons-beanutils/
+License: Apache-2.0
+```
+
 ```yaml
 Id:      commons-cli:commons-cli
 Project: Apache Commons CLI
@@ -169,6 +239,13 @@ URL:     https://commons.apache.org/proper/commons-codec/
 License: Apache-2.0
 ```
 
+```yaml
+Id:      commons-collections:commons-collections
+Project: Apache Commons Collections
+URL:     https://commons.apache.org/proper/commons-collections/
+License: Apache-2.0
+```
+
 ```yaml
 Id:      commons-io:commons-io
 Project: Apache Commons IO
@@ -183,6 +260,20 @@ URL:     http://commons.apache.org/logging/
 License: Apache-2.0
 ```
 
+```yaml
+Id:      commons-digester:commons-digester
+Project: Apache Commons Digester
+URL:     https://commons.apache.org/proper/commons-digester/
+License: Apache-2.0
+```
+
+```yaml
+Id:      commons-validator:commons-validator
+Project: Apache Commons Validator
+URL:     https://commons.apache.org/proper/commons-validator/
+License: Apache-2.0
+```
+
 ```yaml
 Id:      de.saxsys:mvvmfx
 Project: mvvm(fx)
@@ -190,6 +281,13 @@ URL:     https://github.com/sialcasa/mvvmFX
 License: Apache-2.0
 ```
 
+```yaml
+Id:      de.swiesend:secret-service
+Project: Secret Service
+URL:     https://github.com/swiesend/secret-service
+License: MIT
+```
+
 ```yaml
 Id:      de.saxsys:mvvmfx-validation
 Project: mvvm(fx)
@@ -330,13 +428,6 @@ URL:     http://pdfbox.apache.org
 License: Apache-2.0
 ```
 
-```yaml
-Id:      org.apache.tika:tika-core
-Project: Apache Tika
-URL:     https://tika.apache.org/
-License: Apache-2.0
-```
-
 ```yaml
 Id:      org.bouncycastle:bcprov-jdk15on
 Project: The Legion of the Bouncy Castle
@@ -403,6 +494,13 @@ Path:    lib/icu4j.jar
 SourcePath: lib/ic4j-src.jar
 ```
 
+```yaml
+Id:      org.jooq:jool
+Project: JOOλ
+URL:     https://github.com/jOOQ/jOOL
+License: Apache-2.0
+```
+
 ```yaml
 Id:      org.jsoup:jsoup
 Project: jsoup
@@ -511,10 +609,31 @@ License: Apache-2.0
 ```yaml
 Id:      org.yaml:snakeyaml
 Project: SnakeYAML
-URL:     https://bitbucket.org/asomov/snakeyaml-engine/src/master/
+URL:     https://bitbucket.org/snakeyaml/snakeyaml-engine/src/master/
 License: Apache-2.0
 ```
 
+```yaml
+Id:      pt.davidafsilva.apple:jkeychain
+Project: JKeyChain
+URL:     https://github.com/davidafsilva/jkeychain
+License: BSD-2-Clause
+```
+
+```yaml
+Id:      tech.units:indriya
+Project: Indriya - JSR 385 - Reference Implementation
+URL:     https://github.com/unitsofmeasurement/indriya
+License: BSD-3-Clause
+```
+
+```yaml
+Id:      tech.uom.lib:uom-lib-common
+Project: Units of Measurement Libraries - extending and complementing JSR 385
+URL:     https://github.com/unitsofmeasurement/uom-lib
+License: BSD-3-Clause
+```
+
 ## Sorted list of runtime dependencies output by gradle
 
 1. `gradlew dependencies > build/dependencies.txt`
@@ -522,122 +641,138 @@ 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.14.1
-com.fasterxml.jackson.core:jackson-core:2.14.1
-com.fasterxml.jackson.core:jackson-databind:2.14.1
-com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.14.1
-com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.14.1
-com.fasterxml.jackson:jackson-bom:2.14.1
-com.github.JabRef:afterburner.fx:testmoduleinfo-SNAPSHOT
+at.favre.lib:hkdf:1.1.0
+com.dlsc.gemsfx:gemsfx:1.77.0
+com.dlsc.pickerfx:pickerfx:1.2.0
+com.dlsc.unitfx:unitfx:1.0.10
+com.fasterxml.jackson.core:jackson-annotations:2.15.2
+com.fasterxml.jackson.core:jackson-core:2.15.2
+com.fasterxml.jackson.core:jackson-databind:2.15.2
+com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.15.2
+com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.15.2
+com.fasterxml.jackson:jackson-bom:2.15.2
+com.github.hypfvieh:dbus-java-core:4.2.1
+com.github.hypfvieh:dbus-java-transport-native-unixsocket:4.2.1
+com.github.javakeyring:java-keyring:1.0.4
 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.code.gson:gson:2.10
+com.googlecode.javaewah:JavaEWAH:1.2.3
+com.google.errorprone:error_prone_annotations:2.18.0
 com.google.guava:failureaccess:1.0.1
-com.google.guava:guava:31.1-jre
+com.google.guava:guava:32.1.2-jre
+com.google.guava:guava-parent:32.1.2-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.13
-com.h2database:h2-mvstore:2.1.214
-com.jfoenix:jfoenix:9.0.10
-com.konghq:unirest-java:3.14.1
+com.google.j2objc:j2objc-annotations:2.8
+com.h2database:h2-mvstore:2.2.220
+com.konghq:unirest-java:3.14.5
 com.microsoft.azure:applicationinsights-core:2.4.1
 com.microsoft.azure:applicationinsights-logging-log4j2:2.4.1
+commons-beanutils:commons-beanutils:1.9.4
+commons-cli:commons-cli:1.5.0
+commons-codec:commons-codec:1.15
+commons-collections:commons-collections:3.2.2
+commons-digester:commons-digester:2.1
+commons-logging:commons-logging:1.2
+commons-validator:commons-validator:1.7
 com.oracle.ojdbc:ojdbc10:19.3.0.0
 com.oracle.ojdbc:ons:19.3.0.0
 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.squareup.okhttp3:okhttp:3.12.0
+com.squareup.okio:okio:1.15.0
+com.squareup.retrofit2:retrofit:2.6.1
 com.sun.activation:jakarta.activation:2.0.1
 com.sun.istack:istack-commons-runtime:4.0.1
 com.tobiasdiez:easybind:2.2.1-SNAPSHOT
-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.15
-commons-io:commons-io:2.11.0
-commons-logging:commons-logging:1.2
+com.vladsch.flexmark:flexmark:0.64.8
+com.vladsch.flexmark:flexmark-util-ast:0.64.8
+com.vladsch.flexmark:flexmark-util-builder:0.64.8
+com.vladsch.flexmark:flexmark-util-collection:0.64.8
+com.vladsch.flexmark:flexmark-util-data:0.64.8
+com.vladsch.flexmark:flexmark-util-dependency:0.64.8
+com.vladsch.flexmark:flexmark-util-format:0.64.8
+com.vladsch.flexmark:flexmark-util-html:0.64.8
+com.vladsch.flexmark:flexmark-util-misc:0.64.8
+com.vladsch.flexmark:flexmark-util-sequence:0.64.8
+com.vladsch.flexmark:flexmark-util-visitor:0.64.8
 de.saxsys:mvvmfx:1.8.0
-de.undercouch:citeproc-java:3.0.0-alpha.6
+de.swiesend:secret-service:1.8.1-jdk17
+de.undercouch:citeproc-java:3.0.0-beta.2
 eu.lestard:doc-annotations:0.2
 info.debatty:java-string-similarity:2.0.0
 io.github.java-diff-utils:java-diff-utils:4.12
 jakarta.annotation:jakarta.annotation-api:2.1.1
 jakarta.inject:jakarta.inject-api:2.0.1
 jakarta.xml.bind:jakarta.xml.bind-api:3.0.1
+javax.measure:unit-api:2.1.2
 net.harawata:appdirs:1.2.1
-net.java.dev.jna:jna-platform:5.6.0
-net.java.dev.jna:jna:5.6.0
+net.java.dev.jna:jna:5.13.0
+net.java.dev.jna:jna-platform:5.13.0
 net.jcip:jcip-annotations:1.0
 net.jodah:typetools:0.6.1
-org.antlr:antlr4-runtime:4.9.3
-org.apache.commons:commons-csv:1.9.0
-org.apache.commons:commons-lang3:3.12.0
+one.jpro.jproutils:tree-showing:0.2.2
+org.antlr:antlr4-runtime:4.13.0
+org.apache.commons:commons-csv:1.10.0
+org.apache.commons:commons-lang3:3.13.0
 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:httpcore-nio:4.4.13
 org.apache.httpcomponents:httpmime:4.5.13
-org.apache.lucene:lucene-analysis-common:9.4.2
-org.apache.lucene:lucene-core:9.4.1
-org.apache.lucene:lucene-core:9.4.2
-org.apache.lucene:lucene-highlighter:9.4.2
-org.apache.lucene:lucene-queries:9.4.1
-org.apache.lucene:lucene-queries:9.4.2
-org.apache.lucene:lucene-queryparser:9.4.2
-org.apache.lucene:lucene-sandbox:9.4.2
-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.6.0
-org.bouncycastle:bcprov-jdk18on:1.71.1
-org.checkerframework:checker-qual:3.12.0
-org.codehaus.mojo:animal-sniffer-annotations:1.18
+org.apache.lucene:lucene-analysis-common:9.7.0
+org.apache.lucene:lucene-core:9.7.0
+org.apache.lucene:lucene-highlighter:9.7.0
+org.apache.lucene:lucene-queries:9.7.0
+org.apache.lucene:lucene-queryparser:9.7.0
+org.apache.lucene:lucene-sandbox:9.7.0
+org.apache.pdfbox:fontbox:3.0.0
+org.apache.pdfbox:pdfbox:3.0.0
+org.apache.pdfbox:pdfbox-io:3.0.0
+org.apache.pdfbox:xmpbox:3.0.0
+org.bouncycastle:bcprov-jdk18on:1.76
+org.checkerframework:checker-qual:3.33.0
 org.controlsfx:controlsfx:11.1.2
-org.eclipse.jgit:org.eclipse.jgit:6.3.0.202209071007-r
-org.fxmisc.flowless:flowless:0.7.0
-org.fxmisc.richtext:richtextfx:0.11.0
+org.eclipse.jgit:org.eclipse.jgit:6.6.0.202305301015-r
+org.fxmisc.flowless:flowless:0.7.1
+org.fxmisc.richtext:richtextfx:0.11.1
 org.fxmisc.undo:undofx:2.1.1
 org.fxmisc.wellbehaved:wellbehavedfx:0.3.3
 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.15.3
+org.jabref:afterburner.fx:1.1.0-SNAPSHOT
+org.jbibtex:jbibtex:1.0.20
+org.jetbrains:annotations:24.0.1
+org.jooq:jool:0.9.15
+org.jsoup:jsoup:1.16.1
+org.kordamp.ikonli:ikonli-bootstrapicons-pack:12.3.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.4.1
-org.libreoffice:unoloader:7.4.1
-org.mariadb.jdbc:mariadb-java-client:2.7.7
-org.openjfx:javafx-base:19
-org.openjfx:javafx-controls:19
-org.openjfx:javafx-fxml:19
-org.openjfx:javafx-graphics:19
-org.openjfx:javafx-media:19
-org.openjfx:javafx-swing:19
-org.openjfx:javafx-web:19
-org.postgresql:postgresql:42.5.1
+org.kordamp.ikonli:ikonli-materialdesign-pack:12.3.1
+org.kordamp.ikonli:ikonli-material-pack:12.3.1
+org.libreoffice:libreoffice:7.5.3
+org.libreoffice:unoloader:7.6.0
+org.mariadb.jdbc:mariadb-java-client:2.7.9
+org.openjfx:javafx-base:20
+org.openjfx:javafx-controls:20
+org.openjfx:javafx-fxml:20
+org.openjfx:javafx-graphics:20
+org.openjfx:javafx-media:20
+org.openjfx:javafx-swing:20
+org.openjfx:javafx-web:20
+org.postgresql:postgresql:42.6.0
 org.reactfx:reactfx:2.0-M5
 org.scala-lang:scala-library:2.13.8
-org.slf4j:slf4j-api:2.0.5
-org.tinylog:slf4j-tinylog:2.5.0
-org.tinylog:tinylog-api:2.5.0
-org.tinylog:tinylog-impl:2.5.0
-org.yaml:snakeyaml:1.33
+org.slf4j:slf4j-api:2.0.7
+org.tinylog:slf4j-tinylog:2.6.2
+org.tinylog:tinylog-api:2.6.2
+org.tinylog:tinylog-impl:2.6.2
+org.yaml:snakeyaml:2.0
+pt.davidafsilva.apple:jkeychain:1.1.0
+tech.units:indriya:2.1.2
+tech.uom.lib:uom-lib-common:2.1
 ```
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index c1962a79e29..7f93135c49b 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 8196ca1994f..864d6c47512 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,8 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=a62c5f99585dd9e1f95dab7b9415a0e698fa9dd1e6c38537faa81ac078f4d23e
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
+distributionSha256Sum=591855b517fc635b9e04de1d05d5e76ada3f89f5fc76f87978d1b245b4f69225
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index aeb74cbb43e..0adc8e1a532 100755
--- a/gradlew
+++ b/gradlew
@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -130,10 +131,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
diff --git a/rewrite.yml b/rewrite.yml
new file mode 100644
index 00000000000..69508f500c9
--- /dev/null
+++ b/rewrite.yml
@@ -0,0 +1,181 @@
+---
+type: specs.openrewrite.org/v1beta/recipe
+name: org.jabref.config.rewrite.cleanup
+recipeList:
+  # generated by extracting class names out of https://github.com/openrewrite/rewrite-static-analysis
+  #
+  # 1. git clone https://github.com/openrewrite/rewrite-static-analysis.git
+  # 2. cd rewrite-static-analysis/src/main/java/org/openrewrite/staticanalysis
+  # 3. find . -type f -name "*.java" -exec basename {} .java \; | awk '{print "  - org.openrewrite.staticanalysis." $1}' | grep -v "Visitor" | grep -v "package-info"
+  #
+  # Then, following to are removed:
+  # Sometimes fails to produce correct results
+  # - org.openrewrite.staticanalysis.FinalizePrivateFields
+  # Creates constructor at the end of the class which violates JabRef's code style
+  # - org.openrewrite.staticanalysis.HideUtilityClassConstructor
+  # We are not relying on serialization, thus we do not want to maintain the serialVersionUID manually
+  # - org.openrewrite.staticanalysis.AddSerialVersionUidToSerializable
+  # Leads to "if (Boolean.TRUE.equals(proxyPrefs.shouldUseProxy())) {", which reads strange
+  # - org.openrewrite.staticanalysis.AvoidBoxedBooleanExpressions
+  # Leads to exception
+  # - org.openrewrite.staticanalysis.CombineSemanticallyEqualCatchBlocks
+  # Unreadable code
+  #   .ifPresent((Path selectedDirectory) -> {
+  # - org.openrewrite.staticanalysis.ExplicitLambdaArgumentTypes
+  # Unreable code (e.g., public final class BindingsHelper)
+  # - org.openrewrite.staticanalysis.FinalClass
+  # Unreable code
+  #  - org.openrewrite.staticanalysis.FinalizeLocalVariables
+  # Unreadable code
+  #  - org.openrewrite.staticanalysis.FinalizeMethodArguments
+  # Not sure about the consequences (LibraryTab).
+  #  - org.openrewrite.staticanalysis.FixStringFormatExpressions
+  # Leads to unreadable code (this.shouldAutoComplete.set(shouldAutoComplete1);)
+  #  - org.openrewrite.staticanalysis.HiddenField
+  # Leads to unreadable code
+  #  - org.openrewrite.staticanalysis.InlineVariable
+  # Leads to unreadable code
+  #  - org.openrewrite.staticanalysis.LambdaBlockToExpression
+  # Works on case-senstive file systems only
+  #  - org.openrewrite.staticanalysis.LowercasePackage
+  # Needs manual intervention (not fixable at existing code)
+  #  - org.openrewrite.staticanalysis.MethodNameCasing
+  # Needs manual intervention (not fixable at existing code)
+  #  - org.openrewrite.staticanalysis.MinimumSwitchCases
+  # Leads to unreadable code
+  #  - org.openrewrite.staticanalysis.NoFinalizedLocalVariables
+  # Contradicts JabRef's checkstyle
+  #  - org.openrewrite.staticanalysis.NoWhitespaceAfter
+  # We sometimes need == instead of equals
+  #  - org.openrewrite.staticanalysis.ReferentialEqualityToObjectEquals
+  # AuthorListTest uses System.gc
+  #  - org.openrewrite.staticanalysis.RemoveCallsToSystemGc
+  # We need that for our CLI
+  #  - org.openrewrite.staticanalysis.RemoveSystemOutPrintln
+  # Removes a field - and that wrong
+  #  - org.openrewrite.staticanalysis.RemoveUnusedPrivateMethods
+  # Crashes
+  #  - org.openrewrite.staticanalysis.RenameExceptionInEmptyCatch
+  # Also renames private static final varialbes (e.g., LOGGER, ALL_ENTRIES_GROUP_DEFAULT_ICON, ...)
+  #  - org.openrewrite.staticanalysis.RenamePrivateFieldsToCamelCase
+  # Does something else (deleting a field in TreeNode)
+  #  - org.openrewrite.staticanalysis.ReplaceDeprecatedRuntimeExecMethods
+  # Leads to compile errors
+  #  - org.openrewrite.staticanalysis.ReplaceDuplicateStringLiterals
+  # Not everything correctly transformed
+  #  - org.openrewrite.staticanalysis.ReplaceLambdaWithMethodReference
+  # Crashes
+  #  - org.openrewrite.staticanalysis.ReplaceStackWithDeque
+  # We want to keep JDK16 (and not downgrade to JDK11)
+  #  - org.openrewrite.staticanalysis.ReplaceStreamToListWithCollect
+  # Changes one item only
+  # - org.openrewrite.staticanalysis.ReplaceStringBuilderWithString
+  # We like text blocks
+  #  - org.openrewrite.staticanalysis.ReplaceTextBlockWithString
+  # Hangs
+  #  - org.openrewrite.staticanalysis.ReplaceValidateNotNullHavingVarargsWithObjectsRequireNonNull
+  # We need that in OOBibStyleTest
+  #  - org.openrewrite.staticanalysis.SimplifyConstantIfBranchExecution
+
+  # We log and wrap the exceptions
+  #  - org.openrewrite.staticanalysis.UnnecessaryCatch
+  # Does not work
+  #  - org.openrewrite.staticanalysis.UnnecessaryCloseInTryWithResources
+  # Does not work
+  #  - org.openrewrite.staticanalysis.UnnecessaryExplicitTypeArguments
+  - org.openrewrite.staticanalysis.UnnecessaryParentheses
+  # Does not work
+  #  - org.openrewrite.staticanalysis.UnnecessaryPrimitiveAnnotations
+  # Removes too much throws
+  #  - org.openrewrite.staticanalysis.UnnecessaryThrows
+  # Crashes
+  #  - org.openrewrite.staticanalysis.UseAsBuilder
+  # "Upgrades" too much, deletes fields
+  #  - org.openrewrite.staticanalysis.UseCollectionInterfaces
+  # Does not work at TreeNode
+  #  - org.openrewrite.staticanalysis.UseDiamondOperator
+  # States that it gains performance, but the code is more unreable
+  #  - org.openrewrite.staticanalysis.UseForEachRemoveInsteadOfSetRemoveAll
+  # We voted against it
+  #  - org.openrewrite.staticanalysis.ExplicitInitialization
+
+  - org.openrewrite.java.ShortenFullyQualifiedTypeReferences
+
+  - org.openrewrite.staticanalysis.AtomicPrimitiveEqualsUsesGet
+  - org.openrewrite.staticanalysis.BigDecimalRoundingConstantsToEnums
+  - org.openrewrite.staticanalysis.BooleanChecksNotInverted
+  - org.openrewrite.staticanalysis.CaseInsensitiveComparisonsDoNotChangeCase
+  - org.openrewrite.staticanalysis.CatchClauseOnlyRethrows
+  - org.openrewrite.staticanalysis.ChainStringBuilderAppendCalls
+  # Might need manual intervention, because negations are not treated properly
+  - org.openrewrite.staticanalysis.CompareEnumsWithEqualityOperator
+  - org.openrewrite.staticanalysis.ControlFlowIndentation
+  - org.openrewrite.staticanalysis.CovariantEquals
+  - org.openrewrite.staticanalysis.DeclarationSiteTypeVariance
+  # Needs manual intervention
+#  - org.openrewrite.staticanalysis.DefaultComesLast
+  - org.openrewrite.staticanalysis.EmptyBlock
+  - org.openrewrite.staticanalysis.EqualsAvoidsNull
+  # Needs manual intervention
+#  - org.openrewrite.staticanalysis.ExplicitCharsetOnStringGetBytes
+  - org.openrewrite.staticanalysis.ExternalizableHasNoArgsConstructor
+  - org.openrewrite.staticanalysis.FallThrough
+#  - org.openrewrite.staticanalysis.ForLoopControlVariablePostfixOperators
+  - org.openrewrite.staticanalysis.ForLoopIncrementInUpdate
+  - org.openrewrite.staticanalysis.IndexOfChecksShouldUseAStartPosition
+  - org.openrewrite.staticanalysis.IndexOfReplaceableByContains
+#  - org.openrewrite.staticanalysis.IndexOfShouldNotCompareGreaterThanZero
+  - org.openrewrite.staticanalysis.InstanceOfPatternMatch
+  - org.openrewrite.staticanalysis.IsEmptyCallOnCollections
+#  - org.openrewrite.staticanalysis.MissingOverrideAnnotation
+#  - org.openrewrite.staticanalysis.ModifierOrder
+  - org.openrewrite.staticanalysis.MultipleVariableDeclarations
+  - org.openrewrite.staticanalysis.NeedBraces
+  - org.openrewrite.staticanalysis.NestedEnumsAreNotStatic
+  - org.openrewrite.staticanalysis.NewStringBuilderBufferWithCharArgument
+  - org.openrewrite.staticanalysis.NoDoubleBraceInitialization
+#  - org.openrewrite.staticanalysis.NoEmptyCollectionWithRawType
+  - org.openrewrite.staticanalysis.NoEqualityInForCondition
+  - org.openrewrite.staticanalysis.NoFinalizer
+#  - org.openrewrite.staticanalysis.NoPrimitiveWrappersForToStringOrCompareTo
+#  - org.openrewrite.staticanalysis.NoRedundantJumpStatements
+  - org.openrewrite.staticanalysis.NoToStringOnStringType
+  - org.openrewrite.staticanalysis.NoValueOfOnStringType
+#  - org.openrewrite.staticanalysis.NoWhitespaceBefore
+  - org.openrewrite.staticanalysis.ObjectFinalizeCallsSuper
+#  - org.openrewrite.staticanalysis.OperatorWrap
+  - org.openrewrite.staticanalysis.PrimitiveWrapperClassConstructorToValueOf
+  - org.openrewrite.staticanalysis.RedundantFileCreation
+  - org.openrewrite.staticanalysis.RemoveCallsToObjectFinalize
+  - org.openrewrite.staticanalysis.RemoveEmptyJavaDocParameters
+  - org.openrewrite.staticanalysis.RemoveExtraSemicolons
+  - org.openrewrite.staticanalysis.RemoveJavaDocAuthorTag
+  - org.openrewrite.staticanalysis.RemoveRedundantTypeCast
+  - org.openrewrite.staticanalysis.RemoveUnneededAssertion
+  - org.openrewrite.staticanalysis.RemoveUnneededBlock
+#  - org.openrewrite.staticanalysis.RemoveUnusedLocalVariables
+#  - org.openrewrite.staticanalysis.RemoveUnusedPrivateFields
+#  - org.openrewrite.staticanalysis.RenameLocalVariablesToCamelCase
+  - org.openrewrite.staticanalysis.RenameMethodsNamedHashcodeEqualOrTostring
+  - org.openrewrite.staticanalysis.ReplaceRedundantFormatWithPrintf
+  - org.openrewrite.staticanalysis.ReplaceStringBuilderWithString
+#  - org.openrewrite.staticanalysis.ShortenFullyQualifiedTypeReferences
+#  - org.openrewrite.staticanalysis.SimplifyConsecutiveAssignments
+#  - org.openrewrite.staticanalysis.SimplifyCompoundStatement
+  - org.openrewrite.staticanalysis.SimplifyBooleanExpression
+  - org.openrewrite.staticanalysis.SimplifyBooleanReturn
+  - org.openrewrite.staticanalysis.SimplifyDurationCreationUnits
+  - org.openrewrite.staticanalysis.StaticMethodNotFinal
+  - org.openrewrite.staticanalysis.StringLiteralEquality
+  - org.openrewrite.staticanalysis.TypecastParenPad
+  - org.openrewrite.staticanalysis.UnwrapRepeatableAnnotations
+  - org.openrewrite.staticanalysis.UpperCaseLiteralSuffixes
+#  - org.openrewrite.staticanalysis.UseJavaStyleArrayDeclarations
+  - org.openrewrite.staticanalysis.UseLambdaForFunctionalInterface
+#  - org.openrewrite.staticanalysis.UseListSort
+  - org.openrewrite.staticanalysis.UseObjectNotifyAll
+  - org.openrewrite.staticanalysis.UseStandardCharset
+  - org.openrewrite.staticanalysis.UseStringReplace
+  - org.openrewrite.staticanalysis.UseSystemLineSeparator
+  - org.openrewrite.staticanalysis.WhileInsteadOfFor
+#  - org.openrewrite.staticanalysis.WriteOctalValuesAsDecimal
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 3a000c8a78f..eebb2ec3d62 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -10,10 +10,11 @@ description: |
   `snap connect jabref:removable-media`
 grade: stable
 confinement: strict
-base: core20
+base: core22
 compression: lzo
 architectures:
-  - build-on: amd64
+ - build-on: [amd64, arm64]
+   build-for: [amd64]
 
 plugs:
   home:
@@ -45,10 +46,10 @@ layout:
 apps:
   jabref:
     command: bin/JabRef
-    extensions: [gnome-3-38]
+    extensions: [gnome]
   browser-proxy:
     command: lib/jabrefHost.py
-    extensions: [gnome-3-38]
+    extensions: [gnome]
 
 environment:
   _JAVA_OPTIONS: "-Duser.home=$SNAP_USER_DATA"
@@ -57,7 +58,7 @@ environment:
 parts:
   jabref:
     plugin: dump
-    source: https://builds.jabref.org/main/JabRef-5.10-portable_linux.tar.gz
+    source: https://builds.jabref.org/main/JabRef-5.11-portable_linux.tar.gz
     stage-packages:
       - x11-utils
     override-build: |
@@ -80,10 +81,10 @@ parts:
       - jabref-launcher
     plugin: nil
     build-snaps:
-      - gnome-3-38-2004
+      - gnome-42-2204
     override-prime: |
       set -eux
-      for snap in "gnome-3-38-2004"; do  # List all content-snaps you're using here
+      for snap in "gnome-42-2204"; do  # List all content-snaps you're using here
           cd "/snap/$snap/current" && find . -type f,l -exec rm -f "$SNAPCRAFT_PRIME/{}" "$SNAPCRAFT_PRIME/usr/{}" \;
       done
       for CRUFT in bug lintian man; do
diff --git a/src/jmh/java/org/jabref/benchmarks/Benchmarks.java b/src/jmh/java/org/jabref/benchmarks/Benchmarks.java
index b0073114ac5..8eae854642c 100644
--- a/src/jmh/java/org/jabref/benchmarks/Benchmarks.java
+++ b/src/jmh/java/org/jabref/benchmarks/Benchmarks.java
@@ -9,9 +9,11 @@
 import java.util.stream.Collectors;
 
 import org.jabref.gui.Globals;
+import org.jabref.logic.bibtex.FieldPreferences;
+import org.jabref.logic.citationkeypattern.CitationKeyPatternPreferences;
 import org.jabref.logic.exporter.BibWriter;
 import org.jabref.logic.exporter.BibtexDatabaseWriter;
-import org.jabref.logic.exporter.SavePreferences;
+import org.jabref.logic.exporter.SelfContainedSaveConfiguration;
 import org.jabref.logic.formatter.bibtexfields.HtmlToLatexFormatter;
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.logic.importer.fileformat.BibtexParser;
@@ -32,8 +34,6 @@
 import org.jabref.model.groups.WordKeywordGroup;
 import org.jabref.model.metadata.MetaData;
 import org.jabref.model.search.rules.SearchRules.SearchFlags;
-import org.jabref.model.util.DummyFileUpdateMonitor;
-import org.jabref.preferences.GeneralPreferences;
 import org.jabref.preferences.JabRefPreferences;
 
 import org.openjdk.jmh.Main;
@@ -80,14 +80,19 @@ public void init() throws Exception {
     private StringWriter getOutputWriter() throws IOException {
         StringWriter outputWriter = new StringWriter();
         BibWriter bibWriter = new BibWriter(outputWriter, OS.NEWLINE);
-        BibtexDatabaseWriter databaseWriter = new BibtexDatabaseWriter(bibWriter, mock(GeneralPreferences.class), mock(SavePreferences.class), new BibEntryTypesManager());
+        BibtexDatabaseWriter databaseWriter = new BibtexDatabaseWriter(
+                bibWriter,
+                mock(SelfContainedSaveConfiguration.class),
+                mock(FieldPreferences.class),
+                mock(CitationKeyPatternPreferences.class),
+                new BibEntryTypesManager());
         databaseWriter.savePartOfDatabase(new BibDatabaseContext(database, new MetaData()), database.getEntries());
         return outputWriter;
     }
 
     @Benchmark
     public ParserResult parse() throws IOException {
-        BibtexParser parser = new BibtexParser(Globals.prefs.getImportFormatPreferences(), new DummyFileUpdateMonitor());
+        BibtexParser parser = new BibtexParser(Globals.prefs.getImportFormatPreferences());
         return parser.parse(new StringReader(bibtexString));
     }
 
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
index e500c1ca5b7..e4c66f4e4eb 100644
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@@ -9,16 +9,13 @@
     // JavaFX
     requires javafx.base;
     requires javafx.graphics;
-    requires javafx.swing;
     requires javafx.controls;
     requires javafx.web;
     requires javafx.fxml;
     requires afterburner.fx;
-    requires com.jfoenix;
+    requires com.dlsc.gemsfx;
+    uses com.dlsc.gemsfx.TagsField;
     requires de.saxsys.mvvmfx;
-    requires reactfx;
-    requires de.saxsys.mvvmfx.validation;
-    requires org.fxmisc.flowless;
 
     requires org.kordamp.ikonli.core;
     requires org.kordamp.ikonli.javafx;
@@ -51,6 +48,7 @@
     with org.jabref.gui.logging.GuiWriter,
          org.jabref.gui.logging.ApplicationInsightsWriter;
 
+    // Preferences and XML
     requires java.prefs;
 
     // Annotations (@PostConstruct)
@@ -104,14 +102,20 @@
     requires jbibtex;
     requires citeproc.java;
 
-    requires pdfbox;
-    requires xmpbox;
+    requires org.apache.pdfbox;
+    requires org.apache.xmpbox;
     requires com.ibm.icu;
 
     requires flexmark;
     requires flexmark.util.ast;
     requires flexmark.util.data;
 
+    requires com.h2database.mvstore;
+
+    requires java.keyring;
+
+    requires org.jooq.jool;
+
     // fulltext search
     requires org.apache.lucene.core;
     // In case the version is updated, please also adapt SearchFieldConstants#VERSION to the newly used version
@@ -131,7 +135,6 @@
     uses org.eclipse.jgit.lib.GpgSigner;
 
     // other libraries
-    requires com.h2database.mvstore;
     requires org.antlr.antlr4.runtime;
     requires org.libreoffice.uno;
 
diff --git a/src/main/java/org/jabref/cli/ArgumentProcessor.java b/src/main/java/org/jabref/cli/ArgumentProcessor.java
index 88bb849569b..5d5c2c025d6 100644
--- a/src/main/java/org/jabref/cli/ArgumentProcessor.java
+++ b/src/main/java/org/jabref/cli/ArgumentProcessor.java
@@ -16,7 +16,7 @@
 import org.jabref.gui.externalfiles.AutoSetFileLinksUtil;
 import org.jabref.gui.undo.NamedCompound;
 import org.jabref.logic.JabRefException;
-import org.jabref.logic.bibtex.FieldWriterPreferences;
+import org.jabref.logic.bibtex.FieldPreferences;
 import org.jabref.logic.citationkeypattern.CitationKeyGenerator;
 import org.jabref.logic.exporter.AtomicFileWriter;
 import org.jabref.logic.exporter.BibDatabaseWriter;
@@ -25,7 +25,7 @@
 import org.jabref.logic.exporter.EmbeddedBibFilePdfExporter;
 import org.jabref.logic.exporter.Exporter;
 import org.jabref.logic.exporter.ExporterFactory;
-import org.jabref.logic.exporter.SavePreferences;
+import org.jabref.logic.exporter.SelfContainedSaveConfiguration;
 import org.jabref.logic.exporter.XmpPdfExporter;
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.ImportException;
@@ -38,6 +38,7 @@
 import org.jabref.logic.importer.SearchBasedFetcher;
 import org.jabref.logic.importer.WebFetchers;
 import org.jabref.logic.importer.fileformat.BibtexParser;
+import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.net.URLDownload;
 import org.jabref.logic.search.DatabaseSearcher;
@@ -53,8 +54,8 @@
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.strings.StringUtil;
 import org.jabref.model.util.DummyFileUpdateMonitor;
+import org.jabref.model.util.FileUpdateMonitor;
 import org.jabref.preferences.FilePreferences;
-import org.jabref.preferences.GeneralPreferences;
 import org.jabref.preferences.PreferencesService;
 import org.jabref.preferences.SearchPreferences;
 
@@ -69,12 +70,20 @@ public class ArgumentProcessor {
     private final List<ParserResult> parserResults;
     private final Mode startupMode;
     private final PreferencesService preferencesService;
+    private final FileUpdateMonitor fileUpdateMonitor;
+    private final BibEntryTypesManager entryTypesManager;
     private boolean noGUINeeded;
 
-    public ArgumentProcessor(String[] args, Mode startupMode, PreferencesService preferencesService) throws org.apache.commons.cli.ParseException {
+    public ArgumentProcessor(String[] args,
+                             Mode startupMode,
+                             PreferencesService preferencesService,
+                             FileUpdateMonitor fileUpdateMonitor,
+                             BibEntryTypesManager entryTypesManager) throws org.apache.commons.cli.ParseException {
         this.cli = new JabRefCLI(args);
         this.startupMode = startupMode;
         this.preferencesService = preferencesService;
+        this.fileUpdateMonitor = fileUpdateMonitor;
+        this.entryTypesManager = entryTypesManager;
 
         this.parserResults = processArguments();
     }
@@ -85,7 +94,7 @@ public ArgumentProcessor(String[] args, Mode startupMode, PreferencesService pre
      * @param argument See importFile.
      * @return ParserResult with setToOpenTab(true)
      */
-    private static Optional<ParserResult> importToOpenBase(String argument) {
+    private Optional<ParserResult> importToOpenBase(String argument) {
         Optional<ParserResult> result = importFile(argument);
 
         result.ifPresent(ParserResult::setToOpenTab);
@@ -93,8 +102,8 @@ private static Optional<ParserResult> importToOpenBase(String argument) {
         return result;
     }
 
-    private static Optional<ParserResult> importBibtexToOpenBase(String argument, ImportFormatPreferences importFormatPreferences) {
-        BibtexParser parser = new BibtexParser(importFormatPreferences, new DummyFileUpdateMonitor());
+    private Optional<ParserResult> importBibtexToOpenBase(String argument, ImportFormatPreferences importFormatPreferences) {
+        BibtexParser parser = new BibtexParser(importFormatPreferences);
         try {
             List<BibEntry> entries = parser.parseEntries(argument);
             ParserResult result = new ParserResult(entries);
@@ -106,7 +115,7 @@ private static Optional<ParserResult> importBibtexToOpenBase(String argument, Im
         }
     }
 
-    private static Optional<ParserResult> importFile(String argument) {
+    private Optional<ParserResult> importFile(String argument) {
         String[] data = argument.split(",");
 
         String address = data[0];
@@ -144,21 +153,26 @@ private static Optional<ParserResult> importFile(String argument) {
         return importResult;
     }
 
-    private static Optional<ParserResult> importFile(Path file, String importFormat) {
+    private Optional<ParserResult> importFile(Path file, String importFormat) {
         try {
+            ImportFormatReader importFormatReader = new ImportFormatReader(
+                    preferencesService.getImporterPreferences(),
+                    preferencesService.getImportFormatPreferences(),
+                    fileUpdateMonitor);
+
             if (!"*".equals(importFormat)) {
                 System.out.println(Localization.lang("Importing") + ": " + file);
-                ParserResult result = Globals.IMPORT_FORMAT_READER.importFromFile(importFormat, file);
+                ParserResult result = importFormatReader.importFromFile(importFormat, file);
                 return Optional.of(result);
             } else {
                 // * 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.importUnknownFormat(file, new DummyFileUpdateMonitor());
 
-                System.out.println(Localization.lang("Format used") + ": " + importResult.format);
-                return Optional.of(importResult.parserResult);
+                System.out.println(Localization.lang("Format used") + ": " + importResult.format());
+                return Optional.of(importResult.parserResult());
             }
         } catch (ImportException ex) {
             System.err
@@ -176,10 +190,6 @@ public boolean hasParserResults() {
     }
 
     private List<ParserResult> processArguments() {
-        if (!cli.isBlank() && cli.isDebugLogging()) {
-            System.err.println("use java property -Dtinylog.level=debug");
-        }
-
         if ((startupMode == Mode.INITIAL_START) && cli.isShowVersion()) {
             cli.displayVersion();
         }
@@ -231,13 +241,14 @@ private List<ParserResult> processArguments() {
 
         if (cli.isWriteMetadatatoPdf() || cli.isWriteXMPtoPdf() || cli.isEmbeddBibfileInPdf()) {
             if (!loaded.isEmpty()) {
-                writeMetadatatoPdf(loaded,
+                writeMetadataToPdf(loaded,
                         cli.getWriteMetadatatoPdf(),
                         preferencesService.getXmpPreferences(),
                         preferencesService.getFilePreferences(),
-                        preferencesService.getGeneralPreferences().getDefaultBibDatabaseMode(),
+                        preferencesService.getLibraryPreferences().getDefaultBibDatabaseMode(),
                         Globals.entryTypesManager,
-                        preferencesService.getFieldWriterPreferences(),
+                        preferencesService.getFieldPreferences(),
+                        Globals.journalAbbreviationRepository,
                         cli.isWriteXMPtoPdf() || cli.isWriteMetadatatoPdf(),
                         cli.isEmbeddBibfileInPdf() || cli.isWriteMetadatatoPdf());
             }
@@ -267,21 +278,38 @@ private List<ParserResult> processArguments() {
         return loaded;
     }
 
-    private void writeMetadatatoPdf(List<ParserResult> loaded, String filesAndCitekeys, 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,
+                                    FieldPreferences fieldPreferences,
+                                    JournalAbbreviationRepository abbreviationRepository,
+                                    boolean writeXMP,
+                                    boolean embeddBibfile) {
         if (loaded.isEmpty()) {
             LOGGER.error("The write xmp option depends on a valid import option.");
             return;
         }
         ParserResult pr = loaded.get(loaded.size() - 1);
         BibDatabaseContext databaseContext = pr.getDatabaseContext();
-        BibDatabase dataBase = pr.getDatabase();
 
         XmpPdfExporter xmpPdfExporter = new XmpPdfExporter(xmpPreferences);
-        EmbeddedBibFilePdfExporter embeddedBibFilePdfExporter = new EmbeddedBibFilePdfExporter(databaseMode, entryTypesManager, fieldWriterPreferences);
+        EmbeddedBibFilePdfExporter embeddedBibFilePdfExporter = new EmbeddedBibFilePdfExporter(databaseMode, entryTypesManager, fieldPreferences);
 
         if ("all".equals(filesAndCitekeys)) {
-            for (BibEntry entry : dataBase.getEntries()) {
-                writeMetadatatoPDFsOfEntry(databaseContext, entry.getCitationKey().orElse("<no cite key defined>"), entry, filePreferences, xmpPdfExporter, embeddedBibFilePdfExporter, writeXMP, embeddBibfile);
+            for (BibEntry entry : databaseContext.getEntries()) {
+                writeMetadataToPDFsOfEntry(
+                        databaseContext,
+                        entry.getCitationKey().orElse("<no cite key defined>"),
+                        entry,
+                        filePreferences,
+                        xmpPdfExporter,
+                        embeddedBibFilePdfExporter,
+                        abbreviationRepository,
+                        writeXMP,
+                        embeddBibfile);
             }
             return;
         }
@@ -296,21 +324,45 @@ private void writeMetadatatoPdf(List<ParserResult> loaded, String filesAndCiteke
             }
         }
 
-        writeMetadatatoPdfByCitekey(databaseContext, dataBase, citeKeys, filePreferences, xmpPdfExporter, embeddedBibFilePdfExporter, writeXMP, embeddBibfile);
-        writeMetadatatoPdfByFileNames(databaseContext, dataBase, pdfs, filePreferences, xmpPdfExporter, embeddedBibFilePdfExporter, writeXMP, embeddBibfile);
+        writeMetadataToPdfByCitekey(
+                databaseContext,
+                citeKeys,
+                filePreferences,
+                xmpPdfExporter,
+                embeddedBibFilePdfExporter,
+                abbreviationRepository,
+                writeXMP,
+                embeddBibfile);
+        writeMetadataToPdfByFileNames(
+                databaseContext,
+                pdfs,
+                filePreferences,
+                xmpPdfExporter,
+                embeddedBibFilePdfExporter,
+                abbreviationRepository,
+                writeXMP,
+                embeddBibfile);
     }
 
-    private void writeMetadatatoPDFsOfEntry(BibDatabaseContext databaseContext, String citeKey, BibEntry entry, 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,
+                                            JournalAbbreviationRepository abbreviationRepository,
+                                            boolean writeXMP,
+                                            boolean embeddBibfile) {
         try {
             if (writeXMP) {
-                if (xmpPdfExporter.exportToAllFilesOfEntry(databaseContext, filePreferences, entry, List.of(entry))) {
+                if (xmpPdfExporter.exportToAllFilesOfEntry(databaseContext, filePreferences, entry, List.of(entry), abbreviationRepository)) {
                     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, filePreferences, entry, List.of(entry))) {
+                if (embeddedBibFilePdfExporter.exportToAllFilesOfEntry(databaseContext, filePreferences, entry, List.of(entry), abbreviationRepository)) {
                     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);
@@ -321,20 +373,34 @@ private void writeMetadatatoPDFsOfEntry(BibDatabaseContext databaseContext, Stri
         }
     }
 
-    private void writeMetadatatoPdfByCitekey(BibDatabaseContext databaseContext, BibDatabase dataBase, List<String> citeKeys, FilePreferences filePreferences, XmpPdfExporter xmpPdfExporter, EmbeddedBibFilePdfExporter embeddedBibFilePdfExporter, boolean writeXMP, boolean embeddBibfile) {
+    private void writeMetadataToPdfByCitekey(BibDatabaseContext databaseContext,
+                                             List<String> citeKeys,
+                                             FilePreferences filePreferences,
+                                             XmpPdfExporter xmpPdfExporter,
+                                             EmbeddedBibFilePdfExporter embeddedBibFilePdfExporter,
+                                             JournalAbbreviationRepository abbreviationRepository,
+                                             boolean writeXMP,
+                                             boolean embeddBibfile) {
         for (String citeKey : citeKeys) {
-            List<BibEntry> bibEntryList = dataBase.getEntriesByCitationKey(citeKey);
+            List<BibEntry> bibEntryList = databaseContext.getDatabase().getEntriesByCitationKey(citeKey);
             if (bibEntryList.isEmpty()) {
                 System.err.printf("Skipped - Cannot find %s in library.%n", citeKey);
                 continue;
             }
             for (BibEntry entry : bibEntryList) {
-                writeMetadatatoPDFsOfEntry(databaseContext, citeKey, entry, filePreferences, xmpPdfExporter, embeddedBibFilePdfExporter, writeXMP, embeddBibfile);
+                writeMetadataToPDFsOfEntry(databaseContext, citeKey, entry, filePreferences, xmpPdfExporter, embeddedBibFilePdfExporter, abbreviationRepository, writeXMP, embeddBibfile);
             }
         }
     }
 
-    private void writeMetadatatoPdfByFileNames(BibDatabaseContext databaseContext, BibDatabase dataBase, List<String> pdfs, FilePreferences filePreferences, XmpPdfExporter xmpPdfExporter, EmbeddedBibFilePdfExporter embeddedBibFilePdfExporter, boolean writeXMP, boolean embeddBibfile) {
+    private void writeMetadataToPdfByFileNames(BibDatabaseContext databaseContext,
+                                               List<String> pdfs,
+                                               FilePreferences filePreferences,
+                                               XmpPdfExporter xmpPdfExporter,
+                                               EmbeddedBibFilePdfExporter embeddedBibFilePdfExporter,
+                                               JournalAbbreviationRepository abbreviationRepository,
+                                               boolean writeXMP,
+                                               boolean embeddBibfile) {
         for (String fileName : pdfs) {
             Path filePath = Path.of(fileName);
             if (!filePath.isAbsolute()) {
@@ -343,14 +409,14 @@ private void writeMetadatatoPdfByFileNames(BibDatabaseContext databaseContext, B
             if (Files.exists(filePath)) {
                 try {
                     if (writeXMP) {
-                        if (xmpPdfExporter.exportToFileByPath(databaseContext, dataBase, filePreferences, filePath)) {
+                        if (xmpPdfExporter.exportToFileByPath(databaseContext, filePreferences, filePath, abbreviationRepository)) {
                             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, filePreferences, filePath)) {
+                        if (embeddedBibFilePdfExporter.exportToFileByPath(databaseContext, filePreferences, filePath, abbreviationRepository)) {
                             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);
@@ -397,7 +463,7 @@ private boolean exportMatches(List<ParserResult> loaded) {
                 }
             }
 
-            if (formatName.equals("bib")) {
+            if ("bib".equals(formatName)) {
                 // output a bib file as default or if
                 // provided exportFormat is "bib"
                 saveDatabase(new BibDatabase(matches), data[1]);
@@ -406,8 +472,7 @@ private boolean exportMatches(List<ParserResult> loaded) {
                 // export new database
                 ExporterFactory exporterFactory = ExporterFactory.create(
                         preferencesService,
-                        Globals.entryTypesManager,
-                        Globals.journalAbbreviationRepository);
+                        Globals.entryTypesManager);
                 Optional<Exporter> exporter = exporterFactory.getExporterByName(formatName);
                 if (exporter.isEmpty()) {
                     System.err.println(Localization.lang("Unknown export format") + ": " + formatName);
@@ -415,7 +480,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]), matches, Collections.emptyList());
+                        exporter.get().export(databaseContext, Path.of(data[1]), matches, Collections.emptyList(), Globals.journalAbbreviationRepository);
                     } catch (Exception ex) {
                         System.err.println(Localization.lang("Could not export file") + " '" + data[1] + "': "
                                 + Throwables.getStackTraceAsString(ex));
@@ -460,7 +525,7 @@ private List<ParserResult> importAndOpenFiles() {
                         pr = OpenDatabase.loadDatabase(
                                 Path.of(aLeftOver),
                                 preferencesService.getImportFormatPreferences(),
-                                Globals.getFileUpdateMonitor());
+                                fileUpdateMonitor);
                     } catch (IOException ex) {
                         pr = ParserResult.fromError(ex);
                         LOGGER.error("Error opening file '{}'", aLeftOver, ex);
@@ -531,16 +596,16 @@ private boolean generateAux(List<ParserResult> loaded, String[] data) {
     private void saveDatabase(BibDatabase newBase, String subName) {
         try {
             System.out.println(Localization.lang("Saving") + ": " + subName);
-            GeneralPreferences generalPreferences = preferencesService.getGeneralPreferences();
-            SavePreferences savePreferences = preferencesService.getSavePreferences();
             try (AtomicFileWriter fileWriter = new AtomicFileWriter(Path.of(subName), StandardCharsets.UTF_8)) {
                 BibWriter bibWriter = new BibWriter(fileWriter, OS.NEWLINE);
-
+                SelfContainedSaveConfiguration saveConfiguration = (SelfContainedSaveConfiguration) new SelfContainedSaveConfiguration()
+                        .withReformatOnSave(preferencesService.getLibraryPreferences().shouldAlwaysReformatOnSave());
                 BibDatabaseWriter databaseWriter = new BibtexDatabaseWriter(
-                                                                            bibWriter,
-                                                                            generalPreferences,
-                                                                            savePreferences,
-                                                                            Globals.entryTypesManager);
+                        bibWriter,
+                        saveConfiguration,
+                        preferencesService.getFieldPreferences(),
+                        preferencesService.getCitationKeyPatternPreferences(),
+                        entryTypesManager);
                 databaseWriter.saveDatabase(new BibDatabaseContext(newBase));
 
                 // Show just a warning message if encoding did not work for all characters:
@@ -579,8 +644,7 @@ private void exportFile(List<ParserResult> loaded, String[] data) {
             System.out.println(Localization.lang("Exporting") + ": " + data[0]);
             ExporterFactory exporterFactory = ExporterFactory.create(
                     preferencesService,
-                    Globals.entryTypesManager,
-                    Globals.journalAbbreviationRepository);
+                    Globals.entryTypesManager);
             Optional<Exporter> exporter = exporterFactory.getExporterByName(data[1]);
             if (exporter.isEmpty()) {
                 System.err.println(Localization.lang("Unknown export format") + ": " + data[1]);
@@ -591,7 +655,8 @@ private void exportFile(List<ParserResult> loaded, String[] data) {
                             pr.getDatabaseContext(),
                             Path.of(data[0]),
                             pr.getDatabaseContext().getDatabase().getEntries(),
-                            fileDirForDatabase);
+                            fileDirForDatabase,
+                            Globals.journalAbbreviationRepository);
                 } catch (Exception ex) {
                     System.err.println(Localization.lang("Could not export file") + " '" + data[0] + "': "
                             + Throwables.getStackTraceAsString(ex));
diff --git a/src/main/java/org/jabref/cli/JabRefCLI.java b/src/main/java/org/jabref/cli/JabRefCLI.java
index 367c929541e..484201b63ff 100644
--- a/src/main/java/org/jabref/cli/JabRefCLI.java
+++ b/src/main/java/org/jabref/cli/JabRefCLI.java
@@ -1,11 +1,17 @@
 package org.jabref.cli;
 
 import java.util.List;
+import java.util.Objects;
+
+import javafx.util.Pair;
 
 import org.jabref.gui.Globals;
-import org.jabref.logic.exporter.Exporter;
 import org.jabref.logic.exporter.ExporterFactory;
+import org.jabref.logic.importer.ImportFormatReader;
 import org.jabref.logic.l10n.Localization;
+import org.jabref.logic.util.OS;
+import org.jabref.model.strings.StringUtil;
+import org.jabref.model.util.DummyFileUpdateMonitor;
 import org.jabref.preferences.PreferencesService;
 
 import org.apache.commons.cli.CommandLine;
@@ -18,6 +24,7 @@
 public class JabRefCLI {
     private static final int WIDTH = 100; // Number of characters per line before a line break must be added.
     private static final String WRAPPED_LINE_PREFIX = ""; // If a line break is added, this prefix will be inserted at the beginning of the next line
+    private static final String STRING_TABLE_DELIMITER = " : ";
 
     private final CommandLine cl;
     private final List<String> leftOver;
@@ -159,7 +166,7 @@ public boolean isWriteMetadatatoPdf() {
     public String getWriteMetadatatoPdf() {
         return cl.hasOption("writeMetadatatoPdf") ? cl.getOptionValue("writeMetadatatoPdf") :
                 cl.hasOption("writeXMPtoPdf") ? cl.getOptionValue("writeXMPtoPdf") :
-                cl.hasOption("embeddBibfileInPdf") ? cl.getOptionValue("embeddBibfileInPdf") : null;
+                        cl.hasOption("embeddBibfileInPdf") ? cl.getOptionValue("embeddBibfileInPdf") : null;
     }
 
     private static Options getOptions() {
@@ -291,16 +298,26 @@ public void displayVersion() {
     public static void printUsage(PreferencesService preferencesService) {
         String header = "";
 
-        String importFormats = Globals.IMPORT_FORMAT_READER.getImportFormatList();
-        String importFormatsList = String.format("%s:%n%s%n", Localization.lang("Available import formats"), importFormats);
+        ImportFormatReader importFormatReader = new ImportFormatReader(
+                preferencesService.getImporterPreferences(),
+                preferencesService.getImportFormatPreferences(),
+                new DummyFileUpdateMonitor());
+        List<Pair<String, String>> importFormats = importFormatReader
+                .getImportFormats().stream()
+                .map(format -> new Pair<>(format.getName(), format.getId()))
+                .toList();
+        String importFormatsIntro = Localization.lang("Available import formats");
+        String importFormatsList = String.format("%s:%n%s%n", importFormatsIntro, alignStringTable(importFormats));
 
         ExporterFactory exporterFactory = ExporterFactory.create(
                 preferencesService,
-                Globals.entryTypesManager,
-                Globals.journalAbbreviationRepository);
+                Globals.entryTypesManager);
+        List<Pair<String, String>> exportFormats = exporterFactory
+                .getExporters().stream()
+                .map(format -> new Pair<>(format.getName(), format.getId()))
+                .toList();
         String outFormatsIntro = Localization.lang("Available export formats");
-        String outFormats = wrapStringList(exporterFactory.getExporters().stream().map(Exporter::getId).toList(), outFormatsIntro.length());
-        String outFormatsList = String.format("%s: %s%n", outFormatsIntro, outFormats);
+        String outFormatsList = String.format("%s:%n%s%n", outFormatsIntro, alignStringTable(exportFormats));
 
         String footer = '\n' + importFormatsList + outFormatsList + "\nPlease report issues at https://github.com/JabRef/jabref/issues.";
 
@@ -316,12 +333,34 @@ public List<String> getLeftOver() {
         return leftOver;
     }
 
+    protected static String alignStringTable(List<Pair<String, String>> table) {
+        StringBuilder sb = new StringBuilder();
+
+        int maxLength = table.stream()
+                             .mapToInt(pair -> Objects.requireNonNullElse(pair.getKey(), "").length())
+                             .max().orElse(0);
+
+        for (Pair<String, String> pair : table) {
+            int padding = Math.max(0, maxLength - pair.getKey().length());
+            sb.append(WRAPPED_LINE_PREFIX);
+            sb.append(pair.getKey());
+
+            sb.append(StringUtil.repeatSpaces(padding));
+
+            sb.append(STRING_TABLE_DELIMITER);
+            sb.append(pair.getValue());
+            sb.append(OS.NEWLINE);
+        }
+
+        return sb.toString();
+    }
+
     /**
      * Creates and wraps a multi-line and colon-seperated string from a List of Strings.
      */
-    protected static String wrapStringList(List<String> list, int firstLineIntroLength) {
+    protected static String wrapStringList(List<String> list, int firstLineIndentation) {
         StringBuilder builder = new StringBuilder();
-        int lastBreak = -firstLineIntroLength;
+        int lastBreak = -firstLineIndentation;
 
         for (String line : list) {
             if (((builder.length() + 2 + line.length()) - lastBreak) > WIDTH) {
diff --git a/src/main/java/org/jabref/cli/Launcher.java b/src/main/java/org/jabref/cli/Launcher.java
index 89adc9dd43b..8fb00c4742a 100644
--- a/src/main/java/org/jabref/cli/Launcher.java
+++ b/src/main/java/org/jabref/cli/Launcher.java
@@ -21,14 +21,13 @@
 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.logic.util.OS;
 import org.jabref.migrations.PreferencesMigrations;
-import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.entry.BibEntryTypesManager;
+import org.jabref.model.util.FileUpdateMonitor;
 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;
@@ -45,19 +44,34 @@
 public class Launcher {
     private static Logger LOGGER;
     private static String[] ARGUMENTS;
+    private static boolean isDebugEnabled;
 
     public static void main(String[] args) {
         routeLoggingToSlf4J();
         ARGUMENTS = args;
+
+        // We must configure logging as soon as possible, which is why we cannot wait for the usual
+        // argument parsing workflow to parse logging options .e.g. --debug
+        JabRefCLI jabRefCLI;
+        try {
+            jabRefCLI = new JabRefCLI(ARGUMENTS);
+            isDebugEnabled = jabRefCLI.isDebugLogging();
+        } catch (ParseException e) {
+            isDebugEnabled = false;
+        }
+
         addLogToDisk();
         try {
+            BibEntryTypesManager entryTypesManager = new BibEntryTypesManager();
+            Globals.entryTypesManager = entryTypesManager;
+
             // Init preferences
             final JabRefPreferences preferences = JabRefPreferences.getInstance();
             Globals.prefs = preferences;
-            PreferencesMigrations.runMigrations(preferences);
+            PreferencesMigrations.runMigrations(preferences, entryTypesManager);
 
             // Early exit in case another instance is already running
-            if (!handleMultipleAppInstances(args, preferences)) {
+            if (!handleMultipleAppInstances(ARGUMENTS, preferences)) {
                 return;
             }
 
@@ -68,15 +82,20 @@ public static void main(String[] args) {
             clearOldSearchIndices();
 
             try {
+                FileUpdateMonitor fileUpdateMonitor = Globals.getFileUpdateMonitor();
+
                 // Process arguments
-                ArgumentProcessor argumentProcessor = new ArgumentProcessor(args, ArgumentProcessor.Mode.INITIAL_START,
-                        preferences);
+                ArgumentProcessor argumentProcessor = new ArgumentProcessor(
+                        ARGUMENTS, ArgumentProcessor.Mode.INITIAL_START,
+                        preferences,
+                        fileUpdateMonitor,
+                        entryTypesManager);
                 if (argumentProcessor.shouldShutDown()) {
                     LOGGER.debug("JabRef shut down after processing command line arguments");
                     return;
                 }
 
-                MainApplication.main(argumentProcessor.getParserResults(), argumentProcessor.isBlank(), preferences, ARGUMENTS);
+                MainApplication.main(argumentProcessor.getParserResults(), argumentProcessor.isBlank(), preferences, fileUpdateMonitor, ARGUMENTS);
             } catch (ParseException e) {
                 LOGGER.error("Problem parsing arguments", e);
                 JabRefCLI.printUsage(preferences);
@@ -97,12 +116,7 @@ private static void routeLoggingToSlf4J() {
      * the log configuration programmatically anymore.
      */
     private static void addLogToDisk() {
-        Path directory = Path.of(AppDirsFactory.getInstance()
-                                               .getUserDataDir(
-                                                       OS.APP_DIR_APP_NAME,
-                                                       "logs",
-                                                       OS.APP_DIR_APP_AUTHOR))
-                             .resolve(new BuildInfo().version.toString());
+        Path directory = OS.getNativeDesktop().getLogDirectory();
         try {
             Files.createDirectories(directory);
         } catch (IOException e) {
@@ -114,7 +128,8 @@ private static void addLogToDisk() {
         // https://tinylog.org/v2/configuration/#shared-file-writer
         Map<String, String> configuration = Map.of(
                 "writerFile", "shared file",
-                "writerFile.level", "debug",
+                "writerFile.level", isDebugEnabled ? "debug" : "info",
+                "level", isDebugEnabled ? "debug" : "info",
                 "writerFile.file", directory.resolve("log.txt").toString(),
                 "writerFile.charset", "UTF-8");
 
@@ -151,12 +166,6 @@ private static void initGlobals(PreferencesService preferences) {
         Globals.journalAbbreviationRepository = JournalAbbreviationLoader
                 .loadRepository(preferences.getJournalAbbreviationPreferences());
 
-        // Build list of Import and Export formats
-        Globals.IMPORT_FORMAT_READER.resetImportFormats(
-                preferences.getImporterPreferences(),
-                preferences.getImportFormatPreferences(),
-                Globals.getFileUpdateMonitor());
-
         Globals.entryTypesManager = preferences.getCustomEntryTypesRepository();
         Globals.protectedTermsLoader = new ProtectedTermsLoader(preferences.getProtectedTermsPreferences());
     }
@@ -175,7 +184,7 @@ private static void configureSSL(SSLPreferences sslPreferences) {
     }
 
     private static void clearOldSearchIndices() {
-        Path currentIndexPath = BibDatabaseContext.getFulltextIndexBasePath();
+        Path currentIndexPath = OS.getNativeDesktop().getFulltextIndexBaseDirectory();
         Path appData = currentIndexPath.getParent();
 
         try {
@@ -190,9 +199,9 @@ private static void clearOldSearchIndices() {
                         && !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);
+                            .sorted(Comparator.reverseOrder())
+                            .map(Path::toFile)
+                            .forEach(File::delete);
                 }
             }
         } catch (IOException e) {
diff --git a/src/main/java/org/jabref/gui/Base.css b/src/main/java/org/jabref/gui/Base.css
index bfa2e95fc47..68f96eebf28 100644
--- a/src/main/java/org/jabref/gui/Base.css
+++ b/src/main/java/org/jabref/gui/Base.css
@@ -372,6 +372,10 @@ TextFlow > .tooltip-text-monospaced {
     -fx-padding: 0.5em 1em 0.5em 1em;
 }
 
+.menu-button > .label {
+    -fx-padding: 0 8 0 8;
+}
+
 .button:hover {
     -fx-background-color: rgba(0, 0, 0, 0.12);
 }
@@ -529,6 +533,12 @@ TextFlow > .tooltip-text-monospaced {
     -fx-padding: 0.0em 0.666667em 0.0em 0.666667em;
 }
 
+.menu-bar .menu-button {
+    -fx-border-color: transparent;
+    -fx-border-width: 0;
+    -fx-border-radius: 0;
+}
+
 .menu-item {
     -fx-padding: 0.5em 0.41777em 0.5em 0.41777em;
 }
@@ -622,12 +632,14 @@ TextFlow > .tooltip-text-monospaced {
     -fx-background-color: -jr-green;
 }
 
-.table-view {
+.table-view,
+.tree-table-view {
     -fx-background-insets: 0;
     -fx-padding: 0;
 }
 
-.table-view:focused {
+.table-view:focused,
+.tree-table-view:focused {
     -fx-background-insets: 0;
 }
 
@@ -751,6 +763,9 @@ TextFlow > .tooltip-text-monospaced {
     -fx-background-color: -fx-control-inner-background;
     -fx-background-insets: 0;
     -fx-effect: null;
+    -fx-border-width: 1;
+    -fx-border-color: -fx-outer-border;
+    -fx-padding: 0;
 }
 
 .combo-box-popup > .list-view > .virtual-flow > .clipped-container > .sheet > .list-cell {
@@ -1086,24 +1101,26 @@ We want to have a look that matches our icons in the tool-bar */
     -fx-background-color: -fx-mark-highlight-color, derive(-jr-theme-text, -30%);
 }
 
-.table-view {
+.table-view,
+.tree-table-view {
     -fx-border-width: 0;
     -fx-padding: 0;
     -fx-border-insets: 0;
     -fx-table-cell-border-color: transparent;
 }
 
-.table-view .column-header-background {
+.column-header-background {
     -fx-background-color: -fx-control-inner-background;
     -fx-border-width: 0;
 }
 
-.table-view .column-header-background:hover {
+.column-header-background:hover {
     -fx-background-color: -fx-outer-border;
 }
 
-.table-view .column-header,
-.table-view .filler {
+.column-header,
+.table-view .filler,
+.tree-table-view .filler {
     -fx-background-color: transparent, -fx-control-inner-background;
     -fx-background-insets: 0, 0 0.02em 0 0.02em;
     -fx-font-weight: bold;
@@ -1112,20 +1129,22 @@ We want to have a look that matches our icons in the tool-bar */
     -fx-border-color: -fx-outer-border;
 }
 
-.table-view .column-header > .label {
+.column-header > .label {
     -fx-padding: 0 1em 0 1em;
     -fx-alignment: center-left;
     -fx-text-fill: -jr-head-fg;
 }
 
-.table-view .column-header .glyph-icon {
+.column-header .glyph-icon {
     -fx-alignment: baseline-center;
     -fx-text-fill: -jr-head-fg;
     -fx-fill: -jr-head-fg;
 }
 
 .table-cell,
-.table-cell .glyph-icon {
+.tree-table-cell,
+.table-cell .glyph-icon,
+.tree-table-cell .glyph-icon {
     -fx-padding: 0.5em 1em 0.5em 1em;
     -fx-cell-size: 4.0em;
     -fx-text-fill: -fx-text-background-color;
@@ -1225,10 +1244,10 @@ We want to have a look that matches our icons in the tool-bar */
     -fx-background-color: -jr-accent;
 }
 
-.jfx-color-picker:armed,
-.jfx-color-picker:hover,
-.jfx-color-picker:focused,
-.jfx-color-picker {
+.color-picker:armed,
+.color-picker:hover,
+.color-picker:focused,
+.color-picker {
     -fx-background-color: transparent, transparent, transparent, transparent;
     -fx-background-radius: 0px;
     -fx-background-insets: 0px;
@@ -1368,6 +1387,27 @@ We want to have a look that matches our icons in the tool-bar */
     -fx-pref-height: 30px;
     -fx-padding: 0px 0px 0px -8px;
     -fx-margin: 0em;
+    -fx-border-style: none;
+}
+
+.tags-field {
+    -fx-pref-height: 30px;
+    -fx-margin: 0em;
+    -fx-border-style: none;
+}
+
+.tags-field > .flow-pane > .tag-view {
+    -fx-background-color: -fx-default-button;
+    -fx-text-fill: -fx-focused-text-base-color;
+}
+
+.tags-field > .flow-pane > .tag-view:selected {
+    -fx-background-color: derive(-fx-default-button, -20%);
+    -fx-text-fill: -fx-focused-text-base-color;
+}
+
+.tags-field-editor {
+    -fx-border-width: 0;
 }
 
 .searchBar:invalid {
diff --git a/src/main/java/org/jabref/gui/ClipBoardManager.java b/src/main/java/org/jabref/gui/ClipBoardManager.java
index b91d1be858b..8ff63a59374 100644
--- a/src/main/java/org/jabref/gui/ClipBoardManager.java
+++ b/src/main/java/org/jabref/gui/ClipBoardManager.java
@@ -7,7 +7,6 @@
 import java.awt.datatransfer.UnsupportedFlavorException;
 import java.io.IOException;
 import java.util.List;
-import java.util.Optional;
 
 import javafx.application.Platform;
 import javafx.scene.control.TextInputControl;
@@ -21,6 +20,7 @@
 import org.jabref.logic.bibtex.FieldWriter;
 import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.preferences.PreferencesService;
 
 import org.slf4j.Logger;
@@ -87,10 +87,6 @@ public static String getContents() {
         return result;
     }
 
-    public Optional<String> getBibTeXEntriesFromClipboard() {
-        return Optional.ofNullable(clipboard.getContent(DragAndDropDataFormats.ENTRIES)).map(String.class::cast);
-    }
-
     /**
      * Get the String residing on the primary clipboard (if it exists).
      *
@@ -146,11 +142,13 @@ public void setContent(String string) {
         setPrimaryClipboardContent(content);
     }
 
-    public void setContent(List<BibEntry> entries) throws IOException {
+    public void setContent(List<BibEntry> entries, BibEntryTypesManager entryTypesManager) throws IOException {
         final ClipboardContent content = new ClipboardContent();
-        BibEntryWriter writer = new BibEntryWriter(new FieldWriter(preferencesService.getFieldWriterPreferences()), Globals.entryTypesManager);
+        BibEntryWriter writer = new BibEntryWriter(new FieldWriter(preferencesService.getFieldPreferences()), entryTypesManager);
         String serializedEntries = writer.serializeAll(entries, BibDatabaseMode.BIBTEX);
-        content.put(DragAndDropDataFormats.ENTRIES, serializedEntries);
+        // BibEntry is not Java serializable. Thus, we need to do the serialization manually
+        // At reading of the clipboard in JabRef, we parse the plain string in all cases, so we don't need to flag we put BibEntries here
+        // Furthermore, storing a string also enables other applications to work with the data
         content.putString(serializedEntries);
         clipboard.setContent(content);
         setPrimaryClipboardContent(content);
diff --git a/src/main/java/org/jabref/gui/DefaultInjector.java b/src/main/java/org/jabref/gui/DefaultInjector.java
index dd94f84ef15..b74e0efb8ff 100644
--- a/src/main/java/org/jabref/gui/DefaultInjector.java
+++ b/src/main/java/org/jabref/gui/DefaultInjector.java
@@ -7,7 +7,6 @@
 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;
@@ -53,8 +52,6 @@ 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 9ef6f563566..f33f501ebed 100644
--- a/src/main/java/org/jabref/gui/EntryTypeView.java
+++ b/src/main/java/org/jabref/gui/EntryTypeView.java
@@ -23,7 +23,6 @@
 import org.jabref.gui.util.TaskExecutor;
 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;
@@ -36,6 +35,7 @@
 import org.jabref.model.entry.types.IEEETranEntryTypeDefinitions;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.model.strings.StringUtil;
+import org.jabref.model.util.FileUpdateMonitor;
 import org.jabref.preferences.PreferencesService;
 
 import com.airhacks.afterburner.views.ViewLoader;
@@ -48,9 +48,9 @@
  */
 public class EntryTypeView extends BaseDialog<EntryType> {
 
-    @Inject StateManager stateManager;
-    @Inject ImportFormatReader importFormatReader;
-    @Inject TaskExecutor taskExecutor;
+    @Inject private StateManager stateManager;
+    @Inject private TaskExecutor taskExecutor;
+    @Inject private FileUpdateMonitor fileUpdateMonitor;
 
     @FXML private ButtonType generateButton;
     @FXML private TextField idTextField;
@@ -89,7 +89,7 @@ public EntryTypeView(LibraryTab libraryTab, DialogService dialogService, Prefere
 
         Button btnGenerate = (Button) this.getDialogPane().lookupButton(generateButton);
 
-        btnGenerate.textProperty().bind(EasyBind.map(viewModel.searchingProperty(), searching -> (searching) ? Localization.lang("Searching...") : Localization.lang("Generate")));
+        btnGenerate.textProperty().bind(EasyBind.map(viewModel.searchingProperty(), searching -> searching ? Localization.lang("Searching...") : Localization.lang("Generate")));
         btnGenerate.disableProperty().bind(viewModel.idFieldValidationStatus().validProperty().not().or(viewModel.searchingProperty()));
 
         EasyBind.subscribe(viewModel.searchSuccesfulProperty(), value -> {
@@ -122,7 +122,13 @@ private void addEntriesToPane(FlowPane pane, Collection<? extends BibEntryType>
     @FXML
     public void initialize() {
         visualizer.setDecoration(new IconValidationDecorator());
-        viewModel = new EntryTypeViewModel(preferencesService, libraryTab, dialogService, stateManager, importFormatReader, taskExecutor);
+        viewModel = new EntryTypeViewModel(
+                preferencesService,
+                libraryTab,
+                dialogService,
+                stateManager,
+                taskExecutor,
+                fileUpdateMonitor);
 
         idBasedFetchers.itemsProperty().bind(viewModel.fetcherItemsProperty());
         idTextField.textProperty().bindBidirectional(viewModel.idTextProperty());
@@ -213,8 +219,8 @@ private void setEntryTypeForReturnAndClose(Optional<BibEntryType> entryType) {
      * The description is originating from biblatex manual chapter 2 Biblatex documentation is favored over the bibtex, since bibtex is a subset of biblatex and biblatex is better documented.
      */
     public static String getDescription(EntryType selectedType) {
-        if (selectedType instanceof StandardEntryType) {
-            switch ((StandardEntryType) selectedType) {
+        if (selectedType instanceof StandardEntryType entryType) {
+            switch (entryType) {
                 case Article -> {
                     return Localization.lang("An article in a journal, magazine, newspaper, or other periodical which forms a self-contained unit with its own title.");
                 }
diff --git a/src/main/java/org/jabref/gui/EntryTypeViewModel.java b/src/main/java/org/jabref/gui/EntryTypeViewModel.java
index 434252bae93..892229d6b3e 100644
--- a/src/main/java/org/jabref/gui/EntryTypeViewModel.java
+++ b/src/main/java/org/jabref/gui/EntryTypeViewModel.java
@@ -21,13 +21,13 @@
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.FetcherServerException;
 import org.jabref.logic.importer.IdBasedFetcher;
-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;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.model.strings.StringUtil;
+import org.jabref.model.util.FileUpdateMonitor;
 import org.jabref.preferences.PreferencesService;
 
 import de.saxsys.mvvmfx.utils.validation.FunctionBasedValidator;
@@ -53,21 +53,21 @@ public class EntryTypeViewModel {
     private final DialogService dialogService;
     private final Validator idFieldValidator;
     private final StateManager stateManager;
-    private final ImportFormatReader importFormatReader;
     private final TaskExecutor taskExecutor;
+    private final FileUpdateMonitor fileUpdateMonitor;
 
     public EntryTypeViewModel(PreferencesService preferences,
                               LibraryTab libraryTab,
                               DialogService dialogService,
                               StateManager stateManager,
-                              ImportFormatReader importFormatReader,
-                              TaskExecutor taskExecutor) {
+                              TaskExecutor taskExecutor,
+                              FileUpdateMonitor fileUpdateMonitor) {
         this.libraryTab = libraryTab;
         this.preferencesService = preferences;
         this.dialogService = dialogService;
         this.stateManager = stateManager;
-        this.importFormatReader = importFormatReader;
         this.taskExecutor = taskExecutor;
+        this.fileUpdateMonitor = fileUpdateMonitor;
 
         fetchers.addAll(WebFetchers.getIdBasedFetchers(
                 preferences.getImportFormatPreferences(),
@@ -130,7 +130,7 @@ private class FetcherWorker extends Task<Optional<BibEntry>> {
         private String searchID = "";
 
         @Override
-        protected Optional<BibEntry> call() throws InterruptedException, FetcherException {
+        protected Optional<BibEntry> call() throws FetcherException {
             searchingProperty().setValue(true);
             storeSelectedFetcher();
             fetcher = selectedItemProperty().getValue();
@@ -159,7 +159,7 @@ public void runFetcherWorker() {
                 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);
+            LOGGER.error(String.format("Exception during fetching when using fetcher '%s' with entry id '%s'.", fetcher, searchId), exception);
 
             searchingProperty.set(false);
             fetcherWorker = new FetcherWorker();
@@ -173,11 +173,10 @@ public void runFetcherWorker() {
                 ImportHandler handler = new ImportHandler(
                         libraryTab.getBibDatabaseContext(),
                         preferencesService,
-                        Globals.getFileUpdateMonitor(),
+                        fileUpdateMonitor,
                         libraryTab.getUndoManager(),
                         stateManager,
                         dialogService,
-                        importFormatReader,
                         taskExecutor);
                 handler.importEntryWithDuplicateCheck(libraryTab.getBibDatabaseContext(), entry);
 
diff --git a/src/main/java/org/jabref/gui/Globals.java b/src/main/java/org/jabref/gui/Globals.java
index 6070283d1d1..117361bb72f 100644
--- a/src/main/java/org/jabref/gui/Globals.java
+++ b/src/main/java/org/jabref/gui/Globals.java
@@ -13,7 +13,6 @@
 import org.jabref.gui.util.DefaultFileUpdateMonitor;
 import org.jabref.gui.util.DefaultTaskExecutor;
 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.logic.remote.RemotePreferences;
@@ -43,12 +42,12 @@ public class Globals {
     public static final BuildInfo BUILD_INFO = new BuildInfo();
 
     public static final RemoteListenerServerManager REMOTE_LISTENER = new RemoteListenerServerManager();
+
     /**
      * Manager for the state of the GUI.
      */
     public static StateManager stateManager = new StateManager();
 
-    public static final ImportFormatReader IMPORT_FORMAT_READER = new ImportFormatReader();
     public static final TaskExecutor TASK_EXECUTOR = new DefaultTaskExecutor(stateManager);
 
     /**
@@ -71,7 +70,7 @@ public class Globals {
     public static ProtectedTermsLoader protectedTermsLoader;
 
     public static CountingUndoManager undoManager = new CountingUndoManager();
-    public static BibEntryTypesManager entryTypesManager = new BibEntryTypesManager();
+    public static BibEntryTypesManager entryTypesManager;
 
     private static ClipBoardManager clipBoardManager = null;
     private static KeyBindingRepository keyBindingRepository;
@@ -101,24 +100,30 @@ public static synchronized ClipBoardManager getClipboardManager() {
     public static synchronized ThemeManager getThemeManager() {
         if (themeManager == null) {
             themeManager = new ThemeManager(
-                    prefs.getAppearancePreferences(),
+                    prefs.getWorkspacePreferences(),
                     getFileUpdateMonitor(),
                     Runnable::run);
         }
         return themeManager;
     }
 
+    public static synchronized FileUpdateMonitor getFileUpdateMonitor() {
+        if (fileUpdateMonitor == null) {
+            fileUpdateMonitor = new DefaultFileUpdateMonitor();
+            JabRefExecutorService.INSTANCE.executeInterruptableTask(fileUpdateMonitor, "FileUpdateMonitor");
+        }
+        return fileUpdateMonitor;
+    }
+
     // Background tasks
     public static void startBackgroundTasks() {
-        Globals.fileUpdateMonitor = new DefaultFileUpdateMonitor();
-        JabRefExecutorService.INSTANCE.executeInterruptableTask(Globals.fileUpdateMonitor, "FileUpdateMonitor");
         // TODO Currently deactivated due to incompatibilities in XML
       /*  if (Globals.prefs.getTelemetryPreferences().shouldCollectTelemetry() && !GraphicsEnvironment.isHeadless()) {
             startTelemetryClient();
         } */
         RemotePreferences remotePreferences = prefs.getRemotePreferences();
         if (remotePreferences.useRemoteServer()) {
-            Globals.REMOTE_LISTENER.openAndStart(new CLIMessageHandler(prefs), remotePreferences.getPort());
+            Globals.REMOTE_LISTENER.openAndStart(new CLIMessageHandler(prefs, fileUpdateMonitor, entryTypesManager), remotePreferences.getPort());
         }
     }
 
@@ -147,10 +152,6 @@ private static void startTelemetryClient() {
         telemetryClient.trackSessionState(SessionState.Start);
     }
 
-    public static FileUpdateMonitor getFileUpdateMonitor() {
-        return fileUpdateMonitor;
-    }
-
     public static void shutdownThreadPools() {
         TASK_EXECUTOR.shutdown();
         if (fileUpdateMonitor != null) {
diff --git a/src/main/java/org/jabref/gui/JabRefDialogService.java b/src/main/java/org/jabref/gui/JabRefDialogService.java
index 9709223cc2b..6f3c333db13 100644
--- a/src/main/java/org/jabref/gui/JabRefDialogService.java
+++ b/src/main/java/org/jabref/gui/JabRefDialogService.java
@@ -27,7 +27,6 @@
 import javafx.scene.control.Label;
 import javafx.scene.control.TextInputDialog;
 import javafx.scene.layout.HBox;
-import javafx.scene.layout.Pane;
 import javafx.scene.layout.Region;
 import javafx.scene.layout.VBox;
 import javafx.stage.DirectoryChooser;
@@ -38,7 +37,6 @@
 
 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;
@@ -73,11 +71,9 @@ public class JabRefDialogService implements DialogService {
     private static final Logger LOGGER = LoggerFactory.getLogger(JabRefDialogService.class);
 
     private final Window mainWindow;
-    private final ThemeManager themeManager;
 
-    public JabRefDialogService(Window mainWindow, Pane mainPane, ThemeManager themeManager) {
+    public JabRefDialogService(Window mainWindow) {
         this.mainWindow = mainWindow;
-        this.themeManager = themeManager;
     }
 
     private FXDialog createDialog(AlertType type, String title, String content) {
@@ -364,7 +360,7 @@ public void notify(String message) {
                                               .text(
                                                     "(" + Localization.lang("Check the event log to see all notifications") + ")"
                                                      + "\n\n" + message)
-                                              .onAction((e)-> {
+                                              .onAction(e -> {
                                                      ErrorConsoleAction ec = new ErrorConsoleAction();
                                                      ec.execute();
                                                  }))
diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
index 24cb8f44581..88a37f98927 100644
--- a/src/main/java/org/jabref/gui/JabRefFrame.java
+++ b/src/main/java/org/jabref/gui/JabRefFrame.java
@@ -54,6 +54,8 @@
 import org.jabref.gui.actions.ActionHelper;
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.gui.actions.StandardActions;
+import org.jabref.gui.autosaveandbackup.AutosaveManager;
+import org.jabref.gui.autosaveandbackup.BackupManager;
 import org.jabref.gui.auximport.NewSubLibraryAction;
 import org.jabref.gui.bibtexextractor.ExtractBibtexAction;
 import org.jabref.gui.citationkeypattern.GenerateCitationKeyAction;
@@ -118,13 +120,10 @@
 import org.jabref.gui.util.BackgroundTask;
 import org.jabref.gui.util.DefaultTaskExecutor;
 import org.jabref.gui.util.TaskExecutor;
-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;
@@ -135,9 +134,12 @@
 import org.jabref.logic.util.OS;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.entry.field.SpecialField;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.model.groups.GroupTreeNode;
+import org.jabref.model.util.FileUpdateMonitor;
+import org.jabref.preferences.GuiPreferences;
 import org.jabref.preferences.PreferencesService;
 import org.jabref.preferences.TelemetryPreferences;
 
@@ -170,9 +172,10 @@ public class JabRefFrame extends BorderPane {
 
     private final Stage mainStage;
     private final StateManager stateManager;
-    private final ThemeManager themeManager;
     private final CountingUndoManager undoManager;
     private final DialogService dialogService;
+    private final FileUpdateMonitor fileUpdateMonitor;
+    private final BibEntryTypesManager entryTypesManager;
     private final PushToApplicationCommand pushToApplicationCommand;
     private SidePane sidePane;
     private TabPane tabbedPane;
@@ -182,19 +185,18 @@ public class JabRefFrame extends BorderPane {
     private Subscription dividerSubscription;
 
     private final TaskExecutor taskExecutor;
-    private final ImportFormatReader importFormatReader;
 
     public JabRefFrame(Stage mainStage) {
         this.mainStage = mainStage;
         this.stateManager = Globals.stateManager;
-        this.themeManager = Globals.getThemeManager();
-        this.dialogService = new JabRefDialogService(mainStage, this, themeManager);
+        this.dialogService = new JabRefDialogService(mainStage);
         this.undoManager = Globals.undoManager;
+        this.fileUpdateMonitor = Globals.getFileUpdateMonitor();
+        this.entryTypesManager = Globals.entryTypesManager;
         this.globalSearchBar = new GlobalSearchBar(this, stateManager, prefs, undoManager, dialogService);
         this.pushToApplicationCommand = new PushToApplicationCommand(stateManager, dialogService, prefs);
         this.fileHistory = new FileHistoryMenu(prefs.getGuiPreferences().getFileHistory(), 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)) {
@@ -255,9 +257,9 @@ private void initDragAndDrop() {
 
                         Dragboard dragboard = tabDragEvent.getDragboard();
 
-                        if (DragAndDropHelper.hasBibFiles(tabDragEvent.getDragboard())) {
+                        if (DragAndDropHelper.hasBibFiles(dragboard)) {
                             tabbedPane.getTabs().remove(dndIndicator);
-                            List<Path> bibFiles = DragAndDropHelper.getBibFiles(tabDragEvent.getDragboard());
+                            List<Path> bibFiles = DragAndDropHelper.getBibFiles(dragboard);
                             OpenDatabaseAction openDatabaseAction = this.getOpenDatabaseAction();
                             openDatabaseAction.openFiles(bibFiles);
                             tabDragEvent.setDropCompleted(true);
@@ -267,8 +269,8 @@ private void initDragAndDrop() {
                                 if (libraryTab.getId().equals(destinationTabNode.getId()) &&
                                         !tabbedPane.getSelectionModel().getSelectedItem().equals(libraryTab)) {
                                     LibraryTab destinationLibraryTab = (LibraryTab) libraryTab;
-                                    if (DragAndDropHelper.hasGroups(tabDragEvent.getDragboard())) {
-                                        List<String> groupPathToSources = DragAndDropHelper.getGroups(tabDragEvent.getDragboard());
+                                    if (DragAndDropHelper.hasGroups(dragboard)) {
+                                        List<String> groupPathToSources = DragAndDropHelper.getGroups(dragboard);
 
                                         copyRootNode(destinationLibraryTab);
 
@@ -320,6 +322,10 @@ private void initKeyBindings() {
                         getCurrentLibraryTab().getMainTable().requestFocus();
                         event.consume();
                         break;
+                    case FOCUS_GROUP_LIST:
+                        sidePane.getSidePaneComponent(SidePaneType.GROUPS).requestFocus();
+                        event.consume();
+                    break;
                     case NEXT_LIBRARY:
                         tabbedPane.getSelectionModel().selectNext();
                         event.consume();
@@ -411,7 +417,7 @@ public void openAction(String filePath) {
      * The MacAdapter calls this method when "About" is selected from the application menu.
      */
     public void about() {
-        new HelpAction(HelpFile.CONTENTS, dialogService).execute();
+        new HelpAction(HelpFile.CONTENTS, dialogService, prefs.getFilePreferences()).execute();
     }
 
     /**
@@ -423,7 +429,7 @@ public void about() {
      *                  set to true
      */
     private void tearDownJabRef(List<String> filenames) {
-        if (prefs.getImportExportPreferences().shouldOpenLastEdited()) {
+        if (prefs.getWorkspacePreferences().shouldOpenLastEdited()) {
             // Here we store the names of all current files. If there is no current file, we remove any
             // previously stored filename.
             if (filenames.isEmpty()) {
@@ -472,13 +478,6 @@ public boolean quit() {
         for (int i = 0; i < tabbedPane.getTabs().size(); i++) {
             LibraryTab libraryTab = getLibraryTabAt(i);
             final BibDatabaseContext context = libraryTab.getBibDatabaseContext();
-
-            if (context.hasEmptyEntries()) {
-                if (!confirmEmptyEntry(libraryTab, context)) {
-                    return false;
-                }
-            }
-
             if (libraryTab.isModified() && (context.getLocation() == DatabaseLocation.LOCAL)) {
                 tabbedPane.getSelectionModel().select(i);
                 if (!confirmClose(libraryTab)) {
@@ -490,19 +489,49 @@ public boolean quit() {
                 context.clearDBMSSynchronizer();
             }
             AutosaveManager.shutdown(context);
-            BackupManager.shutdown(context);
+            BackupManager.shutdown(context, prefs.getFilePreferences().getBackupDirectory(), prefs.getFilePreferences().shouldCreateBackup());
             context.getDatabasePath().map(Path::toAbsolutePath).map(Path::toString).ifPresent(filenames::add);
         }
 
         WaitForSaveFinishedDialog waitForSaveFinishedDialog = new WaitForSaveFinishedDialog(dialogService);
         waitForSaveFinishedDialog.showAndWait(getLibraryTabs());
 
+        // We call saveWindow state here again because under Mac the windowClose listener on the stage isn't triggered when using cmd + q
+        saveWindowState();
         // Good bye!
         tearDownJabRef(filenames);
         Platform.exit();
         return true;
     }
 
+    public void saveWindowState() {
+        GuiPreferences preferences = prefs.getGuiPreferences();
+        preferences.setPositionX(mainStage.getX());
+        preferences.setPositionY(mainStage.getY());
+        preferences.setSizeX(mainStage.getWidth());
+        preferences.setSizeY(mainStage.getHeight());
+        preferences.setWindowMaximised(mainStage.isMaximized());
+        preferences.setWindowFullScreen(mainStage.isFullScreen());
+        debugLogWindowState(mainStage);
+    }
+
+    /**
+     * outprints the Data from the Screen (only in debug mode)
+     *
+     * @param mainStage JabRefs stage
+     */
+    private void debugLogWindowState(Stage mainStage) {
+        if (LOGGER.isDebugEnabled()) {
+            String debugLogString = "SCREEN DATA:" +
+                    "mainStage.WINDOW_MAXIMISED: " + mainStage.isMaximized() + "\n" +
+                    "mainStage.POS_X: " + mainStage.getX() + "\n" +
+                    "mainStage.POS_Y: " + mainStage.getY() + "\n" +
+                    "mainStage.SIZE_X: " + mainStage.getWidth() + "\n" +
+                    "mainStages.SIZE_Y: " + mainStage.getHeight() + "\n";
+            LOGGER.debug(debugLogString);
+        }
+    }
+
     private void initLayout() {
         setId("frame");
 
@@ -567,7 +596,7 @@ private Node createToolbar() {
         ToolBar toolBar = new ToolBar(
                 new HBox(
                         factory.createIconButton(StandardActions.NEW_LIBRARY, new NewDatabaseAction(this, prefs)),
-                        factory.createIconButton(StandardActions.OPEN_LIBRARY, new OpenDatabaseAction(this, prefs, dialogService, stateManager, themeManager)),
+                        factory.createIconButton(StandardActions.OPEN_LIBRARY, new OpenDatabaseAction(this, prefs, dialogService, stateManager, fileUpdateMonitor, entryTypesManager)),
                         factory.createIconButton(StandardActions.SAVE_LIBRARY, new SaveAction(SaveAction.SaveMethod.SAVE, this, prefs, stateManager))),
 
                 leftSpacer,
@@ -607,7 +636,7 @@ private Node createToolbar() {
                 new Separator(Orientation.VERTICAL),
 
                 new HBox(
-                        factory.createIconButton(StandardActions.OPEN_GITHUB, new OpenBrowserAction("https://github.com/JabRef/jabref", dialogService))));
+                        factory.createIconButton(StandardActions.OPEN_GITHUB, new OpenBrowserAction("https://github.com/JabRef/jabref", dialogService, prefs.getFilePreferences()))));
 
         leftSpacer.setPrefWidth(50);
         leftSpacer.setMinWidth(Region.USE_PREF_SIZE);
@@ -648,7 +677,7 @@ public void showLibraryTab(LibraryTab libraryTab) {
     }
 
     public void init() {
-        sidePane = new SidePane(prefs, taskExecutor, dialogService, stateManager, undoManager);
+        sidePane = new SidePane(prefs, Globals.journalAbbreviationRepository, taskExecutor, dialogService, stateManager, undoManager);
         tabbedPane = new TabPane();
         tabbedPane.setTabDragPolicy(TabPane.TabDragPolicy.REORDER);
 
@@ -658,7 +687,7 @@ public void init() {
 
         // Bind global state
         FilteredList<Tab> filteredTabs = new FilteredList<>(tabbedPane.getTabs());
-        filteredTabs.setPredicate(tab -> tab instanceof LibraryTab);
+        filteredTabs.setPredicate(LibraryTab.class::isInstance);
 
         // This variable cannot be inlined, since otherwise the list created by EasyBind is being garbage collected
         openDatabaseList = EasyBind.map(filteredTabs, tab -> ((LibraryTab) tab).getBibDatabaseContext());
@@ -775,12 +804,13 @@ private MenuBar createMenu() {
                 factory.createMenuItem(StandardActions.SAVE_LIBRARY, new SaveAction(SaveAction.SaveMethod.SAVE, this, prefs, stateManager)),
                 factory.createMenuItem(StandardActions.SAVE_LIBRARY_AS, new SaveAction(SaveAction.SaveMethod.SAVE_AS, this, prefs, stateManager)),
                 factory.createMenuItem(StandardActions.SAVE_ALL, new SaveAllAction(this, prefs)),
+                factory.createMenuItem(StandardActions.CLOSE_LIBRARY, new CloseDatabaseAction()),
 
                 new SeparatorMenuItem(),
 
                 factory.createSubMenu(StandardActions.IMPORT,
-                        factory.createMenuItem(StandardActions.IMPORT_INTO_CURRENT_LIBRARY, new ImportCommand(this, false, prefs, stateManager)),
-                        factory.createMenuItem(StandardActions.IMPORT_INTO_NEW_LIBRARY, new ImportCommand(this, true, prefs, stateManager))),
+                        factory.createMenuItem(StandardActions.IMPORT_INTO_CURRENT_LIBRARY, new ImportCommand(this, false, prefs, stateManager, fileUpdateMonitor)),
+                        factory.createMenuItem(StandardActions.IMPORT_INTO_NEW_LIBRARY, new ImportCommand(this, true, prefs, stateManager, fileUpdateMonitor))),
 
                 factory.createSubMenu(StandardActions.EXPORT,
                         factory.createMenuItem(StandardActions.EXPORT_ALL, new ExportCommand(ExportCommand.ExportMethod.EXPORT_ALL, this, stateManager, dialogService, prefs)),
@@ -799,7 +829,6 @@ private MenuBar createMenu() {
 
                 new SeparatorMenuItem(),
 
-                factory.createMenuItem(StandardActions.CLOSE_LIBRARY, new CloseDatabaseAction()),
                 factory.createMenuItem(StandardActions.QUIT, new CloseAction())
         );
 
@@ -813,12 +842,12 @@ private MenuBar createMenu() {
 
                 factory.createMenuItem(StandardActions.COPY, new EditAction(StandardActions.COPY, this, stateManager)),
                 factory.createSubMenu(StandardActions.COPY_MORE,
-                        factory.createMenuItem(StandardActions.COPY_TITLE, new CopyMoreAction(StandardActions.COPY_TITLE, dialogService, stateManager, Globals.getClipboardManager(), prefs)),
-                        factory.createMenuItem(StandardActions.COPY_KEY, new CopyMoreAction(StandardActions.COPY_KEY, dialogService, stateManager, Globals.getClipboardManager(), prefs)),
-                        factory.createMenuItem(StandardActions.COPY_CITE_KEY, new CopyMoreAction(StandardActions.COPY_CITE_KEY, dialogService, stateManager, Globals.getClipboardManager(), prefs)),
-                        factory.createMenuItem(StandardActions.COPY_KEY_AND_TITLE, new CopyMoreAction(StandardActions.COPY_KEY_AND_TITLE, dialogService, stateManager, Globals.getClipboardManager(), prefs)),
-                        factory.createMenuItem(StandardActions.COPY_KEY_AND_LINK, new CopyMoreAction(StandardActions.COPY_KEY_AND_LINK, dialogService, stateManager, Globals.getClipboardManager(), prefs)),
-                        factory.createMenuItem(StandardActions.COPY_CITATION_PREVIEW, new CopyCitationAction(CitationStyleOutputFormat.HTML, dialogService, stateManager, Globals.getClipboardManager(), Globals.TASK_EXECUTOR, prefs.getPreviewPreferences())),
+                        factory.createMenuItem(StandardActions.COPY_TITLE, new CopyMoreAction(StandardActions.COPY_TITLE, dialogService, stateManager, Globals.getClipboardManager(), prefs, Globals.journalAbbreviationRepository)),
+                        factory.createMenuItem(StandardActions.COPY_KEY, new CopyMoreAction(StandardActions.COPY_KEY, dialogService, stateManager, Globals.getClipboardManager(), prefs, Globals.journalAbbreviationRepository)),
+                        factory.createMenuItem(StandardActions.COPY_CITE_KEY, new CopyMoreAction(StandardActions.COPY_CITE_KEY, dialogService, stateManager, Globals.getClipboardManager(), prefs, Globals.journalAbbreviationRepository)),
+                        factory.createMenuItem(StandardActions.COPY_KEY_AND_TITLE, new CopyMoreAction(StandardActions.COPY_KEY_AND_TITLE, dialogService, stateManager, Globals.getClipboardManager(), prefs, Globals.journalAbbreviationRepository)),
+                        factory.createMenuItem(StandardActions.COPY_KEY_AND_LINK, new CopyMoreAction(StandardActions.COPY_KEY_AND_LINK, dialogService, stateManager, Globals.getClipboardManager(), prefs, Globals.journalAbbreviationRepository)),
+                        factory.createMenuItem(StandardActions.COPY_CITATION_PREVIEW, new CopyCitationAction(CitationStyleOutputFormat.HTML, dialogService, stateManager, Globals.getClipboardManager(), Globals.TASK_EXECUTOR, prefs, Globals.journalAbbreviationRepository)),
                         factory.createMenuItem(StandardActions.EXPORT_SELECTED_TO_CLIPBOARD, new ExportToClipboardAction(dialogService, stateManager, Globals.getClipboardManager(), Globals.TASK_EXECUTOR, prefs))),
 
                 factory.createMenuItem(StandardActions.PASTE, new EditAction(StandardActions.PASTE, this, stateManager)),
@@ -866,8 +895,8 @@ private MenuBar createMenu() {
 
         quality.getItems().addAll(
                 factory.createMenuItem(StandardActions.FIND_DUPLICATES, new DuplicateSearch(this, dialogService, stateManager, prefs)),
-                factory.createMenuItem(StandardActions.MERGE_ENTRIES, new MergeEntriesAction(dialogService, stateManager, prefs.getBibEntryPreferences())),
-                factory.createMenuItem(StandardActions.CHECK_INTEGRITY, new IntegrityCheckAction(this, stateManager, Globals.TASK_EXECUTOR)),
+                factory.createMenuItem(StandardActions.MERGE_ENTRIES, new MergeEntriesAction(dialogService, stateManager, prefs)),
+                factory.createMenuItem(StandardActions.CHECK_INTEGRITY, new IntegrityCheckAction(this, prefs, dialogService, stateManager, Globals.TASK_EXECUTOR, Globals.journalAbbreviationRepository)),
                 factory.createMenuItem(StandardActions.CLEANUP_ENTRIES, new CleanupAction(this, this.prefs, dialogService, stateManager)),
 
                 new SeparatorMenuItem(),
@@ -908,20 +937,20 @@ private MenuBar createMenu() {
 
                 new SeparatorMenuItem(),
 
-                factory.createMenuItem(StandardActions.WRITE_METADATA_TO_PDF, new WriteMetadataToPdfAction(stateManager, Globals.entryTypesManager, prefs.getFieldWriterPreferences(), dialogService, taskExecutor, prefs.getFilePreferences(), prefs.getXmpPreferences())),
+                factory.createMenuItem(StandardActions.WRITE_METADATA_TO_PDF, new WriteMetadataToPdfAction(stateManager, Globals.entryTypesManager, prefs.getFieldPreferences(), dialogService, taskExecutor, prefs.getFilePreferences(), prefs.getXmpPreferences(), Globals.journalAbbreviationRepository)),
                 factory.createMenuItem(StandardActions.COPY_LINKED_FILES, new CopyFilesAction(dialogService, prefs, stateManager)),
 
                 new SeparatorMenuItem(),
 
-                factory.createMenuItem(StandardActions.SEND_AS_EMAIL, new SendAsEMailAction(dialogService, this.prefs, stateManager)),
+                createSendSubMenu(factory, dialogService, stateManager, prefs),
                 pushToApplicationMenuItem,
 
                 new SeparatorMenuItem(),
 
                 // Systematic Literature Review (SLR)
-                factory.createMenuItem(StandardActions.START_NEW_STUDY, new StartNewStudyAction(this, Globals.getFileUpdateMonitor(), Globals.TASK_EXECUTOR, prefs, stateManager, themeManager)),
+                factory.createMenuItem(StandardActions.START_NEW_STUDY, new StartNewStudyAction(this, fileUpdateMonitor, taskExecutor, prefs, stateManager)),
                 factory.createMenuItem(StandardActions.EDIT_EXISTING_STUDY, new EditExistingStudyAction(this.dialogService, this.stateManager)),
-                factory.createMenuItem(StandardActions.UPDATE_SEARCH_RESULTS_OF_STUDY, new ExistingStudySearchAction(this, this.getOpenDatabaseAction(), this.getDialogService(), Globals.getFileUpdateMonitor(), Globals.TASK_EXECUTOR, prefs, stateManager, themeManager)),
+                factory.createMenuItem(StandardActions.UPDATE_SEARCH_RESULTS_OF_STUDY, new ExistingStudySearchAction(this, this.getOpenDatabaseAction(), this.getDialogService(), fileUpdateMonitor, Globals.TASK_EXECUTOR, prefs, stateManager)),
 
                 new SeparatorMenuItem(),
 
@@ -948,8 +977,8 @@ private MenuBar createMenu() {
         );
 
         help.getItems().addAll(
-                factory.createMenuItem(StandardActions.HELP, new HelpAction(HelpFile.CONTENTS, dialogService)),
-                factory.createMenuItem(StandardActions.OPEN_FORUM, new OpenBrowserAction("http://discourse.jabref.org/", dialogService)),
+                factory.createMenuItem(StandardActions.HELP, new HelpAction(HelpFile.CONTENTS, dialogService, prefs.getFilePreferences())),
+                factory.createMenuItem(StandardActions.OPEN_FORUM, new OpenBrowserAction("http://discourse.jabref.org/", dialogService, prefs.getFilePreferences())),
 
                 new SeparatorMenuItem(),
 
@@ -957,19 +986,19 @@ private MenuBar createMenu() {
 
                 new SeparatorMenuItem(),
 
-                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.createMenuItem(StandardActions.DONATE, new OpenBrowserAction("https://donations.jabref.org", dialogService, prefs.getFilePreferences())),
+                factory.createMenuItem(StandardActions.SEARCH_FOR_UPDATES, new SearchForUpdateAction(Globals.BUILD_INFO, prefs, dialogService, Globals.TASK_EXECUTOR)),
                 factory.createSubMenu(StandardActions.WEB_MENU,
-                        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)),
+                        factory.createMenuItem(StandardActions.OPEN_WEBPAGE, new OpenBrowserAction("https://jabref.org/", dialogService, prefs.getFilePreferences())),
+                        factory.createMenuItem(StandardActions.OPEN_BLOG, new OpenBrowserAction("https://blog.jabref.org/", dialogService, prefs.getFilePreferences())),
+                        factory.createMenuItem(StandardActions.OPEN_FACEBOOK, new OpenBrowserAction("https://www.facebook.com/JabRef/", dialogService, prefs.getFilePreferences())),
+                        factory.createMenuItem(StandardActions.OPEN_TWITTER, new OpenBrowserAction("https://twitter.com/jabref_org", dialogService, prefs.getFilePreferences())),
+                        factory.createMenuItem(StandardActions.OPEN_GITHUB, new OpenBrowserAction("https://github.com/JabRef/jabref", dialogService, prefs.getFilePreferences())),
 
                         new SeparatorMenuItem(),
 
-                        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.OPEN_DEV_VERSION_LINK, new OpenBrowserAction("https://builds.jabref.org/master/", dialogService, prefs.getFilePreferences())),
+                        factory.createMenuItem(StandardActions.OPEN_CHANGELOG, new OpenBrowserAction("https://github.com/JabRef/jabref/blob/main/CHANGELOG.md", dialogService, prefs.getFilePreferences()))
                 ),
                 factory.createMenuItem(StandardActions.ABOUT, new AboutAction())
         );
@@ -1157,12 +1186,12 @@ public void addTab(LibraryTab libraryTab, boolean raisePanel) {
 
     /**
      * Opens a new tab with existing data.
-     * Asynchronous loading is done at {@link #createLibraryTab(BackgroundTask, Path, PreferencesService, StateManager, JabRefFrame, ThemeManager)}.
+     * Asynchronous loading is done at {@link org.jabref.gui.LibraryTab#createLibraryTab(BackgroundTask, Path, PreferencesService, StateManager, JabRefFrame, ThemeManager)}.
      */
     public LibraryTab addTab(BibDatabaseContext databaseContext, boolean raisePanel) {
         Objects.requireNonNull(databaseContext);
 
-        LibraryTab libraryTab = new LibraryTab(databaseContext, this, prefs, stateManager, themeManager);
+        LibraryTab libraryTab = new LibraryTab(databaseContext, this, prefs, stateManager, fileUpdateMonitor, entryTypesManager);
         addTab(libraryTab, raisePanel);
         return libraryTab;
     }
@@ -1235,55 +1264,13 @@ private boolean confirmClose(LibraryTab libraryTab) {
         }
 
         if (buttonType.equals(discardChanges)) {
-            BackupManager.discardBackup(libraryTab.getBibDatabaseContext());
+            BackupManager.discardBackup(libraryTab.getBibDatabaseContext(), prefs.getFilePreferences().getBackupDirectory());
             return true;
         }
 
         return false;
     }
 
-    /**
-     * Ask if the user really wants to remove any empty entries
-     */
-    private Boolean confirmEmptyEntry(LibraryTab libraryTab, BibDatabaseContext context) {
-        String filename = libraryTab.getBibDatabaseContext()
-                                    .getDatabasePath()
-                                    .map(Path::toAbsolutePath)
-                                    .map(Path::toString)
-                                    .orElse(Localization.lang("untitled"));
-
-        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 library"), ButtonBar.ButtonData.CANCEL_CLOSE);
-
-        Optional<ButtonType> response = dialogService.showCustomButtonDialogAndWait(Alert.AlertType.CONFIRMATION,
-                Localization.lang("Empty entries"),
-                Localization.lang("Library '%0' has empty entries. Do you want to delete them?", filename),
-                deleteEmptyEntries, keepEmptyEntries, cancel);
-        if (response.isPresent() && response.get().equals(deleteEmptyEntries)) {
-            // The user wants to delete.
-            try {
-                for (BibEntry currentEntry : new ArrayList<>(context.getEntries())) {
-                    if (currentEntry.getFields().isEmpty()) {
-                        context.getDatabase().removeEntries(Collections.singletonList(currentEntry));
-                    }
-                }
-                SaveDatabaseAction saveAction = new SaveDatabaseAction(libraryTab, prefs, Globals.entryTypesManager);
-                if (saveAction.save()) {
-                    return true;
-                }
-                // The action was either canceled or unsuccessful.
-                dialogService.notify(Localization.lang("Unable to save library"));
-            } catch (Throwable ex) {
-                LOGGER.error("A problem occurred when trying to delete the empty entries", ex);
-                dialogService.showErrorDialogAndWait(Localization.lang("Delete empty entries"), Localization.lang("Could not delete empty entries."), ex);
-            }
-            // Save was cancelled or an error occurred.
-            return false;
-        }
-        return !response.get().equals(cancel);
-    }
-
     private void closeTab(LibraryTab libraryTab) {
         // empty tab without database
         if (libraryTab == null) {
@@ -1291,11 +1278,6 @@ private void closeTab(LibraryTab libraryTab) {
         }
 
         final BibDatabaseContext context = libraryTab.getBibDatabaseContext();
-        if (context.hasEmptyEntries()) {
-            if (!confirmEmptyEntry(libraryTab, context)) {
-                return;
-            }
-        }
 
         if (libraryTab.isModified() && (context.getLocation() == DatabaseLocation.LOCAL)) {
             if (confirmClose(libraryTab)) {
@@ -1312,7 +1294,7 @@ private void closeTab(LibraryTab libraryTab) {
             removeTab(libraryTab);
         }
         AutosaveManager.shutdown(context);
-        BackupManager.shutdown(context);
+        BackupManager.shutdown(context, prefs.getFilePreferences().getBackupDirectory(), prefs.getFilePreferences().shouldCreateBackup());
     }
 
     private void removeTab(LibraryTab libraryTab) {
@@ -1327,7 +1309,7 @@ public void closeCurrentTab() {
     }
 
     public OpenDatabaseAction getOpenDatabaseAction() {
-        return new OpenDatabaseAction(this, prefs, dialogService, stateManager, themeManager);
+        return new OpenDatabaseAction(this, prefs, dialogService, stateManager, fileUpdateMonitor, entryTypesManager);
     }
 
     public GlobalSearchBar getGlobalSearchBar() {
@@ -1378,6 +1360,19 @@ private void copyRootNode(LibraryTab destinationLibraryTab) {
                              .setGroups(currentLibraryGroupRoot);
     }
 
+    private Menu createSendSubMenu(ActionFactory factory,
+                                          DialogService dialogService,
+                                          StateManager stateManager,
+                                          PreferencesService preferencesService) {
+        Menu sendMenu = factory.createMenu(StandardActions.SEND);
+        sendMenu.getItems().addAll(
+                factory.createMenuItem(StandardActions.SEND_AS_EMAIL, new SendAsStandardEmailAction(dialogService, preferencesService, stateManager, entryTypesManager)),
+                factory.createMenuItem(StandardActions.SEND_TO_KINDLE, new SendAsKindleEmailAction(dialogService, preferencesService, stateManager))
+        );
+
+        return sendMenu;
+    }
+
     /**
      * The action concerned with closing the window.
      */
@@ -1453,7 +1448,7 @@ public OpenDatabaseFolder(Supplier<BibDatabaseContext> databaseContext) {
         public void execute() {
             Optional.of(databaseContext.get()).flatMap(BibDatabaseContext::getDatabasePath).ifPresent(path -> {
                 try {
-                    JabRefDesktop.openFolderAndSelectFile(path, prefs, dialogService);
+                    JabRefDesktop.openFolderAndSelectFile(path, prefs.getExternalApplicationsPreferences(), 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 6f230e9eebf..f0497c11c28 100644
--- a/src/main/java/org/jabref/gui/JabRefGUI.java
+++ b/src/main/java/org/jabref/gui/JabRefGUI.java
@@ -4,6 +4,7 @@
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 import javafx.application.Platform;
@@ -25,10 +26,13 @@
 import org.jabref.logic.shared.exception.InvalidDBMSConnectionPropertiesException;
 import org.jabref.logic.shared.exception.NotASharedDatabaseException;
 import org.jabref.logic.util.WebViewStore;
+import org.jabref.model.strings.StringUtil;
+import org.jabref.model.util.FileUpdateMonitor;
 import org.jabref.preferences.GuiPreferences;
 import org.jabref.preferences.PreferencesService;
 
 import com.airhacks.afterburner.injection.Injector;
+import com.tobiasdiez.easybind.EasyBind;
 import impl.org.controlsfx.skin.DecorationPane;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -39,6 +43,7 @@ public class JabRefGUI {
 
     private static JabRefFrame mainFrame;
     private final PreferencesService preferencesService;
+    private final FileUpdateMonitor fileUpdateMonitor;
 
     private final List<ParserResult> bibDatabases;
     private final boolean isBlank;
@@ -46,10 +51,15 @@ public class JabRefGUI {
     private final List<ParserResult> failed = new ArrayList<>();
     private final List<ParserResult> toOpenTab = new ArrayList<>();
 
-    public JabRefGUI(Stage mainStage, List<ParserResult> databases, boolean isBlank, PreferencesService preferencesService) {
+    public JabRefGUI(Stage mainStage,
+                     List<ParserResult> databases,
+                     boolean isBlank,
+                     PreferencesService preferencesService,
+                     FileUpdateMonitor fileUpdateMonitor) {
         this.bibDatabases = databases;
         this.isBlank = isBlank;
         this.preferencesService = preferencesService;
+        this.fileUpdateMonitor = fileUpdateMonitor;
         this.correctedWindowPos = false;
 
         WebViewStore.init();
@@ -58,19 +68,42 @@ public JabRefGUI(Stage mainStage, List<ParserResult> databases, boolean isBlank,
 
         openWindow(mainStage);
 
-        new VersionWorker(Globals.BUILD_INFO.version,
-                mainFrame.getDialogService(),
-                Globals.TASK_EXECUTOR,
-                preferencesService.getInternalPreferences())
-                .checkForNewVersionDelayed();
-
-        if (preferencesService.getProxyPreferences().shouldUseProxy() && preferencesService.getProxyPreferences().shouldUseAuthentication()) {
-            DialogService dialogService = Injector.instantiateModelOrService(DialogService.class);
-            dialogService.showPasswordDialogAndWait(Localization.lang("Proxy configuration"), Localization.lang("Proxy requires password"), Localization.lang("Password"))
-                .ifPresent(newPassword -> {
-                    preferencesService.getProxyPreferences().setPassword(newPassword);
-                    ProxyRegisterer.register(preferencesService.getProxyPreferences());
-                });
+        EasyBind.subscribe(preferencesService.getInternalPreferences().versionCheckEnabledProperty(), enabled -> {
+            if (enabled) {
+                new VersionWorker(Globals.BUILD_INFO.version,
+                        mainFrame.getDialogService(),
+                        Globals.TASK_EXECUTOR,
+                        preferencesService)
+                        .checkForNewVersionDelayed();
+            }
+        });
+
+        setupProxy();
+    }
+
+    private void setupProxy() {
+        if (!preferencesService.getProxyPreferences().shouldUseProxy()
+                || !preferencesService.getProxyPreferences().shouldUseAuthentication()) {
+            return;
+        }
+
+        if (preferencesService.getProxyPreferences().shouldPersistPassword()
+                && StringUtil.isNotBlank(preferencesService.getProxyPreferences().getPassword())) {
+            ProxyRegisterer.register(preferencesService.getProxyPreferences());
+            return;
+        }
+
+        DialogService dialogService = Injector.instantiateModelOrService(DialogService.class);
+        Optional<String> password = dialogService.showPasswordDialogAndWait(
+                Localization.lang("Proxy configuration"),
+                Localization.lang("Proxy requires password"),
+                Localization.lang("Password"));
+
+        if (password.isPresent()) {
+            preferencesService.getProxyPreferences().setPassword(password.get());
+            ProxyRegisterer.register(preferencesService.getProxyPreferences());
+        } else {
+            LOGGER.warn("No proxy password specified");
         }
     }
 
@@ -84,10 +117,14 @@ private void openWindow(Stage mainStage) {
         mainStage.setMinHeight(330);
         mainStage.setMinWidth(580);
 
+        if (guiPreferences.isWindowFullscreen()) {
+            mainStage.setFullScreen(true);
+        }
         // Restore window location and/or maximised state
         if (guiPreferences.isWindowMaximised()) {
             mainStage.setMaximized(true);
-        } else if ((Screen.getScreens().size() == 1) && isWindowPositionOutOfBounds()) {
+        }
+        if ((Screen.getScreens().size() == 1) && isWindowPositionOutOfBounds()) {
             // corrects the Window, if it is outside the mainscreen
             LOGGER.debug("The Jabref window is outside the main screen");
             mainStage.setX(0);
@@ -123,7 +160,7 @@ private void openWindow(Stage mainStage) {
             if (!correctedWindowPos) {
                 // saves the window position only if its not  corrected -> the window will rest at the old Position,
                 // if the external Screen is connected again.
-                saveWindowState(mainStage);
+                getMainFrame().saveWindowState();
             }
             boolean reallyQuit = mainFrame.quit();
             if (!reallyQuit) {
@@ -132,7 +169,7 @@ private void openWindow(Stage mainStage) {
         });
         Platform.runLater(this::openDatabases);
 
-        if (!(Globals.getFileUpdateMonitor().isActive())) {
+        if (!(fileUpdateMonitor.isActive())) {
             getMainFrame().getDialogService()
                           .showErrorDialogAndWait(Localization.lang("Unable to monitor file changes. Please close files " +
                                   "and processes and restart. You may encounter errors if you continue " +
@@ -142,7 +179,7 @@ private void openWindow(Stage mainStage) {
 
     private void openDatabases() {
         // If the option is enabled, open the last edited libraries, if any.
-        if (!isBlank && preferencesService.getImportExportPreferences().shouldOpenLastEdited()) {
+        if (!isBlank && preferencesService.getWorkspacePreferences().shouldOpenLastEdited()) {
             openLastEditedDatabases();
         }
 
@@ -173,7 +210,8 @@ private void openDatabases() {
 
             if (pr.getDatabase().isShared()) {
                 try {
-                    new SharedDatabaseUIManager(mainFrame, preferencesService).openSharedDatabaseFromParserResult(pr);
+                    new SharedDatabaseUIManager(mainFrame, preferencesService, fileUpdateMonitor)
+                            .openSharedDatabaseFromParserResult(pr);
                 } catch (SQLException | DatabaseNotSupportedException | InvalidDBMSConnectionPropertiesException |
                         NotASharedDatabaseException e) {
                     pr.getDatabaseContext().clearDatabasePath(); // do not open the original file
@@ -242,6 +280,7 @@ private void saveWindowState(Stage mainStage) {
         preferences.setSizeX(mainStage.getWidth());
         preferences.setSizeY(mainStage.getHeight());
         preferences.setWindowMaximised(mainStage.isMaximized());
+        preferences.setWindowFullScreen(mainStage.isFullScreen());
         debugLogWindowState(mainStage);
     }
 
@@ -279,7 +318,7 @@ private void openLastEditedDatabases() {
             return;
         }
 
-        List<Path> filesToOpen = lastFiles.stream().map(file -> Path.of(file)).collect(Collectors.toList());
+        List<Path> filesToOpen = lastFiles.stream().map(Path::of).collect(Collectors.toList());
         getMainFrame().getOpenDatabaseAction().openFiles(filesToOpen);
     }
 
diff --git a/src/main/java/org/jabref/gui/LibraryTab.java b/src/main/java/org/jabref/gui/LibraryTab.java
index 6edf841e0df..fa02d937aa5 100644
--- a/src/main/java/org/jabref/gui/LibraryTab.java
+++ b/src/main/java/org/jabref/gui/LibraryTab.java
@@ -26,13 +26,14 @@
 import org.jabref.gui.autocompleter.AutoCompletePreferences;
 import org.jabref.gui.autocompleter.PersonNameSuggestionProvider;
 import org.jabref.gui.autocompleter.SuggestionProviders;
+import org.jabref.gui.autosaveandbackup.AutosaveManager;
+import org.jabref.gui.autosaveandbackup.BackupManager;
 import org.jabref.gui.collab.DatabaseChangeMonitor;
 import org.jabref.gui.dialogs.AutosaveUiManager;
 import org.jabref.gui.entryeditor.EntryEditor;
 import org.jabref.gui.importer.actions.OpenDatabaseAction;
 import org.jabref.gui.maintable.MainTable;
 import org.jabref.gui.maintable.MainTableDataModel;
-import org.jabref.gui.theme.ThemeManager;
 import org.jabref.gui.undo.CountingUndoManager;
 import org.jabref.gui.undo.NamedCompound;
 import org.jabref.gui.undo.UndoableFieldChange;
@@ -40,8 +41,6 @@
 import org.jabref.gui.undo.UndoableRemoveEntries;
 import org.jabref.gui.util.BackgroundTask;
 import org.jabref.gui.util.DefaultTaskExecutor;
-import org.jabref.logic.autosaveandbackup.AutosaveManager;
-import org.jabref.logic.autosaveandbackup.BackupManager;
 import org.jabref.logic.citationstyle.CitationStyleCache;
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.logic.importer.util.FileFieldParser;
@@ -60,6 +59,7 @@
 import org.jabref.model.database.event.EntriesAddedEvent;
 import org.jabref.model.database.event.EntriesRemovedEvent;
 import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.model.entry.event.EntriesEventSource;
 import org.jabref.model.entry.event.EntryChangedEvent;
@@ -67,6 +67,7 @@
 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.util.FileUpdateMonitor;
 import org.jabref.preferences.PreferencesService;
 
 import com.google.common.eventbus.Subscribe;
@@ -84,8 +85,9 @@ public class LibraryTab extends Tab {
     private final CountingUndoManager undoManager;
     private final DialogService dialogService;
     private final PreferencesService preferencesService;
+    private final FileUpdateMonitor fileUpdateMonitor;
     private final StateManager stateManager;
-    private final ThemeManager themeManager;
+    private final BibEntryTypesManager entryTypesManager;
     private final BooleanProperty changedProperty = new SimpleBooleanProperty(false);
     private final BooleanProperty nonUndoableChangeProperty = new SimpleBooleanProperty(false);
 
@@ -122,14 +124,16 @@ public LibraryTab(BibDatabaseContext bibDatabaseContext,
                       JabRefFrame frame,
                       PreferencesService preferencesService,
                       StateManager stateManager,
-                      ThemeManager themeManager) {
+                      FileUpdateMonitor fileUpdateMonitor,
+                      BibEntryTypesManager entryTypesManager) {
         this.frame = Objects.requireNonNull(frame);
         this.bibDatabaseContext = Objects.requireNonNull(bibDatabaseContext);
         this.undoManager = frame.getUndoManager();
         this.dialogService = frame.getDialogService();
         this.preferencesService = Objects.requireNonNull(preferencesService);
         this.stateManager = Objects.requireNonNull(stateManager);
-        this.themeManager = Objects.requireNonNull(themeManager);
+        this.fileUpdateMonitor = fileUpdateMonitor;
+        this.entryTypesManager = entryTypesManager;
 
         bibDatabaseContext.getDatabase().registerListener(this);
         bibDatabaseContext.getMetaData().registerListener(this);
@@ -287,17 +291,17 @@ public void feedData(BibDatabaseContext bibDatabaseContextFromParserResult) {
     public void installAutosaveManagerAndBackupManager() {
         if (isDatabaseReadyForAutoSave(bibDatabaseContext)) {
             AutosaveManager autosaveManager = AutosaveManager.start(bibDatabaseContext);
-            autosaveManager.registerListener(new AutosaveUiManager(this));
+            autosaveManager.registerListener(new AutosaveUiManager(this, preferencesService, entryTypesManager));
         }
-        if (isDatabaseReadyForBackup(bibDatabaseContext)) {
-            BackupManager.start(bibDatabaseContext, Globals.entryTypesManager, preferencesService);
+        if (isDatabaseReadyForBackup(bibDatabaseContext) && preferencesService.getFilePreferences().shouldCreateBackup()) {
+            BackupManager.start(this, bibDatabaseContext, Globals.entryTypesManager, preferencesService);
         }
     }
 
     private boolean isDatabaseReadyForAutoSave(BibDatabaseContext context) {
         return ((context.getLocation() == DatabaseLocation.SHARED)
                 || ((context.getLocation() == DatabaseLocation.LOCAL)
-                && preferencesService.getImportExportPreferences().shouldAutoSave()))
+                && preferencesService.getLibraryPreferences().shouldAutoSave()))
                 && context.getDatabasePath().isPresent();
     }
 
@@ -313,7 +317,7 @@ private boolean isDatabaseReadyForBackup(BibDatabaseContext context) {
      * Example: *jabref-authors.bib – testbib
      */
     public void updateTabTitle(boolean isChanged) {
-        boolean isAutosaveEnabled = preferencesService.getImportExportPreferences().shouldAutoSave();
+        boolean isAutosaveEnabled = preferencesService.getLibraryPreferences().shouldAutoSave();
 
         DatabaseLocation databaseLocation = bibDatabaseContext.getLocation();
         Optional<Path> file = bibDatabaseContext.getDatabasePath();
@@ -469,13 +473,9 @@ public void insertEntries(final List<BibEntry> entries) {
             bibDatabaseContext.getDatabase().insertEntries(entries);
 
             // Set owner and timestamp
-            for (BibEntry entry : entries) {
-                UpdateField.setAutomaticFields(entry,
-                        true,
-                        true,
-                        preferencesService.getOwnerPreferences(),
-                        preferencesService.getTimestampPreferences());
-            }
+            UpdateField.setAutomaticFields(entries,
+                    preferencesService.getOwnerPreferences(),
+                    preferencesService.getTimestampPreferences());
             // Create an UndoableInsertEntries object.
             getUndoManager().addEdit(new UndoableInsertEntries(bibDatabaseContext.getDatabase(), entries));
 
@@ -505,8 +505,9 @@ private void createMainTable() {
                 stateManager,
                 Globals.getKeyPrefs(),
                 Globals.getClipboardManager(),
-                Globals.IMPORT_FORMAT_READER,
-                Globals.TASK_EXECUTOR);
+                entryTypesManager,
+                Globals.TASK_EXECUTOR,
+                fileUpdateMonitor);
 
         // 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()));
@@ -578,6 +579,7 @@ public EntryEditor getEntryEditor() {
     public void showAndEdit(BibEntry entry) {
         showBottomPane(BasePanelMode.SHOWING_EDITOR);
 
+        // We use != instead of equals because of performance reasons
         if (entry != getShowing()) {
             entryEditor.setEntry(entry);
             showing = entry;
@@ -667,7 +669,7 @@ public BibDatabase getDatabase() {
     }
 
     private boolean showDeleteConfirmationDialog(int numberOfEntries) {
-        if (preferencesService.getGeneralPreferences().shouldConfirmDelete()) {
+        if (preferencesService.getWorkspacePreferences().shouldConfirmDelete()) {
             String title = Localization.lang("Delete entry");
             String message = Localization.lang("Really delete the selected entry?");
             String okButton = Localization.lang("Delete entry");
@@ -684,7 +686,7 @@ private boolean showDeleteConfirmationDialog(int numberOfEntries) {
                     okButton,
                     cancelButton,
                     Localization.lang("Do not ask again"),
-                    optOut -> preferencesService.getGeneralPreferences().setConfirmDelete(!optOut));
+                    optOut -> preferencesService.getWorkspacePreferences().setConfirmDelete(!optOut));
         } else {
             return true;
         }
@@ -705,7 +707,7 @@ private void saveDividerLocation(Number position) {
     public void cleanUp() {
         changeMonitor.ifPresent(DatabaseChangeMonitor::unregister);
         AutosaveManager.shutdown(bibDatabaseContext);
-        BackupManager.shutdown(bibDatabaseContext);
+        BackupManager.shutdown(bibDatabaseContext, preferencesService.getFilePreferences().getBackupDirectory(), preferencesService.getFilePreferences().shouldCreateBackup());
     }
 
     /**
@@ -767,7 +769,7 @@ public FileAnnotationCache getAnnotationCache() {
     public void resetChangeMonitor() {
         changeMonitor.ifPresent(DatabaseChangeMonitor::unregister);
         changeMonitor = Optional.of(new DatabaseChangeMonitor(bibDatabaseContext,
-                Globals.getFileUpdateMonitor(),
+                fileUpdateMonitor,
                 Globals.TASK_EXECUTOR,
                 dialogService,
                 preferencesService,
@@ -819,14 +821,20 @@ public void resetChangedProperties() {
     /**
      * Creates a new library tab. Contents are loaded by the {@code dataLoadingTask}. Most of the other parameters are required by {@code resetChangeMonitor()}.
      *
-     * @param dataLoadingTask The task to execute to load the data. It is executed using {@link Globals.TASK_EXECUTOR}.
+     * @param dataLoadingTask The task to execute to load the data. It is executed using {@link org.jabref.gui.Globals.TASK_EXECUTOR}.
      * @param file the path to the file (loaded by the dataLoadingTask)
      */
-    public static LibraryTab createLibraryTab(BackgroundTask<ParserResult> dataLoadingTask, Path file, PreferencesService preferencesService, StateManager stateManager, JabRefFrame frame, ThemeManager themeManager) {
+    public static LibraryTab createLibraryTab(BackgroundTask<ParserResult> dataLoadingTask,
+                                              Path file,
+                                              PreferencesService preferencesService,
+                                              StateManager stateManager,
+                                              JabRefFrame frame,
+                                              FileUpdateMonitor fileUpdateMonitor,
+                                              BibEntryTypesManager entryTypesManager) {
         BibDatabaseContext context = new BibDatabaseContext();
         context.setDatabasePath(file);
 
-        LibraryTab newTab = new LibraryTab(context, frame, preferencesService, stateManager, themeManager);
+        LibraryTab newTab = new LibraryTab(context, frame, preferencesService, stateManager, fileUpdateMonitor, entryTypesManager);
 
         newTab.setDataLoadingTask(dataLoadingTask);
         dataLoadingTask.onRunning(newTab::onDatabaseLoadingStarted)
diff --git a/src/main/java/org/jabref/gui/MainApplication.java b/src/main/java/org/jabref/gui/MainApplication.java
index 6e286042d42..a187843977d 100644
--- a/src/main/java/org/jabref/gui/MainApplication.java
+++ b/src/main/java/org/jabref/gui/MainApplication.java
@@ -7,6 +7,7 @@
 
 import org.jabref.gui.openoffice.OOBibBaseConnect;
 import org.jabref.logic.importer.ParserResult;
+import org.jabref.model.util.FileUpdateMonitor;
 import org.jabref.preferences.JabRefPreferences;
 
 /**
@@ -16,11 +17,17 @@ public class MainApplication extends Application {
     private static List<ParserResult> parserResults;
     private static boolean isBlank;
     private static JabRefPreferences preferences;
+    private static FileUpdateMonitor fileUpdateMonitor;
 
-    public static void main(List<ParserResult> parserResults, boolean blank, JabRefPreferences preferences, String[] args) {
+    public static void main(List<ParserResult> parserResults,
+                            boolean blank,
+                            JabRefPreferences preferences,
+                            FileUpdateMonitor fileUpdateMonitor,
+                            String[] args) {
         MainApplication.parserResults = parserResults;
         MainApplication.isBlank = blank;
         MainApplication.preferences = preferences;
+        MainApplication.fileUpdateMonitor = fileUpdateMonitor;
         launch(args);
     }
 
@@ -28,7 +35,7 @@ public static void main(List<ParserResult> parserResults, boolean blank, JabRefP
     public void start(Stage mainStage) {
         FallbackExceptionHandler.installExceptionHandler();
         Globals.startBackgroundTasks();
-        new JabRefGUI(mainStage, parserResults, isBlank, preferences);
+        new JabRefGUI(mainStage, parserResults, isBlank, preferences, fileUpdateMonitor);
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/OpenConsoleAction.java b/src/main/java/org/jabref/gui/OpenConsoleAction.java
index b470e1e3ef0..acada1d5629 100644
--- a/src/main/java/org/jabref/gui/OpenConsoleAction.java
+++ b/src/main/java/org/jabref/gui/OpenConsoleAction.java
@@ -47,7 +47,7 @@ public OpenConsoleAction(StateManager stateManager, PreferencesService preferenc
     public void execute() {
         Optional.ofNullable(databaseContext.get()).or(stateManager::getActiveDatabase).flatMap(BibDatabaseContext::getDatabasePath).ifPresent(path -> {
             try {
-                JabRefDesktop.openConsole(path.toFile(), preferencesService, dialogService);
+                JabRefDesktop.openConsole(path, 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 0caaa5afc3b..f8a9bba6ad6 100644
--- a/src/main/java/org/jabref/gui/SendAsEMailAction.java
+++ b/src/main/java/org/jabref/gui/SendAsEMailAction.java
@@ -2,22 +2,17 @@
 
 import java.awt.Desktop;
 import java.io.IOException;
-import java.io.StringWriter;
 import java.net.URI;
+import java.net.URISyntaxException;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
 
 import org.jabref.architecture.AllowedToUseAwt;
-import org.jabref.gui.actions.ActionHelper;
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.gui.desktop.JabRefDesktop;
 import org.jabref.gui.util.BackgroundTask;
-import org.jabref.logic.bibtex.BibEntryWriter;
-import org.jabref.logic.bibtex.FieldWriter;
-import org.jabref.logic.exporter.BibWriter;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.logic.util.OS;
 import org.jabref.logic.util.io.FileUtil;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
@@ -37,7 +32,7 @@
  * preferences/external programs
  */
 @AllowedToUseAwt("Requires AWT to send an email")
-public class SendAsEMailAction extends SimpleCommand {
+public abstract class SendAsEMailAction extends SimpleCommand {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(SendAsEMailAction.class);
     private final DialogService dialogService;
@@ -48,8 +43,6 @@ public SendAsEMailAction(DialogService dialogService, PreferencesService prefere
         this.dialogService = dialogService;
         this.preferencesService = preferencesService;
         this.stateManager = stateManager;
-
-        this.executable.bind(ActionHelper.needsEntriesSelected(stateManager));
     }
 
     @Override
@@ -73,53 +66,56 @@ private String sendEmail() throws Exception {
             return Localization.lang("This operation requires one or more entries to be selected.");
         }
 
-        StringWriter rawEntries = new StringWriter();
-        BibWriter bibWriter = new BibWriter(rawEntries, OS.NEWLINE);
-        BibDatabaseContext databaseContext = stateManager.getActiveDatabase().get();
         List<BibEntry> entries = stateManager.getSelectedEntries();
+        URI uriMailTo = getUriMailTo(entries);
 
-        // write the entries via this writer to "rawEntries" (being a StringWriter), which  used later to form the email content
-        BibEntryWriter bibtexEntryWriter = new BibEntryWriter(new FieldWriter(preferencesService.getFieldWriterPreferences()), Globals.entryTypesManager);
+        Desktop desktop = Desktop.getDesktop();
+        desktop.mail(uriMailTo);
 
-        for (BibEntry entry : entries) {
-            try {
-                bibtexEntryWriter.write(entry, bibWriter, databaseContext.getMode());
-            } catch (IOException e) {
-                LOGGER.warn("Problem creating BibTeX file for mailing.", e);
-            }
+        return String.format("%s: %d", Localization.lang("Entries added to an email"), entries.size());
+    }
+
+    private URI getUriMailTo(List<BibEntry> entries) throws URISyntaxException {
+        StringBuilder mailTo = new StringBuilder();
+
+        mailTo.append(getEmailAddress());
+        mailTo.append("?Body=").append(getBody());
+        mailTo.append("&Subject=").append(getSubject());
+
+        List<String> attachments = getAttachments(entries);
+        for (String path : attachments) {
+            mailTo.append("&Attachment=\"").append(path);
+            mailTo.append("\"");
         }
 
-        List<String> attachments = new ArrayList<>();
+        return new URI("mailto", mailTo.toString(), null);
+    }
 
+    private List<String> getAttachments(List<BibEntry> entries) {
         // open folders is needed to indirectly support email programs, which cannot handle
         //   the unofficial "mailto:attachment" property
         boolean openFolders = preferencesService.getExternalApplicationsPreferences().shouldAutoOpenEmailAttachmentsFolder();
 
+        BibDatabaseContext databaseContext = stateManager.getActiveDatabase().get();
         List<Path> fileList = FileUtil.getListOfLinkedFiles(entries, databaseContext.getFileDirectories(preferencesService.getFilePreferences()));
+
+        List<String> attachments = new ArrayList<>();
         for (Path path : fileList) {
             attachments.add(path.toAbsolutePath().toString());
             if (openFolders) {
                 try {
-                    JabRefDesktop.openFolderAndSelectFile(path.toAbsolutePath(), preferencesService, dialogService);
+                    JabRefDesktop.openFolderAndSelectFile(path.toAbsolutePath(), preferencesService.getExternalApplicationsPreferences(), dialogService);
                 } catch (IOException e) {
                     LOGGER.debug("Cannot open file", e);
                 }
             }
         }
+        return attachments;
+    }
 
-        String mailTo = "?Body=".concat(rawEntries.toString());
-        mailTo = mailTo.concat("&Subject=");
-        mailTo = mailTo.concat(preferencesService.getExternalApplicationsPreferences().getEmailSubject());
-        for (String path : attachments) {
-            mailTo = mailTo.concat("&Attachment=\"").concat(path);
-            mailTo = mailTo.concat("\"");
-        }
-
-        URI uriMailTo = new URI("mailto", mailTo, null);
+    protected abstract String getEmailAddress();
 
-        Desktop desktop = Desktop.getDesktop();
-        desktop.mail(uriMailTo);
+    protected abstract String getSubject();
 
-        return String.format("%s: %d", Localization.lang("Entries added to an email"), entries.size());
-    }
+    protected abstract String getBody();
 }
diff --git a/src/main/java/org/jabref/gui/SendAsKindleEmailAction.java b/src/main/java/org/jabref/gui/SendAsKindleEmailAction.java
new file mode 100644
index 00000000000..113f6cf3c50
--- /dev/null
+++ b/src/main/java/org/jabref/gui/SendAsKindleEmailAction.java
@@ -0,0 +1,34 @@
+package org.jabref.gui;
+
+import org.jabref.gui.actions.ActionHelper;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.preferences.PreferencesService;
+
+/**
+ * Sends attachments for selected entries to the
+ * configured Kindle email
+ */
+public class SendAsKindleEmailAction extends SendAsEMailAction {
+    private final PreferencesService preferencesService;
+
+    public SendAsKindleEmailAction(DialogService dialogService, PreferencesService preferencesService, StateManager stateManager) {
+        super(dialogService, preferencesService, stateManager);
+        this.preferencesService = preferencesService;
+        this.executable.bind(ActionHelper.needsEntriesSelected(stateManager).and(ActionHelper.hasLinkedFileForSelectedEntries(stateManager)));
+    }
+
+    @Override
+    protected String getEmailAddress() {
+        return preferencesService.getExternalApplicationsPreferences().getKindleEmail();
+    }
+
+    @Override
+    protected String getSubject() {
+        return Localization.lang("Send to Kindle");
+    }
+
+    @Override
+    protected String getBody() {
+        return Localization.lang("Send to Kindle");
+    }
+}
diff --git a/src/main/java/org/jabref/gui/SendAsStandardEmailAction.java b/src/main/java/org/jabref/gui/SendAsStandardEmailAction.java
new file mode 100644
index 00000000000..0faf359b371
--- /dev/null
+++ b/src/main/java/org/jabref/gui/SendAsStandardEmailAction.java
@@ -0,0 +1,67 @@
+package org.jabref.gui;
+
+import java.io.IOException;
+import java.io.StringWriter;
+import java.util.List;
+
+import org.jabref.gui.actions.ActionHelper;
+import org.jabref.logic.bibtex.BibEntryWriter;
+import org.jabref.logic.bibtex.FieldWriter;
+import org.jabref.logic.exporter.BibWriter;
+import org.jabref.logic.util.OS;
+import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.BibEntryTypesManager;
+import org.jabref.preferences.PreferencesService;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Sends the selected entries to any specifiable email
+ * by populating the email body
+ */
+public class SendAsStandardEmailAction extends SendAsEMailAction {
+    private static final Logger LOGGER = LoggerFactory.getLogger(SendAsStandardEmailAction.class);
+    private final PreferencesService preferencesService;
+    private final StateManager stateManager;
+    private final BibEntryTypesManager entryTypesManager;
+
+    public SendAsStandardEmailAction(DialogService dialogService, PreferencesService preferencesService, StateManager stateManager, BibEntryTypesManager entryTypesManager) {
+        super(dialogService, preferencesService, stateManager);
+        this.preferencesService = preferencesService;
+        this.stateManager = stateManager;
+        this.entryTypesManager = entryTypesManager;
+        this.executable.bind(ActionHelper.needsEntriesSelected(stateManager));
+    }
+
+    @Override
+    protected String getEmailAddress() {
+        return "";
+    }
+
+    @Override
+    protected String getSubject() {
+        return preferencesService.getExternalApplicationsPreferences().getEmailSubject();
+    }
+
+    @Override
+    protected String getBody() {
+        List<BibEntry> entries = stateManager.getSelectedEntries();
+        BibDatabaseContext databaseContext = stateManager.getActiveDatabase().get();
+        StringWriter rawEntries = new StringWriter();
+        BibWriter bibWriter = new BibWriter(rawEntries, OS.NEWLINE);
+
+        BibEntryWriter bibtexEntryWriter = new BibEntryWriter(new FieldWriter(preferencesService.getFieldPreferences()), entryTypesManager);
+
+        for (BibEntry entry : entries) {
+            try {
+                bibtexEntryWriter.write(entry, bibWriter, databaseContext.getMode());
+            } catch (IOException e) {
+                LOGGER.warn("Problem creating BibTeX file for mailing.", e);
+            }
+        }
+
+        return rawEntries.toString();
+    }
+}
diff --git a/src/main/java/org/jabref/gui/StateManager.java b/src/main/java/org/jabref/gui/StateManager.java
index fffab647dd0..f1ff42c5785 100644
--- a/src/main/java/org/jabref/gui/StateManager.java
+++ b/src/main/java/org/jabref/gui/StateManager.java
@@ -62,7 +62,7 @@ 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<Pair<BackgroundTask, Task<?>>> backgroundTasks = FXCollections.observableArrayList(task -> new Observable[] {task.getValue().progressProperty(), task.getValue().runningProperty()});
+    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));
@@ -169,7 +169,7 @@ public ObservableList<Task<?>> getBackgroundTasks() {
         return EasyBind.map(backgroundTasks, Pair::getValue);
     }
 
-    public void addBackgroundTask(BackgroundTask backgroundTask, Task<?> task) {
+    public void addBackgroundTask(BackgroundTask<?> backgroundTask, Task<?> task) {
         this.backgroundTasks.add(0, new Pair<>(backgroundTask, task));
     }
 
diff --git a/src/main/java/org/jabref/gui/actions/ActionFactory.java b/src/main/java/org/jabref/gui/actions/ActionFactory.java
index 7112ffc8f12..3deb6d068ef 100644
--- a/src/main/java/org/jabref/gui/actions/ActionFactory.java
+++ b/src/main/java/org/jabref/gui/actions/ActionFactory.java
@@ -80,9 +80,9 @@ public MenuItem configureMenuItem(Action action, Command command, MenuItem menuI
         setGraphic(menuItem, action);
 
         // Show tooltips
-        if (command instanceof SimpleCommand) {
+        if (command instanceof SimpleCommand simpleCommand) {
             EasyBind.subscribe(
-                    ((SimpleCommand) command).statusMessageProperty(),
+                    simpleCommand.statusMessageProperty(),
                     message -> {
                         Label label = getAssociatedNode(menuItem);
                         if (label != null) {
diff --git a/src/main/java/org/jabref/gui/actions/JabRefAction.java b/src/main/java/org/jabref/gui/actions/JabRefAction.java
index 9d0e7217f85..abf49e3f48a 100644
--- a/src/main/java/org/jabref/gui/actions/JabRefAction.java
+++ b/src/main/java/org/jabref/gui/actions/JabRefAction.java
@@ -47,8 +47,7 @@ public JabRefAction(Action action, Command command, KeyBindingRepository keyBind
 
         disabledProperty().bind(command.executableProperty().not());
 
-        if (command instanceof SimpleCommand) {
-            SimpleCommand ourCommand = (SimpleCommand) command;
+        if (command instanceof SimpleCommand ourCommand) {
             longTextProperty().bind(Bindings.concat(action.getDescription(), ourCommand.statusMessageProperty()));
         }
     }
diff --git a/src/main/java/org/jabref/gui/actions/StandardActions.java b/src/main/java/org/jabref/gui/actions/StandardActions.java
index 8d9d8249af4..99cfc029201 100644
--- a/src/main/java/org/jabref/gui/actions/StandardActions.java
+++ b/src/main/java/org/jabref/gui/actions/StandardActions.java
@@ -25,7 +25,9 @@ public enum StandardActions implements Action {
     CUT(Localization.lang("Cut"), IconTheme.JabRefIcons.CUT, KeyBinding.CUT),
     DELETE(Localization.lang("Delete"), IconTheme.JabRefIcons.DELETE_ENTRY),
     DELETE_ENTRY(Localization.lang("Delete entry"), IconTheme.JabRefIcons.DELETE_ENTRY, KeyBinding.DELETE_ENTRY),
-    SEND_AS_EMAIL(Localization.lang("Send as email"), IconTheme.JabRefIcons.EMAIL),
+    SEND(Localization.lang("Send"), IconTheme.JabRefIcons.EMAIL),
+    SEND_AS_EMAIL(Localization.lang("As Email")),
+    SEND_TO_KINDLE(Localization.lang("To Kindle")),
     REBUILD_FULLTEXT_SEARCH_INDEX(Localization.lang("Rebuild fulltext search index"), IconTheme.JabRefIcons.FILE),
     OPEN_EXTERNAL_FILE(Localization.lang("Open file"), IconTheme.JabRefIcons.FILE, KeyBinding.OPEN_FILE),
     OPEN_URL(Localization.lang("Open URL or DOI"), IconTheme.JabRefIcons.WWW, KeyBinding.OPEN_URL_OR_DOI),
@@ -70,7 +72,7 @@ public enum StandardActions implements Action {
     EXPORT_SELECTED(Localization.lang("Export selected entries"), KeyBinding.EXPORT_SELECTED),
     CONNECT_TO_SHARED_DB(Localization.lang("Connect to shared database"), IconTheme.JabRefIcons.CONNECT_DB),
     PULL_CHANGES_FROM_SHARED_DB(Localization.lang("Pull changes from shared database"), KeyBinding.PULL_CHANGES_FROM_SHARED_DATABASE),
-    CLOSE_LIBRARY(Localization.lang("Close"), Localization.lang("Close the current library"), IconTheme.JabRefIcons.CLOSE, KeyBinding.CLOSE_DATABASE),
+    CLOSE_LIBRARY(Localization.lang("Close library"), Localization.lang("Close the current library"), IconTheme.JabRefIcons.CLOSE, KeyBinding.CLOSE_DATABASE),
     CLOSE_OTHER_LIBRARIES(Localization.lang("Close others"), Localization.lang("Close other libraries"), IconTheme.JabRefIcons.CLOSE),
     CLOSE_ALL_LIBRARIES(Localization.lang("Close all"), Localization.lang("Close all libraries"), IconTheme.JabRefIcons.CLOSE),
     QUIT(Localization.lang("Quit"), Localization.lang("Quit JabRef"), IconTheme.JabRefIcons.CLOSE_JABREF, KeyBinding.QUIT_JABREF),
diff --git a/src/main/java/org/jabref/gui/autocompleter/SuggestionProviders.java b/src/main/java/org/jabref/gui/autocompleter/SuggestionProviders.java
index 3c47d6dd8e3..06d2abef8a8 100644
--- a/src/main/java/org/jabref/gui/autocompleter/SuggestionProviders.java
+++ b/src/main/java/org/jabref/gui/autocompleter/SuggestionProviders.java
@@ -36,7 +36,7 @@ public SuggestionProvider<?> getForField(Field field) {
             return new PersonNameSuggestionProvider(field, database);
         } else if (fieldProperties.contains(FieldProperty.SINGLE_ENTRY_LINK) || fieldProperties.contains(FieldProperty.MULTIPLE_ENTRY_LINK)) {
             return new BibEntrySuggestionProvider(database);
-        } else if (fieldProperties.contains(FieldProperty.JOURNAL_NAME) || StandardField.PUBLISHER.equals(field)) {
+        } else if (fieldProperties.contains(FieldProperty.JOURNAL_NAME) || StandardField.PUBLISHER == field) {
             return new JournalsSuggestionProvider(field, database, abbreviationRepository);
         } else {
             return new WordSuggestionProvider(field, database);
diff --git a/src/main/java/org/jabref/logic/autosaveandbackup/AutosaveManager.java b/src/main/java/org/jabref/gui/autosaveandbackup/AutosaveManager.java
similarity index 98%
rename from src/main/java/org/jabref/logic/autosaveandbackup/AutosaveManager.java
rename to src/main/java/org/jabref/gui/autosaveandbackup/AutosaveManager.java
index 990da5c2db4..72402b18dd5 100644
--- a/src/main/java/org/jabref/logic/autosaveandbackup/AutosaveManager.java
+++ b/src/main/java/org/jabref/gui/autosaveandbackup/AutosaveManager.java
@@ -1,4 +1,4 @@
-package org.jabref.logic.autosaveandbackup;
+package org.jabref.gui.autosaveandbackup;
 
 import java.util.HashSet;
 import java.util.Set;
diff --git a/src/main/java/org/jabref/logic/autosaveandbackup/BackupManager.java b/src/main/java/org/jabref/gui/autosaveandbackup/BackupManager.java
similarity index 67%
rename from src/main/java/org/jabref/logic/autosaveandbackup/BackupManager.java
rename to src/main/java/org/jabref/gui/autosaveandbackup/BackupManager.java
index 789671c0b14..1b9017f192f 100644
--- a/src/main/java/org/jabref/logic/autosaveandbackup/BackupManager.java
+++ b/src/main/java/org/jabref/gui/autosaveandbackup/BackupManager.java
@@ -1,4 +1,4 @@
-package org.jabref.logic.autosaveandbackup;
+package org.jabref.gui.autosaveandbackup;
 
 import java.io.IOException;
 import java.io.Writer;
@@ -19,18 +19,24 @@
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
+import javafx.scene.control.TableColumn;
+
+import org.jabref.gui.LibraryTab;
+import org.jabref.gui.maintable.BibEntryTableViewModel;
+import org.jabref.gui.maintable.columns.MainTableColumn;
 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.exporter.SelfContainedSaveConfiguration;
 import org.jabref.logic.util.BackupFileType;
 import org.jabref.logic.util.CoarseChangeFilter;
 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;
-import org.jabref.preferences.GeneralPreferences;
+import org.jabref.model.metadata.SaveOrder;
+import org.jabref.model.metadata.SelfContainedSaveOrder;
 import org.jabref.preferences.PreferencesService;
 
 import com.google.common.eventbus.Subscribe;
@@ -58,19 +64,19 @@ public class BackupManager {
     private final ScheduledThreadPoolExecutor executor;
     private final CoarseChangeFilter changeFilter;
     private final BibEntryTypesManager entryTypesManager;
-
+    private final LibraryTab libraryTab;
 
     // 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 = false;
 
-    BackupManager(BibDatabaseContext bibDatabaseContext, BibEntryTypesManager entryTypesManager, PreferencesService preferences) {
+    BackupManager(LibraryTab libraryTab, BibDatabaseContext bibDatabaseContext, BibEntryTypesManager entryTypesManager, PreferencesService preferences) {
         this.bibDatabaseContext = bibDatabaseContext;
         this.entryTypesManager = entryTypesManager;
         this.preferences = preferences;
         this.executor = new ScheduledThreadPoolExecutor(2);
+        this.libraryTab = libraryTab;
 
         changeFilter = new CoarseChangeFilter(bibDatabaseContext);
         changeFilter.registerListener(this);
@@ -79,15 +85,15 @@ public class BackupManager {
     /**
      * Determines the most recent backup file name
      */
-    static Path getBackupPathForNewBackup(Path originalPath) {
-        return BackupFileUtil.getPathForNewBackupFileAndCreateDirectory(originalPath, BackupFileType.BACKUP);
+    static Path getBackupPathForNewBackup(Path originalPath, Path backupDir) {
+        return BackupFileUtil.getPathForNewBackupFileAndCreateDirectory(originalPath, BackupFileType.BACKUP, backupDir);
     }
 
     /**
      * Determines the most recent existing backup file name
      */
-    static Optional<Path> getLatestBackupPath(Path originalPath) {
-        return BackupFileUtil.getPathOfLatestExistingBackupFile(originalPath, BackupFileType.BACKUP);
+    static Optional<Path> getLatestBackupPath(Path originalPath, Path backupDir) {
+        return BackupFileUtil.getPathOfLatestExistingBackupFile(originalPath, BackupFileType.BACKUP, backupDir);
     }
 
     /**
@@ -98,9 +104,9 @@ static Optional<Path> getLatestBackupPath(Path originalPath) {
      *
      * @param bibDatabaseContext Associated {@link BibDatabaseContext}
      */
-    public static BackupManager start(BibDatabaseContext bibDatabaseContext, BibEntryTypesManager entryTypesManager, PreferencesService preferences) {
-        BackupManager backupManager = new BackupManager(bibDatabaseContext, entryTypesManager, preferences);
-        backupManager.startBackupTask();
+    public static BackupManager start(LibraryTab libraryTab, BibDatabaseContext bibDatabaseContext, BibEntryTypesManager entryTypesManager, PreferencesService preferences) {
+        BackupManager backupManager = new BackupManager(libraryTab, bibDatabaseContext, entryTypesManager, preferences);
+        backupManager.startBackupTask(preferences.getFilePreferences().getBackupDirectory());
         runningInstances.add(backupManager);
         return backupManager;
     }
@@ -110,19 +116,19 @@ public static BackupManager start(BibDatabaseContext bibDatabaseContext, BibEntr
      *
      * @param bibDatabaseContext Associated {@link BibDatabaseContext}
      */
-    public static void discardBackup(BibDatabaseContext bibDatabaseContext) {
-        runningInstances.stream().filter(instance -> instance.bibDatabaseContext == bibDatabaseContext).forEach(
-                BackupManager::discardBackup);
+    public static void discardBackup(BibDatabaseContext bibDatabaseContext, Path backupDir) {
+        runningInstances.stream().filter(instance -> instance.bibDatabaseContext == bibDatabaseContext).forEach(backupManager -> backupManager.discardBackup(backupDir));
     }
 
     /**
      * Shuts down the BackupManager which is associated with the given {@link BibDatabaseContext}.
      *
      * @param bibDatabaseContext Associated {@link BibDatabaseContext}
+     * @param createBackup True, if a backup should be created
+     * @param backupDir The path to the backup directory
      */
-    public static void shutdown(BibDatabaseContext bibDatabaseContext) {
-        runningInstances.stream().filter(instance -> instance.bibDatabaseContext == bibDatabaseContext).forEach(
-                BackupManager::shutdown);
+    public static void shutdown(BibDatabaseContext bibDatabaseContext, Path backupDir, boolean createBackup) {
+        runningInstances.stream().filter(instance -> instance.bibDatabaseContext == bibDatabaseContext).forEach(backupManager -> backupManager.shutdown(backupDir, createBackup));
         runningInstances.removeIf(instance -> instance.bibDatabaseContext == bibDatabaseContext);
     }
 
@@ -138,8 +144,8 @@ public static void shutdown(BibDatabaseContext bibDatabaseContext) {
      * "default" return value in the good case. In case a discarded file exists, <code>false</code> is returned, too.
      * 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 discardedFile = determineDiscardedFile(originalPath);
+    public static boolean backupFileDiffers(Path originalPath, Path backupDir) {
+        Path discardedFile = determineDiscardedFile(originalPath, backupDir);
         if (Files.exists(discardedFile)) {
             try {
                 Files.delete(discardedFile);
@@ -149,10 +155,10 @@ public static boolean backupFileDiffers(Path originalPath) {
             }
             return false;
         }
-        return getLatestBackupPath(originalPath).map(latestBackupPath -> {
+        return getLatestBackupPath(originalPath, backupDir).map(latestBackupPath -> {
             FileTime latestBackupFileLastModifiedTime;
             try {
-                 latestBackupFileLastModifiedTime = Files.getLastModifiedTime(latestBackupPath);
+                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
@@ -186,8 +192,8 @@ 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) {
-        Optional<Path> backupPath = getLatestBackupPath(originalPath);
+    public static void restoreBackup(Path originalPath, Path backupDir) {
+        Optional<Path> backupPath = getLatestBackupPath(originalPath, backupDir);
         if (backupPath.isEmpty()) {
             LOGGER.error("There is no backup file");
             return;
@@ -199,8 +205,8 @@ public static void restoreBackup(Path originalPath) {
         }
     }
 
-    Optional<Path> determineBackupPathForNewBackup() {
-        return bibDatabaseContext.getDatabasePath().map(BackupManager::getBackupPathForNewBackup);
+    Optional<Path> determineBackupPathForNewBackup(Path backupDir) {
+        return bibDatabaseContext.getDatabasePath().map(path -> BackupManager.getBackupPathForNewBackup(path, backupDir));
     }
 
     /**
@@ -208,7 +214,7 @@ Optional<Path> determineBackupPathForNewBackup() {
      *
      * <em>SIDE EFFECT: Deletes oldest backup file</em>
      *
-     * @param backupPath the path where the library should be backed up to
+     * @param backupPath the full path to the file where the library should be backed up to
      */
     void performBackup(Path backupPath) {
         if (!needsBackup) {
@@ -217,18 +223,38 @@ void performBackup(Path backupPath) {
 
         // 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();
+            Path oldestBackupFile = backupFilesQueue.poll();
             try {
-                Files.delete(lessRecentBackupFile);
+                Files.delete(oldestBackupFile);
             } catch (IOException e) {
-                LOGGER.error("Could not delete backup file {}", lessRecentBackupFile, e);
+                LOGGER.error("Could not delete backup file {}", oldestBackupFile, e);
             }
         }
 
         // code similar to org.jabref.gui.exporter.SaveDatabaseAction.saveDatabase
-        GeneralPreferences generalPreferences = preferences.getGeneralPreferences();
-        SavePreferences savePreferences = preferences.getSavePreferences()
-                                                     .withMakeBackup(false);
+        SelfContainedSaveOrder saveOrder = bibDatabaseContext
+                .getMetaData().getSaveOrder()
+                .map(so -> {
+                    if (so.getOrderType() == SaveOrder.OrderType.TABLE) {
+                        // We need to "flatten out" SaveOrder.OrderType.TABLE as BibWriter does not have access to preferences
+                        List<TableColumn<BibEntryTableViewModel, ?>> sortOrder = libraryTab.getMainTable().getSortOrder();
+                        return new SelfContainedSaveOrder(
+                                SaveOrder.OrderType.SPECIFIED,
+                                sortOrder.stream()
+                                         .filter(col -> col instanceof MainTableColumn<?>)
+                                         .map(column -> ((MainTableColumn<?>) column).getModel())
+                                         .flatMap(model -> model.getSortCriteria().stream())
+                                         .toList());
+                    } else {
+                        return SelfContainedSaveOrder.of(so);
+                    }
+                })
+                .orElse(SaveOrder.getDefaultSaveOrder());
+        SelfContainedSaveConfiguration saveConfiguration = (SelfContainedSaveConfiguration) new SelfContainedSaveConfiguration()
+                .withMakeBackup(false)
+                .withSaveOrder(saveOrder)
+                .withReformatOnSave(preferences.getLibraryPreferences().shouldAlwaysReformatOnSave());
+
         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"
@@ -236,7 +262,12 @@ void performBackup(Path backupPath) {
         //          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)
+            new BibtexDatabaseWriter(
+                    bibWriter,
+                    saveConfiguration,
+                    preferences.getFieldPreferences(),
+                    preferences.getCitationKeyPatternPreferences(),
+                    entryTypesManager)
                     .saveDatabase(bibDatabaseContext);
             backupFilesQueue.add(backupPath);
 
@@ -248,10 +279,8 @@ void performBackup(Path backupPath) {
         }
     }
 
-    private static Path determineDiscardedFile(Path file) {
-        return BackupFileUtil.getAppDataBackupDir().resolve(
-                BackupFileUtil.getUniqueFilePrefix(file) + "--" + file.getFileName() + "--discarded"
-        );
+    private static Path determineDiscardedFile(Path file, Path backupDir) {
+        return backupDir.resolve(BackupFileUtil.getUniqueFilePrefix(file) + "--" + file.getFileName() + "--discarded");
     }
 
     /**
@@ -260,8 +289,8 @@ private static Path determineDiscardedFile(Path file) {
      * We do not delete any files, because the user might want to recover old backup files.
      * Therefore, we mark discarded backups by a --discarded file.
      */
-    public void discardBackup() {
-        Path path = determineDiscardedFile(bibDatabaseContext.getDatabasePath().get());
+    public void discardBackup(Path backupDir) {
+        Path path = determineDiscardedFile(bibDatabaseContext.getDatabasePath().get(), backupDir);
         try {
             Files.createFile(path);
         } catch (IOException e) {
@@ -289,19 +318,18 @@ public synchronized void listen(@SuppressWarnings("unused") BibDatabaseContextCh
         }
     }
 
-    private void startBackupTask() {
-        fillQueue();
+    private void startBackupTask(Path backupDir) {
+        fillQueue(backupDir);
 
         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);
+                                     // We need to determine the backup path on each action, because we use the timestamp in the filename
+                                     () -> determineBackupPathForNewBackup(backupDir).ifPresent(path -> this.performBackup(path)),
+                                     DELAY_BETWEEN_BACKUP_ATTEMPTS_IN_SECONDS,
+                                     DELAY_BETWEEN_BACKUP_ATTEMPTS_IN_SECONDS,
+                                     TimeUnit.SECONDS);
     }
 
-    private void fillQueue() {
-        Path backupDir = BackupFileUtil.getAppDataBackupDir();
+    private void fillQueue(Path backupDir) {
         if (!Files.exists(backupDir)) {
             return;
         }
@@ -323,13 +351,18 @@ private void fillQueue() {
     /**
      * Unregisters the BackupManager from the eventBus of {@link BibDatabaseContext}.
      * This method should only be used when closing a database/JabRef in a normal way.
+     *
+     * @param backupDir The backup directory
+     * @param createBackup If the backup manager should still perform a backup
      */
-    private void shutdown() {
+    private void shutdown(Path backupDir, boolean createBackup) {
         changeFilter.unregisterListener(this);
         changeFilter.shutdown();
         executor.shutdown();
 
-        // Ensure that backup is a recent one
-        determineBackupPathForNewBackup().ifPresent(this::performBackup);
+        if (createBackup) {
+            // Ensure that backup is a recent one
+            determineBackupPathForNewBackup(backupDir).ifPresent(this::performBackup);
+        }
     }
 }
diff --git a/src/main/java/org/jabref/gui/auximport/NewSubLibraryAction.java b/src/main/java/org/jabref/gui/auximport/NewSubLibraryAction.java
index 36c426afb17..65cc37abfd9 100644
--- a/src/main/java/org/jabref/gui/auximport/NewSubLibraryAction.java
+++ b/src/main/java/org/jabref/gui/auximport/NewSubLibraryAction.java
@@ -11,6 +11,8 @@
 
 /**
  * The action concerned with generate a new (sub-)database from latex AUX file.
+ *
+ * A new library is created by {@link org.jabref.gui.importer.NewDatabaseAction}
  */
 public class NewSubLibraryAction extends SimpleCommand {
 
diff --git a/src/main/java/org/jabref/gui/backup/BackupResolverDialog.java b/src/main/java/org/jabref/gui/backup/BackupResolverDialog.java
index bdd2fbd2d16..502ed96740f 100644
--- a/src/main/java/org/jabref/gui/backup/BackupResolverDialog.java
+++ b/src/main/java/org/jabref/gui/backup/BackupResolverDialog.java
@@ -9,11 +9,11 @@
 import javafx.scene.control.Hyperlink;
 
 import org.jabref.gui.FXDialog;
-import org.jabref.gui.Globals;
 import org.jabref.gui.desktop.JabRefDesktop;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.BackupFileType;
 import org.jabref.logic.util.io.BackupFileUtil;
+import org.jabref.preferences.ExternalApplicationsPreferences;
 
 import org.controlsfx.control.HyperlinkLabel;
 import org.slf4j.Logger;
@@ -26,28 +26,22 @@ public class BackupResolverDialog extends FXDialog {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(BackupResolverDialog.class);
 
-    public BackupResolverDialog(Path originalPath) {
+    public BackupResolverDialog(Path originalPath, Path backupDir, ExternalApplicationsPreferences externalApplicationsPreferences) {
         super(AlertType.CONFIRMATION, Localization.lang("Backup found"), true);
         setHeaderText(null);
         getDialogPane().setMinHeight(180);
         getDialogPane().getButtonTypes().setAll(RESTORE_FROM_BACKUP, REVIEW_BACKUP, IGNORE_BACKUP);
 
-        Optional<Path> backupPathOpt = BackupFileUtil.getPathOfLatestExistingBackupFile(originalPath, BackupFileType.BACKUP);
+        Optional<Path> backupPathOpt = BackupFileUtil.getPathOfLatestExistingBackupFile(originalPath, BackupFileType.BACKUP, backupDir);
         String backupFilename = backupPathOpt.map(Path::getFileName).map(Path::toString).orElse(Localization.lang("File not found"));
-        String content = new StringBuilder()
-                .append(Localization.lang("A backup file for '%0' was found at [%1]",
-                        originalPath.getFileName().toString(),
-                        backupFilename))
-                .append("\n")
-                .append(Localization.lang("This could indicate that JabRef did not shut down cleanly last time the file was used."))
-                .append("\n\n")
-                .append(Localization.lang("Do you want to recover the library from the backup file?"))
-                .toString();
+        String content = Localization.lang("A backup file for '%0' was found at [%1]", originalPath.getFileName().toString(), backupFilename) + "\n" +
+                Localization.lang("This could indicate that JabRef did not shut down cleanly last time the file was used.") + "\n\n" +
+                Localization.lang("Do you want to recover the library from the backup file?");
         setContentText(content);
 
         HyperlinkLabel contentLabel = new HyperlinkLabel(content);
         contentLabel.setPrefWidth(360);
-        contentLabel.setOnAction((e) -> {
+        contentLabel.setOnAction(e -> {
             if (backupPathOpt.isPresent()) {
                 if (!(e.getSource() instanceof Hyperlink)) {
                     return;
@@ -55,7 +49,7 @@ public BackupResolverDialog(Path originalPath) {
                 String clickedLinkText = ((Hyperlink) (e.getSource())).getText();
                 if (backupFilename.equals(clickedLinkText)) {
                     try {
-                        JabRefDesktop.openFolderAndSelectFile(backupPathOpt.get(), Globals.prefs, null);
+                        JabRefDesktop.openFolderAndSelectFile(backupPathOpt.get(), externalApplicationsPreferences, null);
                     } catch (IOException ex) {
                         LOGGER.error("Could not open backup folder", ex);
                     }
diff --git a/src/main/java/org/jabref/gui/bibtexextractor/BibtexExtractorViewModel.java b/src/main/java/org/jabref/gui/bibtexextractor/BibtexExtractorViewModel.java
index 418706815b2..a8674044ecf 100644
--- a/src/main/java/org/jabref/gui/bibtexextractor/BibtexExtractorViewModel.java
+++ b/src/main/java/org/jabref/gui/bibtexextractor/BibtexExtractorViewModel.java
@@ -16,7 +16,6 @@
 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,8 +42,7 @@ public BibtexExtractorViewModel(BibDatabaseContext bibdatabaseContext,
                                     FileUpdateMonitor fileUpdateMonitor,
                                     TaskExecutor taskExecutor,
                                     UndoManager undoManager,
-                                    StateManager stateManager,
-                                    ImportFormatReader importFormatReader) {
+                                    StateManager stateManager) {
 
         this.dialogService = dialogService;
         this.preferencesService = preferencesService;
@@ -56,7 +54,6 @@ public BibtexExtractorViewModel(BibDatabaseContext bibdatabaseContext,
                 undoManager,
                 stateManager,
                 dialogService,
-                importFormatReader,
                 taskExecutor);
     }
 
@@ -82,7 +79,7 @@ private void parseUsingGrobid() {
         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) -> {
+                      .onFailure(e -> {
                           if (e instanceof FetcherException) {
                               String msg = Localization.lang("There are connection issues with a JabRef server. Detailed information: %0",
                                       e.getMessage());
diff --git a/src/main/java/org/jabref/gui/bibtexextractor/ExtractBibtexDialog.java b/src/main/java/org/jabref/gui/bibtexextractor/ExtractBibtexDialog.java
index 95d6ba5a692..c3d8638608f 100644
--- a/src/main/java/org/jabref/gui/bibtexextractor/ExtractBibtexDialog.java
+++ b/src/main/java/org/jabref/gui/bibtexextractor/ExtractBibtexDialog.java
@@ -12,7 +12,6 @@
 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;
@@ -36,7 +35,6 @@ 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)
@@ -48,14 +46,21 @@ public ExtractBibtexDialog() {
 
         buttonParse = (Button) getDialogPane().lookupButton(parseButtonType);
         buttonParse.setTooltip(new Tooltip((Localization.lang("Starts the extraction and adds the resulting entries to the currently opened database"))));
-        buttonParse.setOnAction((event) -> viewModel.startParsing());
+        buttonParse.setOnAction(event -> viewModel.startParsing());
         buttonParse.disableProperty().bind(viewModel.inputTextProperty().isEmpty());
     }
 
     @FXML
     private void initialize() {
         BibDatabaseContext database = stateManager.getActiveDatabase().orElseThrow(() -> new NullPointerException("Database null"));
-        this.viewModel = new BibtexExtractorViewModel(database, dialogService, preferencesService, fileUpdateMonitor, taskExecutor, undoManager, stateManager, importFormatReader);
+        this.viewModel = new BibtexExtractorViewModel(
+                database,
+                dialogService,
+                preferencesService,
+                fileUpdateMonitor,
+                taskExecutor,
+                undoManager,
+                stateManager);
         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 1cc32a198c1..5cc07a31c71 100644
--- a/src/main/java/org/jabref/gui/citationkeypattern/GenerateCitationKeyAction.java
+++ b/src/main/java/org/jabref/gui/citationkeypattern/GenerateCitationKeyAction.java
@@ -54,7 +54,7 @@ public void execute() {
         checkOverwriteKeysChosen();
 
         if (!this.isCanceled) {
-            BackgroundTask backgroundTask = this.generateKeysInBackground();
+            BackgroundTask<Void> backgroundTask = this.generateKeysInBackground();
             backgroundTask.showToUser(true);
             backgroundTask.titleProperty().set(Localization.lang("Autogenerate citation keys"));
             backgroundTask.messageProperty().set(Localization.lang("%0/%1 entries", 0, entries.size()));
@@ -93,8 +93,8 @@ private void checkOverwriteKeysChosen() {
         }
     }
 
-    private BackgroundTask generateKeysInBackground() {
-        return new BackgroundTask<Void>() {
+    private BackgroundTask<Void> generateKeysInBackground() {
+        return new BackgroundTask<>() {
             private NamedCompound compound;
 
             @Override
diff --git a/src/main/java/org/jabref/gui/cleanup/CleanupPresetPanel.fxml b/src/main/java/org/jabref/gui/cleanup/CleanupPresetPanel.fxml
index 2ffb576b405..2ef2300a312 100644
--- a/src/main/java/org/jabref/gui/cleanup/CleanupPresetPanel.fxml
+++ b/src/main/java/org/jabref/gui/cleanup/CleanupPresetPanel.fxml
@@ -7,36 +7,36 @@
 <?import org.jabref.gui.commonfxcontrols.FieldFormatterCleanupsPanel?>
 <?import javafx.scene.control.ToggleGroup?>
 <?import javafx.scene.control.RadioButton?>
+
 <fx:root xmlns:fx="http://javafx.com/fxml/1" spacing="10.0" type="VBox" xmlns="http://javafx.com/javafx/8.0.121"
          fx:controller="org.jabref.gui.cleanup.CleanupPresetPanel">
     <fx:define>
         <ToggleGroup fx:id="timestampCleanup"/>
-    </fx:define>
-
-    <CheckBox fx:id="cleanUpDOI" text="%Move DOIs from note and URL field to DOI field and remove http prefix"/>
-    <CheckBox fx:id="cleanUpEprint"
-              text="%Move preprint information from 'URL' and 'journal' field to the 'eprint' field"/>
-    <CheckBox fx:id="cleanUpISSN" text="%Reformat ISSN"/>
-    <CheckBox fx:id="cleanUpUpgradeExternalLinks"/>
-    <CheckBox fx:id="cleanUpMovePDF"/>
-    <CheckBox fx:id="cleanUpMakePathsRelative" text="%Make paths of linked files relative (if possible)"/>
-    <CheckBox fx:id="cleanUpRenamePDF" text="%Rename PDFs to given filename format pattern"/>
-    <VBox spacing="5.0">
-        <Label fx:id="cleanupRenamePDFLabel"/>
-        <CheckBox fx:id="cleanUpRenamePDFonlyRelativePaths" text="%Rename only PDFs having a relative path"/>
-        <VBox.margin>
-            <Insets left="40.0"/>
-        </VBox.margin>
-    </VBox>
-
-    <CheckBox fx:id="cleanUpBiblatex"
-              text="%Convert to biblatex format (e.g., store publication date in date field)"/>
-    <CheckBox fx:id="cleanUpBibtex"
-              text="%Convert to BibTeX format (e.g., store publication date in year and month fields)"/>
-    <CheckBox fx:id="cleanUpTimestampToCreationDate"
-              text="%Convert timestamp field to field 'creationdate'"/>
-    <CheckBox fx:id="cleanUpTimestampToModificationDate"
-              text="%Convert timestamp field to field 'modificationdate'"/>
+      </fx:define>
 
-    <FieldFormatterCleanupsPanel fx:id="formatterCleanupsPanel"/>
-</fx:root>
+    
+      <CheckBox fx:id="cleanUpDOI" text="%Move DOIs from note and URL field to DOI field and remove http prefix" />
+      <CheckBox fx:id="cleanUpEprint" text="%Move preprint information from 'URL' and 'journal' field to the 'eprint' field" />
+      <CheckBox fx:id="cleanUpURL" text="%Move URL in note field to url field" />
+      <CheckBox fx:id="cleanUpISSN" text="%Reformat ISSN" />
+      <CheckBox fx:id="cleanUpUpgradeExternalLinks" />
+      <CheckBox fx:id="cleanUpMovePDF" />
+      <CheckBox fx:id="cleanUpMakePathsRelative" text="%Make paths of linked files relative (if possible)" />
+      <CheckBox fx:id="cleanUpRenamePDF" text="%Rename PDFs to given filename format pattern" />
+      <VBox prefHeight="40.0" prefWidth="451.0" spacing="10.0">
+          <Label fx:id="cleanupRenamePDFLabel" />
+          <CheckBox fx:id="cleanUpRenamePDFonlyRelativePaths" text="%Rename only PDFs having a relative path" />
+       <VBox.margin>
+          <Insets left="20.0" />
+       </VBox.margin>
+      </VBox>
+      <CheckBox fx:id="cleanUpBiblatex" text="%Convert to biblatex format (e.g., store publication date in date field)" />
+      <CheckBox fx:id="cleanUpBibtex" text="%Convert to BibTeX format (e.g., store publication date in year and month fields)" />
+      <CheckBox fx:id="cleanUpTimestampToCreationDate" text="%Convert timestamp field to field 'creationdate'" />
+      <CheckBox fx:id="cleanUpTimestampToModificationDate" text="%Convert timestamp field to field 'modificationdate'" />
+            <FieldFormatterCleanupsPanel fx:id="formatterCleanupsPanel" />
+ <padding>
+    <Insets bottom="10.0" left="15.0" right="10.0" top="10.0" />
+ </padding>
+  
+</fx:root>
\ No newline at end of file
diff --git a/src/main/java/org/jabref/gui/cleanup/CleanupPresetPanel.java b/src/main/java/org/jabref/gui/cleanup/CleanupPresetPanel.java
index 5c83ec5dfa8..1a0cf3d6df2 100644
--- a/src/main/java/org/jabref/gui/cleanup/CleanupPresetPanel.java
+++ b/src/main/java/org/jabref/gui/cleanup/CleanupPresetPanel.java
@@ -27,6 +27,7 @@ public class CleanupPresetPanel extends VBox {
     @FXML private Label cleanupRenamePDFLabel;
     @FXML private CheckBox cleanUpDOI;
     @FXML private CheckBox cleanUpEprint;
+    @FXML private CheckBox cleanUpURL;
     @FXML private CheckBox cleanUpISSN;
     @FXML private CheckBox cleanUpMovePDF;
     @FXML private CheckBox cleanUpMakePathsRelative;
@@ -100,6 +101,7 @@ private void init(CleanupPreferences cleanupPreferences, FilePreferences filePre
     private void updateDisplay(CleanupPreferences preset) {
         cleanUpDOI.setSelected(preset.isActive(CleanupPreferences.CleanupStep.CLEAN_UP_DOI));
         cleanUpEprint.setSelected(preset.isActive(CleanupPreferences.CleanupStep.CLEANUP_EPRINT));
+        cleanUpURL.setSelected(preset.isActive(CleanupPreferences.CleanupStep.CLEAN_UP_URL));
         if (!cleanUpMovePDF.isDisabled()) {
             cleanUpMovePDF.setSelected(preset.isActive(CleanupPreferences.CleanupStep.MOVE_PDF));
         }
@@ -129,6 +131,9 @@ public CleanupPreferences getCleanupPreset() {
         if (cleanUpEprint.isSelected()) {
             activeJobs.add(CleanupPreferences.CleanupStep.CLEANUP_EPRINT);
         }
+        if (cleanUpURL.isSelected()) {
+            activeJobs.add(CleanupPreferences.CleanupStep.CLEAN_UP_URL);
+        }
         if (cleanUpISSN.isSelected()) {
             activeJobs.add(CleanupPreferences.CleanupStep.CLEAN_UP_ISSN);
         }
diff --git a/src/main/java/org/jabref/gui/collab/ChangeScanner.java b/src/main/java/org/jabref/gui/collab/ChangeScanner.java
index 72ea8768613..64936e47de4 100644
--- a/src/main/java/org/jabref/gui/collab/ChangeScanner.java
+++ b/src/main/java/org/jabref/gui/collab/ChangeScanner.java
@@ -28,7 +28,7 @@ public ChangeScanner(BibDatabaseContext database,
                          PreferencesService preferencesService) {
         this.database = database;
         this.preferencesService = preferencesService;
-        this.databaseChangeResolverFactory = new DatabaseChangeResolverFactory(dialogService, database, preferencesService.getBibEntryPreferences());
+        this.databaseChangeResolverFactory = new DatabaseChangeResolverFactory(dialogService, database, preferencesService);
     }
 
     public List<DatabaseChange> scanForChanges() {
diff --git a/src/main/java/org/jabref/gui/collab/DatabaseChangeResolverFactory.java b/src/main/java/org/jabref/gui/collab/DatabaseChangeResolverFactory.java
index 2aed7bb22ed..c27c7c600db 100644
--- a/src/main/java/org/jabref/gui/collab/DatabaseChangeResolverFactory.java
+++ b/src/main/java/org/jabref/gui/collab/DatabaseChangeResolverFactory.java
@@ -6,22 +6,22 @@
 import org.jabref.gui.collab.entrychange.EntryChange;
 import org.jabref.gui.collab.entrychange.EntryChangeResolver;
 import org.jabref.model.database.BibDatabaseContext;
-import org.jabref.preferences.BibEntryPreferences;
+import org.jabref.preferences.PreferencesService;
 
 public class DatabaseChangeResolverFactory {
     private final DialogService dialogService;
     private final BibDatabaseContext databaseContext;
-    private final BibEntryPreferences bibEntryPreferences;
+    private final PreferencesService preferencesService;
 
-    public DatabaseChangeResolverFactory(DialogService dialogService, BibDatabaseContext databaseContext, BibEntryPreferences bibEntryPreferences) {
+    public DatabaseChangeResolverFactory(DialogService dialogService, BibDatabaseContext databaseContext, PreferencesService preferencesService) {
         this.dialogService = dialogService;
         this.databaseContext = databaseContext;
-        this.bibEntryPreferences = bibEntryPreferences;
+        this.preferencesService = preferencesService;
     }
 
     public Optional<DatabaseChangeResolver> create(DatabaseChange change) {
         if (change instanceof EntryChange entryChange) {
-            return Optional.of(new EntryChangeResolver(entryChange, dialogService, databaseContext, bibEntryPreferences));
+            return Optional.of(new EntryChangeResolver(entryChange, dialogService, databaseContext, preferencesService));
         }
 
         return Optional.empty();
diff --git a/src/main/java/org/jabref/gui/collab/DatabaseChangesResolverDialog.java b/src/main/java/org/jabref/gui/collab/DatabaseChangesResolverDialog.java
index a0d5c3420cd..7dcb21b0bf4 100644
--- a/src/main/java/org/jabref/gui/collab/DatabaseChangesResolverDialog.java
+++ b/src/main/java/org/jabref/gui/collab/DatabaseChangesResolverDialog.java
@@ -88,7 +88,7 @@ public DatabaseChangesResolverDialog(List<DatabaseChange> changes, BibDatabaseCo
 
     @FXML
     private void initialize() {
-        PreviewViewer previewViewer = new PreviewViewer(database, dialogService, stateManager, themeManager);
+        PreviewViewer previewViewer = new PreviewViewer(database, dialogService, preferencesService, stateManager, themeManager);
         DatabaseChangeDetailsViewFactory databaseChangeDetailsViewFactory = new DatabaseChangeDetailsViewFactory(database, dialogService, stateManager, themeManager, preferencesService, entryTypesManager, previewViewer);
 
         viewModel = new ExternalChangesResolverViewModel(changes, undoManager);
diff --git a/src/main/java/org/jabref/gui/collab/entrychange/EntryChangeDetailsView.java b/src/main/java/org/jabref/gui/collab/entrychange/EntryChangeDetailsView.java
index 7782a6919bc..880341921ef 100644
--- a/src/main/java/org/jabref/gui/collab/entrychange/EntryChangeDetailsView.java
+++ b/src/main/java/org/jabref/gui/collab/entrychange/EntryChangeDetailsView.java
@@ -30,7 +30,7 @@ public EntryChangeDetailsView(BibEntry oldEntry, BibEntry newEntry, BibDatabaseC
         onDisk.getStyleClass().add("lib-change-header");
 
         // we need a copy here as we otherwise would set the same entry twice
-        PreviewViewer previewClone = new PreviewViewer(databaseContext, dialogService, stateManager, themeManager);
+        PreviewViewer previewClone = new PreviewViewer(databaseContext, dialogService, preferencesService, stateManager, themeManager);
 
         TabPane oldEntryTabPane = oldPreviewWithSourcesTab.getPreviewWithSourceTab(oldEntry, databaseContext, preferencesService, entryTypesManager, previewClone, Localization.lang("Entry Preview"));
         TabPane newEntryTabPane = newPreviewWithSourcesTab.getPreviewWithSourceTab(newEntry, databaseContext, preferencesService, entryTypesManager, previewViewer, Localization.lang("Entry Preview"));
diff --git a/src/main/java/org/jabref/gui/collab/entrychange/EntryChangeResolver.java b/src/main/java/org/jabref/gui/collab/entrychange/EntryChangeResolver.java
index 8e5575f4196..8555a2ec517 100644
--- a/src/main/java/org/jabref/gui/collab/entrychange/EntryChangeResolver.java
+++ b/src/main/java/org/jabref/gui/collab/entrychange/EntryChangeResolver.java
@@ -12,24 +12,24 @@
 import org.jabref.gui.mergeentries.newmergedialog.toolbar.ThreeWayMergeToolbar;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
-import org.jabref.preferences.BibEntryPreferences;
+import org.jabref.preferences.PreferencesService;
 
 public final class EntryChangeResolver extends DatabaseChangeResolver {
     private final EntryChange entryChange;
     private final BibDatabaseContext databaseContext;
 
-    private final BibEntryPreferences bibEntryPreferences;
+    private final PreferencesService preferencesService;
 
-    public EntryChangeResolver(EntryChange entryChange, DialogService dialogService, BibDatabaseContext databaseContext, BibEntryPreferences bibEntryPreferences) {
+    public EntryChangeResolver(EntryChange entryChange, DialogService dialogService, BibDatabaseContext databaseContext, PreferencesService preferencesService) {
         super(dialogService);
         this.entryChange = entryChange;
         this.databaseContext = databaseContext;
-        this.bibEntryPreferences = bibEntryPreferences;
+        this.preferencesService = preferencesService;
     }
 
     @Override
     public Optional<DatabaseChange> askUserToResolveChange() {
-        MergeEntriesDialog mergeEntriesDialog = new MergeEntriesDialog(entryChange.getOldEntry(), entryChange.getNewEntry(), bibEntryPreferences);
+        MergeEntriesDialog mergeEntriesDialog = new MergeEntriesDialog(entryChange.getOldEntry(), entryChange.getNewEntry(), preferencesService);
         mergeEntriesDialog.setLeftHeaderText(Localization.lang("In JabRef"));
         mergeEntriesDialog.setRightHeaderText(Localization.lang("On disk"));
         mergeEntriesDialog.configureDiff(new ShowDiffConfig(ThreeWayMergeToolbar.DiffView.SPLIT, BasicDiffMethod.WORDS));
diff --git a/src/main/java/org/jabref/gui/collab/entrychange/PreviewWithSourceTab.java b/src/main/java/org/jabref/gui/collab/entrychange/PreviewWithSourceTab.java
index 0a4a494fa1e..be87e21a046 100644
--- a/src/main/java/org/jabref/gui/collab/entrychange/PreviewWithSourceTab.java
+++ b/src/main/java/org/jabref/gui/collab/entrychange/PreviewWithSourceTab.java
@@ -8,8 +8,8 @@
 
 import org.jabref.gui.preview.PreviewViewer;
 import org.jabref.logic.bibtex.BibEntryWriter;
+import org.jabref.logic.bibtex.FieldPreferences;
 import org.jabref.logic.bibtex.FieldWriter;
-import org.jabref.logic.bibtex.FieldWriterPreferences;
 import org.jabref.logic.exporter.BibWriter;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.OS;
@@ -52,7 +52,7 @@ public TabPane getPreviewWithSourceTab(BibEntry entry, BibDatabaseContext bibDat
         }
 
         try {
-            codeArea.appendText(getSourceString(entry, bibDatabaseContext.getMode(), preferencesService.getFieldWriterPreferences(), entryTypesManager));
+            codeArea.appendText(getSourceString(entry, bibDatabaseContext.getMode(), preferencesService.getFieldPreferences(), entryTypesManager));
         } catch (IOException e) {
             LOGGER.error("Error getting Bibtex: {}", entry);
         }
@@ -63,10 +63,10 @@ public TabPane getPreviewWithSourceTab(BibEntry entry, BibDatabaseContext bibDat
         return tabPanePreviewCode;
     }
 
-    private String getSourceString(BibEntry entry, BibDatabaseMode type, FieldWriterPreferences fieldWriterPreferences, BibEntryTypesManager entryTypesManager) throws IOException {
+    private String getSourceString(BibEntry entry, BibDatabaseMode type, FieldPreferences fieldPreferences, BibEntryTypesManager entryTypesManager) throws IOException {
         StringWriter writer = new StringWriter();
         BibWriter bibWriter = new BibWriter(writer, OS.NEWLINE);
-        FieldWriter fieldWriter = FieldWriter.buildIgnoreHashes(fieldWriterPreferences);
+        FieldWriter fieldWriter = FieldWriter.buildIgnoreHashes(fieldPreferences);
         new BibEntryWriter(fieldWriter, entryTypesManager).write(entry, bibWriter, type);
         return writer.toString();
     }
diff --git a/src/main/java/org/jabref/gui/collab/metedatachange/MetadataChangeDetailsView.java b/src/main/java/org/jabref/gui/collab/metedatachange/MetadataChangeDetailsView.java
index cddcdf32e2d..3c2a81e3e01 100644
--- a/src/main/java/org/jabref/gui/collab/metedatachange/MetadataChangeDetailsView.java
+++ b/src/main/java/org/jabref/gui/collab/metedatachange/MetadataChangeDetailsView.java
@@ -1,6 +1,7 @@
 package org.jabref.gui.collab.metedatachange;
 
 import javafx.scene.control.Label;
+import javafx.scene.control.ScrollPane;
 import javafx.scene.layout.VBox;
 
 import org.jabref.gui.collab.DatabaseChangeDetailsView;
@@ -17,20 +18,24 @@ public MetadataChangeDetailsView(MetadataChange metadataChange, PreferencesServi
         header.getStyleClass().add("sectionHeader");
         container.getChildren().add(header);
 
-        for (MetaDataDiff.Difference change : metadataChange.getMetaDataDiff().getDifferences(preferencesService)) {
-            container.getChildren().add(new Label(getDifferenceString(change)));
+        for (MetaDataDiff.Difference diff : metadataChange.getMetaDataDiff().getDifferences(preferencesService)) {
+            container.getChildren().add(new Label(getDifferenceString(diff.differenceType())));
+            container.getChildren().add(new Label(diff.originalObject().toString()));
+            container.getChildren().add(new Label(diff.newObject().toString()));
         }
 
-        setLeftAnchor(container, 8d);
-        setTopAnchor(container, 8d);
-        setRightAnchor(container, 8d);
-        setBottomAnchor(container, 8d);
+        ScrollPane scrollPane = new ScrollPane(container);
+        scrollPane.setFitToWidth(true);
+        getChildren().setAll(scrollPane);
 
-        getChildren().setAll(container);
+        setLeftAnchor(scrollPane, 8d);
+        setTopAnchor(scrollPane, 8d);
+        setRightAnchor(scrollPane, 8d);
+        setBottomAnchor(scrollPane, 8d);
     }
 
-    private String getDifferenceString(MetaDataDiff.Difference change) {
-        return switch (change) {
+    private String getDifferenceString(MetaDataDiff.DifferenceType changeType) {
+        return switch (changeType) {
             case PROTECTED ->
                     Localization.lang("Library protection");
             case GROUPS_ALTERED ->
diff --git a/src/main/java/org/jabref/gui/commonfxcontrols/SaveOrderConfigPanel.fxml b/src/main/java/org/jabref/gui/commonfxcontrols/SaveOrderConfigPanel.fxml
index 1e2b9f84822..c23fde51d2f 100644
--- a/src/main/java/org/jabref/gui/commonfxcontrols/SaveOrderConfigPanel.fxml
+++ b/src/main/java/org/jabref/gui/commonfxcontrols/SaveOrderConfigPanel.fxml
@@ -16,7 +16,7 @@
         <ToggleGroup fx:id="saveOrderToggleGroup"/>
     </fx:define>
 
-    <RadioButton fx:id="exportInOriginalOrder" text="%Keep original order"
+    <RadioButton fx:id="exportInOriginalOrder" text="%Keep original order and add new entries at the end"
                  toggleGroup="$saveOrderToggleGroup"/>
     <RadioButton fx:id="exportInTableOrder" text="%Use current table sort order"
                  toggleGroup="$saveOrderToggleGroup"/>
diff --git a/src/main/java/org/jabref/gui/commonfxcontrols/SaveOrderConfigPanelViewModel.java b/src/main/java/org/jabref/gui/commonfxcontrols/SaveOrderConfigPanelViewModel.java
index efba3ab390d..6776df54e47 100644
--- a/src/main/java/org/jabref/gui/commonfxcontrols/SaveOrderConfigPanelViewModel.java
+++ b/src/main/java/org/jabref/gui/commonfxcontrols/SaveOrderConfigPanelViewModel.java
@@ -9,7 +9,6 @@
 import javafx.collections.FXCollections;
 
 import org.jabref.model.entry.field.Field;
-import org.jabref.model.metadata.SaveOrderConfig;
 
 public class SaveOrderConfigPanelViewModel {
 
@@ -24,7 +23,7 @@ public SaveOrderConfigPanelViewModel() {
     }
 
     public void addCriterion() {
-        selectedSortCriteriaProperty.add(new SortCriterionViewModel(new SaveOrderConfig.SortCriterion()));
+        selectedSortCriteriaProperty.add(new SortCriterionViewModel());
     }
 
     public void removeCriterion(SortCriterionViewModel sortCriterionViewModel) {
diff --git a/src/main/java/org/jabref/gui/commonfxcontrols/SortCriterionViewModel.java b/src/main/java/org/jabref/gui/commonfxcontrols/SortCriterionViewModel.java
index 485fa2368d2..19edca1f9d9 100644
--- a/src/main/java/org/jabref/gui/commonfxcontrols/SortCriterionViewModel.java
+++ b/src/main/java/org/jabref/gui/commonfxcontrols/SortCriterionViewModel.java
@@ -6,18 +6,24 @@
 import javafx.beans.property.SimpleObjectProperty;
 
 import org.jabref.model.entry.field.Field;
-import org.jabref.model.metadata.SaveOrderConfig;
+import org.jabref.model.entry.field.StandardField;
+import org.jabref.model.metadata.SaveOrder;
 
 public class SortCriterionViewModel {
 
     private final ObjectProperty<Field> fieldProperty = new SimpleObjectProperty<>();
     private final BooleanProperty descendingProperty = new SimpleBooleanProperty();
 
-    public SortCriterionViewModel(SaveOrderConfig.SortCriterion criterion) {
+    public SortCriterionViewModel(SaveOrder.SortCriterion criterion) {
         this.fieldProperty.setValue(criterion.field);
         this.descendingProperty.setValue(criterion.descending);
     }
 
+    public SortCriterionViewModel() {
+        this.fieldProperty.setValue(StandardField.AUTHOR);
+        this.descendingProperty.setValue(false);
+    }
+
     public ObjectProperty<Field> fieldProperty() {
         return fieldProperty;
     }
@@ -26,7 +32,7 @@ public BooleanProperty descendingProperty() {
         return descendingProperty;
     }
 
-    public SaveOrderConfig.SortCriterion getCriterion() {
-        return new SaveOrderConfig.SortCriterion(fieldProperty.getValue(), descendingProperty.getValue());
+    public SaveOrder.SortCriterion getCriterion() {
+        return new SaveOrder.SortCriterion(fieldProperty.getValue(), descendingProperty.getValue());
     }
 }
diff --git a/src/main/java/org/jabref/gui/copyfiles/CopyFilesAction.java b/src/main/java/org/jabref/gui/copyfiles/CopyFilesAction.java
index 4317dbeef8e..41b47510acd 100644
--- a/src/main/java/org/jabref/gui/copyfiles/CopyFilesAction.java
+++ b/src/main/java/org/jabref/gui/copyfiles/CopyFilesAction.java
@@ -47,7 +47,7 @@ public void execute() {
         List<BibEntry> entries = stateManager.getSelectedEntries();
 
         DirectoryDialogConfiguration dirDialogConfiguration = new DirectoryDialogConfiguration.Builder()
-                .withInitialDirectory(preferencesService.getImportExportPreferences().getExportWorkingDirectory())
+                .withInitialDirectory(preferencesService.getExportPreferences().getExportWorkingDirectory())
                 .build();
         Optional<Path> exportPath = dialogService.showDirectorySelectionDialog(dirDialogConfiguration);
         exportPath.ifPresent(path -> {
@@ -57,7 +57,7 @@ public void execute() {
                     Localization.lang("Copy linked files to folder..."),
                     exportTask);
             Globals.TASK_EXECUTOR.execute(exportTask);
-            exportTask.setOnSucceeded((e) -> showDialog(exportTask.getValue()));
+            exportTask.setOnSucceeded(e -> showDialog(exportTask.getValue()));
         });
     }
 }
diff --git a/src/main/java/org/jabref/gui/copyfiles/CopyFilesDialogView.java b/src/main/java/org/jabref/gui/copyfiles/CopyFilesDialogView.java
index e8d6d20f859..7b1bfcc2f58 100644
--- a/src/main/java/org/jabref/gui/copyfiles/CopyFilesDialogView.java
+++ b/src/main/java/org/jabref/gui/copyfiles/CopyFilesDialogView.java
@@ -56,6 +56,6 @@ private void setupTable() {
         }));
 
         tvResult.setItems(viewModel.copyFilesResultListProperty());
-        tvResult.setColumnResizePolicy((param) -> true);
+        tvResult.setColumnResizePolicy(param -> true);
     }
 }
diff --git a/src/main/java/org/jabref/gui/desktop/JabRefDesktop.java b/src/main/java/org/jabref/gui/desktop/JabRefDesktop.java
index feaf48d281a..5c4b332a029 100644
--- a/src/main/java/org/jabref/gui/desktop/JabRefDesktop.java
+++ b/src/main/java/org/jabref/gui/desktop/JabRefDesktop.java
@@ -1,6 +1,5 @@
 package org.jabref.gui.desktop;
 
-import java.io.File;
 import java.io.IOException;
 import java.net.URI;
 import java.nio.file.Files;
@@ -13,11 +12,7 @@
 
 import org.jabref.gui.DialogService;
 import org.jabref.gui.Globals;
-import org.jabref.gui.desktop.os.DefaultDesktop;
-import org.jabref.gui.desktop.os.Linux;
 import org.jabref.gui.desktop.os.NativeDesktop;
-import org.jabref.gui.desktop.os.OSX;
-import org.jabref.gui.desktop.os.Windows;
 import org.jabref.gui.externalfiletype.ExternalFileType;
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.logic.importer.util.IdentifierParser;
@@ -30,20 +25,22 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.identifier.DOI;
 import org.jabref.model.entry.identifier.Identifier;
+import org.jabref.preferences.ExternalApplicationsPreferences;
+import org.jabref.preferences.FilePreferences;
 import org.jabref.preferences.PreferencesService;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * TODO: Replace by http://docs.oracle.com/javase/7/docs/api/java/awt/Desktop.html
- * http://stackoverflow.com/questions/18004150/desktop-api-is-not-supported-on-the-current-platform
+ * See http://stackoverflow.com/questions/18004150/desktop-api-is-not-supported-on-the-current-platform for more implementation hints.
+ * http://docs.oracle.com/javase/7/docs/api/java/awt/Desktop.html cannot be used as we don't want to rely on AWT
  */
 public class JabRefDesktop {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(JabRefDesktop.class);
 
-    private static final NativeDesktop NATIVE_DESKTOP = getNativeDesktop();
+    private static final NativeDesktop NATIVE_DESKTOP = OS.getNativeDesktop();
     private static final Pattern REMOTE_LINK_PATTERN = Pattern.compile("[a-z]+://.*");
 
     private JabRefDesktop() {
@@ -51,6 +48,8 @@ private JabRefDesktop() {
 
     /**
      * Open a http/pdf/ps viewer for the given link string.
+     *
+     * Opening a PDF file at the file field is done at {@link org.jabref.gui.fieldeditors.LinkedFileViewModel#open}
      */
     public static void openExternalViewer(BibDatabaseContext databaseContext,
                                           PreferencesService preferencesService,
@@ -61,7 +60,7 @@ public static void openExternalViewer(BibDatabaseContext databaseContext,
             throws IOException {
         String link = initialLink;
         Field field = initialField;
-        if (StandardField.PS.equals(field) || StandardField.PDF.equals(field)) {
+        if ((StandardField.PS == field) || (StandardField.PDF == field)) {
             // Find the default directory for this field type:
             List<Path> directories = databaseContext.getFileDirectories(preferencesService.getFilePreferences());
 
@@ -83,15 +82,18 @@ public static void openExternalViewer(BibDatabaseContext databaseContext,
                     field = StandardField.PS;
                 }
             }
-        } else if (StandardField.DOI.equals(field)) {
-            openDoi(link);
+        } else if (StandardField.DOI == field) {
+            openDoi(link, preferencesService);
+            return;
+        } else if (StandardField.ISBN == field) {
+            openIsbn(link, preferencesService);
             return;
-        } else if (StandardField.EPRINT.equals(field)) {
+        } else if (StandardField.EPRINT == field) {
             IdentifierParser identifierParser = new IdentifierParser(entry);
             link = identifierParser.parse(StandardField.EPRINT)
-                    .flatMap(Identifier::getExternalURI)
-                    .map(URI::toASCIIString)
-                    .orElse(link);
+                                   .flatMap(Identifier::getExternalURI)
+                                   .map(URI::toASCIIString)
+                                   .orElse(link);
 
             if (Objects.equals(link, initialLink)) {
                 Optional<String> eprintTypeOpt = entry.getField(StandardField.EPRINTTYPE);
@@ -105,17 +107,17 @@ public static void openExternalViewer(BibDatabaseContext databaseContext,
             field = StandardField.URL;
         }
 
-        if (StandardField.URL.equals(field)) {
-            openBrowser(link);
-        } else if (StandardField.PS.equals(field)) {
+        if (StandardField.URL == field) {
+            openBrowser(link, preferencesService.getFilePreferences());
+        } else if (StandardField.PS == field) {
             try {
-                NATIVE_DESKTOP.openFile(link, StandardField.PS.getName());
+                NATIVE_DESKTOP.openFile(link, StandardField.PS.getName(), preferencesService.getFilePreferences());
             } catch (IOException e) {
                 LOGGER.error("An error occurred on the command: " + link, e);
             }
-        } else if (StandardField.PDF.equals(field)) {
+        } else if (StandardField.PDF == field) {
             try {
-                NATIVE_DESKTOP.openFile(link, StandardField.PDF.getName());
+                NATIVE_DESKTOP.openFile(link, StandardField.PDF.getName(), preferencesService.getFilePreferences());
             } catch (IOException e) {
                 LOGGER.error("An error occurred on the command: " + link, e);
             }
@@ -124,21 +126,26 @@ public static void openExternalViewer(BibDatabaseContext databaseContext,
         }
     }
 
-    private static void openDoi(String doi) throws IOException {
+    private static void openDoi(String doi, PreferencesService preferencesService) throws IOException {
         String link = DOI.parse(doi).map(DOI::getURIAsASCIIString).orElse(doi);
-        openBrowser(link);
+        openBrowser(link, preferencesService.getFilePreferences());
     }
 
     public static void openCustomDoi(String link, PreferencesService preferences, DialogService dialogService) {
-            DOI.parse(link)
-                        .flatMap(doi -> doi.getExternalURIWithCustomBase(preferences.getDOIPreferences().getDefaultBaseURI()))
-                        .ifPresent(uri -> {
-                            try {
-                                JabRefDesktop.openBrowser(uri);
-                            } catch (IOException e) {
-                                dialogService.showErrorDialogAndWait(Localization.lang("Unable to open link."), e);
-                            }
-                        });
+        DOI.parse(link)
+           .flatMap(doi -> doi.getExternalURIWithCustomBase(preferences.getDOIPreferences().getDefaultBaseURI()))
+           .ifPresent(uri -> {
+               try {
+                   JabRefDesktop.openBrowser(uri, preferences.getFilePreferences());
+               } catch (IOException e) {
+                   dialogService.showErrorDialogAndWait(Localization.lang("Unable to open link."), e);
+               }
+           });
+    }
+
+    private static void openIsbn(String isbn, PreferencesService preferencesService) throws IOException {
+        String link = "https://openlibrary.org/isbn/" + isbn;
+        openBrowser(link, preferencesService.getFilePreferences());
     }
 
     /**
@@ -149,42 +156,42 @@ public static void openCustomDoi(String link, PreferencesService preferences, Di
      * @return false if the link couldn't be resolved, true otherwise.
      */
     public static boolean openExternalFileAnyFormat(final BibDatabaseContext databaseContext,
-                                                    PreferencesService preferencesService,
+                                                    FilePreferences filePreferences,
                                                     String link,
-                                                    final Optional<ExternalFileType> type)
-            throws IOException {
-
+                                                    final Optional<ExternalFileType> type) throws IOException {
         if (REMOTE_LINK_PATTERN.matcher(link.toLowerCase(Locale.ROOT)).matches()) {
-            openExternalFilePlatformIndependent(type, link);
+            openExternalFilePlatformIndependent(type, link, filePreferences);
             return true;
         }
-
-        Optional<Path> file = FileUtil.find(databaseContext, link, preferencesService.getFilePreferences());
+        Optional<Path> file = FileUtil.find(databaseContext, link, filePreferences);
         if (file.isPresent() && Files.exists(file.get())) {
             // Open the file:
             String filePath = file.get().toString();
-            openExternalFilePlatformIndependent(type, filePath);
-        } else {
-            // No file matched the name, try to open it directly using the given app
-            openExternalFilePlatformIndependent(type, link);
+            openExternalFilePlatformIndependent(type, filePath, filePreferences);
+            return true;
         }
+
+        // No file matched the name, try to open it directly using the given app
+        openExternalFilePlatformIndependent(type, link, filePreferences);
         return true;
     }
 
-    private static void openExternalFilePlatformIndependent(Optional<ExternalFileType> fileType, String filePath)
+    private static void openExternalFilePlatformIndependent(Optional<ExternalFileType> fileType,
+                                                            String filePath,
+                                                            FilePreferences filePreferences)
             throws IOException {
         if (fileType.isPresent()) {
             String application = fileType.get().getOpenWithApplication();
 
             if (application.isEmpty()) {
-                NATIVE_DESKTOP.openFile(filePath, fileType.get().getExtension());
+                NATIVE_DESKTOP.openFile(filePath, fileType.get().getExtension(), filePreferences);
             } else {
                 NATIVE_DESKTOP.openFileWithApplication(filePath, application);
             }
         } else {
             // File type is not given and therefore no application specified
             // Let the OS handle the opening of the file
-            NATIVE_DESKTOP.openFile(filePath, "");
+            NATIVE_DESKTOP.openFile(filePath, "", filePreferences);
         }
     }
 
@@ -194,67 +201,26 @@ 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, DialogService dialogService) throws IOException {
+    public static void openFolderAndSelectFile(Path fileLink,
+                                               ExternalApplicationsPreferences externalApplicationsPreferences,
+                                               DialogService dialogService) throws IOException {
         if (fileLink == null) {
             return;
         }
 
-        boolean useCustomFileBrowser = preferencesService.getExternalApplicationsPreferences().useCustomFileBrowser();
+        boolean useCustomFileBrowser = externalApplicationsPreferences.useCustomFileBrowser();
         if (!useCustomFileBrowser) {
             NATIVE_DESKTOP.openFolderAndSelectFile(fileLink);
-        } else {
-            String absolutePath = fileLink.toAbsolutePath().getParent().toString();
-            String command = preferencesService.getExternalApplicationsPreferences().getCustomFileBrowserCommand();
-            if (!command.isEmpty()) {
-                command = command.replaceAll("\\s+", " "); // normalize white spaces
-
-                // replace the placeholder if used
-                command = command.replace("%DIR", absolutePath);
-                String[] subcommands = command.split(" ");
-
-                LOGGER.info("Executing command \"" + command + "\"...");
-
-                try {
-                    new ProcessBuilder(subcommands).start();
-                } catch (IOException exception) {
-                    LOGGER.error("Open File Browser", exception);
-                    dialogService.notify(Localization.lang("Error occured while executing the command \"%0\".", command));
-                }
-            }
+            return;
         }
-    }
-
-    /**
-     * Opens the given URL using the system browser
-     *
-     * @param url the URL to open
-     */
-    public static void openBrowser(String url) throws IOException {
-        Optional<ExternalFileType> fileType = ExternalFileTypes.getExternalFileTypeByExt("html", Globals.prefs.getFilePreferences());
-        openExternalFilePlatformIndependent(fileType, url);
-    }
-
-    public static void openBrowser(URI url) throws IOException {
-        openBrowser(url.toASCIIString());
-    }
-
-    /**
-     * Opens the url with the users standard Browser. If that fails a popup will be shown to instruct the user to open the link manually and the link gets copied to the clipboard
-     *
-     * @param url the URL to open
-     */
-    public static void openBrowserShowPopup(String url, DialogService dialogService) {
-        try {
-            openBrowser(url);
-        } catch (IOException exception) {
-            Globals.getClipboardManager().setContent(url);
-            LOGGER.error("Could not open browser", exception);
-            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.");
-            dialogService.notify(couldNotOpenBrowser);
-            dialogService.showErrorDialogAndWait(couldNotOpenBrowser, couldNotOpenBrowser + "\n" + openManually + "\n" + copiedToClipboard);
+        String absolutePath = fileLink.toAbsolutePath().getParent().toString();
+        String command = externalApplicationsPreferences.getCustomFileBrowserCommand();
+        if (command.isEmpty()) {
+            LOGGER.info("No custom file browser command defined");
+            NATIVE_DESKTOP.openFolderAndSelectFile(fileLink);
+            return;
         }
+        executeCommand(command, absolutePath, dialogService);
     }
 
     /**
@@ -263,51 +229,79 @@ public static void openBrowserShowPopup(String url, DialogService dialogService)
      * 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, DialogService dialogService) throws IOException {
+    public static void openConsole(Path file, PreferencesService preferencesService, DialogService dialogService) throws IOException {
         if (file == null) {
             return;
         }
 
-        String absolutePath = file.toPath().toAbsolutePath().getParent().toString();
+        String absolutePath = file.toAbsolutePath().getParent().toString();
 
         boolean useCustomTerminal = preferencesService.getExternalApplicationsPreferences().useCustomTerminal();
         if (!useCustomTerminal) {
             NATIVE_DESKTOP.openConsole(absolutePath, dialogService);
-        } else {
-            String command = preferencesService.getExternalApplicationsPreferences().getCustomTerminalCommand();
-            command = command.trim();
-
-            if (!command.isEmpty()) {
-                command = command.replaceAll("\\s+", " "); // normalize white spaces
-                command = command.replace("%DIR", absolutePath); // replace the placeholder if used
+            return;
+        }
+        String command = preferencesService.getExternalApplicationsPreferences().getCustomTerminalCommand();
+        command = command.trim();
+        if (command.isEmpty()) {
+            NATIVE_DESKTOP.openConsole(absolutePath, dialogService);
+            LOGGER.info("Preference for custom terminal is empty. Using default terminal.");
+            return;
+        }
+        executeCommand(command, absolutePath, dialogService);
+    }
 
-                String[] subcommands = command.split(" ");
+    private static void executeCommand(String command, String absolutePath, DialogService dialogService) {
+        // normalize white spaces
+        command = command.replaceAll("\\s+", " ");
 
-                LOGGER.info("Executing command \"" + command + "\"...");
-                dialogService.notify(Localization.lang("Executing command \"%0\"...", command));
+        // replace the placeholder if used
+        command = command.replace("%DIR", absolutePath);
 
-                try {
-                    new ProcessBuilder(subcommands).start();
-                } catch (IOException exception) {
-                    LOGGER.error("Open console", exception);
+        LOGGER.info("Executing command \"{}\"...", command);
+        dialogService.notify(Localization.lang("Executing command \"%0\"...", command));
 
-                   dialogService.notify(Localization.lang("Error occured while executing the command \"%0\".", command));
-                }
-            }
+        String[] subcommands = command.split(" ");
+        try {
+            new ProcessBuilder(subcommands).start();
+        } catch (IOException exception) {
+            LOGGER.error("Error during command execution", exception);
+            dialogService.notify(Localization.lang("Error occurred while executing the command \"%0\".", command));
         }
     }
 
-    // TODO: Move to OS.java
-    public static NativeDesktop getNativeDesktop() {
-        if (OS.WINDOWS) {
-            return new Windows();
-        } else if (OS.OS_X) {
-            return new OSX();
-        } else if (OS.LINUX) {
-            return new Linux();
+    /**
+     * Opens the given URL using the system browser
+     *
+     * @param url the URL to open
+     */
+    public static void openBrowser(String url, FilePreferences filePreferences) throws IOException {
+        Optional<ExternalFileType> fileType = ExternalFileTypes.getExternalFileTypeByExt("html", filePreferences);
+        openExternalFilePlatformIndependent(fileType, url, filePreferences);
+    }
+
+    public static void openBrowser(URI url, FilePreferences filePreferences) throws IOException {
+        openBrowser(url.toASCIIString(), filePreferences);
+    }
+
+    /**
+     * Opens the url with the users standard Browser. If that fails a popup will be shown to instruct the user to open the link manually and the link gets copied to the clipboard
+     *
+     * @param url the URL to open
+     */
+    public static void openBrowserShowPopup(String url, DialogService dialogService, FilePreferences filePreferences) {
+        try {
+            openBrowser(url, filePreferences);
+        } catch (IOException exception) {
+            Globals.getClipboardManager().setContent(url);
+            LOGGER.error("Could not open browser", exception);
+            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.");
+            dialogService.notify(couldNotOpenBrowser);
+            dialogService.showErrorDialogAndWait(couldNotOpenBrowser, couldNotOpenBrowser + "\n" + openManually + "\n" + copiedToClipboard);
         }
-        return new DefaultDesktop();
     }
 }
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 86d97fb45ae..7ab380efcb7 100644
--- a/src/main/java/org/jabref/gui/desktop/os/DefaultDesktop.java
+++ b/src/main/java/org/jabref/gui/desktop/os/DefaultDesktop.java
@@ -6,17 +6,23 @@
 import java.nio.file.Path;
 
 import org.jabref.architecture.AllowedToUseAwt;
+import org.jabref.cli.Launcher;
 import org.jabref.gui.DialogService;
+import org.jabref.preferences.FilePreferences;
 
-import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+/**
+ * This class contains some default implementations (if OS is neither linux, windows or osx) file directories and file/application open handling methods <br>
+ * We cannot use a static logger instance here in this class as the Logger first needs to be configured in the {@link Launcher#addLogToDisk}
+ * The configuration of tinylog will become immutable as soon as the first log entry is issued.
+ * https://tinylog.org/v2/configuration/
+ **/
 @AllowedToUseAwt("Requires AWT to open a file")
-public class DefaultDesktop implements NativeDesktop {
-    private static final Logger LOGGER = LoggerFactory.getLogger(NativeDesktop.class);
+public class DefaultDesktop extends NativeDesktop {
 
     @Override
-    public void openFile(String filePath, String fileType) throws IOException {
+    public void openFile(String filePath, String fileType, FilePreferences filePreferences) throws IOException {
         Desktop.getDesktop().open(new File(filePath));
     }
 
@@ -33,7 +39,7 @@ public void openFolderAndSelectFile(Path filePath) throws IOException {
 
     @Override
     public void openConsole(String absolutePath, DialogService dialogService) throws IOException {
-        LOGGER.error("This feature is not supported by your Operating System.");
+        LoggerFactory.getLogger(DefaultDesktop.class).error("This feature is not supported by your Operating System.");
     }
 
     @Override
@@ -45,9 +51,4 @@ public String detectProgramPath(String programName, String directoryName) {
     public Path getApplicationDirectory() {
         return getUserDirectory();
     }
-
-    @Override
-    public Path getDefaultFileChooserDirectory() {
-        return Path.of(System.getProperty("user.home"));
-    }
 }
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 c08ca68aa2c..eba3745c0e9 100644
--- a/src/main/java/org/jabref/gui/desktop/os/Linux.java
+++ b/src/main/java/org/jabref/gui/desktop/os/Linux.java
@@ -5,60 +5,67 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.List;
 import java.util.Locale;
-import java.util.Objects;
 import java.util.Optional;
 
 import org.jabref.architecture.AllowedToUseAwt;
+import org.jabref.cli.Launcher;
 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.jabref.preferences.FilePreferences;
 
-import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+/**
+ * This class contains Linux specific implementations for file directories and file/application open handling methods <br>
+ * We cannot use a static logger instance here in this class as the Logger first needs to be configured in the {@link Launcher#addLogToDisk}
+ * The configuration of tinylog will become immutable as soon as the first log entry is issued.
+ * https://tinylog.org/v2/configuration/
+ **/
 @AllowedToUseAwt("Requires AWT to open a file with the native method")
-public class Linux implements NativeDesktop {
+public class Linux extends NativeDesktop {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(Linux.class);
+    private static final String ETC_ALTERNATIVES_X_TERMINAL_EMULATOR = "/etc/alternatives/x-terminal-emulator";
 
     private void nativeOpenFile(String filePath) {
         JabRefExecutorService.INSTANCE.execute(() -> {
             try {
                 File file = new File(filePath);
                 Desktop.getDesktop().open(file);
-                LOGGER.debug("Open file in default application with Desktop integration");
+                LoggerFactory.getLogger(Linux.class).debug("Open file in default application with Desktop integration");
             } catch (IllegalArgumentException e) {
-                LOGGER.debug("Fail back to xdg-open");
+                LoggerFactory.getLogger(Linux.class).debug("Fail back to xdg-open");
                 try {
                     String[] cmd = {"xdg-open", filePath};
                     Runtime.getRuntime().exec(cmd);
                 } catch (Exception e2) {
-                    LOGGER.warn("Open operation not successful: " + e2);
+                    LoggerFactory.getLogger(Linux.class).warn("Open operation not successful: ", e2);
                 }
             } catch (IOException e) {
-                LOGGER.warn("Native open operation not successful: " + e);
+                LoggerFactory.getLogger(Linux.class).warn("Native open operation not successful: ", e);
             }
         });
     }
 
     @Override
-    public void openFile(String filePath, String fileType) throws IOException {
-        Optional<ExternalFileType> type = ExternalFileTypes.getExternalFileTypeByExt(fileType, Globals.prefs.getFilePreferences());
+    public void openFile(String filePath, String fileType, FilePreferences filePreferences) throws IOException {
+        Optional<ExternalFileType> type = ExternalFileTypes.getExternalFileTypeByExt(fileType, filePreferences);
         String viewer;
 
         if (type.isPresent() && !type.get().getOpenWithApplication().isEmpty()) {
             viewer = type.get().getOpenWithApplication();
             ProcessBuilder processBuilder = new ProcessBuilder(viewer, filePath);
             Process process = processBuilder.start();
-            StreamGobbler streamGobblerInput = new StreamGobbler(process.getInputStream(), LOGGER::debug);
-            StreamGobbler streamGobblerError = new StreamGobbler(process.getErrorStream(), LOGGER::debug);
+            StreamGobbler streamGobblerInput = new StreamGobbler(process.getInputStream(), LoggerFactory.getLogger(Linux.class)::debug);
+            StreamGobbler streamGobblerError = new StreamGobbler(process.getErrorStream(), LoggerFactory.getLogger(Linux.class)::debug);
 
             JabRefExecutorService.INSTANCE.execute(streamGobblerInput);
             JabRefExecutorService.INSTANCE.execute(streamGobblerError);
@@ -80,8 +87,8 @@ public void openFileWithApplication(String filePath, String application) throws
             ProcessBuilder processBuilder = new ProcessBuilder(cmdArray);
             Process process = processBuilder.start();
 
-            StreamGobbler streamGobblerInput = new StreamGobbler(process.getInputStream(), LOGGER::debug);
-            StreamGobbler streamGobblerError = new StreamGobbler(process.getErrorStream(), LOGGER::debug);
+            StreamGobbler streamGobblerInput = new StreamGobbler(process.getInputStream(), LoggerFactory.getLogger(Linux.class)::debug);
+            StreamGobbler streamGobblerError = new StreamGobbler(process.getErrorStream(), LoggerFactory.getLogger(Linux.class)::debug);
 
             JabRefExecutorService.INSTANCE.execute(streamGobblerInput);
             JabRefExecutorService.INSTANCE.execute(streamGobblerError);
@@ -95,7 +102,7 @@ public void openFolderAndSelectFile(Path filePath) throws IOException {
         String desktopSession = System.getenv("DESKTOP_SESSION");
 
         String absoluteFilePath = filePath.toAbsolutePath().toString();
-        String[] cmd = {"xdg-open", absoluteFilePath}; // default command
+        String[] cmd = {"xdg-open", filePath.getParent().toString()}; // default is the folder of the file
 
         if (desktopSession != null) {
             desktopSession = desktopSession.toLowerCase(Locale.ROOT);
@@ -107,13 +114,16 @@ public void openFolderAndSelectFile(Path filePath) throws IOException {
                 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
+            } else if (desktopSession.contains("xfce")) {
+                cmd = new String[] {"thunar", absoluteFilePath};
             }
         }
-        ProcessBuilder processBuilder = new ProcessBuilder((cmd));
+        LoggerFactory.getLogger(Linux.class).debug("Opening folder and selecting file using {}", String.join(" ", 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);
+        StreamGobbler streamGobblerInput = new StreamGobbler(process.getInputStream(), LoggerFactory.getLogger(Linux.class)::debug);
+        StreamGobbler streamGobblerError = new StreamGobbler(process.getErrorStream(), LoggerFactory.getLogger(Linux.class)::debug);
 
         JabRefExecutorService.INSTANCE.execute(streamGobblerInput);
         JabRefExecutorService.INSTANCE.execute(streamGobblerError);
@@ -122,12 +132,12 @@ public void openFolderAndSelectFile(Path filePath) throws IOException {
     @Override
     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."));
+        if (!Files.exists(Path.of(ETC_ALTERNATIVES_X_TERMINAL_EMULATOR))) {
+            dialogService.showErrorDialogAndWait(Localization.lang("Could not detect terminal automatically using '%0'. Please define a custom terminal in the preferences.", ETC_ALTERNATIVES_X_TERMINAL_EMULATOR));
             return;
         }
 
-        ProcessBuilder processBuilder = new ProcessBuilder("readlink", "/etc/alternatives/x-terminal-emulator");
+        ProcessBuilder processBuilder = new ProcessBuilder("readlink", ETC_ALTERNATIVES_X_TERMINAL_EMULATOR);
         Process process = processBuilder.start();
 
         try (BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()))) {
@@ -137,21 +147,24 @@ public void openConsole(String absolutePath, DialogService dialogService) throws
 
                 String[] cmd;
                 if (emulatorName.contains("gnome")) {
-                    cmd = new String[] {"gnome-terminal", "--working-directory=", absolutePath};
+                    cmd = new String[] {"gnome-terminal", "--working-directory", absolutePath};
                 } else if (emulatorName.contains("xfce4")) {
-                    cmd = new String[] {"xfce4-terminal", "--working-directory=", absolutePath};
+                    // xfce4-terminal requires "--working-directory=<directory>" format (one arg)
+                    cmd = new String[] {"xfce4-terminal", "--working-directory=" + absolutePath};
                 } else if (emulatorName.contains("konsole")) {
-                    cmd = new String[] {"konsole", "--workdir=", absolutePath};
+                    cmd = new String[] {"konsole", "--workdir", absolutePath};
                 } else {
                     cmd = new String[] {emulatorName, absolutePath};
                 }
 
+                LoggerFactory.getLogger(Linux.class).debug("Opening terminal using {}", String.join(" ", cmd));
+
                 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);
+                StreamGobbler streamGobblerInput = new StreamGobbler(processTerminal.getInputStream(), LoggerFactory.getLogger(Linux.class)::debug);
+                StreamGobbler streamGobblerError = new StreamGobbler(processTerminal.getErrorStream(), LoggerFactory.getLogger(Linux.class)::debug);
 
                 JabRefExecutorService.INSTANCE.execute(streamGobblerInput);
                 JabRefExecutorService.INSTANCE.execute(streamGobblerError);
@@ -171,9 +184,34 @@ public Path getApplicationDirectory() {
 
     @Override
     public Path getDefaultFileChooserDirectory() {
-        return Path.of(Objects.requireNonNullElse(
-                System.getenv("XDG_DOCUMENTS_DIR"),
-                System.getProperty("user.home") + "/Documents")
-        );
+        String xdgDocumentsDir = System.getenv("XDG_DOCUMENTS_DIR");
+        if (xdgDocumentsDir != null) {
+            return Path.of(xdgDocumentsDir);
+        }
+
+        // Make use of xdg-user-dirs
+        // See https://www.freedesktop.org/wiki/Software/xdg-user-dirs/ for details
+        try {
+            Process process = new ProcessBuilder("xdg-user-dir", "DOCUMENTS").start(); // Package name with 's', command without
+            List<String> strings = new BufferedReader(new InputStreamReader(process.getInputStream(), StandardCharsets.UTF_8))
+                    .lines().toList();
+            if (strings.isEmpty()) {
+                LoggerFactory.getLogger(Linux.class).error("xdg-user-dir returned nothing");
+                return getUserDirectory();
+            }
+            String documentsDirectory = strings.get(0);
+            Path documentsPath = Path.of(documentsDirectory);
+            if (!Files.exists(documentsPath)) {
+                LoggerFactory.getLogger(Linux.class).error("xdg-user-dir returned non-existant directory {}", documentsDirectory);
+                return getUserDirectory();
+            }
+            LoggerFactory.getLogger(Linux.class).debug("Got documents path {}", documentsPath);
+            return documentsPath;
+        } catch (IOException e) {
+            LoggerFactory.getLogger(Linux.class).error("Error while executing xdg-user-dir", e);
+        }
+
+        // Fallback
+        return getUserDirectory();
     }
 }
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 74341d10e8a..7e6c4c8fae4 100644
--- a/src/main/java/org/jabref/gui/desktop/os/NativeDesktop.java
+++ b/src/main/java/org/jabref/gui/desktop/os/NativeDesktop.java
@@ -1,13 +1,36 @@
 package org.jabref.gui.desktop.os;
 
+import java.io.File;
 import java.io.IOException;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.nio.file.Files;
 import java.nio.file.Path;
 
+import org.jabref.cli.Launcher;
 import org.jabref.gui.DialogService;
+import org.jabref.logic.util.BuildInfo;
+import org.jabref.logic.util.OS;
+import org.jabref.model.pdf.search.SearchFieldConstants;
+import org.jabref.model.strings.StringUtil;
+import org.jabref.preferences.FilePreferences;
 
-public interface NativeDesktop {
+import net.harawata.appdirs.AppDirsFactory;
+import org.slf4j.LoggerFactory;
 
-    void openFile(String filePath, String fileType) throws IOException;
+/**
+ * This class contains bundles OS specific implementations for file directories and file/application open handling methods.
+ * In case the default does not work, subclasses provide the correct behavior.
+ *
+ * <p>
+ * We cannot use a static logger instance here in this class as the Logger first needs to be configured in the {@link Launcher#addLogToDisk}
+ * The configuration of tinylog will become immutable as soon as the first log entry is issued.
+ * https://tinylog.org/v2/configuration/
+ * </p>
+ */
+public abstract class NativeDesktop {
+
+    public abstract void openFile(String filePath, String fileType, FilePreferences filePreferences) throws IOException;
 
     /**
      * Opens a file on an Operating System, using the given application.
@@ -15,34 +38,91 @@ public interface NativeDesktop {
      * @param filePath    The filename.
      * @param application Link to the app that opens the file.
      */
-    void openFileWithApplication(String filePath, String application) throws IOException;
+    public abstract void openFileWithApplication(String filePath, String application) throws IOException;
 
-    void openFolderAndSelectFile(Path file) throws IOException;
+    public abstract void openFolderAndSelectFile(Path file) throws IOException;
 
-    void openConsole(String absolutePath, DialogService dialogService) throws IOException;
+    public abstract void openConsole(String absolutePath, DialogService dialogService) throws IOException;
 
-    String detectProgramPath(String programName, String directoryName);
+    public abstract String detectProgramPath(String programName, String directoryName);
 
     /**
      * Returns the path to the system's applications folder.
      *
      * @return the path to the applications folder.
      */
-    Path getApplicationDirectory();
+    public abstract Path getApplicationDirectory();
 
     /**
      * Get the user's default file chooser directory
      *
      * @return The path to the directory
      */
-     Path getDefaultFileChooserDirectory();
+    public Path getDefaultFileChooserDirectory() {
+         Path userDirectory = getUserDirectory();
+         Path documents = userDirectory.resolve("Documents");
+         if (!Files.exists(documents)) {
+             return userDirectory;
+         }
+         return documents;
+     }
 
     /**
      * Returns the path to the system's user directory.
      *
      * @return the path to the user directory.
      */
-    default Path getUserDirectory() {
+    public Path getUserDirectory() {
         return Path.of(System.getProperty("user.home"));
     }
+
+    public Path getLogDirectory() {
+        return Path.of(AppDirsFactory.getInstance()
+                                     .getUserDataDir(
+                                             OS.APP_DIR_APP_NAME,
+                                             "logs",
+                                             OS.APP_DIR_APP_AUTHOR))
+                   .resolve(new BuildInfo().version.toString());
+    }
+
+    public Path getBackupDirectory() {
+        return Path.of(AppDirsFactory.getInstance()
+                                     .getUserDataDir(
+                                             OS.APP_DIR_APP_NAME,
+                                             "backups",
+                                             OS.APP_DIR_APP_AUTHOR));
+    }
+
+    public Path getFulltextIndexBaseDirectory() {
+        return Path.of(AppDirsFactory.getInstance()
+                                     .getUserDataDir(OS.APP_DIR_APP_NAME,
+                                             "lucene" + File.separator + SearchFieldConstants.VERSION,
+                                             OS.APP_DIR_APP_AUTHOR));
+    }
+
+    public Path getSslDirectory() {
+        return Path.of(AppDirsFactory.getInstance()
+                                     .getUserDataDir(OS.APP_DIR_APP_NAME,
+                                             "ssl",
+                                             OS.APP_DIR_APP_AUTHOR));
+    }
+
+    public String getHostName() {
+        String hostName;
+        // Following code inspired by https://commons.apache.org/proper/commons-lang/apidocs/org/apache/commons/lang3/SystemUtils.html#getHostName--
+        // See also https://stackoverflow.com/a/20793241/873282
+        hostName = System.getenv("HOSTNAME");
+        if (StringUtil.isBlank(hostName)) {
+            hostName = System.getenv("COMPUTERNAME");
+        }
+        if (StringUtil.isBlank(hostName)) {
+            try {
+                hostName = InetAddress.getLocalHost().getHostName();
+            } catch (UnknownHostException e) {
+                LoggerFactory.getLogger(OS.class).info("Hostname not found. Using \"localhost\" as fallback.", e);
+                hostName = "localhost";
+            }
+        }
+        return hostName;
+    }
 }
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 ece1d553d56..7adbd087927 100644
--- a/src/main/java/org/jabref/gui/desktop/os/OSX.java
+++ b/src/main/java/org/jabref/gui/desktop/os/OSX.java
@@ -5,17 +5,24 @@
 import java.util.Optional;
 
 import org.jabref.architecture.AllowedToUseAwt;
+import org.jabref.cli.Launcher;
 import org.jabref.gui.DialogService;
-import org.jabref.gui.Globals;
 import org.jabref.gui.externalfiletype.ExternalFileType;
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
-
+import org.jabref.preferences.FilePreferences;
+
+/**
+ * This class contains macOS (OSX) specific implementations for file directories and file/application open handling methods <br>
+ * We cannot use a static logger instance here in this class as the Logger first needs to be configured in the {@link Launcher#addLogToDisk}
+ * The configuration of tinylog will become immutable as soon as the first log entry is issued.
+ * https://tinylog.org/v2/configuration/
+ **/
 @AllowedToUseAwt("Requires AWT to open a file")
-public class OSX implements NativeDesktop {
+public class OSX extends NativeDesktop {
 
     @Override
-    public void openFile(String filePath, String fileType) throws IOException {
-        Optional<ExternalFileType> type = ExternalFileTypes.getExternalFileTypeByExt(fileType, Globals.prefs.getFilePreferences());
+    public void openFile(String filePath, String fileType, FilePreferences filePreferences) throws IOException {
+        Optional<ExternalFileType> type = ExternalFileTypes.getExternalFileTypeByExt(fileType, filePreferences);
         if (type.isPresent() && !type.get().getOpenWithApplication().isEmpty()) {
             openFileWithApplication(filePath, type.get().getOpenWithApplication());
         } else {
@@ -52,9 +59,4 @@ public String detectProgramPath(String programName, String directoryName) {
     public Path getApplicationDirectory() {
         return Path.of("/Applications");
     }
-
-    @Override
-    public Path getDefaultFileChooserDirectory() {
-        return Path.of(System.getProperty("user.home") + "/Documents");
-    }
 }
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 eb973986e0e..bacf32f6406 100644
--- a/src/main/java/org/jabref/gui/desktop/os/Windows.java
+++ b/src/main/java/org/jabref/gui/desktop/os/Windows.java
@@ -6,26 +6,31 @@
 import java.nio.file.Path;
 import java.util.Optional;
 
+import org.jabref.cli.Launcher;
 import org.jabref.gui.DialogService;
-import org.jabref.gui.Globals;
 import org.jabref.gui.externalfiletype.ExternalFileType;
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
+import org.jabref.preferences.FilePreferences;
 
 import com.sun.jna.platform.win32.KnownFolders;
 import com.sun.jna.platform.win32.Shell32Util;
 import com.sun.jna.platform.win32.ShlObj;
 import com.sun.jna.platform.win32.Win32Exception;
-import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class Windows implements NativeDesktop {
-    private static final Logger LOGGER = LoggerFactory.getLogger(Windows.class);
+/**
+ * This class contains Windows specific implementations for file directories and file/application open handling methods <br>
+ * We cannot use a static logger instance here in this class as the Logger first needs to be configured in the {@link Launcher#addLogToDisk}
+ * The configuration of tinylog will become immutable as soon as the first log entry is issued.
+ * https://tinylog.org/v2/configuration/
+ **/
+public class Windows extends NativeDesktop {
 
     private static final String DEFAULT_EXECUTABLE_EXTENSION = ".exe";
 
     @Override
-    public void openFile(String filePath, String fileType) throws IOException {
-        Optional<ExternalFileType> type = ExternalFileTypes.getExternalFileTypeByExt(fileType, Globals.prefs.getFilePreferences());
+    public void openFile(String filePath, String fileType, FilePreferences filePreferences) throws IOException {
+        Optional<ExternalFileType> type = ExternalFileTypes.getExternalFileTypeByExt(fileType, filePreferences);
 
         if (type.isPresent() && !type.get().getOpenWithApplication().isEmpty()) {
             openFileWithApplication(filePath, type.get().getOpenWithApplication());
@@ -89,7 +94,8 @@ public Path getDefaultFileChooserDirectory() {
                 return Path.of(Shell32Util.getFolderPath(ShlObj.CSIDL_MYDOCUMENTS));
             }
         } catch (Win32Exception e) {
-            LOGGER.error("Error accessing folder", e);
+            // needs to be non-static because of org.jabref.cli.Launcher.addLogToDisk
+            LoggerFactory.getLogger(Windows.class).error("Error accessing folder", e);
             return Path.of(System.getProperty("user.home"));
         }
     }
diff --git a/src/main/java/org/jabref/gui/dialogs/AutosaveUiManager.java b/src/main/java/org/jabref/gui/dialogs/AutosaveUiManager.java
index a7bc85890ee..56fe6777872 100644
--- a/src/main/java/org/jabref/gui/dialogs/AutosaveUiManager.java
+++ b/src/main/java/org/jabref/gui/dialogs/AutosaveUiManager.java
@@ -1,9 +1,10 @@
 package org.jabref.gui.dialogs;
 
-import org.jabref.gui.Globals;
 import org.jabref.gui.LibraryTab;
 import org.jabref.gui.exporter.SaveDatabaseAction;
 import org.jabref.model.database.event.AutosaveEvent;
+import org.jabref.model.entry.BibEntryTypesManager;
+import org.jabref.preferences.PreferencesService;
 
 import com.google.common.eventbus.Subscribe;
 import org.slf4j.Logger;
@@ -16,10 +17,10 @@
 public class AutosaveUiManager {
     private static final Logger LOGGER = LoggerFactory.getLogger(AutosaveUiManager.class);
 
-    private SaveDatabaseAction saveDatabaseAction;
+    private final SaveDatabaseAction saveDatabaseAction;
 
-    public AutosaveUiManager(LibraryTab libraryTab) {
-        this.saveDatabaseAction = new SaveDatabaseAction(libraryTab, Globals.prefs, Globals.entryTypesManager);
+    public AutosaveUiManager(LibraryTab libraryTab, PreferencesService preferencesService, BibEntryTypesManager entryTypesManager) {
+        this.saveDatabaseAction = new SaveDatabaseAction(libraryTab, preferencesService, entryTypesManager);
     }
 
     @Subscribe
diff --git a/src/main/java/org/jabref/gui/dialogs/BackupUIManager.java b/src/main/java/org/jabref/gui/dialogs/BackupUIManager.java
index ceba43dd088..05ba9755db4 100644
--- a/src/main/java/org/jabref/gui/dialogs/BackupUIManager.java
+++ b/src/main/java/org/jabref/gui/dialogs/BackupUIManager.java
@@ -8,14 +8,13 @@
 import javafx.scene.control.ButtonType;
 
 import org.jabref.gui.DialogService;
-import org.jabref.gui.Globals;
+import org.jabref.gui.autosaveandbackup.BackupManager;
 import org.jabref.gui.backup.BackupResolverDialog;
 import org.jabref.gui.collab.DatabaseChange;
 import org.jabref.gui.collab.DatabaseChangeList;
 import org.jabref.gui.collab.DatabaseChangeResolverFactory;
 import org.jabref.gui.collab.DatabaseChangesResolverDialog;
 import org.jabref.gui.util.DefaultTaskExecutor;
-import org.jabref.logic.autosaveandbackup.BackupManager;
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.OpenDatabase;
 import org.jabref.logic.importer.ParserResult;
@@ -23,6 +22,8 @@
 import org.jabref.logic.util.io.BackupFileUtil;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.util.DummyFileUpdateMonitor;
+import org.jabref.model.util.FileUpdateMonitor;
+import org.jabref.preferences.ExternalApplicationsPreferences;
 import org.jabref.preferences.PreferencesService;
 
 import org.slf4j.Logger;
@@ -37,36 +38,51 @@ public class BackupUIManager {
     private BackupUIManager() {
     }
 
-    public static Optional<ParserResult> showRestoreBackupDialog(DialogService dialogService, Path originalPath, PreferencesService preferencesService) {
-        var actionOpt = showBackupResolverDialog(dialogService, originalPath);
+    public static Optional<ParserResult> showRestoreBackupDialog(DialogService dialogService,
+                                                                 Path originalPath,
+                                                                 PreferencesService preferencesService,
+                                                                 FileUpdateMonitor fileUpdateMonitor) {
+        var actionOpt = showBackupResolverDialog(
+                dialogService,
+                preferencesService.getExternalApplicationsPreferences(),
+                originalPath,
+                preferencesService.getFilePreferences().getBackupDirectory());
         return actionOpt.flatMap(action -> {
             if (action == BackupResolverDialog.RESTORE_FROM_BACKUP) {
-                BackupManager.restoreBackup(originalPath);
+                BackupManager.restoreBackup(originalPath, preferencesService.getFilePreferences().getBackupDirectory());
                 return Optional.empty();
             } else if (action == BackupResolverDialog.REVIEW_BACKUP) {
-                return showReviewBackupDialog(dialogService, originalPath, preferencesService);
+                return showReviewBackupDialog(dialogService, originalPath, preferencesService, fileUpdateMonitor);
             }
             return Optional.empty();
         });
     }
 
-    private static Optional<ButtonType> showBackupResolverDialog(DialogService dialogService, Path originalPath) {
-        return DefaultTaskExecutor.runInJavaFXThread(() -> dialogService.showCustomDialogAndWait(new BackupResolverDialog(originalPath)));
+    private static Optional<ButtonType> showBackupResolverDialog(DialogService dialogService,
+                                                                 ExternalApplicationsPreferences externalApplicationsPreferences,
+                                                                 Path originalPath,
+                                                                 Path backupDir) {
+        return DefaultTaskExecutor.runInJavaFXThread(
+                () -> dialogService.showCustomDialogAndWait(new BackupResolverDialog(originalPath, backupDir, externalApplicationsPreferences)));
     }
 
-    private static Optional<ParserResult> showReviewBackupDialog(DialogService dialogService, Path originalPath, PreferencesService preferencesService) {
+    private static Optional<ParserResult> showReviewBackupDialog(
+            DialogService dialogService,
+            Path originalPath,
+            PreferencesService preferencesService,
+            FileUpdateMonitor fileUpdateMonitor) {
         try {
-            ImportFormatPreferences importFormatPreferences = Globals.prefs.getImportFormatPreferences();
+            ImportFormatPreferences importFormatPreferences = preferencesService.getImportFormatPreferences();
 
             // The database of the originalParserResult will be modified
-            ParserResult originalParserResult = OpenDatabase.loadDatabase(originalPath, importFormatPreferences, Globals.getFileUpdateMonitor());
+            ParserResult originalParserResult = OpenDatabase.loadDatabase(originalPath, importFormatPreferences, fileUpdateMonitor);
             // This will be modified by using the `DatabaseChangesResolverDialog`.
             BibDatabaseContext originalDatabase = originalParserResult.getDatabaseContext();
 
-            Path backupPath = BackupFileUtil.getPathOfLatestExistingBackupFile(originalPath, BackupFileType.BACKUP).orElseThrow();
+            Path backupPath = BackupFileUtil.getPathOfLatestExistingBackupFile(originalPath, BackupFileType.BACKUP, preferencesService.getFilePreferences().getBackupDirectory()).orElseThrow();
             BibDatabaseContext backupDatabase = OpenDatabase.loadDatabase(backupPath, importFormatPreferences, new DummyFileUpdateMonitor()).getDatabaseContext();
 
-            DatabaseChangeResolverFactory changeResolverFactory = new DatabaseChangeResolverFactory(dialogService, originalDatabase, preferencesService.getBibEntryPreferences());
+            DatabaseChangeResolverFactory changeResolverFactory = new DatabaseChangeResolverFactory(dialogService, originalDatabase, preferencesService);
 
             return DefaultTaskExecutor.runInJavaFXThread(() -> {
                 List<DatabaseChange> changes = DatabaseChangeList.compareAndGetChanges(originalDatabase, backupDatabase, changeResolverFactory);
@@ -77,7 +93,7 @@ private static Optional<ParserResult> showReviewBackupDialog(DialogService dialo
                 var allChangesResolved = dialogService.showCustomDialogAndWait(reviewBackupDialog);
                 if (allChangesResolved.isEmpty() || !allChangesResolved.get()) {
                     // In case not all changes are resolved, start from scratch
-                    return showRestoreBackupDialog(dialogService, originalPath, preferencesService);
+                    return showRestoreBackupDialog(dialogService, originalPath, preferencesService, fileUpdateMonitor);
                 }
 
                 // This does NOT return the original ParserResult, but a modified version with all changes accepted or rejected
diff --git a/src/main/java/org/jabref/gui/documentviewer/DocumentPageViewModel.java b/src/main/java/org/jabref/gui/documentviewer/DocumentPageViewModel.java
index 9fe04ab71f5..78203fd9b9b 100644
--- a/src/main/java/org/jabref/gui/documentviewer/DocumentPageViewModel.java
+++ b/src/main/java/org/jabref/gui/documentviewer/DocumentPageViewModel.java
@@ -9,9 +9,6 @@ public abstract class DocumentPageViewModel {
 
     /**
      * Renders this page and returns an image representation of itself.
-     *
-     * @param width
-     * @param height
      */
     public abstract Image render(int width, int height);
 
diff --git a/src/main/java/org/jabref/gui/documentviewer/DocumentViewerView.java b/src/main/java/org/jabref/gui/documentviewer/DocumentViewerView.java
index e75b607e505..17a428b0c95 100644
--- a/src/main/java/org/jabref/gui/documentviewer/DocumentViewerView.java
+++ b/src/main/java/org/jabref/gui/documentviewer/DocumentViewerView.java
@@ -51,7 +51,7 @@ public DocumentViewerView() {
 
         // Remove button bar at bottom, but add close button to keep the dialog closable by clicking the "x" window symbol
         getDialogPane().getButtonTypes().add(ButtonType.CLOSE);
-        getDialogPane().getChildren().removeIf(node -> node instanceof ButtonBar);
+        getDialogPane().getChildren().removeIf(ButtonBar.class::isInstance);
     }
 
     @FXML
diff --git a/src/main/java/org/jabref/gui/documentviewer/PdfDocumentPageViewModel.java b/src/main/java/org/jabref/gui/documentviewer/PdfDocumentPageViewModel.java
index 9010ec3379c..607709742b1 100644
--- a/src/main/java/org/jabref/gui/documentviewer/PdfDocumentPageViewModel.java
+++ b/src/main/java/org/jabref/gui/documentviewer/PdfDocumentPageViewModel.java
@@ -5,8 +5,9 @@
 import java.io.IOException;
 import java.util.Objects;
 
-import javafx.embed.swing.SwingFXUtils;
 import javafx.scene.image.Image;
+import javafx.scene.image.PixelWriter;
+import javafx.scene.image.WritableImage;
 
 import org.jabref.architecture.AllowedToUseAwt;
 
@@ -51,7 +52,7 @@ public Image render(int width, int height) {
         try {
             int resolution = 96;
             BufferedImage image = renderer.renderImageWithDPI(pageNumber, 2 * resolution, ImageType.RGB);
-            return SwingFXUtils.toFXImage(resize(image, width, height), null);
+            return convertToFxImage(resize(image, width, height));
         } catch (IOException e) {
             // TODO: LOG
             return null;
@@ -68,4 +69,19 @@ public double getAspectRatio() {
         PDRectangle mediaBox = page.getMediaBox();
         return mediaBox.getWidth() / mediaBox.getHeight();
     }
+
+    // See https://stackoverflow.com/a/57552025/3450689
+    private static Image convertToFxImage(BufferedImage image) {
+        WritableImage wr = null;
+        if (image != null) {
+            wr = new WritableImage(image.getWidth(), image.getHeight());
+            PixelWriter pw = wr.getPixelWriter();
+            for (int x = 0; x < image.getWidth(); x++) {
+                for (int y = 0; y < image.getHeight(); y++) {
+                    pw.setArgb(x, y, image.getRGB(x, y));
+                }
+            }
+        }
+        return wr;
+    }
 }
diff --git a/src/main/java/org/jabref/gui/duplicationFinder/DuplicateResolverDialog.java b/src/main/java/org/jabref/gui/duplicationFinder/DuplicateResolverDialog.java
index 15a27d4f810..9cdf97b0de9 100644
--- a/src/main/java/org/jabref/gui/duplicationFinder/DuplicateResolverDialog.java
+++ b/src/main/java/org/jabref/gui/duplicationFinder/DuplicateResolverDialog.java
@@ -77,21 +77,21 @@ private void init(BibEntry one, BibEntry two, DuplicateResolverType type) {
                 first = new ButtonType(Localization.lang("Keep left"), ButtonData.LEFT);
                 second = new ButtonType(Localization.lang("Keep right"), ButtonData.LEFT);
                 both = new ButtonType(Localization.lang("Keep both"), ButtonData.LEFT);
-                threeWayMerge = new ThreeWayMergeView(one, two, preferencesService.getBibEntryPreferences());
+                threeWayMerge = new ThreeWayMergeView(one, two, preferencesService);
             }
             case DUPLICATE_SEARCH_WITH_EXACT -> {
                 first = new ButtonType(Localization.lang("Keep left"), ButtonData.LEFT);
                 second = new ButtonType(Localization.lang("Keep right"), ButtonData.LEFT);
                 both = new ButtonType(Localization.lang("Keep both"), ButtonData.LEFT);
                 removeExactVisible = true;
-                threeWayMerge = new ThreeWayMergeView(one, two, preferencesService.getBibEntryPreferences());
+                threeWayMerge = new ThreeWayMergeView(one, two, preferencesService);
             }
             case IMPORT_CHECK -> {
                 first = new ButtonType(Localization.lang("Keep old entry"), ButtonData.LEFT);
                 second = new ButtonType(Localization.lang("Keep from import"), ButtonData.LEFT);
                 both = new ButtonType(Localization.lang("Keep both"), ButtonData.LEFT);
                 threeWayMerge = new ThreeWayMergeView(one, two, Localization.lang("Old entry"),
-                        Localization.lang("From import"), preferencesService.getBibEntryPreferences());
+                        Localization.lang("From import"), preferencesService);
             }
             default -> throw new IllegalStateException("Switch expression should be exhaustive");
         }
@@ -106,7 +106,7 @@ private void init(BibEntry one, BibEntry two, DuplicateResolverType type) {
             // 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));
+                           .forEach(btn -> ButtonBar.setButtonUniformSize(btn, false));
         }
 
         // Retrieves the previous window state and sets the new dialog window size and position to match it
@@ -138,7 +138,7 @@ private void init(BibEntry one, BibEntry two, DuplicateResolverType type) {
             return null;
         });
 
-        HelpAction helpCommand = new HelpAction(HelpFile.FIND_DUPLICATES, dialogService);
+        HelpAction helpCommand = new HelpAction(HelpFile.FIND_DUPLICATES, dialogService, preferencesService.getFilePreferences());
         Button helpButton = actionFactory.createIconButton(StandardActions.HELP, helpCommand);
         borderPane.setRight(helpButton);
 
diff --git a/src/main/java/org/jabref/gui/duplicationFinder/DuplicateSearch.java b/src/main/java/org/jabref/gui/duplicationFinder/DuplicateSearch.java
index 611240c2701..29d91ec02d1 100644
--- a/src/main/java/org/jabref/gui/duplicationFinder/DuplicateSearch.java
+++ b/src/main/java/org/jabref/gui/duplicationFinder/DuplicateSearch.java
@@ -87,8 +87,8 @@ public void execute() {
     }
 
     private void searchPossibleDuplicates(List<BibEntry> entries, BibDatabaseMode databaseMode) {
-        for (int i = 0; (i < (entries.size() - 1)); i++) {
-            for (int j = i + 1; (j < entries.size()); j++) {
+        for (int i = 0; i < (entries.size() - 1); i++) {
+            for (int j = i + 1; j < entries.size(); j++) {
                 if (Thread.interrupted()) {
                     return;
                 }
diff --git a/src/main/java/org/jabref/gui/edit/CopyMoreAction.java b/src/main/java/org/jabref/gui/edit/CopyMoreAction.java
index 2da415b3485..0f9bbe3c103 100644
--- a/src/main/java/org/jabref/gui/edit/CopyMoreAction.java
+++ b/src/main/java/org/jabref/gui/edit/CopyMoreAction.java
@@ -8,12 +8,12 @@
 
 import org.jabref.gui.ClipBoardManager;
 import org.jabref.gui.DialogService;
-import org.jabref.gui.Globals;
 import org.jabref.gui.JabRefDialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.ActionHelper;
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.gui.actions.StandardActions;
+import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.layout.Layout;
 import org.jabref.logic.layout.LayoutHelper;
@@ -33,17 +33,20 @@ public class CopyMoreAction extends SimpleCommand {
     private final StateManager stateManager;
     private final ClipBoardManager clipBoardManager;
     private final PreferencesService preferencesService;
+    private final JournalAbbreviationRepository abbreviationRepository;
 
     public CopyMoreAction(StandardActions action,
                           DialogService dialogService,
                           StateManager stateManager,
                           ClipBoardManager clipBoardManager,
-                          PreferencesService preferencesService) {
+                          PreferencesService preferencesService,
+                          JournalAbbreviationRepository abbreviationRepository) {
         this.action = action;
         this.dialogService = dialogService;
         this.stateManager = stateManager;
         this.clipBoardManager = clipBoardManager;
         this.preferencesService = preferencesService;
+        this.abbreviationRepository = abbreviationRepository;
 
         this.executable.bind(ActionHelper.needsEntriesSelected(stateManager));
     }
@@ -192,7 +195,7 @@ private void copyKeyAndTitle() {
         StringReader layoutString = new StringReader("\\citationkey - \\begin{title}\\format[RemoveBrackets]{\\title}\\end{title}\n");
         Layout layout;
         try {
-            layout = new LayoutHelper(layoutString, preferencesService.getLayoutFormatterPreferences(Globals.journalAbbreviationRepository)).getLayoutFromText();
+            layout = new LayoutHelper(layoutString, preferencesService.getLayoutFormatterPreferences(), abbreviationRepository).getLayoutFromText();
         } catch (IOException e) {
             LOGGER.info("Could not get layout.", e);
             return;
diff --git a/src/main/java/org/jabref/gui/edit/EditAction.java b/src/main/java/org/jabref/gui/edit/EditAction.java
index 9942c6b5d29..b0daa482cb0 100644
--- a/src/main/java/org/jabref/gui/edit/EditAction.java
+++ b/src/main/java/org/jabref/gui/edit/EditAction.java
@@ -1,6 +1,5 @@
 package org.jabref.gui.edit;
 
-import javafx.scene.control.TextField;
 import javafx.scene.control.TextInputControl;
 import javafx.scene.web.WebView;
 
@@ -23,7 +22,6 @@ public class EditAction extends SimpleCommand {
     private static final Logger LOGGER = LoggerFactory.getLogger(EditAction.class);
 
     private final JabRefFrame frame;
-    private TextField text;
     private final StandardActions action;
     private final StateManager stateManager;
 
@@ -47,35 +45,48 @@ public String toString() {
     @Override
     public void execute() {
         stateManager.getFocusOwner().ifPresent(focusOwner -> {
-            LOGGER.debug("focusOwner: {}; Action: {}", focusOwner.toString(), action.getText());
-            if (focusOwner instanceof TextInputControl) {
+            LOGGER.debug("focusOwner: {}; Action: {}", focusOwner, action.getText());
+            if (focusOwner instanceof TextInputControl textInput) {
                 // Focus is on text field -> copy/paste/cut selected text
-                TextInputControl textInput = (TextInputControl) focusOwner;
                 // DELETE_ENTRY in text field should do forward delete
                 switch (action) {
+                    case SELECT_ALL -> textInput.selectAll();
                     case COPY -> textInput.copy();
-                    case UNDO -> textInput.undo();
-                    case REDO -> textInput.redo();
                     case CUT -> textInput.cut();
                     case PASTE -> textInput.paste();
                     case DELETE -> textInput.clear();
-                    case SELECT_ALL -> textInput.selectAll();
                     case DELETE_ENTRY -> textInput.deleteNextChar();
-                    default -> throw new IllegalStateException("Only cut/copy/paste supported in TextInputControl but got " + action);
+                    case UNDO -> textInput.undo();
+                    case REDO -> textInput.redo();
+                    default -> {
+                        String message = "Only cut/copy/paste supported in TextInputControl but got " + action;
+                        LOGGER.error(message);
+                        throw new IllegalStateException(message);
+                    }
                 }
             } else if ((focusOwner instanceof CodeArea) || (focusOwner instanceof WebView)) {
+                LOGGER.debug("Ignoring request in CodeArea or WebView");
                 return;
             } else {
                 LOGGER.debug("Else: {}", focusOwner.getClass().getSimpleName());
                 // 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) {
                     case COPY -> frame.getCurrentLibraryTab().copy();
                     case CUT -> frame.getCurrentLibraryTab().cut();
                     case PASTE -> frame.getCurrentLibraryTab().paste();
                     case DELETE_ENTRY -> frame.getCurrentLibraryTab().delete(false);
-                    default -> throw new IllegalStateException("Only cut/copy/paste supported but got " + action);
+                    case UNDO -> {
+                        if (frame.getUndoManager().canUndo()) {
+                            frame.getUndoManager().undo();
+                        }
+                    }
+                    case REDO -> {
+                        if (frame.getUndoManager().canRedo()) {
+                            frame.getUndoManager().redo();
+                        }
+                    }
+                    default -> LOGGER.debug("Only cut/copy/paste/deleteEntry supported but got: {} and focus owner {}", action, focusOwner);
                 }
             }
         });
diff --git a/src/main/java/org/jabref/gui/edit/OpenBrowserAction.java b/src/main/java/org/jabref/gui/edit/OpenBrowserAction.java
index c6eb7653ae8..967ffef9e42 100644
--- a/src/main/java/org/jabref/gui/edit/OpenBrowserAction.java
+++ b/src/main/java/org/jabref/gui/edit/OpenBrowserAction.java
@@ -3,19 +3,22 @@
 import org.jabref.gui.DialogService;
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.gui.desktop.JabRefDesktop;
+import org.jabref.preferences.FilePreferences;
 
 public class OpenBrowserAction extends SimpleCommand {
 
     private final String urlToOpen;
     private final DialogService dialogService;
+    private final FilePreferences filePreferences;
 
-    public OpenBrowserAction(String urlToOpen, DialogService dialogService) {
+    public OpenBrowserAction(String urlToOpen, DialogService dialogService, FilePreferences filePreferences) {
         this.urlToOpen = urlToOpen;
         this.dialogService = dialogService;
+        this.filePreferences = filePreferences;
     }
 
     @Override
     public void execute() {
-        JabRefDesktop.openBrowserShowPopup(urlToOpen, dialogService);
+        JabRefDesktop.openBrowserShowPopup(urlToOpen, dialogService, filePreferences);
     }
 }
diff --git a/src/main/java/org/jabref/gui/edit/automaticfiededitor/AutomaticFieldEditorDialog.java b/src/main/java/org/jabref/gui/edit/automaticfiededitor/AutomaticFieldEditorDialog.java
index 9f6a4663d9d..b23e32788ec 100644
--- a/src/main/java/org/jabref/gui/edit/automaticfiededitor/AutomaticFieldEditorDialog.java
+++ b/src/main/java/org/jabref/gui/edit/automaticfiededitor/AutomaticFieldEditorDialog.java
@@ -66,7 +66,7 @@ public AutomaticFieldEditorDialog(StateManager stateManager) {
         // 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));
+            .forEach(btn -> ButtonBar.setButtonUniformSize(btn, false));
     }
 
     @FXML
diff --git a/src/main/java/org/jabref/gui/entryeditor/CommentsTab.java b/src/main/java/org/jabref/gui/entryeditor/CommentsTab.java
new file mode 100644
index 00000000000..269ab381a83
--- /dev/null
+++ b/src/main/java/org/jabref/gui/entryeditor/CommentsTab.java
@@ -0,0 +1,91 @@
+package org.jabref.gui.entryeditor;
+
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import javax.swing.undo.UndoManager;
+
+import org.jabref.gui.DialogService;
+import org.jabref.gui.StateManager;
+import org.jabref.gui.autocompleter.SuggestionProviders;
+import org.jabref.gui.fieldeditors.FieldEditorFX;
+import org.jabref.gui.icon.IconTheme;
+import org.jabref.gui.theme.ThemeManager;
+import org.jabref.gui.util.TaskExecutor;
+import org.jabref.logic.journals.JournalAbbreviationRepository;
+import org.jabref.logic.l10n.Localization;
+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.field.Field;
+import org.jabref.model.entry.field.StandardField;
+import org.jabref.model.entry.field.UserSpecificCommentField;
+import org.jabref.preferences.PreferencesService;
+
+public class CommentsTab extends FieldsEditorTab {
+    public static final String NAME = "Comments";
+
+    private final String defaultOwner;
+    public CommentsTab(PreferencesService preferences,
+                       BibDatabaseContext databaseContext,
+                       SuggestionProviders suggestionProviders,
+                       UndoManager undoManager,
+                       DialogService dialogService,
+                       StateManager stateManager,
+                       ThemeManager themeManager,
+                       IndexingTaskManager indexingTaskManager,
+                       TaskExecutor taskExecutor,
+                       JournalAbbreviationRepository journalAbbreviationRepository) {
+        super(
+                false,
+                databaseContext,
+                suggestionProviders,
+                undoManager,
+                dialogService,
+                preferences,
+                stateManager,
+                themeManager,
+                taskExecutor,
+                journalAbbreviationRepository,
+                indexingTaskManager
+        );
+        this.defaultOwner = preferences.getOwnerPreferences().getDefaultOwner();
+        setText(Localization.lang("Comments"));
+        setGraphic(IconTheme.JabRefIcons.COMMENT.getGraphicNode());
+    }
+
+    @Override
+    protected Set<Field> determineFieldsToShow(BibEntry entry) {
+        UserSpecificCommentField defaultCommentField = new UserSpecificCommentField(defaultOwner);
+
+        // As default: Show BibTeX comment field and the user-specific comment field of the default owner
+        Set<Field> comments = new LinkedHashSet<>(Set.of(defaultCommentField, StandardField.COMMENT));
+
+        comments.addAll(entry.getFields().stream()
+                             .filter(field -> field instanceof UserSpecificCommentField ||
+                                     field.getName().toLowerCase().contains("comment"))
+                             .collect(Collectors.toSet()));
+
+        return comments;
+    }
+
+    @Override
+    protected void setupPanel(BibEntry entry, boolean compressed) {
+        super.setupPanel(entry, compressed);
+
+        for (Map.Entry<Field, FieldEditorFX> fieldEditorEntry : editors.entrySet()) {
+            Field field = fieldEditorEntry.getKey();
+            FieldEditorFX editor = fieldEditorEntry.getValue();
+
+            if (field instanceof UserSpecificCommentField) {
+                if (field.getName().contains(defaultOwner)) {
+                    editor.getNode().setDisable(false);
+                }
+            } else {
+                editor.getNode().setDisable(!field.getName().equals(StandardField.COMMENT.getName()));
+            }
+        }
+    }
+}
diff --git a/src/main/java/org/jabref/gui/entryeditor/DeprecatedFieldsTab.java b/src/main/java/org/jabref/gui/entryeditor/DeprecatedFieldsTab.java
index 91d876c41b5..a40302d54c6 100644
--- a/src/main/java/org/jabref/gui/entryeditor/DeprecatedFieldsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/DeprecatedFieldsTab.java
@@ -30,6 +30,7 @@
 
 public class DeprecatedFieldsTab extends FieldsEditorTab {
 
+    public static final String NAME = "Deprecated fields";
     private final BibEntryTypesManager entryTypesManager;
 
     public DeprecatedFieldsTab(BibDatabaseContext databaseContext,
@@ -47,7 +48,7 @@ public DeprecatedFieldsTab(BibDatabaseContext databaseContext,
         this.entryTypesManager = entryTypesManager;
 
         setText(Localization.lang("Deprecated fields"));
-        EasyBind.subscribe(preferences.getGeneralPreferences().showAdvancedHintsProperty(), advancedHints -> {
+        EasyBind.subscribe(preferences.getWorkspacePreferences().showAdvancedHintsProperty(), advancedHints -> {
             if (advancedHints) {
                 setTooltip(new Tooltip(Localization.lang("Shows fields having a successor in biblatex.\nFor instance, the publication month should be part of the date field.\nUse the Cleanup Entries functionality to convert the entry to biblatex.")));
             } else {
diff --git a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
index f6cdc84bfe2..349f01cded2 100644
--- a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
+++ b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
@@ -3,6 +3,7 @@
 import java.io.File;
 import java.nio.file.Path;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -121,7 +122,7 @@ public EntryEditor(LibraryTab libraryTab) {
                   .load();
 
         this.entryEditorPreferences = preferencesService.getEntryEditorPreferences();
-        this.fileLinker = new ExternalFilesEntryLinker(preferencesService.getFilePreferences(), databaseContext);
+        this.fileLinker = new ExternalFilesEntryLinker(preferencesService.getFilePreferences(), databaseContext, dialogService);
 
         EasyBind.subscribe(tabbed.getSelectionModel().selectedItemProperty(), tab -> {
             EntryEditorTab activeTab = (EntryEditorTab) tab;
@@ -146,19 +147,19 @@ public EntryEditor(LibraryTab libraryTab) {
             boolean success = false;
 
             if (event.getDragboard().hasContent(DataFormat.FILES)) {
-                List<Path> files = event.getDragboard().getFiles().stream().map(File::toPath).collect(Collectors.toList());
+                List<Path> draggedFiles = event.getDragboard().getFiles().stream().map(File::toPath).collect(Collectors.toList());
                 switch (event.getTransferMode()) {
                     case COPY -> {
                         LOGGER.debug("Mode COPY");
-                        fileLinker.copyFilesToFileDirAndAddToEntry(entry, files, libraryTab.getIndexingTaskManager());
+                        fileLinker.copyFilesToFileDirAndAddToEntry(entry, draggedFiles, libraryTab.getIndexingTaskManager());
                     }
                     case MOVE -> {
                         LOGGER.debug("Mode MOVE");
-                        fileLinker.moveFilesToFileDirAndAddToEntry(entry, files, libraryTab.getIndexingTaskManager());
+                        fileLinker.moveFilesToFileDirRenameAndAddToEntry(entry, draggedFiles, libraryTab.getIndexingTaskManager());
                     }
                     case LINK -> {
                         LOGGER.debug("Mode LINK");
-                        fileLinker.addFilesToEntry(entry, files);
+                        fileLinker.addFilesToEntry(entry, draggedFiles);
                     }
                 }
                 success = true;
@@ -196,7 +197,7 @@ private void setupKeyBindings() {
                         event.consume();
                         break;
                     case HELP:
-                        new HelpAction(HelpFile.ENTRY_EDITOR, dialogService).execute();
+                        new HelpAction(HelpFile.ENTRY_EDITOR, dialogService, preferencesService.getFilePreferences()).execute();
                         event.consume();
                         break;
                     case CLOSE:
@@ -245,43 +246,55 @@ private void navigateToNextEntry() {
     }
 
     private List<EntryEditorTab> createTabs() {
-        // Preview tab
         entryEditorTabs.add(new PreviewTab(databaseContext, dialogService, preferencesService, stateManager, themeManager, libraryTab.getIndexingTaskManager()));
 
-        // Required fields
+        // Required, optional, deprecated, and "other" fields
         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, 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, taskExecutor, journalAbbreviationRepository));
 
+        // Comment Tab: Tab for general and user-specific comments
+        entryEditorTabs.add(new CommentsTab(preferencesService, databaseContext, libraryTab.getSuggestionProviders(), undoManager, dialogService, stateManager, themeManager, libraryTab.getIndexingTaskManager(), taskExecutor, journalAbbreviationRepository));
+
         // General fields from preferences
-        for (Map.Entry<String, Set<Field>> tab : entryEditorPreferences.getEntryEditorTabList().entrySet()) {
+        // First, remove all tabs that are already handled above or below; except for the source tab (which has different titles for BibTeX and BibLaTeX mode)
+        Map<String, Set<Field>> entryEditorTabList = new HashMap<>(entryEditorPreferences.getEntryEditorTabs());
+        entryEditorTabList.remove(PreviewTab.NAME);
+        entryEditorTabList.remove(RequiredFieldsTab.NAME);
+        entryEditorTabList.remove(OptionalFieldsTab.NAME);
+        entryEditorTabList.remove(OptionalFields2Tab.NAME);
+        entryEditorTabList.remove(DeprecatedFieldsTab.NAME);
+        entryEditorTabList.remove(CommentsTab.NAME);
+        entryEditorTabList.remove(MathSciNetTab.NAME);
+        entryEditorTabList.remove(FileAnnotationTab.NAME);
+        entryEditorTabList.remove(RelatedArticlesTab.NAME);
+        entryEditorTabList.remove(LatexCitationsTab.NAME);
+        entryEditorTabList.remove(FulltextSearchResultsTab.NAME);
+        entryEditorTabList.remove("Comments");
+        // Then show the remaining configured
+        for (Map.Entry<String, Set<Field>> tab : entryEditorTabList.entrySet()) {
             entryEditorTabs.add(new UserDefinedFieldsTab(tab.getKey(), tab.getValue(), databaseContext, libraryTab.getSuggestionProviders(), undoManager, dialogService, preferencesService, stateManager, themeManager, libraryTab.getIndexingTaskManager(), taskExecutor, journalAbbreviationRepository));
         }
 
-        // Special tabs
+        // "Special" tabs
         entryEditorTabs.add(new MathSciNetTab());
         entryEditorTabs.add(new FileAnnotationTab(libraryTab.getAnnotationCache()));
         entryEditorTabs.add(new RelatedArticlesTab(this, entryEditorPreferences, preferencesService, dialogService));
 
-        // Source tab
         sourceTab = new SourceTab(
                 databaseContext,
                 undoManager,
-                preferencesService.getFieldWriterPreferences(),
+                preferencesService.getFieldPreferences(),
                 preferencesService.getImportFormatPreferences(),
                 fileMonitor,
                 dialogService,
                 stateManager,
+                bibEntryTypesManager,
                 keyBindingRepository);
         entryEditorTabs.add(sourceTab);
 
-        // LaTeX citations tab
         entryEditorTabs.add(new LatexCitationsTab(databaseContext, preferencesService, taskExecutor, dialogService));
 
         entryEditorTabs.add(new FulltextSearchResultsTab(stateManager, preferencesService, dialogService));
@@ -408,8 +421,8 @@ private void fetchAndMerge(EntryBasedFetcher fetcher) {
     public void setFocusToField(Field field) {
         DefaultTaskExecutor.runInJavaFXThread(() -> {
             for (Tab tab : tabbed.getTabs()) {
-                if ((tab instanceof FieldsEditorTab fieldsEditorTab) && fieldsEditorTab.getShownFields()
-                                                                                     .contains(field)) {
+                if ((tab instanceof FieldsEditorTab fieldsEditorTab)
+                        && fieldsEditorTab.getShownFields().contains(field)) {
                     tabbed.getSelectionModel().select(tab);
                     fieldsEditorTab.requestFocus(field);
                 }
diff --git a/src/main/java/org/jabref/gui/entryeditor/EntryEditorPreferences.java b/src/main/java/org/jabref/gui/entryeditor/EntryEditorPreferences.java
index 8e8a5b0a76d..73431acb78d 100644
--- a/src/main/java/org/jabref/gui/entryeditor/EntryEditorPreferences.java
+++ b/src/main/java/org/jabref/gui/entryeditor/EntryEditorPreferences.java
@@ -6,9 +6,11 @@
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.DoubleProperty;
 import javafx.beans.property.MapProperty;
+import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleDoubleProperty;
 import javafx.beans.property.SimpleMapProperty;
+import javafx.beans.property.SimpleObjectProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableMap;
 
@@ -16,42 +18,66 @@
 
 public class EntryEditorPreferences {
 
+    /**
+     * Specifies the different possible enablement states for online services
+     */
+    public enum JournalPopupEnabled {
+        FIRST_START, // The first time a user uses this service
+        ENABLED,
+        DISABLED;
+
+        public static JournalPopupEnabled fromString(String status) {
+            for (JournalPopupEnabled value : JournalPopupEnabled.values()) {
+                if (value.toString().equalsIgnoreCase(status)) {
+                    return value;
+                }
+            }
+            throw new IllegalArgumentException("No enum found with value: " + status);
+        }
+    }
+
     private final MapProperty<String, Set<Field>> entryEditorTabList;
+    private final MapProperty<String, Set<Field>> defaultEntryEditorTabList;
     private final BooleanProperty shouldOpenOnNewEntry;
     private final BooleanProperty shouldShowRecommendationsTab;
-    private final BooleanProperty isMrdlibAccepted;
     private final BooleanProperty shouldShowLatexCitationsTab;
     private final BooleanProperty showSourceTabByDefault;
     private final BooleanProperty enableValidation;
     private final BooleanProperty allowIntegerEditionBibtex;
     private final DoubleProperty dividerPosition;
+    private final BooleanProperty autoLinkFiles;
+    private final ObjectProperty<JournalPopupEnabled> enablementStatus;
 
     public EntryEditorPreferences(Map<String, Set<Field>> entryEditorTabList,
+                                  Map<String, Set<Field>> defaultEntryEditorTabList,
                                   boolean shouldOpenOnNewEntry,
                                   boolean shouldShowRecommendationsTab,
-                                  boolean isMrdlibAccepted,
                                   boolean shouldShowLatexCitationsTab,
                                   boolean showSourceTabByDefault,
                                   boolean enableValidation,
                                   boolean allowIntegerEditionBibtex,
-                                  double dividerPosition) {
+                                  double dividerPosition,
+                                  boolean autolinkFilesEnabled,
+                                  JournalPopupEnabled journalPopupEnabled) {
 
         this.entryEditorTabList = new SimpleMapProperty<>(FXCollections.observableMap(entryEditorTabList));
+        this.defaultEntryEditorTabList = new SimpleMapProperty<>(FXCollections.observableMap(defaultEntryEditorTabList));
         this.shouldOpenOnNewEntry = new SimpleBooleanProperty(shouldOpenOnNewEntry);
         this.shouldShowRecommendationsTab = new SimpleBooleanProperty(shouldShowRecommendationsTab);
-        this.isMrdlibAccepted = new SimpleBooleanProperty(isMrdlibAccepted);
         this.shouldShowLatexCitationsTab = new SimpleBooleanProperty(shouldShowLatexCitationsTab);
         this.showSourceTabByDefault = new SimpleBooleanProperty(showSourceTabByDefault);
         this.enableValidation = new SimpleBooleanProperty(enableValidation);
         this.allowIntegerEditionBibtex = new SimpleBooleanProperty(allowIntegerEditionBibtex);
         this.dividerPosition = new SimpleDoubleProperty(dividerPosition);
+        this.autoLinkFiles = new SimpleBooleanProperty(autolinkFilesEnabled);
+        this.enablementStatus = new SimpleObjectProperty<>(journalPopupEnabled);
     }
 
-    public ObservableMap<String, Set<Field>> getEntryEditorTabList() {
+    public ObservableMap<String, Set<Field>> getEntryEditorTabs() {
         return entryEditorTabList.get();
     }
 
-    public MapProperty<String, Set<Field>> entryEditorTabListProperty() {
+    public MapProperty<String, Set<Field>> entryEditorTabs() {
         return entryEditorTabList;
     }
 
@@ -59,6 +85,10 @@ public void setEntryEditorTabList(Map<String, Set<Field>> entryEditorTabList) {
         this.entryEditorTabList.set(FXCollections.observableMap(entryEditorTabList));
     }
 
+    public ObservableMap<String, Set<Field>> getDefaultEntryEditorTabs() {
+        return defaultEntryEditorTabList.get();
+    }
+
     public boolean shouldOpenOnNewEntry() {
         return shouldOpenOnNewEntry.get();
     }
@@ -83,18 +113,6 @@ public void setShouldShowRecommendationsTab(boolean shouldShowRecommendationsTab
         this.shouldShowRecommendationsTab.set(shouldShowRecommendationsTab);
     }
 
-    public boolean isMrdlibAccepted() {
-        return isMrdlibAccepted.get();
-    }
-
-    public BooleanProperty isMrdlibAcceptedProperty() {
-        return isMrdlibAccepted;
-    }
-
-    public void setIsMrdlibAccepted(boolean isMrdlibAccepted) {
-        this.isMrdlibAccepted.set(isMrdlibAccepted);
-    }
-
     public boolean shouldShowLatexCitationsTab() {
         return shouldShowLatexCitationsTab.get();
     }
@@ -154,4 +172,28 @@ public DoubleProperty dividerPositionProperty() {
     public void setDividerPosition(double dividerPosition) {
         this.dividerPosition.set(dividerPosition);
     }
+
+    public boolean autoLinkFilesEnabled() {
+        return this.autoLinkFiles.getValue();
+    }
+
+    public BooleanProperty autoLinkEnabledProperty() {
+        return this.autoLinkFiles;
+    }
+
+    public void setAutoLinkFilesEnabled(boolean enabled) {
+        this.autoLinkFiles.setValue(enabled);
+    }
+
+    public JournalPopupEnabled shouldEnableJournalPopup() {
+        return enablementStatus.get();
+    }
+
+    public ObjectProperty<JournalPopupEnabled> enableJournalPopupProperty() {
+        return enablementStatus;
+    }
+
+    public void setEnableJournalPopup(JournalPopupEnabled journalPopupEnabled) {
+        this.enablementStatus.set(journalPopupEnabled);
+    }
 }
diff --git a/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java b/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java
index 49fc1d8715b..8ab2b955eae 100644
--- a/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java
@@ -46,7 +46,7 @@
  */
 abstract class FieldsEditorTab extends EntryEditorTab {
     protected final BibDatabaseContext databaseContext;
-    private final Map<Field, FieldEditorFX> editors = new LinkedHashMap<>();
+    protected final Map<Field, FieldEditorFX> editors = new LinkedHashMap<>();
     private final boolean isCompressed;
     private final SuggestionProviders suggestionProviders;
     private final DialogService dialogService;
@@ -93,7 +93,7 @@ private static void addColumn(GridPane gridPane, int columnIndex, Stream<Parent>
         gridPane.addColumn(columnIndex, nodes.toArray(Node[]::new));
     }
 
-    private void setupPanel(BibEntry entry, boolean compressed) {
+    protected void setupPanel(BibEntry entry, boolean compressed) {
         // The preferences might be not initialized in tests -> return immediately
         // TODO: Replace this ugly workaround by proper injection propagation
         if (preferences == null) {
@@ -184,9 +184,6 @@ private void setCompressedRowLayout(GridPane gridPane, int rows) {
         }
     }
 
-    /**
-     * Focuses the given field.
-     */
     public void requestFocus(Field fieldName) {
         if (editors.containsKey(fieldName)) {
             editors.get(fieldName).focus();
@@ -202,7 +199,6 @@ public boolean shouldShow(BibEntry entry) {
     protected void bindToEntry(BibEntry entry) {
         initPanel();
         setupPanel(entry, isCompressed);
-
         if (previewPanel != null) {
             previewPanel.setEntry(entry);
         }
diff --git a/src/main/java/org/jabref/gui/entryeditor/LatexCitationsTab.java b/src/main/java/org/jabref/gui/entryeditor/LatexCitationsTab.java
index 87658d4e46c..fd3b47a43f9 100644
--- a/src/main/java/org/jabref/gui/entryeditor/LatexCitationsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/LatexCitationsTab.java
@@ -27,6 +27,7 @@
 
 public class LatexCitationsTab extends EntryEditorTab {
 
+    public static final String NAME = "LaTeX Citations";
     private final LatexCitationsTabViewModel viewModel;
     private final GridPane searchPane;
     private final ProgressIndicator progressIndicator;
diff --git a/src/main/java/org/jabref/gui/entryeditor/LatexCitationsTabViewModel.java b/src/main/java/org/jabref/gui/entryeditor/LatexCitationsTabViewModel.java
index fbfbb5c37e3..fc2ce8361fe 100644
--- a/src/main/java/org/jabref/gui/entryeditor/LatexCitationsTabViewModel.java
+++ b/src/main/java/org/jabref/gui/entryeditor/LatexCitationsTabViewModel.java
@@ -68,7 +68,7 @@ public LatexCitationsTabViewModel(BibDatabaseContext databaseContext,
         this.preferencesService = preferencesService;
         this.taskExecutor = taskExecutor;
         this.dialogService = dialogService;
-        this.directory = new SimpleObjectProperty<>(databaseContext.getMetaData().getLatexFileDirectory(preferencesService.getFilePreferences().getUser())
+        this.directory = new SimpleObjectProperty<>(databaseContext.getMetaData().getLatexFileDirectory(preferencesService.getFilePreferences().getUserAndHost())
                                                                    .orElse(FileUtil.getInitialDirectory(databaseContext, preferencesService.getFilePreferences().getWorkingDirectory())));
         this.citationList = FXCollections.observableArrayList();
         this.status = new SimpleObjectProperty<>(Status.IN_PROGRESS);
@@ -130,7 +130,7 @@ private void cancelSearch() {
 
     private Collection<Citation> searchAndParse(String citeKey) throws IOException {
         // we need to check whether the user meanwhile set the LaTeX file directory or the database changed locations
-        Path newDirectory = databaseContext.getMetaData().getLatexFileDirectory(preferencesService.getFilePreferences().getUser())
+        Path newDirectory = databaseContext.getMetaData().getLatexFileDirectory(preferencesService.getFilePreferences().getUserAndHost())
                                            .orElse(FileUtil.getInitialDirectory(databaseContext, preferencesService.getFilePreferences().getWorkingDirectory()));
 
         if (latexParserResult == null || !newDirectory.equals(directory.get())) {
@@ -172,7 +172,7 @@ public void setLatexDirectory() {
                 .withInitialDirectory(directory.get()).build();
 
         dialogService.showDirectorySelectionDialog(directoryDialogConfiguration).ifPresent(selectedDirectory ->
-                databaseContext.getMetaData().setLatexFileDirectory(preferencesService.getFilePreferences().getUser(), selectedDirectory.toAbsolutePath()));
+                databaseContext.getMetaData().setLatexFileDirectory(preferencesService.getFilePreferences().getUserAndHost(), selectedDirectory.toAbsolutePath()));
 
         init(currentEntry);
     }
diff --git a/src/main/java/org/jabref/gui/entryeditor/MathSciNetTab.java b/src/main/java/org/jabref/gui/entryeditor/MathSciNetTab.java
index 3113d016542..9f4ed909090 100644
--- a/src/main/java/org/jabref/gui/entryeditor/MathSciNetTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/MathSciNetTab.java
@@ -14,6 +14,8 @@
 
 public class MathSciNetTab extends EntryEditorTab {
 
+    public static final String NAME = "MathSciNet Review";
+
     public MathSciNetTab() {
         setText(Localization.lang("MathSciNet Review"));
     }
diff --git a/src/main/java/org/jabref/gui/entryeditor/OptionalFields2Tab.java b/src/main/java/org/jabref/gui/entryeditor/OptionalFields2Tab.java
index 97c38da58dd..da37540e513 100644
--- a/src/main/java/org/jabref/gui/entryeditor/OptionalFields2Tab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/OptionalFields2Tab.java
@@ -15,6 +15,9 @@
 import org.jabref.preferences.PreferencesService;
 
 public class OptionalFields2Tab extends OptionalFieldsTabBase {
+
+    public static final String NAME = "Optional fields 2";
+
     public OptionalFields2Tab(BibDatabaseContext databaseContext,
                               SuggestionProviders suggestionProviders,
                               UndoManager undoManager,
diff --git a/src/main/java/org/jabref/gui/entryeditor/OptionalFieldsTab.java b/src/main/java/org/jabref/gui/entryeditor/OptionalFieldsTab.java
index 93a6ff4b6f1..d511ef268cf 100644
--- a/src/main/java/org/jabref/gui/entryeditor/OptionalFieldsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/OptionalFieldsTab.java
@@ -15,6 +15,9 @@
 import org.jabref.preferences.PreferencesService;
 
 public class OptionalFieldsTab extends OptionalFieldsTabBase {
+
+    public static final String NAME = "Optional fields";
+
     public OptionalFieldsTab(BibDatabaseContext databaseContext,
                              SuggestionProviders suggestionProviders,
                              UndoManager undoManager,
diff --git a/src/main/java/org/jabref/gui/entryeditor/OtherFieldsTab.java b/src/main/java/org/jabref/gui/entryeditor/OtherFieldsTab.java
index 180ea465c53..dae09c7a2a3 100644
--- a/src/main/java/org/jabref/gui/entryeditor/OtherFieldsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/OtherFieldsTab.java
@@ -1,5 +1,6 @@
 package org.jabref.gui.entryeditor;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -28,10 +29,13 @@
 import org.jabref.model.entry.field.BibField;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.InternalField;
+import org.jabref.model.entry.field.StandardField;
+import org.jabref.model.entry.field.UserSpecificCommentField;
 import org.jabref.preferences.PreferencesService;
 
 public class OtherFieldsTab extends FieldsEditorTab {
 
+    public static final String NAME = "Other fields";
     private final List<Field> customTabFieldNames;
     private final BibEntryTypesManager entryTypesManager;
 
@@ -59,7 +63,8 @@ public OtherFieldsTab(BibDatabaseContext databaseContext,
                 indexingTaskManager);
 
         this.entryTypesManager = entryTypesManager;
-        this.customTabFieldNames = preferences.getAllDefaultTabFieldNames();
+        this.customTabFieldNames = new ArrayList<>();
+        preferences.getEntryEditorPreferences().getDefaultEntryEditorTabs().values().forEach(customTabFieldNames::addAll);
 
         setText(Localization.lang("Other fields"));
         setTooltip(new Tooltip(Localization.lang("Show remaining fields")));
@@ -72,12 +77,14 @@ protected Set<Field> determineFieldsToShow(BibEntry entry) {
         Optional<BibEntryType> entryType = entryTypesManager.enrich(entry.getType(), mode);
         if (entryType.isPresent()) {
             Set<Field> allKnownFields = entryType.get().getAllFields();
-            Set<Field> otherFields = entry.getFields().stream().filter(field -> !allKnownFields.contains(field)).collect(Collectors.toCollection(LinkedHashSet::new));
-
+            Set<Field> otherFields = entry.getFields().stream()
+                                          .filter(field -> !allKnownFields.contains(field) &&
+                                                  !(field.equals(StandardField.COMMENT) || field instanceof UserSpecificCommentField))
+                                          .collect(Collectors.toCollection(LinkedHashSet::new));
             otherFields.removeAll(entryType.get().getDeprecatedFields(mode));
             otherFields.removeAll(entryType.get().getOptionalFields().stream().map(BibField::field).collect(Collectors.toSet()));
             otherFields.remove(InternalField.KEY_FIELD);
-            otherFields.removeAll(customTabFieldNames);
+            customTabFieldNames.forEach(otherFields::remove);
             return otherFields;
         } else {
             // Entry type unknown -> treat all fields as required
diff --git a/src/main/java/org/jabref/gui/entryeditor/PreviewTab.java b/src/main/java/org/jabref/gui/entryeditor/PreviewTab.java
index 4212506b8f6..908349bc0ad 100644
--- a/src/main/java/org/jabref/gui/entryeditor/PreviewTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/PreviewTab.java
@@ -12,6 +12,7 @@
 import org.jabref.preferences.PreferencesService;
 
 public class PreviewTab extends EntryEditorTab {
+    public static final String NAME = "Preview";
     private final DialogService dialogService;
     private final BibDatabaseContext databaseContext;
     private final PreferencesService preferences;
diff --git a/src/main/java/org/jabref/gui/entryeditor/RelatedArticlesTab.java b/src/main/java/org/jabref/gui/entryeditor/RelatedArticlesTab.java
index 54f21252406..08047d1aae9 100644
--- a/src/main/java/org/jabref/gui/entryeditor/RelatedArticlesTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/RelatedArticlesTab.java
@@ -40,6 +40,7 @@
  */
 public class RelatedArticlesTab extends EntryEditorTab {
 
+    public static final String NAME = "Related articles";
     private static final Logger LOGGER = LoggerFactory.getLogger(RelatedArticlesTab.class);
     private final EntryEditorPreferences preferences;
     private final DialogService dialogService;
@@ -65,7 +66,7 @@ private StackPane getRelatedArticlesPane(BibEntry entry) {
         ProgressIndicator progress = new ProgressIndicator();
         progress.setMaxSize(100, 100);
 
-        MrDLibFetcher fetcher = new MrDLibFetcher(preferencesService.getGeneralPreferences().getLanguage().name(),
+        MrDLibFetcher fetcher = new MrDLibFetcher(preferencesService.getWorkspacePreferences().getLanguage().name(),
                 Globals.BUILD_INFO.version, preferencesService.getMrDlibPreferences());
         BackgroundTask
                 .wrap(() -> fetcher.performSearch(entry))
@@ -127,7 +128,7 @@ private ScrollPane getRelatedArticleInfo(List<BibEntry> list, MrDLibFetcher fetc
             titleLink.setOnAction(event -> {
                 if (entry.getField(StandardField.URL).isPresent()) {
                     try {
-                        JabRefDesktop.openBrowser(entry.getField(StandardField.URL).get());
+                        JabRefDesktop.openBrowser(entry.getField(StandardField.URL).get(), preferencesService.getFilePreferences());
                     } catch (IOException e) {
                         LOGGER.error("Error opening the browser to: " + entry.getField(StandardField.URL).get(), e);
                         dialogService.showErrorDialogAndWait(e);
@@ -191,7 +192,7 @@ private ScrollPane getPrivacyDialog(BibEntry entry) {
         Hyperlink mdlLink = new Hyperlink(Localization.lang("Further information about Mr. DLib for JabRef users."));
         mdlLink.setOnAction(event -> {
             try {
-                JabRefDesktop.openBrowser("http://mr-dlib.org/information-for-users/information-about-mr-dlib-for-jabref-users/");
+                JabRefDesktop.openBrowser("http://mr-dlib.org/information-for-users/information-about-mr-dlib-for-jabref-users/", preferencesService.getFilePreferences());
             } catch (IOException e) {
                 LOGGER.error("Error opening the browser to Mr. DLib information page.", e);
                 dialogService.showErrorDialogAndWait(e);
@@ -211,9 +212,8 @@ private ScrollPane getPrivacyDialog(BibEntry entry) {
         vb.setSpacing(10);
 
         button.setOnAction(event -> {
-            preferences.setIsMrdlibAccepted(true);
-
             MrDlibPreferences mrDlibPreferences = preferencesService.getMrDlibPreferences();
+            mrDlibPreferences.setAcceptRecommendations(true);
             mrDlibPreferences.setSendLanguage(cbLanguage.isSelected());
             mrDlibPreferences.setSendOs(cbOS.isSelected());
             mrDlibPreferences.setSendTimezone(cbTimezone.isSelected());
@@ -236,7 +236,7 @@ public boolean shouldShow(BibEntry entry) {
     @Override
     protected void bindToEntry(BibEntry entry) {
         // Ask for consent to send data to Mr. DLib on first time to tab
-        if (preferences.isMrdlibAccepted()) {
+        if (preferencesService.getMrDlibPreferences().shouldAcceptRecommendations()) {
             setContent(getRelatedArticlesPane(entry));
         } else {
             setContent(getPrivacyDialog(entry));
diff --git a/src/main/java/org/jabref/gui/entryeditor/RequiredFieldsTab.java b/src/main/java/org/jabref/gui/entryeditor/RequiredFieldsTab.java
index 3451f2c8f53..cfc530c9d08 100644
--- a/src/main/java/org/jabref/gui/entryeditor/RequiredFieldsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/RequiredFieldsTab.java
@@ -28,6 +28,7 @@
 
 public class RequiredFieldsTab extends FieldsEditorTab {
 
+    public static final String NAME = "Required fields";
     private final BibEntryTypesManager entryTypesManager;
 
     public RequiredFieldsTab(BibDatabaseContext databaseContext,
@@ -44,7 +45,6 @@ public RequiredFieldsTab(BibDatabaseContext databaseContext,
         super(false, databaseContext, suggestionProviders, undoManager, dialogService,
                 preferences, stateManager, themeManager, taskExecutor, journalAbbreviationRepository, indexingTaskManager);
         this.entryTypesManager = entryTypesManager;
-
         setText(Localization.lang("Required fields"));
         setTooltip(new Tooltip(Localization.lang("Show required fields")));
         setGraphic(IconTheme.JabRefIcons.REQUIRED.getGraphicNode());
@@ -56,7 +56,7 @@ protected Set<Field> determineFieldsToShow(BibEntry entry) {
         Set<Field> fields = new LinkedHashSet<>();
         if (entryType.isPresent()) {
             for (OrFields orFields : entryType.get().getRequiredFields()) {
-                fields.addAll(orFields);
+                fields.addAll(orFields.getFields());
             }
             // Add the edit field for Bibtex-key.
             fields.add(InternalField.KEY_FIELD);
diff --git a/src/main/java/org/jabref/gui/entryeditor/SourceTab.java b/src/main/java/org/jabref/gui/entryeditor/SourceTab.java
index 1e3de019011..05c8f94a8a3 100644
--- a/src/main/java/org/jabref/gui/entryeditor/SourceTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/SourceTab.java
@@ -21,7 +21,6 @@
 import javafx.scene.input.KeyEvent;
 
 import org.jabref.gui.DialogService;
-import org.jabref.gui.Globals;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.ActionFactory;
 import org.jabref.gui.actions.SimpleCommand;
@@ -35,8 +34,8 @@
 import org.jabref.gui.undo.UndoableFieldChange;
 import org.jabref.gui.util.DefaultTaskExecutor;
 import org.jabref.logic.bibtex.BibEntryWriter;
+import org.jabref.logic.bibtex.FieldPreferences;
 import org.jabref.logic.bibtex.FieldWriter;
-import org.jabref.logic.bibtex.FieldWriterPreferences;
 import org.jabref.logic.bibtex.InvalidFieldValueException;
 import org.jabref.logic.exporter.BibWriter;
 import org.jabref.logic.importer.ImportFormatPreferences;
@@ -49,6 +48,7 @@
 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.model.entry.field.Field;
 import org.jabref.model.util.FileUpdateMonitor;
 
@@ -63,7 +63,7 @@
 public class SourceTab extends EntryEditorTab {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(SourceTab.class);
-    private final FieldWriterPreferences fieldWriterPreferences;
+    private final FieldPreferences fieldPreferences;
     private final BibDatabaseMode mode;
     private final UndoManager undoManager;
     private final ObjectProperty<ValidationMessage> sourceIsValid = new SimpleObjectProperty<>();
@@ -72,8 +72,9 @@ public class SourceTab extends EntryEditorTab {
     private final FileUpdateMonitor fileMonitor;
     private final DialogService dialogService;
     private final StateManager stateManager;
-    private Optional<Pattern> searchHighlightPattern = Optional.empty();
+    private final BibEntryTypesManager entryTypesManager;
     private final KeyBindingRepository keyBindingRepository;
+    private Optional<Pattern> searchHighlightPattern = Optional.empty();
     private CodeArea codeArea;
 
     private BibEntry previousEntry;
@@ -98,17 +99,26 @@ public void execute() {
         }
     }
 
-    public SourceTab(BibDatabaseContext bibDatabaseContext, CountingUndoManager undoManager, FieldWriterPreferences fieldWriterPreferences, ImportFormatPreferences importFormatPreferences, FileUpdateMonitor fileMonitor, DialogService dialogService, StateManager stateManager, KeyBindingRepository keyBindingRepository) {
+    public SourceTab(BibDatabaseContext bibDatabaseContext,
+                     CountingUndoManager undoManager,
+                     FieldPreferences fieldPreferences,
+                     ImportFormatPreferences importFormatPreferences,
+                     FileUpdateMonitor fileMonitor,
+                     DialogService dialogService,
+                     StateManager stateManager,
+                     BibEntryTypesManager entryTypesManager,
+                     KeyBindingRepository keyBindingRepository) {
         this.mode = bibDatabaseContext.getMode();
         this.setText(Localization.lang("%0 source", mode.getFormattedName()));
         this.setTooltip(new Tooltip(Localization.lang("Show/edit %0 source", mode.getFormattedName())));
         this.setGraphic(IconTheme.JabRefIcons.SOURCE.getGraphicNode());
         this.undoManager = undoManager;
-        this.fieldWriterPreferences = fieldWriterPreferences;
+        this.fieldPreferences = fieldPreferences;
         this.importFormatPreferences = importFormatPreferences;
         this.fileMonitor = fileMonitor;
         this.dialogService = dialogService;
         this.stateManager = stateManager;
+        this.entryTypesManager = entryTypesManager;
         this.keyBindingRepository = keyBindingRepository;
 
         stateManager.activeSearchQueryProperty().addListener((observable, oldValue, newValue) -> {
@@ -129,11 +139,11 @@ private void highlightSearchPattern() {
         }
     }
 
-    private String getSourceString(BibEntry entry, BibDatabaseMode type, FieldWriterPreferences fieldWriterPreferences) throws IOException {
+    private String getSourceString(BibEntry entry, BibDatabaseMode type, FieldPreferences fieldPreferences) throws IOException {
         StringWriter writer = new StringWriter();
         BibWriter bibWriter = new BibWriter(writer, OS.NEWLINE);
-        FieldWriter fieldWriter = FieldWriter.buildIgnoreHashes(fieldWriterPreferences);
-        new BibEntryWriter(fieldWriter, Globals.entryTypesManager).write(entry, bibWriter, type);
+        FieldWriter fieldWriter = FieldWriter.buildIgnoreHashes(fieldPreferences);
+        new BibEntryWriter(fieldWriter, entryTypesManager).write(entry, bibWriter, type);
         return writer.toString();
     }
 
@@ -225,7 +235,7 @@ private void updateCodeArea() {
 
             codeArea.clear();
             try {
-                codeArea.appendText(getSourceString(currentEntry, mode, fieldWriterPreferences));
+                codeArea.appendText(getSourceString(currentEntry, mode, fieldPreferences));
                 codeArea.setEditable(true);
                 highlightSearchPattern();
             } catch (IOException ex) {
@@ -307,7 +317,7 @@ private void storeSource(BibEntry outOfFocusEntry, String text) {
                 String newValue = field.getValue();
                 if (!Objects.equals(oldValue, newValue)) {
                     // Test if the field is legally set.
-                    new FieldWriter(fieldWriterPreferences).write(fieldName, newValue);
+                    new FieldWriter(fieldPreferences).write(fieldName, newValue);
 
                     compound.addEdit(new UndoableFieldChange(outOfFocusEntry, fieldName, oldValue, newValue));
                     outOfFocusEntry.setField(fieldName, newValue);
diff --git a/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTab.java b/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTab.java
index 9ba9c1b23e8..338cc91872b 100644
--- a/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTab.java
@@ -13,6 +13,7 @@
 
 public class FileAnnotationTab extends EntryEditorTab {
 
+    public static final String NAME = "File annotations";
     private final FileAnnotationCache fileAnnotationCache;
 
     public FileAnnotationTab(FileAnnotationCache cache) {
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 62cd3d53491..d6cd4175103 100644
--- a/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationViewModel.java
+++ b/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationViewModel.java
@@ -31,7 +31,7 @@ private void setupContentProperties(FileAnnotation annotation) {
             this.content.set(annotation.getLinkedFileAnnotation().getContent());
             String annotationContent = annotation.getContent();
             String illegibleTextMessage = Localization.lang("The marked area does not contain any legible text!");
-            String markingContent = (annotationContent.isEmpty() ? illegibleTextMessage : annotationContent);
+            String markingContent = annotationContent.isEmpty() ? illegibleTextMessage : annotationContent;
             this.marking.set(removePunctuationMark(markingContent));
         } else {
             String content = annotation.getContent();
@@ -88,19 +88,19 @@ public StringProperty authorProperty() {
     @Override
     public String toString() {
         if (annotation.hasLinkedAnnotation() && this.getContent().isEmpty()) {
-            if (FileAnnotationType.UNDERLINE.equals(annotation.getAnnotationType())) {
+            if (FileAnnotationType.UNDERLINE == annotation.getAnnotationType()) {
                 return Localization.lang("Empty Underline");
             }
-            if (FileAnnotationType.HIGHLIGHT.equals(annotation.getAnnotationType())) {
+            if (FileAnnotationType.HIGHLIGHT == annotation.getAnnotationType()) {
                 return Localization.lang("Empty Highlight");
             }
             return Localization.lang("Empty Marking");
         }
 
-        if (FileAnnotationType.UNDERLINE.equals(annotation.getAnnotationType())) {
+        if (FileAnnotationType.UNDERLINE == annotation.getAnnotationType()) {
             return Localization.lang("Underline") + ": " + this.getContent();
         }
-        if (FileAnnotationType.HIGHLIGHT.equals(annotation.getAnnotationType())) {
+        if (FileAnnotationType.HIGHLIGHT == annotation.getAnnotationType()) {
             return Localization.lang("Highlight") + ": " + this.getContent();
         }
 
diff --git a/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FulltextSearchResultsTab.java b/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FulltextSearchResultsTab.java
index 8fe5c146b5b..9732e15b3a4 100644
--- a/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FulltextSearchResultsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FulltextSearchResultsTab.java
@@ -38,6 +38,7 @@
 
 public class FulltextSearchResultsTab extends EntryEditorTab {
 
+    public static final String NAME = "Search results";
     private static final Logger LOGGER = LoggerFactory.getLogger(FulltextSearchResultsTab.class);
 
     private final StateManager stateManager;
@@ -98,7 +99,7 @@ protected void bindToEntry(BibEntry entry) {
             // Iterate through pages (within file) with search hits
             for (SearchResult searchResult : resultsForPath.getValue()) {
                 for (String resultTextHtml : searchResult.getContentResultStringsHtml()) {
-                    content.getChildren().addAll(TooltipTextUtil.createTextsFromHtml(resultTextHtml.replaceAll("</b> <b>", " ")));
+                    content.getChildren().addAll(TooltipTextUtil.createTextsFromHtml(resultTextHtml.replace("</b> <b>", " ")));
                     content.getChildren().addAll(new Text(System.lineSeparator()), lineSeparator(0.8), createPageLink(searchResult.getPageNumber()));
                 }
                 if (!searchResult.getAnnotationsResultStringsHtml().isEmpty()) {
@@ -107,7 +108,7 @@ protected void bindToEntry(BibEntry entry) {
                     content.getChildren().add(annotationsText);
                 }
                 for (String resultTextHtml : searchResult.getAnnotationsResultStringsHtml()) {
-                    content.getChildren().addAll(TooltipTextUtil.createTextsFromHtml(resultTextHtml.replaceAll("</b> <b>", " ")));
+                    content.getChildren().addAll(TooltipTextUtil.createTextsFromHtml(resultTextHtml.replace("</b> <b>", " ")));
                     content.getChildren().addAll(new Text(System.lineSeparator()), lineSeparator(0.8), createPageLink(searchResult.getPageNumber()));
                 }
             }
@@ -126,7 +127,7 @@ private Text createFileLink(String pathToFile) {
         fileLinkText.setOnMouseClicked(event -> {
             if (MouseButton.PRIMARY.equals(event.getButton())) {
                 try {
-                    JabRefDesktop.openBrowser(resolvedPath.toUri());
+                    JabRefDesktop.openBrowser(resolvedPath.toUri(), preferencesService.getFilePreferences());
                 } catch (IOException e) {
                     LOGGER.error("Cannot open {}.", resolvedPath.toString(), e);
                 }
diff --git a/src/main/java/org/jabref/gui/errorconsole/ErrorConsoleView.java b/src/main/java/org/jabref/gui/errorconsole/ErrorConsoleView.java
index e29940c7717..daf9fb35fe9 100644
--- a/src/main/java/org/jabref/gui/errorconsole/ErrorConsoleView.java
+++ b/src/main/java/org/jabref/gui/errorconsole/ErrorConsoleView.java
@@ -26,6 +26,7 @@
 import org.jabref.gui.util.ControlHelper;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.BuildInfo;
+import org.jabref.preferences.PreferencesService;
 
 import com.airhacks.afterburner.views.ViewLoader;
 import jakarta.inject.Inject;
@@ -41,6 +42,7 @@ public class ErrorConsoleView extends BaseDialog<Void> {
     @FXML private Label descriptionLabel;
 
     @Inject private DialogService dialogService;
+    @Inject private PreferencesService preferencesService;
     @Inject private ClipBoardManager clipBoardManager;
     @Inject private BuildInfo buildInfo;
     @Inject private KeyBindingRepository keyBindingRepository;
@@ -63,7 +65,7 @@ public ErrorConsoleView() {
 
     @FXML
     private void initialize() {
-        viewModel = new ErrorConsoleViewModel(dialogService, clipBoardManager, buildInfo);
+        viewModel = new ErrorConsoleViewModel(dialogService, preferencesService, clipBoardManager, buildInfo);
         messagesListView.setCellFactory(createCellFactory());
         messagesListView.itemsProperty().bind(viewModel.allMessagesDataProperty());
         messagesListView.scrollTo(viewModel.allMessagesDataProperty().getSize() - 1);
diff --git a/src/main/java/org/jabref/gui/errorconsole/ErrorConsoleViewModel.java b/src/main/java/org/jabref/gui/errorconsole/ErrorConsoleViewModel.java
index 959224f3a5d..5f346cdcd4e 100644
--- a/src/main/java/org/jabref/gui/errorconsole/ErrorConsoleViewModel.java
+++ b/src/main/java/org/jabref/gui/errorconsole/ErrorConsoleViewModel.java
@@ -19,6 +19,7 @@
 import org.jabref.logic.logging.LogMessages;
 import org.jabref.logic.util.BuildInfo;
 import org.jabref.logic.util.OS;
+import org.jabref.preferences.PreferencesService;
 
 import com.tobiasdiez.easybind.EasyBind;
 import org.apache.http.client.utils.URIBuilder;
@@ -30,12 +31,14 @@ public class ErrorConsoleViewModel extends AbstractViewModel {
     private static final Logger LOGGER = LoggerFactory.getLogger(ErrorConsoleViewModel.class);
 
     private final DialogService dialogService;
+    private final PreferencesService preferencesService;
     private final ClipBoardManager clipBoardManager;
     private final BuildInfo buildInfo;
     private final ListProperty<LogEventViewModel> allMessagesData;
 
-    public ErrorConsoleViewModel(DialogService dialogService, ClipBoardManager clipBoardManager, BuildInfo buildInfo) {
+    public ErrorConsoleViewModel(DialogService dialogService, PreferencesService preferencesService, ClipBoardManager clipBoardManager, BuildInfo buildInfo) {
         this.dialogService = Objects.requireNonNull(dialogService);
+        this.preferencesService = Objects.requireNonNull(preferencesService);
         this.clipBoardManager = Objects.requireNonNull(clipBoardManager);
         this.buildInfo = Objects.requireNonNull(buildInfo);
         ObservableList<LogEventViewModel> eventViewModels = EasyBind.map(BindingsHelper.forUI(LogMessages.getInstance().getMessages()), LogEventViewModel::new);
@@ -47,7 +50,7 @@ public ListProperty<LogEventViewModel> allMessagesDataProperty() {
     }
 
     /**
-     * Concatenates the formatted message of the given {@link LogEvent}s by using the a new line separator.
+     * Concatenates the formatted message of the given {@link LogEventViewModel}s by using a new line separator.
      *
      * @return all messages as String
      */
@@ -65,7 +68,7 @@ public void copyLog() {
     }
 
     /**
-     * Copies the given list of {@link LogEvent}s to the clipboard.
+     * Copies the given list of {@link LogEventViewModel}s to the clipboard.
      */
     public void copyLog(List<LogEventViewModel> messages) {
         if (messages.isEmpty()) {
@@ -110,7 +113,7 @@ public void reportIssue() {
                     .setScheme("https").setHost("github.com")
                     .setPath("/JabRef/jabref/issues/new")
                     .setParameter("body", issueBody);
-            JabRefDesktop.openBrowser(uriBuilder.build().toString());
+            JabRefDesktop.openBrowser(uriBuilder.build().toString(), preferencesService.getFilePreferences());
         } catch (IOException | URISyntaxException e) {
             LOGGER.error("Problem opening url", e);
         }
diff --git a/src/main/java/org/jabref/gui/errorconsole/LogEventViewModel.java b/src/main/java/org/jabref/gui/errorconsole/LogEventViewModel.java
index 0694c080b14..24152e82f01 100644
--- a/src/main/java/org/jabref/gui/errorconsole/LogEventViewModel.java
+++ b/src/main/java/org/jabref/gui/errorconsole/LogEventViewModel.java
@@ -37,12 +37,12 @@ public String getStyleClass() {
     public JabRefIcon getIcon() {
         switch (logEvent.getLevel()) {
             case ERROR:
-                return (IconTheme.JabRefIcons.INTEGRITY_FAIL);
+                return IconTheme.JabRefIcons.INTEGRITY_FAIL;
             case WARN:
-                return (IconTheme.JabRefIcons.INTEGRITY_WARN);
+                return IconTheme.JabRefIcons.INTEGRITY_WARN;
             case INFO:
             default:
-                return (IconTheme.JabRefIcons.INTEGRITY_INFO);
+                return IconTheme.JabRefIcons.INTEGRITY_INFO;
         }
     }
 
diff --git a/src/main/java/org/jabref/gui/exporter/CreateModifyExporterDialogView.java b/src/main/java/org/jabref/gui/exporter/CreateModifyExporterDialogView.java
index d1370c42575..5ad22042ddc 100644
--- a/src/main/java/org/jabref/gui/exporter/CreateModifyExporterDialogView.java
+++ b/src/main/java/org/jabref/gui/exporter/CreateModifyExporterDialogView.java
@@ -7,7 +7,6 @@
 
 import org.jabref.gui.DialogService;
 import org.jabref.gui.util.BaseDialog;
-import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.preferences.PreferencesService;
 
@@ -16,7 +15,6 @@
 
 public class CreateModifyExporterDialogView extends BaseDialog<ExporterViewModel> {
 
-    @Inject private JournalAbbreviationRepository repository;
     private final ExporterViewModel exporter;
     @FXML private TextField name;
     @FXML private TextField fileName;
@@ -45,7 +43,7 @@ public CreateModifyExporterDialogView(ExporterViewModel exporter) {
 
     @FXML
     private void initialize() {
-        viewModel = new CreateModifyExporterDialogViewModel(exporter, dialogService, preferences, repository);
+        viewModel = new CreateModifyExporterDialogViewModel(exporter, dialogService, preferences);
         name.textProperty().bindBidirectional(viewModel.getName());
         fileName.textProperty().bindBidirectional(viewModel.getLayoutFileName());
         extension.textProperty().bindBidirectional(viewModel.getExtension());
diff --git a/src/main/java/org/jabref/gui/exporter/CreateModifyExporterDialogViewModel.java b/src/main/java/org/jabref/gui/exporter/CreateModifyExporterDialogViewModel.java
index ae8ee9b7234..78c808dad3c 100644
--- a/src/main/java/org/jabref/gui/exporter/CreateModifyExporterDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/exporter/CreateModifyExporterDialogViewModel.java
@@ -8,11 +8,8 @@
 import org.jabref.gui.AbstractViewModel;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.util.FileDialogConfiguration;
-import org.jabref.logic.exporter.SavePreferences;
 import org.jabref.logic.exporter.TemplateExporter;
-import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.logic.layout.LayoutFormatterPreferences;
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.preferences.PreferencesService;
 
@@ -37,13 +34,11 @@ public class CreateModifyExporterDialogViewModel extends AbstractViewModel {
     private final StringProperty layoutFile = new SimpleStringProperty("");
     private final StringProperty extension = new SimpleStringProperty("");
 
-    private final JournalAbbreviationRepository repository;
-
-    public CreateModifyExporterDialogViewModel(ExporterViewModel exporter, DialogService dialogService, PreferencesService preferences,
-                                               JournalAbbreviationRepository repository) {
+    public CreateModifyExporterDialogViewModel(ExporterViewModel exporter,
+                                               DialogService dialogService,
+                                               PreferencesService preferences) {
         this.dialogService = dialogService;
         this.preferences = preferences;
-        this.repository = repository;
 
         // Set text of each of the boxes
         if (exporter != null) {
@@ -56,7 +51,7 @@ public CreateModifyExporterDialogViewModel(ExporterViewModel exporter, DialogSer
     public ExporterViewModel saveExporter() {
         Path layoutFileDir = Path.of(layoutFile.get()).getParent();
         if (layoutFileDir != null) {
-            preferences.getImportExportPreferences().setExportWorkingDirectory(layoutFileDir);
+            preferences.getExportPreferences().setExportWorkingDirectory(layoutFileDir);
         }
 
         // Check that there are no empty strings.
@@ -67,10 +62,12 @@ public ExporterViewModel saveExporter() {
         }
 
         // Create a new exporter to be returned to ExportCustomizationDialogViewModel, which requested it
-        LayoutFormatterPreferences layoutPreferences = preferences.getLayoutFormatterPreferences(repository);
-        SavePreferences savePreferences = preferences.getSavePreferencesForExport();
-        TemplateExporter format = new TemplateExporter(name.get(), layoutFile.get(), extension.get(),
-                layoutPreferences, savePreferences);
+        TemplateExporter format = new TemplateExporter(
+                name.get(),
+                layoutFile.get(),
+                extension.get(),
+                preferences.getLayoutFormatterPreferences(),
+                preferences.getSelfContainedExportConfiguration().getSelfContainedSaveOrder());
         format.setCustomExport(true);
         return new ExporterViewModel(format);
     }
@@ -79,7 +76,7 @@ public void browse() {
         FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
                 .addExtensionFilter(Localization.lang("Custom layout file"), StandardFileType.LAYOUT)
                 .withDefaultExtension(Localization.lang("Custom layout file"), StandardFileType.LAYOUT)
-                .withInitialDirectory(preferences.getImportExportPreferences().getExportWorkingDirectory()).build();
+                .withInitialDirectory(preferences.getExportPreferences().getExportWorkingDirectory()).build();
         dialogService.showFileOpenDialog(fileDialogConfiguration).ifPresent(f -> layoutFile.set(f.toAbsolutePath().toString()));
     }
 
diff --git a/src/main/java/org/jabref/gui/exporter/ExportCommand.java b/src/main/java/org/jabref/gui/exporter/ExportCommand.java
index c5479d8c2cd..96eebc80160 100644
--- a/src/main/java/org/jabref/gui/exporter/ExportCommand.java
+++ b/src/main/java/org/jabref/gui/exporter/ExportCommand.java
@@ -70,16 +70,15 @@ public void execute() {
         // Get list of exporters and sort before adding to file dialog
         ExporterFactory exporterFactory = ExporterFactory.create(
                 preferences,
-                Globals.entryTypesManager,
-                Globals.journalAbbreviationRepository);
+                Globals.entryTypesManager);
         List<Exporter> exporters = exporterFactory.getExporters().stream()
                                                   .sorted(Comparator.comparing(Exporter::getName))
                                                   .collect(Collectors.toList());
 
         FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
                 .addExtensionFilter(FileFilterConverter.exporterToExtensionFilter(exporters))
-                .withDefaultExtension(preferences.getImportExportPreferences().getLastExportExtension())
-                .withInitialDirectory(preferences.getImportExportPreferences().getExportWorkingDirectory())
+                .withDefaultExtension(preferences.getExportPreferences().getLastExportExtension())
+                .withInitialDirectory(preferences.getExportPreferences().getExportWorkingDirectory())
                 .build();
         dialogService.showFileSaveDialog(fileDialogConfiguration)
                      .ifPresent(path -> export(path, fileDialogConfiguration.getSelectedExtensionFilter(), exporters));
@@ -110,8 +109,8 @@ private void export(Path file, FileChooser.ExtensionFilter selectedExtensionFilt
 
         // Make sure we remember which filter was used, to set
         // the default for next time:
-        preferences.getImportExportPreferences().setLastExportExtension(format.getName());
-        preferences.getImportExportPreferences().setExportWorkingDirectory(file.getParent());
+        preferences.getExportPreferences().setLastExportExtension(format.getName());
+        preferences.getExportPreferences().setExportWorkingDirectory(file.getParent());
 
         final List<BibEntry> finEntries = entries;
 
@@ -120,7 +119,8 @@ private void export(Path file, FileChooser.ExtensionFilter selectedExtensionFilt
                     format.export(stateManager.getActiveDatabase().get(),
                             file,
                             finEntries,
-                            fileDirForDatabase);
+                            fileDirForDatabase,
+                            Globals.journalAbbreviationRepository);
                     return null; // can not use BackgroundTask.wrap(Runnable) because Runnable.run() can't throw Exceptions
                 })
                 .onSuccess(save -> {
@@ -130,7 +130,7 @@ private void export(Path file, FileChooser.ExtensionFilter selectedExtensionFilt
                             Localization.lang("Export operation finished successfully."),
                             List.of(new Action(Localization.lang("Reveal in File Explorer"), event -> {
                                 try {
-                                    JabRefDesktop.openFolderAndSelectFile(file, preferences, dialogService);
+                                    JabRefDesktop.openFolderAndSelectFile(file, preferences.getExternalApplicationsPreferences(), dialogService);
                                 } catch (IOException e) {
                                     LOGGER.error("Could not open export folder.", e);
                                 }
diff --git a/src/main/java/org/jabref/gui/exporter/ExportToClipboardAction.java b/src/main/java/org/jabref/gui/exporter/ExportToClipboardAction.java
index 79a044aef28..c0d2e2c7135 100644
--- a/src/main/java/org/jabref/gui/exporter/ExportToClipboardAction.java
+++ b/src/main/java/org/jabref/gui/exporter/ExportToClipboardAction.java
@@ -75,8 +75,7 @@ public void execute() {
 
         ExporterFactory exporterFactory = ExporterFactory.create(
                 preferences,
-                Globals.entryTypesManager,
-                Globals.journalAbbreviationRepository);
+                Globals.entryTypesManager);
         List<Exporter> exporters = exporterFactory.getExporters().stream()
                                                   .sorted(Comparator.comparing(Exporter::getName))
                                                   .filter(exporter -> SUPPORTED_FILETYPES.contains(exporter.getFileType()))
@@ -84,7 +83,7 @@ public void execute() {
 
         // Find default choice, if any
         Exporter defaultChoice = exporters.stream()
-                                          .filter(exporter -> exporter.getName().equals(preferences.getImportExportPreferences().getLastExportExtension()))
+                                          .filter(exporter -> exporter.getName().equals(preferences.getExportPreferences().getLastExportExtension()))
                                           .findAny()
                                           .orElse(null);
 
@@ -107,7 +106,7 @@ private ExportResult exportToClipboard(Exporter exporter) throws Exception {
                                                     .orElse(List.of(preferences.getFilePreferences().getWorkingDirectory()));
 
         // Add chosen export type to last used preference, to become default
-        preferences.getImportExportPreferences().setLastExportExtension(exporter.getName());
+        preferences.getExportPreferences().setLastExportExtension(exporter.getName());
 
         Path tmp = null;
         try {
@@ -118,7 +117,7 @@ private ExportResult exportToClipboard(Exporter exporter) throws Exception {
             entries.addAll(stateManager.getSelectedEntries());
 
             // Write to file:
-            exporter.export(stateManager.getActiveDatabase().get(), tmp, entries, fileDirForDatabase);
+            exporter.export(stateManager.getActiveDatabase().get(), tmp, entries, fileDirForDatabase, Globals.journalAbbreviationRepository);
             // Read the file and put the contents on the clipboard:
 
             return new ExportResult(Files.readString(tmp), exporter.getFileType());
diff --git a/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java b/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java
index 84bf9346e23..3d451540b2e 100644
--- a/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java
+++ b/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java
@@ -6,6 +6,7 @@
 import java.nio.charset.UnsupportedCharsetException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -13,21 +14,25 @@
 import javafx.scene.control.ButtonBar;
 import javafx.scene.control.ButtonType;
 import javafx.scene.control.DialogPane;
+import javafx.scene.control.TableColumn;
 import javafx.scene.layout.VBox;
 import javafx.scene.text.Text;
 
 import org.jabref.gui.DialogService;
 import org.jabref.gui.JabRefFrame;
 import org.jabref.gui.LibraryTab;
+import org.jabref.gui.autosaveandbackup.AutosaveManager;
+import org.jabref.gui.autosaveandbackup.BackupManager;
+import org.jabref.gui.maintable.BibEntryTableViewModel;
+import org.jabref.gui.maintable.columns.MainTableColumn;
 import org.jabref.gui.util.BackgroundTask;
 import org.jabref.gui.util.FileDialogConfiguration;
-import org.jabref.logic.autosaveandbackup.AutosaveManager;
-import org.jabref.logic.autosaveandbackup.BackupManager;
 import org.jabref.logic.exporter.AtomicFileWriter;
+import org.jabref.logic.exporter.BibDatabaseWriter;
 import org.jabref.logic.exporter.BibWriter;
 import org.jabref.logic.exporter.BibtexDatabaseWriter;
 import org.jabref.logic.exporter.SaveException;
-import org.jabref.logic.exporter.SavePreferences;
+import org.jabref.logic.exporter.SelfContainedSaveConfiguration;
 import org.jabref.logic.l10n.Encodings;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.shared.DatabaseLocation;
@@ -36,7 +41,8 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.database.event.ChangePropagation;
 import org.jabref.model.entry.BibEntryTypesManager;
-import org.jabref.preferences.GeneralPreferences;
+import org.jabref.model.metadata.SaveOrder;
+import org.jabref.model.metadata.SelfContainedSaveOrder;
 import org.jabref.preferences.PreferencesService;
 
 import org.slf4j.Logger;
@@ -79,7 +85,7 @@ public boolean save(SaveDatabaseMode mode) {
     }
 
     /**
-     * Asks the user for the path and saves afterwards
+     * Asks the user for the path and saves afterward
      */
     public void saveAs() {
         askForSavePath().ifPresent(this::saveAs);
@@ -89,10 +95,31 @@ public boolean saveAs(Path file) {
         return this.saveAs(file, SaveDatabaseMode.NORMAL);
     }
 
+    private SelfContainedSaveOrder getSaveOrder() {
+        return libraryTab.getBibDatabaseContext()
+                .getMetaData().getSaveOrder()
+                .map(so -> {
+                    if (so.getOrderType() == SaveOrder.OrderType.TABLE) {
+                        // We need to "flatten out" SaveOrder.OrderType.TABLE as BibWriter does not have access to preferences
+                        List<TableColumn<BibEntryTableViewModel, ?>> sortOrder = libraryTab.getMainTable().getSortOrder();
+                        return new SelfContainedSaveOrder(
+                                SaveOrder.OrderType.SPECIFIED,
+                                sortOrder.stream()
+                                         .filter(col -> col instanceof MainTableColumn<?>)
+                                         .map(column -> ((MainTableColumn<?>) column).getModel())
+                                         .flatMap(model -> model.getSortCriteria().stream())
+                                         .toList());
+                    } else {
+                        return SelfContainedSaveOrder.of(so);
+                    }
+                })
+                .orElse(SaveOrder.getDefaultSaveOrder());
+    }
+
     public void saveSelectedAsPlain() {
         askForSavePath().ifPresent(path -> {
             try {
-                saveDatabase(path, true, StandardCharsets.UTF_8, SavePreferences.DatabaseSaveType.PLAIN_BIBTEX);
+                saveDatabase(path, true, StandardCharsets.UTF_8, BibDatabaseWriter.SaveType.PLAIN_BIBTEX, getSaveOrder());
                 frame.getFileHistory().newFile(path);
                 dialogService.notify(Localization.lang("Saved selected to '%0'.", path.toString()));
             } catch (SaveException ex) {
@@ -116,7 +143,7 @@ boolean saveAs(Path file, SaveDatabaseMode mode) {
             final Path oldFile = databasePath.get();
             context.setDatabasePath(oldFile);
             AutosaveManager.shutdown(context);
-            BackupManager.shutdown(context);
+            BackupManager.shutdown(context, this.preferences.getFilePreferences().getBackupDirectory(), preferences.getFilePreferences().shouldCreateBackup());
         }
 
         // Set new location
@@ -209,8 +236,7 @@ private boolean save(Path targetPath, SaveDatabaseMode mode) {
             // Make sure to remember which encoding we used
             libraryTab.getBibDatabaseContext().getMetaData().setEncoding(encoding, ChangePropagation.DO_NOT_POST_EVENT);
 
-            // Save the database
-            boolean success = saveDatabase(targetPath, false, encoding, SavePreferences.DatabaseSaveType.ALL);
+            boolean success = saveDatabase(targetPath, false, encoding, BibDatabaseWriter.SaveType.WITH_JABREF_META_DATA, getSaveOrder());
 
             if (success) {
                 libraryTab.getUndoManager().markUnchanged();
@@ -228,17 +254,20 @@ private boolean save(Path targetPath, SaveDatabaseMode mode) {
         }
     }
 
-    private boolean saveDatabase(Path file, boolean selectedOnly, Charset encoding, SavePreferences.DatabaseSaveType saveType) throws SaveException {
+    private boolean saveDatabase(Path file, boolean selectedOnly, Charset encoding, BibDatabaseWriter.SaveType saveType, SelfContainedSaveOrder saveOrder) 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);
+        SelfContainedSaveConfiguration saveConfiguration
+                = new SelfContainedSaveConfiguration(saveOrder, false, saveType, preferences.getLibraryPreferences().shouldAlwaysReformatOnSave());
         BibDatabaseContext bibDatabaseContext = libraryTab.getBibDatabaseContext();
         synchronized (bibDatabaseContext) {
-            try (AtomicFileWriter fileWriter = new AtomicFileWriter(file, encoding, savePreferences.shouldMakeBackup())) {
+            try (AtomicFileWriter fileWriter = new AtomicFileWriter(file, encoding, saveConfiguration.shouldMakeBackup())) {
                 BibWriter bibWriter = new BibWriter(fileWriter, bibDatabaseContext.getDatabase().getNewLineSeparator());
-                BibtexDatabaseWriter databaseWriter = new BibtexDatabaseWriter(bibWriter, generalPreferences, savePreferences, entryTypesManager);
+                BibtexDatabaseWriter databaseWriter = new BibtexDatabaseWriter(
+                        bibWriter,
+                        saveConfiguration,
+                        preferences.getFieldPreferences(),
+                        preferences.getCitationKeyPatternPreferences(),
+                        entryTypesManager);
 
                 if (selectedOnly) {
                     databaseWriter.savePartOfDatabase(bibDatabaseContext, libraryTab.getSelectedEntries());
@@ -249,7 +278,7 @@ private boolean saveDatabase(Path file, boolean selectedOnly, Charset encoding,
                 libraryTab.registerUndoableChanges(databaseWriter.getSaveActionsFieldChanges());
 
                 if (fileWriter.hasEncodingProblems()) {
-                    saveWithDifferentEncoding(file, selectedOnly, encoding, fileWriter.getEncodingProblems(), saveType);
+                    saveWithDifferentEncoding(file, selectedOnly, encoding, fileWriter.getEncodingProblems(), saveType, saveOrder);
                 }
             } catch (UnsupportedCharsetException ex) {
                 throw new SaveException(Localization.lang("Character encoding '%0' is not supported.", encoding.displayName()), ex);
@@ -260,7 +289,7 @@ private boolean saveDatabase(Path file, boolean selectedOnly, Charset encoding,
         }
     }
 
-    private void saveWithDifferentEncoding(Path file, boolean selectedOnly, Charset encoding, Set<Character> encodingProblems, SavePreferences.DatabaseSaveType saveType) throws SaveException {
+    private void saveWithDifferentEncoding(Path file, boolean selectedOnly, Charset encoding, Set<Character> encodingProblems, BibDatabaseWriter.SaveType saveType, SelfContainedSaveOrder saveOrder) throws SaveException {
         DialogPane pane = new DialogPane();
         VBox vbox = new VBox();
         vbox.getChildren().addAll(
@@ -282,7 +311,7 @@ private void saveWithDifferentEncoding(Path file, boolean selectedOnly, Charset
                 // Make sure to remember which encoding we used.
                 libraryTab.getBibDatabaseContext().getMetaData().setEncoding(newEncoding.get(), ChangePropagation.DO_NOT_POST_EVENT);
 
-                saveDatabase(file, selectedOnly, newEncoding.get(), saveType);
+                saveDatabase(file, selectedOnly, newEncoding.get(), saveType, saveOrder);
             }
         }
     }
diff --git a/src/main/java/org/jabref/gui/exporter/WriteMetadataToPdfAction.java b/src/main/java/org/jabref/gui/exporter/WriteMetadataToPdfAction.java
index 34d39b2c8d4..6e579b4965a 100644
--- a/src/main/java/org/jabref/gui/exporter/WriteMetadataToPdfAction.java
+++ b/src/main/java/org/jabref/gui/exporter/WriteMetadataToPdfAction.java
@@ -25,8 +25,9 @@
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.gui.util.BackgroundTask;
 import org.jabref.gui.util.TaskExecutor;
-import org.jabref.logic.bibtex.FieldWriterPreferences;
+import org.jabref.logic.bibtex.FieldPreferences;
 import org.jabref.logic.exporter.EmbeddedBibFilePdfExporter;
+import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.io.FileUtil;
 import org.jabref.logic.xmp.XmpPreferences;
@@ -43,11 +44,12 @@ public class WriteMetadataToPdfAction extends SimpleCommand {
 
     private final StateManager stateManager;
     private final BibEntryTypesManager entryTypesManager;
-    private final FieldWriterPreferences fieldWriterPreferences;
+    private final FieldPreferences fieldPreferences;
     private final DialogService dialogService;
     private final TaskExecutor taskExecutor;
     private final FilePreferences filePreferences;
     private final XmpPreferences xmpPreferences;
+    private final JournalAbbreviationRepository abbreviationRepository;
 
     private OptionsDialog optionsDialog;
 
@@ -59,14 +61,22 @@ public class WriteMetadataToPdfAction extends SimpleCommand {
     private int entriesChanged;
     private int errors;
 
-    public WriteMetadataToPdfAction(StateManager stateManager, BibEntryTypesManager entryTypesManager, FieldWriterPreferences fieldWriterPreferences, DialogService dialogService, TaskExecutor taskExecutor, FilePreferences filePreferences, XmpPreferences xmpPreferences) {
+    public WriteMetadataToPdfAction(StateManager stateManager,
+                                    BibEntryTypesManager entryTypesManager,
+                                    FieldPreferences fieldPreferences,
+                                    DialogService dialogService,
+                                    TaskExecutor taskExecutor,
+                                    FilePreferences filePreferences,
+                                    XmpPreferences xmpPreferences,
+                                    JournalAbbreviationRepository abbreviationRepository) {
         this.stateManager = stateManager;
         this.entryTypesManager = entryTypesManager;
-        this.fieldWriterPreferences = fieldWriterPreferences;
+        this.fieldPreferences = fieldPreferences;
         this.dialogService = dialogService;
         this.taskExecutor = taskExecutor;
         this.filePreferences = filePreferences;
         this.xmpPreferences = xmpPreferences;
+        this.abbreviationRepository = abbreviationRepository;
 
         this.executable.bind(needsDatabase(stateManager));
     }
@@ -195,8 +205,8 @@ private void writeMetadata() {
     synchronized private void writeMetadataToFile(Path file, BibEntry entry, BibDatabaseContext databaseContext, BibDatabase database) throws Exception {
         new XmpUtilWriter(xmpPreferences).writeXmp(file, entry, database);
 
-        EmbeddedBibFilePdfExporter embeddedBibExporter = new EmbeddedBibFilePdfExporter(databaseContext.getMode(), entryTypesManager, fieldWriterPreferences);
-        embeddedBibExporter.exportToFileByPath(databaseContext, database, filePreferences, file);
+        EmbeddedBibFilePdfExporter embeddedBibExporter = new EmbeddedBibFilePdfExporter(databaseContext.getMode(), entryTypesManager, fieldPreferences);
+        embeddedBibExporter.exportToFileByPath(databaseContext, filePreferences, file, abbreviationRepository);
     }
 
     class OptionsDialog extends FXDialog {
diff --git a/src/main/java/org/jabref/gui/externalfiles/DownloadFullTextAction.java b/src/main/java/org/jabref/gui/externalfiles/DownloadFullTextAction.java
index be8b74ede44..df950b7e893 100644
--- a/src/main/java/org/jabref/gui/externalfiles/DownloadFullTextAction.java
+++ b/src/main/java/org/jabref/gui/externalfiles/DownloadFullTextAction.java
@@ -113,7 +113,7 @@ private void downloadFullTexts(Map<BibEntry, Optional<URL>> downloads, BibDataba
                 Optional<Path> dir = databaseContext.getFirstExistingFileDir(preferences.getFilePreferences());
                 if (dir.isEmpty()) {
                     dialogService.showErrorDialogAndWait(Localization.lang("Directory not found"),
-                            Localization.lang("Main file directory not set. Check the preferences (linked files) or the library properties."));
+                            Localization.lang("Main file directory not set. Check the preferences (\"Linked files\") or modify the library properties (\"Override default file directories\")."));
                     return;
                 }
 
diff --git a/src/main/java/org/jabref/gui/externalfiles/ExternalFilesEntryLinker.java b/src/main/java/org/jabref/gui/externalfiles/ExternalFilesEntryLinker.java
index 7f9591c60f4..57df1e395c8 100644
--- a/src/main/java/org/jabref/gui/externalfiles/ExternalFilesEntryLinker.java
+++ b/src/main/java/org/jabref/gui/externalfiles/ExternalFilesEntryLinker.java
@@ -1,18 +1,23 @@
 package org.jabref.gui.externalfiles;
 
 import java.io.IOException;
+import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 
+import org.jabref.gui.DialogService;
 import org.jabref.gui.externalfiletype.ExternalFileType;
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.externalfiletype.UnknownExternalFileType;
 import org.jabref.logic.cleanup.MoveFilesCleanup;
 import org.jabref.logic.cleanup.RenamePdfCleanup;
+import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.pdf.search.indexing.IndexingTaskManager;
 import org.jabref.logic.pdf.search.indexing.PdfIndexer;
+import org.jabref.logic.util.io.FileNameCleaner;
 import org.jabref.logic.util.io.FileUtil;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
@@ -30,12 +35,14 @@ public class ExternalFilesEntryLinker {
     private final BibDatabaseContext bibDatabaseContext;
     private final MoveFilesCleanup moveFilesCleanup;
     private final RenamePdfCleanup renameFilesCleanup;
+    private final DialogService dialogService;
 
-    public ExternalFilesEntryLinker(FilePreferences filePreferences, BibDatabaseContext bibDatabaseContext) {
+    public ExternalFilesEntryLinker(FilePreferences filePreferences, BibDatabaseContext bibDatabaseContext, DialogService dialogService) {
         this.filePreferences = filePreferences;
         this.bibDatabaseContext = bibDatabaseContext;
         this.moveFilesCleanup = new MoveFilesCleanup(bibDatabaseContext, filePreferences);
         this.renameFilesCleanup = new RenamePdfCleanup(false, bibDatabaseContext, filePreferences);
+        this.dialogService = dialogService;
     }
 
     public Optional<Path> copyFileToFileDir(Path file) {
@@ -58,7 +65,8 @@ public void moveLinkedFilesToFileDir(BibEntry entry) {
     }
 
     public void addFilesToEntry(BibEntry entry, List<Path> files) {
-        for (Path file : files) {
+        List<Path> validFiles = getValidFileNames(files);
+        for (Path file : validFiles) {
             FileUtil.getFileExtension(file).ifPresent(ext -> {
                 ExternalFileType type = ExternalFileTypes.getExternalFileTypeByExt(ext, filePreferences)
                                                          .orElse(new UnknownExternalFileType(ext));
@@ -69,7 +77,7 @@ public void addFilesToEntry(BibEntry entry, List<Path> files) {
         }
     }
 
-    public void moveFilesToFileDirAndAddToEntry(BibEntry entry, List<Path> files, IndexingTaskManager indexingTaskManager) {
+    public void moveFilesToFileDirRenameAndAddToEntry(BibEntry entry, List<Path> files, IndexingTaskManager indexingTaskManager) {
         try (AutoCloseable blocker = indexingTaskManager.blockNewTasks()) {
             addFilesToEntry(entry, files);
             moveLinkedFilesToFileDir(entry);
@@ -102,4 +110,32 @@ public void copyFilesToFileDirAndAddToEntry(BibEntry entry, List<Path> files, In
             LOGGER.error("Could not access Fulltext-Index", e);
         }
     }
+
+    private List<Path> getValidFileNames(List<Path> filesToAdd) {
+        List<Path> validFileNames = new ArrayList<>();
+
+        for (Path fileToAdd : filesToAdd) {
+            if (FileUtil.detectBadFileName(fileToAdd.toString())) {
+                String newFilename = FileNameCleaner.cleanFileName(fileToAdd.getFileName().toString());
+
+                boolean correctButtonPressed = dialogService.showConfirmationDialogAndWait(Localization.lang("File \"%0\" cannot be added!", fileToAdd.getFileName()),
+                        Localization.lang("Illegal characters in the file name detected.\nFile will be renamed to \"%0\" and added.", newFilename),
+                        Localization.lang("Rename and add"));
+
+                if (correctButtonPressed) {
+                    Path correctPath = fileToAdd.resolveSibling(newFilename);
+                    try {
+                        Files.move(fileToAdd, correctPath);
+                        validFileNames.add(correctPath);
+                    } catch (IOException ex) {
+                        LOGGER.error("Error moving file", ex);
+                        dialogService.showErrorDialogAndWait(ex);
+                    }
+                }
+            } else {
+                validFileNames.add(fileToAdd);
+            }
+        }
+        return validFileNames;
+    }
 }
diff --git a/src/main/java/org/jabref/gui/externalfiles/GitIgnoreFileFilter.java b/src/main/java/org/jabref/gui/externalfiles/GitIgnoreFileFilter.java
index 64f01de977b..e396c4f883a 100644
--- a/src/main/java/org/jabref/gui/externalfiles/GitIgnoreFileFilter.java
+++ b/src/main/java/org/jabref/gui/externalfiles/GitIgnoreFileFilter.java
@@ -37,7 +37,7 @@ public GitIgnoreFileFilter(Path path) {
             Path gitIgnore = currentPath.resolve(".gitignore");
             try {
                 Set<PathMatcher> plainGitIgnorePatternsFromGitIgnoreFile = Files.readAllLines(gitIgnore).stream()
-                                                                                .map(line -> line.trim())
+                                                                                .map(String::trim)
                                                                                 .filter(not(String::isEmpty))
                                                                                 .filter(line -> !line.startsWith("#"))
                                                                                 // convert to Java syntax for Glob patterns
diff --git a/src/main/java/org/jabref/gui/externalfiles/ImportHandler.java b/src/main/java/org/jabref/gui/externalfiles/ImportHandler.java
index cb6eb471137..31edf671e97 100644
--- a/src/main/java/org/jabref/gui/externalfiles/ImportHandler.java
+++ b/src/main/java/org/jabref/gui/externalfiles/ImportHandler.java
@@ -33,6 +33,7 @@
 import org.jabref.logic.importer.ParseException;
 import org.jabref.logic.importer.fetcher.ArXivFetcher;
 import org.jabref.logic.importer.fetcher.DoiFetcher;
+import org.jabref.logic.importer.fetcher.isbntobibtex.IsbnFetcher;
 import org.jabref.logic.importer.fileformat.BibtexParser;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.UpdateField;
@@ -44,6 +45,7 @@
 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.identifier.ISBN;
 import org.jabref.model.groups.GroupEntryChanger;
 import org.jabref.model.groups.GroupTreeNode;
 import org.jabref.model.util.FileUpdateMonitor;
@@ -64,7 +66,6 @@ public class ImportHandler {
     private final UndoManager undoManager;
     private final StateManager stateManager;
     private final DialogService dialogService;
-    private final ImportFormatReader importFormatReader;
     private final TaskExecutor taskExecutor;
 
     public ImportHandler(BibDatabaseContext database,
@@ -73,7 +74,6 @@ public ImportHandler(BibDatabaseContext database,
                          UndoManager undoManager,
                          StateManager stateManager,
                          DialogService dialogService,
-                         ImportFormatReader importFormatReader,
                          TaskExecutor taskExecutor) {
 
         this.bibDatabaseContext = database;
@@ -81,10 +81,9 @@ public ImportHandler(BibDatabaseContext database,
         this.fileUpdateMonitor = fileupdateMonitor;
         this.stateManager = stateManager;
         this.dialogService = dialogService;
-        this.importFormatReader = importFormatReader;
         this.taskExecutor = taskExecutor;
 
-        this.linker = new ExternalFilesEntryLinker(preferencesService.getFilePreferences(), database);
+        this.linker = new ExternalFilesEntryLinker(preferencesService.getFilePreferences(), database, dialogService);
         this.contentImporter = new ExternalFilesContentImporter(preferencesService.getImportFormatPreferences());
         this.undoManager = undoManager;
     }
@@ -289,22 +288,32 @@ public List<BibEntry> handleStringData(String data) throws FetcherException {
             return Collections.emptyList();
         }
 
-        Optional<DOI> doi = DOI.parse(data);
+        Optional<DOI> doi = DOI.findInText(data);
         if (doi.isPresent()) {
             return fetchByDOI(doi.get());
         }
+
         Optional<ArXivIdentifier> arXiv = ArXivIdentifier.parse(data);
         if (arXiv.isPresent()) {
             return fetchByArXiv(arXiv.get());
         }
 
+        Optional<ISBN> isbn = ISBN.parse(data);
+        if (isbn.isPresent()) {
+            return fetchByISBN(isbn.get());
+        }
+
         return tryImportFormats(data);
     }
 
     private List<BibEntry> tryImportFormats(String data) {
         try {
+            ImportFormatReader importFormatReader = new ImportFormatReader(
+                    preferencesService.getImporterPreferences(),
+                    preferencesService.getImportFormatPreferences(),
+                    fileUpdateMonitor);
             UnknownFormatImport unknownFormatImport = importFormatReader.importUnknownFormat(data);
-            return unknownFormatImport.parserResult.getDatabase().getEntries();
+            return unknownFormatImport.parserResult().getDatabase().getEntries();
         } catch (ImportException ex) { // ex is already localized
             dialogService.showErrorDialogAndWait(Localization.lang("Import error"), ex);
             return Collections.emptyList();
@@ -312,7 +321,7 @@ private List<BibEntry> tryImportFormats(String data) {
     }
 
     private List<BibEntry> fetchByDOI(DOI doi) throws FetcherException {
-        LOGGER.info("Found DOI in clipboard");
+        LOGGER.info("Found DOI identifer in clipboard");
         Optional<BibEntry> entry = new DoiFetcher(preferencesService.getImportFormatPreferences()).performSearchById(doi.getDOI());
         return OptionalUtil.toList(entry);
     }
@@ -322,4 +331,10 @@ private List<BibEntry> fetchByArXiv(ArXivIdentifier arXivIdentifier) throws Fetc
         Optional<BibEntry> entry = new ArXivFetcher(preferencesService.getImportFormatPreferences()).performSearchById(arXivIdentifier.getNormalizedWithoutVersion());
         return OptionalUtil.toList(entry);
     }
+
+    private List<BibEntry> fetchByISBN(ISBN isbn) throws FetcherException {
+        LOGGER.info("Found ISBN identifier in clipboard");
+        Optional<BibEntry> entry = new IsbnFetcher(preferencesService.getImportFormatPreferences()).performSearchById(isbn.getNormalized());
+        return OptionalUtil.toList(entry);
+    }
 }
diff --git a/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesDialogView.java b/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesDialogView.java
index 13ddbe4bd34..03d14de7df1 100644
--- a/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesDialogView.java
+++ b/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesDialogView.java
@@ -42,7 +42,6 @@
 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.database.BibDatabaseContext;
 import org.jabref.model.util.FileUpdateMonitor;
@@ -84,7 +83,6 @@ 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;
@@ -112,7 +110,13 @@ public UnlinkedFilesDialogView() {
 
     @FXML
     private void initialize() {
-        viewModel = new UnlinkedFilesDialogViewModel(dialogService, undoManager, fileUpdateMonitor, preferencesService, stateManager, taskExecutor, importFormatReader);
+        viewModel = new UnlinkedFilesDialogViewModel(
+                dialogService,
+                undoManager,
+                fileUpdateMonitor,
+                preferencesService,
+                stateManager,
+                taskExecutor);
 
         this.bibDatabaseContext = stateManager.getActiveDatabase().orElseThrow(() -> new NullPointerException("No active library"));
 
@@ -208,7 +212,7 @@ private void initResultTable() {
 
         colStatus.setCellValueFactory(cellData -> cellData.getValue().icon());
         colStatus.setCellFactory(new ValueTableCellFactory<ImportFilesResultItemViewModel, JabRefIcon>().withGraphic(JabRefIcon::getGraphicNode));
-        importResultTable.setColumnResizePolicy((param) -> true);
+        importResultTable.setColumnResizePolicy(param -> true);
 
         importResultTable.setItems(viewModel.resultTableItems());
     }
diff --git a/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesDialogViewModel.java b/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesDialogViewModel.java
index 082a9390594..dffa9a50b51 100644
--- a/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesDialogViewModel.java
@@ -35,7 +35,6 @@
 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;
@@ -85,8 +84,7 @@ public UnlinkedFilesDialogViewModel(DialogService dialogService,
                                         FileUpdateMonitor fileUpdateMonitor,
                                         PreferencesService preferences,
                                         StateManager stateManager,
-                                        TaskExecutor taskExecutor,
-                                        ImportFormatReader importFormatReader) {
+                                        TaskExecutor taskExecutor) {
         this.preferences = preferences;
         this.dialogService = dialogService;
         this.taskExecutor = taskExecutor;
@@ -98,7 +96,6 @@ public UnlinkedFilesDialogViewModel(DialogService dialogService,
                 undoManager,
                 stateManager,
                 dialogService,
-                importFormatReader,
                 taskExecutor);
 
         this.fileFilterList = FXCollections.observableArrayList(
@@ -176,7 +173,7 @@ public void startExport() {
         List<Path> fileList = checkedFileListProperty.stream()
                                                      .map(item -> item.getValue().getPath())
                                                      .filter(path -> path.toFile().isFile())
-                                                     .collect(Collectors.toList());
+                                                     .toList();
         if (fileList.isEmpty()) {
             LOGGER.warn("There are no valid files checked");
             return;
diff --git a/src/main/java/org/jabref/gui/externalfiletype/CustomExternalFileType.java b/src/main/java/org/jabref/gui/externalfiletype/CustomExternalFileType.java
index 5a4887c6fd3..9a922177f99 100644
--- a/src/main/java/org/jabref/gui/externalfiletype/CustomExternalFileType.java
+++ b/src/main/java/org/jabref/gui/externalfiletype/CustomExternalFileType.java
@@ -178,8 +178,7 @@ public boolean equals(Object object) {
             return true;
         }
 
-        if (object instanceof CustomExternalFileType) {
-            CustomExternalFileType other = (CustomExternalFileType) object;
+        if (object instanceof CustomExternalFileType other) {
             return Objects.equals(name, other.name) && Objects.equals(extension, other.extension) &&
                     Objects.equals(mimeType, other.mimeType) && Objects.equals(openWith, other.openWith) && Objects.equals(iconName, other.iconName);
         }
diff --git a/src/main/java/org/jabref/gui/fieldeditors/EditorTextArea.java b/src/main/java/org/jabref/gui/fieldeditors/EditorTextArea.java
index 92eb4e88817..d57148409be 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/EditorTextArea.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/EditorTextArea.java
@@ -76,7 +76,6 @@ public void paste() {
      */
     @FunctionalInterface
     public interface PasteActionHandler {
-
         void handle();
     }
 }
diff --git a/src/main/java/org/jabref/gui/fieldeditors/FieldEditors.java b/src/main/java/org/jabref/gui/fieldeditors/FieldEditors.java
index 94eeb164af0..1ff28bdbb55 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/FieldEditors.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/FieldEditors.java
@@ -53,7 +53,7 @@ public static FieldEditorFX getForField(final Field field,
                 journalAbbreviationRepository,
                 preferences.getEntryEditorPreferences().shouldAllowIntegerEditionBibtex());
 
-        boolean isMultiLine = FieldFactory.isMultiLineField(field, preferences.getFieldContentParserPreferences().getNonWrappableFields());
+        boolean isMultiLine = FieldFactory.isMultiLineField(field, preferences.getFieldPreferences().getNonWrappableFields());
 
         if (preferences.getTimestampPreferences().getTimestampField().equals(field)) {
             return new DateEditor(field, DateTimeFormatter.ofPattern(preferences.getTimestampPreferences().getTimestampFormat()), suggestionProvider, fieldCheckers, preferences);
@@ -62,13 +62,15 @@ public static FieldEditorFX getForField(final Field field,
         } else if (fieldProperties.contains(FieldProperty.EXTERNAL)) {
             return new UrlEditor(field, dialogService, suggestionProvider, fieldCheckers, preferences);
         } else if (fieldProperties.contains(FieldProperty.JOURNAL_NAME)) {
-            return new JournalEditor(field, journalAbbreviationRepository, preferences, suggestionProvider, fieldCheckers);
+            return new JournalEditor(field, taskExecutor, dialogService, journalAbbreviationRepository, preferences, suggestionProvider, fieldCheckers);
         } else if (fieldProperties.contains(FieldProperty.DOI) || fieldProperties.contains(FieldProperty.EPRINT) || fieldProperties.contains(FieldProperty.ISBN)) {
             return new IdentifierEditor(field, taskExecutor, dialogService, suggestionProvider, fieldCheckers, preferences);
         } else if (field == StandardField.OWNER) {
             return new OwnerEditor(field, preferences, suggestionProvider, fieldCheckers);
+        } else if (field == StandardField.GROUPS) {
+            return new GroupEditor(field, suggestionProvider, fieldCheckers, preferences, isMultiLine);
         } else if (fieldProperties.contains(FieldProperty.FILE_EDITOR)) {
-            return new LinkedFilesEditor(field, dialogService, databaseContext, taskExecutor, suggestionProvider, fieldCheckers, preferences);
+            return new LinkedFilesEditor(field, databaseContext, suggestionProvider, fieldCheckers);
         } else if (fieldProperties.contains(FieldProperty.YES_NO)) {
             return new OptionEditor<>(new YesNoEditorViewModel(field, suggestionProvider, fieldCheckers));
         } else if (fieldProperties.contains(FieldProperty.MONTH)) {
@@ -91,10 +93,12 @@ public static FieldEditorFX getForField(final Field field,
             return new LinkedEntriesEditor(field, databaseContext, (SuggestionProvider<BibEntry>) suggestionProvider, fieldCheckers);
         } else if (fieldProperties.contains(FieldProperty.PERSON_NAMES)) {
             return new PersonsEditor(field, suggestionProvider, preferences, fieldCheckers, isMultiLine);
-        } else if (StandardField.KEYWORDS.equals(field)) {
+        } else if (StandardField.KEYWORDS == field) {
             return new KeywordsEditor(field, suggestionProvider, fieldCheckers, preferences);
         } else if (field == InternalField.KEY_FIELD) {
             return new CitationKeyEditor(field, preferences, suggestionProvider, fieldCheckers, databaseContext, undoManager, dialogService);
+        } else if (field == StandardField.ISSN) {
+            return new ISSNEditor(field, suggestionProvider, fieldCheckers, preferences, taskExecutor, dialogService);
         } else {
             // default
             return new SimpleEditor(field, suggestionProvider, fieldCheckers, preferences, isMultiLine);
diff --git a/src/main/java/org/jabref/gui/fieldeditors/FieldNameLabel.java b/src/main/java/org/jabref/gui/fieldeditors/FieldNameLabel.java
index ae3852c3aae..33c9018a829 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/FieldNameLabel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/FieldNameLabel.java
@@ -223,14 +223,12 @@ public String getDescription(Field field) {
                 case TIMESTAMP:
                     return Localization.lang("Timestamp of this entry, when it has been created or last modified.");
             }
-        } else if (field instanceof InternalField) {
-            InternalField internalField = (InternalField) field;
+        } else if (field instanceof InternalField internalField) {
             switch (internalField) {
                 case KEY_FIELD:
                     return Localization.lang("Key by which the work may be cited.");
             }
-        } else if (field instanceof SpecialField) {
-            SpecialField specialField = (SpecialField) field;
+        } else if (field instanceof SpecialField specialField) {
             switch (specialField) {
                 case PRINTED:
                     return Localization.lang("User-specific printed flag, in case the entry has been printed.");
diff --git a/src/main/java/org/jabref/gui/fieldeditors/GroupEditor.java b/src/main/java/org/jabref/gui/fieldeditors/GroupEditor.java
new file mode 100644
index 00000000000..db516806b03
--- /dev/null
+++ b/src/main/java/org/jabref/gui/fieldeditors/GroupEditor.java
@@ -0,0 +1,57 @@
+package org.jabref.gui.fieldeditors;
+
+import java.util.List;
+import java.util.Optional;
+
+import javafx.scene.input.TransferMode;
+
+import org.jabref.gui.DragAndDropDataFormats;
+import org.jabref.gui.autocompleter.SuggestionProvider;
+import org.jabref.logic.integrity.FieldCheckers;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.field.Field;
+import org.jabref.model.entry.field.StandardField;
+import org.jabref.preferences.PreferencesService;
+
+public class GroupEditor extends SimpleEditor {
+
+    private Optional<BibEntry> bibEntry;
+
+    public GroupEditor(final Field field,
+                       final SuggestionProvider<?> suggestionProvider,
+                       final FieldCheckers fieldCheckers,
+                       final PreferencesService preferences,
+                       final boolean isMultiLine) {
+        super(field, suggestionProvider, fieldCheckers, preferences, isMultiLine);
+
+        this.setOnDragOver(event -> {
+            if (event.getDragboard().hasContent(DragAndDropDataFormats.GROUP)) {
+                event.acceptTransferModes(TransferMode.MOVE);
+            }
+            event.consume();
+        });
+
+        this.setOnDragDropped(event -> {
+            boolean success = false;
+            if (event.getDragboard().hasContent(DragAndDropDataFormats.GROUP)) {
+                List<String> draggedGroups = (List<String>) event.getDragboard().getContent(DragAndDropDataFormats.GROUP);
+                if (bibEntry.isPresent() && draggedGroups.get(0) != null) {
+                    String newGroup = bibEntry.map(entry -> entry.getField(StandardField.GROUPS)
+                                                                     .map(oldGroups -> oldGroups + (preferences.getBibEntryPreferences().getKeywordSeparator()) + (draggedGroups.get(0)))
+                                                                     .orElse(draggedGroups.get(0)))
+                                                  .orElse(null);
+                    bibEntry.map(entry -> entry.setField(StandardField.GROUPS, newGroup));
+                    success = true;
+                }
+            }
+            event.setDropCompleted(success);
+            event.consume();
+        });
+    }
+
+    @Override
+    public void bindToEntry(BibEntry entry) {
+        super.bindToEntry(entry);
+        this.bibEntry = Optional.of(entry);
+    }
+}
diff --git a/src/main/java/org/jabref/gui/fieldeditors/ISSNEditor.fxml b/src/main/java/org/jabref/gui/fieldeditors/ISSNEditor.fxml
new file mode 100644
index 00000000000..021a0f24f60
--- /dev/null
+++ b/src/main/java/org/jabref/gui/fieldeditors/ISSNEditor.fxml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Tooltip?>
+<?import javafx.scene.layout.HBox?>
+<?import org.jabref.gui.icon.JabRefIconView?>
+<?import javafx.scene.layout.VBox?>
+<?import org.jabref.gui.fieldeditors.EditorTextArea?>
+<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.ISSNEditor">
+    <EditorTextArea fx:id="textArea"/>
+    <VBox>
+        <Button fx:id="journalInfoButton"
+                onAction="#showJournalInfo"
+                styleClass="icon-button">
+            <graphic>
+                <JabRefIconView glyph="VIEW_JOURNAL_INFO"/>
+            </graphic>
+            <tooltip>
+                <Tooltip text="%View journal info"/>
+            </tooltip>
+        </Button>
+    </VBox>
+</fx:root>
diff --git a/src/main/java/org/jabref/gui/fieldeditors/ISSNEditor.java b/src/main/java/org/jabref/gui/fieldeditors/ISSNEditor.java
new file mode 100644
index 00000000000..55dea620477
--- /dev/null
+++ b/src/main/java/org/jabref/gui/fieldeditors/ISSNEditor.java
@@ -0,0 +1,77 @@
+package org.jabref.gui.fieldeditors;
+
+import javafx.fxml.FXML;
+import javafx.scene.Parent;
+import javafx.scene.control.Button;
+import javafx.scene.layout.HBox;
+
+import org.jabref.gui.DialogService;
+import org.jabref.gui.autocompleter.SuggestionProvider;
+import org.jabref.gui.fieldeditors.contextmenu.DefaultMenu;
+import org.jabref.gui.util.TaskExecutor;
+import org.jabref.logic.integrity.FieldCheckers;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.field.Field;
+import org.jabref.preferences.PreferencesService;
+
+import com.airhacks.afterburner.views.ViewLoader;
+
+public class ISSNEditor extends HBox implements FieldEditorFX {
+    @FXML private ISSNEditorViewModel viewModel;
+    @FXML private EditorTextArea textArea;
+    @FXML private Button journalInfoButton;
+    private final DialogService dialogService;
+    private final PreferencesService preferencesService;
+
+    public ISSNEditor(Field field,
+                      SuggestionProvider<?> suggestionProvider,
+                      FieldCheckers fieldCheckers,
+                      PreferencesService preferences,
+                      TaskExecutor taskExecutor,
+                      DialogService dialogService) {
+        this.preferencesService = preferences;
+        this.dialogService = dialogService;
+
+        this.viewModel = new ISSNEditorViewModel(
+                field,
+                suggestionProvider,
+                fieldCheckers,
+                taskExecutor,
+                dialogService);
+
+        ViewLoader.view(this)
+                  .root(this)
+                  .load();
+
+        textArea.textProperty().bindBidirectional(viewModel.textProperty());
+        textArea.initContextMenu(new DefaultMenu(textArea));
+
+        new EditorValidator(preferences).configureValidation(viewModel.getFieldValidator().getValidationStatus(), textArea);
+    }
+
+    public ISSNEditorViewModel getViewModel() {
+        return viewModel;
+    }
+
+    @Override
+    public void bindToEntry(BibEntry entry) {
+        viewModel.bindToEntry(entry);
+    }
+
+    @Override
+    public Parent getNode() {
+        return this;
+    }
+
+    @Override
+    public void requestFocus() {
+        textArea.requestFocus();
+    }
+
+    @FXML
+    private void showJournalInfo() {
+        if (JournalInfoOptInDialogHelper.isJournalInfoEnabled(dialogService, preferencesService.getEntryEditorPreferences())) {
+            viewModel.showJournalInfo(journalInfoButton);
+        }
+    }
+}
diff --git a/src/main/java/org/jabref/gui/fieldeditors/ISSNEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/ISSNEditorViewModel.java
new file mode 100644
index 00000000000..0ce1eb1862d
--- /dev/null
+++ b/src/main/java/org/jabref/gui/fieldeditors/ISSNEditorViewModel.java
@@ -0,0 +1,29 @@
+package org.jabref.gui.fieldeditors;
+
+import javafx.scene.control.Button;
+
+import org.jabref.gui.DialogService;
+import org.jabref.gui.autocompleter.SuggestionProvider;
+import org.jabref.gui.util.TaskExecutor;
+import org.jabref.logic.integrity.FieldCheckers;
+import org.jabref.model.entry.field.Field;
+
+public class ISSNEditorViewModel extends AbstractEditorViewModel {
+    private final TaskExecutor taskExecutor;
+    private final DialogService dialogService;
+
+    public ISSNEditorViewModel(
+            Field field,
+            SuggestionProvider<?> suggestionProvider,
+            FieldCheckers fieldCheckers,
+            TaskExecutor taskExecutor,
+            DialogService dialogService) {
+        super(field, suggestionProvider, fieldCheckers);
+        this.taskExecutor = taskExecutor;
+        this.dialogService = dialogService;
+    }
+
+    public void showJournalInfo(Button journalInfoButton) {
+        PopOverUtil.showJournalInfo(journalInfoButton, entry, dialogService, taskExecutor);
+    }
+}
diff --git a/src/main/java/org/jabref/gui/fieldeditors/JournalEditor.fxml b/src/main/java/org/jabref/gui/fieldeditors/JournalEditor.fxml
index dafded3704e..e7e7636073c 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/JournalEditor.fxml
+++ b/src/main/java/org/jabref/gui/fieldeditors/JournalEditor.fxml
@@ -5,16 +5,29 @@
 <?import javafx.scene.layout.HBox?>
 <?import org.jabref.gui.fieldeditors.EditorTextField?>
 <?import org.jabref.gui.icon.JabRefIconView?>
+<?import javafx.scene.layout.VBox?>
 <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.JournalEditor">
     <EditorTextField fx:id="textField"/>
-    <Button onAction="#toggleAbbreviation"
-            styleClass="icon-button">
-        <graphic>
-            <JabRefIconView glyph="TOGGLE_ABBREVIATION"/>
-        </graphic>
-        <tooltip>
-            <Tooltip text="%Switches between full and abbreviated journal name if the journal name is known."/>
-        </tooltip>
-    </Button>
+    <VBox>
+        <Button onAction="#toggleAbbreviation"
+                styleClass="icon-button">
+            <graphic>
+                <JabRefIconView glyph="TOGGLE_ABBREVIATION"/>
+            </graphic>
+            <tooltip>
+                <Tooltip text="%Switches between full and abbreviated journal name if the journal name is known."/>
+            </tooltip>
+        </Button>
+        <Button fx:id="journalInfoButton"
+                onAction="#showJournalInfo"
+                styleClass="icon-button">
+            <graphic>
+                <JabRefIconView glyph="VIEW_JOURNAL_INFO"/>
+            </graphic>
+            <tooltip>
+                <Tooltip text="%View journal info"/>
+            </tooltip>
+        </Button>
+    </VBox>
 </fx:root>
diff --git a/src/main/java/org/jabref/gui/fieldeditors/JournalEditor.java b/src/main/java/org/jabref/gui/fieldeditors/JournalEditor.java
index 491818b4663..5c12abccd71 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/JournalEditor.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/JournalEditor.java
@@ -2,11 +2,14 @@
 
 import javafx.fxml.FXML;
 import javafx.scene.Parent;
+import javafx.scene.control.Button;
 import javafx.scene.layout.HBox;
 
+import org.jabref.gui.DialogService;
 import org.jabref.gui.autocompleter.AutoCompletionTextInputBinding;
 import org.jabref.gui.autocompleter.SuggestionProvider;
 import org.jabref.gui.fieldeditors.contextmenu.DefaultMenu;
+import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.integrity.FieldCheckers;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.model.entry.BibEntry;
@@ -19,13 +22,27 @@ public class JournalEditor extends HBox implements FieldEditorFX {
 
     @FXML private JournalEditorViewModel viewModel;
     @FXML private EditorTextField textField;
+    @FXML private Button journalInfoButton;
+    private final DialogService dialogService;
+    private final PreferencesService preferencesService;
 
     public JournalEditor(Field field,
+                         TaskExecutor taskExecutor,
+                         DialogService dialogService,
                          JournalAbbreviationRepository journalAbbreviationRepository,
                          PreferencesService preferences,
                          SuggestionProvider<?> suggestionProvider,
                          FieldCheckers fieldCheckers) {
-        this.viewModel = new JournalEditorViewModel(field, suggestionProvider, journalAbbreviationRepository, fieldCheckers);
+        this.dialogService = dialogService;
+        this.preferencesService = preferences;
+
+        this.viewModel = new JournalEditorViewModel(
+                field,
+                suggestionProvider,
+                journalAbbreviationRepository,
+                fieldCheckers,
+                taskExecutor,
+                dialogService);
 
         ViewLoader.view(this)
                   .root(this)
@@ -57,4 +74,11 @@ public Parent getNode() {
     private void toggleAbbreviation() {
         viewModel.toggleAbbreviation();
     }
+
+    @FXML
+    private void showJournalInfo() {
+        if (JournalInfoOptInDialogHelper.isJournalInfoEnabled(dialogService, preferencesService.getEntryEditorPreferences())) {
+            viewModel.showJournalInfo(journalInfoButton);
+        }
+    }
 }
diff --git a/src/main/java/org/jabref/gui/fieldeditors/JournalEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/JournalEditorViewModel.java
index 42effd401e4..3e6267e1eed 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/JournalEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/JournalEditorViewModel.java
@@ -1,6 +1,10 @@
 package org.jabref.gui.fieldeditors;
 
+import javafx.scene.control.Button;
+
+import org.jabref.gui.DialogService;
 import org.jabref.gui.autocompleter.SuggestionProvider;
+import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.integrity.FieldCheckers;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.model.entry.field.Field;
@@ -8,10 +12,20 @@
 
 public class JournalEditorViewModel extends AbstractEditorViewModel {
     private final JournalAbbreviationRepository journalAbbreviationRepository;
+    private final TaskExecutor taskExecutor;
+    private final DialogService dialogService;
 
-    public JournalEditorViewModel(Field field, SuggestionProvider<?> suggestionProvider, JournalAbbreviationRepository journalAbbreviationRepository, FieldCheckers fieldCheckers) {
+    public JournalEditorViewModel(
+            Field field,
+            SuggestionProvider<?> suggestionProvider,
+            JournalAbbreviationRepository journalAbbreviationRepository,
+            FieldCheckers fieldCheckers,
+            TaskExecutor taskExecutor,
+            DialogService dialogService) {
         super(field, suggestionProvider, fieldCheckers);
         this.journalAbbreviationRepository = journalAbbreviationRepository;
+        this.taskExecutor = taskExecutor;
+        this.dialogService = dialogService;
     }
 
     public void toggleAbbreviation() {
@@ -28,4 +42,8 @@ public void toggleAbbreviation() {
             // panel.getUndoManager().addEdit(new UndoableFieldChange(entry, editor.getName(), text, nextAbbreviation));
         });
     }
+
+    public void showJournalInfo(Button journalInfoButton) {
+        PopOverUtil.showJournalInfo(journalInfoButton, entry, dialogService, taskExecutor);
+    }
 }
diff --git a/src/main/java/org/jabref/gui/fieldeditors/JournalInfoOptInDialogHelper.java b/src/main/java/org/jabref/gui/fieldeditors/JournalInfoOptInDialogHelper.java
new file mode 100644
index 00000000000..c811936a379
--- /dev/null
+++ b/src/main/java/org/jabref/gui/fieldeditors/JournalInfoOptInDialogHelper.java
@@ -0,0 +1,35 @@
+package org.jabref.gui.fieldeditors;
+
+import org.jabref.gui.DialogService;
+import org.jabref.gui.entryeditor.EntryEditorPreferences;
+import org.jabref.logic.l10n.Localization;
+
+public class JournalInfoOptInDialogHelper {
+
+    /**
+     * Using the journal information data fetcher service needs to be opt-in for GDPR compliance.
+     */
+    public static boolean isJournalInfoEnabled(DialogService dialogService, EntryEditorPreferences preferences) {
+        if (preferences.shouldEnableJournalPopup() == EntryEditorPreferences.JournalPopupEnabled.ENABLED) {
+            return true;
+        }
+
+        if (preferences.shouldEnableJournalPopup() == EntryEditorPreferences.JournalPopupEnabled.DISABLED) {
+            dialogService.notify(
+                    Localization.lang("Please enable journal information fetching in %0 > %1",
+                            Localization.lang("Preferences"),
+                            Localization.lang("Web search"))
+            );
+            return false;
+        }
+
+        boolean journalInfoEnabled = dialogService.showConfirmationDialogAndWait(
+                Localization.lang("Remote services"),
+                Localization.lang("Allow sending ISSN to a JabRef online service (SCimago) for fetching journal information"));
+
+        preferences.setEnableJournalPopup(journalInfoEnabled
+                ? EntryEditorPreferences.JournalPopupEnabled.ENABLED
+                : EntryEditorPreferences.JournalPopupEnabled.DISABLED);
+        return journalInfoEnabled;
+    }
+}
diff --git a/src/main/java/org/jabref/gui/fieldeditors/LinkedEntriesEditor.fxml b/src/main/java/org/jabref/gui/fieldeditors/LinkedEntriesEditor.fxml
index 4b75bbe6311..10d87fdc46e 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/LinkedEntriesEditor.fxml
+++ b/src/main/java/org/jabref/gui/fieldeditors/LinkedEntriesEditor.fxml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <?import javafx.scene.layout.HBox?>
-<?import com.jfoenix.controls.JFXChipView?>
+<?import com.dlsc.gemsfx.TagsField?>
 <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.LinkedEntriesEditor">
-    <JFXChipView fx:id="chipView" HBox.hgrow="ALWAYS" maxWidth="Infinity"/>
+    <TagsField fx:id="entryLinkField" HBox.hgrow="ALWAYS"/>
 </fx:root>
diff --git a/src/main/java/org/jabref/gui/fieldeditors/LinkedEntriesEditor.java b/src/main/java/org/jabref/gui/fieldeditors/LinkedEntriesEditor.java
index 3067ee36a11..8c54685b210 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/LinkedEntriesEditor.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/LinkedEntriesEditor.java
@@ -1,53 +1,101 @@
 package org.jabref.gui.fieldeditors;
 
+import java.util.Comparator;
 import java.util.stream.Collectors;
 
 import javafx.beans.binding.Bindings;
 import javafx.fxml.FXML;
+import javafx.scene.Node;
 import javafx.scene.Parent;
+import javafx.scene.control.ContentDisplay;
+import javafx.scene.control.ContextMenu;
+import javafx.scene.control.Label;
+import javafx.scene.input.MouseButton;
 import javafx.scene.layout.HBox;
 
+import org.jabref.gui.ClipBoardManager;
+import org.jabref.gui.DialogService;
+import org.jabref.gui.JabRefDialogService;
+import org.jabref.gui.actions.ActionFactory;
+import org.jabref.gui.actions.SimpleCommand;
+import org.jabref.gui.actions.StandardActions;
 import org.jabref.gui.autocompleter.SuggestionProvider;
+import org.jabref.gui.icon.IconTheme;
+import org.jabref.gui.keyboard.KeyBindingRepository;
 import org.jabref.gui.util.ViewModelListCellFactory;
 import org.jabref.logic.integrity.FieldCheckers;
+import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.ParsedEntryLink;
 import org.jabref.model.entry.field.Field;
 
 import com.airhacks.afterburner.views.ViewLoader;
-import com.jfoenix.controls.JFXChip;
-import com.jfoenix.controls.JFXChipView;
-import com.jfoenix.controls.JFXDefaultChip;
+import com.dlsc.gemsfx.TagsField;
+import jakarta.inject.Inject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class LinkedEntriesEditor extends HBox implements FieldEditorFX {
 
-    @FXML
+    private static final Logger LOGGER = LoggerFactory.getLogger(LinkedEntriesEditor.class);
+
+    @FXML public TagsField<ParsedEntryLink> entryLinkField;
+
+    @Inject private DialogService dialogService;
+    @Inject private ClipBoardManager clipBoardManager;
+    @Inject private KeyBindingRepository keyBindingRepository;
+
     private final LinkedEntriesEditorViewModel viewModel;
-    @FXML
-    private JFXChipView<ParsedEntryLink> chipView;
 
     public LinkedEntriesEditor(Field field, BibDatabaseContext databaseContext, SuggestionProvider<BibEntry> suggestionProvider, FieldCheckers fieldCheckers) {
-        this.viewModel = new LinkedEntriesEditorViewModel(field, suggestionProvider, databaseContext, fieldCheckers);
-
         ViewLoader.view(this)
                   .root(this)
                   .load();
 
-        chipView.setConverter(viewModel.getStringConverter());
-        var autoCompletionItemFactory = new ViewModelListCellFactory<ParsedEntryLink>()
-                .withText(ParsedEntryLink::getKey);
-        chipView.getAutoCompletePopup().setSuggestionsCellFactory(autoCompletionItemFactory);
-        chipView.getAutoCompletePopup().setCellLimit(5);
-        chipView.getSuggestions().addAll(suggestionProvider.getPossibleSuggestions().stream().map(ParsedEntryLink::new).collect(Collectors.toList()));
-
-        chipView.setChipFactory((view, item) -> {
-            JFXChip<ParsedEntryLink> chip = new JFXDefaultChip<>(view, item);
-            chip.setOnMouseClicked(event -> viewModel.jumpToEntry(item));
-            return chip;
+        this.viewModel = new LinkedEntriesEditorViewModel(field, suggestionProvider, databaseContext, fieldCheckers);
+
+        entryLinkField.setCellFactory(new ViewModelListCellFactory<ParsedEntryLink>().withText(ParsedEntryLink::getKey));
+        // Mind the .collect(Collectors.toList()) as the list needs to be mutable
+        entryLinkField.setSuggestionProvider(request ->
+                suggestionProvider.getPossibleSuggestions().stream()
+                                  .filter(suggestion -> suggestion.getCitationKey().orElse("").toLowerCase()
+                                                                  .contains(request.getUserText().toLowerCase()))
+                                  .map(ParsedEntryLink::new)
+                                  .collect(Collectors.toList()));
+        entryLinkField.setTagViewFactory(this::createTag);
+        entryLinkField.setConverter(viewModel.getStringConverter());
+        entryLinkField.setNewItemProducer(searchText -> viewModel.getStringConverter().fromString(searchText));
+        entryLinkField.setMatcher((entryLink, searchText) -> entryLink.getKey().toLowerCase().startsWith(searchText.toLowerCase()));
+        entryLinkField.setComparator(Comparator.comparing(ParsedEntryLink::getKey));
+        entryLinkField.setShowSearchIcon(false);
+        entryLinkField.getEditor().getStyleClass().clear();
+        entryLinkField.getEditor().getStyleClass().add("tags-field-editor");
+
+        Bindings.bindContentBidirectional(entryLinkField.getTags(), viewModel.linkedEntriesProperty());
+    }
+
+    private Node createTag(ParsedEntryLink entryLink) {
+        Label tagLabel = new Label();
+        tagLabel.setText(entryLinkField.getConverter().toString(entryLink));
+        tagLabel.setGraphic(IconTheme.JabRefIcons.REMOVE_TAGS.getGraphicNode());
+        tagLabel.getGraphic().setOnMouseClicked(event -> entryLinkField.removeTags(entryLink));
+        tagLabel.setContentDisplay(ContentDisplay.RIGHT);
+        tagLabel.setOnMouseClicked(event -> {
+            if (event.getClickCount() == 2 && event.getButton().equals(MouseButton.PRIMARY)) {
+                viewModel.jumpToEntry(entryLink);
+            }
         });
 
-        Bindings.bindContentBidirectional(chipView.getChips(), viewModel.linkedEntriesProperty());
+        ContextMenu contextMenu = new ContextMenu();
+        ActionFactory factory = new ActionFactory(keyBindingRepository);
+        contextMenu.getItems().addAll(
+                factory.createMenuItem(StandardActions.COPY, new TagContextAction(StandardActions.COPY, entryLink)),
+                factory.createMenuItem(StandardActions.CUT, new TagContextAction(StandardActions.CUT, entryLink)),
+                factory.createMenuItem(StandardActions.DELETE, new TagContextAction(StandardActions.DELETE, entryLink))
+        );
+        tagLabel.setContextMenu(contextMenu);
+        return tagLabel;
     }
 
     public LinkedEntriesEditorViewModel getViewModel() {
@@ -63,4 +111,35 @@ public void bindToEntry(BibEntry entry) {
     public Parent getNode() {
         return this;
     }
+
+    private class TagContextAction extends SimpleCommand {
+        private final StandardActions command;
+        private final ParsedEntryLink entryLink;
+
+        public TagContextAction(StandardActions command, ParsedEntryLink entryLink) {
+            this.command = command;
+            this.entryLink = entryLink;
+        }
+
+        @Override
+        public void execute() {
+            switch (command) {
+                case COPY -> {
+                    clipBoardManager.setContent(entryLink.getKey());
+                    dialogService.notify(Localization.lang("Copied '%0' to clipboard.",
+                            JabRefDialogService.shortenDialogMessage(entryLink.getKey())));
+                }
+                case CUT -> {
+                    clipBoardManager.setContent(entryLink.getKey());
+                    dialogService.notify(Localization.lang("Copied '%0' to clipboard.",
+                            JabRefDialogService.shortenDialogMessage(entryLink.getKey())));
+                    entryLinkField.removeTags(entryLink);
+                }
+                case DELETE ->
+                        entryLinkField.removeTags(entryLink);
+                default ->
+                        LOGGER.info("Action {} not defined", command.getText());
+            }
+        }
+    }
 }
diff --git a/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java
index 62ea9e1f973..d0f3c9a977e 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java
@@ -13,6 +13,7 @@
 
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.SSLHandshakeException;
 import javax.net.ssl.SSLSocketFactory;
 
 import javafx.beans.Observable;
@@ -43,6 +44,8 @@
 import org.jabref.gui.util.ControlHelper;
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.externalfiles.LinkedFileHandler;
+import org.jabref.logic.importer.FetcherClientException;
+import org.jabref.logic.importer.FetcherServerException;
 import org.jabref.logic.importer.Importer;
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.logic.importer.fileformat.PdfContentImporter;
@@ -82,7 +85,7 @@ public class LinkedFileViewModel extends AbstractViewModel {
     private final DialogService dialogService;
     private final BibEntry entry;
     private final TaskExecutor taskExecutor;
-    private final PreferencesService preferences;
+    private final PreferencesService preferencesService;
     private final LinkedFileHandler linkedFileHandler;
 
     private ObjectBinding<Node> linkedFileIconBinding;
@@ -94,11 +97,11 @@ public LinkedFileViewModel(LinkedFile linkedFile,
                                BibDatabaseContext databaseContext,
                                TaskExecutor taskExecutor,
                                DialogService dialogService,
-                               PreferencesService preferences) {
+                               PreferencesService preferencesService) {
 
         this.linkedFile = linkedFile;
-        this.preferences = preferences;
-        this.linkedFileHandler = new LinkedFileHandler(linkedFile, entry, databaseContext, preferences.getFilePreferences());
+        this.preferencesService = preferencesService;
+        this.linkedFileHandler = new LinkedFileHandler(linkedFile, entry, databaseContext, preferencesService.getFilePreferences());
         this.databaseContext = databaseContext;
         this.entry = entry;
         this.dialogService = dialogService;
@@ -110,14 +113,14 @@ public LinkedFileViewModel(LinkedFile linkedFile,
                     if (linkedFile.isOnlineLink()) {
                         return true;
                     } else {
-                        Optional<Path> path = FileUtil.find(databaseContext, link, preferences.getFilePreferences());
+                        Optional<Path> path = FileUtil.find(databaseContext, link, preferencesService.getFilePreferences());
                         return path.isPresent() && Files.exists(path.get());
                     }
                 },
                 ValidationMessage.warning(Localization.lang("Could not find file '%0'.", linkedFile.getLink())));
 
         downloadOngoing.bind(downloadProgress.greaterThanOrEqualTo(0).and(downloadProgress.lessThan(1)));
-        isOfflinePdf.setValue(!linkedFile.isOnlineLink() && linkedFile.getFileType().equalsIgnoreCase("pdf"));
+        isOfflinePdf.setValue(!linkedFile.isOnlineLink() && "pdf".equalsIgnoreCase(linkedFile.getFileType()));
     }
 
     public BooleanProperty isOfflinePdfProperty() {
@@ -177,7 +180,7 @@ public Optional<Path> findIn(List<Path> directories) {
     }
 
     public JabRefIcon getTypeIcon() {
-        return ExternalFileTypes.getExternalFileTypeByLinkedFile(linkedFile, false, preferences.getFilePreferences())
+        return ExternalFileTypes.getExternalFileTypeByLinkedFile(linkedFile, false, preferencesService.getFilePreferences())
                                 .map(ExternalFileType::getIcon)
                                 .orElse(IconTheme.JabRefIcons.FILE);
     }
@@ -208,8 +211,8 @@ public Observable[] getObservables() {
 
     public void open() {
         try {
-            Optional<ExternalFileType> type = ExternalFileTypes.getExternalFileTypeByLinkedFile(linkedFile, true, preferences.getFilePreferences());
-            boolean successful = JabRefDesktop.openExternalFileAnyFormat(databaseContext, preferences, linkedFile.getLink(), type);
+            Optional<ExternalFileType> type = ExternalFileTypes.getExternalFileTypeByLinkedFile(linkedFile, true, preferencesService.getFilePreferences());
+            boolean successful = JabRefDesktop.openExternalFileAnyFormat(databaseContext, preferencesService.getFilePreferences(), linkedFile.getLink(), type);
             if (!successful) {
                 dialogService.showErrorDialogAndWait(Localization.lang("File not found"), Localization.lang("Could not find file '%0'.", linkedFile.getLink()));
             }
@@ -224,10 +227,9 @@ public void openFolder() {
                 Optional<Path> resolvedPath = FileUtil.find(
                         databaseContext,
                         linkedFile.getLink(),
-                        preferences.getFilePreferences());
-
+                        preferencesService.getFilePreferences());
                 if (resolvedPath.isPresent()) {
-                    JabRefDesktop.openFolderAndSelectFile(resolvedPath.get(), preferences, dialogService);
+                    JabRefDesktop.openFolderAndSelectFile(resolvedPath.get(), preferencesService.getExternalApplicationsPreferences(), dialogService);
                 } else {
                     dialogService.showErrorDialogAndWait(Localization.lang("File not found"));
                 }
@@ -259,7 +261,7 @@ public void renameFileToName(String targetFileName) {
             return;
         }
 
-        Optional<Path> file = linkedFile.findIn(databaseContext, preferences.getFilePreferences());
+        Optional<Path> file = linkedFile.findIn(databaseContext, preferencesService.getFilePreferences());
         if (file.isPresent()) {
             performRenameWithConflictCheck(targetFileName);
         } else {
@@ -296,14 +298,14 @@ public void moveToDefaultDirectory() {
         }
 
         // Get target folder
-        Optional<Path> fileDir = databaseContext.getFirstExistingFileDir(preferences.getFilePreferences());
+        Optional<Path> fileDir = databaseContext.getFirstExistingFileDir(preferencesService.getFilePreferences());
         if (fileDir.isEmpty()) {
             dialogService.showErrorDialogAndWait(Localization.lang("Move file"), Localization.lang("File directory is not set or does not exist!"));
             return;
         }
 
-        Optional<Path> file = linkedFile.findIn(databaseContext, preferences.getFilePreferences());
-        if ((file.isPresent())) {
+        Optional<Path> file = linkedFile.findIn(databaseContext, preferencesService.getFilePreferences());
+        if (file.isPresent()) {
             // Found the linked file, so move it
             try {
                 linkedFileHandler.moveToDefaultDirectory();
@@ -338,7 +340,7 @@ public boolean isGeneratedNameSameAsOriginal() {
      * @return true if suggested filepath is same as existing filepath.
      */
     public boolean isGeneratedPathSameAsOriginal() {
-        FilePreferences filePreferences = preferences.getFilePreferences();
+        FilePreferences filePreferences = preferencesService.getFilePreferences();
         Optional<Path> baseDir = databaseContext.getFirstExistingFileDir(filePreferences);
         if (baseDir.isEmpty()) {
             // could not find default path
@@ -353,7 +355,7 @@ public boolean isGeneratedPathSameAsOriginal() {
 
         Optional<Path> targetDir = baseDir.map(dir -> dir.resolve(targetDirectoryName));
 
-        Optional<Path> currentDir = linkedFile.findIn(databaseContext, preferences.getFilePreferences()).map(Path::getParent);
+        Optional<Path> currentDir = linkedFile.findIn(databaseContext, preferencesService.getFilePreferences()).map(Path::getParent);
         if (currentDir.isEmpty()) {
             // Could not find file
             return false;
@@ -381,7 +383,7 @@ public void moveToDefaultDirectoryAndRename() {
      * successfully, does not exist in the first place or the user choose to remove it)
      */
     public boolean delete() {
-        Optional<Path> file = linkedFile.findIn(databaseContext, preferences.getFilePreferences());
+        Optional<Path> file = linkedFile.findIn(databaseContext, preferencesService.getFilePreferences());
 
         if (file.isEmpty()) {
             LOGGER.warn("Could not find file {}", linkedFile.getLink());
@@ -422,16 +424,12 @@ public void edit() {
         });
     }
 
-    public WriteMetadataToPdfCommand createWriteMetadataToPdfCommand() {
-        return new WriteMetadataToPdfCommand(linkedFile, databaseContext, preferences, dialogService, entry, LOGGER, taskExecutor);
-    }
-
     public void download() {
         if (!linkedFile.isOnlineLink()) {
             throw new UnsupportedOperationException("In order to download the file it has to be an online link");
         }
         try {
-            Optional<Path> targetDirectory = databaseContext.getFirstExistingFileDir(preferences.getFilePreferences());
+            Optional<Path> targetDirectory = databaseContext.getFirstExistingFileDir(preferencesService.getFilePreferences());
             if (targetDirectory.isEmpty()) {
                 dialogService.showErrorDialogAndWait(Localization.lang("Download file"), Localization.lang("File directory is not set or does not exist!"));
                 return;
@@ -456,8 +454,8 @@ public void download() {
                     // we need to call LinkedFileViewModel#fromFile, because we need to make the path relative to the configured directories
                     LinkedFile newLinkedFile = LinkedFilesEditorViewModel.fromFile(
                             destination,
-                            databaseContext.getFileDirectories(preferences.getFilePreferences()),
-                            preferences.getFilePreferences());
+                            databaseContext.getFileDirectories(preferencesService.getFilePreferences()),
+                            preferencesService.getFilePreferences());
                     entry.replaceDownloadedFile(linkedFile.getLink(), newLinkedFile);
 
                     // Notify in bar when the file type is HTML.
@@ -473,20 +471,37 @@ public void download() {
                     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);
+                LOGGER.error("Error downloading from URL: " + urlDownload, ex);
+                String fetcherExceptionMessage = ex.getMessage();
+                int statusCode;
+                if (ex instanceof FetcherClientException clientException) {
+                    statusCode = clientException.getStatusCode();
+                    if (statusCode == 401) {
+                        dialogService.showInformationDialogAndWait(Localization.lang("Failed to download from URL"), Localization.lang("401 Unauthorized: Access Denied. You are not authorized to access this resource. Please check your credentials and try again. If you believe you should have access, please contact the administrator for assistance.\nURL: %0 \n %1", urlDownload.getSource(), fetcherExceptionMessage));
+                    } else if (statusCode == 403) {
+                        dialogService.showInformationDialogAndWait(Localization.lang("Failed to download from URL"), Localization.lang("403 Forbidden: Access Denied. You do not have permission to access this resource. Please contact the administrator for assistance or try a different action.\nURL: %0 \n %1", urlDownload.getSource(), fetcherExceptionMessage));
+                    } else if (statusCode == 404) {
+                        dialogService.showInformationDialogAndWait(Localization.lang("Failed to download from URL"), Localization.lang("404 Not Found Error: The requested resource could not be found. It seems that the file you are trying to download is not available or has been moved. Please verify the URL and try again. If you believe this is an error, please contact the administrator for further assistance.\nURL: %0 \n %1", urlDownload.getSource(), fetcherExceptionMessage));
+                    }
+                } else if (ex instanceof FetcherServerException serverException) {
+                    statusCode = serverException.getStatusCode();
+                    dialogService.showInformationDialogAndWait(Localization.lang("Failed to download from URL"),
+                                Localization.lang("Error downloading form URL. Cause is likely the server side. HTTP Error %0 \n %1 \nURL: %2 \nPlease try again later or contact the server administrator.", statusCode, fetcherExceptionMessage, urlDownload.getSource()));
+                    } else {
+                        dialogService.showErrorDialogAndWait(Localization.lang("Failed to download from URL"), Localization.lang("Error message: %0 \nURL: %1 \nPlease check the URL and try again.", fetcherExceptionMessage, urlDownload.getSource()));
+                    }
+                });
+                taskExecutor.execute(downloadTask);
+            } catch (MalformedURLException exception) {
+                dialogService.showErrorDialogAndWait(Localization.lang("Invalid URL"), exception);
+            }
         }
-    }
 
-    public boolean checkSSLHandshake(URLDownload urlDownload) {
-        try {
+        public boolean checkSSLHandshake(URLDownload urlDownload) {
+            try {
             urlDownload.canBeReached();
         } catch (kong.unirest.UnirestException ex) {
-            if (ex.getCause() instanceof javax.net.ssl.SSLHandshakeException) {
+            if (ex.getCause() instanceof SSLHandshakeException) {
                 if (dialogService.showConfirmationDialogAndWait(Localization.lang("Download file"),
                         Localization.lang("Unable to find valid certification path to requested target(%0), download anyway?",
                                           urlDownload.getSource().toString()))) {
@@ -513,7 +528,7 @@ public BackgroundTask<Path> prepareDownloadTask(Path targetDirectory, URLDownloa
                     ExternalFileType externalFileType = suggestedType.orElse(StandardExternalFileType.PDF);
 
                     String suggestedName = linkedFileHandler.getSuggestedFileName(externalFileType.getExtension());
-                    String fulltextDir = FileUtil.createDirNameFromPattern(databaseContext.getDatabase(), entry, preferences.getFilePreferences().getFileDirectoryPattern());
+                    String fulltextDir = FileUtil.createDirNameFromPattern(databaseContext.getDatabase(), entry, preferencesService.getFilePreferences().getFileDirectoryPattern());
                     suggestedName = FileNameUniqueness.getNonOverWritingFileName(targetDirectory.resolve(fulltextDir), suggestedName);
                     return targetDirectory.resolve(fulltextDir).resolve(suggestedName);
                 })
@@ -537,15 +552,15 @@ private Optional<ExternalFileType> inferFileTypeFromMimeType(URLDownload urlDown
 
         if (mimeType != null) {
             LOGGER.debug("MIME Type suggested: " + mimeType);
-            return ExternalFileTypes.getExternalFileTypeByMimeType(mimeType, preferences.getFilePreferences());
+            return ExternalFileTypes.getExternalFileTypeByMimeType(mimeType, preferencesService.getFilePreferences());
         } else {
             return Optional.empty();
         }
     }
 
     private Optional<ExternalFileType> inferFileTypeFromURL(String url) {
-        return URLUtil.getSuffix(url, preferences.getFilePreferences())
-                      .flatMap(extension -> ExternalFileTypes.getExternalFileTypeByExt(extension, preferences.getFilePreferences()));
+        return URLUtil.getSuffix(url, preferencesService.getFilePreferences())
+                      .flatMap(extension -> ExternalFileTypes.getExternalFileTypeByExt(extension, preferencesService.getFilePreferences()));
     }
 
     public LinkedFile getFile() {
@@ -557,17 +572,17 @@ public ValidationStatus fileExistsValidationStatus() {
     }
 
     public void parsePdfMetadataAndShowMergeDialog() {
-        linkedFile.findIn(databaseContext, preferences.getFilePreferences()).ifPresent(filePath -> {
-            MultiMergeEntriesView dialog = new MultiMergeEntriesView(preferences, taskExecutor);
+        linkedFile.findIn(databaseContext, preferencesService.getFilePreferences()).ifPresent(filePath -> {
+            MultiMergeEntriesView dialog = new MultiMergeEntriesView(preferencesService, taskExecutor);
             dialog.setTitle(Localization.lang("Merge PDF metadata"));
             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.getGrobidPreferences().isGrobidEnabled()) {
-                dialog.addSource("Grobid", wrapImporterToSupplier(new PdfGrobidImporter(preferences.getImportFormatPreferences()), filePath));
+            dialog.addSource(Localization.lang("Verbatim"), wrapImporterToSupplier(new PdfVerbatimBibTextImporter(preferencesService.getImportFormatPreferences()), filePath));
+            dialog.addSource(Localization.lang("Embedded"), wrapImporterToSupplier(new PdfEmbeddedBibFileImporter(preferencesService.getImportFormatPreferences()), filePath));
+            if (preferencesService.getGrobidPreferences().isGrobidEnabled()) {
+                dialog.addSource("Grobid", wrapImporterToSupplier(new PdfGrobidImporter(preferencesService.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));
+            dialog.addSource(Localization.lang("XMP metadata"), wrapImporterToSupplier(new PdfXmpImporter(preferencesService.getXmpPreferences()), filePath));
+            dialog.addSource(Localization.lang("Content"), wrapImporterToSupplier(new PdfContentImporter(preferencesService.getImportFormatPreferences()), filePath));
             dialogService.showCustomDialogAndWait(dialog).ifPresent(newEntry -> {
                 databaseContext.getDatabase().removeEntry(entry);
                 databaseContext.getDatabase().insertEntry(newEntry);
diff --git a/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.fxml b/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.fxml
index 5f61cfd109c..f73bdc72290 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.fxml
+++ b/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.fxml
@@ -23,8 +23,7 @@
         <Button onAction="#fetchFulltext" styleClass="icon-button">
             <graphic>
                 <StackPane>
-                    <JabRefIconView glyph="FETCH_FULLTEXT"
-                                    visible="${controller.viewModel.fulltextLookupInProgress == false}"/>
+                    <JabRefIconView fx:id="fulltextFetcher" glyph="FETCH_FULLTEXT" visible="false"/>
                     <ProgressIndicator maxHeight="12.0" maxWidth="12.0"
                                        visible="${controller.viewModel.fulltextLookupInProgress}"/>
                 </StackPane>
diff --git a/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.java b/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.java
index b59d1a3164d..2f687be78e1 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.java
@@ -38,6 +38,7 @@
 import org.jabref.gui.autocompleter.SuggestionProvider;
 import org.jabref.gui.copyfiles.CopySingleFileAction;
 import org.jabref.gui.icon.IconTheme;
+import org.jabref.gui.icon.JabRefIconView;
 import org.jabref.gui.importer.GrobidOptInDialogHelper;
 import org.jabref.gui.keyboard.KeyBinding;
 import org.jabref.gui.linkedfile.DeleteFileAction;
@@ -46,9 +47,11 @@
 import org.jabref.gui.util.ViewModelListCellFactory;
 import org.jabref.gui.util.uithreadaware.UiThreadObservableList;
 import org.jabref.logic.integrity.FieldCheckers;
+import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.model.entry.field.Field;
 import org.jabref.preferences.PreferencesService;
@@ -56,36 +59,51 @@
 import com.airhacks.afterburner.views.ViewLoader;
 import com.tobiasdiez.easybind.EasyBind;
 import com.tobiasdiez.easybind.optional.ObservableOptionalValue;
+import jakarta.inject.Inject;
 
 public class LinkedFilesEditor extends HBox implements FieldEditorFX {
 
-    @FXML private final LinkedFilesEditorViewModel viewModel;
     @FXML private ListView<LinkedFileViewModel> listView;
+    @FXML private JabRefIconView fulltextFetcher;
 
-    private final DialogService dialogService;
+    private final Field field;
     private final BibDatabaseContext databaseContext;
-    private final UiThreadObservableList<LinkedFileViewModel> decoratedModelList;
-    private final PreferencesService preferencesService;
+    private final SuggestionProvider<?> suggestionProvider;
+    private final FieldCheckers fieldCheckers;
+
+    @Inject private DialogService dialogService;
+    @Inject private PreferencesService preferencesService;
+    @Inject private BibEntryTypesManager bibEntryTypesManager;
+    @Inject private JournalAbbreviationRepository abbreviationRepository;
+    @Inject private TaskExecutor taskExecutor;
+
+    private LinkedFilesEditorViewModel viewModel;
 
     private ObservableOptionalValue<BibEntry> bibEntry = EasyBind.wrapNullable(new SimpleObjectProperty<>());
+    private final UiThreadObservableList<LinkedFileViewModel> decoratedModelList;
 
     public LinkedFilesEditor(Field field,
-                             DialogService dialogService,
                              BibDatabaseContext databaseContext,
-                             TaskExecutor taskExecutor,
                              SuggestionProvider<?> suggestionProvider,
-                             FieldCheckers fieldCheckers,
-                             PreferencesService preferences) {
-        this.viewModel = new LinkedFilesEditorViewModel(field, suggestionProvider, dialogService, databaseContext, taskExecutor, fieldCheckers, preferences);
-        this.dialogService = dialogService;
+                             FieldCheckers fieldCheckers) {
+        this.field = field;
         this.databaseContext = databaseContext;
-        this.preferencesService = preferences;
+        this.suggestionProvider = suggestionProvider;
+        this.fieldCheckers = fieldCheckers;
 
         ViewLoader.view(this)
                   .root(this)
                   .load();
 
-        ViewModelListCellFactory<LinkedFileViewModel> cellFactory = new ViewModelListCellFactory<LinkedFileViewModel>()
+        decoratedModelList = new UiThreadObservableList<>(viewModel.filesProperty());
+        Bindings.bindContentBidirectional(listView.itemsProperty().get(), decoratedModelList);
+    }
+
+    @FXML
+    private void initialize() {
+        this.viewModel = new LinkedFilesEditorViewModel(field, suggestionProvider, dialogService, databaseContext, taskExecutor, fieldCheckers, preferencesService);
+
+        new ViewModelListCellFactory<LinkedFileViewModel>()
                 .withStringTooltip(LinkedFileViewModel::getDescriptionAndLink)
                 .withGraphic(this::createFileDisplay)
                 .withContextMenu(this::createContextMenuForFile)
@@ -93,13 +111,12 @@ public LinkedFilesEditor(Field field,
                 .setOnDragDetected(this::handleOnDragDetected)
                 .setOnDragDropped(this::handleOnDragDropped)
                 .setOnDragOver(this::handleOnDragOver)
-                .withValidation(LinkedFileViewModel::fileExistsValidationStatus);
-
-        listView.setCellFactory(cellFactory);
+                .withValidation(LinkedFileViewModel::fileExistsValidationStatus)
+                .install(listView);
         listView.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);
 
-        decoratedModelList = new UiThreadObservableList<>(viewModel.filesProperty());
-        Bindings.bindContentBidirectional(listView.itemsProperty().get(), decoratedModelList);
+        fulltextFetcher.visibleProperty().bind(viewModel.fulltextLookupInProgressProperty().not());
+
         setUpKeyBindings();
     }
 
@@ -190,8 +207,14 @@ private Node createFileDisplay(LinkedFileViewModel linkedFile) {
         writeMetadataToPdf.setTooltip(new Tooltip(Localization.lang("Write BibTeXEntry metadata to PDF.")));
         writeMetadataToPdf.visibleProperty().bind(linkedFile.isOfflinePdfProperty());
         writeMetadataToPdf.getStyleClass().setAll("icon-button");
-
-        WriteMetadataToPdfCommand writeMetadataToPdfCommand = linkedFile.createWriteMetadataToPdfCommand();
+        WriteMetadataToPdfCommand writeMetadataToPdfCommand = new WriteMetadataToPdfCommand(
+                linkedFile.getFile(),
+                bibEntry.getValueOrElse(new BibEntry()), databaseContext,
+                dialogService,
+                preferencesService,
+                bibEntryTypesManager,
+                abbreviationRepository,
+                taskExecutor);
         writeMetadataToPdf.disableProperty().bind(writeMetadataToPdfCommand.executableProperty().not());
         writeMetadataToPdf.setOnAction(event -> writeMetadataToPdfCommand.execute());
 
diff --git a/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditorViewModel.java
index 519ca7c1bcd..d95543abc2e 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditorViewModel.java
@@ -3,6 +3,7 @@
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
@@ -11,6 +12,7 @@
 
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ListProperty;
+import javafx.beans.property.ReadOnlyBooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleListProperty;
 import javafx.collections.FXCollections;
@@ -33,6 +35,7 @@
 import org.jabref.logic.importer.util.FileFieldParser;
 import org.jabref.logic.integrity.FieldCheckers;
 import org.jabref.logic.l10n.Localization;
+import org.jabref.logic.util.io.FileNameCleaner;
 import org.jabref.logic.util.io.FileUtil;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
@@ -42,7 +45,11 @@
 import org.jabref.preferences.FilePreferences;
 import org.jabref.preferences.PreferencesService;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 public class LinkedFilesEditorViewModel extends AbstractEditorViewModel {
+    private static final Logger LOGGER = LoggerFactory.getLogger(LinkedFilesEditorViewModel.class);
 
     private final ListProperty<LinkedFileViewModel> files = new SimpleListProperty<>(FXCollections.observableArrayList(LinkedFileViewModel::getObservables));
     private final BooleanProperty fulltextLookupInProgress = new SimpleBooleanProperty(false);
@@ -109,10 +116,6 @@ public LinkedFileViewModel fromFile(Path file, FilePreferences filePreferences)
                 preferences);
     }
 
-    public boolean isFulltextLookupInProgress() {
-        return fulltextLookupInProgress.get();
-    }
-
     private List<LinkedFileViewModel> parseToFileViewModel(String stringValue) {
         return FileFieldParser.parse(stringValue).stream()
                               .map(linkedFile -> new LinkedFileViewModel(
@@ -142,23 +145,48 @@ public void addNewFile() {
                 .build();
 
         List<Path> fileDirectories = databaseContext.getFileDirectories(preferences.getFilePreferences());
-        dialogService.showFileOpenDialogAndGetMultipleFiles(fileDialogConfiguration).forEach(newFile -> {
-            LinkedFile newLinkedFile = fromFile(newFile, fileDirectories, preferences.getFilePreferences());
-            files.add(new LinkedFileViewModel(
-                    newLinkedFile,
-                    entry,
-                    databaseContext,
-                    taskExecutor,
-                    dialogService,
-                    preferences));
-        });
+        List<Path> selectedFiles = dialogService.showFileOpenDialogAndGetMultipleFiles(fileDialogConfiguration);
+
+        for (Path fileToAdd : selectedFiles) {
+            if (FileUtil.detectBadFileName(fileToAdd.toString())) {
+                String newFilename = FileNameCleaner.cleanFileName(fileToAdd.getFileName().toString());
+
+                boolean correctButtonPressed = dialogService.showConfirmationDialogAndWait(Localization.lang("File \"%0\" cannot be added!", fileToAdd.getFileName()),
+                        Localization.lang("Illegal characters in the file name detected.\nFile will be renamed to \"%0\" and added.", newFilename),
+                        Localization.lang("Rename and add"));
+
+                if (correctButtonPressed) {
+                    Path correctPath = fileToAdd.resolveSibling(newFilename);
+                    try {
+                        Files.move(fileToAdd, correctPath);
+                        addNewLinkedFile(correctPath, fileDirectories);
+                    } catch (IOException ex) {
+                        LOGGER.error("Error moving file", ex);
+                        dialogService.showErrorDialogAndWait(ex);
+                    }
+                }
+            } else {
+                addNewLinkedFile(fileToAdd, fileDirectories);
+            }
+        }
+    }
+
+    private void addNewLinkedFile(Path correctPath, List<Path> fileDirectories) {
+        LinkedFile newLinkedFile = fromFile(correctPath, fileDirectories, preferences.getFilePreferences());
+        files.add(new LinkedFileViewModel(
+                newLinkedFile,
+                entry,
+                databaseContext,
+                taskExecutor,
+                dialogService,
+                preferences));
     }
 
     @Override
     public void bindToEntry(BibEntry entry) {
         super.bindToEntry(entry);
 
-        if (entry != null) {
+        if ((entry != null) && preferences.getEntryEditorPreferences().autoLinkFilesEnabled()) {
             BackgroundTask<List<LinkedFileViewModel>> findAssociatedNotLinkedFiles = BackgroundTask
                     .wrap(() -> findAssociatedNotLinkedFiles(entry))
                     .onSuccess(files::addAll);
@@ -265,4 +293,8 @@ public void deleteFile(LinkedFileViewModel file) {
     public void removeFileLink(LinkedFileViewModel file) {
         files.remove(file);
     }
+
+    public ReadOnlyBooleanProperty fulltextLookupInProgressProperty() {
+        return fulltextLookupInProgress;
+    }
 }
diff --git a/src/main/java/org/jabref/gui/fieldeditors/PopOverUtil.java b/src/main/java/org/jabref/gui/fieldeditors/PopOverUtil.java
new file mode 100644
index 00000000000..e8b2165a49a
--- /dev/null
+++ b/src/main/java/org/jabref/gui/fieldeditors/PopOverUtil.java
@@ -0,0 +1,52 @@
+package org.jabref.gui.fieldeditors;
+
+import java.util.Optional;
+
+import javafx.scene.control.Button;
+import javafx.scene.control.ProgressIndicator;
+
+import org.jabref.gui.DialogService;
+import org.jabref.gui.fieldeditors.journalinfo.JournalInfoView;
+import org.jabref.gui.util.BackgroundTask;
+import org.jabref.gui.util.TaskExecutor;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.field.StandardField;
+
+import org.controlsfx.control.PopOver;
+
+public class PopOverUtil {
+
+    public static void showJournalInfo(Button button, BibEntry entry, DialogService dialogService, TaskExecutor taskExecutor) {
+        Optional<String> optionalIssn = entry.getField(StandardField.ISSN);
+        Optional<String> optionalJournalName = entry.getField(StandardField.JOURNAL);
+
+        if (optionalIssn.isPresent() || optionalJournalName.isPresent()) {
+            PopOver popOver = new PopOver();
+            ProgressIndicator progressIndicator = new ProgressIndicator();
+            progressIndicator.setMaxSize(30, 30);
+            popOver.setContentNode(progressIndicator);
+            popOver.setDetachable(true);
+            popOver.setTitle(Localization.lang("Journal Information"));
+            popOver.setArrowLocation(PopOver.ArrowLocation.BOTTOM_CENTER);
+            popOver.setArrowSize(0);
+            popOver.show(button, 0);
+
+            BackgroundTask
+                    .wrap(() -> new JournalInfoView().populateJournalInformation(optionalIssn.orElse(""), optionalJournalName.orElse("")))
+                    .onSuccess(updatedNode -> {
+                        popOver.setContentNode(updatedNode);
+                        popOver.show(button, 0);
+                    })
+                    .onFailure(exception -> {
+                        popOver.hide();
+                        String message = Localization.lang("Error while fetching journal information: %0",
+                                exception.getMessage());
+                        dialogService.notify(message);
+                    })
+                    .executeWith(taskExecutor);
+        } else {
+            dialogService.notify(Localization.lang("ISSN or journal name required for fetching journal information"));
+        }
+    }
+}
diff --git a/src/main/java/org/jabref/gui/fieldeditors/TextInputControlBehavior.java b/src/main/java/org/jabref/gui/fieldeditors/TextInputControlBehavior.java
index 2051a10b068..31a45bc8c68 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/TextInputControlBehavior.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/TextInputControlBehavior.java
@@ -23,7 +23,7 @@
 public class TextInputControlBehavior {
 
     /**
-     * @implNote taken from {@link com.sun.javafx.scene.control.behavior.TextFieldBehavior#contextMenuRequested(javafx.scene.input.ContextMenuEvent)}
+     * taken from {@link com.sun.javafx.scene.control.behavior.TextFieldBehavior#contextMenuRequested(javafx.scene.input.ContextMenuEvent)}
      */
     public static void showContextMenu(TextField textField, ContextMenu contextMenu, ContextMenuEvent e) {
         double screenX = e.getScreenX();
@@ -81,7 +81,7 @@ public static void showContextMenu(TextField textField, ContextMenu contextMenu,
     }
 
     /**
-     * @implNote taken from {@link com.sun.javafx.scene.control.behavior.TextAreaBehavior#contextMenuRequested(javafx.scene.input.ContextMenuEvent)}
+     * taken from {@link com.sun.javafx.scene.control.behavior.TextAreaBehavior#contextMenuRequested(javafx.scene.input.ContextMenuEvent)}
      */
     public static void showContextMenu(TextArea textArea, ContextMenu contextMenu, ContextMenuEvent e) {
         double screenX = e.getScreenX();
diff --git a/src/main/java/org/jabref/gui/fieldeditors/UrlEditor.java b/src/main/java/org/jabref/gui/fieldeditors/UrlEditor.java
index 8510b5fe95f..4a71d689c6f 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/UrlEditor.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/UrlEditor.java
@@ -30,8 +30,8 @@ public UrlEditor(Field field,
                      DialogService dialogService,
                      SuggestionProvider<?> suggestionProvider,
                      FieldCheckers fieldCheckers,
-                     PreferencesService preferences) {
-        this.viewModel = new UrlEditorViewModel(field, suggestionProvider, dialogService, fieldCheckers);
+                     PreferencesService preferencesService) {
+        this.viewModel = new UrlEditorViewModel(field, suggestionProvider, dialogService, preferencesService, fieldCheckers);
 
         ViewLoader.view(this)
                   .root(this)
@@ -44,7 +44,7 @@ public UrlEditor(Field field,
         // init paste handler for UrlEditor to format pasted url link in textArea
         textArea.setPasteActionHandler(() -> textArea.setText(new CleanupUrlFormatter().format(new TrimWhitespaceFormatter().format(textArea.getText()))));
 
-        new EditorValidator(preferences).configureValidation(viewModel.getFieldValidator().getValidationStatus(), textArea);
+        new EditorValidator(preferencesService).configureValidation(viewModel.getFieldValidator().getValidationStatus(), textArea);
     }
 
     public UrlEditorViewModel getViewModel() {
diff --git a/src/main/java/org/jabref/gui/fieldeditors/UrlEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/UrlEditorViewModel.java
index 5e2dfdb7cdd..f8f6670ec77 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/UrlEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/UrlEditorViewModel.java
@@ -12,16 +12,19 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.strings.StringUtil;
+import org.jabref.preferences.PreferencesService;
 
 import com.tobiasdiez.easybind.EasyBind;
 
 public class UrlEditorViewModel extends AbstractEditorViewModel {
     private final DialogService dialogService;
+    private final PreferencesService preferencesService;
     private final BooleanProperty validUrlIsNotPresent = new SimpleBooleanProperty(true);
 
-    public UrlEditorViewModel(Field field, SuggestionProvider<?> suggestionProvider, DialogService dialogService, FieldCheckers fieldCheckers) {
+    public UrlEditorViewModel(Field field, SuggestionProvider<?> suggestionProvider, DialogService dialogService, PreferencesService preferencesService, FieldCheckers fieldCheckers) {
         super(field, suggestionProvider, fieldCheckers);
         this.dialogService = dialogService;
+        this.preferencesService = preferencesService;
 
         validUrlIsNotPresent.bind(
                 EasyBind.map(text, input -> StringUtil.isBlank(input) || !URLUtil.isURL(input))
@@ -42,7 +45,7 @@ public void openExternalLink() {
         }
 
         try {
-            JabRefDesktop.openBrowser(text.get());
+            JabRefDesktop.openBrowser(text.get(), preferencesService.getFilePreferences());
         } catch (IOException ex) {
             dialogService.notify(Localization.lang("Unable to open link."));
         }
diff --git a/src/main/java/org/jabref/gui/fieldeditors/WriteMetadataToPdfCommand.java b/src/main/java/org/jabref/gui/fieldeditors/WriteMetadataToPdfCommand.java
index 6f5ed16cca3..328182e2958 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/WriteMetadataToPdfCommand.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/WriteMetadataToPdfCommand.java
@@ -7,36 +7,50 @@
 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.journals.JournalAbbreviationRepository;
 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.BibEntryTypesManager;
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.preferences.PreferencesService;
 
 import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class WriteMetadataToPdfCommand extends SimpleCommand {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(WriteMetadataToPdfCommand.class);
+
     private final LinkedFile linkedFile;
+    private final BibEntry entry;
     private final BibDatabaseContext databaseContext;
     private final PreferencesService preferences;
     private final DialogService dialogService;
-    private final BibEntry entry;
-    private final Logger logger;
+    private final BibEntryTypesManager bibEntryTypesManager;
+    private final JournalAbbreviationRepository abbreviationRepository;
     private final TaskExecutor taskExecutor;
 
-    public WriteMetadataToPdfCommand(LinkedFile linkedFile, BibDatabaseContext databaseContext, PreferencesService preferences, DialogService dialogService, BibEntry entry, Logger logger, TaskExecutor taskExecutor) {
+    public WriteMetadataToPdfCommand(LinkedFile linkedFile,
+                                     BibEntry entry,
+                                     BibDatabaseContext databaseContext,
+                                     DialogService dialogService,
+                                     PreferencesService preferences,
+                                     BibEntryTypesManager bibEntryTypesManager,
+                                     JournalAbbreviationRepository abbreviationRepository,
+                                     TaskExecutor taskExecutor) {
         this.linkedFile = linkedFile;
+        this.entry = entry;
         this.databaseContext = databaseContext;
         this.preferences = preferences;
         this.dialogService = dialogService;
-        this.entry = entry;
-        this.logger = logger;
+        this.bibEntryTypesManager = bibEntryTypesManager;
+        this.abbreviationRepository = abbreviationRepository;
         this.taskExecutor = taskExecutor;
     }
 
@@ -52,13 +66,20 @@ public void execute() {
                         // 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());
+                        EmbeddedBibFilePdfExporter embeddedBibExporter = new EmbeddedBibFilePdfExporter(
+                                databaseContext.getMode(),
+                                bibEntryTypesManager,
+                                preferences.getFieldPreferences());
+                        embeddedBibExporter.exportToFileByPath(
+                                databaseContext,
+                                preferences.getFilePreferences(),
+                                file.get(),
+                                abbreviationRepository);
 
                         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);
+                        LOGGER.error("Error while writing metadata to {}", file.map(Path::toString).orElse(""), ex);
                     }
                 }
             }
diff --git a/src/main/java/org/jabref/gui/fieldeditors/contextmenu/DefaultMenu.java b/src/main/java/org/jabref/gui/fieldeditors/contextmenu/DefaultMenu.java
index b6bc78d6707..c5f95b72fa8 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/contextmenu/DefaultMenu.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/contextmenu/DefaultMenu.java
@@ -4,13 +4,10 @@
 import java.util.Objects;
 import java.util.function.Supplier;
 
-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.TextInputControl;
-import javafx.scene.control.Tooltip;
 
 import org.jabref.logic.cleanup.Formatter;
 import org.jabref.logic.formatter.Formatters;
@@ -47,9 +44,7 @@ private static Menu getCaseChangeMenu(TextInputControl textInputControl) {
         Menu submenu = new Menu(Localization.lang("Change case"));
 
         for (final Formatter caseChanger : Formatters.getCaseChangers()) {
-            CustomMenuItem menuItem = new CustomMenuItem(new Label(caseChanger.getName()));
-            Tooltip toolTip = new Tooltip(caseChanger.getDescription());
-            Tooltip.install(menuItem.getContent(), toolTip);
+            MenuItem menuItem = new MenuItem(caseChanger.getName());
             EasyBind.subscribe(textInputControl.textProperty(), value -> menuItem.setDisable(StringUtil.isNullOrEmpty(value)));
             menuItem.setOnAction(event ->
                     textInputControl.textProperty().set(caseChanger.format(textInputControl.textProperty().get())));
@@ -63,9 +58,7 @@ private static Menu getConversionMenu(TextInputControl textInputControl) {
         Menu submenu = new Menu(Localization.lang("Convert"));
 
         for (Formatter converter : Formatters.getConverters()) {
-            CustomMenuItem menuItem = new CustomMenuItem(new Label(converter.getName()));
-            Tooltip toolTip = new Tooltip(converter.getDescription());
-            Tooltip.install(menuItem.getContent(), toolTip);
+            MenuItem menuItem = new MenuItem(converter.getName());
             EasyBind.subscribe(textInputControl.textProperty(), value -> menuItem.setDisable(StringUtil.isNullOrEmpty(value)));
             menuItem.setOnAction(event ->
                     textInputControl.textProperty().set(converter.format(textInputControl.textProperty().get())));
diff --git a/src/main/java/org/jabref/gui/fieldeditors/contextmenu/EditorMenus.java b/src/main/java/org/jabref/gui/fieldeditors/contextmenu/EditorMenus.java
index eee48807c99..7a31eec6f45 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/contextmenu/EditorMenus.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/contextmenu/EditorMenus.java
@@ -4,13 +4,10 @@
 import java.util.List;
 import java.util.function.Supplier;
 
-import javafx.scene.control.CustomMenuItem;
-import javafx.scene.control.Label;
 import javafx.scene.control.MenuItem;
 import javafx.scene.control.SeparatorMenuItem;
 import javafx.scene.control.TextArea;
 import javafx.scene.control.TextInputControl;
-import javafx.scene.control.Tooltip;
 
 import org.jabref.gui.Globals;
 import org.jabref.gui.actions.ActionFactory;
@@ -39,11 +36,9 @@ public class EditorMenus {
      */
     public static Supplier<List<MenuItem>> getNameMenu(final TextInputControl textInput) {
         return () -> {
-            CustomMenuItem normalizeNames = new CustomMenuItem(new Label(Localization.lang("Normalize to BibTeX name format")));
+            MenuItem normalizeNames = new MenuItem(Localization.lang("Normalize to BibTeX name format"));
             EasyBind.subscribe(textInput.textProperty(), value -> normalizeNames.setDisable(StringUtil.isNullOrEmpty(value)));
             normalizeNames.setOnAction(event -> textInput.setText(new NormalizeNamesFormatter().format(textInput.getText())));
-            Tooltip toolTip = new Tooltip(Localization.lang("If possible, normalize this list of names to conform to standard BibTeX name formatting"));
-            Tooltip.install(normalizeNames.getContent(), toolTip);
             List<MenuItem> menuItems = new ArrayList<>(6);
             menuItems.add(normalizeNames);
             menuItems.addAll(new DefaultMenu(textInput).get());
@@ -79,7 +74,7 @@ public static Supplier<List<MenuItem>> getDOIMenu(TextArea textArea) {
      */
     public static Supplier<List<MenuItem>> getCleanupUrlMenu(TextArea textArea) {
         return () -> {
-            CustomMenuItem cleanupURL = new CustomMenuItem(new Label(Localization.lang("Cleanup URL link")));
+            MenuItem cleanupURL = new MenuItem(Localization.lang("Cleanup URL link"));
             cleanupURL.setDisable(textArea.textProperty().isEmpty().get());
             cleanupURL.setOnAction(event -> textArea.setText(new CleanupUrlFormatter().format(textArea.getText())));
             List<MenuItem> menuItems = new ArrayList<>();
diff --git a/src/main/java/org/jabref/gui/fieldeditors/contextmenu/ProtectedTermsMenu.java b/src/main/java/org/jabref/gui/fieldeditors/contextmenu/ProtectedTermsMenu.java
index e085eb981bd..d66eb82a777 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/contextmenu/ProtectedTermsMenu.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/contextmenu/ProtectedTermsMenu.java
@@ -16,6 +16,7 @@
 import org.jabref.gui.icon.JabRefIcon;
 import org.jabref.logic.cleanup.Formatter;
 import org.jabref.logic.formatter.casechanger.ProtectTermsFormatter;
+import org.jabref.logic.formatter.casechanger.UnprotectTermsFormatter;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.protectedterms.ProtectedTermsList;
 
@@ -42,6 +43,18 @@ public String getDescription() {
         }
     };
 
+    private final Action unprotectSelectionActionInformation = new Action() {
+        @Override
+        public String getText() {
+            return Localization.lang("Unprotect selection");
+        }
+
+        @Override
+        public String getDescription() {
+            return Localization.lang("Remove all {} in selected text");
+        }
+    };
+
     private class ProtectSelectionAction extends SimpleCommand {
         ProtectSelectionAction() {
             this.executable.bind(textInputControl.selectedTextProperty().isNotEmpty());
@@ -54,6 +67,20 @@ public void execute() {
         }
     }
 
+    private class UnprotectSelectionAction extends SimpleCommand {
+
+        public UnprotectSelectionAction() {
+            this.executable.bind(textInputControl.selectedTextProperty().isNotEmpty());
+        }
+
+        @Override
+        public void execute() {
+            String selectedText = textInputControl.getSelectedText();
+            String formattedString = new UnprotectTermsFormatter().format(selectedText);
+            textInputControl.replaceSelection(formattedString);
+        }
+    }
+
     private class FormatFieldAction extends SimpleCommand {
         FormatFieldAction() {
             this.executable.bind(textInputControl.textProperty().isNotEmpty());
@@ -88,7 +115,8 @@ public ProtectedTermsMenu(final TextInputControl textInputControl) {
         getItems().addAll(factory.createMenuItem(protectSelectionActionInformation, new ProtectSelectionAction()),
                 getExternalFilesMenu(),
                 new SeparatorMenuItem(),
-                factory.createMenuItem(() -> Localization.lang("Format field"), new FormatFieldAction()));
+                factory.createMenuItem(() -> Localization.lang("Format field"), new FormatFieldAction()),
+                factory.createMenuItem(unprotectSelectionActionInformation, new UnprotectSelectionAction()));
     }
 
     private Menu getExternalFilesMenu() {
diff --git a/src/main/java/org/jabref/gui/fieldeditors/identifier/BaseIdentifierEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/identifier/BaseIdentifierEditorViewModel.java
index 48c3d39d9b3..457df38e15d 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/identifier/BaseIdentifierEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/identifier/BaseIdentifierEditorViewModel.java
@@ -75,9 +75,9 @@ protected void handleIdentifierFetchingError(Exception exception, IdFetcher<T> f
         } else if (exception instanceof FetcherServerException) {
             dialogService.showInformationDialogAndWait(Localization.lang("Look up %0", fetcher.getName()), Localization.lang("Server not available"));
         } else if (exception.getCause() != null) {
-            dialogService.showWarningDialogAndWait(Localization.lang("Look up %0", fetcher.getName()), Localization.lang("Error occured %0", exception.getCause().getMessage()));
+            dialogService.showWarningDialogAndWait(Localization.lang("Look up %0", fetcher.getName()), Localization.lang("Error occurred %0", exception.getCause().getMessage()));
         } else {
-            dialogService.showWarningDialogAndWait(Localization.lang("Look up %0", fetcher.getName()), Localization.lang("Error occured %0", exception.getCause().getMessage()));
+            dialogService.showWarningDialogAndWait(Localization.lang("Look up %0", fetcher.getName()), Localization.lang("Error occurred %0", exception.getCause().getMessage()));
         }
     }
 
@@ -124,7 +124,7 @@ public void lookupIdentifier(BibEntry bibEntry) {
     public void openExternalLink() {
         identifier.get().flatMap(Identifier::getExternalURI).ifPresent(url -> {
                     try {
-                        JabRefDesktop.openBrowser(url);
+                        JabRefDesktop.openBrowser(url, preferences.getFilePreferences());
                     } catch (IOException ex) {
                         dialogService.showErrorDialogAndWait(Localization.lang("Unable to open link."), ex);
                     }
diff --git a/src/main/java/org/jabref/gui/fieldeditors/identifier/EprintIdentifierEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/identifier/EprintIdentifierEditorViewModel.java
index 9a7c424c070..7b3c6a3c363 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/identifier/EprintIdentifierEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/identifier/EprintIdentifierEditorViewModel.java
@@ -24,7 +24,7 @@ public class EprintIdentifierEditorViewModel extends BaseIdentifierEditorViewMod
     // https://en.wikipedia.org/wiki/Lapsed_listener_problem
     private MapChangeListener<Field, String> eprintTypeFieldListener = change -> {
         Field changedField = change.getKey();
-        if (StandardField.EPRINTTYPE.equals(changedField)) {
+        if (StandardField.EPRINTTYPE == changedField) {
             updateIdentifier();
         }
     };
diff --git a/src/main/java/org/jabref/gui/fieldeditors/identifier/IdentifierEditor.java b/src/main/java/org/jabref/gui/fieldeditors/identifier/IdentifierEditor.java
index 645807b8d9a..8f9e67ff6d4 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/identifier/IdentifierEditor.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/identifier/IdentifierEditor.java
@@ -39,11 +39,11 @@ public IdentifierEditor(Field field,
                             SuggestionProvider<?> suggestionProvider,
                             FieldCheckers fieldCheckers,
                             PreferencesService preferences) {
-        if (StandardField.DOI.equals(field)) {
+        if (StandardField.DOI == field) {
             this.viewModel = new DoiIdentifierEditorViewModel(suggestionProvider, fieldCheckers, dialogService, taskExecutor, preferences);
-        } else if (StandardField.ISBN.equals(field)) {
+        } else if (StandardField.ISBN == field) {
             this.viewModel = new ISBNIdentifierEditorViewModel(suggestionProvider, fieldCheckers, dialogService, taskExecutor, preferences);
-        } else if (StandardField.EPRINT.equals(field)) {
+        } else if (StandardField.EPRINT == field) {
             this.viewModel = new EprintIdentifierEditorViewModel(suggestionProvider, fieldCheckers, dialogService, taskExecutor, preferences);
         } else {
             throw new IllegalStateException(String.format("Unable to instantiate a view model for identifier field editor '%s'", field.getDisplayName()));
@@ -86,12 +86,12 @@ public Parent getNode() {
 
     @FXML
     private void fetchInformationByIdentifier() {
-        entry.ifPresent(bibEntry -> viewModel.fetchBibliographyInformation(bibEntry));
+        entry.ifPresent(viewModel::fetchBibliographyInformation);
     }
 
     @FXML
     private void lookupIdentifier() {
-        entry.ifPresent(bibEntry -> viewModel.lookupIdentifier(bibEntry));
+        entry.ifPresent(viewModel::lookupIdentifier);
     }
 
     @FXML
diff --git a/src/main/java/org/jabref/gui/fieldeditors/journalinfo/JournalInfo.css b/src/main/java/org/jabref/gui/fieldeditors/journalinfo/JournalInfo.css
new file mode 100644
index 00000000000..6b618d5083d
--- /dev/null
+++ b/src/main/java/org/jabref/gui/fieldeditors/journalinfo/JournalInfo.css
@@ -0,0 +1,28 @@
+.info-container {
+    -fx-background-color: -jr-background-alt;
+}
+
+.info-heading {
+    -fx-font-size: 30;
+    -fx-text-fill: -jr-theme;
+}
+
+.info-label {
+    -fx-font-size: 15;
+    -fx-text-fill: -jr-theme;
+}
+
+.grid-cell {
+    -fx-border-color: transparent -fx-outer-border -fx-outer-border transparent;
+    -fx-border-width: 0 1px 1px 0;
+}
+
+.grid-cell-r {
+    -fx-border-color: transparent -fx-outer-border transparent transparent;
+    -fx-border-width: 0 1px 0 0;
+}
+
+.grid-cell-b {
+    -fx-border-color: transparent transparent -fx-outer-border transparent;
+    -fx-border-width: 0 0 1px 0;
+}
diff --git a/src/main/java/org/jabref/gui/fieldeditors/journalinfo/JournalInfo.fxml b/src/main/java/org/jabref/gui/fieldeditors/journalinfo/JournalInfo.fxml
new file mode 100644
index 00000000000..7611f0595d2
--- /dev/null
+++ b/src/main/java/org/jabref/gui/fieldeditors/journalinfo/JournalInfo.fxml
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.chart.CategoryAxis?>
+<?import javafx.scene.chart.LineChart?>
+<?import javafx.scene.chart.NumberAxis?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.RowConstraints?>
+<?import javafx.scene.layout.VBox?>
+
+<?import javafx.scene.control.ScrollPane?>
+<fx:root VBox.vgrow="ALWAYS" alignment="TOP_CENTER" prefHeight="800.0" prefWidth="1200.0" spacing="10.0" styleClass="info-container" type="VBox" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.fieldeditors.journalinfo.JournalInfoView">
+    <Label fx:id="title" styleClass="info-heading">
+        <opaqueInsets>
+            <Insets bottom="1.0" right="10.0" top="10.0" />
+        </opaqueInsets>
+    </Label>
+    <GridPane maxHeight="150.0" VBox.vgrow="ALWAYS">
+        <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 hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+        </columnConstraints>
+        <rowConstraints>
+            <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="ALWAYS" />
+         <RowConstraints />
+        </rowConstraints>
+        <VBox prefHeight="200.0" prefWidth="100.0" styleClass="grid-cell-r">
+            <Label styleClass="info-label" text="%h-index">
+                <VBox.margin>
+                    <Insets bottom="10.0" />
+                </VBox.margin>
+            </Label>
+            <Label fx:id="hIndex" style="-fx-font-size: 24;" />
+            <padding>
+                <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+            </padding>
+        </VBox>
+        <VBox prefHeight="200.0" prefWidth="100.0" styleClass="grid-cell-r" GridPane.columnIndex="1">
+            <Label styleClass="info-label" text="%Categories">
+                <VBox.margin>
+                    <Insets bottom="10.0" />
+                </VBox.margin>
+            </Label>
+            <ScrollPane>
+                <Label fx:id="categories" />
+            </ScrollPane>
+            <padding>
+                <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+            </padding>
+        </VBox>
+        <VBox prefHeight="200.0" prefWidth="100.0" styleClass="grid-cell-r" GridPane.columnIndex="2">
+            <Label styleClass="info-label" text="%Publisher">
+                <VBox.margin>
+                    <Insets bottom="10.0" />
+                </VBox.margin>
+            </Label>
+            <Label fx:id="publisher" />
+            <padding>
+                <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+            </padding>
+        </VBox>
+        <VBox prefHeight="200.0" prefWidth="100.0" GridPane.columnIndex="3">
+            <Label styleClass="info-label" text="%ISSN">
+                <VBox.margin>
+                    <Insets bottom="10.0" />
+                </VBox.margin>
+            </Label>
+            <Label fx:id="issn" />
+            <padding>
+                <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+            </padding>
+        </VBox>
+        <VBox.margin>
+            <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+        </VBox.margin>
+    </GridPane>
+    <GridPane prefHeight="564.0" prefWidth="1180.0" VBox.vgrow="SOMETIMES">
+     <columnConstraints>
+        <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>
+        <LineChart fx:id="sjrChart" legendVisible="false" title="SJR">
+            <xAxis>
+             <CategoryAxis label="%Year" side="BOTTOM" />
+            </xAxis>
+            <yAxis>
+             <NumberAxis minorTickVisible="false" side="LEFT" />
+            </yAxis>
+        </LineChart>
+        <LineChart fx:id="citesIncomingByRecentlyPublishedChart" legendVisible="false" title="%Cites Incoming by Recently Published" GridPane.columnIndex="1" GridPane.rowIndex="0">
+            <xAxis>
+                <CategoryAxis label="%Year" side="BOTTOM" />
+            </xAxis>
+            <yAxis>
+                <NumberAxis minorTickVisible="false" side="LEFT" />
+            </yAxis>
+        </LineChart>
+        <LineChart fx:id="citesOutgoingChart" legendVisible="false" title="%Cites Outgoing" GridPane.columnIndex="0" GridPane.rowIndex="1">
+            <xAxis>
+                <CategoryAxis label="%Year" side="BOTTOM" />
+            </xAxis>
+            <yAxis>
+                <NumberAxis minorTickVisible="false" side="LEFT" />
+            </yAxis>
+        </LineChart>
+        <LineChart fx:id="citesOutgoingPerDocChart" legendVisible="false" title="%Cites Outgoing per Document" GridPane.columnIndex="1" GridPane.rowIndex="1">
+            <xAxis>
+                <CategoryAxis label="%Year" side="BOTTOM" />
+            </xAxis>
+            <yAxis>
+                <NumberAxis minorTickVisible="false" side="LEFT" />
+            </yAxis>
+        </LineChart>
+        <LineChart fx:id="docsThisYearChart" legendVisible="false" title="%Docs (This Year)" GridPane.columnIndex="0" GridPane.rowIndex="2">
+            <xAxis>
+              <CategoryAxis label="%Year" side="BOTTOM" />
+            </xAxis>
+            <yAxis>
+              <NumberAxis minorTickVisible="false" side="LEFT" />
+            </yAxis>
+        </LineChart>
+        <LineChart fx:id="citableDocsPrevious3YearsChart" legendVisible="false" title="%Citable Docs (Previous 3 Years)" GridPane.columnIndex="1" GridPane.rowIndex="2">
+            <xAxis>
+                <CategoryAxis label="%Year" side="BOTTOM" />
+            </xAxis>
+            <yAxis>
+                <NumberAxis minorTickVisible="false" side="LEFT" />
+            </yAxis>
+        </LineChart>
+    </GridPane>
+    <padding>
+        <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+    </padding>
+</fx:root>
diff --git a/src/main/java/org/jabref/gui/fieldeditors/journalinfo/JournalInfoView.java b/src/main/java/org/jabref/gui/fieldeditors/journalinfo/JournalInfoView.java
new file mode 100644
index 00000000000..adffd08e287
--- /dev/null
+++ b/src/main/java/org/jabref/gui/fieldeditors/journalinfo/JournalInfoView.java
@@ -0,0 +1,63 @@
+package org.jabref.gui.fieldeditors.journalinfo;
+
+import java.util.Objects;
+
+import javafx.fxml.FXML;
+import javafx.scene.Node;
+import javafx.scene.chart.LineChart;
+import javafx.scene.control.Label;
+import javafx.scene.layout.VBox;
+
+import org.jabref.logic.importer.FetcherException;
+
+import com.airhacks.afterburner.views.ViewLoader;
+
+public class JournalInfoView extends VBox {
+    @FXML private Label title;
+    @FXML private Label categories;
+    @FXML private Label publisher;
+    @FXML private Label hIndex;
+    @FXML private Label issn;
+    @FXML private LineChart<String, Double> sjrChart;
+    @FXML private LineChart<String, Double> citableDocsPrevious3YearsChart;
+    @FXML private LineChart<String, Double> citesOutgoingChart;
+    @FXML private LineChart<String, Double> citesOutgoingPerDocChart;
+    @FXML private LineChart<String, Double> citesIncomingByRecentlyPublishedChart;
+    @FXML private LineChart<String, Double> docsThisYearChart;
+    private final JournalInfoViewModel viewModel;
+
+    public JournalInfoView() {
+        this.viewModel = new JournalInfoViewModel();
+
+        ViewLoader.view(this)
+                  .root(this)
+                  .load();
+
+        this.getStylesheets().add(Objects.requireNonNull(JournalInfoView.class.getResource("JournalInfo.css")).toExternalForm());
+
+        title.textProperty().bind(viewModel.titleProperty());
+        categories.textProperty().bind(viewModel.categoriesProperty());
+        publisher.textProperty().bind(viewModel.publisherProperty());
+        hIndex.textProperty().bind(viewModel.hIndexProperty());
+        this.issn.textProperty().bind(viewModel.issnProperty());
+        bindChartProperties();
+    }
+
+    public Node populateJournalInformation(String issn, String journalName) throws FetcherException {
+        viewModel.populateJournalInformation(issn, journalName);
+        return this;
+    }
+
+    public Node getNode() {
+        return this;
+    }
+
+    private void bindChartProperties() {
+        sjrChart.setData(viewModel.getSjrData());
+        citableDocsPrevious3YearsChart.setData(viewModel.getCitableDocsPrevious3YearsData());
+        citesOutgoingChart.setData(viewModel.getCitesOutgoingData());
+        citesOutgoingPerDocChart.setData(viewModel.getCitesOutgoingPerDocData());
+        citesIncomingByRecentlyPublishedChart.setData(viewModel.getCitesIncomingByRecentlyPublishedData());
+        docsThisYearChart.setData(viewModel.getDocsThisYearData());
+    }
+}
diff --git a/src/main/java/org/jabref/gui/fieldeditors/journalinfo/JournalInfoViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/journalinfo/JournalInfoViewModel.java
new file mode 100644
index 00000000000..671bcc3024b
--- /dev/null
+++ b/src/main/java/org/jabref/gui/fieldeditors/journalinfo/JournalInfoViewModel.java
@@ -0,0 +1,191 @@
+package org.jabref.gui.fieldeditors.journalinfo;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import javafx.beans.property.ReadOnlyStringWrapper;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import javafx.scene.chart.XYChart;
+import javafx.util.Pair;
+
+import org.jabref.gui.AbstractViewModel;
+import org.jabref.logic.importer.FetcherException;
+import org.jabref.logic.importer.fetcher.JournalInformationFetcher;
+import org.jabref.logic.journals.JournalInformation;
+
+public class JournalInfoViewModel extends AbstractViewModel {
+    private final ReadOnlyStringWrapper title = new ReadOnlyStringWrapper();
+    private final ReadOnlyStringWrapper country = new ReadOnlyStringWrapper();
+    private final ReadOnlyStringWrapper categories = new ReadOnlyStringWrapper();
+    private final ReadOnlyStringWrapper publisher = new ReadOnlyStringWrapper();
+    private final ReadOnlyStringWrapper scimagoId = new ReadOnlyStringWrapper();
+    private final ReadOnlyStringWrapper hIndex = new ReadOnlyStringWrapper();
+    private final ReadOnlyStringWrapper issn = new ReadOnlyStringWrapper();
+    private final ObservableList<XYChart.Series<String, Double>> sjrData = FXCollections.observableArrayList();
+    private final ObservableList<XYChart.Series<String, Double>> snipData = FXCollections.observableArrayList();
+    private final ObservableList<XYChart.Series<String, Double>> citableDocsPrevious3YearsData = FXCollections.observableArrayList();
+    private final ObservableList<XYChart.Series<String, Double>> citesOutgoingData = FXCollections.observableArrayList();
+    private final ObservableList<XYChart.Series<String, Double>> citesOutgoingPerDocData = FXCollections.observableArrayList();
+    private final ObservableList<XYChart.Series<String, Double>> citesIncomingByRecentlyPublishedData = FXCollections.observableArrayList();
+    private final ObservableList<XYChart.Series<String, Double>> docsThisYearData = FXCollections.observableArrayList();
+
+    public void populateJournalInformation(String issn, String journalName) throws FetcherException {
+        Optional<JournalInformation> journalInformationOptional = new JournalInformationFetcher().getJournalInformation(issn, journalName);
+
+        journalInformationOptional.ifPresent(journalInformation -> {
+            setTitle(journalInformation.title());
+            setCountry(journalInformation.country());
+            setCategories(getFormattedCategories(journalInformation));
+            setPublisher(getFormattedPublisher(journalInformation));
+            setScimagoId(journalInformation.scimagoId());
+            sethIndex(journalInformation.hIndex());
+            setIssn(journalInformation.issn());
+            sjrData.add(convertToSeries(journalInformation.sjrArray()));
+            snipData.add(convertToSeries(journalInformation.snipArray()));
+            citableDocsPrevious3YearsData.add(convertToSeries(journalInformation.citableDocsPrevious3Years()));
+            citesOutgoingData.add(convertToSeries(journalInformation.citesOutgoing()));
+            citesOutgoingPerDocData.add(convertToSeries(journalInformation.citesOutgoingPerDoc()));
+            citesIncomingByRecentlyPublishedData.add(convertToSeries(journalInformation.citesIncomingByRecentlyPublished()));
+            docsThisYearData.add(convertToSeries(journalInformation.docsThisYear()));
+        });
+    }
+
+    public String getTitle() {
+        return title.get();
+    }
+
+    public ReadOnlyStringWrapper titleProperty() {
+        return title;
+    }
+
+    private void setTitle(String title) {
+        this.title.set(title);
+    }
+
+    public String getCountry() {
+        return country.get();
+    }
+
+    public ReadOnlyStringWrapper countryProperty() {
+        return country;
+    }
+
+    public void setCountry(String country) {
+        this.country.set(country);
+    }
+
+    public String getCategories() {
+        return categories.get();
+    }
+
+    public ReadOnlyStringWrapper categoriesProperty() {
+        return categories;
+    }
+
+    public void setCategories(String categories) {
+        this.categories.set(categories);
+    }
+
+    public String getPublisher() {
+        return publisher.get();
+    }
+
+    public ReadOnlyStringWrapper publisherProperty() {
+        return publisher;
+    }
+
+    public void setPublisher(String publisher) {
+        this.publisher.set(publisher);
+    }
+
+    public String getScimagoId() {
+        return scimagoId.get();
+    }
+
+    public ReadOnlyStringWrapper scimagoIdProperty() {
+        return scimagoId;
+    }
+
+    public void setScimagoId(String scimagoId) {
+        this.scimagoId.set(scimagoId);
+    }
+
+    public String gethIndex() {
+        return hIndex.get();
+    }
+
+    public ReadOnlyStringWrapper hIndexProperty() {
+        return hIndex;
+    }
+
+    public void sethIndex(String hIndex) {
+        this.hIndex.set(hIndex);
+    }
+
+    public String getIssn() {
+        return issn.get();
+    }
+
+    public ReadOnlyStringWrapper issnProperty() {
+        return issn;
+    }
+
+    public void setIssn(String issn) {
+        this.issn.set(issn);
+    }
+
+    public ObservableList<XYChart.Series<String, Double>> getSjrData() {
+        return sjrData;
+    }
+
+    public ObservableList<XYChart.Series<String, Double>> getSnipData() {
+        return snipData;
+    }
+
+    public ObservableList<XYChart.Series<String, Double>> getCitableDocsPrevious3YearsData() {
+        return citableDocsPrevious3YearsData;
+    }
+
+    public ObservableList<XYChart.Series<String, Double>> getCitesOutgoingData() {
+        return citesOutgoingData;
+    }
+
+    public ObservableList<XYChart.Series<String, Double>> getCitesOutgoingPerDocData() {
+        return citesOutgoingPerDocData;
+    }
+
+    public ObservableList<XYChart.Series<String, Double>> getCitesIncomingByRecentlyPublishedData() {
+        return citesIncomingByRecentlyPublishedData;
+    }
+
+    public ObservableList<XYChart.Series<String, Double>> getDocsThisYearData() {
+        return docsThisYearData;
+    }
+
+    public XYChart.Series<String, Double> convertToSeries(List<Pair<Integer, Double>> data) {
+        XYChart.Series<String, Double> series = new XYChart.Series<>();
+        data.stream()
+            .map(pair -> new XYChart.Data<>(pair.getKey().toString(), pair.getValue()))
+            .forEach(series.getData()::add);
+        return series;
+    }
+
+    private static String getFormattedCategories(JournalInformation journalInformation) {
+        return Arrays.stream(journalInformation.categories().split(","))
+                     .map(String::trim)
+                     .collect(Collectors.joining("\n"));
+    }
+
+    private static String getFormattedPublisher(JournalInformation journalInformation) {
+        StringBuilder publisher = new StringBuilder();
+        publisher.append(journalInformation.publisher());
+        String country = journalInformation.country();
+        if (!country.isBlank()) {
+            publisher.append(" (").append(country).append(")");
+        }
+        return publisher.toString();
+    }
+}
diff --git a/src/main/java/org/jabref/gui/groups/GroupDialogView.java b/src/main/java/org/jabref/gui/groups/GroupDialogView.java
index 218c64379f0..b7b4b020f62 100644
--- a/src/main/java/org/jabref/gui/groups/GroupDialogView.java
+++ b/src/main/java/org/jabref/gui/groups/GroupDialogView.java
@@ -38,10 +38,12 @@
 import org.jabref.model.groups.GroupHierarchyType;
 import org.jabref.model.search.rules.SearchRules;
 import org.jabref.model.search.rules.SearchRules.SearchFlags;
+import org.jabref.model.util.FileUpdateMonitor;
 import org.jabref.preferences.PreferencesService;
 
 import com.airhacks.afterburner.views.ViewLoader;
 import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
+import jakarta.inject.Inject;
 import org.controlsfx.control.GridCell;
 import org.controlsfx.control.GridView;
 import org.controlsfx.control.PopOver;
@@ -86,6 +88,8 @@ public class GroupDialogView extends BaseDialog<AbstractGroup> {
 
     @FXML private TextField texGroupFilePath;
 
+    @Inject private FileUpdateMonitor fileUpdateMonitor;
+
     private final EnumMap<GroupHierarchyType, String> hierarchyText = new EnumMap<>(GroupHierarchyType.class);
     private final EnumMap<GroupHierarchyType, String> hierarchyToolTip = new EnumMap<>(GroupHierarchyType.class);
 
@@ -97,7 +101,7 @@ public GroupDialogView(DialogService dialogService,
                            PreferencesService preferencesService,
                            AbstractGroup editedGroup,
                            GroupDialogHeader groupDialogHeader) {
-        viewModel = new GroupDialogViewModel(dialogService, currentDatabase, preferencesService, editedGroup, groupDialogHeader);
+        viewModel = new GroupDialogViewModel(dialogService, currentDatabase, preferencesService, editedGroup, fileUpdateMonitor);
 
         ViewLoader.view(this)
                   .load()
@@ -154,6 +158,7 @@ public void initialize() {
         keywordGroupRegex.selectedProperty().bindBidirectional(viewModel.keywordGroupRegexProperty());
 
         searchGroupSearchTerm.textProperty().bindBidirectional(viewModel.searchGroupSearchTermProperty());
+        searchGroupCaseSensitive.setSelected(viewModel.searchFlagsProperty().getValue().contains(SearchFlags.CASE_SENSITIVE));
         searchGroupCaseSensitive.selectedProperty().addListener((observable, oldValue, newValue) -> {
             EnumSet<SearchFlags> searchFlags = viewModel.searchFlagsProperty().get();
             if (newValue) {
@@ -163,6 +168,7 @@ public void initialize() {
             }
             viewModel.searchFlagsProperty().set(searchFlags);
         });
+        searchGroupRegex.setSelected(viewModel.searchFlagsProperty().getValue().contains(SearchFlags.REGULAR_EXPRESSION));
         searchGroupRegex.selectedProperty().addListener((observable, oldValue, newValue) -> {
             EnumSet<SearchFlags> searchFlags = viewModel.searchFlagsProperty().get();
             if (newValue) {
diff --git a/src/main/java/org/jabref/gui/groups/GroupDialogViewModel.java b/src/main/java/org/jabref/gui/groups/GroupDialogViewModel.java
index 52760352acb..e18d431d0bd 100644
--- a/src/main/java/org/jabref/gui/groups/GroupDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/groups/GroupDialogViewModel.java
@@ -24,7 +24,6 @@
 import javafx.scene.paint.Color;
 
 import org.jabref.gui.DialogService;
-import org.jabref.gui.Globals;
 import org.jabref.gui.help.HelpAction;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.util.FileDialogConfiguration;
@@ -52,6 +51,7 @@
 import org.jabref.model.search.rules.SearchRules;
 import org.jabref.model.search.rules.SearchRules.SearchFlags;
 import org.jabref.model.strings.StringUtil;
+import org.jabref.model.util.FileUpdateMonitor;
 import org.jabref.preferences.PreferencesService;
 
 import de.saxsys.mvvmfx.utils.validation.CompositeValidator;
@@ -109,18 +109,18 @@ public class GroupDialogViewModel {
     private final PreferencesService preferencesService;
     private final BibDatabaseContext currentDatabase;
     private final AbstractGroup editedGroup;
-    private final GroupDialogHeader groupDialogHeader;
+    private final FileUpdateMonitor fileUpdateMonitor;
 
     public GroupDialogViewModel(DialogService dialogService,
                                 BibDatabaseContext currentDatabase,
                                 PreferencesService preferencesService,
                                 AbstractGroup editedGroup,
-                                GroupDialogHeader groupDialogHeader) {
+                                FileUpdateMonitor fileUpdateMonitor) {
         this.dialogService = dialogService;
         this.preferencesService = preferencesService;
         this.currentDatabase = currentDatabase;
         this.editedGroup = editedGroup;
-        this.groupDialogHeader = groupDialogHeader;
+        this.fileUpdateMonitor = fileUpdateMonitor;
 
         setupValidation();
         setValues();
@@ -279,7 +279,7 @@ private void setupValidation() {
      * @return an absolute path if LatexFileDirectory exists; otherwise, returns input
      */
     private Path getAbsoluteTexGroupPath(String input) {
-        Optional<Path> latexFileDirectory = currentDatabase.getMetaData().getLatexFileDirectory(preferencesService.getFilePreferences().getUser());
+        Optional<Path> latexFileDirectory = currentDatabase.getMetaData().getLatexFileDirectory(preferencesService.getFilePreferences().getUserAndHost());
         return latexFileDirectory.map(path -> path.resolve(input)).orElse(Path.of(input));
     }
 
@@ -334,6 +334,7 @@ public AbstractGroup resultConverter(ButtonType button) {
                     // Set default value for delimiters: ',' for base and '>' for hierarchical
                     char delimiter = ',';
                     char hierarDelimiter = Keyword.DEFAULT_HIERARCHICAL_DELIMITER;
+                    autoGroupKeywordsOptionProperty.setValue(Boolean.TRUE);
                     // Modify values for delimiters if user provided customized values
                     if (!autoGroupKeywordsDelimiterProperty.getValue().isEmpty()) {
                         delimiter = autoGroupKeywordsDelimiterProperty.getValue().charAt(0);
@@ -359,7 +360,7 @@ public AbstractGroup resultConverter(ButtonType button) {
                         groupHierarchySelectedProperty.getValue(),
                         Path.of(texGroupFilePathProperty.getValue().trim()),
                         new DefaultAuxParser(new BibDatabase()),
-                        Globals.getFileUpdateMonitor(),
+                        fileUpdateMonitor,
                         currentDatabase.getMetaData());
             }
 
@@ -387,6 +388,7 @@ public void setValues() {
             colorProperty.setValue(IconTheme.getDefaultGroupColor());
             typeExplicitProperty.setValue(true);
             groupHierarchySelectedProperty.setValue(preferencesService.getGroupsPreferences().getDefaultHierarchicalContext());
+            autoGroupKeywordsOptionProperty.setValue(Boolean.TRUE);
         } else {
             nameProperty.setValue(editedGroup.getName());
             colorProperty.setValue(editedGroup.getColor().orElse(IconTheme.getDefaultGroupColor()));
@@ -423,11 +425,13 @@ public void setValues() {
 
                 if (editedGroup.getClass() == AutomaticKeywordGroup.class) {
                     AutomaticKeywordGroup group = (AutomaticKeywordGroup) editedGroup;
+                    autoGroupKeywordsOptionProperty.setValue(Boolean.TRUE);
                     autoGroupKeywordsDelimiterProperty.setValue(group.getKeywordDelimiter().toString());
                     autoGroupKeywordsHierarchicalDelimiterProperty.setValue(group.getKeywordHierarchicalDelimiter().toString());
                     autoGroupKeywordsFieldProperty.setValue(group.getField().getName());
                 } else if (editedGroup.getClass() == AutomaticPersonsGroup.class) {
                     AutomaticPersonsGroup group = (AutomaticPersonsGroup) editedGroup;
+                    autoGroupPersonsOptionProperty.setValue(Boolean.TRUE);
                     autoGroupPersonsFieldProperty.setValue(group.getField().getName());
                 }
             } else if (editedGroup.getClass() == TexGroup.class) {
@@ -444,7 +448,7 @@ public void texGroupBrowse() {
                 .addExtensionFilter(StandardFileType.AUX)
                 .withDefaultExtension(StandardFileType.AUX)
                 .withInitialDirectory(currentDatabase.getMetaData()
-                                                     .getLatexFileDirectory(preferencesService.getFilePreferences().getUser())
+                                                     .getLatexFileDirectory(preferencesService.getFilePreferences().getUserAndHost())
                                                      .orElse(FileUtil.getInitialDirectory(currentDatabase, preferencesService.getFilePreferences().getWorkingDirectory()))).build();
         dialogService.showFileOpenDialog(fileDialogConfiguration)
                      .ifPresent(file -> texGroupFilePathProperty.setValue(
@@ -453,13 +457,13 @@ public void texGroupBrowse() {
     }
 
     public void openHelpPage() {
-        new HelpAction(HelpFile.GROUPS, dialogService).execute();
+        new HelpAction(HelpFile.GROUPS, dialogService, preferencesService.getFilePreferences()).execute();
     }
 
     private List<Path> getFileDirectoriesAsPaths() {
         List<Path> fileDirs = new ArrayList<>();
         MetaData metaData = currentDatabase.getMetaData();
-        metaData.getLatexFileDirectory(preferencesService.getFilePreferences().getUser()).ifPresent(fileDirs::add);
+        metaData.getLatexFileDirectory(preferencesService.getFilePreferences().getUserAndHost()).ifPresent(fileDirs::add);
 
         return fileDirs;
     }
diff --git a/src/main/java/org/jabref/gui/groups/GroupNodeViewModel.java b/src/main/java/org/jabref/gui/groups/GroupNodeViewModel.java
index f63eafc2470..bd113bf249e 100644
--- a/src/main/java/org/jabref/gui/groups/GroupNodeViewModel.java
+++ b/src/main/java/org/jabref/gui/groups/GroupNodeViewModel.java
@@ -32,9 +32,17 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.groups.AbstractGroup;
+import org.jabref.model.groups.AllEntriesGroup;
 import org.jabref.model.groups.AutomaticGroup;
+import org.jabref.model.groups.AutomaticKeywordGroup;
+import org.jabref.model.groups.AutomaticPersonsGroup;
+import org.jabref.model.groups.ExplicitGroup;
 import org.jabref.model.groups.GroupEntryChanger;
 import org.jabref.model.groups.GroupTreeNode;
+import org.jabref.model.groups.KeywordGroup;
+import org.jabref.model.groups.LastNameGroup;
+import org.jabref.model.groups.RegexKeywordGroup;
+import org.jabref.model.groups.SearchGroup;
 import org.jabref.model.groups.TexGroup;
 import org.jabref.model.strings.StringUtil;
 import org.jabref.preferences.PreferencesService;
@@ -59,7 +67,7 @@ public class GroupNodeViewModel {
     private final CustomLocalDragboard localDragBoard;
     private final ObservableList<BibEntry> entriesList;
     private final PreferencesService preferencesService;
-    private final InvalidationListener onInvalidatedGroup = (listener) -> refreshGroup();
+    private final InvalidationListener onInvalidatedGroup = listener -> refreshGroup();
 
     public GroupNodeViewModel(BibDatabaseContext databaseContext, StateManager stateManager, TaskExecutor taskExecutor, GroupTreeNode groupNode, CustomLocalDragboard localDragBoard, PreferencesService preferencesService) {
         this.databaseContext = Objects.requireNonNull(databaseContext);
@@ -368,4 +376,135 @@ public void draggedOn(GroupNodeViewModel target, DroppingMouseLocation mouseLoca
     private int getPositionInParent() {
         return groupNode.getPositionInParent();
     }
+
+    public boolean hasSubgroups() {
+        return !getChildren().isEmpty();
+    }
+
+    public boolean canAddEntriesIn() {
+        AbstractGroup group = groupNode.getGroup();
+        if (group instanceof AllEntriesGroup) {
+            return false;
+        } else if (group instanceof ExplicitGroup) {
+            return true;
+        } else if (group instanceof LastNameGroup || group instanceof RegexKeywordGroup) {
+            return groupNode.getParent()
+                            .map(parent -> parent.getGroup())
+                            .map(groupParent -> groupParent instanceof AutomaticKeywordGroup || groupParent instanceof AutomaticPersonsGroup)
+                            .orElse(false);
+        } else if (group instanceof KeywordGroup) {
+            // also covers WordKeywordGroup
+            return true;
+        } else if (group instanceof SearchGroup) {
+            return false;
+        } else if (group instanceof AutomaticKeywordGroup) {
+            return false;
+        } else if (group instanceof AutomaticPersonsGroup) {
+            return false;
+        } else if (group instanceof TexGroup) {
+            return false;
+        } else {
+            throw new UnsupportedOperationException("canAddEntriesIn method not yet implemented in group: " + group.getClass().getName());
+        }
+    }
+
+    public boolean canBeDragged() {
+        AbstractGroup group = groupNode.getGroup();
+        if (group instanceof AllEntriesGroup) {
+            return false;
+        } else if (group instanceof ExplicitGroup) {
+            return true;
+        } else if (group instanceof KeywordGroup) {
+            // KeywordGroup is parent of LastNameGroup, RegexKeywordGroup and WordKeywordGroup
+            return groupNode.getParent()
+                            .map(parent -> parent.getGroup())
+                            .map(groupParent -> !(groupParent instanceof AutomaticKeywordGroup || groupParent instanceof AutomaticPersonsGroup))
+                            .orElse(false);
+        } else if (group instanceof SearchGroup) {
+            return true;
+        } else if (group instanceof AutomaticKeywordGroup) {
+            return true;
+        } else if (group instanceof AutomaticPersonsGroup) {
+            return true;
+        } else if (group instanceof TexGroup) {
+            return true;
+        } else {
+            throw new UnsupportedOperationException("canBeDragged method not yet implemented in group: " + group.getClass().getName());
+        }
+    }
+
+    public boolean canAddGroupsIn() {
+        AbstractGroup group = groupNode.getGroup();
+        if (group instanceof AllEntriesGroup) {
+            return true;
+        } else if (group instanceof ExplicitGroup) {
+            return true;
+        } else if (group instanceof KeywordGroup) {
+            // KeywordGroup is parent of LastNameGroup, RegexKeywordGroup and WordKeywordGroup
+            return groupNode.getParent()
+                            .map(parent -> parent.getGroup())
+                            .map(groupParent -> !(groupParent instanceof AutomaticKeywordGroup || groupParent instanceof AutomaticPersonsGroup))
+                            .orElse(false);
+        } else if (group instanceof SearchGroup) {
+            return true;
+        } else if (group instanceof AutomaticKeywordGroup) {
+            return false;
+        } else if (group instanceof AutomaticPersonsGroup) {
+            return false;
+        } else if (group instanceof TexGroup) {
+            return true;
+        } else {
+            throw new UnsupportedOperationException("canAddGroupsIn method not yet implemented in group: " + group.getClass().getName());
+        }
+    }
+
+    public boolean canRemove() {
+        AbstractGroup group = groupNode.getGroup();
+        if (group instanceof AllEntriesGroup) {
+            return false;
+        } else if (group instanceof ExplicitGroup) {
+            return true;
+        } else if (group instanceof KeywordGroup) {
+            // KeywordGroup is parent of LastNameGroup, RegexKeywordGroup and WordKeywordGroup
+            return groupNode.getParent()
+                            .map(parent -> parent.getGroup())
+                            .map(groupParent -> !(groupParent instanceof AutomaticKeywordGroup || groupParent instanceof AutomaticPersonsGroup))
+                            .orElse(false);
+        } else if (group instanceof SearchGroup) {
+            return true;
+        } else if (group instanceof AutomaticKeywordGroup) {
+            return true;
+        } else if (group instanceof AutomaticPersonsGroup) {
+            return true;
+        } else if (group instanceof TexGroup) {
+            return true;
+        } else {
+            throw new UnsupportedOperationException("canRemove method not yet implemented in group: " + group.getClass().getName());
+        }
+    }
+
+    public boolean isEditable() {
+        AbstractGroup group = groupNode.getGroup();
+        if (group instanceof AllEntriesGroup) {
+            return false;
+        } else if (group instanceof ExplicitGroup) {
+            return true;
+        } else if (group instanceof KeywordGroup) {
+            // KeywordGroup is parent of LastNameGroup, RegexKeywordGroup and WordKeywordGroup
+            return groupNode.getParent()
+                            .map(parent -> parent.getGroup())
+                            .map(groupParent -> !(groupParent instanceof AutomaticKeywordGroup || groupParent instanceof AutomaticPersonsGroup))
+                            .orElse(false);
+        } else if (group instanceof SearchGroup) {
+            return true;
+        } else if (group instanceof AutomaticKeywordGroup) {
+            return true;
+        } else if (group instanceof AutomaticPersonsGroup) {
+            return true;
+        } else if (group instanceof TexGroup) {
+            return true;
+        } else {
+            throw new UnsupportedOperationException("isEditable method not yet implemented in group: " + group.getClass().getName());
+        }
+    }
 }
diff --git a/src/main/java/org/jabref/gui/groups/GroupTreeNodeViewModel.java b/src/main/java/org/jabref/gui/groups/GroupTreeNodeViewModel.java
index e173f06215b..4383ec85ebf 100644
--- a/src/main/java/org/jabref/gui/groups/GroupTreeNodeViewModel.java
+++ b/src/main/java/org/jabref/gui/groups/GroupTreeNodeViewModel.java
@@ -59,12 +59,12 @@ public String getDescription() {
         AbstractGroup group = node.getGroup();
         String shortDescription = "";
         boolean showDynamic = true;
-        if (group instanceof ExplicitGroup) {
-            shortDescription = GroupDescriptions.getShortDescriptionExplicitGroup((ExplicitGroup) group);
-        } else if (group instanceof KeywordGroup) {
-            shortDescription = GroupDescriptions.getShortDescriptionKeywordGroup((KeywordGroup) group, showDynamic);
-        } else if (group instanceof SearchGroup) {
-            shortDescription = GroupDescriptions.getShortDescription((SearchGroup) group, showDynamic);
+        if (group instanceof ExplicitGroup explicitGroup) {
+            shortDescription = GroupDescriptions.getShortDescriptionExplicitGroup(explicitGroup);
+        } else if (group instanceof KeywordGroup keywordGroup) {
+            shortDescription = GroupDescriptions.getShortDescriptionKeywordGroup(keywordGroup, showDynamic);
+        } else if (group instanceof SearchGroup searchGroup) {
+            shortDescription = GroupDescriptions.getShortDescription(searchGroup, showDynamic);
         } else {
             shortDescription = GroupDescriptions.getShortDescriptionAllEntriesGroup();
         }
diff --git a/src/main/java/org/jabref/gui/groups/GroupTreeView.java b/src/main/java/org/jabref/gui/groups/GroupTreeView.java
index 9da46651442..25c679c1254 100644
--- a/src/main/java/org/jabref/gui/groups/GroupTreeView.java
+++ b/src/main/java/org/jabref/gui/groups/GroupTreeView.java
@@ -175,7 +175,7 @@ private void initialize() {
                 BindingsHelper.bindContentBidirectional(
                         groupTree.getSelectionModel().getSelectedItems(),
                         viewModel.selectedGroupsProperty(),
-                        (newSelectedGroups) -> newSelectedGroups.forEach(this::selectNode),
+                        newSelectedGroups -> newSelectedGroups.forEach(this::selectNode),
                         this::updateSelection
                 ));
 
@@ -224,7 +224,7 @@ private void initialize() {
 
         new ViewModelTreeTableRowFactory<GroupNodeViewModel>()
                 .withContextMenu(this::createContextMenuForGroup)
-                .withOnMousePressedEvent((row, event) -> {
+                .withEventFilter(MouseEvent.MOUSE_PRESSED, (row, event) -> {
                     if (event.getTarget() instanceof StackPane pane) {
                         if (pane.getStyleClass().contains("arrow") || pane.getStyleClass().contains("tree-disclosure-node")) {
                             event.consume();
@@ -242,7 +242,7 @@ private void initialize() {
                 .setOnDragExited(this::handleOnDragExited)
                 .setOnDragOver(this::handleOnDragOver)
                 .withPseudoClass(PSEUDOCLASS_ROOTELEMENT, row -> Bindings.createBooleanBinding(
-                        () -> (row != null) && (row.getItem() == groupTree.getRoot().getValue()), row.treeItemProperty()))
+                        () -> (row != null) && (groupTree.getRoot() != null) && (row.getItem() == groupTree.getRoot().getValue()), row.treeItemProperty()))
                 .withPseudoClass(PSEUDOCLASS_SUBELEMENT, row -> Bindings.createBooleanBinding(
                         () -> (row != null) && (groupTree.getTreeItemLevel(row.getTreeItem()) > 1), row.treeItemProperty()))
                 .install(groupTree);
@@ -266,7 +266,6 @@ private StackPane getArrowCell(GroupNodeViewModel viewModel) {
 
     private StackPane createNumberCell(GroupNodeViewModel group) {
         final StackPane node = new StackPane();
-        node.getStyleClass().setAll("hits");
         if (!group.isRoot()) {
             BindingsHelper.includePseudoClassWhen(node, PSEUDOCLASS_ANYSELECTED,
                     group.anySelectedEntriesMatchedProperty());
@@ -275,21 +274,27 @@ private StackPane createNumberCell(GroupNodeViewModel group) {
         }
         Text text = new Text();
         EasyBind.subscribe(preferencesService.getGroupsPreferences().displayGroupCountProperty(),
-                (newValue) -> {
+                shouldDisplayGroupCount -> {
                     if (text.textProperty().isBound()) {
                         text.textProperty().unbind();
                         text.setText("");
                     }
 
-                    if (newValue) {
+                    node.getStyleClass().clear();
+
+                    if (shouldDisplayGroupCount) {
+                        node.getStyleClass().add("hits");
                         text.textProperty().bind(group.getHits().map(Number::intValue).map(this::getFormattedNumber));
+                        Tooltip tooltip = new Tooltip();
+                        tooltip.textProperty().bind(group.getHits().asString());
+                        Tooltip.install(text, tooltip);
                     }
                 });
         text.getStyleClass().setAll("text");
 
         text.styleProperty().bind(Bindings.createStringBinding(() -> {
             double reducedFontSize;
-            double font_size = preferencesService.getAppearancePreferences().getMainFontSize();
+            double font_size = preferencesService.getWorkspacePreferences().getMainFontSize();
             // For each breaking point, the font size is reduced 0.20 em to fix issue 8797
             if (font_size > 26.0) {
                 reducedFontSize = 0.25;
@@ -301,7 +306,7 @@ private StackPane createNumberCell(GroupNodeViewModel group) {
                 reducedFontSize = 0.75;
             }
             return String.format("-fx-font-size: %fem;", reducedFontSize);
-        }, preferencesService.getAppearancePreferences().mainFontSizeProperty()));
+        }, preferencesService.getWorkspacePreferences().mainFontSizeProperty()));
 
         node.getChildren().add(text);
         node.setMaxWidth(Control.USE_PREF_SIZE);
@@ -320,7 +325,7 @@ private void handleOnDragDetected(TreeTableRow<GroupNodeViewModel> row, GroupNod
             }
         }
 
-        if (groupsToMove.size() > 0) {
+        if (!groupsToMove.isEmpty()) {
             localDragboard.clearAll();
         }
 
@@ -338,14 +343,14 @@ private void handleOnDragDropped(TreeTableRow<GroupNodeViewModel> row, GroupNode
         Dragboard dragboard = event.getDragboard();
         boolean success = false;
 
-        if (dragboard.hasContent(DragAndDropDataFormats.GROUP) && viewModel.canAddGroupsIn(row.getItem())) {
+        if (dragboard.hasContent(DragAndDropDataFormats.GROUP) && row.getItem().canAddGroupsIn()) {
             List<String> pathToSources = (List<String>) dragboard.getContent(DragAndDropDataFormats.GROUP);
             List<GroupNodeViewModel> changedGroups = new LinkedList<>();
             for (String pathToSource : pathToSources) {
                 Optional<GroupNodeViewModel> source = viewModel
                         .rootGroupProperty().get()
                         .getChildByPath(pathToSource);
-                if (source.isPresent() && viewModel.canBeDragged(source.get())) {
+                if (source.isPresent() && source.get().canBeDragged()) {
                     source.get().draggedOn(row.getItem(), ControlHelper.getDroppingMouseLocation(row, event));
                     changedGroups.add(source.get());
                     success = true;
@@ -417,6 +422,10 @@ private Optional<TreeItem<GroupNodeViewModel>> getTreeItemByValue(GroupNodeViewM
 
     private Optional<TreeItem<GroupNodeViewModel>> getTreeItemByValue(TreeItem<GroupNodeViewModel> root,
                                                                       GroupNodeViewModel value) {
+        if (root == null) {
+            return Optional.empty();
+        }
+
         if (root.getValue().equals(value)) {
             return Optional.of(root);
         }
@@ -442,11 +451,11 @@ private void setupDragScrolling() {
                     scrollBar.setValue(newValue);
                 }));
 
-        groupTree.setOnScroll((event) -> scrollTimer.stop());
-        groupTree.setOnDragDone((event) -> scrollTimer.stop());
-        groupTree.setOnDragEntered((event) -> scrollTimer.stop());
-        groupTree.setOnDragDropped((event) -> scrollTimer.stop());
-        groupTree.setOnDragExited((event) -> {
+        groupTree.setOnScroll(event -> scrollTimer.stop());
+        groupTree.setOnDragDone(event -> scrollTimer.stop());
+        groupTree.setOnDragEntered(event -> scrollTimer.stop());
+        groupTree.setOnDragDropped(event -> scrollTimer.stop());
+        groupTree.setOnDragExited(event -> {
             if (event.getY() > 0) {
                 scrollVelocity = 1.0 / SCROLL_SPEED;
             } else {
@@ -475,7 +484,7 @@ private ContextMenu createContextMenuForGroup(GroupNodeViewModel group) {
         ActionFactory factory = new ActionFactory(Globals.getKeyPrefs());
 
         MenuItem removeGroup;
-        if (viewModel.hasSubgroups(group) && viewModel.canAddGroupsIn(group) && !group.isRoot()) {
+        if (group.hasSubgroups() && group.canAddGroupsIn() && !group.isRoot()) {
             removeGroup = new Menu(Localization.lang("Remove group"), null,
                     factory.createMenuItem(StandardActions.GROUP_REMOVE_KEEP_SUBGROUPS,
                             new GroupTreeView.ContextAction(StandardActions.GROUP_REMOVE_KEEP_SUBGROUPS, group)),
@@ -489,7 +498,6 @@ private ContextMenu createContextMenuForGroup(GroupNodeViewModel group) {
         contextMenu.getItems().addAll(
                 factory.createMenuItem(StandardActions.GROUP_EDIT, new ContextAction(StandardActions.GROUP_EDIT, group)),
                 removeGroup,
-                factory.createMenuItem(StandardActions.GROUP_EDIT, new ContextAction(StandardActions.GROUP_EDIT, group)),
                 new SeparatorMenuItem(),
                 factory.createMenuItem(StandardActions.GROUP_SUBGROUP_ADD, new ContextAction(StandardActions.GROUP_SUBGROUP_ADD, group)),
                 factory.createMenuItem(StandardActions.GROUP_SUBGROUP_REMOVE, new ContextAction(StandardActions.GROUP_SUBGROUP_REMOVE, group)),
@@ -567,17 +575,20 @@ public ContextAction(StandardActions command, GroupNodeViewModel group) {
             this.executable.bind(BindingsHelper.constantOf(
                     switch (command) {
                         case GROUP_EDIT ->
-                                viewModel.isEditable(group);
+                                group.isEditable();
                         case GROUP_REMOVE, GROUP_REMOVE_WITH_SUBGROUPS, GROUP_REMOVE_KEEP_SUBGROUPS ->
-                                viewModel.isEditable(group) && viewModel.canAddGroupsIn(group);
+                                group.isEditable() && group.canRemove();
                         case GROUP_SUBGROUP_ADD ->
-                                viewModel.isEditable(group) && viewModel.canAddGroupsIn(group)
+                                group.isEditable() && group.canAddGroupsIn()
+                                        || group.isRoot();
+                        case GROUP_SUBGROUP_REMOVE ->
+                                group.isEditable() && group.hasSubgroups() && group.canRemove()
                                         || group.isRoot();
-                        case GROUP_SUBGROUP_REMOVE, GROUP_SUBGROUP_SORT ->
-                                viewModel.isEditable(group) && viewModel.hasSubgroups(group) && viewModel.canAddGroupsIn(group)
+                        case GROUP_SUBGROUP_SORT ->
+                                group.isEditable() && group.hasSubgroups() && group.canAddEntriesIn()
                                         || group.isRoot();
                         case GROUP_ENTRIES_ADD, GROUP_ENTRIES_REMOVE ->
-                                viewModel.canAddEntriesIn(group);
+                                group.canAddEntriesIn();
                         default ->
                                 true;
                     }));
@@ -609,4 +620,11 @@ public void execute() {
             }
         }
     }
+
+    /**
+     * Focus on GroupTree
+     */
+    public void requestFocusGroupTree() {
+        groupTree.requestFocus();
+    }
 }
diff --git a/src/main/java/org/jabref/gui/groups/GroupTreeViewModel.java b/src/main/java/org/jabref/gui/groups/GroupTreeViewModel.java
index 725b6678750..8f50bdab229 100644
--- a/src/main/java/org/jabref/gui/groups/GroupTreeViewModel.java
+++ b/src/main/java/org/jabref/gui/groups/GroupTreeViewModel.java
@@ -30,13 +30,10 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.groups.AbstractGroup;
-import org.jabref.model.groups.AllEntriesGroup;
 import org.jabref.model.groups.AutomaticKeywordGroup;
 import org.jabref.model.groups.AutomaticPersonsGroup;
 import org.jabref.model.groups.ExplicitGroup;
 import org.jabref.model.groups.GroupTreeNode;
-import org.jabref.model.groups.KeywordGroup;
-import org.jabref.model.groups.LastNameGroup;
 import org.jabref.model.groups.RegexKeywordGroup;
 import org.jabref.model.groups.SearchGroup;
 import org.jabref.model.groups.TexGroup;
@@ -157,8 +154,7 @@ private void onActiveDatabaseChanged(Optional<BibDatabaseContext> newDatabase) {
     }
 
     /**
-     * Opens "New Group Dialog" and adds the resulting group as subgroup to the specified group while maintaining the
-     * alphabetical order
+     * Opens "New Group Dialog" and adds the resulting group as subgroup to the specified group
      */
     public void addNewSubgroup(GroupNodeViewModel parent, GroupDialogHeader groupDialogHeader) {
         currentDatabase.ifPresent(database -> {
@@ -179,8 +175,6 @@ public void addNewSubgroup(GroupNodeViewModel parent, GroupDialogHeader groupDia
                 // TODO: Expand parent to make new group visible
                 // parent.expand();
 
-                sortAlphabeticallyRecursive(parent.getGroupNode());
-
                 dialogService.notify(Localization.lang("Added group \"%0\".", group.getName()));
                 writeGroupChangesToMetaData();
             });
@@ -210,28 +204,28 @@ boolean onlyMinorChanges(AbstractGroup oldGroup, AbstractGroup newGroup) {
             WordKeywordGroup newWordKeywordGroup = (WordKeywordGroup) newGroup;
 
             return Objects.equals(oldWordKeywordGroup.getSearchField().getName(), newWordKeywordGroup.getSearchField().getName())
-                   && Objects.equals(oldWordKeywordGroup.getSearchExpression(), newWordKeywordGroup.getSearchExpression())
-                   && Objects.equals(oldWordKeywordGroup.isCaseSensitive(), newWordKeywordGroup.isCaseSensitive());
+                    && Objects.equals(oldWordKeywordGroup.getSearchExpression(), newWordKeywordGroup.getSearchExpression())
+                    && Objects.equals(oldWordKeywordGroup.isCaseSensitive(), newWordKeywordGroup.isCaseSensitive());
         } else if (oldGroup.getClass() == RegexKeywordGroup.class) {
             RegexKeywordGroup oldRegexKeywordGroup = (RegexKeywordGroup) oldGroup;
             RegexKeywordGroup newRegexKeywordGroup = (RegexKeywordGroup) newGroup;
 
             return Objects.equals(oldRegexKeywordGroup.getSearchField().getName(), newRegexKeywordGroup.getSearchField().getName())
-                   && Objects.equals(oldRegexKeywordGroup.getSearchExpression(), newRegexKeywordGroup.getSearchExpression())
-                   && Objects.equals(oldRegexKeywordGroup.isCaseSensitive(), newRegexKeywordGroup.isCaseSensitive());
-        } else if ((oldGroup.getClass() == SearchGroup.class)) {
+                    && Objects.equals(oldRegexKeywordGroup.getSearchExpression(), newRegexKeywordGroup.getSearchExpression())
+                    && Objects.equals(oldRegexKeywordGroup.isCaseSensitive(), newRegexKeywordGroup.isCaseSensitive());
+        } else if (oldGroup.getClass() == SearchGroup.class) {
             SearchGroup oldSearchGroup = (SearchGroup) oldGroup;
             SearchGroup newSearchGroup = (SearchGroup) newGroup;
 
             return Objects.equals(oldSearchGroup.getSearchExpression(), newSearchGroup.getSearchExpression())
-                   && Objects.equals(oldSearchGroup.getSearchFlags(), newSearchGroup.getSearchFlags());
+                    && Objects.equals(oldSearchGroup.getSearchFlags(), newSearchGroup.getSearchFlags());
         } else if (oldGroup.getClass() == AutomaticKeywordGroup.class) {
             AutomaticKeywordGroup oldAutomaticKeywordGroup = (AutomaticKeywordGroup) oldGroup;
             AutomaticKeywordGroup newAutomaticKeywordGroup = (AutomaticKeywordGroup) oldGroup;
 
             return Objects.equals(oldAutomaticKeywordGroup.getKeywordDelimiter(), newAutomaticKeywordGroup.getKeywordDelimiter())
-                   && Objects.equals(oldAutomaticKeywordGroup.getKeywordHierarchicalDelimiter(), newAutomaticKeywordGroup.getKeywordHierarchicalDelimiter())
-                   && Objects.equals(oldAutomaticKeywordGroup.getField().getName(), newAutomaticKeywordGroup.getField().getName());
+                    && Objects.equals(oldAutomaticKeywordGroup.getKeywordHierarchicalDelimiter(), newAutomaticKeywordGroup.getKeywordHierarchicalDelimiter())
+                    && Objects.equals(oldAutomaticKeywordGroup.getField().getName(), newAutomaticKeywordGroup.getField().getName());
         } else if (oldGroup.getClass() == AutomaticPersonsGroup.class) {
             AutomaticPersonsGroup oldAutomaticPersonsGroup = (AutomaticPersonsGroup) oldGroup;
             AutomaticPersonsGroup newAutomaticPersonsGroup = (AutomaticPersonsGroup) newGroup;
@@ -251,11 +245,11 @@ boolean onlyMinorChanges(AbstractGroup oldGroup, AbstractGroup newGroup) {
     public void editGroup(GroupNodeViewModel oldGroup) {
         currentDatabase.ifPresent(database -> {
             Optional<AbstractGroup> newGroup = dialogService.showCustomDialogAndWait(new GroupDialogView(
-                     dialogService,
-                     database,
-                     preferences,
-                     oldGroup.getGroupNode().getGroup(),
-                     GroupDialogHeader.SUBGROUP));
+                    dialogService,
+                    database,
+                    preferences,
+                    oldGroup.getGroupNode().getGroup(),
+                    GroupDialogHeader.SUBGROUP));
             newGroup.ifPresent(group -> {
 
                 AbstractGroup oldGroupDef = oldGroup.getGroupNode().getGroup();
@@ -280,10 +274,10 @@ public void editGroup(GroupNodeViewModel oldGroup) {
                     }
 
                     oldGroup.getGroupNode().setGroup(
-                                                     group,
-                                                     true,
-                                                     removePreviousAssignments,
-                                                     database.getEntries());
+                            group,
+                            true,
+                            removePreviousAssignments,
+                            database.getEntries());
 
                     dialogService.notify(Localization.lang("Modified group \"%0\".", group.getName()));
                     writeGroupChangesToMetaData();
@@ -294,10 +288,10 @@ public void editGroup(GroupNodeViewModel oldGroup) {
 
                 if (groupTypeEqual && onlyMinorChanges(oldGroup.getGroupNode().getGroup(), group)) {
                     oldGroup.getGroupNode().setGroup(
-                                     group,
-                                     true,
-                                     true,
-                                     database.getEntries());
+                            group,
+                            true,
+                            true,
+                            database.getEntries());
 
                     writeGroupChangesToMetaData();
                     refresh();
@@ -313,16 +307,16 @@ public void editGroup(GroupNodeViewModel oldGroup) {
 
                 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)");
+                            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"),
-                                                                                                       content,
-                                                                                                       keepAssignments,
-                                                                                                       removeAssignments,
-                                                                                                       cancel);
+                        Localization.lang("Change of Grouping Method"),
+                        content,
+                        keepAssignments,
+                        removeAssignments,
+                        cancel);
                 boolean removePreviousAssignments = (oldGroup.getGroupNode().getGroup() instanceof ExplicitGroup)
-                                                    && (group instanceof ExplicitGroup);
+                        && (group instanceof ExplicitGroup);
 
                 int groupsWithSameName = 0;
                 Optional<GroupTreeNode> databaseRootGroup = currentDatabase.get().getMetaData().getGroups();
@@ -338,16 +332,16 @@ public void editGroup(GroupNodeViewModel oldGroup) {
 
                 if (previousAssignments.isPresent() && (previousAssignments.get().getButtonData() == ButtonBar.ButtonData.YES)) {
                     oldGroup.getGroupNode().setGroup(
-                                 group,
-                                 true,
-                                 removePreviousAssignments,
-                                 database.getEntries());
+                            group,
+                            true,
+                            removePreviousAssignments,
+                            database.getEntries());
                 } else if (previousAssignments.isPresent() && (previousAssignments.get().getButtonData() == ButtonBar.ButtonData.NO)) {
                     oldGroup.getGroupNode().setGroup(
-                                 group,
-                                 false,
-                                 removePreviousAssignments,
-                                 database.getEntries());
+                            group,
+                            false,
+                            removePreviousAssignments,
+                            database.getEntries());
                 } else if (previousAssignments.isPresent() && (previousAssignments.get().getButtonData() == ButtonBar.ButtonData.CANCEL_CLOSE)) {
                     return;
                 }
@@ -371,10 +365,6 @@ public void editGroup(GroupNodeViewModel oldGroup) {
                 //    undoAddPreviousEntries = UndoableChangeEntriesOfGroup.getUndoableEdit(null, addChange);
                 // }
 
-                oldGroup.getParent().ifPresent(parent -> {
-                    sortAlphabeticallyRecursive(parent);
-                });
-
                 dialogService.notify(Localization.lang("Modified group \"%0\".", group.getName()));
                 writeGroupChangesToMetaData();
                 // This is ugly but we have no proper update mechanism in place to propagate the changes, so redraw everything
@@ -574,130 +564,4 @@ public void removeSelectedEntries(GroupNodeViewModel group) {
     public void sortAlphabeticallyRecursive(GroupTreeNode group) {
         group.sortChildren(compAlphabetIgnoreCase, true);
     }
-
-    public boolean canBeDragged(GroupNodeViewModel groupnode) {
-        AbstractGroup group = groupnode.getGroupNode().getGroup();
-        if (group instanceof AllEntriesGroup) {
-            return false;
-        } else if (group instanceof ExplicitGroup) {
-            return true;
-        } else if (group instanceof LastNameGroup || group instanceof KeywordGroup || group instanceof RegexKeywordGroup) {
-            if (groupnode.getParent().isPresent()) {
-                AbstractGroup groupParent = groupnode.getParent().get().getGroup();
-                if (groupParent instanceof AutomaticKeywordGroup || groupParent instanceof AutomaticPersonsGroup) {
-                    return false;
-                } else {
-                    return true;
-                }
-            } else {
-                return false;
-            }
-        } else if (group instanceof SearchGroup) {
-            return true;
-        } else if (group instanceof AutomaticKeywordGroup) {
-            return true;
-        } else if (group instanceof AutomaticPersonsGroup) {
-            return true;
-        } else if (group instanceof TexGroup) {
-            return true;
-        } else {
-            throw new UnsupportedOperationException("canBeDragged method not yet implemented in group: " + group.getClass().getName());
-        }
-    }
-
-    public boolean canAddGroupsIn(GroupNodeViewModel groupnode) {
-        AbstractGroup group = groupnode.getGroupNode().getGroup();
-        if (group instanceof AllEntriesGroup) {
-            return true;
-        } else if (group instanceof ExplicitGroup) {
-            return true;
-        } else if (group instanceof LastNameGroup || group instanceof KeywordGroup || group instanceof RegexKeywordGroup) {
-            if (groupnode.getParent().isPresent()) {
-                AbstractGroup groupParent = groupnode.getParent().get().getGroup();
-                if (groupParent instanceof AutomaticKeywordGroup || groupParent instanceof AutomaticPersonsGroup) {
-                    return false;
-                } else {
-                    return true;
-                }
-            } else {
-                return false;
-            }
-        } else if (group instanceof SearchGroup) {
-            return true;
-        } else if (group instanceof AutomaticKeywordGroup) {
-            return false;
-        } else if (group instanceof AutomaticPersonsGroup) {
-            return false;
-        } else if (group instanceof TexGroup) {
-            return true;
-        } else {
-            throw new UnsupportedOperationException("canAddGroupsIn method not yet implemented in group: " + group.getClass().getName());
-        }
-    }
-
-    public boolean hasSubgroups(GroupNodeViewModel groupnode) {
-        return groupnode.getChildren().size() > 0;
-    }
-
-    public boolean canAddEntriesIn(GroupNodeViewModel groupnode) {
-        AbstractGroup group = groupnode.getGroupNode().getGroup();
-        if (group instanceof AllEntriesGroup) {
-            return false;
-        } else if (group instanceof ExplicitGroup) {
-            return true;
-        } else if (group instanceof LastNameGroup || group instanceof RegexKeywordGroup) {
-            if (groupnode.getParent().isPresent()) {
-                AbstractGroup groupParent = groupnode.getParent().get().getGroup();
-                if (groupParent instanceof AutomaticKeywordGroup || groupParent instanceof AutomaticPersonsGroup) {
-                    return true;
-                } else {
-                    return false;
-                }
-            } else {
-                return false;
-            }
-        } else if (group instanceof KeywordGroup) {
-            return true;
-        } else if (group instanceof SearchGroup) {
-            return false;
-        } else if (group instanceof AutomaticKeywordGroup) {
-            return false;
-        } else if (group instanceof AutomaticPersonsGroup) {
-            return false;
-        } else if (group instanceof TexGroup) {
-            return false;
-        } else {
-            throw new UnsupportedOperationException("canAddEntriesIn method not yet implemented in group: " + group.getClass().getName());
-        }
-    }
-
-    public boolean isEditable(GroupNodeViewModel groupnode) {
-        AbstractGroup group = groupnode.getGroupNode().getGroup();
-        if (group instanceof AllEntriesGroup) {
-            return false;
-        } else if (group instanceof ExplicitGroup) {
-            return true;
-        } else if (group instanceof LastNameGroup || group instanceof KeywordGroup || group instanceof RegexKeywordGroup) {
-            if (groupnode.getParent().isPresent()) {
-                AbstractGroup groupParent = groupnode.getParent().get().getGroup();
-                if (groupParent instanceof AutomaticKeywordGroup || groupParent instanceof AutomaticPersonsGroup) {
-                    return false;
-                } else {
-                    return true;
-                }
-            } else {
-                return false;
-            }
-        } else if (group instanceof SearchGroup) {
-            return true;
-        } else if (group instanceof AutomaticKeywordGroup) {
-            return true;
-        } else if (group instanceof AutomaticPersonsGroup) {
-            return true;
-        } else if (group instanceof TexGroup) {
-            return true;
-        } else {
-            throw new UnsupportedOperationException("isEditable method not yet implemented in group: " + group.getClass().getName());
-        }
-    }
 }
diff --git a/src/main/java/org/jabref/gui/groups/MoveGroupChange.java b/src/main/java/org/jabref/gui/groups/MoveGroupChange.java
index fb23bcee047..e52f9cbef8d 100644
--- a/src/main/java/org/jabref/gui/groups/MoveGroupChange.java
+++ b/src/main/java/org/jabref/gui/groups/MoveGroupChange.java
@@ -10,8 +10,6 @@ public class MoveGroupChange {
     private int newChildIndex;
 
     /**
-     * @param oldParent
-     * @param oldChildIndex
      * @param newParent     The new parent node to which the node will be moved.
      * @param newChildIndex The child index at newParent to which the node will be moved.
      */
diff --git a/src/main/java/org/jabref/gui/groups/UndoableMoveGroup.java b/src/main/java/org/jabref/gui/groups/UndoableMoveGroup.java
index 08c3f9f4723..c4f367d31f7 100644
--- a/src/main/java/org/jabref/gui/groups/UndoableMoveGroup.java
+++ b/src/main/java/org/jabref/gui/groups/UndoableMoveGroup.java
@@ -7,9 +7,6 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.groups.GroupTreeNode;
 
-/**
- * @author jzieren
- */
 class UndoableMoveGroup extends AbstractUndoableJabRefEdit {
 
     private final GroupTreeNodeViewModel root;
diff --git a/src/main/java/org/jabref/gui/help/AboutDialog.css b/src/main/java/org/jabref/gui/help/AboutDialog.css
index 04dd4e9d0e7..50d86c04a8d 100644
--- a/src/main/java/org/jabref/gui/help/AboutDialog.css
+++ b/src/main/java/org/jabref/gui/help/AboutDialog.css
@@ -42,7 +42,7 @@
 }
 
 .logo-pane {
-    fx-fill: transparent;
+    -fx-fill: transparent;
 }
 
 .logo-pane SVGPath {
diff --git a/src/main/java/org/jabref/gui/help/AboutDialog.fxml b/src/main/java/org/jabref/gui/help/AboutDialog.fxml
index 8dea325a531..bda361a6046 100644
--- a/src/main/java/org/jabref/gui/help/AboutDialog.fxml
+++ b/src/main/java/org/jabref/gui/help/AboutDialog.fxml
@@ -8,6 +8,7 @@
 <?import javafx.scene.control.Tooltip?>
 <?import javafx.scene.Cursor?>
 <?import javafx.scene.effect.Reflection?>
+<?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.BorderPane?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.Pane?>
@@ -17,8 +18,9 @@
 <DialogPane prefWidth="530.0" prefHeight="510.0" xmlns="http://javafx.com/javafx/8.0.121" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.help.AboutDialogView">
     <content>
         <VBox alignment="CENTER_LEFT" BorderPane.alignment="CENTER">
-            <HBox alignment="CENTER_LEFT">
-                <VBox alignment="CENTER_LEFT" spacing="1.0" styleClass="about-top" HBox.hgrow="NEVER">
+            <AnchorPane>
+                <VBox alignment="CENTER_LEFT" spacing="1.0" styleClass="about-top"
+                      AnchorPane.leftAnchor="0" AnchorPane.topAnchor="0">
                     <Label alignment="CENTER" contentDisplay="CENTER" onMouseClicked="#copyVersionToClipboard" styleClass="about-heading" text="${controller.viewModel.heading}" textFill="#2c3e50" wrapText="true">
                         <cursor>
                             <Cursor fx:constant="HAND"/>
@@ -36,6 +38,7 @@
                         <Label styleClass="space-after" text="${controller.viewModel.license}" wrapText="true"/>
                         <Hyperlink onAction="#openLicense" text="MIT"/>
                     </HBox>
+                    <Hyperlink onAction="#openPrivacyPolicy" text="Privacy Policy"/>
                     <Hyperlink onAction="#openExternalLibrariesWebsite" text="%Used libraries"/>
                     <HBox alignment="CENTER_LEFT">
                         <Label styleClass="space-after" text="%Want to help?" wrapText="true"/>
@@ -45,43 +48,38 @@
                         <Label text="."/>
                     </HBox>
                 </VBox>
-                <BorderPane BorderPane.alignment="CENTER" HBox.hgrow="ALWAYS">
-                    <center>
-                        <StackPane onMouseClicked="#openJabrefWebsite" prefHeight="140" prefWidth="140" scaleX="0.6"
-                                   scaleY="0.6" BorderPane.alignment="CENTER">
-                            <!-- SVGPaths need to be wrapped in a Pane to get them to the same size -->
-                            <Pane prefHeight="350" prefWidth="350" styleClass="logo-pane">
-                                <SVGPath content="M97.2 87.1C93.2 33.8 18.4 14.6 18.2 15.6c-0.1 6.7-0.3 13.3-0.4 20 17.8 3.6 61.7 20.1 79.4 51.5"/>
-                            </Pane>
-                            <Pane prefHeight="350" prefWidth="350" styleClass="logo-pane">
-                                <SVGPath content="M96.2 61.2C92.8 19.2 35.1 0.4 35 1c0 3.5-0.1 7-0.1 10.6 18.1 7.5 47.7 24.7 61.3 49.6"/>
-                            </Pane>
-                            <Pane prefHeight="350" prefWidth="350" styleClass="logo-pane">
-                                <SVGPath content="M67.1 65.2c-25.9-17.6-58.5-22.1-58.6-21.4-0.3 12.4-0.6 24.8-0.9 37.2 37.9 2.2 40.2 25.7 37.9 40.8l-39.1 12.6-1.9 69.5 68.7-26.6c8-3.3 16-6.4 24.1-9.3v-47.9c0-21.4-10.9-41.8-30.1-54.9"/>
-                            </Pane>
 
-                            <Pane prefHeight="350" prefWidth="350" styleClass="logo-pane">
-                                <SVGPath content="M107.8 87.1c3.9-53.2 78.8-72.5 78.9-71.5 0.1 6.7 0.3 13.3 0.4 20-17.8 3.6-61.7 20.1-79.4 51.5"/>
-                            </Pane>
-                            <Pane prefHeight="350" prefWidth="350" styleClass="logo-pane">
-                                <SVGPath content="M108.8 61.2c3.4-42.1 61.1-60.8 61.2-60.2 0 3.5 0.1 7 0.1 10.6-18.1 7.5-47.7 24.7-61.3 49.6"/>
-                            </Pane>
-                            <Pane prefHeight="350" prefWidth="350" styleClass="logo-pane">
-                                <SVGPath content="M137.9 65.2c25.9-17.6 58.5-22.1 58.6-21.4 0.3 12.4 0.6 24.8 0.9 37.2-37.9 2.2-40.2 25.7-37.9 40.8l39.1 12.6 1.9 69.5-68.7-26.6c-8-3.3-16-6.4-24.1-9.3v-47.9c0-21.4 10.9-41.8 30.1-54.9"/>
-                            </Pane>
+                <StackPane onMouseClicked="#openJabrefWebsite"
+                           scaleX="0.6" scaleY="0.6" translateX="-26" translateY="-30" prefWidth="120" prefHeight="120"
+                           AnchorPane.rightAnchor="0" AnchorPane.topAnchor="0">
+                    <!-- SVGPaths need to be wrapped in a Pane to get them to the same size -->
+                    <Pane styleClass="logo-pane">
+                        <SVGPath content="M97.2 87.1C93.2 33.8 18.4 14.6 18.2 15.6c-0.1 6.7-0.3 13.3-0.4 20 17.8 3.6 61.7 20.1 79.4 51.5"/>
+                    </Pane>
+                    <Pane styleClass="logo-pane">
+                        <SVGPath content="M96.2 61.2C92.8 19.2 35.1 0.4 35 1c0 3.5-0.1 7-0.1 10.6 18.1 7.5 47.7 24.7 61.3 49.6"/>
+                    </Pane>
+                    <Pane styleClass="logo-pane">
+                        <SVGPath content="M67.1 65.2c-25.9-17.6-58.5-22.1-58.6-21.4-0.3 12.4-0.6 24.8-0.9 37.2 37.9 2.2 40.2 25.7 37.9 40.8l-39.1 12.6-1.9 69.5 68.7-26.6c8-3.3 16-6.4 24.1-9.3v-47.9c0-21.4-10.9-41.8-30.1-54.9"/>
+                    </Pane>
+                    <Pane styleClass="logo-pane">
+                        <SVGPath content="M107.8 87.1c3.9-53.2 78.8-72.5 78.9-71.5 0.1 6.7 0.3 13.3 0.4 20-17.8 3.6-61.7 20.1-79.4 51.5"/>
+                    </Pane>
+                    <Pane styleClass="logo-pane">
+                        <SVGPath content="M108.8 61.2c3.4-42.1 61.1-60.8 61.2-60.2 0 3.5 0.1 7 0.1 10.6-18.1 7.5-47.7 24.7-61.3 49.6"/>
+                    </Pane>
+                    <Pane styleClass="logo-pane">
+                        <SVGPath content="M137.9 65.2c25.9-17.6 58.5-22.1 58.6-21.4 0.3 12.4 0.6 24.8 0.9 37.2-37.9 2.2-40.2 25.7-37.9 40.8l39.1 12.6 1.9 69.5-68.7-26.6c-8-3.3-16-6.4-24.1-9.3v-47.9c0-21.4 10.9-41.8 30.1-54.9"/>
+                    </Pane>
 
-                            <cursor>
-                                <Cursor fx:constant="HAND"/>
-                            </cursor>
-                            <effect>
-                                <Reflection fraction="0.15"/>
-                            </effect>
-                        </StackPane>
-                    </center>
-                    <bottom>
-                    </bottom>
-                </BorderPane>
-            </HBox>
+                    <cursor>
+                        <Cursor fx:constant="HAND"/>
+                    </cursor>
+                    <effect>
+                        <Reflection fraction="0.15"/>
+                    </effect>
+                </StackPane>
+            </AnchorPane>
             <Label styleClass="sub-heading" text="%Maintainers"/>
             <Label alignment="CENTER" styleClass="info-sections" text="${controller.viewModel.maintainers}" textAlignment="JUSTIFY" wrapText="true"/>
             <Label styleClass="sub-heading" text="%Contributors"/>
@@ -91,8 +89,6 @@
             <TextArea fx:id="textAreaVersions" editable="false" prefHeight="100.0" prefWidth="200.0" styleClass="info-sections"/>
         </VBox>
     </content>
-    <header>
-    </header>
     <ButtonType fx:id="copyVersionButton" text="%Copy Version" buttonData="LEFT"/>
     <ButtonType fx:constant="CLOSE"/>
 </DialogPane>
diff --git a/src/main/java/org/jabref/gui/help/AboutDialogView.java b/src/main/java/org/jabref/gui/help/AboutDialogView.java
index de23785d378..6698ecce3ca 100644
--- a/src/main/java/org/jabref/gui/help/AboutDialogView.java
+++ b/src/main/java/org/jabref/gui/help/AboutDialogView.java
@@ -10,6 +10,7 @@
 import org.jabref.gui.util.ControlHelper;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.BuildInfo;
+import org.jabref.preferences.PreferencesService;
 
 import com.airhacks.afterburner.views.ViewLoader;
 import jakarta.inject.Inject;
@@ -20,6 +21,7 @@ public class AboutDialogView extends BaseDialog<Void> {
     @FXML private TextArea textAreaVersions;
 
     @Inject private DialogService dialogService;
+    @Inject private PreferencesService preferencesService;
     @Inject private ClipBoardManager clipBoardManager;
     @Inject private BuildInfo buildInfo;
 
@@ -41,7 +43,7 @@ public AboutDialogViewModel getViewModel() {
 
     @FXML
     private void initialize() {
-        viewModel = new AboutDialogViewModel(dialogService, clipBoardManager, buildInfo);
+        viewModel = new AboutDialogViewModel(dialogService, preferencesService, clipBoardManager, buildInfo);
 
         textAreaVersions.setText(viewModel.getVersionInfo());
         this.setResizable(false);
@@ -86,4 +88,8 @@ public void openContributors() {
     public void openDonation() {
         viewModel.openDonation();
     }
+
+    public void openPrivacyPolicy() {
+        viewModel.openPrivacyPolicy();
+    }
 }
diff --git a/src/main/java/org/jabref/gui/help/AboutDialogViewModel.java b/src/main/java/org/jabref/gui/help/AboutDialogViewModel.java
index 2d38961064f..4a14c8b836c 100644
--- a/src/main/java/org/jabref/gui/help/AboutDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/help/AboutDialogViewModel.java
@@ -16,6 +16,7 @@
 import org.jabref.gui.desktop.JabRefDesktop;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.BuildInfo;
+import org.jabref.preferences.PreferencesService;
 
 import com.google.common.collect.Lists;
 import org.slf4j.Logger;
@@ -29,6 +30,7 @@ public class AboutDialogViewModel extends AbstractViewModel {
     private static final String GITHUB_URL = "https://github.com/JabRef/jabref";
     private static final String LICENSE_URL = "https://github.com/JabRef/jabref/blob/main/LICENSE.md";
     private static final String CONTRIBUTORS_URL = "https://github.com/JabRef/jabref/graphs/contributors";
+    private static final String PRIVACY_POLICY_URL = "https://github.com/JabRef/jabref/blob/main/PRIVACY.md";
     private final String changelogUrl;
     private final String versionInfo;
     private final ReadOnlyStringWrapper environmentInfo = new ReadOnlyStringWrapper();
@@ -38,11 +40,13 @@ public class AboutDialogViewModel extends AbstractViewModel {
     private final ReadOnlyStringWrapper license = new ReadOnlyStringWrapper();
     private final ReadOnlyBooleanWrapper isDevelopmentVersion = new ReadOnlyBooleanWrapper();
     private final DialogService dialogService;
+    private final PreferencesService preferencesService;
     private final ReadOnlyStringWrapper developmentVersion = new ReadOnlyStringWrapper();
     private final ClipBoardManager clipBoardManager;
 
-    public AboutDialogViewModel(DialogService dialogService, ClipBoardManager clipBoardManager, BuildInfo buildInfo) {
+    public AboutDialogViewModel(DialogService dialogService, PreferencesService preferencesService, ClipBoardManager clipBoardManager, BuildInfo buildInfo) {
         this.dialogService = Objects.requireNonNull(dialogService);
+        this.preferencesService = Objects.requireNonNull(preferencesService);
         this.clipBoardManager = Objects.requireNonNull(clipBoardManager);
         String[] version = buildInfo.version.getFullVersion().split("--");
         heading.set("JabRef " + version[0]);
@@ -148,10 +152,14 @@ public void openDonation() {
 
     private void openWebsite(String url) {
         try {
-            JabRefDesktop.openBrowser(url);
+            JabRefDesktop.openBrowser(url, preferencesService.getFilePreferences());
         } catch (IOException e) {
             dialogService.showErrorDialogAndWait(Localization.lang("Could not open website."), e);
             logger.error("Could not open default browser.", e);
         }
     }
+
+    public void openPrivacyPolicy() {
+        openWebsite(PRIVACY_POLICY_URL);
+    }
 }
diff --git a/src/main/java/org/jabref/gui/help/ErrorConsoleAction.java b/src/main/java/org/jabref/gui/help/ErrorConsoleAction.java
index 16a41242dfe..a27ffacee40 100644
--- a/src/main/java/org/jabref/gui/help/ErrorConsoleAction.java
+++ b/src/main/java/org/jabref/gui/help/ErrorConsoleAction.java
@@ -10,7 +10,7 @@
  * Such an error console can be
  * useful in getting complete bug reports, especially from Windows users,
  * without asking users to run JabRef in a command window to catch the error info.
- * <p/>
+ *
  * It offers a separate tab for the log output.
  */
 public class ErrorConsoleAction extends SimpleCommand {
diff --git a/src/main/java/org/jabref/gui/help/HelpAction.java b/src/main/java/org/jabref/gui/help/HelpAction.java
index 0447f7331ed..816e215731d 100644
--- a/src/main/java/org/jabref/gui/help/HelpAction.java
+++ b/src/main/java/org/jabref/gui/help/HelpAction.java
@@ -4,6 +4,7 @@
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.gui.desktop.JabRefDesktop;
 import org.jabref.logic.help.HelpFile;
+import org.jabref.preferences.FilePreferences;
 
 /**
  * This Action keeps a reference to a URL. When activated, it shows the help
@@ -13,16 +14,18 @@ public class HelpAction extends SimpleCommand {
 
     private final HelpFile helpPage;
     private final DialogService dialogService;
+    private final FilePreferences filePreferences;
 
-    public HelpAction(HelpFile helpPage, DialogService dialogService) {
+    public HelpAction(HelpFile helpPage, DialogService dialogService, FilePreferences filePreferences) {
         this.helpPage = helpPage;
         this.dialogService = dialogService;
+        this.filePreferences = filePreferences;
     }
 
     void openHelpPage(HelpFile helpPage) {
         StringBuilder sb = new StringBuilder("https://docs.jabref.org/");
         sb.append(helpPage.getPageName());
-        JabRefDesktop.openBrowserShowPopup(sb.toString(), dialogService);
+        JabRefDesktop.openBrowserShowPopup(sb.toString(), dialogService, filePreferences);
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/help/NewVersionDialog.java b/src/main/java/org/jabref/gui/help/NewVersionDialog.java
index f026d0d7295..7f51da7b2a9 100644
--- a/src/main/java/org/jabref/gui/help/NewVersionDialog.java
+++ b/src/main/java/org/jabref/gui/help/NewVersionDialog.java
@@ -12,10 +12,11 @@
 import org.jabref.gui.util.BaseDialog;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.Version;
+import org.jabref.preferences.FilePreferences;
 
 public class NewVersionDialog extends BaseDialog<Boolean> {
 
-    public NewVersionDialog(Version currentVersion, Version latestVersion, DialogService dialogService) {
+    public NewVersionDialog(Version currentVersion, Version latestVersion, DialogService dialogService, FilePreferences filePreferences) {
         this.setTitle(Localization.lang("New version available"));
 
         ButtonType btnIgnoreUpdate = new ButtonType(Localization.lang("Ignore this update"), ButtonBar.ButtonData.CANCEL_CLOSE);
@@ -26,7 +27,7 @@ public NewVersionDialog(Version currentVersion, Version latestVersion, DialogSer
             if (button == btnIgnoreUpdate) {
                 return false;
             } else if (button == btnDownloadUpdate) {
-                JabRefDesktop.openBrowserShowPopup(Version.JABREF_DOWNLOAD_URL, dialogService);
+                JabRefDesktop.openBrowserShowPopup(Version.JABREF_DOWNLOAD_URL, dialogService, filePreferences);
             }
             return true;
         });
@@ -35,7 +36,7 @@ public NewVersionDialog(Version currentVersion, Version latestVersion, DialogSer
 
         Hyperlink lblMoreInformation = new Hyperlink(Localization.lang("To see what is new view the changelog."));
         lblMoreInformation.setOnAction(event ->
-                JabRefDesktop.openBrowserShowPopup(latestVersion.getChangelogUrl(), dialogService)
+                JabRefDesktop.openBrowserShowPopup(latestVersion.getChangelogUrl(), dialogService, filePreferences)
         );
 
         VBox container = new VBox(
diff --git a/src/main/java/org/jabref/gui/help/SearchForUpdateAction.java b/src/main/java/org/jabref/gui/help/SearchForUpdateAction.java
index f2e0fff9bbc..9c9d4d9d21f 100644
--- a/src/main/java/org/jabref/gui/help/SearchForUpdateAction.java
+++ b/src/main/java/org/jabref/gui/help/SearchForUpdateAction.java
@@ -4,25 +4,27 @@
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.util.BuildInfo;
-import org.jabref.preferences.InternalPreferences;
+import org.jabref.preferences.PreferencesService;
 
 public class SearchForUpdateAction extends SimpleCommand {
 
     private final BuildInfo buildInfo;
-    private final InternalPreferences internalPreferences;
+    private final PreferencesService preferencesService;
     private final DialogService dialogService;
     private final TaskExecutor taskExecutor;
 
-    public SearchForUpdateAction(BuildInfo buildInfo, InternalPreferences internalPreferences, DialogService dialogService, TaskExecutor taskExecutor) {
+    public SearchForUpdateAction(BuildInfo buildInfo, PreferencesService preferencesService, DialogService dialogService, TaskExecutor taskExecutor) {
         this.buildInfo = buildInfo;
-        this.internalPreferences = internalPreferences;
+        this.preferencesService = preferencesService;
         this.dialogService = dialogService;
         this.taskExecutor = taskExecutor;
+
+        this.executable.bind(preferencesService.getInternalPreferences().versionCheckEnabledProperty());
     }
 
     @Override
     public void execute() {
-        new VersionWorker(buildInfo.version, dialogService, taskExecutor, internalPreferences)
+        new VersionWorker(buildInfo.version, dialogService, taskExecutor, preferencesService)
                 .checkForNewVersionAsync();
     }
 }
diff --git a/src/main/java/org/jabref/gui/help/VersionWorker.java b/src/main/java/org/jabref/gui/help/VersionWorker.java
index b4760f58c9b..5a21e89cf78 100644
--- a/src/main/java/org/jabref/gui/help/VersionWorker.java
+++ b/src/main/java/org/jabref/gui/help/VersionWorker.java
@@ -11,7 +11,9 @@
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.Version;
+import org.jabref.preferences.FilePreferences;
 import org.jabref.preferences.InternalPreferences;
+import org.jabref.preferences.PreferencesService;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -36,16 +38,17 @@ public class VersionWorker {
     private final DialogService dialogService;
     private final TaskExecutor taskExecutor;
     private final InternalPreferences internalPreferences;
+    private final FilePreferences filePreferences;
 
     public VersionWorker(Version installedVersion,
-
                          DialogService dialogService,
                          TaskExecutor taskExecutor,
-                         InternalPreferences internalPreferences) {
+                         PreferencesService preferencesService) {
         this.installedVersion = Objects.requireNonNull(installedVersion);
         this.dialogService = Objects.requireNonNull(dialogService);
         this.taskExecutor = Objects.requireNonNull(taskExecutor);
-        this.internalPreferences = internalPreferences;
+        this.internalPreferences = preferencesService.getInternalPreferences();
+        this.filePreferences = preferencesService.getFilePreferences();
     }
 
     /**
@@ -58,6 +61,10 @@ private Optional<Version> getNewVersion() throws IOException {
     }
 
     public void checkForNewVersionAsync() {
+        if (!internalPreferences.isVersionCheckEnabled()) {
+            return;
+        }
+
         BackgroundTask.wrap(this::getNewVersion)
                       .onSuccess(version -> showUpdateInfo(version, true))
                       .onFailure(exception -> showConnectionError(exception, true))
@@ -65,6 +72,10 @@ public void checkForNewVersionAsync() {
     }
 
     public void checkForNewVersionDelayed() {
+        if (!internalPreferences.isVersionCheckEnabled()) {
+            return;
+        }
+
         BackgroundTask.wrap(this::getNewVersion)
                       .onSuccess(version -> showUpdateInfo(version, false))
                       .onFailure(exception -> showConnectionError(exception, false))
@@ -75,12 +86,12 @@ public void checkForNewVersionDelayed() {
      * Prints the connection problem to the status bar and shows a dialog if it was executed manually
      */
     private void showConnectionError(Exception exception, boolean manualExecution) {
-        String couldNotConnect = Localization.lang("Could not connect to the update server.");
-        String tryLater = Localization.lang("Please try again later and/or check your network connection.");
         if (manualExecution) {
+            String couldNotConnect = Localization.lang("Could not connect to the update server.");
+            String tryLater = Localization.lang("Please try again later and/or check your network connection.");
             dialogService.showErrorDialogAndWait(Localization.lang("Error"), couldNotConnect + "\n" + tryLater, exception);
         }
-        LOGGER.warn(couldNotConnect + " " + tryLater, exception);
+        LOGGER.debug("Could not connect to the update server.", exception);
     }
 
     /**
@@ -95,7 +106,8 @@ private void showUpdateInfo(Optional<Version> newerVersion, boolean manualExecut
             }
         } else {
             // notify the user about a newer version
-            if (dialogService.showCustomDialogAndWait(new NewVersionDialog(installedVersion, newerVersion.get(), dialogService)).orElse(true)) {
+            if (dialogService.showCustomDialogAndWait(new NewVersionDialog(installedVersion, newerVersion.get(), dialogService, filePreferences))
+                             .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 51cc775325d..9833e46049c 100644
--- a/src/main/java/org/jabref/gui/icon/IconTheme.java
+++ b/src/main/java/org/jabref/gui/icon/IconTheme.java
@@ -189,6 +189,7 @@ public enum JabRefIcons implements JabRefIcon {
         UNDO(MaterialDesignU.UNDO),
         MARKER(MaterialDesignM.MARKER),
         REFRESH(MaterialDesignR.REFRESH),
+        MEMORYSTICK(MaterialDesignU.USB_FLASH_DRIVE_OUTLINE),
         DELETE_ENTRY(MaterialDesignD.DELETE),
         SEARCH(MaterialDesignM.MAGNIFY),
         FILE_SEARCH(MaterialDesignF.FILE_FIND),
@@ -275,6 +276,7 @@ public enum JabRefIcons implements JabRefIcon {
         APPLICATION_TEXMAKER(JabRefMaterialDesignIcon.TEX_MAKER),
         APPLICATION_VIM(JabRefMaterialDesignIcon.VIM),
         APPLICATION_WINEDT(JabRefMaterialDesignIcon.WINEDT),
+        APPLICATION_SUBLIMETEXT(JabRefMaterialDesignIcon.SUBLIME_TEXT),
         KEY_BINDINGS(MaterialDesignK.KEYBOARD),
         FIND_DUPLICATES(MaterialDesignC.CODE_EQUAL),
         CONNECT_DB(MaterialDesignC.CLOUD_UPLOAD),
@@ -316,6 +318,7 @@ public enum JabRefIcons implements JabRefIcon {
         FETCH_FULLTEXT(MaterialDesignS.SEARCH_WEB),
         FETCH_BY_IDENTIFIER(MaterialDesignC.CLIPBOARD_ARROW_DOWN),
         TOGGLE_ABBREVIATION(MaterialDesignF.FORMAT_ALIGN_CENTER),
+        VIEW_JOURNAL_INFO(MaterialDesignI.INFORMATION_VARIANT),
         NEW_FILE(MaterialDesignP.PLUS),
         DOWNLOAD(MaterialDesignD.DOWNLOAD),
         OWNER(MaterialDesignA.ACCOUNT),
@@ -344,11 +347,9 @@ public enum JabRefIcons implements JabRefIcon {
         KEEP_ON_TOP(MaterialDesignP.PIN),
         KEEP_ON_TOP_OFF(MaterialDesignP.PIN_OFF_OUTLINE),
         OPEN_GLOBAL_SEARCH(MaterialDesignO.OPEN_IN_NEW),
-
+        REMOVE_TAGS(MaterialDesignC.CLOSE),
         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/JabRefMaterialDesignIcon.java b/src/main/java/org/jabref/gui/icon/JabRefMaterialDesignIcon.java
index 0c934e8161a..e6b63d609db 100644
--- a/src/main/java/org/jabref/gui/icon/JabRefMaterialDesignIcon.java
+++ b/src/main/java/org/jabref/gui/icon/JabRefMaterialDesignIcon.java
@@ -6,9 +6,10 @@
  * Provides the same true-type font interface as MaterialDesignIcon itself, but uses a font we created ourselves that
  * contains icons that are not available in MaterialDesignIcons.
  *
- * @implNote The glyphs of the ttf (speak: the icons) were created with Illustrator and a template from the material design icons
+ * The glyphs of the ttf (speak: the icons) were created with Illustrator and a template from the material design icons
  * web-page. The art boards for each icon was exported as SVG and then converted with <a href="https://icomoon.io/app">
  * IcoMoon</a>. The final TTF font is located in the resource folder.
+ *
  * @see <a href="https://github.com/JabRef/jabref/wiki/Custom-SVG-Icons-for-JabRef">Tutorial on our Wiki</a>
  * @see <a href="https://materialdesignicons.com/custom">Material Design Icon custom page</a>
  */
@@ -28,7 +29,8 @@ public enum JabRefMaterialDesignIcon implements Ikon {
     SET_CENTER("jab-setcenter", '\ue90b'),
     SET_ALL("jab-setall", '\ue90c'),
     VSCODE("jab-vsvode", '\ue90d'),
-    CANCEL("jab-cancel", '\ue90e');
+    CANCEL("jab-cancel", '\ue90e'),
+    SUBLIME_TEXT("jab-sublime-text", '\ue90f');
 
     private String description;
     private int code;
diff --git a/src/main/java/org/jabref/gui/importer/BibEntryTypePrefsAndFileViewModel.java b/src/main/java/org/jabref/gui/importer/BibEntryTypePrefsAndFileViewModel.java
new file mode 100644
index 00000000000..27735d96c4a
--- /dev/null
+++ b/src/main/java/org/jabref/gui/importer/BibEntryTypePrefsAndFileViewModel.java
@@ -0,0 +1,18 @@
+package org.jabref.gui.importer;
+
+import org.jabref.logic.exporter.MetaDataSerializer;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.model.entry.BibEntryType;
+
+public record BibEntryTypePrefsAndFileViewModel(BibEntryType customTypeFromPreferences, BibEntryType customTypeFromFile) {
+    /**
+     * Used to render in the UI. This is different from {@link BibEntryType#toString()}, because this is the serialization the user expects
+     */
+    @Override
+    public String toString() {
+        return Localization.lang("%0 (from file)\n%1 (current setting)",
+                MetaDataSerializer.serializeCustomEntryTypes(customTypeFromFile),
+                MetaDataSerializer.serializeCustomEntryTypes(customTypeFromPreferences));
+    }
+}
+
diff --git a/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdAction.java b/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdAction.java
index ca9127fef2c..ad277139ff6 100644
--- a/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdAction.java
+++ b/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdAction.java
@@ -3,7 +3,6 @@
 import java.util.Optional;
 
 import org.jabref.gui.DialogService;
-import org.jabref.gui.Globals;
 import org.jabref.gui.LibraryTab;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.SimpleCommand;
@@ -17,6 +16,7 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.types.StandardEntryType;
+import org.jabref.model.util.FileUpdateMonitor;
 import org.jabref.preferences.PreferencesService;
 
 import org.controlsfx.control.PopOver;
@@ -33,6 +33,7 @@ public class GenerateEntryFromIdAction extends SimpleCommand {
     private final TaskExecutor taskExecutor;
     private final PopOver entryFromIdPopOver;
     private final StateManager stateManager;
+    private final FileUpdateMonitor fileUpdateMonitor;
 
     public GenerateEntryFromIdAction(LibraryTab libraryTab,
                                      DialogService dialogService,
@@ -40,7 +41,8 @@ public GenerateEntryFromIdAction(LibraryTab libraryTab,
                                      TaskExecutor taskExecutor,
                                      PopOver entryFromIdPopOver,
                                      String identifier,
-                                     StateManager stateManager) {
+                                     StateManager stateManager,
+                                     FileUpdateMonitor fileUpdateMonitor) {
         this.libraryTab = libraryTab;
         this.dialogService = dialogService;
         this.preferencesService = preferencesService;
@@ -48,6 +50,7 @@ public GenerateEntryFromIdAction(LibraryTab libraryTab,
         this.taskExecutor = taskExecutor;
         this.entryFromIdPopOver = entryFromIdPopOver;
         this.stateManager = stateManager;
+        this.fileUpdateMonitor = fileUpdateMonitor;
     }
 
     @Override
@@ -56,7 +59,7 @@ 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((exception) -> {
+        backgroundTask.onFailure(exception -> {
             String fetcherExceptionMessage = exception.getMessage();
 
             String msg;
@@ -76,11 +79,18 @@ public void execute() {
                                    preferencesService, stateManager).execute();
             }
         });
-        backgroundTask.onSuccess((bibEntry) -> {
+        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, taskExecutor);
+                ImportHandler handler = new ImportHandler(
+                        libraryTab.getBibDatabaseContext(),
+                        preferencesService,
+                        fileUpdateMonitor,
+                        libraryTab.getUndoManager(),
+                        stateManager,
+                        dialogService,
+                        taskExecutor);
                 handler.importEntryWithDuplicateCheck(libraryTab.getBibDatabaseContext(), entry);
             } else {
                 dialogService.notify("No entry found or import canceled");
diff --git a/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.java b/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.java
index e2159d369f4..e1a1c7cfc26 100644
--- a/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.java
+++ b/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.java
@@ -11,9 +11,11 @@
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.l10n.Localization;
+import org.jabref.model.util.FileUpdateMonitor;
 import org.jabref.preferences.PreferencesService;
 
 import com.airhacks.afterburner.views.ViewLoader;
+import jakarta.inject.Inject;
 import org.controlsfx.control.PopOver;
 
 public class GenerateEntryFromIdDialog {
@@ -22,6 +24,8 @@ public class GenerateEntryFromIdDialog {
     @FXML TextField idTextField;
     @FXML Button generateButton;
 
+    @Inject private FileUpdateMonitor fileUpdateMonitor;
+
     private final PreferencesService preferencesService;
     private final DialogService dialogService;
     private final LibraryTab libraryTab;
@@ -56,7 +60,8 @@ public GenerateEntryFromIdDialog(LibraryTab libraryTab, DialogService dialogServ
                 taskExecutor,
                 entryFromIdPopOver,
                 idTextField.getText(),
-                stateManager
+                stateManager,
+                fileUpdateMonitor
         );
         generateEntryFromIdAction.execute();
     }
diff --git a/src/main/java/org/jabref/gui/importer/GrobidOptInDialogHelper.java b/src/main/java/org/jabref/gui/importer/GrobidOptInDialogHelper.java
index cf21a38a30c..07382713e29 100644
--- a/src/main/java/org/jabref/gui/importer/GrobidOptInDialogHelper.java
+++ b/src/main/java/org/jabref/gui/importer/GrobidOptInDialogHelper.java
@@ -29,7 +29,7 @@ public static boolean showAndWaitIfUserIsUndecided(DialogService dialogService,
                 Localization.lang("Remote services"),
                 Localization.lang("Allow sending PDF files and raw citation strings to a JabRef online service (Grobid) to determine Metadata. This produces better results."),
                 Localization.lang("Do not ask again"),
-                (optOut) -> preferences.grobidOptOutProperty().setValue(optOut));
+                optOut -> preferences.grobidOptOutProperty().setValue(optOut));
         preferences.grobidEnabledProperty().setValue(grobidEnabled);
         return grobidEnabled;
     }
diff --git a/src/main/java/org/jabref/gui/importer/ImportAction.java b/src/main/java/org/jabref/gui/importer/ImportAction.java
index 37e8af79242..23e34bfc7ba 100644
--- a/src/main/java/org/jabref/gui/importer/ImportAction.java
+++ b/src/main/java/org/jabref/gui/importer/ImportAction.java
@@ -27,6 +27,7 @@
 import org.jabref.logic.util.UpdateField;
 import org.jabref.logic.util.io.FileUtil;
 import org.jabref.model.database.BibDatabase;
+import org.jabref.model.util.FileUpdateMonitor;
 import org.jabref.preferences.PreferencesService;
 
 import org.slf4j.Logger;
@@ -44,14 +45,20 @@ public class ImportAction {
     private Exception importError;
     private final TaskExecutor taskExecutor = Globals.TASK_EXECUTOR;
 
-    private final PreferencesService prefs;
+    private final PreferencesService preferencesService;
+    private final FileUpdateMonitor fileUpdateMonitor;
 
-    public ImportAction(JabRefFrame frame, boolean openInNew, Importer importer, PreferencesService prefs) {
+    public ImportAction(JabRefFrame frame,
+                        boolean openInNew,
+                        Importer importer,
+                        PreferencesService preferencesService,
+                        FileUpdateMonitor fileUpdateMonitor) {
         this.importer = Optional.ofNullable(importer);
         this.frame = frame;
         this.dialogService = frame.getDialogService();
         this.openInNew = openInNew;
-        this.prefs = prefs;
+        this.preferencesService = preferencesService;
+        this.fileUpdateMonitor = fileUpdateMonitor;
     }
 
     /**
@@ -94,7 +101,7 @@ public void automatedImport(List<String> filenames) {
                 frame.addTab(parserResult.getDatabaseContext(), true);
                 dialogService.notify(Localization.lang("Imported entries") + ": " + parserResult.getDatabase().getEntries().size());
             })
-           .onFailure(ex-> {
+           .onFailure(ex -> {
                LOGGER.error("Error importing", ex);
                dialogService.notify(Localization.lang("Error importing. See the error log for details."));
            })
@@ -114,36 +121,34 @@ private boolean fileIsPdf(Path filename) {
     }
 
     private List<ImportFormatReader.UnknownFormatImport> doImport(List<Path> files) {
-        // We import all files and collect their results:
+        // We import all files and collect their results
         List<ImportFormatReader.UnknownFormatImport> imports = new ArrayList<>();
+        ImportFormatReader importFormatReader = new ImportFormatReader(
+                preferencesService.getImporterPreferences(),
+                preferencesService.getImportFormatPreferences(),
+                fileUpdateMonitor);
         for (Path filename : files) {
             try {
                 if (importer.isEmpty()) {
-                    // Unknown format:
+                    // Unknown format
                     DefaultTaskExecutor.runAndWaitInJavaFXThread(() -> {
-                        if (fileIsPdf(filename) && GrobidOptInDialogHelper.showAndWaitIfUserIsUndecided(frame.getDialogService(), prefs.getGrobidPreferences())) {
-                            Globals.IMPORT_FORMAT_READER.resetImportFormats(
-                                    prefs.getImporterPreferences(),
-                                    prefs.getImportFormatPreferences(),
-                                    Globals.getFileUpdateMonitor());
+                        if (fileIsPdf(filename) && GrobidOptInDialogHelper.showAndWaitIfUserIsUndecided(dialogService, preferencesService.getGrobidPreferences())) {
+                            importFormatReader.reset();
                         }
                         frame.getDialogService().notify(Localization.lang("Importing in unknown format") + "...");
                     });
-                    // This import method never throws an IOException:
-                    imports.add(Globals.IMPORT_FORMAT_READER.importUnknownFormat(filename, Globals.getFileUpdateMonitor()));
+                    // This import method never throws an IOException
+                    imports.add(importFormatReader.importUnknownFormat(filename, fileUpdateMonitor));
                 } else {
                     DefaultTaskExecutor.runAndWaitInJavaFXThread(() -> {
-                        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());
+                        if (((importer.get() instanceof PdfGrobidImporter)
+                                        || (importer.get() instanceof PdfMergeMetadataImporter))
+                                        && GrobidOptInDialogHelper.showAndWaitIfUserIsUndecided(dialogService, preferencesService.getGrobidPreferences())) {
+                            importFormatReader.reset();
                         }
                         frame.getDialogService().notify(Localization.lang("Importing in %0 format", importer.get().getName()) + "...");
                     });
-                    // Specific importer:
+                    // Specific importer
                     ParserResult pr = importer.get().importDatabase(filename);
                     imports.add(new ImportFormatReader.UnknownFormatImport(importer.get().getName(), pr));
                 }
@@ -168,22 +173,22 @@ private ParserResult mergeImportResults(List<ImportFormatReader.UnknownFormatImp
             if (importResult == null) {
                 continue;
             }
-            ParserResult parserResult = importResult.parserResult;
+            ParserResult parserResult = importResult.parserResult();
             resultDatabase.insertEntries(parserResult.getDatabase().getEntries());
 
-            if (ImportFormatReader.BIBTEX_FORMAT.equals(importResult.format)) {
+            if (ImportFormatReader.BIBTEX_FORMAT.equals(importResult.format())) {
                 // additional treatment of BibTeX
-                new DatabaseMerger(prefs.getBibEntryPreferences().getKeywordSeparator()).mergeMetaData(
+                new DatabaseMerger(preferencesService.getBibEntryPreferences().getKeywordSeparator()).mergeMetaData(
                         result.getMetaData(),
                         parserResult.getMetaData(),
-                        importResult.parserResult.getPath().map(path -> path.getFileName().toString()).orElse("unknown"),
+                        importResult.parserResult().getPath().map(path -> path.getFileName().toString()).orElse("unknown"),
                         parserResult.getDatabase().getEntries());
             }
             // TODO: collect errors into ParserResult, because they are currently ignored (see caller of this method)
         }
 
         // set timestamp and owner
-        UpdateField.setAutomaticFields(resultDatabase.getEntries(), prefs.getOwnerPreferences(), prefs.getTimestampPreferences()); // set timestamp and owner
+        UpdateField.setAutomaticFields(resultDatabase.getEntries(), preferencesService.getOwnerPreferences(), preferencesService.getTimestampPreferences()); // set timestamp and owner
 
         return result;
     }
diff --git a/src/main/java/org/jabref/gui/importer/ImportCommand.java b/src/main/java/org/jabref/gui/importer/ImportCommand.java
index 8e40e6c0c49..406b0b1b8e2 100644
--- a/src/main/java/org/jabref/gui/importer/ImportCommand.java
+++ b/src/main/java/org/jabref/gui/importer/ImportCommand.java
@@ -9,14 +9,15 @@
 import javafx.stage.FileChooser;
 
 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.SimpleCommand;
 import org.jabref.gui.util.FileDialogConfiguration;
 import org.jabref.gui.util.FileFilterConverter;
+import org.jabref.logic.importer.ImportFormatReader;
 import org.jabref.logic.importer.Importer;
 import org.jabref.logic.l10n.Localization;
+import org.jabref.model.util.FileUpdateMonitor;
 import org.jabref.preferences.PreferencesService;
 
 import static org.jabref.gui.actions.ActionHelper.needsDatabase;
@@ -30,14 +31,20 @@ public class ImportCommand extends SimpleCommand {
     private final boolean openInNew;
     private final DialogService dialogService;
     private final PreferencesService preferences;
+    private final FileUpdateMonitor fileUpdateMonitor;
 
     /**
      * @param openInNew Indicate whether the entries should import into a new database or into the currently open one.
      */
-    public ImportCommand(JabRefFrame frame, boolean openInNew, PreferencesService preferences, StateManager stateManager) {
+    public ImportCommand(JabRefFrame frame,
+                         boolean openInNew,
+                         PreferencesService preferences,
+                         StateManager stateManager,
+                         FileUpdateMonitor fileUpdateMonitor) {
         this.frame = frame;
         this.openInNew = openInNew;
         this.preferences = preferences;
+        this.fileUpdateMonitor = fileUpdateMonitor;
 
         if (!openInNew) {
             this.executable.bind(needsDatabase(stateManager));
@@ -48,13 +55,17 @@ public ImportCommand(JabRefFrame frame, boolean openInNew, PreferencesService pr
 
     @Override
     public void execute() {
-        SortedSet<Importer> importers = Globals.IMPORT_FORMAT_READER.getImportFormats();
+        ImportFormatReader importFormatReader = new ImportFormatReader(
+                preferences.getImporterPreferences(),
+                preferences.getImportFormatPreferences(),
+                fileUpdateMonitor);
+        SortedSet<Importer> importers = importFormatReader.getImportFormats();
 
         FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
                 .addExtensionFilter(FileFilterConverter.ANY_FILE)
                 .addExtensionFilter(FileFilterConverter.forAllImporters(importers))
                 .addExtensionFilter(FileFilterConverter.importerToExtensionFilter(importers))
-                .withInitialDirectory(preferences.getImportExportPreferences().getImportWorkingDirectory())
+                .withInitialDirectory(preferences.getImporterPreferences().getImportWorkingDirectory())
                 .build();
         dialogService.showFileOpenDialog(fileDialogConfiguration)
                      .ifPresent(path -> doImport(path, importers, fileDialogConfiguration.getSelectedExtensionFilter()));
@@ -68,9 +79,9 @@ private void doImport(Path file, SortedSet<Importer> importers, FileChooser.Exte
             return;
         }
         Optional<Importer> format = FileFilterConverter.getImporter(selectedExtensionFilter, importers);
-        ImportAction importMenu = new ImportAction(frame, openInNew, format.orElse(null), preferences);
+        ImportAction importMenu = new ImportAction(frame, openInNew, format.orElse(null), preferences, fileUpdateMonitor);
         importMenu.automatedImport(Collections.singletonList(file.toString()));
         // Set last working dir for import
-        preferences.getImportExportPreferences().setImportWorkingDirectory(file.getParent());
+        preferences.getImporterPreferences().setImportWorkingDirectory(file.getParent());
     }
 }
diff --git a/src/main/java/org/jabref/gui/importer/ImportCustomEntryTypesDialog.java b/src/main/java/org/jabref/gui/importer/ImportCustomEntryTypesDialog.java
index a99f090628f..93ce743ad3b 100644
--- a/src/main/java/org/jabref/gui/importer/ImportCustomEntryTypesDialog.java
+++ b/src/main/java/org/jabref/gui/importer/ImportCustomEntryTypesDialog.java
@@ -21,10 +21,12 @@
 public class ImportCustomEntryTypesDialog extends BaseDialog<Void> {
 
     private final List<BibEntryType> customEntryTypes;
+
+    @Inject private PreferencesService preferencesService;
     @FXML private VBox boxDifferentCustomization;
+
     @FXML private CheckListView<BibEntryType> unknownEntryTypesCheckList;
-    @Inject private PreferencesService preferencesService;
-    @FXML private CheckListView<BibEntryType> differentCustomizationCheckList;
+    @FXML private CheckListView<BibEntryTypePrefsAndFileViewModel> differentCustomizationCheckList;
 
     private final BibDatabaseMode mode;
     private ImportCustomEntryTypesDialogViewModel viewModel;
@@ -39,7 +41,11 @@ public ImportCustomEntryTypesDialog(BibDatabaseMode mode, List<BibEntryType> cus
 
         setResultConverter(btn -> {
             if (btn == ButtonType.OK) {
-                viewModel.importBibEntryTypes(unknownEntryTypesCheckList.getCheckModel().getCheckedItems(), differentCustomizationCheckList.getCheckModel().getCheckedItems());
+                viewModel.importBibEntryTypes(
+                        unknownEntryTypesCheckList.getCheckModel().getCheckedItems(),
+                        differentCustomizationCheckList.getCheckModel().getCheckedItems().stream()
+                                .map(BibEntryTypePrefsAndFileViewModel::customTypeFromPreferences)
+                                .toList());
             }
             return null;
         });
diff --git a/src/main/java/org/jabref/gui/importer/ImportCustomEntryTypesDialogViewModel.java b/src/main/java/org/jabref/gui/importer/ImportCustomEntryTypesDialogViewModel.java
index 7f910016f44..0a7102698e0 100644
--- a/src/main/java/org/jabref/gui/importer/ImportCustomEntryTypesDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/importer/ImportCustomEntryTypesDialogViewModel.java
@@ -12,13 +12,18 @@
 import org.jabref.model.entry.types.EntryTypeFactory;
 import org.jabref.preferences.PreferencesService;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 public class ImportCustomEntryTypesDialogViewModel {
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(ImportCustomEntryTypesDialogViewModel.class);
+
     private final BibDatabaseMode mode;
     private final PreferencesService preferencesService;
 
     private final ObservableList<BibEntryType> newTypes = FXCollections.observableArrayList();
-    private final ObservableList<BibEntryType> differentCustomizationTypes = FXCollections.observableArrayList();
+    private final ObservableList<BibEntryTypePrefsAndFileViewModel> differentCustomizationTypes = FXCollections.observableArrayList();
 
     public ImportCustomEntryTypesDialogViewModel(BibDatabaseMode mode, List<BibEntryType> entryTypes, PreferencesService preferencesService) {
         this.mode = mode;
@@ -29,8 +34,10 @@ public ImportCustomEntryTypesDialogViewModel(BibDatabaseMode mode, List<BibEntry
             if (currentlyStoredType.isEmpty()) {
                 newTypes.add(customType);
             } else {
-                if (!EntryTypeFactory.isEqualNameAndFieldBased(customType, currentlyStoredType.get())) {
-                    differentCustomizationTypes.add(customType);
+                if (!EntryTypeFactory.nameAndFieldsAreEqual(customType, currentlyStoredType.get())) {
+                    LOGGER.info("currently stored type:    {}", currentlyStoredType.get());
+                    LOGGER.info("type provided by library: {}", customType);
+                    differentCustomizationTypes.add(new BibEntryTypePrefsAndFileViewModel(currentlyStoredType.get(), customType));
                 }
             }
         }
@@ -40,7 +47,7 @@ public ObservableList<BibEntryType> newTypes() {
         return this.newTypes;
     }
 
-    public ObservableList<BibEntryType> differentCustomizations() {
+    public ObservableList<BibEntryTypePrefsAndFileViewModel> differentCustomizations() {
         return this.differentCustomizationTypes;
     }
 
diff --git a/src/main/java/org/jabref/gui/importer/ImportEntriesViewModel.java b/src/main/java/org/jabref/gui/importer/ImportEntriesViewModel.java
index dfd27079cff..9a765087e0b 100644
--- a/src/main/java/org/jabref/gui/importer/ImportEntriesViewModel.java
+++ b/src/main/java/org/jabref/gui/importer/ImportEntriesViewModel.java
@@ -14,7 +14,6 @@
 
 import org.jabref.gui.AbstractViewModel;
 import org.jabref.gui.DialogService;
-import org.jabref.gui.Globals;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.duplicationFinder.DuplicateResolverDialog;
 import org.jabref.gui.externalfiles.ImportHandler;
@@ -126,7 +125,7 @@ public boolean hasDuplicate(BibEntry entry) {
     public void importEntries(List<BibEntry> entriesToImport, boolean shouldDownloadFiles) {
         // Check if we are supposed to warn about duplicates.
         // If so, then see if there are duplicates, and warn if yes.
-        if (preferences.getImportExportPreferences().shouldWarnAboutDuplicatesOnImport()) {
+        if (preferences.getImporterPreferences().shouldWarnAboutDuplicatesOnImport()) {
             BackgroundTask.wrap(() -> entriesToImport.stream()
                                                      .anyMatch(this::hasDuplicate)).onSuccess(duplicateFound -> {
                 if (duplicateFound) {
@@ -135,7 +134,7 @@ public void importEntries(List<BibEntry> entriesToImport, boolean shouldDownload
                             Localization.lang("Continue with import"),
                             Localization.lang("Cancel import"),
                             Localization.lang("Do not ask again"),
-                            optOut -> preferences.getImportExportPreferences().setWarnAboutDuplicatesOnImport(!optOut));
+                            optOut -> preferences.getImporterPreferences().setWarnAboutDuplicatesOnImport(!optOut));
 
                     if (!continueImport) {
                         dialogService.notify(Localization.lang("Import canceled"));
@@ -186,7 +185,6 @@ private void buildImportHandlerThenImportEntries(List<BibEntry> entriesToImport)
                 undoManager,
                 stateManager,
                 dialogService,
-                Globals.IMPORT_FORMAT_READER,
                 taskExecutor);
         importHandler.importEntries(entriesToImport);
         dialogService.notify(Localization.lang("Number of entries successfully imported") + ": " + entriesToImport.size());
diff --git a/src/main/java/org/jabref/gui/importer/NewDatabaseAction.java b/src/main/java/org/jabref/gui/importer/NewDatabaseAction.java
index b2f0b15307a..f45cbbd2a70 100644
--- a/src/main/java/org/jabref/gui/importer/NewDatabaseAction.java
+++ b/src/main/java/org/jabref/gui/importer/NewDatabaseAction.java
@@ -27,7 +27,7 @@ public NewDatabaseAction(JabRefFrame jabRefFrame, PreferencesService preferences
     @Override
     public void execute() {
         BibDatabaseContext bibDatabaseContext = new BibDatabaseContext();
-        bibDatabaseContext.setMode(preferencesService.getGeneralPreferences().getDefaultBibDatabaseMode());
+        bibDatabaseContext.setMode(preferencesService.getLibraryPreferences().getDefaultBibDatabaseMode());
         jabRefFrame.addTab(bibDatabaseContext, true);
     }
 }
diff --git a/src/main/java/org/jabref/gui/importer/actions/CheckForNewEntryTypesAction.java b/src/main/java/org/jabref/gui/importer/actions/CheckForNewEntryTypesAction.java
index 7ce14b28eb6..c1e0208a65e 100644
--- a/src/main/java/org/jabref/gui/importer/actions/CheckForNewEntryTypesAction.java
+++ b/src/main/java/org/jabref/gui/importer/actions/CheckForNewEntryTypesAction.java
@@ -41,6 +41,6 @@ private List<BibEntryType> getListOfUnknownAndUnequalCustomizations(ParserResult
     }
 
     private BibDatabaseMode getBibDatabaseModeFromParserResult(ParserResult parserResult) {
-        return parserResult.getMetaData().getMode().orElse(Globals.prefs.getGeneralPreferences().getDefaultBibDatabaseMode());
+        return parserResult.getMetaData().getMode().orElse(Globals.prefs.getLibraryPreferences().getDefaultBibDatabaseMode());
     }
 }
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 403359dd390..121cf109c2e 100644
--- a/src/main/java/org/jabref/gui/importer/actions/OpenDatabaseAction.java
+++ b/src/main/java/org/jabref/gui/importer/actions/OpenDatabaseAction.java
@@ -17,14 +17,13 @@
 import org.jabref.gui.LibraryTab;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.SimpleCommand;
+import org.jabref.gui.autosaveandbackup.BackupManager;
 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;
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.logic.l10n.Localization;
@@ -32,6 +31,8 @@
 import org.jabref.logic.shared.exception.InvalidDBMSConnectionPropertiesException;
 import org.jabref.logic.shared.exception.NotASharedDatabaseException;
 import org.jabref.logic.util.StandardFileType;
+import org.jabref.model.entry.BibEntryTypesManager;
+import org.jabref.model.util.FileUpdateMonitor;
 import org.jabref.preferences.PreferencesService;
 
 import org.slf4j.Logger;
@@ -54,19 +55,22 @@ public class OpenDatabaseAction extends SimpleCommand {
     private final JabRefFrame frame;
     private final PreferencesService preferencesService;
     private final StateManager stateManager;
-    private final ThemeManager themeManager;
+    private final FileUpdateMonitor fileUpdateMonitor;
     private final DialogService dialogService;
+    private final BibEntryTypesManager entryTypesManager;
 
     public OpenDatabaseAction(JabRefFrame frame,
                               PreferencesService preferencesService,
                               DialogService dialogService,
                               StateManager stateManager,
-                              ThemeManager themeManager) {
+                              FileUpdateMonitor fileUpdateMonitor,
+                              BibEntryTypesManager entryTypesManager) {
         this.frame = frame;
         this.preferencesService = preferencesService;
         this.dialogService = dialogService;
         this.stateManager = stateManager;
-        this.themeManager = themeManager;
+        this.fileUpdateMonitor = fileUpdateMonitor;
+        this.entryTypesManager = entryTypesManager;
     }
 
     /**
@@ -178,7 +182,7 @@ private void openTheFile(Path file) {
 
         BackgroundTask<ParserResult> backgroundTask = BackgroundTask.wrap(() -> loadDatabase(file));
         // The backgroundTask is executed within the method createLibraryTab
-        LibraryTab newTab = LibraryTab.createLibraryTab(backgroundTask, file, preferencesService, stateManager, frame, themeManager);
+        LibraryTab newTab = LibraryTab.createLibraryTab(backgroundTask, file, preferencesService, stateManager, frame, fileUpdateMonitor, entryTypesManager);
         backgroundTask.onFinished(() -> trackOpenNewDatabase(newTab));
     }
 
@@ -192,12 +196,14 @@ private ParserResult loadDatabase(Path file) throws Exception {
         dialogService.notify(Localization.lang("Opening") + ": '" + file + "'");
 
         preferencesService.getFilePreferences().setWorkingDirectory(fileToLoad.getParent());
+        Path backupDir = preferencesService.getFilePreferences().getBackupDirectory();
 
         ParserResult parserResult = null;
-        if (BackupManager.backupFileDiffers(fileToLoad)) {
+        if (BackupManager.backupFileDiffers(fileToLoad, backupDir)) {
             // In case the backup differs, ask the user what to do.
             // In case the user opted for restoring a backup, the content of the backup is contained in parserResult.
-            parserResult = BackupUIManager.showRestoreBackupDialog(dialogService, fileToLoad, preferencesService).orElse(null);
+            parserResult = BackupUIManager.showRestoreBackupDialog(dialogService, fileToLoad, preferencesService, fileUpdateMonitor)
+                                          .orElse(null);
         }
 
         try {
@@ -205,7 +211,7 @@ private ParserResult loadDatabase(Path file) throws Exception {
                 // No backup was restored, do the "normal" loading
                 parserResult = OpenDatabase.loadDatabase(fileToLoad,
                         preferencesService.getImportFormatPreferences(),
-                        Globals.getFileUpdateMonitor());
+                        fileUpdateMonitor);
             }
 
             if (parserResult.hasWarnings()) {
@@ -221,7 +227,8 @@ private ParserResult loadDatabase(Path file) throws Exception {
 
         if (parserResult.getDatabase().isShared()) {
             try {
-                new SharedDatabaseUIManager(frame, preferencesService).openSharedDatabaseFromParserResult(parserResult);
+                new SharedDatabaseUIManager(frame, preferencesService, fileUpdateMonitor)
+                        .openSharedDatabaseFromParserResult(parserResult);
             } catch (SQLException | DatabaseNotSupportedException | InvalidDBMSConnectionPropertiesException |
                     NotASharedDatabaseException e) {
                 parserResult.getDatabaseContext().clearDatabasePath(); // do not open the original file
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 df252ccc8df..7b1db9e9af5 100644
--- a/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneView.java
+++ b/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneView.java
@@ -1,5 +1,6 @@
 package org.jabref.gui.importer.fetcher;
 
+import javafx.beans.binding.BooleanExpression;
 import javafx.css.PseudoClass;
 import javafx.scene.control.Button;
 import javafx.scene.control.ComboBox;
@@ -53,7 +54,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(), dialogService));
+                Button helpButton = factory.createIconButton(StandardActions.HELP, new HelpAction(fetcher.getHelpPage().get(), dialogService, preferences.getFilePreferences()));
                 helpButtonContainer.getChildren().setAll(helpButton);
             } else {
                 helpButtonContainer.getChildren().clear();
@@ -86,10 +87,12 @@ private void initialize() {
         });
 
         // Create button that triggers search
+        BooleanExpression importerEnabled = preferences.getImporterPreferences().importerEnabledProperty();
         Button search = new Button(Localization.lang("Search"));
         search.setDefaultButton(false);
         search.setOnAction(event -> viewModel.search());
         search.setMaxWidth(Double.MAX_VALUE);
+        search.disableProperty().bind(importerEnabled.not());
         getChildren().addAll(fetcherContainer, query, search);
     }
 }
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 6aa6e7177d5..eefb0944c61 100644
--- a/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModel.java
+++ b/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModel.java
@@ -2,6 +2,7 @@
 
 import java.util.Map;
 import java.util.SortedSet;
+import java.util.concurrent.Callable;
 
 import javafx.beans.property.ListProperty;
 import javafx.beans.property.ObjectProperty;
@@ -17,11 +18,13 @@
 import org.jabref.gui.StateManager;
 import org.jabref.gui.importer.ImportEntriesDialog;
 import org.jabref.gui.util.BackgroundTask;
+import org.jabref.logic.importer.CompositeIdFetcher;
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.logic.importer.SearchBasedFetcher;
 import org.jabref.logic.importer.WebFetchers;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.strings.StringUtil;
+import org.jabref.model.util.OptionalUtil;
 import org.jabref.preferences.PreferencesService;
 import org.jabref.preferences.SidePanePreferences;
 
@@ -43,6 +46,7 @@ public class WebSearchPaneViewModel {
     private final ListProperty<SearchBasedFetcher> fetchers = new SimpleListProperty<>(FXCollections.observableArrayList());
     private final StringProperty query = new SimpleStringProperty();
     private final DialogService dialogService;
+    private final PreferencesService preferencesService;
     private final StateManager stateManager;
 
     private final Validator searchQueryValidator;
@@ -51,6 +55,7 @@ public class WebSearchPaneViewModel {
     public WebSearchPaneViewModel(PreferencesService preferencesService, DialogService dialogService, StateManager stateManager) {
         this.dialogService = dialogService;
         this.stateManager = stateManager;
+        this.preferencesService = preferencesService;
 
         SortedSet<SearchBasedFetcher> allFetchers = WebFetchers.getSearchBasedFetchers(
                 preferencesService.getImportFormatPreferences(),
@@ -77,6 +82,12 @@ public WebSearchPaneViewModel(PreferencesService preferencesService, DialogServi
                         // in case user did not enter something, it is treated as valid (to avoid UI WTFs)
                         return null;
                     }
+
+                    if (CompositeIdFetcher.containsValidId(queryText)) {
+                        // in case the query contains any ID, it is treated as valid
+                        return null;
+                    }
+
                     try {
                         parser.parse(queryText, NO_EXPLICIT_FIELD);
                         return null;
@@ -119,6 +130,13 @@ public StringProperty queryProperty() {
     }
 
     public void search() {
+        if (!preferencesService.getImporterPreferences().areImporterEnabled()) {
+            if (!preferencesService.getImporterPreferences().areImporterEnabled()) {
+                dialogService.notify(Localization.lang("Web search disabled"));
+                return;
+            }
+        }
+
         String query = getQuery().trim();
         if (StringUtil.isBlank(query)) {
             dialogService.notify(Localization.lang("Please enter a search string"));
@@ -130,16 +148,25 @@ public void search() {
         }
 
         SearchBasedFetcher activeFetcher = getSelectedFetcher();
+        Callable<ParserResult> parserResultCallable = () -> new ParserResult(activeFetcher.performSearch(query));
+        String fetcherName = activeFetcher.getName();
+
+        if (CompositeIdFetcher.containsValidId(query)) {
+            CompositeIdFetcher compositeIdFetcher = new CompositeIdFetcher(preferencesService.getImportFormatPreferences());
+            parserResultCallable = () -> new ParserResult(OptionalUtil.toList(compositeIdFetcher.performSearchById(query)));
+            fetcherName = compositeIdFetcher.getName();
+        }
+
+        final String finalFetcherName = fetcherName;
         Globals.getTelemetryClient().ifPresent(client ->
-                client.trackEvent("search", Map.of("fetcher", activeFetcher.getName()), Map.of()));
+                client.trackEvent("search", Map.of("fetcher", finalFetcherName), Map.of()));
 
-        BackgroundTask<ParserResult> task;
-        task = BackgroundTask.wrap(() -> new ParserResult(activeFetcher.performSearch(query)))
+        BackgroundTask<ParserResult> task = BackgroundTask.wrap(parserResultCallable)
                              .withInitialMessage(Localization.lang("Processing %0", query));
         task.onFailure(dialogService::showErrorDialogAndWait);
 
         ImportEntriesDialog dialog = new ImportEntriesDialog(stateManager.getActiveDatabase().get(), task);
-        dialog.setTitle(activeFetcher.getName());
+        dialog.setTitle(finalFetcherName);
         dialogService.showCustomDialogAndWait(dialog);
     }
 
diff --git a/src/main/java/org/jabref/gui/integrity/IntegrityCheckAction.java b/src/main/java/org/jabref/gui/integrity/IntegrityCheckAction.java
index 809a2020c78..61922765b80 100644
--- a/src/main/java/org/jabref/gui/integrity/IntegrityCheckAction.java
+++ b/src/main/java/org/jabref/gui/integrity/IntegrityCheckAction.java
@@ -7,16 +7,17 @@
 import javafx.concurrent.Task;
 
 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.SimpleCommand;
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.integrity.IntegrityCheck;
 import org.jabref.logic.integrity.IntegrityMessage;
+import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
+import org.jabref.preferences.PreferencesService;
 
 import static org.jabref.gui.actions.ActionHelper.needsDatabase;
 
@@ -25,13 +26,22 @@ public class IntegrityCheckAction extends SimpleCommand {
     private final TaskExecutor taskExecutor;
     private final DialogService dialogService;
     private final JabRefFrame frame;
+    private final PreferencesService preferencesService;
     private final StateManager stateManager;
+    private final JournalAbbreviationRepository abbreviationRepository;
 
-    public IntegrityCheckAction(JabRefFrame frame, StateManager stateManager, TaskExecutor taskExecutor) {
+    public IntegrityCheckAction(JabRefFrame frame,
+                                PreferencesService preferencesService,
+                                DialogService dialogService,
+                                StateManager stateManager,
+                                TaskExecutor taskExecutor,
+                                JournalAbbreviationRepository abbreviationRepository) {
         this.frame = frame;
         this.stateManager = stateManager;
         this.taskExecutor = taskExecutor;
-        this.dialogService = frame.getDialogService();
+        this.preferencesService = preferencesService;
+        this.dialogService = dialogService;
+        this.abbreviationRepository = abbreviationRepository;
 
         this.executable.bind(needsDatabase(this.stateManager));
     }
@@ -40,10 +50,10 @@ public IntegrityCheckAction(JabRefFrame frame, StateManager stateManager, TaskEx
     public void execute() {
         BibDatabaseContext database = stateManager.getActiveDatabase().orElseThrow(() -> new NullPointerException("Database null"));
         IntegrityCheck check = new IntegrityCheck(database,
-                Globals.prefs.getFilePreferences(),
-                Globals.prefs.getCitationKeyPatternPreferences(),
-                Globals.journalAbbreviationRepository,
-                Globals.prefs.getEntryEditorPreferences().shouldAllowIntegerEditionBibtex());
+                preferencesService.getFilePreferences(),
+                preferencesService.getCitationKeyPatternPreferences(),
+                abbreviationRepository,
+                preferencesService.getEntryEditorPreferences().shouldAllowIntegerEditionBibtex());
 
         Task<List<IntegrityMessage>> task = new Task<>() {
             @Override
diff --git a/src/main/java/org/jabref/gui/journals/AbbreviateAction.java b/src/main/java/org/jabref/gui/journals/AbbreviateAction.java
index bf531de51dd..93be6a06c39 100644
--- a/src/main/java/org/jabref/gui/journals/AbbreviateAction.java
+++ b/src/main/java/org/jabref/gui/journals/AbbreviateAction.java
@@ -110,13 +110,14 @@ private String abbreviate(BibDatabaseContext databaseContext, List<BibEntry> ent
             }
         }).count();
 
-        if (count > 0) {
-            ce.end();
-            frame.getUndoManager().addEdit(ce);
-            frame.getCurrentLibraryTab().markBaseChanged();
-            return Localization.lang("Abbreviated %0 journal names.", String.valueOf(count));
+        if (count == 0) {
+            return Localization.lang("No journal names could be abbreviated.");
         }
-        return Localization.lang("No journal names could be abbreviated.");
+
+        ce.end();
+        frame.getUndoManager().addEdit(ce);
+        frame.getCurrentLibraryTab().markBaseChanged();
+        return Localization.lang("Abbreviated %0 journal names.", String.valueOf(count));
     }
 
     private String unabbreviate(BibDatabaseContext databaseContext, List<BibEntry> entries) {
@@ -126,12 +127,13 @@ private String unabbreviate(BibDatabaseContext databaseContext, List<BibEntry> e
         int count = entries.stream().mapToInt(entry ->
                 (int) FieldFactory.getJournalNameFields().stream().filter(journalField ->
                         undoableAbbreviator.unabbreviate(databaseContext.getDatabase(), entry, journalField, ce)).count()).sum();
-        if (count > 0) {
-            ce.end();
-            frame.getUndoManager().addEdit(ce);
-            frame.getCurrentLibraryTab().markBaseChanged();
-            return Localization.lang("Unabbreviated %0 journal names.", String.valueOf(count));
+        if (count == 0) {
+            return Localization.lang("No journal names could be unabbreviated.");
         }
-        return Localization.lang("No journal names could be unabbreviated.");
+
+        ce.end();
+        frame.getUndoManager().addEdit(ce);
+        frame.getCurrentLibraryTab().markBaseChanged();
+        return Localization.lang("Unabbreviated %0 journal names.", String.valueOf(count));
     }
 }
diff --git a/src/main/java/org/jabref/gui/journals/UndoableAbbreviator.java b/src/main/java/org/jabref/gui/journals/UndoableAbbreviator.java
index b04a64c95dc..94d817674a9 100644
--- a/src/main/java/org/jabref/gui/journals/UndoableAbbreviator.java
+++ b/src/main/java/org/jabref/gui/journals/UndoableAbbreviator.java
@@ -55,7 +55,7 @@ public boolean abbreviate(BibDatabase database, BibEntry entry, Field fieldName,
         }
 
         // Store full name into fjournal but only if it exists
-        if (useFJournalField && (StandardField.JOURNAL.equals(fieldName) || StandardField.JOURNALTITLE.equals(fieldName))) {
+        if (useFJournalField && (StandardField.JOURNAL == fieldName || StandardField.JOURNALTITLE == fieldName)) {
             entry.setField(AMSField.FJOURNAL, abbreviation.getName());
             ce.addEdit(new UndoableFieldChange(entry, AMSField.FJOURNAL, null, abbreviation.getName()));
         }
diff --git a/src/main/java/org/jabref/gui/journals/UndoableUnabbreviator.java b/src/main/java/org/jabref/gui/journals/UndoableUnabbreviator.java
index bf4e1ab5bfe..0b98445dc68 100644
--- a/src/main/java/org/jabref/gui/journals/UndoableUnabbreviator.java
+++ b/src/main/java/org/jabref/gui/journals/UndoableUnabbreviator.java
@@ -58,7 +58,7 @@ public boolean unabbreviate(BibDatabase database, BibEntry entry, Field field, C
     }
 
     public boolean restoreFromFJournal(BibEntry entry, Field field, CompoundEdit ce) {
-        if ((!StandardField.JOURNAL.equals(field) && !StandardField.JOURNALTITLE.equals(field)) || !entry.hasField(AMSField.FJOURNAL)) {
+        if ((StandardField.JOURNAL != field && StandardField.JOURNALTITLE != field) || !entry.hasField(AMSField.FJOURNAL)) {
             return false;
         }
 
diff --git a/src/main/java/org/jabref/gui/keyboard/KeyBinding.java b/src/main/java/org/jabref/gui/keyboard/KeyBinding.java
index d8edbcc75a3..5706d55cc7b 100644
--- a/src/main/java/org/jabref/gui/keyboard/KeyBinding.java
+++ b/src/main/java/org/jabref/gui/keyboard/KeyBinding.java
@@ -56,6 +56,7 @@ public enum KeyBinding {
     FILE_LIST_EDITOR_MOVE_ENTRY_UP("File list editor, move entry up", Localization.lang("File list editor, move entry up"), "ctrl+UP", KeyBindingCategory.VIEW),
     FIND_UNLINKED_FILES("Search for unlinked local files", Localization.lang("Search for unlinked local files"), "shift+F7", KeyBindingCategory.QUALITY),
     FOCUS_ENTRY_TABLE("Focus entry table", Localization.lang("Focus entry table"), "alt+1", KeyBindingCategory.VIEW),
+    FOCUS_GROUP_LIST("Focus group list", Localization.lang("Focus group list"), "alt+s", KeyBindingCategory.VIEW),
     HELP("Help", Localization.lang("Help"), "F1", KeyBindingCategory.FILE),
     IMPORT_INTO_CURRENT_DATABASE("Import into current library", Localization.lang("Import into current library"), "ctrl+I", KeyBindingCategory.FILE),
     IMPORT_INTO_NEW_DATABASE("Import into new library", Localization.lang("Import into new library"), "ctrl+alt+I", KeyBindingCategory.FILE),
@@ -83,7 +84,6 @@ public enum KeyBinding {
     OPEN_URL_OR_DOI("Open URL or DOI", Localization.lang("Open URL or DOI"), "F3", KeyBindingCategory.TOOLS),
     PASTE("Paste", Localization.lang("Paste"), "ctrl+V", KeyBindingCategory.EDIT),
     PULL_CHANGES_FROM_SHARED_DATABASE("Pull changes from shared database", Localization.lang("Pull changes from shared database"), "ctrl+shift+R", KeyBindingCategory.FILE),
-    PREAMBLE_EDITOR_STORE_CHANGES("Preamble editor, store changes", Localization.lang("Preamble editor, store changes"), "alt+S", KeyBindingCategory.FILE),
     PREVIOUS_PREVIEW_LAYOUT("Previous preview layout", Localization.lang("Previous preview layout"), "shift+F9", KeyBindingCategory.VIEW),
     PREVIOUS_LIBRARY("Previous library", Localization.lang("Previous library"), "ctrl+PAGE_UP", KeyBindingCategory.VIEW),
     PUSH_TO_APPLICATION("Push to application", Localization.lang("Push to application"), "ctrl+L", KeyBindingCategory.TOOLS),
diff --git a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesViewModel.java b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesViewModel.java
index 4738c7e30bd..9939528cc36 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesViewModel.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesViewModel.java
@@ -6,6 +6,7 @@
 import org.jabref.gui.libraryproperties.contentselectors.ContentSelectorView;
 import org.jabref.gui.libraryproperties.general.GeneralPropertiesView;
 import org.jabref.gui.libraryproperties.keypattern.KeyPatternPropertiesView;
+import org.jabref.gui.libraryproperties.preamble.PreamblePropertiesView;
 import org.jabref.gui.libraryproperties.saving.SavingPropertiesView;
 import org.jabref.model.database.BibDatabaseContext;
 
@@ -17,9 +18,10 @@ public LibraryPropertiesViewModel(BibDatabaseContext databaseContext) {
         propertiesTabs = List.of(
                 new GeneralPropertiesView(databaseContext),
                 new SavingPropertiesView(databaseContext),
-                new ConstantsPropertiesView(databaseContext),
                 new KeyPatternPropertiesView(databaseContext),
-                new ContentSelectorView(databaseContext)
+                new ConstantsPropertiesView(databaseContext),
+                new ContentSelectorView(databaseContext),
+                new PreamblePropertiesView(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 a6fec6aa7ab..76b0debf639 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/constants/ConstantsPropertiesView.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/constants/ConstantsPropertiesView.java
@@ -49,7 +49,7 @@ public String getTabName() {
     }
 
     public void initialize() {
-        this.viewModel = new ConstantsPropertiesViewModel(databaseContext, dialogService);
+        this.viewModel = new ConstantsPropertiesViewModel(databaseContext, dialogService, preferencesService.getFilePreferences());
 
         addStringButton.setTooltip(new Tooltip(Localization.lang("New string")));
 
@@ -62,8 +62,8 @@ public void initialize() {
                 .install(labelColumn, new DefaultStringConverter());
         labelColumn.setOnEditCommit((TableColumn.CellEditEvent<ConstantsItemModel, String> cellEvent) -> {
 
-            ConstantsItemModel cellItem = cellEvent.getTableView()
-                                                   .getItems()
+            var tableView = cellEvent.getTableView();
+            ConstantsItemModel cellItem = tableView.getItems()
                                                    .get(cellEvent.getTablePosition().getRow());
 
             Optional<ConstantsItemModel> existingItem = viewModel.labelAlreadyExists(cellEvent.getNewValue());
@@ -72,13 +72,18 @@ public void initialize() {
                 dialogService.showErrorDialogAndWait(Localization.lang(
                         "A string with the label '%0' already exists.",
                         cellEvent.getNewValue()));
-
                 cellItem.setLabel(cellEvent.getOldValue());
             } else {
                 cellItem.setLabel(cellEvent.getNewValue());
             }
 
-            cellEvent.getTableView().refresh();
+            // Resort the entries based on the keys and set the focus to the newly-created entry
+            viewModel.resortStrings();
+            var selectionModel = tableView.getSelectionModel();
+            selectionModel.select(cellItem);
+            selectionModel.focus(selectionModel.getSelectedIndex());
+            tableView.refresh();
+            tableView.scrollTo(cellItem);
         });
 
         contentColumn.setSortable(true);
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 8616f4e6b3f..36f4ddeff07 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/constants/ConstantsPropertiesViewModel.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/constants/ConstantsPropertiesViewModel.java
@@ -1,5 +1,7 @@
 package org.jabref.gui.libraryproperties.constants;
 
+import java.util.Comparator;
+import java.util.Locale;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
@@ -18,6 +20,7 @@
 import org.jabref.logic.help.HelpFile;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibtexString;
+import org.jabref.preferences.FilePreferences;
 
 import com.tobiasdiez.easybind.EasyBind;
 
@@ -33,10 +36,12 @@ public class ConstantsPropertiesViewModel implements PropertiesTabViewModel {
     private final BibDatabaseContext databaseContext;
 
     private final DialogService dialogService;
+    private final FilePreferences filePreferences;
 
-    public ConstantsPropertiesViewModel(BibDatabaseContext databaseContext, DialogService dialogService) {
+    public ConstantsPropertiesViewModel(BibDatabaseContext databaseContext, DialogService dialogService, FilePreferences filePreferences) {
         this.databaseContext = databaseContext;
         this.dialogService = dialogService;
+        this.filePreferences = filePreferences;
 
         ObservableList<ObservableValue<Boolean>> allValidProperty =
                 EasyBind.map(stringsListProperty, ConstantsItemModel::combinedValidationValidProperty);
@@ -48,7 +53,7 @@ public void setValues() {
         stringsListProperty.addAll(databaseContext.getDatabase().getStringValues().stream()
                                                   .sorted(new BibtexStringComparator(false))
                                                   .map(this::convertFromBibTexString)
-                                                  .collect(Collectors.toSet()));
+                                                  .toList());
     }
 
     public void addNewString() {
@@ -70,6 +75,11 @@ public void removeString(ConstantsItemModel item) {
         stringsListProperty.remove(item);
     }
 
+    public void resortStrings() {
+        // Resort the strings list in the same order as setValues() does
+        stringsListProperty.sort(Comparator.comparing(c -> c.labelProperty().get().toLowerCase(Locale.ROOT)));
+    }
+
     private ConstantsItemModel convertFromBibTexString(BibtexString bibtexString) {
         return new ConstantsItemModel(bibtexString.getName(), bibtexString.getContent());
     }
@@ -94,7 +104,7 @@ public Optional<ConstantsItemModel> labelAlreadyExists(String label) {
     }
 
     public void openHelpPage() {
-        new HelpAction(HelpFile.STRING_EDITOR, dialogService).execute();
+        new HelpAction(HelpFile.STRING_EDITOR, dialogService, filePreferences).execute();
     }
 
     public ListProperty<ConstantsItemModel> stringsListProperty() {
diff --git a/src/main/java/org/jabref/gui/libraryproperties/contentselectors/ContentSelectorViewModel.java b/src/main/java/org/jabref/gui/libraryproperties/contentselectors/ContentSelectorViewModel.java
index 66e1d12bab4..db23506e8fd 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/contentselectors/ContentSelectorViewModel.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/contentselectors/ContentSelectorViewModel.java
@@ -5,6 +5,7 @@
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -67,12 +68,35 @@ public void setValues() {
     @Override
     public void storeSettings() {
         List<Field> metaDataFields = metaData.getContentSelectors().getFieldsWithSelectors();
+
+        if (isDefaultMap(fieldKeywordsMap)) {
+            Iterator<ContentSelector> iterator = metaData.getContentSelectors().getContentSelectors().iterator();
+            while (iterator.hasNext()) {
+                metaData.clearContentSelectors(iterator.next().getField());
+            }
+        }
+
         fieldKeywordsMap.forEach((field, keywords) -> updateMetaDataContentSelector(metaDataFields, field, keywords));
 
         List<Field> fieldNamesToRemove = filterFieldsToRemove();
         fieldNamesToRemove.forEach(metaData::clearContentSelectors);
     }
 
+    private boolean isDefaultMap(Map<Field, List<String>> fieldKeywordsMap) {
+        if (fieldKeywordsMap.size() != DEFAULT_FIELD_NAMES.size()) {
+            return false;
+        }
+        for (Field field : DEFAULT_FIELD_NAMES) {
+            if (!fieldKeywordsMap.containsKey(field)) {
+                return false;
+            }
+            if (!fieldKeywordsMap.get(field).isEmpty()) {
+                return false;
+            }
+        }
+        return true;
+    }
+
     public ListProperty<Field> getFieldNamesBackingList() {
         return fields;
     }
@@ -102,7 +126,7 @@ BooleanBinding isNoKeywordSelected() {
     }
 
     void showInputFieldNameDialog() {
-        dialogService.showInputDialogAndWait(Localization.lang("Add new field name"), Localization.lang("Field name:"))
+        dialogService.showInputDialogAndWait(Localization.lang("Add new field name"), Localization.lang("Field name"))
                      .map(FieldFactory::parseField)
                      .ifPresent(this::addFieldIfUnique);
     }
diff --git a/src/main/java/org/jabref/gui/libraryproperties/general/GeneralProperties.fxml b/src/main/java/org/jabref/gui/libraryproperties/general/GeneralProperties.fxml
index 88f558888b8..b843840f6e6 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/general/GeneralProperties.fxml
+++ b/src/main/java/org/jabref/gui/libraryproperties/general/GeneralProperties.fxml
@@ -3,7 +3,6 @@
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.ComboBox?>
 <?import javafx.scene.control.Label?>
-<?import javafx.scene.control.TextArea?>
 <?import javafx.scene.control.TextField?>
 <?import javafx.scene.control.Tooltip?>
 <?import javafx.scene.layout.ColumnConstraints?>
@@ -30,26 +29,15 @@
             <RowConstraints/>
         </rowConstraints>
 
-        <Label styleClass="sectionHeader" text="%General"
-               GridPane.columnSpan="3" GridPane.rowIndex="0"/>
-        <Label text="%Library encoding"
-               GridPane.columnIndex="0" GridPane.rowIndex="1"/>
-        <ComboBox fx:id="encoding" prefWidth="150.0"
-                  GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="1"/>
-        <Label text="%Library mode"
-               GridPane.columnIndex="0" GridPane.rowIndex="2"/>
-        <ComboBox fx:id="databaseMode" prefWidth="150.0"
-                  GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="2"/>
-
         <Label styleClass="sectionHeader" text="%Override default file directories"
-               GridPane.columnSpan="3" GridPane.rowIndex="3"/>
+               GridPane.columnSpan="3" GridPane.rowIndex="0"/>
         <Label text="%General file directory"
-               GridPane.columnIndex="0" GridPane.rowIndex="4"/>
+               GridPane.columnIndex="0" GridPane.rowIndex="1"/>
         <TextField fx:id="generalFileDirectory"
-                   GridPane.columnIndex="1" GridPane.rowIndex="4"/>
+                   GridPane.columnIndex="1" GridPane.rowIndex="1"/>
         <Button onAction="#browseGeneralFileDirectory"
                 styleClass="icon-button,narrow" prefHeight="20.0" prefWidth="20.0"
-                GridPane.columnIndex="2" GridPane.rowIndex="4">
+                GridPane.columnIndex="2" GridPane.rowIndex="1">
             <graphic>
                 <JabRefIconView glyph="OPEN"/>
             </graphic>
@@ -59,12 +47,12 @@
         </Button>
 
         <Label text="%User-specific file directory"
-               GridPane.columnIndex="0" GridPane.rowIndex="5"/>
+               GridPane.columnIndex="0" GridPane.rowIndex="2"/>
         <TextField fx:id="userSpecificFileDirectory"
-                   GridPane.columnIndex="1" GridPane.rowIndex="5"/>
+                   GridPane.columnIndex="1" GridPane.rowIndex="2"/>
         <Button onAction="#browseUserSpecificFileDirectory"
                 styleClass="icon-button,narrow" prefHeight="20.0" prefWidth="20.0"
-                GridPane.columnIndex="2" GridPane.rowIndex="5">
+                GridPane.columnIndex="2" GridPane.rowIndex="2">
             <graphic>
                 <JabRefIconView glyph="OPEN"/>
             </graphic>
@@ -74,12 +62,12 @@
         </Button>
 
         <Label text="%LaTeX file directory"
-               GridPane.columnIndex="0" GridPane.rowIndex="6"/>
+               GridPane.columnIndex="0" GridPane.rowIndex="3"/>
         <TextField fx:id="laTexFileDirectory"
-                   GridPane.columnIndex="1" GridPane.rowIndex="6"/>
+                   GridPane.columnIndex="1" GridPane.rowIndex="3"/>
         <Button onAction="#browseLatexFileDirectory"
                 styleClass="icon-button,narrow" prefHeight="20.0" prefWidth="20.0"
-                GridPane.columnIndex="2" GridPane.rowIndex="6">
+                GridPane.columnIndex="2" GridPane.rowIndex="3">
             <graphic>
                 <JabRefIconView glyph="OPEN"/>
             </graphic>
@@ -87,7 +75,17 @@
                 <Tooltip text="%Browse"/>
             </tooltip>
         </Button>
+
+        <Label styleClass="sectionHeader" text="%General"
+               GridPane.columnSpan="3" GridPane.rowIndex="4"/>
+        <Label text="%Library mode"
+               GridPane.columnIndex="0" GridPane.rowIndex="5"/>
+        <ComboBox fx:id="databaseMode" prefWidth="150.0"
+                  GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="5"/>
+        <Label text="%Library encoding"
+               GridPane.columnIndex="0" GridPane.rowIndex="6"/>
+        <ComboBox fx:id="encoding" prefWidth="150.0"
+                  GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="6"/>
+
     </GridPane>
-    <Label styleClass="sectionHeader" text="%Preamble"/>
-    <TextArea fx:id="preamble" minHeight="100" prefHeight="180" VBox.vgrow="ALWAYS"/>
 </fx:root>
diff --git a/src/main/java/org/jabref/gui/libraryproperties/general/GeneralPropertiesView.java b/src/main/java/org/jabref/gui/libraryproperties/general/GeneralPropertiesView.java
index 8b83f4f0d6f..a0c63a436c0 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/general/GeneralPropertiesView.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/general/GeneralPropertiesView.java
@@ -2,11 +2,8 @@
 
 import java.nio.charset.Charset;
 
-import javax.swing.undo.UndoManager;
-
 import javafx.fxml.FXML;
 import javafx.scene.control.ComboBox;
-import javafx.scene.control.TextArea;
 import javafx.scene.control.TextField;
 
 import org.jabref.gui.libraryproperties.AbstractPropertiesTabView;
@@ -25,10 +22,8 @@ public class GeneralPropertiesView extends AbstractPropertiesTabView<GeneralProp
     @FXML private TextField generalFileDirectory;
     @FXML private TextField userSpecificFileDirectory;
     @FXML private TextField laTexFileDirectory;
-    @FXML private TextArea preamble;
 
     @Inject private PreferencesService preferencesService;
-    @Inject private UndoManager undoManager;
 
     public GeneralPropertiesView(BibDatabaseContext databaseContext) {
         this.databaseContext = databaseContext;
@@ -44,7 +39,7 @@ public String getTabName() {
     }
 
     public void initialize() {
-        this.viewModel = new GeneralPropertiesViewModel(databaseContext, dialogService, preferencesService, undoManager);
+        this.viewModel = new GeneralPropertiesViewModel(databaseContext, dialogService, preferencesService);
 
         new ViewModelListCellFactory<Charset>()
                 .withText(Charset::displayName)
@@ -62,8 +57,6 @@ public void initialize() {
         generalFileDirectory.textProperty().bindBidirectional(viewModel.generalFileDirectoryPropertyProperty());
         userSpecificFileDirectory.textProperty().bindBidirectional(viewModel.userSpecificFileDirectoryProperty());
         laTexFileDirectory.textProperty().bindBidirectional(viewModel.laTexFileDirectoryProperty());
-
-        preamble.textProperty().bindBidirectional(viewModel.preambleProperty());
     }
 
     @FXML
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 65dc1d0b9ef..f54cfd5d151 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/general/GeneralPropertiesViewModel.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/general/GeneralPropertiesViewModel.java
@@ -4,8 +4,6 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 
-import javax.swing.undo.UndoManager;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ListProperty;
 import javafx.beans.property.ObjectProperty;
@@ -18,7 +16,6 @@
 
 import org.jabref.gui.DialogService;
 import org.jabref.gui.libraryproperties.PropertiesTabViewModel;
-import org.jabref.gui.undo.UndoablePreambleChange;
 import org.jabref.gui.util.DirectoryDialogConfiguration;
 import org.jabref.logic.l10n.Encodings;
 import org.jabref.logic.shared.DatabaseLocation;
@@ -37,7 +34,6 @@ public class GeneralPropertiesViewModel implements PropertiesTabViewModel {
     private final StringProperty generalFileDirectoryProperty = new SimpleStringProperty("");
     private final StringProperty userSpecificFileDirectoryProperty = new SimpleStringProperty("");
     private final StringProperty laTexFileDirectoryProperty = new SimpleStringProperty("");
-    private final StringProperty preambleProperty = new SimpleStringProperty("");
 
     private final DialogService dialogService;
     private final PreferencesService preferencesService;
@@ -45,12 +41,10 @@ public class GeneralPropertiesViewModel implements PropertiesTabViewModel {
     private final BibDatabaseContext databaseContext;
     private final MetaData metaData;
     private final DirectoryDialogConfiguration directoryDialogConfiguration;
-    private final UndoManager undoManager;
 
-    GeneralPropertiesViewModel(BibDatabaseContext databaseContext, DialogService dialogService, PreferencesService preferencesService, UndoManager undoManager) {
+    GeneralPropertiesViewModel(BibDatabaseContext databaseContext, DialogService dialogService, PreferencesService preferencesService) {
         this.dialogService = dialogService;
         this.preferencesService = preferencesService;
-        this.undoManager = undoManager;
         this.databaseContext = databaseContext;
         this.metaData = databaseContext.getMetaData();
 
@@ -60,16 +54,14 @@ public class GeneralPropertiesViewModel implements PropertiesTabViewModel {
 
     @Override
     public void setValues() {
-        boolean isShared = (databaseContext.getLocation() == DatabaseLocation.SHARED);
+        boolean isShared = databaseContext.getLocation() == DatabaseLocation.SHARED;
         encodingDisableProperty.setValue(isShared); // the encoding of shared database is always UTF-8
 
         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());
-        laTexFileDirectoryProperty.setValue(metaData.getLatexFileDirectory(preferencesService.getFilePreferences().getUser()).map(Path::toString).orElse(""));
-
-        preambleProperty.setValue(databaseContext.getDatabase().getPreamble().orElse(""));
+        userSpecificFileDirectoryProperty.setValue(metaData.getUserFileDirectory(preferencesService.getFilePreferences().getUserAndHost()).orElse("").trim());
+        laTexFileDirectoryProperty.setValue(metaData.getLatexFileDirectory(preferencesService.getFilePreferences().getUserAndHost()).map(Path::toString).orElse(""));
     }
 
     @Override
@@ -88,25 +80,19 @@ public void storeSettings() {
 
         String userSpecificFileDirectory = userSpecificFileDirectoryProperty.getValue();
         if (userSpecificFileDirectory.isEmpty()) {
-            newMetaData.clearUserFileDirectory(preferencesService.getFilePreferences().getUser());
+            newMetaData.clearUserFileDirectory(preferencesService.getFilePreferences().getUserAndHost());
         } else {
-            newMetaData.setUserFileDirectory(preferencesService.getFilePreferences().getUser(), userSpecificFileDirectory);
+            newMetaData.setUserFileDirectory(preferencesService.getFilePreferences().getUserAndHost(), userSpecificFileDirectory);
         }
 
         String latexFileDirectory = laTexFileDirectoryProperty.getValue();
         if (latexFileDirectory.isEmpty()) {
-            newMetaData.clearLatexFileDirectory(preferencesService.getFilePreferences().getUser());
+            newMetaData.clearLatexFileDirectory(preferencesService.getFilePreferences().getUserAndHost());
         } else {
-            newMetaData.setLatexFileDirectory(preferencesService.getFilePreferences().getUser(), Path.of(latexFileDirectory));
+            newMetaData.setLatexFileDirectory(preferencesService.getFilePreferences().getUserAndHost(), Path.of(latexFileDirectory));
         }
 
         databaseContext.setMetaData(newMetaData);
-
-        String newPreamble = preambleProperty.getValue();
-        if (!databaseContext.getDatabase().getPreamble().orElse("").equals(newPreamble)) {
-            undoManager.addEdit(new UndoablePreambleChange(databaseContext.getDatabase(), databaseContext.getDatabase().getPreamble().orElse(null), newPreamble));
-            databaseContext.getDatabase().setPreamble(newPreamble);
-        }
     }
 
     public void browseGeneralDir() {
@@ -155,8 +141,4 @@ public StringProperty userSpecificFileDirectoryProperty() {
     public StringProperty laTexFileDirectoryProperty() {
         return this.laTexFileDirectoryProperty;
     }
-
-    public StringProperty preambleProperty() {
-        return this.preambleProperty;
-    }
 }
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 5c325ff612b..42a573f335d 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/keypattern/KeyPatternPropertiesView.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/keypattern/KeyPatternPropertiesView.java
@@ -47,7 +47,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, dialogService), keyPatternHelp);
+        actionFactory.configureIconButton(StandardActions.HELP_KEY_PATTERNS, new HelpAction(HelpFile.CITATION_KEY_PATTERN, dialogService, preferencesService.getFilePreferences()), keyPatternHelp);
     }
 
     @Override
@@ -55,7 +55,7 @@ public void setValues() {
         viewModel.setValues();
         bibtexKeyPatternTable.setValues(
                 bibEntryTypesManager.getAllTypes(databaseContext.getMetaData().getMode()
-                                                                .orElse(preferencesService.getGeneralPreferences()
+                                                                .orElse(preferencesService.getLibraryPreferences()
                                                                                           .getDefaultBibDatabaseMode())),
                 databaseContext.getMetaData().getCiteKeyPattern(preferencesService.getCitationKeyPatternPreferences().getKeyPattern()));
     }
diff --git a/src/main/java/org/jabref/gui/libraryproperties/preamble/PreambleProperties.fxml b/src/main/java/org/jabref/gui/libraryproperties/preamble/PreambleProperties.fxml
new file mode 100644
index 00000000000..1b0af2fe228
--- /dev/null
+++ b/src/main/java/org/jabref/gui/libraryproperties/preamble/PreambleProperties.fxml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.TextArea?>
+<?import javafx.scene.layout.VBox?>
+<fx:root spacing="10.0" type="VBox"
+         xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml"
+         fx:controller="org.jabref.gui.libraryproperties.preamble.PreamblePropertiesView">
+    <Label styleClass="sectionHeader" text="%Preamble"/>
+    <TextArea fx:id="preamble" minHeight="100" prefHeight="180" VBox.vgrow="ALWAYS"/>
+</fx:root>
diff --git a/src/main/java/org/jabref/gui/libraryproperties/preamble/PreamblePropertiesView.java b/src/main/java/org/jabref/gui/libraryproperties/preamble/PreamblePropertiesView.java
new file mode 100644
index 00000000000..36a5f106fe0
--- /dev/null
+++ b/src/main/java/org/jabref/gui/libraryproperties/preamble/PreamblePropertiesView.java
@@ -0,0 +1,38 @@
+package org.jabref.gui.libraryproperties.preamble;
+
+import javax.swing.undo.UndoManager;
+
+import javafx.fxml.FXML;
+import javafx.scene.control.TextArea;
+
+import org.jabref.gui.libraryproperties.AbstractPropertiesTabView;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.model.database.BibDatabaseContext;
+
+import com.airhacks.afterburner.views.ViewLoader;
+import jakarta.inject.Inject;
+
+public class PreamblePropertiesView extends AbstractPropertiesTabView<PreamblePropertiesViewModel> {
+    @FXML private TextArea preamble;
+
+    @Inject private UndoManager undoManager;
+
+    public PreamblePropertiesView(BibDatabaseContext databaseContext) {
+        this.databaseContext = databaseContext;
+
+        ViewLoader.view(this)
+                  .root(this)
+                  .load();
+    }
+
+    @Override
+    public String getTabName() {
+        return Localization.lang("Preamble");
+    }
+
+    public void initialize() {
+        this.viewModel = new PreamblePropertiesViewModel(databaseContext, undoManager);
+
+        preamble.textProperty().bindBidirectional(viewModel.preambleProperty());
+    }
+}
diff --git a/src/main/java/org/jabref/gui/libraryproperties/preamble/PreamblePropertiesViewModel.java b/src/main/java/org/jabref/gui/libraryproperties/preamble/PreamblePropertiesViewModel.java
new file mode 100644
index 00000000000..5ac3f81b951
--- /dev/null
+++ b/src/main/java/org/jabref/gui/libraryproperties/preamble/PreamblePropertiesViewModel.java
@@ -0,0 +1,40 @@
+package org.jabref.gui.libraryproperties.preamble;
+
+import javax.swing.undo.UndoManager;
+
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+
+import org.jabref.gui.libraryproperties.PropertiesTabViewModel;
+import org.jabref.gui.undo.UndoablePreambleChange;
+import org.jabref.model.database.BibDatabaseContext;
+
+public class PreamblePropertiesViewModel implements PropertiesTabViewModel {
+    private final StringProperty preambleProperty = new SimpleStringProperty("");
+
+    private final BibDatabaseContext databaseContext;
+    private final UndoManager undoManager;
+
+    PreamblePropertiesViewModel(BibDatabaseContext databaseContext, UndoManager undoManager) {
+        this.undoManager = undoManager;
+        this.databaseContext = databaseContext;
+    }
+
+    @Override
+    public void setValues() {
+        preambleProperty.setValue(databaseContext.getDatabase().getPreamble().orElse(""));
+    }
+
+    @Override
+    public void storeSettings() {
+        String newPreamble = preambleProperty.getValue();
+        if (!databaseContext.getDatabase().getPreamble().orElse("").equals(newPreamble)) {
+            undoManager.addEdit(new UndoablePreambleChange(databaseContext.getDatabase(), databaseContext.getDatabase().getPreamble().orElse(null), newPreamble));
+            databaseContext.getDatabase().setPreamble(newPreamble);
+        }
+    }
+
+    public StringProperty preambleProperty() {
+        return this.preambleProperty;
+    }
+}
diff --git a/src/main/java/org/jabref/gui/libraryproperties/saving/SavingPropertiesViewModel.java b/src/main/java/org/jabref/gui/libraryproperties/saving/SavingPropertiesViewModel.java
index 3d8b1cda7ee..9e01a3a76eb 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/saving/SavingPropertiesViewModel.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/saving/SavingPropertiesViewModel.java
@@ -1,9 +1,9 @@
 package org.jabref.gui.libraryproperties.saving;
 
 import java.util.ArrayList;
-import java.util.Comparator;
 import java.util.List;
 import java.util.Optional;
+import java.util.Set;
 
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ListProperty;
@@ -19,13 +19,22 @@
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.FieldFactory;
 import org.jabref.model.entry.field.InternalField;
+import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.metadata.MetaData;
-import org.jabref.model.metadata.SaveOrderConfig;
+import org.jabref.model.metadata.SaveOrder;
 import org.jabref.preferences.CleanupPreferences;
 import org.jabref.preferences.PreferencesService;
 
 public class SavingPropertiesViewModel implements PropertiesTabViewModel {
 
+    private static final SaveOrder UI_DEFAULT_SAVE_ORDER = new SaveOrder(SaveOrder.OrderType.ORIGINAL, List.of(
+            new SaveOrder.SortCriterion(StandardField.AUTHOR),
+            new SaveOrder.SortCriterion(StandardField.YEAR),
+            new SaveOrder.SortCriterion(StandardField.TITLE),
+            // Pro users generate their citation keys well. They can just delete the above three proposals and get a well-sorted library.
+            new SaveOrder.SortCriterion(InternalField.KEY_FIELD)
+    ));
+
     private final BooleanProperty protectDisableProperty = new SimpleBooleanProperty();
     private final BooleanProperty libraryProtectedProperty = new SimpleBooleanProperty();
 
@@ -42,37 +51,43 @@ public class SavingPropertiesViewModel implements PropertiesTabViewModel {
 
     private final BibDatabaseContext databaseContext;
     private final MetaData initialMetaData;
-    private final SaveOrderConfig initialSaveOrderConfig;
+    private final SaveOrder saveOrder;
     private final PreferencesService preferencesService;
 
     public SavingPropertiesViewModel(BibDatabaseContext databaseContext, PreferencesService preferencesService) {
         this.databaseContext = databaseContext;
         this.preferencesService = preferencesService;
         this.initialMetaData = databaseContext.getMetaData();
-        this.initialSaveOrderConfig = initialMetaData.getSaveOrderConfig().orElseGet(preferencesService::getExportSaveOrder);
+        this.saveOrder = initialMetaData.getSaveOrder().orElse(UI_DEFAULT_SAVE_ORDER);
     }
 
     @Override
     public void setValues() {
         libraryProtectedProperty.setValue(initialMetaData.isProtected());
 
-        // SaveOrderConfigPanel
+        // SaveOrderConfigPanel, included via <?import ...> in FXML
 
-        switch (initialSaveOrderConfig.getOrderType()) {
+        switch (saveOrder.getOrderType()) {
             case SPECIFIED -> saveInSpecifiedOrderProperty.setValue(true);
             case ORIGINAL -> saveInOriginalProperty.setValue(true);
             case TABLE -> saveInTableOrderProperty.setValue(true);
         }
 
-        List<Field> fieldNames = new ArrayList<>(FieldFactory.getCommonFields());
-        fieldNames.add(InternalField.TYPE_HEADER); // allow entrytype field as sort criterion
-        fieldNames.sort(Comparator.comparing(Field::getDisplayName));
-        sortableFieldsProperty.addAll(fieldNames);
-        sortCriteriaProperty.addAll(initialSaveOrderConfig.getSortCriteria().stream()
-                                                          .map(SortCriterionViewModel::new)
-                                                          .toList());
+        sortableFieldsProperty.clear();
+
+        Set<Field> fields = FieldFactory.getAllFieldsWithOutInternal();
+        fields.add(InternalField.INTERNAL_ALL_FIELD);
+        fields.add(InternalField.INTERNAL_ALL_TEXT_FIELDS_FIELD);
+        fields.add(InternalField.KEY_FIELD);
+        fields.add(InternalField.TYPE_HEADER);
+
+        sortableFieldsProperty.addAll(FieldFactory.getStandardFieldsWithCitationKey());
+        sortCriteriaProperty.clear();
+        sortCriteriaProperty.addAll(saveOrder.getSortCriteria().stream()
+                                             .map(SortCriterionViewModel::new)
+                                             .toList());
 
-        // FieldFormatterCleanupsPanel
+        // FieldFormatterCleanupsPanel, included via <?import ...> in FXML
 
         Optional<FieldFormatterCleanups> saveActions = initialMetaData.getSaveActions();
         saveActions.ifPresentOrElse(value -> {
@@ -110,15 +125,15 @@ public void storeSettings() {
             }
         }
 
-        SaveOrderConfig newSaveOrderConfig = new SaveOrderConfig(
-                SaveOrderConfig.OrderType.fromBooleans(saveInSpecifiedOrderProperty.getValue(), saveInOriginalProperty.getValue()),
+        SaveOrder newSaveOrder = new SaveOrder(
+                SaveOrder.OrderType.fromBooleans(saveInSpecifiedOrderProperty.getValue(), saveInOriginalProperty.getValue()),
                 sortCriteriaProperty.stream().map(SortCriterionViewModel::getCriterion).toList());
 
-        if (!newSaveOrderConfig.equals(initialSaveOrderConfig)) {
-            if (newSaveOrderConfig.equals(SaveOrderConfig.getDefaultSaveOrder())) {
-                newMetaData.clearSaveOrderConfig();
+        if (!newSaveOrder.equals(saveOrder)) {
+            if (newSaveOrder.equals(SaveOrder.getDefaultSaveOrder())) {
+                newMetaData.clearSaveOrder();
             } else {
-                newMetaData.setSaveOrderConfig(newSaveOrderConfig);
+                newMetaData.setSaveOrder(newSaveOrder);
             }
         }
 
diff --git a/src/main/java/org/jabref/gui/logging/ApplicationInsightsLogEvent.java b/src/main/java/org/jabref/gui/logging/ApplicationInsightsLogEvent.java
index 8753c29fd29..85c2488f22b 100644
--- a/src/main/java/org/jabref/gui/logging/ApplicationInsightsLogEvent.java
+++ b/src/main/java/org/jabref/gui/logging/ApplicationInsightsLogEvent.java
@@ -57,7 +57,7 @@ public Exception getException() {
 
         if (isException()) {
             Throwable throwable = this.logEvent.getException();
-            exception = throwable instanceof Exception ? (Exception) throwable : new Exception(throwable);
+            exception = throwable instanceof Exception e ? e : new Exception(throwable);
         }
 
         return exception;
diff --git a/src/main/java/org/jabref/gui/maintable/BibEntryTableViewModel.java b/src/main/java/org/jabref/gui/maintable/BibEntryTableViewModel.java
index da8c89c9e70..6f614cb2679 100644
--- a/src/main/java/org/jabref/gui/maintable/BibEntryTableViewModel.java
+++ b/src/main/java/org/jabref/gui/maintable/BibEntryTableViewModel.java
@@ -61,12 +61,14 @@ private static EasyBinding<Map<Field, String>> createLinkedIdentifiersBinding(Bi
                 entry.getFieldBinding(StandardField.DOI),
                 entry.getFieldBinding(StandardField.URI),
                 entry.getFieldBinding(StandardField.EPRINT),
-                (url, doi, uri, eprint) -> {
+                entry.getFieldBinding(StandardField.ISBN),
+                (url, doi, uri, eprint, isbn) -> {
                     Map<Field, String> identifiers = new HashMap<>();
                     url.ifPresent(value -> identifiers.put(StandardField.URL, value));
                     doi.ifPresent(value -> identifiers.put(StandardField.DOI, value));
                     uri.ifPresent(value -> identifiers.put(StandardField.URI, value));
                     eprint.ifPresent(value -> identifiers.put(StandardField.EPRINT, value));
+                    isbn.ifPresent(value -> identifiers.put(StandardField.ISBN, value));
                     return identifiers;
                 });
     }
diff --git a/src/main/java/org/jabref/gui/maintable/MainTable.java b/src/main/java/org/jabref/gui/maintable/MainTable.java
index e94bc771c53..10f9f68022e 100644
--- a/src/main/java/org/jabref/gui/maintable/MainTable.java
+++ b/src/main/java/org/jabref/gui/maintable/MainTable.java
@@ -3,7 +3,6 @@
 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;
@@ -46,11 +45,12 @@
 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.model.database.BibDatabaseContext;
 import org.jabref.model.database.event.EntriesAddedEvent;
 import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.BibEntryTypesManager;
+import org.jabref.model.util.FileUpdateMonitor;
 import org.jabref.preferences.PreferencesService;
 
 import com.google.common.eventbus.Subscribe;
@@ -70,6 +70,7 @@ public class MainTable extends TableView<BibEntryTableViewModel> {
     private final ImportHandler importHandler;
     private final CustomLocalDragboard localDragboard;
     private final ClipBoardManager clipBoardManager;
+    private final BibEntryTypesManager entryTypesManager;
     private long lastKeyPressTime;
     private String columnSearchTerm;
 
@@ -81,8 +82,9 @@ public MainTable(MainTableDataModel model,
                      StateManager stateManager,
                      KeyBindingRepository keyBindingRepository,
                      ClipBoardManager clipBoardManager,
-                     ImportFormatReader importFormatReader,
-                     TaskExecutor taskExecutor) {
+                     BibEntryTypesManager entryTypesManager,
+                     TaskExecutor taskExecutor,
+                     FileUpdateMonitor fileUpdateMonitor) {
         super();
 
         this.libraryTab = libraryTab;
@@ -91,17 +93,17 @@ public MainTable(MainTableDataModel model,
         this.database = Objects.requireNonNull(database);
         this.model = model;
         this.clipBoardManager = clipBoardManager;
+        this.entryTypesManager = entryTypesManager;
         UndoManager undoManager = libraryTab.getUndoManager();
         MainTablePreferences mainTablePreferences = preferencesService.getMainTablePreferences();
 
         importHandler = new ImportHandler(
                 database,
                 preferencesService,
-                Globals.getFileUpdateMonitor(),
+                fileUpdateMonitor,
                 undoManager,
                 stateManager,
                 dialogService,
-                importFormatReader,
                 taskExecutor);
 
         localDragboard = stateManager.getLocalDragboard();
@@ -118,7 +120,7 @@ public MainTable(MainTableDataModel model,
                         dialogService,
                         stateManager).createColumns());
 
-        this.getColumns().removeIf(col -> col instanceof LibraryColumn);
+        this.getColumns().removeIf(LibraryColumn.class::isInstance);
 
         new ViewModelTableRowFactory<BibEntryTableViewModel>()
                 .withOnMouseClickedEvent((entry, event) -> {
@@ -135,6 +137,7 @@ public MainTable(MainTableDataModel model,
                         undoManager,
                         clipBoardManager,
                         Globals.TASK_EXECUTOR,
+                        Globals.journalAbbreviationRepository,
                         Globals.entryTypesManager))
                 .setOnDragDetected(this::handleOnDragDetected)
                 .setOnDragDropped(this::handleOnDragDropped)
@@ -145,25 +148,15 @@ public MainTable(MainTableDataModel model,
 
         this.getSortOrder().clear();
 
-        /* KEEP for debugging purposes
-        for (var colModel : mainTablePreferences.getColumnPreferences().getColumnSortOrder()) {
-            for (var col : this.getColumns()) {
-                var tablecColModel = ((MainTableColumn<?>) col).getModel();
-                if (tablecColModel.equals(colModel)) {
-                    LOGGER.debug("Adding sort order for col {} ", col);
-                    this.getSortOrder().add(col);
-                    break;
-                }
-            }
-        }
-        */
-
         mainTablePreferences.getColumnPreferences().getColumnSortOrder().forEach(columnModel ->
                 this.getColumns().stream()
                     .map(column -> (MainTableColumn<?>) column)
                     .filter(column -> column.getModel().equals(columnModel))
                     .findFirst()
-                    .ifPresent(column -> this.getSortOrder().add(column)));
+                    .ifPresent(column -> {
+                        LOGGER.debug("Adding sort order for col {} ", column);
+                        this.getSortOrder().add(column);
+                    }));
 
         if (mainTablePreferences.getResizeColumnsToFit()) {
             this.setColumnResizePolicy(new SmartConstrainedResizePolicy());
@@ -179,7 +172,7 @@ public MainTable(MainTableDataModel model,
         this.getStylesheets().add(MainTable.class.getResource("MainTable.css").toExternalForm());
 
         // Store visual state
-        new PersistenceVisualStateTable(this, mainTablePreferences.getColumnPreferences());
+        new PersistenceVisualStateTable(this, mainTablePreferences.getColumnPreferences()).addListeners();
 
         setupKeyBindings(keyBindingRepository);
 
@@ -199,6 +192,7 @@ public MainTable(MainTableDataModel model,
                 libraryTab.getUndoManager(),
                 dialogService,
                 stateManager);
+
         // Enable the header right-click menu.
         new MainTableHeaderContextMenu(this, rightClickMenuFactory).show(true);
     }
@@ -209,7 +203,6 @@ public MainTable(MainTableDataModel model,
      * @param sortedColumn The sorted column in {@link MainTable}
      * @param keyEvent     The pressed character
      */
-
     private void jumpToSearchKey(TableColumn<BibEntryTableViewModel, ?> sortedColumn, KeyEvent keyEvent) {
         if ((keyEvent.getCharacter() == null) || (sortedColumn == null)) {
             return;
@@ -254,7 +247,7 @@ public void copy() {
 
         if (!selectedEntries.isEmpty()) {
             try {
-                clipBoardManager.setContent(selectedEntries);
+                clipBoardManager.setContent(selectedEntries, entryTypesManager);
                 dialogService.notify(libraryTab.formatOutputMessage(Localization.lang("Copied"), selectedEntries.size()));
             } catch (IOException e) {
                 LOGGER.error("Error while copying selected entries to clipboard", e);
@@ -268,6 +261,11 @@ public void cut() {
     }
 
     private void setupKeyBindings(KeyBindingRepository keyBindings) {
+        EditAction pasteAction = new EditAction(StandardActions.PASTE, libraryTab.frame(), stateManager);
+        EditAction copyAction = new EditAction(StandardActions.COPY, libraryTab.frame(), stateManager);
+        EditAction cutAction = new EditAction(StandardActions.CUT, libraryTab.frame(), stateManager);
+        EditAction deleteAction = new EditAction(StandardActions.DELETE_ENTRY, libraryTab.frame(), stateManager);
+
         this.addEventFilter(KeyEvent.KEY_PRESSED, event -> {
             if (event.getCode() == KeyCode.ENTER) {
                 getSelectedEntries().stream()
@@ -289,19 +287,19 @@ private void setupKeyBindings(KeyBindingRepository keyBindings) {
                         event.consume();
                         break;
                     case PASTE:
-                        new EditAction(StandardActions.PASTE, libraryTab.frame(), stateManager).execute();
+                        pasteAction.execute();
                         event.consume();
                         break;
                     case COPY:
-                        new EditAction(StandardActions.COPY, libraryTab.frame(), stateManager).execute();
+                        copyAction.execute();
                         event.consume();
                         break;
                     case CUT:
-                        new EditAction(StandardActions.CUT, libraryTab.frame(), stateManager).execute();
+                        cutAction.execute();
                         event.consume();
                         break;
                     case DELETE_ENTRY:
-                        new EditAction(StandardActions.DELETE_ENTRY, libraryTab.frame(), stateManager).execute();
+                        deleteAction.execute();
                         event.consume();
                         break;
                     default:
@@ -325,23 +323,22 @@ private void clearAndSelectLast() {
 
     public void paste() {
         List<BibEntry> entriesToAdd;
-            entriesToAdd = this.clipBoardManager.getBibTeXEntriesFromClipboard()
-            .map(importHandler::handleBibTeXData)
-            .orElseGet(this::handleNonBibTeXStringData);
-
+        String content = ClipBoardManager.getContents();
+        entriesToAdd = importHandler.handleBibTeXData(content);
+        if (entriesToAdd.isEmpty()) {
+            entriesToAdd = handleNonBibTeXStringData(content);
+        }
+        if (entriesToAdd.isEmpty()) {
+            return;
+        }
         for (BibEntry entry : entriesToAdd) {
             importHandler.importEntryWithDuplicateCheck(database, entry);
         }
-        if (!entriesToAdd.isEmpty()) {
-            this.requestFocus();
-        }
     }
 
-    private List<BibEntry> handleNonBibTeXStringData() {
-        String data = ClipBoardManager.getContents();
-        List<BibEntry> entries = new ArrayList<>();
+    private List<BibEntry> handleNonBibTeXStringData(String data) {
         try {
-            entries = this.importHandler.handleStringData(data);
+            return 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"));
@@ -350,8 +347,8 @@ private List<BibEntry> handleNonBibTeXStringData() {
             } else {
                 dialogService.showErrorDialogAndWait(exception);
             }
+            return List.of();
         }
-        return entries;
     }
 
     public void dropEntry(List<BibEntry> entriesToAdd) {
@@ -394,8 +391,8 @@ private void handleOnDragDetected(TableRow<BibEntryTableViewModel> row, BibEntry
 
         List<BibEntry> entries = getSelectionModel().getSelectedItems().stream().map(BibEntryTableViewModel::getEntry).collect(Collectors.toList());
 
-        // The following is necesary to initiate the drag and drop in javafx, although we don't need the contents
-        // It doesn't work without
+        // The following is necessary to initiate the drag and drop in JavaFX,
+        // although we don't need the contents, it does not 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.COPY_OR_MOVE);
@@ -430,7 +427,7 @@ private void handleOnDragDropped(TableRow<BibEntryTableViewModel> row, BibEntryT
                         }
                         case MOVE -> {
                             LOGGER.debug("Mode MOVE"); // alt on win
-                            importHandler.getLinker().moveFilesToFileDirAndAddToEntry(entry, files, libraryTab.getIndexingTaskManager());
+                            importHandler.getLinker().moveFilesToFileDirRenameAndAddToEntry(entry, files, libraryTab.getIndexingTaskManager());
                         }
                         case COPY -> {
                             LOGGER.debug("Mode Copy"); // ctrl on win
@@ -487,4 +484,11 @@ private Optional<BibEntryTableViewModel> findEntry(BibEntry entry) {
                     .filter(viewModel -> viewModel.getEntry().equals(entry))
                     .findFirst();
     }
+
+    public static List<MainTableColumnModel> toColumnModels(List<TableColumn<BibEntryTableViewModel, ?>> columns) {
+        return columns.stream()
+                      .filter(col -> col instanceof MainTableColumn<?>)
+                      .map(column -> ((MainTableColumn<?>) column).getModel())
+                      .collect(Collectors.toList());
+    }
 }
diff --git a/src/main/java/org/jabref/gui/maintable/MainTableColumnModel.java b/src/main/java/org/jabref/gui/maintable/MainTableColumnModel.java
index 5ff872c1426..77bcecaf7a1 100644
--- a/src/main/java/org/jabref/gui/maintable/MainTableColumnModel.java
+++ b/src/main/java/org/jabref/gui/maintable/MainTableColumnModel.java
@@ -1,6 +1,7 @@
 package org.jabref.gui.maintable;
 
 import java.util.EnumSet;
+import java.util.List;
 import java.util.Objects;
 
 import javafx.beans.property.DoubleProperty;
@@ -15,6 +16,7 @@
 import org.jabref.gui.util.FieldsUtil;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.field.FieldFactory;
+import org.jabref.model.metadata.SaveOrder;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -142,6 +144,8 @@ public String getDisplayName() {
                 || (typeProperty.getValue() == Type.INDEX)) {
             return typeProperty.getValue().getDisplayName();
         } else {
+            // In case an OrField is used, `FieldFactory.parseField` returns UnknownField, which leads to
+            // "author/editor(Custom)" instead of "author/editor" in the output
             return FieldsUtil.getNameWithType(FieldFactory.parseField(qualifierProperty.getValue()));
         }
     }
@@ -166,6 +170,21 @@ public ObjectProperty<TableColumn.SortType> sortTypeProperty() {
         return sortTypeProperty;
     }
 
+    /**
+     * Returns a list of sort cirteria based on the fields the current column displays.
+     * In case it is single field, a single SortCriterion is returned.
+     * In case of multiple fields, for each field, there is a SortCriterion contained in the list.
+     *
+     * Implementation reason: We want to have SortCriterion handle a single field, because the UI allows for handling
+     * "plain" fields only.
+     */
+    public List<SaveOrder.SortCriterion> getSortCriteria() {
+        boolean descending = getSortType() == TableColumn.SortType.DESCENDING;
+        return FieldFactory.parseOrFields(getQualifier()).getFields().stream()
+                .map(field -> new SaveOrder.SortCriterion(field, descending))
+                .toList();
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) {
diff --git a/src/main/java/org/jabref/gui/maintable/MainTableFieldValueFormatter.java b/src/main/java/org/jabref/gui/maintable/MainTableFieldValueFormatter.java
index bb04a6775f4..33841527a34 100644
--- a/src/main/java/org/jabref/gui/maintable/MainTableFieldValueFormatter.java
+++ b/src/main/java/org/jabref/gui/maintable/MainTableFieldValueFormatter.java
@@ -33,7 +33,7 @@ public MainTableFieldValueFormatter(NameDisplayPreferences nameDisplayPreference
      * @return The formatted name field.
      */
     public String formatFieldsValues(final OrFields fields, final BibEntry entry) {
-        for (Field field : fields) {
+        for (Field field : fields.getFields()) {
             if (field.getProperties().contains(FieldProperty.PERSON_NAMES) && (displayStyle != DisplayStyle.AS_IS)) {
                 Optional<String> name = entry.getResolvedFieldOrAlias(field, bibDatabase);
 
diff --git a/src/main/java/org/jabref/gui/maintable/OpenFolderAction.java b/src/main/java/org/jabref/gui/maintable/OpenFolderAction.java
index 92c8404ca39..b7da7f5be6e 100644
--- a/src/main/java/org/jabref/gui/maintable/OpenFolderAction.java
+++ b/src/main/java/org/jabref/gui/maintable/OpenFolderAction.java
@@ -41,7 +41,7 @@ public OpenFolderAction(DialogService dialogService, StateManager stateManager,
     public void execute() {
             stateManager.getActiveDatabase().ifPresent(databaseContext -> {
                 if (entry == null) {
-                    stateManager.getSelectedEntries().stream().filter((entry) -> !entry.getFiles().isEmpty()).forEach(entry -> {
+                    stateManager.getSelectedEntries().stream().filter(entry -> !entry.getFiles().isEmpty()).forEach(entry -> {
                         LinkedFileViewModel linkedFileViewModel = new LinkedFileViewModel(
                                 entry.getFiles().get(0),
                                 entry,
diff --git a/src/main/java/org/jabref/gui/maintable/OpenUrlAction.java b/src/main/java/org/jabref/gui/maintable/OpenUrlAction.java
index 805452e792c..9848f509cf3 100644
--- a/src/main/java/org/jabref/gui/maintable/OpenUrlAction.java
+++ b/src/main/java/org/jabref/gui/maintable/OpenUrlAction.java
@@ -54,6 +54,10 @@ public void execute() {
                 link = entry.getField(StandardField.URI);
                 field = StandardField.URI;
             }
+            if (entry.hasField(StandardField.ISBN)) {
+                link = entry.getField(StandardField.ISBN);
+                field = StandardField.ISBN;
+            }
             if (entry.hasField(StandardField.DOI)) {
                 link = entry.getField(StandardField.DOI);
                 field = StandardField.DOI;
diff --git a/src/main/java/org/jabref/gui/maintable/PersistenceVisualStateTable.java b/src/main/java/org/jabref/gui/maintable/PersistenceVisualStateTable.java
index eed6c608124..e5b1178f1a0 100644
--- a/src/main/java/org/jabref/gui/maintable/PersistenceVisualStateTable.java
+++ b/src/main/java/org/jabref/gui/maintable/PersistenceVisualStateTable.java
@@ -1,55 +1,73 @@
 package org.jabref.gui.maintable;
 
+import java.util.List;
 import java.util.stream.Collectors;
 
 import javafx.beans.InvalidationListener;
+import javafx.collections.ListChangeListener;
+import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableView;
 
 import org.jabref.gui.maintable.columns.MainTableColumn;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  * Keep track of changes made to the columns (reordering, resorting, resizing).
  */
 public class PersistenceVisualStateTable {
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(PersistenceVisualStateTable.class);
+
     protected final TableView<BibEntryTableViewModel> table;
     protected final ColumnPreferences preferences;
 
-    public PersistenceVisualStateTable(final TableView<BibEntryTableViewModel> table, ColumnPreferences preferences) {
+    public PersistenceVisualStateTable(TableView<BibEntryTableViewModel> table, ColumnPreferences preferences) {
         this.table = table;
         this.preferences = preferences;
+    }
 
+    public void addListeners() {
         table.getColumns().addListener((InvalidationListener) obs -> updateColumns());
-        table.getSortOrder().addListener((InvalidationListener) obs -> updateSortOrder());
+        table.getSortOrder().addListener((ListChangeListener<? super TableColumn<BibEntryTableViewModel, ?>>) obs -> updateSortOrder());
 
         // As we store the ColumnModels of the MainTable, we need to add the listener to the ColumnModel properties,
         // since the value is bound to the model after the listener to the column itself is called.
-        table.getColumns().forEach(col ->
-                ((MainTableColumn<?>) col).getModel().widthProperty().addListener(obs -> updateColumns()));
-        table.getColumns().forEach(col ->
-                ((MainTableColumn<?>) col).getModel().sortTypeProperty().addListener(obs -> updateColumns()));
+
+        table.getColumns().stream()
+             .map(col -> ((MainTableColumn<?>) col).getModel())
+             .forEach(model -> {
+                 model.widthProperty().addListener(obs -> updateColumns());
+                 model.sortTypeProperty().addListener(obs -> updateColumns());
+             });
     }
 
     /**
-     * Stores shown columns, their width and their sortType in preferences.
+     * Stores shown columns, their width and their {@link TableColumn.SortType} in preferences.
+     * The conversion to the "real" string in the preferences is made at
+     * {@link org.jabref.preferences.JabRefPreferences#getColumnSortTypesAsStringList(ColumnPreferences)}
      */
     private void updateColumns() {
-        preferences.setColumns(
-                table.getColumns().stream()
-                     .filter(col -> col instanceof MainTableColumn<?>)
-                     .map(column -> ((MainTableColumn<?>) column).getModel())
-                     .collect(Collectors.toList()));
+        LOGGER.debug("Updating columns");
+        preferences.setColumns(toList(table.getColumns()));
     }
 
     /**
-     * Stores the SortOrder of the Table in the preferences. Cannot be combined with updateColumns, because JavaFX
-     * would provide just an empty list for the sort order on other changes.
+     * Stores the SortOrder of the Table in the preferences. This includes {@link TableColumn.SortType}.
+     * <br>
+     * Cannot be combined with updateColumns, because JavaFX would provide just an empty list for the sort order
+     * on other changes.
      */
     private void updateSortOrder() {
-        preferences.setColumnSortOrder(
-                table.getSortOrder().stream()
-                     .filter(col -> col instanceof MainTableColumn<?>)
-                     .map(column -> ((MainTableColumn<?>) column).getModel())
-                     .collect(Collectors.toList()));
+        LOGGER.debug("Updating sort order");
+        preferences.setColumnSortOrder(toList(table.getSortOrder()));
+    }
+
+    private List<MainTableColumnModel> toList(List<TableColumn<BibEntryTableViewModel, ?>> columns) {
+        return columns.stream()
+                .filter(col -> col instanceof MainTableColumn<?>)
+                .map(column -> ((MainTableColumn<?>) column).getModel())
+                .collect(Collectors.toList());
     }
 }
diff --git a/src/main/java/org/jabref/gui/maintable/RightClickMenu.java b/src/main/java/org/jabref/gui/maintable/RightClickMenu.java
index 31409e0ffc0..fca260455dc 100644
--- a/src/main/java/org/jabref/gui/maintable/RightClickMenu.java
+++ b/src/main/java/org/jabref/gui/maintable/RightClickMenu.java
@@ -9,7 +9,8 @@
 import org.jabref.gui.ClipBoardManager;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.LibraryTab;
-import org.jabref.gui.SendAsEMailAction;
+import org.jabref.gui.SendAsKindleEmailAction;
+import org.jabref.gui.SendAsStandardEmailAction;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.ActionFactory;
 import org.jabref.gui.actions.StandardActions;
@@ -27,6 +28,7 @@
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.citationstyle.CitationStyleOutputFormat;
 import org.jabref.logic.citationstyle.CitationStylePreviewLayout;
+import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.entry.field.SpecialField;
 import org.jabref.preferences.PreferencesService;
@@ -43,23 +45,22 @@ public static ContextMenu create(BibEntryTableViewModel entry,
                                      UndoManager undoManager,
                                      ClipBoardManager clipBoardManager,
                                      TaskExecutor taskExecutor,
+                                     JournalAbbreviationRepository abbreviationRepository,
                                      BibEntryTypesManager entryTypesManager) {
         ActionFactory factory = new ActionFactory(keyBindingRepository);
         ContextMenu contextMenu = new ContextMenu();
 
         contextMenu.getItems().addAll(
                 factory.createMenuItem(StandardActions.COPY, new EditAction(StandardActions.COPY, libraryTab.frame(), stateManager)),
-                createCopySubMenu(factory, dialogService, stateManager, preferencesService, clipBoardManager, taskExecutor),
+                createCopySubMenu(factory, dialogService, stateManager, preferencesService, clipBoardManager, abbreviationRepository, 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(dialogService, stateManager, preferencesService.getBibEntryPreferences())),
+                factory.createMenuItem(StandardActions.MERGE_ENTRIES, new MergeEntriesAction(dialogService, stateManager, preferencesService)),
                 factory.createMenuItem(StandardActions.DELETE_ENTRY, new EditAction(StandardActions.DELETE_ENTRY, libraryTab.frame(), stateManager)),
 
                 new SeparatorMenuItem(),
 
-                factory.createMenuItem(StandardActions.SEND_AS_EMAIL, new SendAsEMailAction(dialogService, preferencesService, stateManager)),
-
-                new SeparatorMenuItem(),
+                createSendSubMenu(factory, dialogService, stateManager, preferencesService, entryTypesManager),
 
                 SpecialFieldMenuItemFactory.createSpecialFieldMenu(SpecialField.RANKING, factory, libraryTab.frame(), dialogService, preferencesService, undoManager, stateManager),
                 SpecialFieldMenuItemFactory.getSpecialFieldSingleItem(SpecialField.RELEVANCE, factory, libraryTab.frame(), dialogService, preferencesService, undoManager, stateManager),
@@ -92,17 +93,18 @@ private static Menu createCopySubMenu(ActionFactory factory,
                                           StateManager stateManager,
                                           PreferencesService preferencesService,
                                           ClipBoardManager clipBoardManager,
+                                          JournalAbbreviationRepository abbreviationRepository,
                                           TaskExecutor taskExecutor) {
         Menu copySpecialMenu = factory.createMenu(StandardActions.COPY_MORE);
 
         copySpecialMenu.getItems().addAll(
-                factory.createMenuItem(StandardActions.COPY_TITLE, new CopyMoreAction(StandardActions.COPY_TITLE, dialogService, stateManager, clipBoardManager, preferencesService)),
-                factory.createMenuItem(StandardActions.COPY_KEY, new CopyMoreAction(StandardActions.COPY_KEY, dialogService, stateManager, clipBoardManager, preferencesService)),
-                factory.createMenuItem(StandardActions.COPY_CITE_KEY, new CopyMoreAction(StandardActions.COPY_CITE_KEY, dialogService, stateManager, clipBoardManager, preferencesService)),
-                factory.createMenuItem(StandardActions.COPY_KEY_AND_TITLE, new CopyMoreAction(StandardActions.COPY_KEY_AND_TITLE, dialogService, stateManager, clipBoardManager, preferencesService)),
-                factory.createMenuItem(StandardActions.COPY_KEY_AND_LINK, new CopyMoreAction(StandardActions.COPY_KEY_AND_LINK, dialogService, stateManager, clipBoardManager, preferencesService)),
-                factory.createMenuItem(StandardActions.COPY_DOI, new CopyMoreAction(StandardActions.COPY_DOI, dialogService, stateManager, clipBoardManager, preferencesService)),
-                factory.createMenuItem(StandardActions.COPY_DOI_URL, new CopyMoreAction(StandardActions.COPY_DOI_URL, dialogService, stateManager, clipBoardManager, preferencesService)),
+                factory.createMenuItem(StandardActions.COPY_TITLE, new CopyMoreAction(StandardActions.COPY_TITLE, dialogService, stateManager, clipBoardManager, preferencesService, abbreviationRepository)),
+                factory.createMenuItem(StandardActions.COPY_KEY, new CopyMoreAction(StandardActions.COPY_KEY, dialogService, stateManager, clipBoardManager, preferencesService, abbreviationRepository)),
+                factory.createMenuItem(StandardActions.COPY_CITE_KEY, new CopyMoreAction(StandardActions.COPY_CITE_KEY, dialogService, stateManager, clipBoardManager, preferencesService, abbreviationRepository)),
+                factory.createMenuItem(StandardActions.COPY_KEY_AND_TITLE, new CopyMoreAction(StandardActions.COPY_KEY_AND_TITLE, dialogService, stateManager, clipBoardManager, preferencesService, abbreviationRepository)),
+                factory.createMenuItem(StandardActions.COPY_KEY_AND_LINK, new CopyMoreAction(StandardActions.COPY_KEY_AND_LINK, dialogService, stateManager, clipBoardManager, preferencesService, abbreviationRepository)),
+                factory.createMenuItem(StandardActions.COPY_DOI, new CopyMoreAction(StandardActions.COPY_DOI, dialogService, stateManager, clipBoardManager, preferencesService, abbreviationRepository)),
+                factory.createMenuItem(StandardActions.COPY_DOI_URL, new CopyMoreAction(StandardActions.COPY_DOI_URL, dialogService, stateManager, clipBoardManager, preferencesService, abbreviationRepository)),
                 new SeparatorMenuItem()
         );
 
@@ -110,10 +112,10 @@ private static Menu createCopySubMenu(ActionFactory factory,
         PreviewPreferences previewPreferences = preferencesService.getPreviewPreferences();
         if (previewPreferences.getSelectedPreviewLayout() instanceof CitationStylePreviewLayout) {
             copySpecialMenu.getItems().addAll(
-                    factory.createMenuItem(StandardActions.COPY_CITATION_HTML, new CopyCitationAction(CitationStyleOutputFormat.HTML, dialogService, stateManager, clipBoardManager, taskExecutor, previewPreferences)),
-                    factory.createMenuItem(StandardActions.COPY_CITATION_TEXT, new CopyCitationAction(CitationStyleOutputFormat.TEXT, dialogService, stateManager, clipBoardManager, taskExecutor, previewPreferences)));
+                    factory.createMenuItem(StandardActions.COPY_CITATION_HTML, new CopyCitationAction(CitationStyleOutputFormat.HTML, dialogService, stateManager, clipBoardManager, taskExecutor, preferencesService, abbreviationRepository)),
+                    factory.createMenuItem(StandardActions.COPY_CITATION_TEXT, new CopyCitationAction(CitationStyleOutputFormat.TEXT, dialogService, stateManager, clipBoardManager, taskExecutor, preferencesService, abbreviationRepository)));
         } else {
-            copySpecialMenu.getItems().add(factory.createMenuItem(StandardActions.COPY_CITATION_PREVIEW, new CopyCitationAction(CitationStyleOutputFormat.HTML, dialogService, stateManager, clipBoardManager, taskExecutor, previewPreferences)));
+            copySpecialMenu.getItems().add(factory.createMenuItem(StandardActions.COPY_CITATION_PREVIEW, new CopyCitationAction(CitationStyleOutputFormat.HTML, dialogService, stateManager, clipBoardManager, taskExecutor, preferencesService, abbreviationRepository)));
         }
 
         copySpecialMenu.getItems().addAll(
@@ -122,4 +124,19 @@ private static Menu createCopySubMenu(ActionFactory factory,
 
         return copySpecialMenu;
     }
+
+    private static Menu createSendSubMenu(ActionFactory factory,
+                                          DialogService dialogService,
+                                          StateManager stateManager,
+                                          PreferencesService preferencesService,
+                                          BibEntryTypesManager entryTypesManager) {
+        Menu sendMenu = factory.createMenu(StandardActions.SEND);
+        sendMenu.getItems().addAll(
+                factory.createMenuItem(StandardActions.SEND_AS_EMAIL, new SendAsStandardEmailAction(dialogService, preferencesService, stateManager, entryTypesManager)),
+                factory.createMenuItem(StandardActions.SEND_TO_KINDLE, new SendAsKindleEmailAction(dialogService, preferencesService, stateManager)),
+                new SeparatorMenuItem()
+        );
+
+        return sendMenu;
+    }
 }
diff --git a/src/main/java/org/jabref/gui/maintable/columns/FieldColumn.java b/src/main/java/org/jabref/gui/maintable/columns/FieldColumn.java
index e1b8b1c1ff9..698e8e16895 100644
--- a/src/main/java/org/jabref/gui/maintable/columns/FieldColumn.java
+++ b/src/main/java/org/jabref/gui/maintable/columns/FieldColumn.java
@@ -31,9 +31,9 @@ public FieldColumn(MainTableColumnModel model) {
                 .withText(text -> text)
                 .install(this);
 
-        if (fields.size() == 1) {
+        if (fields.hasExactlyOne()) {
             // comparator can't parse more than one value
-            Field field = fields.stream().collect(MoreCollectors.onlyElement());
+            Field field = fields.getFields().stream().collect(MoreCollectors.onlyElement());
 
             if ((field instanceof UnknownField) || field.isNumeric()) {
                 this.setComparator(new NumericFieldComparator());
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 5aaeeb207a0..7764498e4c4 100644
--- a/src/main/java/org/jabref/gui/maintable/columns/FileColumn.java
+++ b/src/main/java/org/jabref/gui/maintable/columns/FileColumn.java
@@ -105,7 +105,7 @@ private void setCommonSettings() {
     }
 
     private String createFileTooltip(List<LinkedFile> linkedFiles) {
-        if (linkedFiles.size() > 0) {
+        if (!linkedFiles.isEmpty()) {
             return Localization.lang("Open file %0", linkedFiles.get(0).getLink());
         }
         return null;
diff --git a/src/main/java/org/jabref/gui/menus/FileHistoryMenu.java b/src/main/java/org/jabref/gui/menus/FileHistoryMenu.java
index 23554b66fc6..ab580b5fcd6 100644
--- a/src/main/java/org/jabref/gui/menus/FileHistoryMenu.java
+++ b/src/main/java/org/jabref/gui/menus/FileHistoryMenu.java
@@ -5,6 +5,7 @@
 
 import javafx.scene.control.Menu;
 import javafx.scene.control.MenuItem;
+import javafx.scene.control.SeparatorMenuItem;
 import javafx.scene.input.KeyEvent;
 
 import org.jabref.gui.DialogService;
@@ -14,6 +15,7 @@
 
 public class FileHistoryMenu extends Menu {
 
+    protected final MenuItem clearRecentLibraries;
     private final FileHistory history;
     private final DialogService dialogService;
     private final OpenDatabaseAction openDatabaseAction;
@@ -21,6 +23,10 @@ public class FileHistoryMenu extends Menu {
     public FileHistoryMenu(FileHistory fileHistory, DialogService dialogService, OpenDatabaseAction openDatabaseAction) {
         setText(Localization.lang("Recent libraries"));
 
+        this.clearRecentLibraries = new MenuItem();
+        clearRecentLibraries.setText(Localization.lang("Clear recent libraries"));
+        clearRecentLibraries.setOnAction(event -> clearLibrariesHistory());
+
         this.history = fileHistory;
         this.dialogService = dialogService;
         this.openDatabaseAction = openDatabaseAction;
@@ -65,6 +71,10 @@ private void setItems() {
         for (int index = 0; index < history.size(); index++) {
             addItem(history.get(index), index + 1);
         }
+        getItems().addAll(
+                new SeparatorMenuItem(),
+                clearRecentLibraries
+        );
     }
 
     private void addItem(Path file, int num) {
@@ -91,4 +101,9 @@ public void openFile(Path file) {
         }
         openDatabaseAction.openFile(file);
     }
+
+    public void clearLibrariesHistory() {
+        history.clear();
+        setDisable(true);
+    }
 }
diff --git a/src/main/java/org/jabref/gui/mergeentries/FetchAndMergeEntry.java b/src/main/java/org/jabref/gui/mergeentries/FetchAndMergeEntry.java
index 83399cd4f7b..c779eea8ed9 100644
--- a/src/main/java/org/jabref/gui/mergeentries/FetchAndMergeEntry.java
+++ b/src/main/java/org/jabref/gui/mergeentries/FetchAndMergeEntry.java
@@ -29,7 +29,6 @@
 import org.jabref.model.entry.field.FieldFactory;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.EntryType;
-import org.jabref.preferences.BibEntryPreferences;
 import org.jabref.preferences.PreferencesService;
 
 import org.slf4j.Logger;
@@ -77,7 +76,7 @@ public void fetchAndMerge(BibEntry entry, List<Field> fields) {
                                       String type = field.getDisplayName();
                                       if (fetchedEntry.isPresent()) {
                                           cleanup.doPostCleanup(fetchedEntry.get());
-                                          showMergeDialog(entry, fetchedEntry.get(), fetcher.get(), preferencesService.getBibEntryPreferences());
+                                          showMergeDialog(entry, fetchedEntry.get(), fetcher.get());
                                       } else {
                                           dialogService.notify(Localization.lang("Cannot get info based on given %0: %1", type, fieldContent.get()));
                                       }
@@ -89,7 +88,7 @@ public void fetchAndMerge(BibEntry entry, List<Field> fields) {
                                       } 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()));
+                                          dialogService.showInformationDialogAndWait(Localization.lang("Fetching information using %0", fetcher.get().getName()), Localization.lang("Error occurred %0", exception.getMessage()));
                                       }
                                   })
                                   .executeWith(taskExecutor);
@@ -100,8 +99,8 @@ public void fetchAndMerge(BibEntry entry, List<Field> fields) {
         }
     }
 
-    private void showMergeDialog(BibEntry originalEntry, BibEntry fetchedEntry, WebFetcher fetcher, BibEntryPreferences bibEntryPreferences) {
-        MergeEntriesDialog dialog = new MergeEntriesDialog(originalEntry, fetchedEntry, bibEntryPreferences);
+    private void showMergeDialog(BibEntry originalEntry, BibEntry fetchedEntry, WebFetcher fetcher) {
+        MergeEntriesDialog dialog = new MergeEntriesDialog(originalEntry, fetchedEntry, preferencesService);
         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()));
@@ -167,7 +166,7 @@ public void fetchAndMerge(BibEntry entry, EntryBasedFetcher fetcher) {
                           if (fetchedEntry.isPresent()) {
                               ImportCleanup cleanup = new ImportCleanup(libraryTab.getBibDatabaseContext().getMode());
                               cleanup.doPostCleanup(fetchedEntry.get());
-                              showMergeDialog(entry, fetchedEntry.get(), fetcher, preferencesService.getBibEntryPreferences());
+                              showMergeDialog(entry, fetchedEntry.get(), fetcher);
                           } else {
                               dialogService.notify(Localization.lang("Could not find any bibliographic information."));
                           }
diff --git a/src/main/java/org/jabref/gui/mergeentries/MergeEntriesAction.java b/src/main/java/org/jabref/gui/mergeentries/MergeEntriesAction.java
index 9c40605d11d..acb97eb167c 100644
--- a/src/main/java/org/jabref/gui/mergeentries/MergeEntriesAction.java
+++ b/src/main/java/org/jabref/gui/mergeentries/MergeEntriesAction.java
@@ -11,18 +11,18 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.InternalField;
-import org.jabref.preferences.BibEntryPreferences;
+import org.jabref.preferences.PreferencesService;
 
 public class MergeEntriesAction extends SimpleCommand {
     private static final int NUMBER_OF_ENTRIES_NEEDED = 2;
     private final DialogService dialogService;
     private final StateManager stateManager;
-    private final BibEntryPreferences bibEntryPreferences;
+    private final PreferencesService preferencesService;
 
-    public MergeEntriesAction(DialogService dialogService, StateManager stateManager, BibEntryPreferences bibEntryPreferences) {
+    public MergeEntriesAction(DialogService dialogService, StateManager stateManager, PreferencesService preferencesService) {
         this.dialogService = dialogService;
         this.stateManager = stateManager;
-        this.bibEntryPreferences = bibEntryPreferences;
+        this.preferencesService = preferencesService;
 
         this.executable.bind(ActionHelper.needsEntriesSelected(NUMBER_OF_ENTRIES_NEEDED, stateManager));
     }
@@ -59,7 +59,7 @@ public void execute() {
             second = one;
         }
 
-        MergeEntriesDialog dialog = new MergeEntriesDialog(first, second, bibEntryPreferences);
+        MergeEntriesDialog dialog = new MergeEntriesDialog(first, second, preferencesService);
         dialog.setTitle(Localization.lang("Merge entries"));
 
         Optional<EntriesMergeResult> mergeResultOpt = dialogService.showCustomDialogAndWait(dialog);
diff --git a/src/main/java/org/jabref/gui/mergeentries/MergeEntriesDialog.java b/src/main/java/org/jabref/gui/mergeentries/MergeEntriesDialog.java
index 8be99e1bfee..6766050972a 100644
--- a/src/main/java/org/jabref/gui/mergeentries/MergeEntriesDialog.java
+++ b/src/main/java/org/jabref/gui/mergeentries/MergeEntriesDialog.java
@@ -8,15 +8,15 @@
 import org.jabref.gui.util.BaseDialog;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.BibEntry;
-import org.jabref.preferences.BibEntryPreferences;
+import org.jabref.preferences.PreferencesService;
 
 public class MergeEntriesDialog extends BaseDialog<EntriesMergeResult> {
     private final ThreeWayMergeView threeWayMergeView;
     private final BibEntry one;
     private final BibEntry two;
 
-    public MergeEntriesDialog(BibEntry one, BibEntry two, BibEntryPreferences bibEntryPreferences) {
-        threeWayMergeView = new ThreeWayMergeView(one, two, bibEntryPreferences);
+    public MergeEntriesDialog(BibEntry one, BibEntry two, PreferencesService preferencesService) {
+        threeWayMergeView = new ThreeWayMergeView(one, two, preferencesService);
         this.one = one;
         this.two = two;
 
diff --git a/src/main/java/org/jabref/gui/mergeentries/MultiMergeEntriesView.java b/src/main/java/org/jabref/gui/mergeentries/MultiMergeEntriesView.java
index 86aa0251a62..bcdbb7dafaf 100644
--- a/src/main/java/org/jabref/gui/mergeentries/MultiMergeEntriesView.java
+++ b/src/main/java/org/jabref/gui/mergeentries/MultiMergeEntriesView.java
@@ -233,9 +233,9 @@ private void setupSourceButtonAction(ToggleButton sourceButton, int column) {
             if (newValue) {
                 optionsGrid.getChildrenUnmodifiable().stream()
                            .filter(node -> GridPane.getColumnIndex(node) == column)
-                           .filter(node -> node instanceof HBox)
+                           .filter(HBox.class::isInstance)
                            .forEach(hbox -> ((HBox) hbox).getChildrenUnmodifiable().stream()
-                                                         .filter(node -> node instanceof ToggleButton)
+                                                         .filter(ToggleButton.class::isInstance)
                                                          .forEach(toggleButton -> ((ToggleButton) toggleButton).setSelected(true)));
                 sourceButton.setSelected(true);
             }
@@ -252,7 +252,7 @@ private boolean isMultilineField(Field field) {
         if (field.equals(StandardField.DOI)) {
             return false;
         }
-        return FieldFactory.isMultiLineField(field, preferences.getFieldContentParserPreferences().getNonWrappableFields());
+        return FieldFactory.isMultiLineField(field, preferences.getFieldPreferences().getNonWrappableFields());
     }
 
     private class Cell extends HBox {
diff --git a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/FieldRowView.java b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/FieldRowView.java
index e2522a05f21..afb25d2a4a8 100644
--- a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/FieldRowView.java
+++ b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/FieldRowView.java
@@ -18,6 +18,7 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.strings.StringUtil;
+import org.jabref.preferences.PreferencesService;
 
 import com.tobiasdiez.easybind.EasyBind;
 import org.fxmisc.richtext.StyleClassedTextArea;
@@ -42,12 +43,12 @@ public class FieldRowView {
 
     private GridPane parent;
 
-    public FieldRowView(Field field, BibEntry leftEntry, BibEntry rightEntry, BibEntry mergedEntry, FieldMergerFactory fieldMergerFactory, int rowIndex) {
+    public FieldRowView(Field field, BibEntry leftEntry, BibEntry rightEntry, BibEntry mergedEntry, FieldMergerFactory fieldMergerFactory, PreferencesService preferencesService, int rowIndex) {
         viewModel = new FieldRowViewModel(field, leftEntry, rightEntry, mergedEntry, fieldMergerFactory);
 
         fieldNameCell = new FieldNameCell(field.getDisplayName(), rowIndex);
-        leftValueCell = new FieldValueCell(viewModel.getLeftFieldValue(), rowIndex);
-        rightValueCell = new FieldValueCell(viewModel.getRightFieldValue(), rowIndex);
+        leftValueCell = new FieldValueCell(viewModel.getLeftFieldValue(), rowIndex, preferencesService);
+        rightValueCell = new FieldValueCell(viewModel.getRightFieldValue(), rowIndex, preferencesService);
         mergedValueCell = new MergedFieldCell(viewModel.getMergedFieldValue(), rowIndex);
 
         // As a workaround we need to have a reference to the parent grid pane to be able to show/hide the row.
diff --git a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/PersonsNameFieldRowView.java b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/PersonsNameFieldRowView.java
index 8d707f34b0f..84544d77efd 100644
--- a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/PersonsNameFieldRowView.java
+++ b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/PersonsNameFieldRowView.java
@@ -8,13 +8,14 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.FieldProperty;
+import org.jabref.preferences.PreferencesService;
 
 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);
+    public PersonsNameFieldRowView(Field field, BibEntry leftEntry, BibEntry rightEntry, BibEntry mergedEntry, FieldMergerFactory fieldMergerFactory, PreferencesService preferencesService, int rowIndex) {
+        super(field, leftEntry, rightEntry, mergedEntry, fieldMergerFactory, preferencesService, rowIndex);
         assert field.getProperties().contains(FieldProperty.PERSON_NAMES);
 
         var authorsParser = new AuthorListParser();
diff --git a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/ThreeWayMergeView.java b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/ThreeWayMergeView.java
index fd2b1b3105f..ac04d895b11 100644
--- a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/ThreeWayMergeView.java
+++ b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/ThreeWayMergeView.java
@@ -17,7 +17,7 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.FieldProperty;
-import org.jabref.preferences.BibEntryPreferences;
+import org.jabref.preferences.PreferencesService;
 
 public class ThreeWayMergeView extends VBox {
     public static final int GRID_COLUMN_MIN_WIDTH = 250;
@@ -37,14 +37,18 @@ public class ThreeWayMergeView extends VBox {
     private final ThreeWayMergeViewModel viewModel;
     private final List<FieldRowView> fieldRows = new ArrayList<>();
 
+    private final PreferencesService preferencesService;
+
     private final FieldMergerFactory fieldMergerFactory;
     private final String keywordSeparator;
 
-    public ThreeWayMergeView(BibEntry leftEntry, BibEntry rightEntry, String leftHeader, String rightHeader, BibEntryPreferences bibEntryPreferences) {
+    public ThreeWayMergeView(BibEntry leftEntry, BibEntry rightEntry, String leftHeader, String rightHeader, PreferencesService preferencesService) {
+        this.preferencesService = preferencesService;
+
         getStylesheets().add(ThreeWayMergeView.class.getResource("ThreeWayMergeView.css").toExternalForm());
         viewModel = new ThreeWayMergeViewModel((BibEntry) leftEntry.clone(), (BibEntry) rightEntry.clone(), leftHeader, rightHeader);
-        this.fieldMergerFactory = new FieldMergerFactory(bibEntryPreferences);
-        this.keywordSeparator = bibEntryPreferences.getKeywordSeparator().toString();
+        this.fieldMergerFactory = new FieldMergerFactory(preferencesService.getBibEntryPreferences());
+        this.keywordSeparator = preferencesService.getBibEntryPreferences().getKeywordSeparator().toString();
 
         mergeGridPane = new GridPane();
         scrollPane = new ScrollPane();
@@ -63,8 +67,8 @@ public ThreeWayMergeView(BibEntry leftEntry, BibEntry rightEntry, String leftHea
         getChildren().addAll(toolbar, headerView, scrollPane);
     }
 
-    public ThreeWayMergeView(BibEntry leftEntry, BibEntry rightEntry, BibEntryPreferences bibEntryPreferences) {
-        this(leftEntry, rightEntry, LEFT_DEFAULT_HEADER, RIGHT_DEFAULT_HEADER, bibEntryPreferences);
+    public ThreeWayMergeView(BibEntry leftEntry, BibEntry rightEntry, PreferencesService preferencesService) {
+        this(leftEntry, rightEntry, LEFT_DEFAULT_HEADER, RIGHT_DEFAULT_HEADER, preferencesService);
     }
 
     private void initializeToolbar() {
@@ -95,7 +99,7 @@ private void showOrHideEqualFields() {
     private void updateDiff() {
         if (toolbar.shouldShowDiffs()) {
             for (FieldRowView row : fieldRows) {
-                if (row.getFieldNameCell().getText().equals("Groups") && (row.getLeftValueCell().getText().contains(keywordSeparator) || row.getRightValueCell().getText().contains(keywordSeparator))) {
+                if ("Groups".equals(row.getFieldNameCell().getText()) && (row.getLeftValueCell().getText().contains(keywordSeparator) || row.getRightValueCell().getText().contains(keywordSeparator))) {
                     row.showDiff(new ShowDiffConfig(toolbar.getDiffView(), new GroupDiffMode(keywordSeparator)));
                 } else {
                     row.showDiff(new ShowDiffConfig(toolbar.getDiffView(), toolbar.getDiffHighlightingMethod()));
@@ -145,9 +149,9 @@ private void addRow(int fieldIndex) {
 
         FieldRowView fieldRow;
         if (field.getProperties().contains(FieldProperty.PERSON_NAMES)) {
-            fieldRow = new PersonsNameFieldRowView(field, getLeftEntry(), getRightEntry(), getMergedEntry(), fieldMergerFactory, fieldIndex);
+            fieldRow = new PersonsNameFieldRowView(field, getLeftEntry(), getRightEntry(), getMergedEntry(), fieldMergerFactory, preferencesService, fieldIndex);
         } else {
-            fieldRow = new FieldRowView(field, getLeftEntry(), getRightEntry(), getMergedEntry(), fieldMergerFactory, fieldIndex);
+            fieldRow = new FieldRowView(field, getLeftEntry(), getRightEntry(), getMergedEntry(), fieldMergerFactory, preferencesService, fieldIndex);
         }
 
         fieldRows.add(fieldIndex, fieldRow);
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
index 2a3c3030ac6..3b7d0036722 100644
--- a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/FieldValueCell.java
+++ b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/FieldValueCell.java
@@ -26,6 +26,7 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.identifier.DOI;
 import org.jabref.model.strings.StringUtil;
+import org.jabref.preferences.PreferencesService;
 
 import com.tobiasdiez.easybind.EasyBind;
 import org.fxmisc.flowless.VirtualizedScrollPane;
@@ -46,10 +47,11 @@ public class FieldValueCell extends ThreeWayMergeCell implements Toggle {
 
     private static final PseudoClass SELECTED_PSEUDO_CLASS = PseudoClass.getPseudoClass("selected");
 
-    private final StyleClassedTextArea label = new StyleClassedTextArea();
+    private final PreferencesService preferencesService;
 
-    private final ActionFactory factory = new ActionFactory(Globals.getKeyPrefs());
+    private final ActionFactory factory;
 
+    private final StyleClassedTextArea label = new StyleClassedTextArea();
     private final VirtualizedScrollPane<StyleClassedTextArea> scrollPane = new VirtualizedScrollPane<>(label);
     HBox labelBox = new HBox(scrollPane);
 
@@ -57,14 +59,20 @@ public class FieldValueCell extends ThreeWayMergeCell implements Toggle {
     private final HBox actionsContainer = new HBox();
     private final FieldValueCellViewModel viewModel;
 
-    public FieldValueCell(String text, int rowIndex) {
+    public FieldValueCell(String text, int rowIndex, PreferencesService preferencesService) {
         super(text, rowIndex);
-        viewModel = new FieldValueCellViewModel(text);
+
+        this.preferencesService = preferencesService;
+        this.factory = new ActionFactory(Globals.getKeyPrefs());
+        this.viewModel = new FieldValueCellViewModel(text);
+
         EasyBind.listen(viewModel.selectedProperty(), (observable, old, isSelected) -> {
             pseudoClassStateChanged(SELECTED_PSEUDO_CLASS, isSelected);
             getToggleGroup().selectToggle(FieldValueCell.this);
         });
+
         viewModel.fieldValueProperty().bind(textProperty());
+
         initialize();
     }
 
@@ -123,7 +131,7 @@ 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()));
+        Button copyButton = factory.createIconButton(() -> Localization.lang("Copy"), new CopyFieldValueCommand(preferencesService, getText()));
         copyButton.setGraphic(copyIcon);
         copyButton.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
         copyButton.setMaxHeight(Double.MAX_VALUE);
@@ -136,7 +144,7 @@ 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()));
+        Button openLinkButton = factory.createIconButton(() -> Localization.lang("Open Link"), new OpenExternalLinkAction(getText(), preferencesService.getFilePreferences()));
         openLinkButton.setGraphic(openLinkIcon);
         openLinkButton.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
         openLinkButton.setMaxHeight(Double.MAX_VALUE);
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
index 0d0a2e08230..abc43d3f049 100644
--- a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/OpenExternalLinkAction.java
+++ b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/OpenExternalLinkAction.java
@@ -6,6 +6,7 @@
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.gui.desktop.JabRefDesktop;
 import org.jabref.model.entry.identifier.DOI;
+import org.jabref.preferences.FilePreferences;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -14,10 +15,14 @@
  * A command for opening DOIs and URLs. This was created primarily for simplifying {@link FieldValueCell}.
  */
 public class OpenExternalLinkAction extends SimpleCommand {
-    private final String urlOrDoi;
     private final Logger LOGGER = LoggerFactory.getLogger(OpenExternalLinkAction.class);
 
-    public OpenExternalLinkAction(String urlOrDoi) {
+    private final FilePreferences filePreferences;
+
+    private final String urlOrDoi;
+
+    public OpenExternalLinkAction(String urlOrDoi, FilePreferences filePreferences) {
+        this.filePreferences = filePreferences;
         this.urlOrDoi = urlOrDoi;
     }
 
@@ -29,12 +34,11 @@ public void execute() {
                         DOI.parse(urlOrDoi)
                            .flatMap(DOI::getExternalURI)
                            .map(URI::toString)
-                           .orElse("")
+                           .orElse(""),
+                        filePreferences
                 );
             } else {
-                JabRefDesktop.openBrowser(
-                        urlOrDoi
-                );
+                JabRefDesktop.openBrowser(urlOrDoi, filePreferences);
             }
         } catch (IOException e) {
             LOGGER.warn("Cannot open the given external link '{}'", urlOrDoi, e);
diff --git a/src/main/java/org/jabref/gui/openoffice/Bootstrap.java b/src/main/java/org/jabref/gui/openoffice/Bootstrap.java
index ff5a4e980c8..e7338713e9e 100644
--- a/src/main/java/org/jabref/gui/openoffice/Bootstrap.java
+++ b/src/main/java/org/jabref/gui/openoffice/Bootstrap.java
@@ -21,6 +21,7 @@
 package org.jabref.gui.openoffice;
 
 import java.io.BufferedReader;
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.PrintStream;
@@ -107,7 +108,7 @@ private static void insertBasicFactories(XSet xSet, XImplementationLoader xImpLo
      * @see #bootstrap(String[])
      * @since LibreOffice 5.1
      */
-    public static final String[] getDefaultOptions() {
+    public static String[] getDefaultOptions() {
         return new String[] {"--nologo", "--nodefault", "--norestore", "--nolockcheck"};
     }
 
@@ -176,7 +177,7 @@ public static XMultiServiceFactory createSimpleServiceManager() throws Exception
      * <code>cppuhelper/defaultBootstrap_InitialComponentContext()</code>.
      * @throws Exception if things go awry.
      */
-    public static final XComponentContext defaultBootstrap_InitialComponentContext() throws Exception {
+    public static XComponentContext defaultBootstrap_InitialComponentContext() throws Exception {
         return defaultBootstrap_InitialComponentContext((String) null, (Map<String, String>) null);
     }
 
@@ -188,7 +189,7 @@ public static final XComponentContext defaultBootstrap_InitialComponentContext()
      * @return a freshly bootstrapped component context.
      * @throws Exception if things go awry.
      */
-    public static final XComponentContext defaultBootstrap_InitialComponentContext(String ini_file, Hashtable<String, String> bootstrap_parameters) throws Exception {
+    public static XComponentContext defaultBootstrap_InitialComponentContext(String ini_file, Hashtable<String, String> bootstrap_parameters) throws Exception {
         return defaultBootstrap_InitialComponentContext(ini_file, (Map<String, String>) bootstrap_parameters);
     }
 
@@ -203,7 +204,7 @@ public static final XComponentContext defaultBootstrap_InitialComponentContext(S
      * @return a freshly bootstrapped component context.
      * @throws Exception if things go awry.
      */
-    public static final XComponentContext defaultBootstrap_InitialComponentContext(String ini_file, Map<String, String> bootstrap_parameters) throws Exception {
+    public static XComponentContext defaultBootstrap_InitialComponentContext(String ini_file, Map<String, String> bootstrap_parameters) throws Exception {
         // jni convenience: easier to iterate over array than calling Hashtable
         String pairs[] = null;
         if (null != bootstrap_parameters) {
@@ -253,7 +254,7 @@ public static final XComponentContext defaultBootstrap_InitialComponentContext(S
      * @throws BootstrapException if things go awry.
      * @since UDK 3.1.0
      */
-    public static final XComponentContext bootstrap(Path ooPath) throws BootstrapException {
+    public static XComponentContext bootstrap(Path ooPath) throws BootstrapException {
         String[] defaultArgArray = getDefaultOptions();
         return bootstrap(defaultArgArray, ooPath);
     }
@@ -267,7 +268,7 @@ public static final XComponentContext bootstrap(Path ooPath) throws BootstrapExc
      * @see #getDefaultOptions()
      * @since LibreOffice 5.1
      */
-    public static final XComponentContext bootstrap(String[] argArray, Path path) throws BootstrapException {
+    public static XComponentContext bootstrap(String[] argArray, Path path) throws BootstrapException {
 
         XComponentContext xContext = null;
 
@@ -282,7 +283,7 @@ public static final XComponentContext bootstrap(String[] argArray, Path path) th
             // We need a socket, pipe does not work. https://api.libreoffice.org/examples/examples.html
             String[] cmdArray = new String[argArray.length + 2];
             cmdArray[0] = path.toAbsolutePath().toString();
-            cmdArray[1] = ("--accept=socket,host=localhost,port=2083" + ";urp;");
+            cmdArray[1] = "--accept=socket,host=localhost,port=2083" + ";urp;";
 
             System.arraycopy(argArray, 0, cmdArray, 2, argArray.length);
 
@@ -326,7 +327,7 @@ public static final XComponentContext bootstrap(String[] argArray, Path path) th
             throw e;
         } catch (java.lang.RuntimeException e) {
             throw e;
-        } catch (java.lang.Exception e) {
+        } catch (Exception e) {
             throw new BootstrapException(e);
         }
 
@@ -349,7 +350,7 @@ public void run() {
                     }
                 } catch (UnsupportedEncodingException e) {
                     e.printStackTrace(System.err);
-                } catch (java.io.IOException e) {
+                } catch (IOException e) {
                     e.printStackTrace(System.err);
                 }
             }
diff --git a/src/main/java/org/jabref/gui/openoffice/DetectOpenOfficeInstallation.java b/src/main/java/org/jabref/gui/openoffice/DetectOpenOfficeInstallation.java
index 601c26a7ebd..f7e94eb4c62 100644
--- a/src/main/java/org/jabref/gui/openoffice/DetectOpenOfficeInstallation.java
+++ b/src/main/java/org/jabref/gui/openoffice/DetectOpenOfficeInstallation.java
@@ -6,7 +6,6 @@
 import java.util.Optional;
 
 import org.jabref.gui.DialogService;
-import org.jabref.gui.desktop.JabRefDesktop;
 import org.jabref.gui.desktop.os.NativeDesktop;
 import org.jabref.gui.util.DirectoryDialogConfiguration;
 import org.jabref.logic.l10n.Localization;
@@ -33,7 +32,7 @@ public boolean isExecutablePathDefined() {
     }
 
     public Optional<Path> selectInstallationPath() {
-        final NativeDesktop nativeDesktop = JabRefDesktop.getNativeDesktop();
+        final NativeDesktop nativeDesktop = OS.getNativeDesktop();
 
         dialogService.showInformationDialogAndWait(Localization.lang("Could not find OpenOffice/LibreOffice installation"),
                 Localization.lang("Unable to autodetect OpenOffice/LibreOffice installation. Please choose the installation directory manually."));
diff --git a/src/main/java/org/jabref/gui/openoffice/ManageCitationsDialogView.java b/src/main/java/org/jabref/gui/openoffice/ManageCitationsDialogView.java
index 15bc0def40a..986c971c9d0 100644
--- a/src/main/java/org/jabref/gui/openoffice/ManageCitationsDialogView.java
+++ b/src/main/java/org/jabref/gui/openoffice/ManageCitationsDialogView.java
@@ -84,9 +84,6 @@ private Node getText(String citationContext) {
     }
 
     public boolean isOkToShowThisDialog() {
-        if (viewModel == null || viewModel.failedToGetCitationEntries) {
-            return false;
-        }
-        return true;
+        return viewModel != null && !viewModel.failedToGetCitationEntries;
     }
 }
diff --git a/src/main/java/org/jabref/gui/openoffice/OOBibBase.java b/src/main/java/org/jabref/gui/openoffice/OOBibBase.java
index 20254bc0bd8..f66e353fef5 100644
--- a/src/main/java/org/jabref/gui/openoffice/OOBibBase.java
+++ b/src/main/java/org/jabref/gui/openoffice/OOBibBase.java
@@ -147,10 +147,10 @@ void showDialog(String errorTitle, OOError err) {
     }
 
     OOVoidResult<OOError> collectResults(String errorTitle, List<OOVoidResult<OOError>> results) {
-        String msg = (results.stream()
+        String msg = results.stream()
                              .filter(OOVoidResult::isError)
                              .map(e -> e.getError().getLocalizedMessage())
-                             .collect(Collectors.joining("\n\n")));
+                             .collect(Collectors.joining("\n\n"));
         if (msg.isEmpty()) {
             return OOVoidResult.ok();
         } else {
@@ -191,7 +191,7 @@ OOResult<XTextCursor, OOError> getUserCursorForTextInsertion(XTextDocument doc,
             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.");
+                            + Localization.lang("I cannot insert to the cursor's current location.");
             return OOResult.error(new OOError(errorTitle, msg, ex));
         }
         return OOResult.ok(cursor);
@@ -219,11 +219,11 @@ private static OOVoidResult<OOError> checkRangeOverlaps(XTextDocument doc, OOFro
         boolean requireSeparation = false;
         int maxReportedOverlaps = 10;
         try {
-            return (frontend.checkRangeOverlaps(doc,
+            return frontend.checkRangeOverlaps(doc,
                                     new ArrayList<>(),
                                     requireSeparation,
                                     maxReportedOverlaps)
-                            .mapError(OOError::from));
+                            .mapError(OOError::from);
         } catch (NoDocumentException ex) {
             return OOVoidResult.error(OOError.from(ex).setTitle(errorTitle));
         } catch (WrappedTargetException ex) {
diff --git a/src/main/java/org/jabref/gui/openoffice/OOBibBaseConnect.java b/src/main/java/org/jabref/gui/openoffice/OOBibBaseConnect.java
index 8a12722a17b..59603fabbca 100644
--- a/src/main/java/org/jabref/gui/openoffice/OOBibBaseConnect.java
+++ b/src/main/java/org/jabref/gui/openoffice/OOBibBaseConnect.java
@@ -64,7 +64,7 @@ private XDesktop simpleBootstrap(Path loPath)
             BootstrapException {
 
         // Get the office component context:
-        XComponentContext context = org.jabref.gui.openoffice.Bootstrap.bootstrap(loPath);
+        XComponentContext context = Bootstrap.bootstrap(loPath);
         XMultiComponentFactory sem = context.getServiceManager();
 
         // Create the desktop, which is the root frame of the
@@ -85,7 +85,7 @@ 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()
+                                                          Bootstrap.createSimpleServiceManager()
                     .createInstance("com.sun.star.bridge.BridgeFactory"));
 
             if (bridgeFactory != null) {
@@ -146,9 +146,9 @@ public String toString() {
             }
         }
 
-        List<DocumentTitleViewModel> viewModel = (list.stream()
+        List<DocumentTitleViewModel> viewModel = list.stream()
                                                       .map(DocumentTitleViewModel::new)
-                                                      .collect(Collectors.toList()));
+                                                      .collect(Collectors.toList());
 
         // This whole method is part of a background task when
         // auto-detecting instances, so we need to show dialog in FX
diff --git a/src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java b/src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java
index 4ddf2ac7a42..94c54289125 100644
--- a/src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java
+++ b/src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java
@@ -27,7 +27,6 @@
 import javafx.scene.layout.VBox;
 
 import org.jabref.gui.DialogService;
-import org.jabref.gui.Globals;
 import org.jabref.gui.JabRefGUI;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.ActionFactory;
@@ -43,6 +42,7 @@
 import org.jabref.logic.citationkeypattern.CitationKeyGenerator;
 import org.jabref.logic.citationkeypattern.CitationKeyPatternPreferences;
 import org.jabref.logic.help.HelpFile;
+import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.openoffice.OpenOfficeFileSearch;
 import org.jabref.logic.openoffice.OpenOfficePreferences;
@@ -94,8 +94,8 @@ public class OpenOfficePanel {
     private OOBibStyle style;
 
     public OpenOfficePanel(PreferencesService preferencesService,
-                           OpenOfficePreferences openOfficePreferences,
                            KeyBindingRepository keyBindingRepository,
+                           JournalAbbreviationRepository abbreviationRepository,
                            TaskExecutor taskExecutor,
                            DialogService dialogService,
                            StateManager stateManager,
@@ -117,7 +117,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, dialogService));
+        help = factory.createIconButton(StandardActions.HELP, new HelpAction(HelpFile.OPENOFFICE_LIBREOFFICE, dialogService, preferencesService.getFilePreferences()));
         help.setMaxWidth(Double.MAX_VALUE);
 
         selectDocument = new Button();
@@ -130,8 +130,10 @@ public OpenOfficePanel(PreferencesService preferencesService,
         update.setTooltip(new Tooltip(Localization.lang("Sync OpenOffice/LibreOffice bibliography")));
         update.setMaxWidth(Double.MAX_VALUE);
 
-        loader = new StyleLoader(openOfficePreferences,
-                preferencesService.getLayoutFormatterPreferences(Globals.journalAbbreviationRepository));
+        loader = new StyleLoader(
+                preferencesService.getOpenOfficePreferences(),
+                preferencesService.getLayoutFormatterPreferences(),
+                abbreviationRepository);
 
         initPanel();
     }
@@ -155,9 +157,9 @@ private boolean getOrUpdateTheStyle(String title) {
                 style.ensureUpToDate();
             } catch (IOException ex) {
                 LOGGER.warn("Unable to reload style file '" + style.getPath() + "'", ex);
-                String msg = (Localization.lang("Unable to reload style file")
+                String msg = Localization.lang("Unable to reload style file")
                         + "'" + style.getPath() + "'"
-                        + "\n" + ex.getMessage());
+                        + "\n" + ex.getMessage();
                 new OOError(title, msg, ex).showErrorDialog(dialogService);
                 return FAIL;
             }
@@ -330,7 +332,7 @@ private void connectManually() {
     }
 
     private void updateButtonAvailability() {
-        boolean isConnected = (ooBase != null);
+        boolean isConnected = ooBase != null;
         boolean isConnectedToDocument = isConnected && !ooBase.isDocumentConnectionMissing();
 
         // For these, we need to watch something
@@ -338,7 +340,7 @@ private void updateButtonAvailability() {
         boolean hasDatabase = true; // !getBaseList().isEmpty();
         boolean hasSelectedBibEntry = true;
 
-        selectDocument.setDisable(!(isConnected));
+        selectDocument.setDisable(!isConnected);
         pushEntries.setDisable(!(isConnectedToDocument && hasStyle && hasDatabase));
 
         boolean canCite = isConnectedToDocument && hasStyle && hasSelectedBibEntry;
@@ -418,9 +420,9 @@ private static CitationType citationTypeFromOptions(boolean withText, boolean in
         if (!withText) {
             return CitationType.INVISIBLE_CIT;
         }
-        return (inParenthesis
+        return inParenthesis
                 ? CitationType.AUTHORYEAR_PAR
-                : CitationType.AUTHORYEAR_INTEXT);
+                : CitationType.AUTHORYEAR_INTEXT;
     }
 
     private void pushEntries(CitationType citationType, boolean addPageInfo) {
@@ -477,9 +479,9 @@ private void pushEntries(CitationType citationType, boolean addPageInfo) {
         }
 
         Optional<Update.SyncOptions> syncOptions =
-                (preferencesService.getOpenOfficePreferences().getSyncWhenCiting()
+                preferencesService.getOpenOfficePreferences().getSyncWhenCiting()
                         ? Optional.of(new Update.SyncOptions(getBaseList()))
-                        : Optional.empty());
+                        : Optional.empty();
 
         ooBase.guiActionInsertEntry(entries,
                 database,
diff --git a/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogView.java b/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogView.java
index 77870845ba8..f2c8a835345 100644
--- a/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogView.java
+++ b/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogView.java
@@ -74,11 +74,11 @@ public StyleSelectDialogView(StyleLoader loader) {
     private void initialize() {
         viewModel = new StyleSelectDialogViewModel(dialogService, loader, preferencesService);
 
-        previewArticle = new PreviewViewer(new BibDatabaseContext(), dialogService, stateManager, themeManager);
+        previewArticle = new PreviewViewer(new BibDatabaseContext(), dialogService, preferencesService, stateManager, themeManager);
         previewArticle.setEntry(TestEntry.getTestEntry());
         vbox.getChildren().add(previewArticle);
 
-        previewBook = new PreviewViewer(new BibDatabaseContext(), dialogService, stateManager, themeManager);
+        previewBook = new PreviewViewer(new BibDatabaseContext(), dialogService, preferencesService, stateManager, themeManager);
         previewBook.setEntry(TestEntry.getTestEntryBook());
         vbox.getChildren().add(previewBook);
 
diff --git a/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogViewModel.java b/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogViewModel.java
index 91752c95407..3fc36eec238 100644
--- a/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogViewModel.java
@@ -27,6 +27,7 @@
 import org.jabref.logic.openoffice.style.StyleLoader;
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.preferences.FilePreferences;
 import org.jabref.preferences.PreferencesService;
 
 public class StyleSelectDialogViewModel {
@@ -34,13 +35,13 @@ public class StyleSelectDialogViewModel {
     private final DialogService dialogService;
     private final StyleLoader styleLoader;
     private final OpenOfficePreferences openOfficePreferences;
-    private final PreferencesService preferencesService;
+    private final FilePreferences filePreferences;
     private final ListProperty<StyleSelectItemViewModel> styles = new SimpleListProperty<>(FXCollections.observableArrayList());
     private final ObjectProperty<StyleSelectItemViewModel> selectedItem = new SimpleObjectProperty<>();
 
     public StyleSelectDialogViewModel(DialogService dialogService, StyleLoader styleLoader, PreferencesService preferencesService) {
         this.dialogService = dialogService;
-        this.preferencesService = preferencesService;
+        this.filePreferences = preferencesService.getFilePreferences();
         this.openOfficePreferences = preferencesService.getOpenOfficePreferences();
         this.styleLoader = styleLoader;
 
@@ -62,7 +63,7 @@ public void addStyleFile() {
         FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
                 .addExtensionFilter(Localization.lang("Style file"), StandardFileType.JSTYLE)
                 .withDefaultExtension(Localization.lang("Style file"), StandardFileType.JSTYLE)
-                .withInitialDirectory(preferencesService.getFilePreferences().getWorkingDirectory())
+                .withInitialDirectory(filePreferences.getWorkingDirectory())
                 .build();
         Optional<Path> path = dialogService.showFileOpenDialog(fileDialogConfiguration);
         path.map(Path::toAbsolutePath).map(Path::toString).ifPresent(stylePath -> {
@@ -93,9 +94,9 @@ public void deleteStyle() {
 
     public void editStyle() {
         OOBibStyle style = selectedItem.getValue().getStyle();
-        Optional<ExternalFileType> type = ExternalFileTypes.getExternalFileTypeByExt("jstyle", preferencesService.getFilePreferences());
+        Optional<ExternalFileType> type = ExternalFileTypes.getExternalFileTypeByExt("jstyle", filePreferences);
         try {
-            JabRefDesktop.openExternalFileAnyFormat(new BibDatabaseContext(), preferencesService, style.getPath(), type);
+            JabRefDesktop.openExternalFileAnyFormat(new BibDatabaseContext(), filePreferences, style.getPath(), type);
         } catch (IOException e) {
             dialogService.showErrorDialogAndWait(e);
         }
diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesDialog.fxml b/src/main/java/org/jabref/gui/preferences/PreferencesDialog.fxml
index 4434809a34f..de98129187b 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferencesDialog.fxml
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesDialog.fxml
@@ -7,6 +7,7 @@
 <?import javafx.scene.control.ListView?>
 <?import javafx.scene.control.ScrollPane?>
 <?import javafx.scene.control.SplitPane?>
+<?import javafx.scene.control.ToggleButton?>
 <?import javafx.scene.control.Tooltip?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
@@ -61,6 +62,14 @@
                             <Tooltip text="%Reset preferences"/>
                         </tooltip>
                     </Button>
+                    <ToggleButton fx:id="memoryStickMode" styleClass="icon-button,narrow" maxWidth="Infinity" HBox.hgrow="ALWAYS">
+                        <graphic>
+                            <JabRefIconView glyph="MEMORYSTICK"/>
+                        </graphic>
+                        <tooltip>
+                            <Tooltip text="%Memory stick mode - Store preferences in 'jabref.xml' in the app folder."/>
+                        </tooltip>
+                    </ToggleButton>
                 </HBox>
             </VBox>
             <ScrollPane fx:id="preferencesContainer"/>
diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesDialogView.java b/src/main/java/org/jabref/gui/preferences/PreferencesDialogView.java
index f3a5c245913..1de0bdd99f0 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferencesDialogView.java
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesDialogView.java
@@ -6,6 +6,7 @@
 import javafx.scene.control.ButtonType;
 import javafx.scene.control.ListView;
 import javafx.scene.control.ScrollPane;
+import javafx.scene.control.ToggleButton;
 import javafx.scene.input.KeyCode;
 
 import org.jabref.gui.DialogService;
@@ -35,6 +36,7 @@ public class PreferencesDialogView extends BaseDialog<PreferencesDialogViewModel
     @FXML private ListView<PreferencesTab> preferenceTabList;
     @FXML private ScrollPane preferencesContainer;
     @FXML private ButtonType saveButton;
+    @FXML private ToggleButton memoryStickMode;
 
     @Inject private DialogService dialogService;
     @Inject private PreferencesService preferencesService;
@@ -105,6 +107,8 @@ private void initialize() {
                 .withText(PreferencesTab::getTabName)
                 .install(preferenceTabList);
 
+        memoryStickMode.selectedProperty().bindBidirectional(viewModel.getMemoryStickProperty());
+
         viewModel.setValues();
     }
 
diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java b/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java
index 5b713d53172..35f6a9db00b 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java
@@ -4,7 +4,9 @@
 import java.util.List;
 import java.util.prefs.BackingStoreException;
 
+import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ReadOnlyListWrapper;
+import javafx.beans.property.SimpleBooleanProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 
@@ -12,20 +14,18 @@
 import org.jabref.gui.DialogService;
 import org.jabref.gui.Globals;
 import org.jabref.gui.JabRefFrame;
-import org.jabref.gui.preferences.appearance.AppearanceTab;
+import org.jabref.gui.preferences.autocompletion.AutoCompletionTab;
 import org.jabref.gui.preferences.citationkeypattern.CitationKeyPatternTab;
 import org.jabref.gui.preferences.customentrytypes.CustomEntryTypesTab;
 import org.jabref.gui.preferences.customexporter.CustomExporterTab;
 import org.jabref.gui.preferences.customimporter.CustomImporterTab;
 import org.jabref.gui.preferences.entry.EntryTab;
 import org.jabref.gui.preferences.entryeditor.EntryEditorTab;
-import org.jabref.gui.preferences.entryeditortabs.CustomEditorFieldsTab;
+import org.jabref.gui.preferences.export.ExportTab;
 import org.jabref.gui.preferences.external.ExternalTab;
 import org.jabref.gui.preferences.externalfiletypes.ExternalFileTypesTab;
-import org.jabref.gui.preferences.file.FileTab;
 import org.jabref.gui.preferences.general.GeneralTab;
 import org.jabref.gui.preferences.groups.GroupsTab;
-import org.jabref.gui.preferences.importexport.ImportExportTab;
 import org.jabref.gui.preferences.journals.JournalAbbreviationsTab;
 import org.jabref.gui.preferences.keybindings.KeyBindingsTab;
 import org.jabref.gui.preferences.linkedfiles.LinkedFilesTab;
@@ -34,6 +34,7 @@
 import org.jabref.gui.preferences.preview.PreviewTab;
 import org.jabref.gui.preferences.protectedterms.ProtectedTermsTab;
 import org.jabref.gui.preferences.table.TableTab;
+import org.jabref.gui.preferences.websearch.WebSearchTab;
 import org.jabref.gui.preferences.xmp.XmpPrivacyTab;
 import org.jabref.gui.util.FileDialogConfiguration;
 import org.jabref.logic.JabRefException;
@@ -49,6 +50,8 @@ public class PreferencesDialogViewModel extends AbstractViewModel {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(PreferencesDialogViewModel.class);
 
+    private final SimpleBooleanProperty memoryStickProperty = new SimpleBooleanProperty();
+
     private final DialogService dialogService;
     private final PreferencesService preferences;
     private final ObservableList<PreferencesTab> preferenceTabs;
@@ -62,27 +65,26 @@ public PreferencesDialogViewModel(DialogService dialogService, PreferencesServic
         preferenceTabs = FXCollections.observableArrayList(
                 new GeneralTab(),
                 new KeyBindingsTab(),
-                new FileTab(),
+                new GroupsTab(),
+                new WebSearchTab(),
                 new EntryTab(),
                 new TableTab(),
                 new PreviewTab(),
+                new EntryEditorTab(),
+                new CustomEntryTypesTab(),
+                new CitationKeyPatternTab(),
+                new LinkedFilesTab(),
+                new ExportTab(),
+                new AutoCompletionTab(),
                 new ProtectedTermsTab(),
                 new ExternalTab(),
                 new ExternalFileTypesTab(),
                 new JournalAbbreviationsTab(),
-                new GroupsTab(),
-                new EntryEditorTab(),
-                new ImportExportTab(),
-                new CustomEditorFieldsTab(),
-                new CitationKeyPatternTab(),
-                new LinkedFilesTab(),
                 new NameFormatterTab(),
+                new XmpPrivacyTab(),
                 new CustomImporterTab(),
                 new CustomExporterTab(),
-                new CustomEntryTypesTab(),
-                new XmpPrivacyTab(),
-                new NetworkTab(),
-                new AppearanceTab()
+                new NetworkTab()
         );
     }
 
@@ -186,6 +188,8 @@ public void storeAllSettings() {
         }
 
         // Store settings
+        preferences.getInternalPreferences().setMemoryStickMode(memoryStickProperty.get());
+
         for (PreferencesTab tab : preferenceTabs) {
             tab.storeSettings();
             restartWarnings.addAll(tab.getRestartWarnings());
@@ -211,8 +215,14 @@ public void storeAllSettings() {
      * Inserts the preference values into the Properties of the ViewModel
      */
     public void setValues() {
+        memoryStickProperty.setValue(preferences.getInternalPreferences().isMemoryStickMode());
+
         for (PreferencesTab preferencesTab : preferenceTabs) {
             preferencesTab.setValues();
         }
     }
+
+    public BooleanProperty getMemoryStickProperty() {
+        return memoryStickProperty;
+    }
 }
diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesFilterDialog.java b/src/main/java/org/jabref/gui/preferences/PreferencesFilterDialog.java
index f0ae7e486b0..9b57810578b 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferencesFilterDialog.java
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesFilterDialog.java
@@ -58,7 +58,7 @@ private void initialize() {
                 return null;
             }
             String lowerCaseSearchText = searchText.toLowerCase(Locale.ROOT);
-            return (option) -> option.getKey().toLowerCase(Locale.ROOT).contains(lowerCaseSearchText);
+            return option -> option.getKey().toLowerCase(Locale.ROOT).contains(lowerCaseSearchText);
         }));
         columnType.setCellValueFactory(data -> new ReadOnlyObjectWrapper<>(data.getValue().getType()));
         columnKey.setCellValueFactory(data -> new ReadOnlyStringWrapper(data.getValue().getKey()));
diff --git a/src/main/java/org/jabref/gui/preferences/appearance/AppearanceTab.fxml b/src/main/java/org/jabref/gui/preferences/appearance/AppearanceTab.fxml
deleted file mode 100644
index 211da3212d4..00000000000
--- a/src/main/java/org/jabref/gui/preferences/appearance/AppearanceTab.fxml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?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.RadioButton?>
-<?import javafx.scene.control.Spinner?>
-<?import javafx.scene.control.TextField?>
-<?import javafx.scene.control.ToggleGroup?>
-<?import javafx.scene.control.Tooltip?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.VBox?>
-<?import org.jabref.gui.icon.JabRefIconView?>
-<fx:root spacing="10.0" type="VBox"
-         xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml"
-         fx:controller="org.jabref.gui.preferences.appearance.AppearanceTab">
-    <fx:define>
-        <ToggleGroup fx:id="theme"/>
-    </fx:define>
-    <Label styleClass="titleHeader" text="%Appearance"/>
-
-    <Label styleClass="sectionHeader" text="%Font"/>
-    <CheckBox fx:id="fontOverride" text="%Override default font settings"/>
-    <HBox alignment="CENTER_LEFT" spacing="4.0">
-        <Label text="%Size" disable="${!fontOverride.selected}"/>
-        <Spinner fx:id="fontSize" styleClass="fontsizeSpinner" editable="true"/>
-        <padding>
-            <Insets left="20.0"/>
-        </padding>
-    </HBox>
-
-    <Label styleClass="sectionHeader" text="%Visual theme"/>
-    <RadioButton fx:id="themeLight" text="%Light theme" toggleGroup="$theme"/>
-    <RadioButton fx:id="themeDark" text="%Dark theme" toggleGroup="$theme"/>
-    <HBox alignment="CENTER_LEFT" spacing="4.0">
-        <RadioButton fx:id="customTheme" text="%Custom theme" toggleGroup="$theme"/>
-        <TextField fx:id="customThemePath" HBox.hgrow="ALWAYS" disable="${!customTheme.selected}"/>
-        <Button onAction="#importTheme" disable="${!customTheme.selected}"
-                styleClass="icon-button,narrow"
-                prefHeight="20.0" prefWidth="20.0">
-            <graphic>
-                <JabRefIconView glyph="OPEN"/>
-            </graphic>
-            <tooltip>
-                <Tooltip text="%Browse"/>
-            </tooltip>
-        </Button>
-    </HBox>
-</fx:root>
diff --git a/src/main/java/org/jabref/gui/preferences/appearance/AppearanceTab.java b/src/main/java/org/jabref/gui/preferences/appearance/AppearanceTab.java
deleted file mode 100644
index 96190459255..00000000000
--- a/src/main/java/org/jabref/gui/preferences/appearance/AppearanceTab.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package org.jabref.gui.preferences.appearance;
-
-import java.util.regex.Pattern;
-
-import javafx.application.Platform;
-import javafx.fxml.FXML;
-import javafx.geometry.Pos;
-import javafx.scene.control.CheckBox;
-import javafx.scene.control.RadioButton;
-import javafx.scene.control.Spinner;
-import javafx.scene.control.TextField;
-import javafx.scene.control.TextFormatter;
-import javafx.util.converter.IntegerStringConverter;
-
-import org.jabref.gui.preferences.AbstractPreferenceTabView;
-import org.jabref.gui.preferences.PreferencesTab;
-import org.jabref.gui.util.IconValidationDecorator;
-import org.jabref.logic.l10n.Localization;
-
-import com.airhacks.afterburner.views.ViewLoader;
-import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
-
-public class AppearanceTab extends AbstractPreferenceTabView<AppearanceTabViewModel> implements PreferencesTab {
-
-    @FXML private CheckBox fontOverride;
-    @FXML private Spinner<Integer> fontSize;
-    @FXML private RadioButton themeLight;
-    @FXML private RadioButton themeDark;
-    @FXML private RadioButton customTheme;
-    @FXML private TextField customThemePath;
-
-    private final ControlsFxVisualizer validationVisualizer = new ControlsFxVisualizer();
-
-    // The fontSizeFormatter formats the input given to the fontSize spinner so that non valid values cannot be entered.
-    private final TextFormatter<Integer> fontSizeFormatter = new TextFormatter<>(new IntegerStringConverter(), 9,
-            c -> {
-                if (Pattern.matches("\\d*", c.getText())) {
-                    return c;
-                }
-                c.setText("0");
-                return c;
-            });
-
-    public AppearanceTab() {
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
-    }
-
-    @Override
-    public String getTabName() {
-        return Localization.lang("Appearance");
-    }
-
-    public void initialize() {
-        this.viewModel = new AppearanceTabViewModel(dialogService, preferencesService);
-
-        fontOverride.selectedProperty().bindBidirectional(viewModel.fontOverrideProperty());
-
-        // Spinner does neither support alignment nor disableProperty in FXML
-        fontSize.disableProperty().bind(fontOverride.selectedProperty().not());
-        fontSize.getEditor().setAlignment(Pos.CENTER_RIGHT);
-        fontSize.setValueFactory(AppearanceTabViewModel.fontSizeValueFactory);
-        fontSize.getEditor().textProperty().bindBidirectional(viewModel.fontSizeProperty());
-        fontSize.getEditor().setTextFormatter(fontSizeFormatter);
-
-        themeLight.selectedProperty().bindBidirectional(viewModel.themeLightProperty());
-        themeDark.selectedProperty().bindBidirectional(viewModel.themeDarkProperty());
-        customTheme.selectedProperty().bindBidirectional(viewModel.customThemeProperty());
-        customThemePath.textProperty().bindBidirectional(viewModel.customPathToThemeProperty());
-
-        validationVisualizer.setDecoration(new IconValidationDecorator());
-        Platform.runLater(() -> {
-            validationVisualizer.initVisualization(viewModel.fontSizeValidationStatus(), fontSize);
-            validationVisualizer.initVisualization(viewModel.customPathToThemeValidationStatus(), customThemePath);
-        });
-    }
-
-    @FXML
-    void importTheme() {
-        viewModel.importCSSFile();
-    }
-}
diff --git a/src/main/java/org/jabref/gui/preferences/appearance/AppearanceTabViewModel.java b/src/main/java/org/jabref/gui/preferences/appearance/AppearanceTabViewModel.java
deleted file mode 100644
index e122a4732d6..00000000000
--- a/src/main/java/org/jabref/gui/preferences/appearance/AppearanceTabViewModel.java
+++ /dev/null
@@ -1,172 +0,0 @@
-package org.jabref.gui.preferences.appearance;
-
-import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.SimpleBooleanProperty;
-import javafx.beans.property.SimpleStringProperty;
-import javafx.beans.property.StringProperty;
-import javafx.scene.control.SpinnerValueFactory;
-
-import org.jabref.gui.DialogService;
-import org.jabref.gui.preferences.PreferenceTabViewModel;
-import org.jabref.gui.theme.Theme;
-import org.jabref.gui.util.FileDialogConfiguration;
-import org.jabref.logic.l10n.Localization;
-import org.jabref.logic.util.StandardFileType;
-import org.jabref.model.strings.StringUtil;
-import org.jabref.preferences.AppearancePreferences;
-import org.jabref.preferences.PreferencesService;
-
-import de.saxsys.mvvmfx.utils.validation.CompositeValidator;
-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 AppearanceTabViewModel implements PreferenceTabViewModel {
-
-    public static SpinnerValueFactory<Integer> fontSizeValueFactory =
-            new SpinnerValueFactory.IntegerSpinnerValueFactory(9, Integer.MAX_VALUE);
-
-    private final BooleanProperty fontOverrideProperty = new SimpleBooleanProperty();
-    private final StringProperty fontSizeProperty = new SimpleStringProperty();
-    private final BooleanProperty themeLightProperty = new SimpleBooleanProperty();
-    private final BooleanProperty themeDarkProperty = new SimpleBooleanProperty();
-    private final BooleanProperty themeCustomProperty = new SimpleBooleanProperty();
-    private final StringProperty customPathToThemeProperty = new SimpleStringProperty();
-
-    private final DialogService dialogService;
-    private final PreferencesService preferences;
-    private final AppearancePreferences appearancePreferences;
-
-    private final Validator fontSizeValidator;
-    private final Validator customPathToThemeValidator;
-
-    public AppearanceTabViewModel(DialogService dialogService, PreferencesService preferences) {
-        this.dialogService = dialogService;
-        this.preferences = preferences;
-        this.appearancePreferences = preferences.getAppearancePreferences();
-
-        fontSizeValidator = new FunctionBasedValidator<>(
-                fontSizeProperty,
-                input -> {
-                    try {
-                        return Integer.parseInt(fontSizeProperty().getValue()) > 8;
-                    } catch (NumberFormatException ex) {
-                        return false;
-                    }
-                },
-                ValidationMessage.error(String.format("%s > %s %n %n %s",
-                        Localization.lang("Appearance"),
-                        Localization.lang("Font settings"),
-                        Localization.lang("You must enter an integer value higher than 8."))));
-
-        customPathToThemeValidator = new FunctionBasedValidator<>(
-                customPathToThemeProperty,
-                input -> !StringUtil.isNullOrEmpty(input),
-                ValidationMessage.error(String.format("%s > %s %n %n %s",
-                        Localization.lang("Appearance"),
-                        Localization.lang("Visual theme"),
-                        Localization.lang("Please specify a css theme file."))));
-    }
-
-    @Override
-    public void setValues() {
-        fontOverrideProperty.setValue(appearancePreferences.shouldOverrideDefaultFontSize());
-        fontSizeProperty.setValue(String.valueOf(appearancePreferences.getMainFontSize()));
-
-        // The light theme is in fact the absence of any theme modifying 'base.css'. Another embedded theme like
-        // 'dark.css', stored in the classpath, can be introduced in {@link org.jabref.gui.theme.Theme}.
-        Theme currentTheme = appearancePreferences.getTheme();
-        if (currentTheme.getType() == Theme.Type.DEFAULT) {
-            themeLightProperty.setValue(true);
-            themeDarkProperty.setValue(false);
-            themeCustomProperty.setValue(false);
-        } else if (currentTheme.getType() == Theme.Type.EMBEDDED) {
-            themeLightProperty.setValue(false);
-            themeDarkProperty.setValue(true);
-            themeCustomProperty.setValue(false);
-        } else {
-            themeLightProperty.setValue(false);
-            themeDarkProperty.setValue(false);
-            themeCustomProperty.setValue(true);
-            customPathToThemeProperty.setValue(currentTheme.getName());
-        }
-    }
-
-    @Override
-    public void storeSettings() {
-        appearancePreferences.setShouldOverrideDefaultFontSize(fontOverrideProperty.getValue());
-        appearancePreferences.setMainFontSize(Integer.parseInt(fontSizeProperty.getValue()));
-
-        if (themeLightProperty.getValue()) {
-            appearancePreferences.setTheme(Theme.light());
-        } else if (themeDarkProperty.getValue()) {
-            appearancePreferences.setTheme(Theme.dark());
-        } else if (themeCustomProperty.getValue()) {
-            appearancePreferences.setTheme(Theme.custom(customPathToThemeProperty.getValue()));
-        }
-    }
-
-    public ValidationStatus fontSizeValidationStatus() {
-        return fontSizeValidator.getValidationStatus();
-    }
-
-    public ValidationStatus customPathToThemeValidationStatus() {
-        return customPathToThemeValidator.getValidationStatus();
-    }
-
-    @Override
-    public boolean validateSettings() {
-        CompositeValidator validator = new CompositeValidator();
-
-        if (fontOverrideProperty.getValue()) {
-            validator.addValidators(fontSizeValidator);
-        }
-
-        if (themeCustomProperty.getValue()) {
-            validator.addValidators(customPathToThemeValidator);
-        }
-
-        ValidationStatus validationStatus = validator.getValidationStatus();
-        if (!validationStatus.isValid()) {
-            validationStatus.getHighestMessage().ifPresent(message ->
-                    dialogService.showErrorDialogAndWait(message.getMessage()));
-            return false;
-        }
-        return true;
-    }
-
-    public BooleanProperty fontOverrideProperty() {
-        return fontOverrideProperty;
-    }
-
-    public StringProperty fontSizeProperty() {
-        return fontSizeProperty;
-    }
-
-    public BooleanProperty themeLightProperty() {
-        return themeLightProperty;
-    }
-
-    public BooleanProperty themeDarkProperty() {
-        return themeDarkProperty;
-    }
-
-    public BooleanProperty customThemeProperty() {
-        return themeCustomProperty;
-    }
-
-    public StringProperty customPathToThemeProperty() {
-        return customPathToThemeProperty;
-    }
-
-    public void importCSSFile() {
-        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
-                .addExtensionFilter(StandardFileType.CSS)
-                .withDefaultExtension(StandardFileType.CSS)
-                .withInitialDirectory(preferences.getInternalPreferences().getLastPreferencesExportPath()).build();
-
-        dialogService.showFileOpenDialog(fileDialogConfiguration).ifPresent(file ->
-                customPathToThemeProperty.setValue(file.toAbsolutePath().toString()));
-    }
-}
diff --git a/src/main/java/org/jabref/gui/preferences/autocompletion/AutoCompletionTab.fxml b/src/main/java/org/jabref/gui/preferences/autocompletion/AutoCompletionTab.fxml
new file mode 100644
index 00000000000..d4f96a6178c
--- /dev/null
+++ b/src/main/java/org/jabref/gui/preferences/autocompletion/AutoCompletionTab.fxml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.CheckBox?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.RadioButton?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.control.ToggleGroup?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
+<fx:root spacing="10.0" type="VBox"
+         xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml"
+         fx:controller="org.jabref.gui.preferences.autocompletion.AutoCompletionTab">
+    <fx:define>
+        <ToggleGroup fx:id="nameFormat"/>
+        <ToggleGroup fx:id="firstNames"/>
+    </fx:define>
+
+    <Label styleClass="titleHeader" text="%Autocompletion"/>
+
+    <CheckBox fx:id="enableAutoComplete" text="%Use autocompletion"/>
+    <VBox spacing="10.0">
+        <HBox spacing="4.0">
+            <Label text="%Affected fields" disable="${!enableAutoComplete.selected}"/>
+            <TextField fx:id="autoCompleteFields" HBox.hgrow="ALWAYS" disable="${!enableAutoComplete.selected}">
+                <HBox.margin>
+                    <Insets top="-4.0"/>
+                </HBox.margin>
+            </TextField>
+        </HBox>
+        <Label text="%Name format" disable="${!enableAutoComplete.selected}"/>
+        <RadioButton fx:id="autoCompleteFirstLast" text="%Autocomplete names in 'Firstname Lastname' format only"
+                     toggleGroup="$nameFormat" disable="${!enableAutoComplete.selected}"/>
+        <RadioButton fx:id="autoCompleteLastFirst" text="%Autocomplete names in 'Lastname, Firstname' format only"
+                     toggleGroup="$nameFormat" disable="${!enableAutoComplete.selected}"/>
+        <RadioButton fx:id="autoCompleteBoth" text="%Autocomplete names in both formats"
+                     toggleGroup="$nameFormat" disable="${!enableAutoComplete.selected}"/>
+        <Label text="%First names" disable="${!enableAutoComplete.selected}"/>
+        <RadioButton fx:id="firstNameModeAbbreviated" text="%Use abbreviated firstname whenever possible"
+                     toggleGroup="$firstNames" disable="${!enableAutoComplete.selected}"/>
+        <RadioButton fx:id="firstNameModeFull" text="%Use full firstname whenever possible"
+                     toggleGroup="$firstNames" disable="${!enableAutoComplete.selected}"/>
+        <RadioButton fx:id="firstNameModeBoth" text="%Use abbreviated and full firstname"
+                     toggleGroup="$firstNames" disable="${!enableAutoComplete.selected}"/>
+        <padding>
+            <Insets left="20.0"/>
+        </padding>
+    </VBox>
+</fx:root>
diff --git a/src/main/java/org/jabref/gui/preferences/autocompletion/AutoCompletionTab.java b/src/main/java/org/jabref/gui/preferences/autocompletion/AutoCompletionTab.java
new file mode 100644
index 00000000000..119930370f4
--- /dev/null
+++ b/src/main/java/org/jabref/gui/preferences/autocompletion/AutoCompletionTab.java
@@ -0,0 +1,48 @@
+package org.jabref.gui.preferences.autocompletion;
+
+import javafx.fxml.FXML;
+import javafx.scene.control.CheckBox;
+import javafx.scene.control.RadioButton;
+import javafx.scene.control.TextField;
+
+import org.jabref.gui.preferences.AbstractPreferenceTabView;
+import org.jabref.gui.preferences.PreferencesTab;
+import org.jabref.logic.l10n.Localization;
+
+import com.airhacks.afterburner.views.ViewLoader;
+
+public class AutoCompletionTab extends AbstractPreferenceTabView<AutoCompletionTabViewModel> implements PreferencesTab {
+
+    @FXML private CheckBox enableAutoComplete;
+    @FXML private TextField autoCompleteFields;
+    @FXML private RadioButton autoCompleteFirstLast;
+    @FXML private RadioButton autoCompleteLastFirst;
+    @FXML private RadioButton autoCompleteBoth;
+    @FXML private RadioButton firstNameModeAbbreviated;
+    @FXML private RadioButton firstNameModeFull;
+    @FXML private RadioButton firstNameModeBoth;
+
+    public AutoCompletionTab() {
+        ViewLoader.view(this)
+                  .root(this)
+                  .load();
+    }
+
+    @Override
+    public String getTabName() {
+        return Localization.lang("Autocompletion");
+    }
+
+    public void initialize() {
+        viewModel = new AutoCompletionTabViewModel(preferencesService.getAutoCompletePreferences());
+
+        enableAutoComplete.selectedProperty().bindBidirectional(viewModel.enableAutoCompleteProperty());
+        autoCompleteFields.textProperty().bindBidirectional(viewModel.autoCompleteFieldsProperty());
+        autoCompleteFirstLast.selectedProperty().bindBidirectional(viewModel.autoCompleteFirstLastProperty());
+        autoCompleteLastFirst.selectedProperty().bindBidirectional(viewModel.autoCompleteLastFirstProperty());
+        autoCompleteBoth.selectedProperty().bindBidirectional(viewModel.autoCompleteBothProperty());
+        firstNameModeAbbreviated.selectedProperty().bindBidirectional(viewModel.firstNameModeAbbreviatedProperty());
+        firstNameModeFull.selectedProperty().bindBidirectional(viewModel.firstNameModeFullProperty());
+        firstNameModeBoth.selectedProperty().bindBidirectional(viewModel.firstNameModeBothProperty());
+    }
+}
diff --git a/src/main/java/org/jabref/gui/preferences/autocompletion/AutoCompletionTabViewModel.java b/src/main/java/org/jabref/gui/preferences/autocompletion/AutoCompletionTabViewModel.java
new file mode 100644
index 00000000000..8b9b6633f6e
--- /dev/null
+++ b/src/main/java/org/jabref/gui/preferences/autocompletion/AutoCompletionTabViewModel.java
@@ -0,0 +1,124 @@
+package org.jabref.gui.preferences.autocompletion;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+
+import org.jabref.gui.autocompleter.AutoCompleteFirstNameMode;
+import org.jabref.gui.autocompleter.AutoCompletePreferences;
+import org.jabref.gui.preferences.PreferenceTabViewModel;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.model.entry.field.FieldFactory;
+
+public class AutoCompletionTabViewModel implements PreferenceTabViewModel {
+
+    private final BooleanProperty enableAutoCompleteProperty = new SimpleBooleanProperty();
+    private final StringProperty autoCompleteFieldsProperty = new SimpleStringProperty();
+    private final BooleanProperty autoCompleteFirstLastProperty = new SimpleBooleanProperty();
+    private final BooleanProperty autoCompleteLastFirstProperty = new SimpleBooleanProperty();
+    private final BooleanProperty autoCompleteBothProperty = new SimpleBooleanProperty();
+    private final BooleanProperty firstNameModeAbbreviatedProperty = new SimpleBooleanProperty();
+    private final BooleanProperty firstNameModeFullProperty = new SimpleBooleanProperty();
+    private final BooleanProperty firstNameModeBothProperty = new SimpleBooleanProperty();
+
+    private final AutoCompletePreferences autoCompletePreferences;
+
+    private final List<String> restartWarnings = new ArrayList<>();
+
+    public AutoCompletionTabViewModel(AutoCompletePreferences autoCompletePreferences) {
+        this.autoCompletePreferences = autoCompletePreferences;
+    }
+
+    @Override
+    public void setValues() {
+        enableAutoCompleteProperty.setValue(autoCompletePreferences.shouldAutoComplete());
+        autoCompleteFieldsProperty.setValue(autoCompletePreferences.getCompleteNamesAsString());
+
+        if (autoCompletePreferences.getNameFormat() == AutoCompletePreferences.NameFormat.FIRST_LAST) {
+            autoCompleteFirstLastProperty.setValue(true);
+        } else if (autoCompletePreferences.getNameFormat() == AutoCompletePreferences.NameFormat.LAST_FIRST) {
+            autoCompleteLastFirstProperty.setValue(true);
+        } else {
+            autoCompleteBothProperty.setValue(true);
+        }
+
+        switch (autoCompletePreferences.getFirstNameMode()) {
+            case ONLY_ABBREVIATED -> firstNameModeAbbreviatedProperty.setValue(true);
+            case ONLY_FULL -> firstNameModeFullProperty.setValue(true);
+            default -> firstNameModeBothProperty.setValue(true);
+        }
+    }
+
+    @Override
+    public void storeSettings() {
+        autoCompletePreferences.setAutoComplete(enableAutoCompleteProperty.getValue());
+
+        if (autoCompleteBothProperty.getValue()) {
+            autoCompletePreferences.setNameFormat(AutoCompletePreferences.NameFormat.BOTH);
+        } else if (autoCompleteFirstLastProperty.getValue()) {
+            autoCompletePreferences.setNameFormat(AutoCompletePreferences.NameFormat.FIRST_LAST);
+        } else if (autoCompleteLastFirstProperty.getValue()) {
+            autoCompletePreferences.setNameFormat(AutoCompletePreferences.NameFormat.LAST_FIRST);
+        }
+
+        if (firstNameModeBothProperty.getValue()) {
+            autoCompletePreferences.setFirstNameMode(AutoCompleteFirstNameMode.BOTH);
+        } else if (firstNameModeAbbreviatedProperty.getValue()) {
+            autoCompletePreferences.setFirstNameMode(AutoCompleteFirstNameMode.ONLY_ABBREVIATED);
+        } else if (firstNameModeFullProperty.getValue()) {
+            autoCompletePreferences.setFirstNameMode(AutoCompleteFirstNameMode.ONLY_FULL);
+        }
+
+        if (autoCompletePreferences.shouldAutoComplete() != enableAutoCompleteProperty.getValue()) {
+            if (enableAutoCompleteProperty.getValue()) {
+                restartWarnings.add(Localization.lang("Auto complete enabled."));
+            } else {
+                restartWarnings.add(Localization.lang("Auto complete disabled."));
+            }
+        }
+
+        autoCompletePreferences.getCompleteFields().clear();
+        autoCompletePreferences.getCompleteFields().addAll(FieldFactory.parseFieldList(autoCompleteFieldsProperty.getValue()));
+    }
+
+    @Override
+    public List<String> getRestartWarnings() {
+        return restartWarnings;
+    }
+
+    public BooleanProperty enableAutoCompleteProperty() {
+        return enableAutoCompleteProperty;
+    }
+
+    public StringProperty autoCompleteFieldsProperty() {
+        return autoCompleteFieldsProperty;
+    }
+
+    public BooleanProperty autoCompleteFirstLastProperty() {
+        return autoCompleteFirstLastProperty;
+    }
+
+    public BooleanProperty autoCompleteLastFirstProperty() {
+        return autoCompleteLastFirstProperty;
+    }
+
+    public BooleanProperty autoCompleteBothProperty() {
+        return autoCompleteBothProperty;
+    }
+
+    public BooleanProperty firstNameModeAbbreviatedProperty() {
+        return firstNameModeAbbreviatedProperty;
+    }
+
+    public BooleanProperty firstNameModeFullProperty() {
+        return firstNameModeFullProperty;
+    }
+
+    public BooleanProperty firstNameModeBothProperty() {
+        return firstNameModeBothProperty;
+    }
+}
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 f7f103f6144..5f14bd5247e 100644
--- a/src/main/java/org/jabref/gui/preferences/citationkeypattern/CitationKeyPatternTab.java
+++ b/src/main/java/org/jabref/gui/preferences/citationkeypattern/CitationKeyPatternTab.java
@@ -60,14 +60,14 @@ 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, dialogService), keyPatternHelp);
+        actionFactory.configureIconButton(StandardActions.HELP_KEY_PATTERNS, new HelpAction(HelpFile.CITATION_KEY_PATTERN, dialogService, preferencesService.getFilePreferences()), keyPatternHelp);
     }
 
     @Override
     public void setValues() {
         viewModel.setValues();
         bibtexKeyPatternTable.setValues(
-                Globals.entryTypesManager.getAllTypes(preferencesService.getGeneralPreferences().getDefaultBibDatabaseMode()),
+                Globals.entryTypesManager.getAllTypes(preferencesService.getLibraryPreferences().getDefaultBibDatabaseMode()),
                 preferencesService.getCitationKeyPatternPreferences().getKeyPattern());
     }
 
diff --git a/src/main/java/org/jabref/gui/preferences/customentrytypes/CustomEntryTypesTab.java b/src/main/java/org/jabref/gui/preferences/customentrytypes/CustomEntryTypesTab.java
index 8a68708a785..02317d97885 100644
--- a/src/main/java/org/jabref/gui/preferences/customentrytypes/CustomEntryTypesTab.java
+++ b/src/main/java/org/jabref/gui/preferences/customentrytypes/CustomEntryTypesTab.java
@@ -2,6 +2,7 @@
 
 import javafx.application.Platform;
 import javafx.beans.property.ReadOnlyStringWrapper;
+import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
 import javafx.scene.Group;
 import javafx.scene.control.Button;
@@ -12,6 +13,7 @@
 import javafx.scene.control.TableView;
 import javafx.scene.control.TextField;
 import javafx.scene.control.cell.CheckBoxTableCell;
+import javafx.scene.control.cell.TextFieldTableCell;
 import javafx.scene.input.ClipboardContent;
 import javafx.scene.input.DragEvent;
 import javafx.scene.input.Dragboard;
@@ -73,7 +75,7 @@ public String getTabName() {
 
     public void initialize() {
         BibDatabaseMode mode = stateManager.getActiveDatabase().map(BibDatabaseContext::getMode)
-                                           .orElse(preferencesService.getGeneralPreferences().getDefaultBibDatabaseMode());
+                                           .orElse(preferencesService.getLibraryPreferences().getDefaultBibDatabaseMode());
         BibEntryTypesManager entryTypesRepository = preferencesService.getCustomEntryTypesRepository();
 
         this.viewModel = new CustomEntryTypesTabViewModel(mode, entryTypesRepository, dialogService, preferencesService);
@@ -113,7 +115,7 @@ private void setupEntryTypesTable() {
                 })
                 .withTooltip((type, name) -> {
                     if (type instanceof CustomEntryTypeViewModel) {
-                        return (Localization.lang("Remove entry type") + " " + name);
+                        return Localization.lang("Remove entry type") + " " + name;
                     } else {
                         return null;
                     }
@@ -142,7 +144,32 @@ private void setupEntryTypesTable() {
     }
 
     private void setupFieldsTable() {
-        fieldNameColumn.setCellValueFactory(item -> item.getValue().nameProperty());
+        fieldNameColumn.setCellValueFactory(item -> item.getValue().displayNameProperty());
+        fieldNameColumn.setCellFactory(TextFieldTableCell.forTableColumn());
+        fieldNameColumn.setEditable(true);
+        fieldNameColumn.setOnEditCommit((TableColumn.CellEditEvent<FieldViewModel, String> event) -> {
+            String newDisplayName = event.getNewValue();
+            if (newDisplayName.isBlank()) {
+                dialogService.notify(Localization.lang("Name cannot be empty"));
+                event.getTableView().edit(-1, null);
+                event.getTableView().refresh();
+                return;
+            }
+
+            FieldViewModel fieldViewModel = event.getRowValue();
+            String currentDisplayName = fieldViewModel.displayNameProperty().getValue();
+            EntryTypeViewModel selectedEntryType = viewModel.selectedEntryTypeProperty().get();
+            ObservableList<FieldViewModel> entryFields = selectedEntryType.fields();
+            // The first predicate will check if the user input the original field name or doesn't edit anything after double click
+            boolean fieldExists = !newDisplayName.equals(currentDisplayName) && viewModel.displayNameExists(newDisplayName);
+            if (fieldExists) {
+                dialogService.notify(Localization.lang("Unable to change field name. \"%0\" already in use.", newDisplayName));
+                event.getTableView().edit(-1, null);
+            } else {
+                fieldViewModel.displayNameProperty().setValue(newDisplayName);
+            }
+            event.getTableView().refresh();
+        });
 
         fieldTypeColumn.setCellFactory(CheckBoxTableCell.forTableColumn(fieldTypeColumn));
         fieldTypeColumn.setCellValueFactory(item -> item.getValue().requiredProperty());
@@ -155,7 +182,7 @@ private void setupFieldsTable() {
         fieldTypeActionColumn.setSortable(false);
         fieldTypeActionColumn.setReorderable(false);
         fieldTypeActionColumn.setEditable(false);
-        fieldTypeActionColumn.setCellValueFactory(cellData -> cellData.getValue().nameProperty());
+        fieldTypeActionColumn.setCellValueFactory(cellData -> cellData.getValue().displayNameProperty());
 
         new ValueTableCellFactory<FieldViewModel, String>()
                 .withGraphic(item -> IconTheme.JabRefIcons.DELETE_ENTRY.getGraphicNode())
diff --git a/src/main/java/org/jabref/gui/preferences/customentrytypes/CustomEntryTypesTabViewModel.java b/src/main/java/org/jabref/gui/preferences/customentrytypes/CustomEntryTypesTabViewModel.java
index 2425383e126..08cd62c0ec4 100644
--- a/src/main/java/org/jabref/gui/preferences/customentrytypes/CustomEntryTypesTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/customentrytypes/CustomEntryTypesTabViewModel.java
@@ -45,7 +45,7 @@ public class CustomEntryTypesTabViewModel implements PreferenceTabViewModel {
     private final ObjectProperty<EntryTypeViewModel> selectedEntryType = new SimpleObjectProperty<>();
     private final StringProperty entryTypeToAdd = new SimpleStringProperty("");
     private final ObjectProperty<Field> newFieldToAdd = new SimpleObjectProperty<>();
-    private final ObservableList<EntryTypeViewModel> entryTypesWithFields = FXCollections.observableArrayList(extractor -> new Observable[] {extractor.entryType(), extractor.fields()});
+    private final ObservableList<EntryTypeViewModel> entryTypesWithFields = FXCollections.observableArrayList(extractor -> new Observable[]{extractor.entryType(), extractor.fields()});
     private final List<BibEntryType> entryTypesToDelete = new ArrayList<>();
 
     private final PreferencesService preferencesService;
@@ -57,7 +57,7 @@ public class CustomEntryTypesTabViewModel implements PreferenceTabViewModel {
     private final Validator fieldValidator;
     private final Set<Field> multiLineFields = new HashSet<>();
 
-    Predicate<Field> isMultiline = (field) -> this.multiLineFields.contains(field) || field.getProperties().contains(FieldProperty.MULTILINE_TEXT);
+    Predicate<Field> isMultiline = field -> this.multiLineFields.contains(field) || field.getProperties().contains(FieldProperty.MULTILINE_TEXT);
 
     public CustomEntryTypesTabViewModel(BibDatabaseMode mode,
                                         BibEntryTypesManager entryTypesManager,
@@ -68,7 +68,7 @@ public CustomEntryTypesTabViewModel(BibDatabaseMode mode,
         this.dialogService = dialogService;
         this.bibDatabaseMode = mode;
 
-        this.multiLineFields.addAll(preferencesService.getFieldContentParserPreferences().getNonWrappableFields());
+        this.multiLineFields.addAll(preferencesService.getFieldPreferences().getNonWrappableFields());
 
         entryTypeValidator = new FunctionBasedValidator<>(
                 entryTypeToAdd,
@@ -76,12 +76,13 @@ public CustomEntryTypesTabViewModel(BibDatabaseMode mode,
                 ValidationMessage.error(Localization.lang("Entry type cannot be empty. Please enter a name.")));
         fieldValidator = new FunctionBasedValidator<>(
                 newFieldToAdd,
-                input -> input != null && StringUtil.isNotBlank(input.getDisplayName()),
+                input -> (input != null) && StringUtil.isNotBlank(input.getDisplayName()),
                 ValidationMessage.error(Localization.lang("Field cannot be empty. Please enter a name.")));
     }
 
+    @Override
     public void setValues() {
-        if (this.entryTypesWithFields.size() > 0) {
+        if (!this.entryTypesWithFields.isEmpty()) {
             this.entryTypesWithFields.clear();
         }
         Collection<BibEntryType> allTypes = entryTypesManager.getAllTypes(bibDatabaseMode);
@@ -97,6 +98,7 @@ public void setValues() {
         }
     }
 
+    @Override
     public void storeSettings() {
         Set<Field> multilineFields = new HashSet<>();
         for (EntryTypeViewModel typeViewModel : entryTypesWithFields) {
@@ -105,12 +107,12 @@ public void storeSettings() {
 
             multilineFields.addAll(allFields.stream()
                                             .filter(FieldViewModel::isMultiline)
-                                            .map(FieldViewModel::getField)
+                                            .map(FieldViewModel::toField)
                                             .toList());
 
             List<OrFields> required = allFields.stream()
                                                .filter(FieldViewModel::isRequired)
-                                               .map(FieldViewModel::getField)
+                                               .map(FieldViewModel::toField)
                                                .map(OrFields::new)
                                                .collect(Collectors.toList());
             List<BibField> fields = allFields.stream().map(FieldViewModel::toBibField).collect(Collectors.toList());
@@ -123,10 +125,7 @@ public void storeSettings() {
             entryTypesManager.removeCustomOrModifiedEntryType(entryType, bibDatabaseMode);
         }
 
-        preferencesService.getImportExportPreferences().setNonWrappableFields(
-                multilineFields.stream()
-                               .map(Field::getDisplayName)
-                               .collect(Collectors.joining(";")));
+        preferencesService.getFieldPreferences().setNonWrappableFields(multilineFields);
         preferencesService.storeCustomEntryTypesRepository(entryTypesManager);
     }
 
@@ -147,24 +146,28 @@ public void removeEntryType(EntryTypeViewModel focusedItem) {
 
     public void addNewField() {
         Field field = newFieldToAdd.getValue();
-        ObservableList<FieldViewModel> entryFields = this.selectedEntryType.getValue().fields();
-        boolean fieldExists = entryFields.stream().anyMatch(fieldViewModel ->
-                fieldViewModel.nameProperty().getValue().equals(field.getDisplayName()));
+        boolean fieldExists = displayNameExists(field.getDisplayName());
 
-        if (!fieldExists) {
+        if (fieldExists) {
+            dialogService.showWarningDialogAndWait(
+                    Localization.lang("Duplicate fields"),
+                    Localization.lang("Warning: You added field \"%0\" twice. Only one will be kept.", field.getDisplayName()));
+        } else {
             this.selectedEntryType.getValue().addField(new FieldViewModel(
                     field,
                     FieldViewModel.Mandatory.REQUIRED,
                     FieldPriority.IMPORTANT,
                     false));
-        } else {
-            dialogService.showWarningDialogAndWait(
-                    Localization.lang("Duplicate fields"),
-                    Localization.lang("Warning: You added field \"%0\" twice. Only one will be kept.", field.getDisplayName()));
         }
         newFieldToAddProperty().setValue(null);
     }
 
+    public boolean displayNameExists(String displayName) {
+        ObservableList<FieldViewModel> entryFields = this.selectedEntryType.getValue().fields();
+        return entryFields.stream().anyMatch(fieldViewModel ->
+                fieldViewModel.displayNameProperty().getValue().equals(displayName));
+    }
+
     public void removeField(FieldViewModel focusedItem) {
         selectedEntryType.getValue().removeField(focusedItem);
     }
diff --git a/src/main/java/org/jabref/gui/preferences/customentrytypes/EntryTypeViewModel.java b/src/main/java/org/jabref/gui/preferences/customentrytypes/EntryTypeViewModel.java
index db001559d44..11c99161151 100644
--- a/src/main/java/org/jabref/gui/preferences/customentrytypes/EntryTypeViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/customentrytypes/EntryTypeViewModel.java
@@ -22,14 +22,13 @@ public class EntryTypeViewModel {
 
     public EntryTypeViewModel(BibEntryType entryType, Predicate<Field> isMultiline) {
         this.entryType.set(entryType);
-
         List<FieldViewModel> allFieldsForType = entryType.getAllBibFields()
                        .stream().map(bibField -> new FieldViewModel(bibField.field(),
                                    entryType.isRequired(bibField.field()) ? Mandatory.REQUIRED : Mandatory.OPTIONAL,
                                    bibField.priority(),
                                    isMultiline.test(bibField.field())))
                                                  .collect(Collectors.toList());
-        fields = FXCollections.observableArrayList((allFieldsForType));
+        fields = FXCollections.observableArrayList(allFieldsForType);
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/preferences/customentrytypes/FieldViewModel.java b/src/main/java/org/jabref/gui/preferences/customentrytypes/FieldViewModel.java
index 0cfae0c826d..2894d83f681 100644
--- a/src/main/java/org/jabref/gui/preferences/customentrytypes/FieldViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/customentrytypes/FieldViewModel.java
@@ -10,15 +10,13 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.field.BibField;
 import org.jabref.model.entry.field.Field;
+import org.jabref.model.entry.field.FieldFactory;
 import org.jabref.model.entry.field.FieldPriority;
 import org.jabref.model.entry.field.FieldProperty;
 
-import com.tobiasdiez.easybind.EasyBind;
-
 public class FieldViewModel {
 
-    private final Field field;
-    private final StringProperty fieldName = new SimpleStringProperty("");
+    private final StringProperty displayName = new SimpleStringProperty("");
     private final BooleanProperty required = new SimpleBooleanProperty();
     private final BooleanProperty multiline = new SimpleBooleanProperty();
     private final ObjectProperty<FieldPriority> priorityProperty = new SimpleObjectProperty<>();
@@ -27,27 +25,14 @@ public FieldViewModel(Field field,
                           Mandatory required,
                           FieldPriority priorityProperty,
                           boolean multiline) {
-        this.field = field;
-        this.fieldName.setValue(field.getDisplayName());
+        this.displayName.setValue(field.getDisplayName());
         this.required.setValue(required == Mandatory.REQUIRED);
         this.priorityProperty.setValue(priorityProperty);
         this.multiline.setValue(multiline);
-
-        EasyBind.subscribe(this.multiline, multi -> {
-            if (multi) {
-                this.field.getProperties().add(FieldProperty.MULTILINE_TEXT);
-            } else {
-                this.field.getProperties().remove(FieldProperty.MULTILINE_TEXT);
-            }
-        });
-    }
-
-    public Field getField() {
-        return field;
     }
 
-    public StringProperty nameProperty() {
-        return fieldName;
+    public StringProperty displayNameProperty() {
+        return displayName;
     }
 
     public BooleanProperty requiredProperty() {
@@ -70,17 +55,26 @@ public FieldPriority getPriority() {
         return priorityProperty.getValue();
     }
 
+    public Field toField() {
+        // If the field name is known by JabRef, JabRef's casing will win.
+        // If the field is not known by JabRef (UnknownField), the new casing will be taken.
+        Field field = FieldFactory.parseField(displayName.getValue());
+        if (multiline.getValue()) {
+            field.getProperties().add(FieldProperty.MULTILINE_TEXT);
+        }
+        return field;
+    }
+
     public BibField toBibField() {
-        return new BibField(field, priorityProperty.getValue());
+        return new BibField(toField(), priorityProperty.getValue());
     }
 
     @Override
     public String toString() {
-        return field.getDisplayName();
+        return displayName.getValue();
     }
 
     public enum Mandatory {
-
         REQUIRED(Localization.lang("Required")),
         OPTIONAL(Localization.lang("Optional"));
 
diff --git a/src/main/java/org/jabref/gui/preferences/customexporter/CustomExporterTab.fxml b/src/main/java/org/jabref/gui/preferences/customexporter/CustomExporterTab.fxml
index d1443be12e0..504d4adbb7f 100644
--- a/src/main/java/org/jabref/gui/preferences/customexporter/CustomExporterTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/customexporter/CustomExporterTab.fxml
@@ -6,6 +6,7 @@
 <?import javafx.scene.control.TableView?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
+<?import org.jabref.gui.icon.JabRefIconView?>
 <fx:root spacing="10.0" type="VBox"
          xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml"
          fx:controller="org.jabref.gui.preferences.customexporter.CustomExporterTab">
@@ -24,8 +25,20 @@
     </TableView>
 
     <HBox alignment="BASELINE_RIGHT" spacing="10.0">
-        <Button onAction="#add" text="%Add" prefWidth="80.0"/>
-        <Button onAction="#modify" text="%Modify" prefWidth="80.0"/>
-        <Button onAction="#remove" text="%Remove" prefWidth="80.0"/>
+        <Button onAction="#add" text="%Add" prefWidth="100.0">
+            <graphic>
+                <JabRefIconView glyph="ADD_NOBOX"/>
+            </graphic>
+        </Button>
+        <Button onAction="#modify" text="%Modify" prefWidth="100.0">
+            <graphic>
+                <JabRefIconView glyph="EDIT"/>
+            </graphic>
+        </Button>
+        <Button onAction="#remove" text="%Remove" prefWidth="100.0">
+            <graphic>
+                <JabRefIconView glyph="REMOVE_NOBOX"/>
+            </graphic>
+        </Button>
     </HBox>
 </fx:root>
diff --git a/src/main/java/org/jabref/gui/preferences/customexporter/CustomExporterTab.java b/src/main/java/org/jabref/gui/preferences/customexporter/CustomExporterTab.java
index 7d5f40b6e49..883e7faf5c9 100644
--- a/src/main/java/org/jabref/gui/preferences/customexporter/CustomExporterTab.java
+++ b/src/main/java/org/jabref/gui/preferences/customexporter/CustomExporterTab.java
@@ -8,12 +8,10 @@
 import org.jabref.gui.exporter.ExporterViewModel;
 import org.jabref.gui.preferences.AbstractPreferenceTabView;
 import org.jabref.gui.preferences.PreferencesTab;
-import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.l10n.Localization;
 
 import com.airhacks.afterburner.views.ViewLoader;
 import com.tobiasdiez.easybind.EasyBind;
-import jakarta.inject.Inject;
 
 public class CustomExporterTab extends AbstractPreferenceTabView<CustomExporterTabViewModel> implements PreferencesTab {
 
@@ -22,8 +20,6 @@ public class CustomExporterTab extends AbstractPreferenceTabView<CustomExporterT
     @FXML private TableColumn<ExporterViewModel, String> layoutColumn;
     @FXML private TableColumn<ExporterViewModel, String> extensionColumn;
 
-    @Inject private JournalAbbreviationRepository repository;
-
     public CustomExporterTab() {
         ViewLoader.view(this)
                   .root(this)
@@ -37,7 +33,7 @@ public String getTabName() {
 
     @FXML
     private void initialize() {
-        viewModel = new CustomExporterTabViewModel(preferencesService, dialogService, repository);
+        viewModel = new CustomExporterTabViewModel(preferencesService, dialogService);
 
         exporterTable.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);
         exporterTable.itemsProperty().bind(viewModel.exportersProperty());
diff --git a/src/main/java/org/jabref/gui/preferences/customexporter/CustomExporterTabViewModel.java b/src/main/java/org/jabref/gui/preferences/customexporter/CustomExporterTabViewModel.java
index 11a85fad59b..fea81d07b09 100644
--- a/src/main/java/org/jabref/gui/preferences/customexporter/CustomExporterTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/customexporter/CustomExporterTabViewModel.java
@@ -13,7 +13,6 @@
 import org.jabref.gui.exporter.ExporterViewModel;
 import org.jabref.gui.preferences.PreferenceTabViewModel;
 import org.jabref.logic.exporter.TemplateExporter;
-import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.preferences.PreferencesService;
 
 public class CustomExporterTabViewModel implements PreferenceTabViewModel {
@@ -23,17 +22,16 @@ public class CustomExporterTabViewModel implements PreferenceTabViewModel {
 
     private final PreferencesService preferences;
     private final DialogService dialogService;
-    private final JournalAbbreviationRepository repository;
 
-    public CustomExporterTabViewModel(PreferencesService preferences, DialogService dialogService, JournalAbbreviationRepository repository) {
+    public CustomExporterTabViewModel(PreferencesService preferences, DialogService dialogService) {
         this.preferences = preferences;
         this.dialogService = dialogService;
-        this.repository = repository;
     }
 
     @Override
     public void setValues() {
-        List<TemplateExporter> exportersLogic = preferences.getCustomExportFormats(repository);
+        List<TemplateExporter> exportersLogic = preferences.getExportPreferences().getCustomExporters();
+        exporters.clear();
         for (TemplateExporter exporter : exportersLogic) {
             exporters.add(new ExporterViewModel(exporter));
         }
@@ -44,7 +42,7 @@ public void storeSettings() {
         List<TemplateExporter> exportersLogic = exporters.stream()
                                                          .map(ExporterViewModel::getLogic)
                                                          .collect(Collectors.toList());
-        preferences.storeCustomExportFormats(exportersLogic);
+        preferences.getExportPreferences().setCustomExporters(exportersLogic);
     }
 
     public void addExporter() {
diff --git a/src/main/java/org/jabref/gui/preferences/customimporter/CustomImporterTab.fxml b/src/main/java/org/jabref/gui/preferences/customimporter/CustomImporterTab.fxml
index 2420d7b4c59..bddf9d4ed68 100644
--- a/src/main/java/org/jabref/gui/preferences/customimporter/CustomImporterTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/customimporter/CustomImporterTab.fxml
@@ -6,6 +6,7 @@
 <?import javafx.scene.control.TableView?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
+<?import org.jabref.gui.icon.JabRefIconView?>
 <fx:root spacing="10.0" type="VBox"
          xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml"
          fx:controller="org.jabref.gui.preferences.customimporter.CustomImporterTab">
@@ -24,7 +25,15 @@
     </TableView>
 
     <HBox alignment="BASELINE_RIGHT" spacing="10.0">
-        <Button fx:id="addButton" onAction="#add" text="%Add" prefWidth="80.0"/>
-        <Button onAction="#remove" text="%Remove" prefWidth="80.0"/>
+        <Button fx:id="addButton" onAction="#add" text="%Add" prefWidth="100.0">
+            <graphic>
+                <JabRefIconView glyph="ADD_NOBOX"/>
+            </graphic>
+        </Button>
+        <Button onAction="#remove" text="%Remove" prefWidth="100.0">
+            <graphic>
+                <JabRefIconView glyph="REMOVE_NOBOX"/>
+            </graphic>
+        </Button>
     </HBox>
 </fx:root>
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 2f8065d5615..f7f86004674 100644
--- a/src/main/java/org/jabref/gui/preferences/customimporter/CustomImporterTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/customimporter/CustomImporterTabViewModel.java
@@ -12,10 +12,10 @@
 import javafx.collections.FXCollections;
 
 import org.jabref.gui.DialogService;
-import org.jabref.gui.Globals;
 import org.jabref.gui.importer.ImporterViewModel;
 import org.jabref.gui.preferences.PreferenceTabViewModel;
 import org.jabref.gui.util.FileDialogConfiguration;
+import org.jabref.logic.importer.ImportException;
 import org.jabref.logic.importer.fileformat.CustomImporter;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.StandardFileType;
@@ -42,7 +42,8 @@ public CustomImporterTabViewModel(PreferencesService preferences, DialogService
 
     @Override
     public void setValues() {
-        Set<CustomImporter> importersLogic = preferences.getImporterPreferences().getCustomImportList();
+        Set<CustomImporter> importersLogic = preferences.getImporterPreferences().getCustomImporters();
+        importers.clear();
         for (CustomImporter importer : importersLogic) {
             importers.add(new ImporterViewModel(importer));
         }
@@ -50,14 +51,9 @@ public void setValues() {
 
     @Override
     public void storeSettings() {
-        preferences.getImporterPreferences().getCustomImportList().clear();
-        preferences.getImporterPreferences().getCustomImportList().addAll(importers.stream()
-                                                                                   .map(ImporterViewModel::getLogic)
-                                                                                   .collect(Collectors.toSet()));
-        Globals.IMPORT_FORMAT_READER.resetImportFormats(
-                preferences.getImporterPreferences(),
-                preferences.getImportFormatPreferences(),
-                Globals.getFileUpdateMonitor());
+        preferences.getImporterPreferences().setCustomImporters(importers.stream()
+                                                                         .map(ImporterViewModel::getLogic)
+                                                                         .collect(Collectors.toSet()));
     }
 
     /**
@@ -90,7 +86,7 @@ public void addImporter() {
 
         if (selectedFile.isPresent() && (selectedFile.get().getParent() != null)) {
             boolean isArchive = FileUtil.getFileExtension(selectedFile.get())
-                                        .filter(extension -> extension.equalsIgnoreCase("jar") || extension.equalsIgnoreCase("zip"))
+                                        .filter(extension -> "jar".equalsIgnoreCase(extension) || "zip".equalsIgnoreCase(extension))
                                         .isPresent();
 
             if (isArchive) {
@@ -108,7 +104,7 @@ public void addImporter() {
                             Localization.lang("Could not open %0", selectedFile.get().toString()) + "\n"
                                     + Localization.lang("Have you chosen the correct package path?"),
                             exc);
-                } catch (ClassNotFoundException exc) {
+                } catch (ImportException exc) {
                     LOGGER.error("Could not instantiate importer", exc);
                     dialogService.showErrorDialogAndWait(
                             Localization.lang("Could not instantiate %0 %1", "importer"),
diff --git a/src/main/java/org/jabref/gui/preferences/entry/EntryTab.fxml b/src/main/java/org/jabref/gui/preferences/entry/EntryTab.fxml
index 81028a987d1..11c73f9d9e1 100644
--- a/src/main/java/org/jabref/gui/preferences/entry/EntryTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/entry/EntryTab.fxml
@@ -1,5 +1,6 @@
 <?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?>
@@ -12,9 +13,30 @@
          fx:controller="org.jabref.gui.preferences.entry.EntryTab">
     <Label styleClass="titleHeader" text="%Entry"/>
 
-    <HBox spacing="4" alignment="CENTER_LEFT">
+    <Label styleClass="sectionHeader" text="%Field"/>
+
+    <HBox spacing="4.0" alignment="BASELINE_LEFT">
         <Label text="%Keyword separator"/>
-        <TextField fx:id="keywordSeparator" minWidth="30.0" maxWidth="30.0"/>
+        <TextField fx:id="keywordSeparator" minWidth="30.0" maxWidth="30.0" alignment="CENTER"/>
+    </HBox>
+
+    <CheckBox fx:id="resolveStrings" text="%Resolve BibTeX strings"/>
+    <HBox alignment="CENTER_LEFT" spacing="10.0">
+        <Label text="%Affected fields"/>
+        <TextField fx:id="resolveStringsForFields" HBox.hgrow="ALWAYS"
+                   disable="${!resolveStrings.selected}">
+            <HBox.margin>
+                <Insets top="-4.0"/>
+            </HBox.margin>
+        </TextField>
+        <padding>
+            <Insets left="20.0"/>
+        </padding>
+    </HBox>
+
+    <HBox alignment="CENTER_LEFT" spacing="10.0">
+        <Label text="%Do not wrap when saving"/>
+        <TextField fx:id="nonWrappableFields" HBox.hgrow="ALWAYS"/>
     </HBox>
 
     <Label styleClass="sectionHeader" text="%Entry owner"/>
diff --git a/src/main/java/org/jabref/gui/preferences/entry/EntryTab.java b/src/main/java/org/jabref/gui/preferences/entry/EntryTab.java
index 31fc50f0521..f92088ad6ea 100644
--- a/src/main/java/org/jabref/gui/preferences/entry/EntryTab.java
+++ b/src/main/java/org/jabref/gui/preferences/entry/EntryTab.java
@@ -19,8 +19,14 @@
 
 public class EntryTab extends AbstractPreferenceTabView<EntryTabViewModel> implements PreferencesTab {
 
+
+
     @FXML private TextField keywordSeparator;
 
+    @FXML private CheckBox resolveStrings;
+    @FXML private TextField resolveStringsForFields;
+    @FXML private TextField nonWrappableFields;
+
     @FXML private CheckBox markOwner;
     @FXML private TextField markOwnerName;
     @FXML private CheckBox markOwnerOverwrite;
@@ -38,13 +44,14 @@ public EntryTab() {
     }
 
     public void initialize() {
-        this.viewModel = new EntryTabViewModel(
-                preferencesService.getBibEntryPreferences(),
-                preferencesService.getOwnerPreferences(),
-                preferencesService.getTimestampPreferences());
+        this.viewModel = new EntryTabViewModel(preferencesService);
 
         keywordSeparator.textProperty().bindBidirectional(viewModel.keywordSeparatorProperty());
 
+        resolveStrings.selectedProperty().bindBidirectional(viewModel.resolveStringsProperty());
+        resolveStringsForFields.textProperty().bindBidirectional(viewModel.resolveStringsForFieldsProperty());
+        nonWrappableFields.textProperty().bindBidirectional(viewModel.nonWrappableFieldsProperty());
+
         markOwner.selectedProperty().bindBidirectional(viewModel.markOwnerProperty());
         markOwnerName.textProperty().bindBidirectional(viewModel.markOwnerNameProperty());
         markOwnerName.disableProperty().bind(markOwner.selectedProperty().not());
@@ -55,7 +62,7 @@ public void initialize() {
         addModificationDate.selectedProperty().bindBidirectional(viewModel.addModificationDateProperty());
 
         ActionFactory actionFactory = new ActionFactory(keyBindingRepository);
-        actionFactory.configureIconButton(StandardActions.HELP, new HelpAction(HelpFile.OWNER, dialogService), markOwnerHelp);
+        actionFactory.configureIconButton(StandardActions.HELP, new HelpAction(HelpFile.OWNER, dialogService, preferencesService.getFilePreferences()), markOwnerHelp);
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/preferences/entry/EntryTabViewModel.java b/src/main/java/org/jabref/gui/preferences/entry/EntryTabViewModel.java
index 2bf37676ac5..feabcb4438c 100644
--- a/src/main/java/org/jabref/gui/preferences/entry/EntryTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/entry/EntryTabViewModel.java
@@ -6,33 +6,47 @@
 import javafx.beans.property.StringProperty;
 
 import org.jabref.gui.preferences.PreferenceTabViewModel;
+import org.jabref.logic.bibtex.FieldPreferences;
 import org.jabref.logic.preferences.OwnerPreferences;
 import org.jabref.logic.preferences.TimestampPreferences;
+import org.jabref.model.entry.field.FieldFactory;
 import org.jabref.preferences.BibEntryPreferences;
+import org.jabref.preferences.PreferencesService;
 
 public class EntryTabViewModel implements PreferenceTabViewModel {
 
     private final StringProperty keywordSeparatorProperty = new SimpleStringProperty("");
+
+    private final BooleanProperty resolveStringsProperty = new SimpleBooleanProperty();
+    private final StringProperty resolveStringsForFieldsProperty = new SimpleStringProperty("");
+    private final StringProperty nonWrappableFieldsProperty = new SimpleStringProperty("");
+
     private final BooleanProperty markOwnerProperty = new SimpleBooleanProperty();
     private final StringProperty markOwnerNameProperty = new SimpleStringProperty("");
     private final BooleanProperty markOwnerOverwriteProperty = new SimpleBooleanProperty();
     private final BooleanProperty addCreationDateProperty = new SimpleBooleanProperty();
     private final BooleanProperty addModificationDateProperty = new SimpleBooleanProperty();
 
+    private final FieldPreferences fieldPreferences;
     private final BibEntryPreferences bibEntryPreferences;
     private final OwnerPreferences ownerPreferences;
     private final TimestampPreferences timestampPreferences;
 
-    public EntryTabViewModel(BibEntryPreferences bibEntryPreferences, OwnerPreferences ownerPreferences, TimestampPreferences timestampPreferences) {
-        this.bibEntryPreferences = bibEntryPreferences;
-        this.ownerPreferences = ownerPreferences;
-        this.timestampPreferences = timestampPreferences;
+    public EntryTabViewModel(PreferencesService preferencesService) {
+        this.bibEntryPreferences = preferencesService.getBibEntryPreferences();
+        this.fieldPreferences = preferencesService.getFieldPreferences();
+        this.ownerPreferences = preferencesService.getOwnerPreferences();
+        this.timestampPreferences = preferencesService.getTimestampPreferences();
     }
 
     @Override
     public void setValues() {
         keywordSeparatorProperty.setValue(bibEntryPreferences.getKeywordSeparator().toString());
 
+        resolveStringsProperty.setValue(fieldPreferences.shouldResolveStrings());
+        resolveStringsForFieldsProperty.setValue(FieldFactory.serializeFieldsList(fieldPreferences.getResolvableFields()));
+        nonWrappableFieldsProperty.setValue(FieldFactory.serializeFieldsList(fieldPreferences.getNonWrappableFields()));
+
         markOwnerProperty.setValue(ownerPreferences.isUseOwner());
         markOwnerNameProperty.setValue(ownerPreferences.getDefaultOwner());
         markOwnerOverwriteProperty.setValue(ownerPreferences.isOverwriteOwner());
@@ -45,6 +59,10 @@ public void setValues() {
     public void storeSettings() {
         bibEntryPreferences.keywordSeparatorProperty().setValue(keywordSeparatorProperty.getValue().charAt(0));
 
+        fieldPreferences.setResolveStrings(resolveStringsProperty.getValue());
+        fieldPreferences.setResolvableFields(FieldFactory.parseFieldList(resolveStringsForFieldsProperty.getValue().trim()));
+        fieldPreferences.setNonWrappableFields(FieldFactory.parseFieldList(nonWrappableFieldsProperty.getValue().trim()));
+
         ownerPreferences.setUseOwner(markOwnerProperty.getValue());
         ownerPreferences.setDefaultOwner(markOwnerNameProperty.getValue());
         ownerPreferences.setOverwriteOwner(markOwnerOverwriteProperty.getValue());
@@ -57,6 +75,18 @@ public StringProperty keywordSeparatorProperty() {
         return keywordSeparatorProperty;
     }
 
+    public BooleanProperty resolveStringsProperty() {
+        return resolveStringsProperty;
+    }
+
+    public StringProperty resolveStringsForFieldsProperty() {
+        return resolveStringsForFieldsProperty;
+    }
+
+    public StringProperty nonWrappableFieldsProperty() {
+        return nonWrappableFieldsProperty;
+    }
+
     // Entry owner
 
     public BooleanProperty markOwnerProperty() {
diff --git a/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTab.fxml b/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTab.fxml
index 8d90f4b8c6d..373d531eb8d 100644
--- a/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTab.fxml
@@ -1,13 +1,15 @@
 <?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.RadioButton?>
-<?import javafx.scene.control.TextField?>
+<?import javafx.scene.control.TextArea?>
 <?import javafx.scene.control.ToggleGroup?>
+<?import javafx.scene.control.Tooltip?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
+<?import org.jabref.gui.icon.JabRefIconView?>
 <fx:root spacing="10.0" type="VBox"
          xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml"
          fx:controller="org.jabref.gui.preferences.entryeditor.EntryEditorTab">
@@ -19,6 +21,8 @@
 
     <CheckBox fx:id="openOnNewEntry" text="%Open editor when a new entry is created"/>
     <CheckBox fx:id="defaultSource" text="%Show BibTeX source by default"/>
+    <CheckBox fx:id="autoLinkFilesEnabled" text="%Automatically search and show unlinked files in the entry editor"></CheckBox>
+
     <CheckBox fx:id="enableRelatedArticlesTab" text="%Show 'Related Articles' tab"/>
     <CheckBox fx:id="acceptRecommendations" text="%Accept recommendations from Mr. DLib"
               disable="${!enableRelatedArticlesTab.selected}">
@@ -29,34 +33,24 @@
     <CheckBox fx:id="enableLatexCitationsTab" text="%Show 'LaTeX Citations' tab"/>
     <CheckBox fx:id="enableValidation" text="%Show validation messages"/>
     <CheckBox fx:id="allowIntegerEdition" text="%Allow integers in 'edition' field in BibTeX mode"/>
+    <CheckBox fx:id="journalPopupEnabled" text="%Fetch journal information online to show"/>
 
-    <Label styleClass="sectionHeader" text="%Autocompletion"/>
-    <CheckBox fx:id="enableAutoComplete" text="%Use autocompletion"/>
-    <VBox spacing="10.0">
-        <HBox spacing="4.0">
-            <Label text="%Affected fields:" disable="${!enableAutoComplete.selected}"/>
-            <TextField fx:id="autoCompleteFields" HBox.hgrow="ALWAYS" disable="${!enableAutoComplete.selected}">
-                <HBox.margin>
-                    <Insets top="-4.0"/>
-                </HBox.margin>
-            </TextField>
-        </HBox>
-        <Label text="%Name format" disable="${!enableAutoComplete.selected}"/>
-        <RadioButton fx:id="autoCompleteFirstLast" text="%Autocomplete names in 'Firstname Lastname' format only"
-                     toggleGroup="$nameFormat" disable="${!enableAutoComplete.selected}"/>
-        <RadioButton fx:id="autoCompleteLastFirst" text="%Autocomplete names in 'Lastname, Firstname' format only"
-                     toggleGroup="$nameFormat" disable="${!enableAutoComplete.selected}"/>
-        <RadioButton fx:id="autoCompleteBoth" text="%Autocomplete names in both formats"
-                     toggleGroup="$nameFormat" disable="${!enableAutoComplete.selected}"/>
-        <Label text="%First names" disable="${!enableAutoComplete.selected}"/>
-        <RadioButton fx:id="firstNameModeAbbreviated" text="%Use abbreviated firstname whenever possible"
-                     toggleGroup="$firstNames" disable="${!enableAutoComplete.selected}"/>
-        <RadioButton fx:id="firstNameModeFull" text="%Use full firstname whenever possible"
-                     toggleGroup="$firstNames" disable="${!enableAutoComplete.selected}"/>
-        <RadioButton fx:id="firstNameModeBoth" text="%Use abbreviated and full firstname"
-                     toggleGroup="$firstNames" disable="${!enableAutoComplete.selected}"/>
-        <padding>
-            <Insets left="20.0"/>
-        </padding>
-    </VBox>
+    <Label styleClass="sectionHeader" text="%Custom editor tabs"/>
+    <HBox>
+        <Label text="%Create custom fields for each BibTeX entry"/>
+        <HBox HBox.hgrow="ALWAYS"/>
+        <Button fx:id="generalFieldsHelp"/>
+        <Button prefHeight="20.0" prefWidth="20.0" styleClass="icon-button,narrow" onAction="#resetToDefaults">
+            <graphic>
+                <JabRefIconView glyph="REFRESH"/>
+            </graphic>
+            <tooltip>
+                <Tooltip text="%Reset to default"/>
+            </tooltip>
+        </Button>
+    </HBox>
+
+    <TextArea fx:id="fieldsTextArea" minHeight="200.0"/>
+
+    <Label text="%Format: Tab:field;field;... (e.g. General:url;pdf;note...)"/>
 </fx:root>
diff --git a/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTab.java b/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTab.java
index 66ff2d3ffb9..121d44da00c 100644
--- a/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTab.java
+++ b/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTab.java
@@ -1,15 +1,21 @@
 package org.jabref.gui.preferences.entryeditor;
 
 import javafx.fxml.FXML;
+import javafx.scene.control.Button;
 import javafx.scene.control.CheckBox;
-import javafx.scene.control.RadioButton;
-import javafx.scene.control.TextField;
+import javafx.scene.control.TextArea;
 
+import org.jabref.gui.actions.ActionFactory;
+import org.jabref.gui.actions.StandardActions;
+import org.jabref.gui.help.HelpAction;
+import org.jabref.gui.keyboard.KeyBindingRepository;
 import org.jabref.gui.preferences.AbstractPreferenceTabView;
 import org.jabref.gui.preferences.PreferencesTab;
+import org.jabref.logic.help.HelpFile;
 import org.jabref.logic.l10n.Localization;
 
 import com.airhacks.afterburner.views.ViewLoader;
+import jakarta.inject.Inject;
 
 public class EntryEditorTab extends AbstractPreferenceTabView<EntryEditorTabViewModel> implements PreferencesTab {
 
@@ -20,14 +26,13 @@ public class EntryEditorTab extends AbstractPreferenceTabView<EntryEditorTabView
     @FXML private CheckBox enableLatexCitationsTab;
     @FXML private CheckBox enableValidation;
     @FXML private CheckBox allowIntegerEdition;
-    @FXML private CheckBox enableAutoComplete;
-    @FXML private TextField autoCompleteFields;
-    @FXML private RadioButton autoCompleteFirstLast;
-    @FXML private RadioButton autoCompleteLastFirst;
-    @FXML private RadioButton autoCompleteBoth;
-    @FXML private RadioButton firstNameModeAbbreviated;
-    @FXML private RadioButton firstNameModeFull;
-    @FXML private RadioButton firstNameModeBoth;
+    @FXML private CheckBox journalPopupEnabled;
+    @FXML private CheckBox autoLinkFilesEnabled;
+
+    @FXML private Button generalFieldsHelp;
+    @FXML private TextArea fieldsTextArea;
+
+    @Inject private KeyBindingRepository keyBindingRepository;
 
     public EntryEditorTab() {
         ViewLoader.view(this)
@@ -41,7 +46,7 @@ public String getTabName() {
     }
 
     public void initialize() {
-        this.viewModel = new EntryEditorTabViewModel(preferencesService.getEntryEditorPreferences(), preferencesService.getAutoCompletePreferences());
+        this.viewModel = new EntryEditorTabViewModel(dialogService, preferencesService);
 
         openOnNewEntry.selectedProperty().bindBidirectional(viewModel.openOnNewEntryProperty());
         defaultSource.selectedProperty().bindBidirectional(viewModel.defaultSourceProperty());
@@ -50,13 +55,17 @@ public void initialize() {
         enableLatexCitationsTab.selectedProperty().bindBidirectional(viewModel.enableLatexCitationsTabProperty());
         enableValidation.selectedProperty().bindBidirectional(viewModel.enableValidationProperty());
         allowIntegerEdition.selectedProperty().bindBidirectional(viewModel.allowIntegerEditionProperty());
-        enableAutoComplete.selectedProperty().bindBidirectional(viewModel.enableAutoCompleteProperty());
-        autoCompleteFields.textProperty().bindBidirectional(viewModel.autoCompleteFieldsProperty());
-        autoCompleteFirstLast.selectedProperty().bindBidirectional(viewModel.autoCompleteFirstLastProperty());
-        autoCompleteLastFirst.selectedProperty().bindBidirectional(viewModel.autoCompleteLastFirstProperty());
-        autoCompleteBoth.selectedProperty().bindBidirectional(viewModel.autoCompleteBothProperty());
-        firstNameModeAbbreviated.selectedProperty().bindBidirectional(viewModel.firstNameModeAbbreviatedProperty());
-        firstNameModeFull.selectedProperty().bindBidirectional(viewModel.firstNameModeFullProperty());
-        firstNameModeBoth.selectedProperty().bindBidirectional(viewModel.firstNameModeBothProperty());
+        journalPopupEnabled.selectedProperty().bindBidirectional(viewModel.journalPopupProperty());
+        autoLinkFilesEnabled.selectedProperty().bindBidirectional(viewModel.autoLinkFilesEnabledProperty());
+
+        fieldsTextArea.textProperty().bindBidirectional(viewModel.fieldsProperty());
+
+        ActionFactory actionFactory = new ActionFactory(keyBindingRepository);
+        actionFactory.configureIconButton(StandardActions.HELP, new HelpAction(HelpFile.GENERAL_FIELDS, dialogService, preferencesService.getFilePreferences()), generalFieldsHelp);
+    }
+
+    @FXML
+    void resetToDefaults() {
+        viewModel.resetToDefaults();
     }
 }
diff --git a/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTabViewModel.java b/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTabViewModel.java
index 4c052c67962..dfbd5847fb1 100644
--- a/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTabViewModel.java
@@ -1,19 +1,23 @@
 package org.jabref.gui.preferences.entryeditor;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.LinkedHashMap;
+import java.util.Map;
+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 org.jabref.gui.autocompleter.AutoCompleteFirstNameMode;
-import org.jabref.gui.autocompleter.AutoCompletePreferences;
+import org.jabref.gui.DialogService;
 import org.jabref.gui.entryeditor.EntryEditorPreferences;
 import org.jabref.gui.preferences.PreferenceTabViewModel;
+import org.jabref.logic.citationkeypattern.CitationKeyGenerator;
 import org.jabref.logic.l10n.Localization;
+import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.FieldFactory;
+import org.jabref.preferences.MrDlibPreferences;
+import org.jabref.preferences.PreferencesService;
 
 public class EntryEditorTabViewModel implements PreferenceTabViewModel {
 
@@ -24,23 +28,21 @@ public class EntryEditorTabViewModel implements PreferenceTabViewModel {
     private final BooleanProperty enableLatexCitationsTabProperty = new SimpleBooleanProperty();
     private final BooleanProperty enableValidationProperty = new SimpleBooleanProperty();
     private final BooleanProperty allowIntegerEditionProperty = new SimpleBooleanProperty();
-    private final BooleanProperty enableAutoCompleteProperty = new SimpleBooleanProperty();
-    private final StringProperty autoCompleteFieldsProperty = new SimpleStringProperty();
-    private final BooleanProperty autoCompleteFirstLastProperty = new SimpleBooleanProperty();
-    private final BooleanProperty autoCompleteLastFirstProperty = new SimpleBooleanProperty();
-    private final BooleanProperty autoCompleteBothProperty = new SimpleBooleanProperty();
-    private final BooleanProperty firstNameModeAbbreviatedProperty = new SimpleBooleanProperty();
-    private final BooleanProperty firstNameModeFullProperty = new SimpleBooleanProperty();
-    private final BooleanProperty firstNameModeBothProperty = new SimpleBooleanProperty();
+    private final BooleanProperty journalPopupProperty = new SimpleBooleanProperty();
+    private final BooleanProperty autoLinkEnabledProperty = new SimpleBooleanProperty();
 
-    private final EntryEditorPreferences entryEditorPreferences;
-    private final AutoCompletePreferences autoCompletePreferences;
+    private final StringProperty fieldsProperty = new SimpleStringProperty();
 
-    private final List<String> restartWarnings = new ArrayList<>();
+    private final DialogService dialogService;
+    private final PreferencesService preferencesService;
+    private final EntryEditorPreferences entryEditorPreferences;
+    private final MrDlibPreferences mrDlibPreferences;
 
-    public EntryEditorTabViewModel(EntryEditorPreferences entryEditorPreferences, AutoCompletePreferences autoCompletePreferences) {
-        this.entryEditorPreferences = entryEditorPreferences;
-        this.autoCompletePreferences = autoCompletePreferences;
+    public EntryEditorTabViewModel(DialogService dialogService, PreferencesService preferencesService) {
+        this.dialogService = dialogService;
+        this.preferencesService = preferencesService;
+        this.entryEditorPreferences = preferencesService.getEntryEditorPreferences();
+        this.mrDlibPreferences = preferencesService.getMrDlibPreferences();
     }
 
     @Override
@@ -51,27 +53,31 @@ public void setValues() {
         openOnNewEntryProperty.setValue(entryEditorPreferences.shouldOpenOnNewEntry());
         defaultSourceProperty.setValue(entryEditorPreferences.showSourceTabByDefault());
         enableRelatedArticlesTabProperty.setValue(entryEditorPreferences.shouldShowRecommendationsTab());
-        acceptRecommendationsProperty.setValue(entryEditorPreferences.isMrdlibAccepted());
+        acceptRecommendationsProperty.setValue(mrDlibPreferences.shouldAcceptRecommendations());
         enableLatexCitationsTabProperty.setValue(entryEditorPreferences.shouldShowLatexCitationsTab());
         enableValidationProperty.setValue(entryEditorPreferences.shouldEnableValidation());
         allowIntegerEditionProperty.setValue(entryEditorPreferences.shouldAllowIntegerEditionBibtex());
+        journalPopupProperty.setValue(entryEditorPreferences.shouldEnableJournalPopup() == EntryEditorPreferences.JournalPopupEnabled.ENABLED);
+        autoLinkEnabledProperty.setValue(entryEditorPreferences.autoLinkFilesEnabled());
 
-        enableAutoCompleteProperty.setValue(autoCompletePreferences.shouldAutoComplete());
-        autoCompleteFieldsProperty.setValue(autoCompletePreferences.getCompleteNamesAsString());
+        setFields(entryEditorPreferences.getEntryEditorTabs());
+    }
 
-        if (autoCompletePreferences.getNameFormat() == AutoCompletePreferences.NameFormat.FIRST_LAST) {
-            autoCompleteFirstLastProperty.setValue(true);
-        } else if (autoCompletePreferences.getNameFormat() == AutoCompletePreferences.NameFormat.LAST_FIRST) {
-            autoCompleteLastFirstProperty.setValue(true);
-        } else {
-            autoCompleteBothProperty.setValue(true);
-        }
+    public void resetToDefaults() {
+        setFields(preferencesService.getEntryEditorPreferences().getDefaultEntryEditorTabs());
+    }
+
+    private void setFields(Map<String, Set<Field>> tabNamesAndFields) {
+        StringBuilder sb = new StringBuilder();
 
-        switch (autoCompletePreferences.getFirstNameMode()) {
-            case ONLY_ABBREVIATED -> firstNameModeAbbreviatedProperty.setValue(true);
-            case ONLY_FULL -> firstNameModeFullProperty.setValue(true);
-            default -> firstNameModeBothProperty.setValue(true);
+        // Fill with customized vars
+        for (Map.Entry<String, Set<Field>> tab : tabNamesAndFields.entrySet()) {
+            sb.append(tab.getKey());
+            sb.append(':');
+            sb.append(FieldFactory.serializeFieldsList(tab.getValue()));
+            sb.append('\n');
         }
+        fieldsProperty.set(sb.toString());
     }
 
     @Override
@@ -79,46 +85,46 @@ public void storeSettings() {
         // entryEditorPreferences.setEntryEditorTabList();
         entryEditorPreferences.setShouldOpenOnNewEntry(openOnNewEntryProperty.getValue());
         entryEditorPreferences.setShouldShowRecommendationsTab(enableRelatedArticlesTabProperty.getValue());
-        entryEditorPreferences.setIsMrdlibAccepted(acceptRecommendationsProperty.getValue());
+        mrDlibPreferences.setAcceptRecommendations(acceptRecommendationsProperty.getValue());
         entryEditorPreferences.setShouldShowLatexCitationsTab(enableLatexCitationsTabProperty.getValue());
         entryEditorPreferences.setShowSourceTabByDefault(defaultSourceProperty.getValue());
         entryEditorPreferences.setEnableValidation(enableValidationProperty.getValue());
         entryEditorPreferences.setAllowIntegerEditionBibtex(allowIntegerEditionProperty.getValue());
+        entryEditorPreferences.setEnableJournalPopup(journalPopupProperty.getValue()
+                ? EntryEditorPreferences.JournalPopupEnabled.ENABLED
+                : EntryEditorPreferences.JournalPopupEnabled.DISABLED);
         // entryEditorPreferences.setDividerPosition();
+        entryEditorPreferences.setAutoLinkFilesEnabled(autoLinkEnabledProperty.getValue());
+
+        Map<String, Set<Field>> customTabsMap = new LinkedHashMap<>();
+        String[] lines = fieldsProperty.get().split("\n");
+
+        for (String line : lines) {
+            String[] parts = line.split(":");
+            if (parts.length != 2) {
+                dialogService.showInformationDialogAndWait(
+                        Localization.lang("Error"),
+                        Localization.lang("Each line must be of the following form: 'tab:field1;field2;...;fieldN'."));
+                return;
+            }
 
-        autoCompletePreferences.setAutoComplete(enableAutoCompleteProperty.getValue());
-
-        if (autoCompleteBothProperty.getValue()) {
-            autoCompletePreferences.setNameFormat(AutoCompletePreferences.NameFormat.BOTH);
-        } else if (autoCompleteFirstLastProperty.getValue()) {
-            autoCompletePreferences.setNameFormat(AutoCompletePreferences.NameFormat.FIRST_LAST);
-        } else if (autoCompleteLastFirstProperty.getValue()) {
-            autoCompletePreferences.setNameFormat(AutoCompletePreferences.NameFormat.LAST_FIRST);
-        }
-
-        if (firstNameModeBothProperty.getValue()) {
-            autoCompletePreferences.setFirstNameMode(AutoCompleteFirstNameMode.BOTH);
-        } else if (firstNameModeAbbreviatedProperty.getValue()) {
-            autoCompletePreferences.setFirstNameMode(AutoCompleteFirstNameMode.ONLY_ABBREVIATED);
-        } else if (firstNameModeFullProperty.getValue()) {
-            autoCompletePreferences.setFirstNameMode(AutoCompleteFirstNameMode.ONLY_FULL);
-        }
-
-        if (autoCompletePreferences.shouldAutoComplete() != enableAutoCompleteProperty.getValue()) {
-            if (enableAutoCompleteProperty.getValue()) {
-                restartWarnings.add(Localization.lang("Auto complete enabled."));
-            } else {
-                restartWarnings.add(Localization.lang("Auto complete disabled."));
+            // Use literal string of unwanted characters specified below as opposed to exporting characters
+            // from preferences because the list of allowable characters in this particular differs
+            // i.e. ';' character is allowed in this window, but it's on the list of unwanted chars in preferences
+            String unwantedChars = "#{}()~,^&-\"'`ʹ\\";
+            String testString = CitationKeyGenerator.cleanKey(parts[1], unwantedChars);
+            if (!testString.equals(parts[1])) {
+                dialogService.showInformationDialogAndWait(
+                        Localization.lang("Error"),
+                        Localization.lang("Field names are not allowed to contain white spaces or certain characters (%0).",
+                                "# { } ( ) ~ , ^ & - \" ' ` ʹ \\"));
+                return;
             }
-        }
 
-        autoCompletePreferences.getCompleteFields().clear();
-        autoCompletePreferences.getCompleteFields().addAll(FieldFactory.parseFieldList(autoCompleteFieldsProperty.getValue()));
-    }
+            customTabsMap.put(parts[0], FieldFactory.parseFieldList(parts[1]));
+        }
 
-    @Override
-    public List<String> getRestartWarnings() {
-        return restartWarnings;
+        entryEditorPreferences.setEntryEditorTabList(customTabsMap);
     }
 
     public BooleanProperty openOnNewEntryProperty() {
@@ -149,35 +155,15 @@ public BooleanProperty allowIntegerEditionProperty() {
         return this.allowIntegerEditionProperty;
     }
 
-    public BooleanProperty enableAutoCompleteProperty() {
-        return enableAutoCompleteProperty;
-    }
-
-    public StringProperty autoCompleteFieldsProperty() {
-        return autoCompleteFieldsProperty;
-    }
-
-    public BooleanProperty autoCompleteFirstLastProperty() {
-        return autoCompleteFirstLastProperty;
-    }
-
-    public BooleanProperty autoCompleteLastFirstProperty() {
-        return autoCompleteLastFirstProperty;
-    }
-
-    public BooleanProperty autoCompleteBothProperty() {
-        return autoCompleteBothProperty;
-    }
-
-    public BooleanProperty firstNameModeAbbreviatedProperty() {
-        return firstNameModeAbbreviatedProperty;
+    public BooleanProperty journalPopupProperty() {
+        return journalPopupProperty;
     }
 
-    public BooleanProperty firstNameModeFullProperty() {
-        return firstNameModeFullProperty;
+    public StringProperty fieldsProperty() {
+        return fieldsProperty;
     }
 
-    public BooleanProperty firstNameModeBothProperty() {
-        return firstNameModeBothProperty;
+    public BooleanProperty autoLinkFilesEnabledProperty() {
+        return autoLinkEnabledProperty;
     }
 }
diff --git a/src/main/java/org/jabref/gui/preferences/entryeditortabs/CustomEditorFieldsTab.fxml b/src/main/java/org/jabref/gui/preferences/entryeditortabs/CustomEditorFieldsTab.fxml
deleted file mode 100644
index ffbec77e841..00000000000
--- a/src/main/java/org/jabref/gui/preferences/entryeditortabs/CustomEditorFieldsTab.fxml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.TextArea?>
-<?import javafx.scene.control.Tooltip?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.VBox?>
-<?import org.jabref.gui.icon.JabRefIconView?>
-<fx:root spacing="10.0" type="VBox"
-         xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml"
-         fx:controller="org.jabref.gui.preferences.entryeditortabs.CustomEditorFieldsTab">
-
-    <Label styleClass="titleHeader" text="%Custom editor tabs"/>
-
-    <HBox>
-        <Label text="%Create custom fields for each BibTeX entry"/>
-        <HBox HBox.hgrow="ALWAYS"/>
-        <Button fx:id="generalFieldsHelp"/>
-        <Button prefHeight="20.0" prefWidth="20.0" styleClass="icon-button,narrow" onAction="#resetToDefaults">
-            <graphic>
-                <JabRefIconView glyph="REFRESH"/>
-            </graphic>
-            <tooltip>
-                <Tooltip text="%Reset to default"/>
-            </tooltip>
-        </Button>
-    </HBox>
-
-    <TextArea fx:id="fieldsTextArea" minHeight="200.0"/>
-
-    <Label text="%Format: Tab:field;field;... (e.g. General:url;pdf;note...)"/>
-</fx:root>
diff --git a/src/main/java/org/jabref/gui/preferences/entryeditortabs/CustomEditorFieldsTab.java b/src/main/java/org/jabref/gui/preferences/entryeditortabs/CustomEditorFieldsTab.java
deleted file mode 100644
index 319f4e83f02..00000000000
--- a/src/main/java/org/jabref/gui/preferences/entryeditortabs/CustomEditorFieldsTab.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.jabref.gui.preferences.entryeditortabs;
-
-import javafx.fxml.FXML;
-import javafx.scene.control.Button;
-import javafx.scene.control.TextArea;
-
-import org.jabref.gui.Globals;
-import org.jabref.gui.actions.ActionFactory;
-import org.jabref.gui.actions.StandardActions;
-import org.jabref.gui.help.HelpAction;
-import org.jabref.gui.preferences.AbstractPreferenceTabView;
-import org.jabref.gui.preferences.PreferencesTab;
-import org.jabref.logic.help.HelpFile;
-import org.jabref.logic.l10n.Localization;
-
-import com.airhacks.afterburner.views.ViewLoader;
-
-public class CustomEditorFieldsTab extends AbstractPreferenceTabView<CustomEditorFieldsTabViewModel> implements PreferencesTab {
-
-    @FXML private Button generalFieldsHelp;
-    @FXML private TextArea fieldsTextArea;
-
-    public CustomEditorFieldsTab() {
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
-    }
-
-    @Override
-    public String getTabName() {
-        return Localization.lang("Custom editor tabs");
-    }
-
-    public void initialize() {
-        viewModel = new CustomEditorFieldsTabViewModel(dialogService, preferencesService);
-
-        fieldsTextArea.textProperty().bindBidirectional(viewModel.fieldsProperty());
-
-        ActionFactory actionFactory = new ActionFactory(Globals.getKeyPrefs());
-        actionFactory.configureIconButton(StandardActions.HELP, new HelpAction(HelpFile.GENERAL_FIELDS, dialogService), generalFieldsHelp);
-    }
-
-    @FXML
-    void resetToDefaults() {
-        viewModel.resetToDefaults();
-    }
-}
diff --git a/src/main/java/org/jabref/gui/preferences/entryeditortabs/CustomEditorFieldsTabViewModel.java b/src/main/java/org/jabref/gui/preferences/entryeditortabs/CustomEditorFieldsTabViewModel.java
deleted file mode 100644
index ef51d2486e5..00000000000
--- a/src/main/java/org/jabref/gui/preferences/entryeditortabs/CustomEditorFieldsTabViewModel.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package org.jabref.gui.preferences.entryeditortabs;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.Set;
-
-import javafx.beans.property.SimpleStringProperty;
-import javafx.beans.property.StringProperty;
-
-import org.jabref.gui.DialogService;
-import org.jabref.gui.entryeditor.EntryEditorPreferences;
-import org.jabref.gui.preferences.PreferenceTabViewModel;
-import org.jabref.logic.citationkeypattern.CitationKeyGenerator;
-import org.jabref.logic.l10n.Localization;
-import org.jabref.model.entry.field.Field;
-import org.jabref.model.entry.field.FieldFactory;
-import org.jabref.preferences.PreferencesService;
-
-public class CustomEditorFieldsTabViewModel implements PreferenceTabViewModel {
-
-    private final StringProperty fieldsProperty = new SimpleStringProperty();
-
-    private final DialogService dialogService;
-    private final PreferencesService preferences;
-    private final EntryEditorPreferences entryEditorPreferences;
-
-    public CustomEditorFieldsTabViewModel(DialogService dialogService, PreferencesService preferences) {
-        this.dialogService = dialogService;
-        this.preferences = preferences;
-        this.entryEditorPreferences = preferences.getEntryEditorPreferences();
-    }
-
-    @Override
-    public void setValues() {
-        setFields(entryEditorPreferences.getEntryEditorTabList());
-    }
-
-    public void resetToDefaults() {
-        setFields(preferences.getDefaultTabNamesAndFields());
-    }
-
-    private void setFields(Map<String, Set<Field>> tabNamesAndFields) {
-        StringBuilder sb = new StringBuilder();
-
-        // Fill with customized vars
-        for (Map.Entry<String, Set<Field>> tab : tabNamesAndFields.entrySet()) {
-            sb.append(tab.getKey());
-            sb.append(':');
-            sb.append(FieldFactory.serializeFieldsList(tab.getValue()));
-            sb.append('\n');
-        }
-        fieldsProperty.set(sb.toString());
-    }
-
-    @Override
-    public void storeSettings() {
-        Map<String, Set<Field>> customTabsMap = new LinkedHashMap<>();
-        String[] lines = fieldsProperty.get().split("\n");
-
-        for (String line : lines) {
-            String[] parts = line.split(":");
-            if (parts.length != 2) {
-                dialogService.showInformationDialogAndWait(
-                        Localization.lang("Error"),
-                        Localization.lang("Each line must be of the following form: 'tab:field1;field2;...;fieldN'."));
-                return;
-            }
-
-            // Use literal string of unwanted characters specified below as opposed to exporting characters
-            // from preferences because the list of allowable characters in this particular differs
-            // i.e. ';' character is allowed in this window, but it's on the list of unwanted chars in preferences
-            String unwantedChars = "#{}()~,^&-\"'`ʹ\\";
-            String testString = CitationKeyGenerator.cleanKey(parts[1], unwantedChars);
-            if (!testString.equals(parts[1])) {
-                dialogService.showInformationDialogAndWait(
-                        Localization.lang("Error"),
-                        Localization.lang("Field names are not allowed to contain white spaces or certain characters (%0).",
-                                "# { } ( ) ~ , ^ & - \" ' ` ʹ \\"));
-                return;
-            }
-
-            customTabsMap.put(parts[0], FieldFactory.parseFieldList(parts[1]));
-        }
-
-        entryEditorPreferences.setEntryEditorTabList(customTabsMap);
-    }
-
-    public StringProperty fieldsProperty() {
-        return fieldsProperty;
-    }
-}
diff --git a/src/main/java/org/jabref/gui/preferences/export/ExportTab.fxml b/src/main/java/org/jabref/gui/preferences/export/ExportTab.fxml
new file mode 100644
index 00000000000..c5b107c39c9
--- /dev/null
+++ b/src/main/java/org/jabref/gui/preferences/export/ExportTab.fxml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.Label?>
+<?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.export.ExportTab">
+    <Label styleClass="titleHeader" text="%Export"/>
+
+    <Label styleClass="sectionHeader" text="%Export sort order"/>
+    <SaveOrderConfigPanel fx:id="exportOrderPanel"/>
+</fx:root>
diff --git a/src/main/java/org/jabref/gui/preferences/export/ExportTab.java b/src/main/java/org/jabref/gui/preferences/export/ExportTab.java
new file mode 100644
index 00000000000..6f020818cff
--- /dev/null
+++ b/src/main/java/org/jabref/gui/preferences/export/ExportTab.java
@@ -0,0 +1,36 @@
+package org.jabref.gui.preferences.export;
+
+import javafx.fxml.FXML;
+
+import org.jabref.gui.commonfxcontrols.SaveOrderConfigPanel;
+import org.jabref.gui.preferences.AbstractPreferenceTabView;
+import org.jabref.gui.preferences.PreferencesTab;
+import org.jabref.logic.l10n.Localization;
+
+import com.airhacks.afterburner.views.ViewLoader;
+
+public class ExportTab extends AbstractPreferenceTabView<ExportTabViewModel> implements PreferencesTab {
+    @FXML private SaveOrderConfigPanel exportOrderPanel;
+
+    public ExportTab() {
+        ViewLoader.view(this)
+                  .root(this)
+                  .load();
+    }
+
+    @Override
+    public String getTabName() {
+        return Localization.lang("Export");
+    }
+
+    public void initialize() {
+        this.viewModel = new ExportTabViewModel(preferencesService.getExportPreferences());
+
+        exportOrderPanel.saveInOriginalProperty().bindBidirectional(viewModel.saveInOriginalProperty());
+        exportOrderPanel.saveInTableOrderProperty().bindBidirectional(viewModel.saveInTableOrderProperty());
+        exportOrderPanel.saveInSpecifiedOrderProperty().bindBidirectional(viewModel.saveInSpecifiedOrderProperty());
+        exportOrderPanel.sortableFieldsProperty().bind(viewModel.sortableFieldsProperty());
+        exportOrderPanel.sortCriteriaProperty().bindBidirectional(viewModel.sortCriteriaProperty());
+        exportOrderPanel.setCriteriaLimit(3);
+    }
+}
diff --git a/src/main/java/org/jabref/gui/preferences/export/ExportTabViewModel.java b/src/main/java/org/jabref/gui/preferences/export/ExportTabViewModel.java
new file mode 100644
index 00000000000..f8b278b9708
--- /dev/null
+++ b/src/main/java/org/jabref/gui/preferences/export/ExportTabViewModel.java
@@ -0,0 +1,82 @@
+package org.jabref.gui.preferences.export;
+
+import java.util.ArrayList;
+import java.util.Set;
+
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.ListProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.SimpleListProperty;
+import javafx.collections.FXCollections;
+
+import org.jabref.gui.commonfxcontrols.SortCriterionViewModel;
+import org.jabref.gui.preferences.PreferenceTabViewModel;
+import org.jabref.model.entry.field.Field;
+import org.jabref.model.entry.field.FieldFactory;
+import org.jabref.model.entry.field.InternalField;
+import org.jabref.model.metadata.SaveOrder;
+import org.jabref.preferences.ExportPreferences;
+
+public class ExportTabViewModel implements PreferenceTabViewModel {
+
+    // SaveOrderConfigPanel
+    private final BooleanProperty exportInOriginalProperty = new SimpleBooleanProperty();
+    private final BooleanProperty exportInTableOrderProperty = new SimpleBooleanProperty();
+    private final BooleanProperty exportInSpecifiedOrderProperty = new SimpleBooleanProperty();
+    private final ListProperty<Field> sortableFieldsProperty = new SimpleListProperty<>(FXCollections.observableArrayList());
+    private final ListProperty<SortCriterionViewModel> sortCriteriaProperty = new SimpleListProperty<>(FXCollections.observableArrayList(new ArrayList<>()));
+
+    private final ExportPreferences exportPreferences;
+
+    public ExportTabViewModel(ExportPreferences exportPreferences) {
+        this.exportPreferences = exportPreferences;
+    }
+
+    @Override
+    public void setValues() {
+        SaveOrder exportSaveOrder = exportPreferences.getExportSaveOrder();
+        switch (exportSaveOrder.getOrderType()) {
+            case SPECIFIED -> exportInSpecifiedOrderProperty.setValue(true);
+            case ORIGINAL -> exportInOriginalProperty.setValue(true);
+            case TABLE -> exportInTableOrderProperty.setValue(true);
+        }
+        sortCriteriaProperty.addAll(exportSaveOrder.getSortCriteria().stream()
+                                                   .map(SortCriterionViewModel::new)
+                                                   .toList());
+
+        Set<Field> fields = FieldFactory.getAllFieldsWithOutInternal();
+        fields.add(InternalField.INTERNAL_ALL_FIELD);
+        fields.add(InternalField.INTERNAL_ALL_TEXT_FIELDS_FIELD);
+        fields.add(InternalField.KEY_FIELD);
+        fields.add(InternalField.TYPE_HEADER);
+        sortableFieldsProperty.addAll(FieldFactory.getStandardFieldsWithCitationKey());
+    }
+
+    @Override
+    public void storeSettings() {
+        SaveOrder newSaveOrder = new SaveOrder(
+                SaveOrder.OrderType.fromBooleans(exportInSpecifiedOrderProperty.getValue(), exportInOriginalProperty.getValue()),
+                sortCriteriaProperty.stream().map(SortCriterionViewModel::getCriterion).toList());
+        exportPreferences.setExportSaveOrder(newSaveOrder);
+    }
+
+    public BooleanProperty saveInOriginalProperty() {
+        return exportInOriginalProperty;
+    }
+
+    public BooleanProperty saveInTableOrderProperty() {
+        return exportInTableOrderProperty;
+    }
+
+    public BooleanProperty saveInSpecifiedOrderProperty() {
+        return exportInSpecifiedOrderProperty;
+    }
+
+    public ListProperty<Field> sortableFieldsProperty() {
+        return sortableFieldsProperty;
+    }
+
+    public ListProperty<SortCriterionViewModel> sortCriteriaProperty() {
+        return sortCriteriaProperty;
+    }
+}
diff --git a/src/main/java/org/jabref/gui/preferences/external/ExternalTab.fxml b/src/main/java/org/jabref/gui/preferences/external/ExternalTab.fxml
index e4cd9d468b0..baed6346b4d 100644
--- a/src/main/java/org/jabref/gui/preferences/external/ExternalTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/external/ExternalTab.fxml
@@ -21,6 +21,10 @@
         <Label text="%Subject for sending an email with references"/>
         <TextField fx:id="eMailReferenceSubject" minWidth="150.0" HBox.hgrow="ALWAYS"/>
     </HBox>
+    <HBox alignment="CENTER_LEFT" spacing="10.0">
+        <Label text="%Email address for sending to Kindle"/>
+        <TextField fx:id="kindleEmail" minWidth="150.0" HBox.hgrow="ALWAYS"/>
+    </HBox>
     <CheckBox fx:id="autoOpenAttachedFolders" text="%Automatically open folders of attached files"/>
 
     <Label styleClass="sectionHeader" text="%Push applications"/>
diff --git a/src/main/java/org/jabref/gui/preferences/external/ExternalTab.java b/src/main/java/org/jabref/gui/preferences/external/ExternalTab.java
index e4a0a16eac3..82368139cf9 100644
--- a/src/main/java/org/jabref/gui/preferences/external/ExternalTab.java
+++ b/src/main/java/org/jabref/gui/preferences/external/ExternalTab.java
@@ -29,6 +29,7 @@ public class ExternalTab extends AbstractPreferenceTabView<ExternalTabViewModel>
     @FXML private CheckBox useCustomFileBrowser;
     @FXML private TextField customFileBrowserCommand;
     @FXML private Button customFileBrowserBrowse;
+    @FXML private TextField kindleEmail;
 
     private final ControlsFxVisualizer validationVisualizer = new ControlsFxVisualizer();
 
@@ -68,6 +69,8 @@ public void initialize() {
         customFileBrowserCommand.disableProperty().bind(useCustomFileBrowser.selectedProperty().not());
         customFileBrowserBrowse.disableProperty().bind(useCustomFileBrowser.selectedProperty().not());
 
+        kindleEmail.textProperty().bindBidirectional(viewModel.kindleEmailProperty());
+
         validationVisualizer.setDecoration(new IconValidationDecorator());
         Platform.runLater(() -> {
             validationVisualizer.initVisualization(viewModel.terminalCommandValidationStatus(), customTerminalCommand);
diff --git a/src/main/java/org/jabref/gui/preferences/external/ExternalTabViewModel.java b/src/main/java/org/jabref/gui/preferences/external/ExternalTabViewModel.java
index 14c16d494e5..3700f93b5e4 100644
--- a/src/main/java/org/jabref/gui/preferences/external/ExternalTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/external/ExternalTabViewModel.java
@@ -44,6 +44,7 @@ public class ExternalTabViewModel implements PreferenceTabViewModel {
     private final StringProperty customTerminalCommandProperty = new SimpleStringProperty("");
     private final BooleanProperty useCustomFileBrowserProperty = new SimpleBooleanProperty();
     private final StringProperty customFileBrowserCommandProperty = new SimpleStringProperty("");
+    private final StringProperty kindleEmailProperty = new SimpleStringProperty("");
 
     private final Validator terminalCommandValidator;
     private final Validator fileBrowserCommandValidator;
@@ -85,6 +86,7 @@ public ExternalTabViewModel(DialogService dialogService, PreferencesService pref
                         Localization.lang("Please specify a file browser."))));
     }
 
+    @Override
     public void setValues() {
         eMailReferenceSubjectProperty.setValue(initialExternalApplicationPreferences.getEmailSubject());
         autoOpenAttachedFoldersProperty.setValue(initialExternalApplicationPreferences.shouldAutoOpenEmailAttachmentsFolder());
@@ -100,8 +102,10 @@ public void setValues() {
         customTerminalCommandProperty.setValue(initialExternalApplicationPreferences.getCustomTerminalCommand());
         useCustomFileBrowserProperty.setValue(initialExternalApplicationPreferences.useCustomFileBrowser());
         customFileBrowserCommandProperty.setValue(initialExternalApplicationPreferences.getCustomFileBrowserCommand());
+        kindleEmailProperty.setValue(initialExternalApplicationPreferences.getKindleEmail());
     }
 
+    @Override
     public void storeSettings() {
         ExternalApplicationsPreferences externalPreferences = preferences.getExternalApplicationsPreferences();
         externalPreferences.setEMailSubject(eMailReferenceSubjectProperty.getValue());
@@ -111,6 +115,7 @@ public void storeSettings() {
         externalPreferences.setCustomTerminalCommand(customTerminalCommandProperty.getValue());
         externalPreferences.setUseCustomFileBrowser(useCustomFileBrowserProperty.getValue());
         externalPreferences.setCustomFileBrowserCommand(customFileBrowserCommandProperty.getValue());
+        externalPreferences.setKindleEmail(kindleEmailProperty.getValue());
 
         PushToApplicationPreferences pushPreferences = preferences.getPushToApplicationPreferences();
         pushPreferences.setActiveApplicationName(selectedPushToApplicationProperty.getValue().getDisplayName());
@@ -127,6 +132,7 @@ public ValidationStatus fileBrowserCommandValidationStatus() {
         return fileBrowserCommandValidator.getValidationStatus();
     }
 
+    @Override
     public boolean validateSettings() {
         CompositeValidator validator = new CompositeValidator();
 
@@ -182,6 +188,10 @@ public StringProperty eMailReferenceSubjectProperty() {
         return this.eMailReferenceSubjectProperty;
     }
 
+    public StringProperty kindleEmailProperty() {
+        return this.kindleEmailProperty;
+    }
+
     public BooleanProperty autoOpenAttachedFoldersProperty() {
         return this.autoOpenAttachedFoldersProperty;
     }
diff --git a/src/main/java/org/jabref/gui/preferences/externalfiletypes/EditExternalFileTypeEntryDialog.java b/src/main/java/org/jabref/gui/preferences/externalfiletypes/EditExternalFileTypeEntryDialog.java
index e18ed5a4e83..e5aa3e55c03 100644
--- a/src/main/java/org/jabref/gui/preferences/externalfiletypes/EditExternalFileTypeEntryDialog.java
+++ b/src/main/java/org/jabref/gui/preferences/externalfiletypes/EditExternalFileTypeEntryDialog.java
@@ -10,10 +10,10 @@
 import javafx.scene.control.ToggleGroup;
 
 import org.jabref.gui.DialogService;
-import org.jabref.gui.desktop.JabRefDesktop;
 import org.jabref.gui.desktop.os.NativeDesktop;
 import org.jabref.gui.util.BaseDialog;
 import org.jabref.gui.util.FileDialogConfiguration;
+import org.jabref.logic.util.OS;
 
 import com.airhacks.afterburner.views.ViewLoader;
 import jakarta.inject.Inject;
@@ -31,7 +31,7 @@ public class EditExternalFileTypeEntryDialog extends BaseDialog<Void> {
     @FXML private Label icon;
     @Inject private DialogService dialogService;
 
-    private final NativeDesktop nativeDesktop = JabRefDesktop.getNativeDesktop();
+    private final NativeDesktop nativeDesktop = OS.getNativeDesktop();
     private final FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder().withInitialDirectory(nativeDesktop.getApplicationDirectory()).build();
 
     private final ExternalFileTypeItemViewModel item;
diff --git a/src/main/java/org/jabref/gui/preferences/externalfiletypes/EditExternalFileTypeViewModel.java b/src/main/java/org/jabref/gui/preferences/externalfiletypes/EditExternalFileTypeViewModel.java
index 693f6eab412..7a095e76b94 100644
--- a/src/main/java/org/jabref/gui/preferences/externalfiletypes/EditExternalFileTypeViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/externalfiletypes/EditExternalFileTypeViewModel.java
@@ -27,6 +27,7 @@ public EditExternalFileTypeViewModel(ExternalFileTypeItemViewModel fileTypeViewM
             defaultApplicationSelectedProperty.setValue(true);
         } else {
             customApplicationSelectedProperty.setValue(true);
+            selectedApplicationProperty.setValue(fileTypeViewModel.applicationProperty().getValue());
         }
     }
 
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 8a1faf6f8f4..b61818105f0 100644
--- a/src/main/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypesTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypesTabViewModel.java
@@ -28,6 +28,7 @@ public ExternalFileTypesTabViewModel(FilePreferences filePreferences, DialogServ
 
     @Override
     public void setValues() {
+        fileTypes.clear();
         fileTypes.addAll(filePreferences.getExternalFileTypes().stream()
                        .map(ExternalFileTypeItemViewModel::new)
                        .toList());
diff --git a/src/main/java/org/jabref/gui/preferences/file/FileTab.fxml b/src/main/java/org/jabref/gui/preferences/file/FileTab.fxml
deleted file mode 100644
index 59b1d7f0e90..00000000000
--- a/src/main/java/org/jabref/gui/preferences/file/FileTab.fxml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.CheckBox?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.RadioButton?>
-<?import javafx.scene.control.TextField?>
-<?import javafx.scene.control.ToggleGroup?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.VBox?>
-<fx:root spacing="10.0" type="VBox"
-         xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml"
-         fx:controller="org.jabref.gui.preferences.file.FileTab">
-    <Label text="%File" styleClass="titleHeader"/>
-
-    <Label styleClass="sectionHeader" text="%String constants"/>
-    <fx:define>
-        <ToggleGroup fx:id="stringsResolveToggleGroup"/>
-    </fx:define>
-    <HBox alignment="CENTER_LEFT" spacing="10.0">
-        <RadioButton fx:id="resolveStrings" text="%Resolve BibTeX strings for the following fields"
-                     toggleGroup="$stringsResolveToggleGroup"/>
-        <TextField fx:id="resolveStringsForFields" HBox.hgrow="ALWAYS"/>
-    </HBox>
-    <RadioButton fx:id="doNotResolveStrings" text="%Do not resolve BibTeX strings"
-                 toggleGroup="$stringsResolveToggleGroup"/>
-
-    <Label styleClass="sectionHeader" text="%Loading"/>
-
-    <CheckBox fx:id="openLastStartup" text="%Open last edited libraries at startup"/>
-
-    <Label styleClass="sectionHeader" text="%Saving"/>
-
-    <HBox alignment="CENTER_LEFT" spacing="10.0">
-        <Label text="%Do not wrap the following fields when saving"/>
-        <TextField fx:id="noWrapFiles" HBox.hgrow="ALWAYS"/>
-    </HBox>
-
-    <HBox alignment="CENTER_LEFT" spacing="10.0">
-        <CheckBox fx:id="autosaveLocalLibraries" text="%Autosave local libraries"/>
-        <Button fx:id="autosaveLocalLibrariesHelp"/>
-    </HBox>
-
-    <CheckBox fx:id="alwaysReformatBib" text="%Always reformat BIB file on save and export"/>
-</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
deleted file mode 100644
index 88c3768df07..00000000000
--- a/src/main/java/org/jabref/gui/preferences/file/FileTab.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package org.jabref.gui.preferences.file;
-
-import javafx.fxml.FXML;
-import javafx.scene.control.Button;
-import javafx.scene.control.CheckBox;
-import javafx.scene.control.RadioButton;
-import javafx.scene.control.TextField;
-
-import org.jabref.gui.Globals;
-import org.jabref.gui.actions.ActionFactory;
-import org.jabref.gui.actions.StandardActions;
-import org.jabref.gui.help.HelpAction;
-import org.jabref.gui.preferences.AbstractPreferenceTabView;
-import org.jabref.gui.preferences.PreferencesTab;
-import org.jabref.logic.help.HelpFile;
-import org.jabref.logic.l10n.Localization;
-
-import com.airhacks.afterburner.views.ViewLoader;
-
-public class FileTab extends AbstractPreferenceTabView<FileTabViewModel> implements PreferencesTab {
-
-    @FXML private CheckBox openLastStartup;
-    @FXML private TextField noWrapFiles;
-    @FXML private RadioButton doNotResolveStrings;
-    @FXML private RadioButton resolveStrings;
-    @FXML private TextField resolveStringsForFields;
-    @FXML private CheckBox alwaysReformatBib;
-
-    @FXML private CheckBox autosaveLocalLibraries;
-    @FXML private Button autosaveLocalLibrariesHelp;
-
-    public FileTab() {
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
-    }
-
-    public void initialize() {
-        this.viewModel = new FileTabViewModel(preferencesService.getImportExportPreferences());
-
-        openLastStartup.selectedProperty().bindBidirectional(viewModel.openLastStartupProperty());
-        noWrapFiles.textProperty().bindBidirectional(viewModel.noWrapFilesProperty());
-
-        doNotResolveStrings.selectedProperty().bindBidirectional(viewModel.doNotResolveStringsProperty());
-        resolveStrings.selectedProperty().bindBidirectional(viewModel.resolveStringsProperty());
-        resolveStringsForFields.textProperty().bindBidirectional(viewModel.resolveStringsForFieldsProperty());
-        resolveStringsForFields.disableProperty().bind(doNotResolveStrings.selectedProperty());
-
-        alwaysReformatBib.selectedProperty().bindBidirectional(viewModel.alwaysReformatBibProperty());
-        autosaveLocalLibraries.selectedProperty().bindBidirectional(viewModel.autosaveLocalLibrariesProperty());
-
-        ActionFactory actionFactory = new ActionFactory(Globals.getKeyPrefs());
-        actionFactory.configureIconButton(StandardActions.HELP, new HelpAction(HelpFile.AUTOSAVE, dialogService), autosaveLocalLibrariesHelp);
-    }
-
-    @Override
-    public String getTabName() {
-        return Localization.lang("File");
-    }
-}
diff --git a/src/main/java/org/jabref/gui/preferences/file/FileTabViewModel.java b/src/main/java/org/jabref/gui/preferences/file/FileTabViewModel.java
deleted file mode 100644
index 3981f4d2c82..00000000000
--- a/src/main/java/org/jabref/gui/preferences/file/FileTabViewModel.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package org.jabref.gui.preferences.file;
-
-import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.SimpleBooleanProperty;
-import javafx.beans.property.SimpleStringProperty;
-import javafx.beans.property.StringProperty;
-
-import org.jabref.gui.preferences.PreferenceTabViewModel;
-import org.jabref.preferences.ImportExportPreferences;
-
-public class FileTabViewModel implements PreferenceTabViewModel {
-
-    private final BooleanProperty openLastStartupProperty = new SimpleBooleanProperty();
-    private final StringProperty noWrapFilesProperty = new SimpleStringProperty("");
-    private final BooleanProperty doNotResolveStringsProperty = new SimpleBooleanProperty();
-    private final BooleanProperty resolveStringsProperty = new SimpleBooleanProperty();
-    private final StringProperty resolveStringsForFieldsProperty = new SimpleStringProperty("");
-    private final BooleanProperty alwaysReformatBibProperty = new SimpleBooleanProperty();
-    private final BooleanProperty autosaveLocalLibraries = new SimpleBooleanProperty();
-
-    private final ImportExportPreferences importExportPreferences;
-
-    FileTabViewModel(ImportExportPreferences importExportPreferences) {
-        this.importExportPreferences = importExportPreferences;
-    }
-
-    @Override
-    public void setValues() {
-        openLastStartupProperty.setValue(importExportPreferences.shouldOpenLastEdited());
-        noWrapFilesProperty.setValue(importExportPreferences.getNonWrappableFields());
-
-        doNotResolveStringsProperty.setValue(!importExportPreferences.resolveStrings());
-        resolveStringsProperty.setValue(importExportPreferences.resolveStrings());
-        resolveStringsForFieldsProperty.setValue(importExportPreferences.getResolvableFields());
-        alwaysReformatBibProperty.setValue(importExportPreferences.shouldAlwaysReformatOnSave());
-        autosaveLocalLibraries.setValue(importExportPreferences.shouldAutoSave());
-    }
-
-    @Override
-    public void storeSettings() {
-        importExportPreferences.setOpenLastEdited(openLastStartupProperty.getValue());
-        importExportPreferences.setResolveStrings(!doNotResolveStringsProperty.getValue());
-        importExportPreferences.setNonWrappableFields(noWrapFilesProperty.getValue().trim());
-        importExportPreferences.setResolvableFields(resolveStringsForFieldsProperty.getValue().trim());
-        importExportPreferences.setAlwaysReformatOnSave(alwaysReformatBibProperty.getValue());
-        importExportPreferences.setAutoSave(autosaveLocalLibraries.getValue());
-    }
-
-    // General
-
-    public BooleanProperty openLastStartupProperty() {
-        return openLastStartupProperty;
-    }
-
-    // ImportExport
-
-    public StringProperty noWrapFilesProperty() {
-        return noWrapFilesProperty;
-    }
-
-    public BooleanProperty doNotResolveStringsProperty() {
-        return doNotResolveStringsProperty;
-    }
-
-    public BooleanProperty resolveStringsProperty() {
-        return resolveStringsProperty;
-    }
-
-    public StringProperty resolveStringsForFieldsProperty() {
-        return resolveStringsForFieldsProperty;
-    }
-
-    public BooleanProperty alwaysReformatBibProperty() {
-        return alwaysReformatBibProperty;
-    }
-
-    // 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 9b7382c67b9..60892aea5cf 100644
--- a/src/main/java/org/jabref/gui/preferences/general/GeneralTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/general/GeneralTab.fxml
@@ -1,12 +1,18 @@
 <?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.Spinner?>
+<?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?>
+<?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
+<?import org.jabref.gui.icon.JabRefIconView?>
 <fx:root spacing="10.0" type="VBox"
          xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml"
          fx:controller="org.jabref.gui.preferences.general.GeneralTab">
@@ -16,22 +22,87 @@
             <ColumnConstraints hgrow="SOMETIMES" percentWidth="30.0"/>
             <ColumnConstraints hgrow="SOMETIMES"/>
         </columnConstraints>
-        <rowConstraints>
-            <RowConstraints minHeight="10.0" vgrow="SOMETIMES"/>
-            <RowConstraints minHeight="10.0" vgrow="SOMETIMES"/>
-            <RowConstraints minHeight="10.0" vgrow="SOMETIMES"/>
-        </rowConstraints>
-        <Label text="%Language"/>
-        <ComboBox fx:id="language" prefWidth="200.0" GridPane.columnIndex="1"/>
-        <Label text="%Default library mode" GridPane.rowIndex="2"/>
-        <ComboBox fx:id="biblatexMode" prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="2"/>
+        <Label styleClass="sectionHeader" text="%Appearance"
+               GridPane.rowIndex="0" GridPane.columnIndex="0" GridPane.columnSpan="2"/>
+        <Label text="%Language"
+               GridPane.rowIndex="1" GridPane.columnIndex="0"/>
+        <ComboBox fx:id="language" prefWidth="200.0"
+                  GridPane.rowIndex="1" GridPane.columnIndex="1"/>
+
+        <Label text="%Visual theme"
+               GridPane.rowIndex="2" GridPane.columnIndex="0"/>
+        <ComboBox fx:id="theme" prefWidth="200.0"
+                  GridPane.rowIndex="2" GridPane.columnIndex="1"/>
+        <HBox alignment="CENTER_LEFT" spacing="4.0"
+              GridPane.rowIndex="3" GridPane.columnIndex="0" GridPane.columnSpan="2">
+            <TextField fx:id="customThemePath" HBox.hgrow="ALWAYS"/>
+            <Button fx:id="customThemeBrowse" onAction="#importTheme" styleClass="icon-button,narrow" prefHeight="20.0" prefWidth="20.0">
+                <graphic>
+                    <JabRefIconView glyph="OPEN"/>
+                </graphic>
+                <tooltip>
+                    <Tooltip text="%Browse"/>
+                </tooltip>
+            </Button>
+            <padding>
+                <Insets left="20.0"/>
+            </padding>
+        </HBox>
+
+        <CheckBox fx:id="fontOverride" text="%Override default font settings"
+                  GridPane.rowIndex="4" GridPane.columnIndex="0"/>
+        <HBox alignment="CENTER_LEFT" spacing="4.0" disable="${!fontOverride.selected}"
+              GridPane.rowIndex="4" GridPane.columnIndex="1">
+            <Label text="%Size"/>
+            <Spinner fx:id="fontSize" styleClass="fontsizeSpinner" editable="true"/>
+        </HBox>
     </GridPane>
+
+    <Label styleClass="sectionHeader" text="%User interface"/>
+    <CheckBox fx:id="openLastStartup" text="%Open last edited libraries on startup"/>
+    <CheckBox fx:id="showAdvancedHints"
+              text="%Show advanced hints (i.e. helpful tooltips, suggestions and explanation)"/>
     <CheckBox fx:id="inspectionWarningDuplicate"
               text="%Warn about unresolved duplicates when closing inspection window"/>
     <CheckBox fx:id="confirmDelete" text="%Show confirmation dialog when deleting entries"/>
-    <CheckBox fx:id="memoryStickMode"
-              text="%Load and Save preferences from/to jabref.xml on start-up (memory stick mode)"/>
     <CheckBox fx:id="collectTelemetry" text="%Collect and share telemetry data to help improve JabRef"/>
-    <CheckBox fx:id="showAdvancedHints"
-              text="%Show advanced hints (i.e. helpful tooltips, suggestions and explanation)"/>
+
+    <Label styleClass="sectionHeader" text="%Libraries"/>
+    <GridPane hgap="10.0" vgap="4.0">
+        <columnConstraints>
+            <ColumnConstraints hgrow="SOMETIMES" percentWidth="30.0"/>
+            <ColumnConstraints hgrow="SOMETIMES"/>
+        </columnConstraints>
+
+        <Label text="%Default library mode"/>
+        <ComboBox fx:id="biblatexMode" prefWidth="200.0" GridPane.columnIndex="1"/>
+    </GridPane>
+
+    <Label styleClass="sectionHeader" text="%Saving"/>
+    <CheckBox fx:id="alwaysReformatBib" text="%Always reformat library on save and export"/>
+    <HBox alignment="CENTER_LEFT" spacing="4.0">
+        <CheckBox fx:id="autosaveLocalLibraries" text="%Autosave local libraries"/>
+        <Button fx:id="autosaveLocalLibrariesHelp"/>
+        <padding>
+            <Insets top="-8.0"/>
+        </padding>
+    </HBox>
+
+    <HBox alignment="CENTER_LEFT" spacing="10.0">
+        <CheckBox fx:id="createBackup" text="%Create backup"/>
+        <TextField fx:id="backupDirectory" HBox.hgrow="ALWAYS"/>
+        <Button fx:id="browseDirectory" onAction="#backupFileDirBrowse"
+                styleClass="icon-button,narrow"
+                prefHeight="20.0" prefWidth="20.0" GridPane.columnIndex="2">
+            <graphic>
+                <JabRefIconView glyph="OPEN"/>
+            </graphic>
+            <tooltip>
+                <Tooltip text="%Browse"/>
+            </tooltip>
+        </Button>
+        <VBox.margin>
+            <Insets top="-4.0"/>
+        </VBox.margin>
+    </HBox>
 </fx:root>
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 be2f4160630..8cf5db7140d 100644
--- a/src/main/java/org/jabref/gui/preferences/general/GeneralTab.java
+++ b/src/main/java/org/jabref/gui/preferences/general/GeneralTab.java
@@ -1,27 +1,66 @@
 package org.jabref.gui.preferences.general;
 
+import java.util.regex.Pattern;
+
+import javafx.application.Platform;
 import javafx.fxml.FXML;
+import javafx.geometry.Pos;
+import javafx.scene.control.Button;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.ComboBox;
+import javafx.scene.control.Spinner;
+import javafx.scene.control.TextField;
+import javafx.scene.control.TextFormatter;
+import javafx.util.converter.IntegerStringConverter;
 
+import org.jabref.gui.Globals;
+import org.jabref.gui.actions.ActionFactory;
+import org.jabref.gui.actions.StandardActions;
+import org.jabref.gui.help.HelpAction;
 import org.jabref.gui.preferences.AbstractPreferenceTabView;
 import org.jabref.gui.preferences.PreferencesTab;
+import org.jabref.gui.util.IconValidationDecorator;
 import org.jabref.gui.util.ViewModelListCellFactory;
+import org.jabref.logic.help.HelpFile;
 import org.jabref.logic.l10n.Language;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseMode;
 
 import com.airhacks.afterburner.views.ViewLoader;
+import com.tobiasdiez.easybind.EasyBind;
+import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
 
 public class GeneralTab extends AbstractPreferenceTabView<GeneralTabViewModel> implements PreferencesTab {
 
     @FXML private ComboBox<Language> language;
-    @FXML private ComboBox<BibDatabaseMode> biblatexMode;
+    @FXML private ComboBox<GeneralTabViewModel.ThemeTypes> theme;
+    @FXML private TextField customThemePath;
+    @FXML private Button customThemeBrowse;
+    @FXML private CheckBox fontOverride;
+    @FXML private Spinner<Integer> fontSize;
+    @FXML private CheckBox openLastStartup;
+    @FXML private CheckBox showAdvancedHints;
     @FXML private CheckBox inspectionWarningDuplicate;
     @FXML private CheckBox confirmDelete;
-    @FXML private CheckBox memoryStickMode;
     @FXML private CheckBox collectTelemetry;
-    @FXML private CheckBox showAdvancedHints;
+    @FXML private ComboBox<BibDatabaseMode> biblatexMode;
+    @FXML private CheckBox alwaysReformatBib;
+    @FXML private CheckBox autosaveLocalLibraries;
+    @FXML private Button autosaveLocalLibrariesHelp;
+    @FXML private CheckBox createBackup;
+    @FXML private TextField backupDirectory;
+
+    private final ControlsFxVisualizer validationVisualizer = new ControlsFxVisualizer();
+
+    // The fontSizeFormatter formats the input given to the fontSize spinner so that non valid values cannot be entered.
+    private final TextFormatter<Integer> fontSizeFormatter = new TextFormatter<>(new IntegerStringConverter(), 9,
+            c -> {
+                if (Pattern.matches("\\d*", c.getText())) {
+                    return c;
+                }
+                c.setText("0");
+                return c;
+            });
 
     public GeneralTab() {
         ViewLoader.view(this)
@@ -35,7 +74,7 @@ public String getTabName() {
     }
 
     public void initialize() {
-        this.viewModel = new GeneralTabViewModel(dialogService, preferencesService.getGeneralPreferences(), preferencesService.getTelemetryPreferences());
+        this.viewModel = new GeneralTabViewModel(dialogService, preferencesService);
 
         new ViewModelListCellFactory<Language>()
                 .withText(Language::getDisplayName)
@@ -43,16 +82,63 @@ public void initialize() {
         language.itemsProperty().bind(viewModel.languagesListProperty());
         language.valueProperty().bindBidirectional(viewModel.selectedLanguageProperty());
 
+        fontOverride.selectedProperty().bindBidirectional(viewModel.fontOverrideProperty());
+
+        // Spinner does neither support alignment nor disableProperty in FXML
+        fontSize.disableProperty().bind(fontOverride.selectedProperty().not());
+        fontSize.getEditor().setAlignment(Pos.CENTER_RIGHT);
+        fontSize.setValueFactory(GeneralTabViewModel.fontSizeValueFactory);
+        fontSize.getEditor().textProperty().bindBidirectional(viewModel.fontSizeProperty());
+        fontSize.getEditor().setTextFormatter(fontSizeFormatter);
+
+        new ViewModelListCellFactory<GeneralTabViewModel.ThemeTypes>()
+                .withText(GeneralTabViewModel.ThemeTypes::getDisplayName)
+                .install(theme);
+        theme.itemsProperty().bind(viewModel.themesListProperty());
+        theme.valueProperty().bindBidirectional(viewModel.selectedThemeProperty());
+        customThemePath.textProperty().bindBidirectional(viewModel.customPathToThemeProperty());
+        EasyBind.subscribe(viewModel.selectedThemeProperty(), theme -> {
+            boolean isCustomTheme = theme == GeneralTabViewModel.ThemeTypes.CUSTOM;
+            customThemePath.disableProperty().set(!isCustomTheme);
+            customThemeBrowse.disableProperty().set(!isCustomTheme);
+        });
+
+        validationVisualizer.setDecoration(new IconValidationDecorator());
+
+        openLastStartup.selectedProperty().bindBidirectional(viewModel.openLastStartupProperty());
+        showAdvancedHints.selectedProperty().bindBidirectional(viewModel.showAdvancedHintsProperty());
+        inspectionWarningDuplicate.selectedProperty().bindBidirectional(viewModel.inspectionWarningDuplicateProperty());
+        confirmDelete.selectedProperty().bindBidirectional(viewModel.confirmDeleteProperty());
+
+        collectTelemetry.selectedProperty().bindBidirectional(viewModel.collectTelemetryProperty());
+
         new ViewModelListCellFactory<BibDatabaseMode>()
                 .withText(BibDatabaseMode::getFormattedName)
                 .install(biblatexMode);
         biblatexMode.itemsProperty().bind(viewModel.biblatexModeListProperty());
         biblatexMode.valueProperty().bindBidirectional(viewModel.selectedBiblatexModeProperty());
 
-        inspectionWarningDuplicate.selectedProperty().bindBidirectional(viewModel.inspectionWarningDuplicateProperty());
-        confirmDelete.selectedProperty().bindBidirectional(viewModel.confirmDeleteProperty());
-        memoryStickMode.selectedProperty().bindBidirectional(viewModel.memoryStickModeProperty());
-        collectTelemetry.selectedProperty().bindBidirectional(viewModel.collectTelemetryProperty());
-        showAdvancedHints.selectedProperty().bindBidirectional(viewModel.showAdvancedHintsProperty());
+        alwaysReformatBib.selectedProperty().bindBidirectional(viewModel.alwaysReformatBibProperty());
+        autosaveLocalLibraries.selectedProperty().bindBidirectional(viewModel.autosaveLocalLibrariesProperty());
+        ActionFactory actionFactory = new ActionFactory(Globals.getKeyPrefs());
+        actionFactory.configureIconButton(StandardActions.HELP, new HelpAction(HelpFile.AUTOSAVE, dialogService, preferencesService.getFilePreferences()), autosaveLocalLibrariesHelp);
+
+        createBackup.selectedProperty().bindBidirectional(viewModel.createBackupProperty());
+        backupDirectory.textProperty().bindBidirectional(viewModel.backupDirectoryProperty());
+        backupDirectory.disableProperty().bind(viewModel.createBackupProperty().not());
+
+        Platform.runLater(() -> {
+            validationVisualizer.initVisualization(viewModel.fontSizeValidationStatus(), fontSize);
+            validationVisualizer.initVisualization(viewModel.customPathToThemeValidationStatus(), customThemePath);
+        });
+    }
+
+    @FXML
+    void importTheme() {
+        viewModel.importCSSFile();
+    }
+
+    public void backupFileDirBrowse() {
+        viewModel.backupFileDirBrowse();
     }
 }
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 9566ba81e3e..b7b723046e3 100644
--- a/src/main/java/org/jabref/gui/preferences/general/GeneralTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/general/GeneralTabViewModel.java
@@ -1,86 +1,231 @@
 package org.jabref.gui.preferences.general;
 
+import java.nio.file.Path;
 import java.util.ArrayList;
-import java.util.Comparator;
 import java.util.List;
 
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ListProperty;
 import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.ReadOnlyListProperty;
+import javafx.beans.property.ReadOnlyListWrapper;
 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 javafx.collections.transformation.SortedList;
+import javafx.scene.control.SpinnerValueFactory;
 
 import org.jabref.gui.DialogService;
 import org.jabref.gui.preferences.PreferenceTabViewModel;
+import org.jabref.gui.theme.Theme;
+import org.jabref.gui.util.DirectoryDialogConfiguration;
+import org.jabref.gui.util.FileDialogConfiguration;
 import org.jabref.logic.l10n.Language;
 import org.jabref.logic.l10n.Localization;
+import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.database.BibDatabaseMode;
-import org.jabref.preferences.GeneralPreferences;
+import org.jabref.model.strings.StringUtil;
+import org.jabref.preferences.FilePreferences;
+import org.jabref.preferences.LibraryPreferences;
+import org.jabref.preferences.PreferencesService;
 import org.jabref.preferences.TelemetryPreferences;
+import org.jabref.preferences.WorkspacePreferences;
+
+import de.saxsys.mvvmfx.utils.validation.CompositeValidator;
+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 GeneralTabViewModel implements PreferenceTabViewModel {
-    private final ListProperty<Language> languagesListProperty = new SimpleListProperty<>();
+    protected enum ThemeTypes {
+        LIGHT(Localization.lang("Light")),
+        DARK(Localization.lang("Dark")),
+        CUSTOM(Localization.lang("Custom..."));
+
+        private final String displayName;
+
+        ThemeTypes(String displayName) {
+            this.displayName = displayName;
+        }
+
+        public String getDisplayName() {
+            return displayName;
+        }
+    }
+
+    protected static SpinnerValueFactory<Integer> fontSizeValueFactory =
+            new SpinnerValueFactory.IntegerSpinnerValueFactory(9, Integer.MAX_VALUE);
+
+    private final ReadOnlyListProperty<Language> languagesListProperty =
+            new ReadOnlyListWrapper<>(FXCollections.observableArrayList(Language.values()));;
     private final ObjectProperty<Language> selectedLanguageProperty = new SimpleObjectProperty<>();
-    private final ListProperty<BibDatabaseMode> bibliographyModeListProperty = new SimpleListProperty<>();
-    private final ObjectProperty<BibDatabaseMode> selectedBiblatexModeProperty = new SimpleObjectProperty<>();
 
+    private final ReadOnlyListProperty<ThemeTypes> themesListProperty =
+            new ReadOnlyListWrapper<>(FXCollections.observableArrayList(ThemeTypes.values()));;
+    private final ObjectProperty<ThemeTypes> selectedThemeProperty = new SimpleObjectProperty<>();
+    private final StringProperty customPathToThemeProperty = new SimpleStringProperty();
+
+    private final BooleanProperty fontOverrideProperty = new SimpleBooleanProperty();
+    private final StringProperty fontSizeProperty = new SimpleStringProperty();
+
+    private final BooleanProperty openLastStartupProperty = new SimpleBooleanProperty();
+    private final BooleanProperty showAdvancedHintsProperty = new SimpleBooleanProperty();
     private final BooleanProperty inspectionWarningDuplicateProperty = new SimpleBooleanProperty();
     private final BooleanProperty confirmDeleteProperty = new SimpleBooleanProperty();
-    private final BooleanProperty memoryStickModeProperty = new SimpleBooleanProperty();
+
     private final BooleanProperty collectTelemetryProperty = new SimpleBooleanProperty();
-    private final BooleanProperty showAdvancedHintsProperty = new SimpleBooleanProperty();
+
+    private final ListProperty<BibDatabaseMode> bibliographyModeListProperty = new SimpleListProperty<>();
+    private final ObjectProperty<BibDatabaseMode> selectedBiblatexModeProperty = new SimpleObjectProperty<>();
+
+    private final BooleanProperty alwaysReformatBibProperty = new SimpleBooleanProperty();
+    private final BooleanProperty autosaveLocalLibraries = new SimpleBooleanProperty();
+
+    private final BooleanProperty createBackupProperty = new SimpleBooleanProperty();
+    private final StringProperty backupDirectoryProperty = new SimpleStringProperty("");
 
     private final DialogService dialogService;
-    private final GeneralPreferences generalPreferences;
+    private final PreferencesService preferences;
+    private final WorkspacePreferences workspacePreferences;
     private final TelemetryPreferences telemetryPreferences;
+    private final LibraryPreferences libraryPreferences;
+    private final FilePreferences filePreferences;
+
+    private final Validator fontSizeValidator;
+    private final Validator customPathToThemeValidator;
 
     private final List<String> restartWarning = new ArrayList<>();
 
-    @SuppressWarnings("ReturnValueIgnored")
-    public GeneralTabViewModel(DialogService dialogService, GeneralPreferences generalPreferences, TelemetryPreferences telemetryPreferences) {
+    public GeneralTabViewModel(DialogService dialogService, PreferencesService preferences) {
         this.dialogService = dialogService;
-        this.generalPreferences = generalPreferences;
-        this.telemetryPreferences = telemetryPreferences;
+        this.preferences = preferences;
+        this.workspacePreferences = preferences.getWorkspacePreferences();
+        this.telemetryPreferences = preferences.getTelemetryPreferences();
+        this.libraryPreferences = preferences.getLibraryPreferences();
+        this.filePreferences = preferences.getFilePreferences();
+
+        fontSizeValidator = new FunctionBasedValidator<>(
+                fontSizeProperty,
+                input -> {
+                    try {
+                        return Integer.parseInt(fontSizeProperty().getValue()) > 8;
+                    } catch (NumberFormatException ex) {
+                        return false;
+                    }
+                },
+                ValidationMessage.error(String.format("%s > %s %n %n %s",
+                        Localization.lang("General"),
+                        Localization.lang("Font settings"),
+                        Localization.lang("You must enter an integer value higher than 8."))));
+
+        customPathToThemeValidator = new FunctionBasedValidator<>(
+                customPathToThemeProperty,
+                input -> !StringUtil.isNullOrEmpty(input),
+                ValidationMessage.error(String.format("%s > %s %n %n %s",
+                        Localization.lang("General"),
+                        Localization.lang("Visual theme"),
+                        Localization.lang("Please specify a css theme file."))));
     }
 
+    @Override
     public void setValues() {
-        languagesListProperty.setValue(new SortedList<>(FXCollections.observableArrayList(Language.values()), Comparator.comparing(Language::getDisplayName)));
-        selectedLanguageProperty.setValue(generalPreferences.getLanguage());
+        selectedLanguageProperty.setValue(workspacePreferences.getLanguage());
 
-        bibliographyModeListProperty.setValue(FXCollections.observableArrayList(BibDatabaseMode.values()));
-        selectedBiblatexModeProperty.setValue(generalPreferences.getDefaultBibDatabaseMode());
+        // The light theme is in fact the absence of any theme modifying 'base.css'. Another embedded theme like
+        // 'dark.css', stored in the classpath, can be introduced in {@link org.jabref.gui.theme.Theme}.
+        switch (workspacePreferences.getTheme().getType()) {
+            case DEFAULT -> selectedThemeProperty.setValue(ThemeTypes.LIGHT);
+            case EMBEDDED -> selectedThemeProperty.setValue(ThemeTypes.DARK);
+            case CUSTOM -> {
+                selectedThemeProperty.setValue(ThemeTypes.CUSTOM);
+                customPathToThemeProperty.setValue(workspacePreferences.getTheme().getName());
+            }
+        }
+
+        fontOverrideProperty.setValue(workspacePreferences.shouldOverrideDefaultFontSize());
+        fontSizeProperty.setValue(String.valueOf(workspacePreferences.getMainFontSize()));
+
+        openLastStartupProperty.setValue(workspacePreferences.shouldOpenLastEdited());
+        showAdvancedHintsProperty.setValue(workspacePreferences.shouldShowAdvancedHints());
+        inspectionWarningDuplicateProperty.setValue(workspacePreferences.shouldWarnAboutDuplicatesInInspection());
+        confirmDeleteProperty.setValue(workspacePreferences.shouldConfirmDelete());
 
-        inspectionWarningDuplicateProperty.setValue(generalPreferences.warnAboutDuplicatesInInspection());
-        confirmDeleteProperty.setValue(generalPreferences.shouldConfirmDelete());
-        memoryStickModeProperty.setValue(generalPreferences.isMemoryStickMode());
         collectTelemetryProperty.setValue(telemetryPreferences.shouldCollectTelemetry());
-        showAdvancedHintsProperty.setValue(generalPreferences.shouldShowAdvancedHints());
+
+        bibliographyModeListProperty.setValue(FXCollections.observableArrayList(BibDatabaseMode.values()));
+        selectedBiblatexModeProperty.setValue(libraryPreferences.getDefaultBibDatabaseMode());
+
+        alwaysReformatBibProperty.setValue(libraryPreferences.shouldAlwaysReformatOnSave());
+        autosaveLocalLibraries.setValue(libraryPreferences.shouldAutoSave());
+
+        createBackupProperty.setValue(filePreferences.shouldCreateBackup());
+        backupDirectoryProperty.setValue(filePreferences.getBackupDirectory().toString());
     }
 
+    @Override
     public void storeSettings() {
         Language newLanguage = selectedLanguageProperty.getValue();
-        if (newLanguage != generalPreferences.getLanguage()) {
-            generalPreferences.setLanguage(newLanguage);
+        if (newLanguage != workspacePreferences.getLanguage()) {
+            workspacePreferences.setLanguage(newLanguage);
             Localization.setLanguage(newLanguage);
             restartWarning.add(Localization.lang("Changed language") + ": " + newLanguage.getDisplayName());
         }
 
-        if (generalPreferences.isMemoryStickMode() && !memoryStickModeProperty.getValue()) {
-            dialogService.showInformationDialogAndWait(Localization.lang("Memory stick mode"),
-                    Localization.lang("To disable the memory stick mode"
-                            + " rename or remove the jabref.xml file in the same folder as JabRef."));
+        workspacePreferences.setShouldOverrideDefaultFontSize(fontOverrideProperty.getValue());
+        workspacePreferences.setMainFontSize(Integer.parseInt(fontSizeProperty.getValue()));
+
+        switch (selectedThemeProperty.get()) {
+            case LIGHT -> workspacePreferences.setTheme(Theme.light());
+            case DARK -> workspacePreferences.setTheme(Theme.dark());
+            case CUSTOM -> workspacePreferences.setTheme(Theme.custom(customPathToThemeProperty.getValue()));
         }
 
-        generalPreferences.setDefaultBibDatabaseMode(selectedBiblatexModeProperty.getValue());
-        generalPreferences.setWarnAboutDuplicatesInInspection(inspectionWarningDuplicateProperty.getValue());
-        generalPreferences.setConfirmDelete(confirmDeleteProperty.getValue());
-        generalPreferences.setMemoryStickMode(memoryStickModeProperty.getValue());
-        generalPreferences.setShowAdvancedHints(showAdvancedHintsProperty.getValue());
+        workspacePreferences.setOpenLastEdited(openLastStartupProperty.getValue());
+        workspacePreferences.setShowAdvancedHints(showAdvancedHintsProperty.getValue());
+        workspacePreferences.setWarnAboutDuplicatesInInspection(inspectionWarningDuplicateProperty.getValue());
+        workspacePreferences.setConfirmDelete(confirmDeleteProperty.getValue());
 
         telemetryPreferences.setCollectTelemetry(collectTelemetryProperty.getValue());
+
+        libraryPreferences.setDefaultBibDatabaseMode(selectedBiblatexModeProperty.getValue());
+
+        libraryPreferences.setAlwaysReformatOnSave(alwaysReformatBibProperty.getValue());
+        libraryPreferences.setAutoSave(autosaveLocalLibraries.getValue());
+
+        filePreferences.createBackupProperty().setValue(createBackupProperty.getValue());
+        filePreferences.backupDirectoryProperty().setValue(Path.of(backupDirectoryProperty.getValue()));
+    }
+
+    public ValidationStatus fontSizeValidationStatus() {
+        return fontSizeValidator.getValidationStatus();
+    }
+
+    public ValidationStatus customPathToThemeValidationStatus() {
+        return customPathToThemeValidator.getValidationStatus();
+    }
+
+    @Override
+    public boolean validateSettings() {
+        CompositeValidator validator = new CompositeValidator();
+
+        if (fontOverrideProperty.getValue()) {
+            validator.addValidators(fontSizeValidator);
+        }
+
+        if (selectedThemeProperty.getValue() == ThemeTypes.CUSTOM) {
+            validator.addValidators(customPathToThemeValidator);
+        }
+
+        ValidationStatus validationStatus = validator.getValidationStatus();
+        if (!validationStatus.isValid()) {
+            validationStatus.getHighestMessage().ifPresent(message ->
+                    dialogService.showErrorDialogAndWait(message.getMessage()));
+            return false;
+        }
+        return true;
     }
 
     @Override
@@ -88,9 +233,7 @@ public List<String> getRestartWarnings() {
         return restartWarning;
     }
 
-    // General
-
-    public ListProperty<Language> languagesListProperty() {
+    public ReadOnlyListProperty<Language> languagesListProperty() {
         return this.languagesListProperty;
     }
 
@@ -98,12 +241,42 @@ public ObjectProperty<Language> selectedLanguageProperty() {
         return this.selectedLanguageProperty;
     }
 
-    public ListProperty<BibDatabaseMode> biblatexModeListProperty() {
-        return this.bibliographyModeListProperty;
+    public ReadOnlyListProperty<ThemeTypes> themesListProperty() {
+        return this.themesListProperty;
     }
 
-    public ObjectProperty<BibDatabaseMode> selectedBiblatexModeProperty() {
-        return this.selectedBiblatexModeProperty;
+    public ObjectProperty<ThemeTypes> selectedThemeProperty() {
+        return this.selectedThemeProperty;
+    }
+
+    public StringProperty customPathToThemeProperty() {
+        return customPathToThemeProperty;
+    }
+
+    public void importCSSFile() {
+        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
+                .addExtensionFilter(StandardFileType.CSS)
+                .withDefaultExtension(StandardFileType.CSS)
+                .withInitialDirectory(preferences.getInternalPreferences().getLastPreferencesExportPath()).build();
+
+        dialogService.showFileOpenDialog(fileDialogConfiguration).ifPresent(file ->
+                customPathToThemeProperty.setValue(file.toAbsolutePath().toString()));
+    }
+
+    public BooleanProperty fontOverrideProperty() {
+        return fontOverrideProperty;
+    }
+
+    public StringProperty fontSizeProperty() {
+        return fontSizeProperty;
+    }
+
+    public BooleanProperty openLastStartupProperty() {
+        return openLastStartupProperty;
+    }
+
+    public BooleanProperty showAdvancedHintsProperty() {
+        return this.showAdvancedHintsProperty;
     }
 
     public BooleanProperty inspectionWarningDuplicateProperty() {
@@ -114,15 +287,38 @@ public BooleanProperty confirmDeleteProperty() {
         return this.confirmDeleteProperty;
     }
 
-    public BooleanProperty memoryStickModeProperty() {
-        return this.memoryStickModeProperty;
-    }
-
     public BooleanProperty collectTelemetryProperty() {
         return this.collectTelemetryProperty;
     }
 
-    public BooleanProperty showAdvancedHintsProperty() {
-        return this.showAdvancedHintsProperty;
+    public ListProperty<BibDatabaseMode> biblatexModeListProperty() {
+        return this.bibliographyModeListProperty;
+    }
+
+    public ObjectProperty<BibDatabaseMode> selectedBiblatexModeProperty() {
+        return this.selectedBiblatexModeProperty;
+    }
+
+    public BooleanProperty alwaysReformatBibProperty() {
+        return alwaysReformatBibProperty;
+    }
+
+    public BooleanProperty autosaveLocalLibrariesProperty() {
+        return autosaveLocalLibraries;
+    }
+
+    public BooleanProperty createBackupProperty() {
+        return this.createBackupProperty;
+    }
+
+    public StringProperty backupDirectoryProperty() {
+        return this.backupDirectoryProperty;
+    }
+
+    public void backupFileDirBrowse() {
+        DirectoryDialogConfiguration dirDialogConfiguration =
+                new DirectoryDialogConfiguration.Builder().withInitialDirectory(Path.of(backupDirectoryProperty().getValue())).build();
+        dialogService.showDirectorySelectionDialog(dirDialogConfiguration)
+                     .ifPresent(dir -> backupDirectoryProperty.setValue(dir.toString()));
     }
 }
diff --git a/src/main/java/org/jabref/gui/preferences/journals/AbbreviationsFileViewModel.java b/src/main/java/org/jabref/gui/preferences/journals/AbbreviationsFileViewModel.java
index c1e8424d45c..7e2a4b2f4f7 100644
--- a/src/main/java/org/jabref/gui/preferences/journals/AbbreviationsFileViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/journals/AbbreviationsFileViewModel.java
@@ -101,8 +101,8 @@ public int hashCode() {
 
     @Override
     public boolean equals(Object obj) {
-        if (obj instanceof AbbreviationsFileViewModel) {
-            return Objects.equals(this.name, ((AbbreviationsFileViewModel) obj).name);
+        if (obj instanceof AbbreviationsFileViewModel model) {
+            return Objects.equals(this.name, model.name);
         } else {
             return false;
         }
diff --git a/src/main/java/org/jabref/gui/preferences/journals/JournalAbbreviationsTabViewModel.java b/src/main/java/org/jabref/gui/preferences/journals/JournalAbbreviationsTabViewModel.java
index 78da755da3f..c7be0ebe1a3 100644
--- a/src/main/java/org/jabref/gui/preferences/journals/JournalAbbreviationsTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/journals/JournalAbbreviationsTabViewModel.java
@@ -341,7 +341,7 @@ public void storeSettings() {
                         shouldWriteLists = false;
                     }
                 })
-                .onSuccess((success) -> Globals.journalAbbreviationRepository =
+                .onSuccess(success -> Globals.journalAbbreviationRepository =
                         JournalAbbreviationLoader.loadRepository(abbreviationsPreferences))
                 .onFailure(exception -> LOGGER.error("Failed to store journal preferences.", exception))
                 .executeWith(taskExecutor);
diff --git a/src/main/java/org/jabref/gui/preferences/keybindings/KeyBindingsTab.css b/src/main/java/org/jabref/gui/preferences/keybindings/KeyBindingsTab.css
index 06c5d8fd8be..65ecab8c829 100644
--- a/src/main/java/org/jabref/gui/preferences/keybindings/KeyBindingsTab.css
+++ b/src/main/java/org/jabref/gui/preferences/keybindings/KeyBindingsTab.css
@@ -6,6 +6,7 @@
     visibility: hidden;
 }
 
-.tree-table-row-cell:selected > .tree-table-cell > .icon, .tree-table-row-cell:pressed > .tree-table-cell > .icon {
+.tree-table-row-cell:selected > .tree-table-cell > .icon,
+.tree-table-row-cell:pressed > .tree-table-cell > .icon {
     -fx-fill: white;
 }
diff --git a/src/main/java/org/jabref/gui/preferences/keybindings/KeyBindingsTab.fxml b/src/main/java/org/jabref/gui/preferences/keybindings/KeyBindingsTab.fxml
index ee292c83fcc..6f0f03bec7e 100644
--- a/src/main/java/org/jabref/gui/preferences/keybindings/KeyBindingsTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/keybindings/KeyBindingsTab.fxml
@@ -3,7 +3,6 @@
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.MenuButton?>
-<?import javafx.scene.control.Tooltip?>
 <?import javafx.scene.control.TreeTableColumn?>
 <?import javafx.scene.control.TreeTableView?>
 <?import javafx.scene.layout.HBox?>
@@ -27,15 +26,12 @@
         </columnResizePolicy>
     </TreeTableView>
 
-    <HBox spacing="4" alignment="CENTER_RIGHT">
-        <MenuButton fx:id="presetsButton" text="%Presets"/>
-        <Button prefHeight="20.0" prefWidth="20.0" styleClass="icon-button,narrow" onAction="#resetBindings">
+    <HBox spacing="10.0" alignment="CENTER_RIGHT">
+        <MenuButton fx:id="presetsButton" text="%Presets" styleClass="button"/>
+        <Button text="%Reset all" onAction="#resetBindings">
             <graphic>
                 <JabRefIconView glyph="REFRESH"/>
             </graphic>
-            <tooltip>
-                <Tooltip text="%Reset Bindings"/>
-            </tooltip>
         </Button>
     </HBox>
 </fx:root>
diff --git a/src/main/java/org/jabref/gui/preferences/keybindings/KeyBindingsTab.java b/src/main/java/org/jabref/gui/preferences/keybindings/KeyBindingsTab.java
index c4c04fe86c8..973159b9378 100644
--- a/src/main/java/org/jabref/gui/preferences/keybindings/KeyBindingsTab.java
+++ b/src/main/java/org/jabref/gui/preferences/keybindings/KeyBindingsTab.java
@@ -54,7 +54,7 @@ private void initialize() {
                         .mapObservable(SelectionModel::selectedItemProperty)
                         .mapObservable(TreeItem::valueProperty)
         );
-        keyBindingsTable.setOnKeyPressed(evt -> viewModel.setNewBindingForCurrent(evt));
+        keyBindingsTable.setOnKeyPressed(viewModel::setNewBindingForCurrent);
         keyBindingsTable.rootProperty().bind(
                 EasyBind.map(viewModel.rootKeyBindingProperty(),
                         keybinding -> new RecursiveTreeItem<>(keybinding, KeyBindingViewModel::getChildren))
@@ -75,7 +75,7 @@ private void initialize() {
 
     private MenuItem createMenuItem(KeyBindingPreset preset) {
         MenuItem item = new MenuItem(preset.getName());
-        item.setOnAction((event) -> viewModel.loadPreset(preset));
+        item.setOnAction(event -> viewModel.loadPreset(preset));
         return item;
     }
 
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 558ac2db289..83325c8e3f2 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, dialogService), autolinkRegexHelp);
+        actionFactory.configureIconButton(StandardActions.HELP_REGEX_SEARCH, new HelpAction(HelpFile.REGEX_SEARCH, dialogService, preferencesService.getFilePreferences()), autolinkRegexHelp);
 
         validationVisualizer.setDecoration(new IconValidationDecorator());
         Platform.runLater(() -> validationVisualizer.initVisualization(viewModel.mainFileDirValidationStatus(), mainFileDirectory));
diff --git a/src/main/java/org/jabref/gui/preferences/linkedfiles/LinkedFilesTabViewModel.java b/src/main/java/org/jabref/gui/preferences/linkedfiles/LinkedFilesTabViewModel.java
index 6acc9830346..d020b267179 100644
--- a/src/main/java/org/jabref/gui/preferences/linkedfiles/LinkedFilesTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/linkedfiles/LinkedFilesTabViewModel.java
@@ -54,16 +54,9 @@ public LinkedFilesTabViewModel(DialogService dialogService, PreferencesService p
         mainFileDirValidator = new FunctionBasedValidator<>(
                 mainFileDirectoryProperty,
                 mainDirectoryPath -> {
-                    ValidationMessage error = ValidationMessage.error(String.format(
-                            "%s%n%s%n%n%s%n%n%s > %s > %s",
-                            Localization.lang("Main directory not found"),
-                            mainDirectoryPath,
-                            Localization.lang("Please select a valid main directory under"),
-                            Localization.lang("Linked files"),
-                            Localization.lang("File directory"),
-                            Localization.lang("Main file directory")
-                    ));
-
+                    ValidationMessage error = ValidationMessage.error(
+                            Localization.lang("Main file directory '%0' not found.\nCheck the tab \"Linked files\".", mainDirectoryPath)
+                    );
                     try {
                         Path path = Path.of(mainDirectoryPath);
                         if (!(Files.exists(path) && Files.isDirectory(path))) {
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 84ccc80d80d..932678f7cfa 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, dialogService), formatterHelp);
+        actionFactory.configureIconButton(StandardActions.HELP_NAME_FORMATTER, new HelpAction(HelpFile.CUSTOM_EXPORTS_NAME_FORMATTER, dialogService, preferencesService.getFilePreferences()), formatterHelp);
     }
 
     public void addFormatter() {
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 a7851acdbb2..8f765eb061f 100644
--- a/src/main/java/org/jabref/gui/preferences/network/NetworkTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/network/NetworkTab.fxml
@@ -4,6 +4,7 @@
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.CheckBox?>
 <?import javafx.scene.control.Label?>
+<?import javafx.scene.control.SplitPane?>
 <?import javafx.scene.control.TableColumn?>
 <?import javafx.scene.control.TableView?>
 <?import javafx.scene.control.TextField?>
@@ -16,6 +17,8 @@
 <?import org.controlsfx.control.textfield.CustomPasswordField?>
 <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" />
+    <CheckBox fx:id="versionCheck" text="%Check for latest version online"/>
+    <Label text="%Please use the latest version of JabRef if you run into a bug. If you encounter an issue or a bug, check the latest version, if the issue is still present." wrapText="true"/>
     <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">
@@ -50,7 +53,9 @@
         <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="info-message" text="%Password kept for this session only." GridPane.columnIndex="2" GridPane.rowIndex="5" />
+        <SplitPane fx:id="persistentTooltipWrapper" GridPane.columnIndex="2" GridPane.rowIndex="5">
+            <CheckBox fx:id="proxyPersistPassword" text="%Persist password between sessions"/>
+        </SplitPane>
         <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" />
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 1002f80b22e..71e70e5b1f0 100644
--- a/src/main/java/org/jabref/gui/preferences/network/NetworkTab.java
+++ b/src/main/java/org/jabref/gui/preferences/network/NetworkTab.java
@@ -10,9 +10,11 @@
 import javafx.scene.control.Button;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.Label;
+import javafx.scene.control.SplitPane;
 import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableView;
 import javafx.scene.control.TextField;
+import javafx.scene.control.Tooltip;
 import javafx.scene.input.MouseEvent;
 
 import org.jabref.gui.Globals;
@@ -26,14 +28,18 @@
 import org.jabref.gui.util.ValueTableCellFactory;
 import org.jabref.logic.help.HelpFile;
 import org.jabref.logic.l10n.Localization;
+import org.jabref.model.entry.BibEntryTypesManager;
+import org.jabref.model.util.FileUpdateMonitor;
 
 import com.airhacks.afterburner.views.ViewLoader;
 import com.tobiasdiez.easybind.EasyBind;
 import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
+import jakarta.inject.Inject;
 import org.controlsfx.control.textfield.CustomPasswordField;
 
 public class NetworkTab extends AbstractPreferenceTabView<NetworkTabViewModel> implements PreferencesTab {
     @FXML private Label remoteLabel;
+    @FXML private CheckBox versionCheck;
     @FXML private CheckBox remoteServer;
     @FXML private TextField remotePort;
     @FXML private Button remoteHelp;
@@ -48,8 +54,9 @@ public class NetworkTab extends AbstractPreferenceTabView<NetworkTabViewModel> i
     @FXML private TextField proxyUsername;
     @FXML private Label proxyPasswordLabel;
     @FXML private CustomPasswordField proxyPassword;
-    @FXML private Label proxyAttentionLabel;
     @FXML private Button checkConnectionButton;
+    @FXML private CheckBox proxyPersistPassword;
+    @FXML private SplitPane persistentTooltipWrapper; // The disabled persistPassword control does not show tooltips
 
     @FXML private TableView<CustomCertificateViewModel> customCertificatesTable;
     @FXML private TableColumn<CustomCertificateViewModel, String> certIssuer;
@@ -60,6 +67,8 @@ public class NetworkTab extends AbstractPreferenceTabView<NetworkTabViewModel> i
     @FXML private TableColumn<CustomCertificateViewModel, String> certVersion;
     @FXML private TableColumn<CustomCertificateViewModel, String> actionsColumn;
 
+    @Inject private FileUpdateMonitor fileUpdateMonitor;
+    @Inject private BibEntryTypesManager entryTypesManager;
 
     private String proxyPasswordText = "";
     private int proxyPasswordCaretPosition = 0;
@@ -78,9 +87,11 @@ public String getTabName() {
     }
 
     public void initialize() {
-        this.viewModel = new NetworkTabViewModel(dialogService, preferencesService);
+        this.viewModel = new NetworkTabViewModel(dialogService, preferencesService, fileUpdateMonitor, entryTypesManager);
 
-        remoteLabel.setVisible(preferencesService.getGeneralPreferences().shouldShowAdvancedHints());
+        versionCheck.selectedProperty().bindBidirectional(viewModel.versionCheckProperty());
+
+        remoteLabel.setVisible(preferencesService.getWorkspacePreferences().shouldShowAdvancedHints());
         remoteServer.selectedProperty().bindBidirectional(viewModel.remoteServerProperty());
         remotePort.textProperty().bindBidirectional(viewModel.remotePortProperty());
         remotePort.disableProperty().bind(remoteServer.selectedProperty().not());
@@ -102,7 +113,16 @@ public void initialize() {
         proxyPasswordLabel.disableProperty().bind(proxyCustomAndAuthentication.not());
         proxyPassword.textProperty().bindBidirectional(viewModel.proxyPasswordProperty());
         proxyPassword.disableProperty().bind(proxyCustomAndAuthentication.not());
-        proxyAttentionLabel.disableProperty().bind(proxyCustomAndAuthentication.not());
+        proxyPersistPassword.selectedProperty().bindBidirectional(viewModel.proxyPersistPasswordProperty());
+        proxyPersistPassword.disableProperty().bind(
+                proxyCustomAndAuthentication.and(viewModel.passwordPersistAvailable()).not());
+        EasyBind.subscribe(viewModel.passwordPersistAvailable(), available -> {
+            if (!available) {
+                persistentTooltipWrapper.setTooltip(new Tooltip(Localization.lang("Credential store not available.")));
+            } else {
+                persistentTooltipWrapper.setTooltip(null);
+            }
+        });
 
         proxyPassword.setRight(IconTheme.JabRefIcons.PASSWORD_REVEALED.getGraphicNode());
         proxyPassword.getRight().addEventFilter(MouseEvent.MOUSE_PRESSED, this::proxyPasswordReveal);
@@ -110,7 +130,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, dialogService), remoteHelp);
+        actionFactory.configureIconButton(StandardActions.HELP, new HelpAction(HelpFile.REMOTE, dialogService, preferencesService.getFilePreferences()), remoteHelp);
 
         validationVisualizer.setDecoration(new IconValidationDecorator());
         Platform.runLater(() -> {
@@ -155,7 +175,7 @@ private void proxyPasswordReveal(MouseEvent event) {
     }
 
     private void proxyPasswordMask(MouseEvent event) {
-        if (!proxyPasswordText.equals("")) {
+        if (!"".equals(proxyPasswordText)) {
             proxyPassword.setText(proxyPasswordText);
             proxyPassword.positionCaret(proxyPasswordCaretPosition);
             proxyPassword.setPromptText("");
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 9e74c55722b..7991e86493e 100644
--- a/src/main/java/org/jabref/gui/preferences/network/NetworkTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/network/NetworkTabViewModel.java
@@ -4,12 +4,12 @@
 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.ReadOnlyBooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleListProperty;
 import javafx.beans.property.SimpleStringProperty;
@@ -28,12 +28,15 @@
 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.OS;
 import org.jabref.logic.util.StandardFileType;
+import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.strings.StringUtil;
+import org.jabref.model.util.FileUpdateMonitor;
+import org.jabref.preferences.InternalPreferences;
 import org.jabref.preferences.PreferencesService;
 
 import de.saxsys.mvvmfx.utils.validation.CompositeValidator;
@@ -42,12 +45,9 @@
 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 versionCheckProperty = new SimpleBooleanProperty();
     private final BooleanProperty remoteServerProperty = new SimpleBooleanProperty();
     private final StringProperty remotePortProperty = new SimpleStringProperty("");
     private final BooleanProperty proxyUseProperty = new SimpleBooleanProperty();
@@ -56,6 +56,8 @@ 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 BooleanProperty proxyPersistPasswordProperty = new SimpleBooleanProperty();
+    private final BooleanProperty passwordPersistAvailable = new SimpleBooleanProperty();
     private final ListProperty<CustomCertificateViewModel> customCertificateListProperty = new SimpleListProperty<>(FXCollections.observableArrayList());
 
     private final Validator remotePortValidator;
@@ -66,21 +68,29 @@ public class NetworkTabViewModel implements PreferenceTabViewModel {
 
     private final DialogService dialogService;
     private final PreferencesService preferences;
+    private final FileUpdateMonitor fileUpdateMonitor;
+    private final BibEntryTypesManager entryTypesManager;
+
     private final RemotePreferences remotePreferences;
     private final ProxyPreferences proxyPreferences;
     private final ProxyPreferences backupProxyPreferences;
-    private final SSLPreferences sslPreferences;
+    private final InternalPreferences internalPreferences;
 
     private final TrustStoreManager trustStoreManager;
 
     private final AtomicBoolean sslCertificatesChanged = new AtomicBoolean(false);
 
-    public NetworkTabViewModel(DialogService dialogService, PreferencesService preferences) {
+    public NetworkTabViewModel(DialogService dialogService,
+                               PreferencesService preferences,
+                               FileUpdateMonitor fileUpdateMonitor,
+                               BibEntryTypesManager entryTypesManager) {
         this.dialogService = dialogService;
         this.preferences = preferences;
+        this.fileUpdateMonitor = fileUpdateMonitor;
+        this.entryTypesManager = entryTypesManager;
         this.remotePreferences = preferences.getRemotePreferences();
         this.proxyPreferences = preferences.getProxyPreferences();
-        this.sslPreferences = preferences.getSSLPreferences();
+        this.internalPreferences = preferences.getInternalPreferences();
 
         backupProxyPreferences = new ProxyPreferences(
                 proxyPreferences.shouldUseProxy(),
@@ -88,7 +98,8 @@ public NetworkTabViewModel(DialogService dialogService, PreferencesService prefe
                 proxyPreferences.getPort(),
                 proxyPreferences.shouldUseAuthentication(),
                 proxyPreferences.getUsername(),
-                proxyPreferences.getPassword());
+                proxyPreferences.getPassword(),
+                proxyPreferences.shouldPersistPassword());
 
         remotePortValidator = new FunctionBasedValidator<>(
                 remotePortProperty,
@@ -131,16 +142,18 @@ public NetworkTabViewModel(DialogService dialogService, PreferencesService prefe
 
         proxyPasswordValidator = new FunctionBasedValidator<>(
                 proxyPasswordProperty,
-                input -> input.length() > 0,
+                input -> !input.isBlank(),
                 ValidationMessage.error(String.format("%s > %s %n %n %s",
                         Localization.lang("Network"),
                         Localization.lang("Proxy configuration"),
                         Localization.lang("Please specify a password"))));
-        this.trustStoreManager = new TrustStoreManager(Path.of(sslPreferences.getTruststorePath()));
+
+        this.trustStoreManager = new TrustStoreManager(Path.of(preferences.getSSLPreferences().getTruststorePath()));
     }
 
     @Override
     public void setValues() {
+        versionCheckProperty.setValue(internalPreferences.isVersionCheckEnabled());
         remoteServerProperty.setValue(remotePreferences.useRemoteServer());
         remotePortProperty.setValue(String.valueOf(remotePreferences.getPort()));
 
@@ -155,6 +168,8 @@ private void setProxyValues() {
         proxyUseAuthenticationProperty.setValue(proxyPreferences.shouldUseAuthentication());
         proxyUsernameProperty.setValue(proxyPreferences.getUsername());
         proxyPasswordProperty.setValue(proxyPreferences.getPassword());
+        proxyPersistPasswordProperty.setValue(proxyPreferences.shouldPersistPassword());
+        passwordPersistAvailable.setValue(OS.isKeyringAvailable());
     }
 
     private void setSSLValues() {
@@ -177,23 +192,7 @@ private void setSSLValues() {
 
     @Override
     public void storeSettings() {
-        storeRemoteSettings();
-        storeProxySettings(new ProxyPreferences(
-                proxyUseProperty.getValue(),
-                proxyHostnameProperty.getValue().trim(),
-                proxyPortProperty.getValue().trim(),
-                proxyUseAuthenticationProperty.getValue(),
-                proxyUsernameProperty.getValue().trim(),
-                proxyPasswordProperty.getValue()
-        ));
-        storeSSLSettings();
-    }
-
-    private void storeRemoteSettings() {
-        RemotePreferences newRemotePreferences = new RemotePreferences(
-                remotePreferences.getPort(),
-                remoteServerProperty.getValue()
-        );
+        internalPreferences.setVersionCheckEnabled(versionCheckProperty.getValue());
 
         getPortAsInt(remotePortProperty.getValue()).ifPresent(newPort -> {
             if (remotePreferences.isDifferentPort(newPort)) {
@@ -203,30 +202,21 @@ private void storeRemoteSettings() {
 
         if (remoteServerProperty.getValue()) {
             remotePreferences.setUseRemoteServer(true);
-            Globals.REMOTE_LISTENER.openAndStart(new CLIMessageHandler(preferences), remotePreferences.getPort());
+            Globals.REMOTE_LISTENER.openAndStart(new CLIMessageHandler(preferences, fileUpdateMonitor, entryTypesManager), remotePreferences.getPort());
         } else {
             remotePreferences.setUseRemoteServer(false);
             Globals.REMOTE_LISTENER.stop();
         }
-    }
-
-    private void storeProxySettings(ProxyPreferences newProxyPreferences) {
-        if (Objects.equals(newProxyPreferences, proxyPreferences)) {
-            // nothing changed; thus, nothing to store
-            return;
-        }
 
-        ProxyRegisterer.register(newProxyPreferences);
+        proxyPreferences.setUseProxy(proxyUseProperty.getValue());
+        proxyPreferences.setHostname(proxyHostnameProperty.getValue().trim());
+        proxyPreferences.setPort(proxyPortProperty.getValue().trim());
+        proxyPreferences.setUseAuthentication(proxyUseAuthenticationProperty.getValue());
+        proxyPreferences.setUsername(proxyUsernameProperty.getValue().trim());
+        proxyPreferences.setPersistPassword(proxyPersistPasswordProperty.getValue()); // Set before the password to actually persist
+        proxyPreferences.setPassword(proxyPasswordProperty.getValue());
+        ProxyRegisterer.register(proxyPreferences);
 
-        proxyPreferences.setUseProxy(newProxyPreferences.shouldUseProxy());
-        proxyPreferences.setHostname(newProxyPreferences.getHostname());
-        proxyPreferences.setPort(newProxyPreferences.getPort());
-        proxyPreferences.setUseAuthentication(newProxyPreferences.shouldUseAuthentication());
-        proxyPreferences.setUsername(newProxyPreferences.getUsername());
-        proxyPreferences.setPassword(newProxyPreferences.getPassword());
-    }
-
-    public void storeSSLSettings() {
         trustStoreManager.flush();
     }
 
@@ -295,15 +285,14 @@ public void checkConnection() {
 
         final String testUrl = "http://jabref.org";
 
-        // Workaround for testing, since the URLDownload uses stored proxy settings, see
-        // preferences.storeProxyPreferences(...) below.
-        storeProxySettings(new ProxyPreferences(
+        ProxyRegisterer.register(new ProxyPreferences(
                 proxyUseProperty.getValue(),
                 proxyHostnameProperty.getValue().trim(),
                 proxyPortProperty.getValue().trim(),
                 proxyUseAuthenticationProperty.getValue(),
                 proxyUsernameProperty.getValue().trim(),
-                proxyPasswordProperty.getValue()
+                proxyPasswordProperty.getValue(),
+                proxyPersistPasswordProperty.getValue()
         ));
 
         URLDownload urlDownload;
@@ -320,7 +309,7 @@ public void checkConnection() {
             dialogService.showErrorDialogAndWait(dialogTitle, connectionFailedText);
         }
 
-        storeProxySettings(backupProxyPreferences);
+        ProxyRegisterer.register(backupProxyPreferences);
     }
 
     @Override
@@ -332,6 +321,10 @@ public List<String> getRestartWarnings() {
         }
     }
 
+    public BooleanProperty versionCheckProperty() {
+        return versionCheckProperty;
+    }
+
     public BooleanProperty remoteServerProperty() {
         return remoteServerProperty;
     }
@@ -364,6 +357,14 @@ public StringProperty proxyPasswordProperty() {
         return proxyPasswordProperty;
     }
 
+    public BooleanProperty proxyPersistPasswordProperty() {
+        return proxyPersistPasswordProperty;
+    }
+
+    public ReadOnlyBooleanProperty passwordPersistAvailable() {
+        return passwordPersistAvailable;
+    }
+
     public ListProperty<CustomCertificateViewModel> customCertificateListProperty() {
         return customCertificateListProperty;
     }
diff --git a/src/main/java/org/jabref/gui/preferences/preview/PreviewTab.java b/src/main/java/org/jabref/gui/preferences/preview/PreviewTab.java
index 10ff3bcf9aa..cd50d49cfdb 100644
--- a/src/main/java/org/jabref/gui/preferences/preview/PreviewTab.java
+++ b/src/main/java/org/jabref/gui/preferences/preview/PreviewTab.java
@@ -156,7 +156,7 @@ public void initialize() {
         sortUpButton.disableProperty().bind(viewModel.chosenSelectionModelProperty().getValue().selectedItemProperty().isNull());
         sortDownButton.disableProperty().bind(viewModel.chosenSelectionModelProperty().getValue().selectedItemProperty().isNull());
 
-        PreviewViewer previewViewer = new PreviewViewer(new BibDatabaseContext(), dialogService, stateManager, themeManager);
+        PreviewViewer previewViewer = new PreviewViewer(new BibDatabaseContext(), dialogService, preferencesService, stateManager, themeManager);
         previewViewer.setEntry(TestEntry.getTestEntry());
         EasyBind.subscribe(viewModel.selectedLayoutProperty(), previewViewer::setLayout);
         previewViewer.visibleProperty().bind(viewModel.chosenSelectionModelProperty().getValue().selectedItemProperty().isNotNull()
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 397e7687c58..7a06975c0ab 100644
--- a/src/main/java/org/jabref/gui/preferences/preview/PreviewTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/preview/PreviewTabViewModel.java
@@ -117,13 +117,13 @@ public void setValues() {
         chosenListProperty.getValue().addAll(previewPreferences.getLayoutCycle());
 
         availableListProperty.clear();
-        if (chosenListProperty.stream().noneMatch(layout -> layout instanceof TextBasedPreviewLayout)) {
+        if (chosenListProperty.stream().noneMatch(TextBasedPreviewLayout.class::isInstance)) {
             availableListProperty.getValue().add(previewPreferences.getCustomPreviewLayout());
         }
 
         BackgroundTask.wrap(CitationStyle::discoverCitationStyles)
                       .onSuccess(styles -> styles.stream()
-                                                 .map(style-> new CitationStylePreviewLayout(style, Globals.entryTypesManager))
+                                                 .map(style -> new CitationStylePreviewLayout(style, Globals.entryTypesManager))
                                                  .filter(style -> chosenListProperty.getValue().filtered(item ->
                                                          item.getName().equals(style.getName())).isEmpty())
                                                  .sorted(Comparator.comparing(PreviewLayout::getName))
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 ac17b25d736..93ffa2b05fb 100644
--- a/src/main/java/org/jabref/gui/preferences/protectedterms/ProtectedTermsTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/protectedterms/ProtectedTermsTabViewModel.java
@@ -27,6 +27,7 @@
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.util.OptionalUtil;
+import org.jabref.preferences.FilePreferences;
 import org.jabref.preferences.PreferencesService;
 
 import org.slf4j.Logger;
@@ -37,17 +38,17 @@ public class ProtectedTermsTabViewModel implements PreferenceTabViewModel {
 
     private final ProtectedTermsLoader termsLoader;
     private final ListProperty<ProtectedTermsListItemModel> termsFilesProperty = new SimpleListProperty<>(FXCollections.observableArrayList());
-    private final PreferencesService preferences;
+    private final FilePreferences filePreferences;
     private final DialogService dialogService;
     private final ProtectedTermsPreferences protectedTermsPreferences;
 
     public ProtectedTermsTabViewModel(ProtectedTermsLoader termsLoader,
                                       DialogService dialogService,
-                                      PreferencesService preferences) {
+                                      PreferencesService preferencesService) {
         this.termsLoader = termsLoader;
         this.dialogService = dialogService;
-        this.preferences = preferences;
-        this.protectedTermsPreferences = preferences.getProtectedTermsPreferences();
+        this.filePreferences = preferencesService.getFilePreferences();
+        this.protectedTermsPreferences = preferencesService.getProtectedTermsPreferences();
     }
 
     @Override
@@ -92,7 +93,7 @@ public void addFile() {
         FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
                 .addExtensionFilter(Localization.lang("Protected terms file"), StandardFileType.TERMS)
                 .withDefaultExtension(Localization.lang("Protected terms file"), StandardFileType.TERMS)
-                .withInitialDirectory(preferences.getFilePreferences().getWorkingDirectory())
+                .withInitialDirectory(filePreferences.getWorkingDirectory())
                 .build();
 
         dialogService.showFileOpenDialog(fileDialogConfiguration)
@@ -116,18 +117,18 @@ public void removeList(ProtectedTermsListItemModel itemModel) {
     }
 
     public void createNewFile() {
-        dialogService.showCustomDialogAndWait(new NewProtectedTermsFileDialog(termsFilesProperty, dialogService, preferences.getFilePreferences()));
+        dialogService.showCustomDialogAndWait(new NewProtectedTermsFileDialog(termsFilesProperty, dialogService, filePreferences));
     }
 
     public void edit(ProtectedTermsListItemModel file) {
         Optional<ExternalFileType> termsFileType = OptionalUtil.<ExternalFileType>orElse(
-                ExternalFileTypes.getExternalFileTypeByExt("terms", preferences.getFilePreferences()),
-                ExternalFileTypes.getExternalFileTypeByExt("txt", preferences.getFilePreferences())
+                ExternalFileTypes.getExternalFileTypeByExt("terms", filePreferences),
+                ExternalFileTypes.getExternalFileTypeByExt("txt", filePreferences)
         );
 
         String fileName = file.getTermsList().getLocation();
         try {
-            JabRefDesktop.openExternalFileAnyFormat(new BibDatabaseContext(), preferences, fileName, termsFileType);
+            JabRefDesktop.openExternalFileAnyFormat(new BibDatabaseContext(), filePreferences, fileName, termsFileType);
         } catch (IOException e) {
             LOGGER.warn("Problem open protected terms file editor", e);
         }
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 e3ab7004598..4d802c8b611 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, dialogService), specialFieldsHelp);
+        actionFactory.configureIconButton(StandardActions.HELP_SPECIAL_FIELDS, new HelpAction(HelpFile.SPECIAL_FIELDS, dialogService, preferencesService.getFilePreferences()), 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 5c4daec2830..52c488b0cfe 100644
--- a/src/main/java/org/jabref/gui/preferences/table/TableTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/table/TableTabViewModel.java
@@ -193,7 +193,8 @@ private void removeExtraFileColumns() {
     }
 
     public void insertColumnInList() {
-        if (addColumnProperty.getValue() == null) {
+        if (addColumnProperty.getValue() == null ||
+            addColumnProperty.getValue().getQualifier().isEmpty()) {
             return;
         }
 
diff --git a/src/main/java/org/jabref/gui/preferences/importexport/ImportExportTab.fxml b/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTab.fxml
similarity index 82%
rename from src/main/java/org/jabref/gui/preferences/importexport/ImportExportTab.fxml
rename to src/main/java/org/jabref/gui/preferences/websearch/WebSearchTab.fxml
index c698a797910..6bd19f653ca 100644
--- a/src/main/java/org/jabref/gui/preferences/importexport/ImportExportTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTab.fxml
@@ -4,17 +4,18 @@
 <?import javafx.scene.control.CheckBox?>
 <?import javafx.scene.control.ComboBox?>
 <?import javafx.scene.control.Label?>
+<?import javafx.scene.control.SplitPane?>
 <?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">
-    <Label styleClass="titleHeader" text="%Import and Export"/>
+         fx:controller="org.jabref.gui.preferences.websearch.WebSearchTab">
+    <Label styleClass="titleHeader" text="%Web search"/>
 
     <Label styleClass="sectionHeader" text="%General"/>
+    <CheckBox fx:id="enableWebSearch" text="%Enable web search"/>
     <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"/>
     <CheckBox fx:id="downloadLinkedOnlineFiles" text="%Download linked online files"/>
@@ -25,9 +26,6 @@
         <TextField fx:id="useCustomDOIName" HBox.hgrow="ALWAYS"/>
     </HBox>
 
-    <Label styleClass="sectionHeader" text="%Export sort order"/>
-    <SaveOrderConfigPanel fx:id="exportOrderPanel"/>
-
     <Label styleClass="sectionHeader" text="%Remote services"/>
     <CheckBox fx:id="grobidEnabled" text="%Allow sending PDF files and raw citation strings to a JabRef online service (Grobid) to determine Metadata. This produces better results."/>
     <HBox alignment="CENTER_LEFT" spacing="10.0">
@@ -42,8 +40,12 @@
         <CheckBox fx:id="useCustomApiKey" text="%Custom">
         </CheckBox>
     </HBox>
-    <HBox alignment="CENTER_LEFT" >
+
+    <HBox alignment="CENTER_LEFT" spacing="10.0">
         <Button fx:id="testCustomApiKey" text="%Check connection" onAction="#checkCustomApiKey"
                 prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="6"/>
+        <SplitPane fx:id="persistentTooltipWrapper">
+            <CheckBox fx:id="persistApiKeys" text="%Persist api keys between sessions"/>
+        </SplitPane>
     </HBox>
 </fx:root>
diff --git a/src/main/java/org/jabref/gui/preferences/importexport/ImportExportTab.java b/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTab.java
similarity index 74%
rename from src/main/java/org/jabref/gui/preferences/importexport/ImportExportTab.java
rename to src/main/java/org/jabref/gui/preferences/websearch/WebSearchTab.java
index 3018a76daca..f7302a5696c 100644
--- a/src/main/java/org/jabref/gui/preferences/importexport/ImportExportTab.java
+++ b/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTab.java
@@ -1,13 +1,14 @@
-package org.jabref.gui.preferences.importexport;
+package org.jabref.gui.preferences.websearch;
 
 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.SplitPane;
 import javafx.scene.control.TextField;
+import javafx.scene.control.Tooltip;
 
-import org.jabref.gui.commonfxcontrols.SaveOrderConfigPanel;
 import org.jabref.gui.preferences.AbstractPreferenceTabView;
 import org.jabref.gui.preferences.PreferencesTab;
 import org.jabref.gui.util.ViewModelListCellFactory;
@@ -15,27 +16,30 @@
 import org.jabref.logic.preferences.FetcherApiKey;
 
 import com.airhacks.afterburner.views.ViewLoader;
+import com.tobiasdiez.easybind.EasyBind;
 
-public class ImportExportTab extends AbstractPreferenceTabView<ImportExportTabViewModel> implements PreferencesTab {
+public class WebSearchTab extends AbstractPreferenceTabView<WebSearchTabViewModel> implements PreferencesTab {
 
+    @FXML private CheckBox enableWebSearch;
     @FXML private CheckBox generateNewKeyOnImport;
+    @FXML private CheckBox warnAboutDuplicatesOnImport;
+    @FXML private CheckBox downloadLinkedOnlineFiles;
+
     @FXML private CheckBox useCustomDOI;
     @FXML private TextField useCustomDOIName;
 
-    @FXML private SaveOrderConfigPanel exportOrderPanel;
+    @FXML private CheckBox grobidEnabled;
+    @FXML private TextField grobidURL;
 
     @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 persistApiKeys;
+    @FXML private SplitPane persistentTooltipWrapper; // The disabled persistApiKeys control does not show tooltips
 
-    @FXML private CheckBox warnAboutDuplicatesOnImport;
-    @FXML private CheckBox downloadLinkedOnlineFiles;
-
-    public ImportExportTab() {
+    public WebSearchTab() {
         ViewLoader.view(this)
                   .root(this)
                   .load();
@@ -43,30 +47,24 @@ public ImportExportTab() {
 
     @Override
     public String getTabName() {
-        return Localization.lang("Import and Export");
+        return Localization.lang("Web search");
     }
 
     public void initialize() {
-        this.viewModel = new ImportExportTabViewModel(preferencesService, dialogService);
-
-        useCustomDOI.selectedProperty().bindBidirectional(viewModel.useCustomDOIProperty());
-        useCustomDOIName.textProperty().bindBidirectional(viewModel.useCustomDOINameProperty());
-        useCustomDOIName.disableProperty().bind(useCustomDOI.selectedProperty().not());
+        this.viewModel = new WebSearchTabViewModel(preferencesService, dialogService);
 
+        enableWebSearch.selectedProperty().bindBidirectional(viewModel.enableWebSearchProperty());
         generateNewKeyOnImport.selectedProperty().bindBidirectional(viewModel.generateKeyOnImportProperty());
-
-        exportOrderPanel.saveInOriginalProperty().bindBidirectional(viewModel.saveInOriginalProperty());
-        exportOrderPanel.saveInTableOrderProperty().bindBidirectional(viewModel.saveInTableOrderProperty());
-        exportOrderPanel.saveInSpecifiedOrderProperty().bindBidirectional(viewModel.saveInSpecifiedOrderProperty());
-        exportOrderPanel.sortableFieldsProperty().bind(viewModel.sortableFieldsProperty());
-        exportOrderPanel.sortCriteriaProperty().bindBidirectional(viewModel.sortCriteriaProperty());
-        exportOrderPanel.setCriteriaLimit(3);
+        warnAboutDuplicatesOnImport.selectedProperty().bindBidirectional(viewModel.warnAboutDuplicatesOnImportProperty());
+        downloadLinkedOnlineFiles.selectedProperty().bindBidirectional(viewModel.shouldDownloadLinkedOnlineFiles());
 
         grobidEnabled.selectedProperty().bindBidirectional(viewModel.grobidEnabledProperty());
         grobidURL.textProperty().bindBidirectional(viewModel.grobidURLProperty());
         grobidURL.disableProperty().bind(grobidEnabled.selectedProperty().not());
 
-        downloadLinkedOnlineFiles.selectedProperty().bindBidirectional(viewModel.shouldDownloadLinkedOnlineFiles());
+        useCustomDOI.selectedProperty().bindBidirectional(viewModel.useCustomDOIProperty());
+        useCustomDOIName.textProperty().bindBidirectional(viewModel.useCustomDOINameProperty());
+        useCustomDOIName.disableProperty().bind(useCustomDOI.selectedProperty().not());
 
         new ViewModelListCellFactory<FetcherApiKey>()
                 .withText(FetcherApiKey::getName)
@@ -85,13 +83,21 @@ public void initialize() {
         customApiKey.disableProperty().bind(useCustomApiKey.selectedProperty().not());
         testCustomApiKey.disableProperty().bind(useCustomApiKey.selectedProperty().not());
 
+        persistApiKeys.selectedProperty().bindBidirectional(viewModel.getApikeyPersistProperty());
+        persistApiKeys.disableProperty().bind(viewModel.apiKeyPersistAvailable().not());
+        EasyBind.subscribe(viewModel.apiKeyPersistAvailable(), available -> {
+            if (!available) {
+                persistentTooltipWrapper.setTooltip(new Tooltip(Localization.lang("Credential store not available.")));
+            } else {
+                persistentTooltipWrapper.setTooltip(null);
+            }
+        });
+
         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) {
diff --git a/src/main/java/org/jabref/gui/preferences/importexport/ImportExportTabViewModel.java b/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTabViewModel.java
similarity index 69%
rename from src/main/java/org/jabref/gui/preferences/importexport/ImportExportTabViewModel.java
rename to src/main/java/org/jabref/gui/preferences/websearch/WebSearchTabViewModel.java
index 96196df3284..8be8c005e48 100644
--- a/src/main/java/org/jabref/gui/preferences/importexport/ImportExportTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTabViewModel.java
@@ -1,10 +1,7 @@
-package org.jabref.gui.preferences.importexport;
+package org.jabref.gui.preferences.websearch;
 
 import java.io.IOException;
 import java.net.HttpURLConnection;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
 import java.util.Optional;
 
 import javax.net.ssl.HostnameVerifier;
@@ -14,6 +11,7 @@
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ListProperty;
 import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.ReadOnlyBooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleListProperty;
 import javafx.beans.property.SimpleObjectProperty;
@@ -22,7 +20,6 @@
 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;
@@ -32,106 +29,84 @@
 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.logic.util.OS;
 import org.jabref.preferences.FilePreferences;
-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<>();
-
+public class WebSearchTabViewModel implements PreferenceTabViewModel {
+    private final BooleanProperty enableWebSearchProperty = new SimpleBooleanProperty();
     private final BooleanProperty generateKeyOnImportProperty = new SimpleBooleanProperty();
+    private final BooleanProperty warnAboutDuplicatesOnImportProperty = new SimpleBooleanProperty();
+    private final BooleanProperty shouldDownloadLinkedOnlineFiles = new SimpleBooleanProperty();
 
     private final BooleanProperty useCustomDOIProperty = new SimpleBooleanProperty();
     private final StringProperty useCustomDOINameProperty = new SimpleStringProperty("");
 
-    // SaveOrderConfigPanel
-    private final BooleanProperty exportInOriginalProperty = new SimpleBooleanProperty();
-    private final BooleanProperty exportInTableOrderProperty = new SimpleBooleanProperty();
-    private final BooleanProperty exportInSpecifiedOrderProperty = new SimpleBooleanProperty();
-    private final ListProperty<Field> sortableFieldsProperty = new SimpleListProperty<>(FXCollections.observableArrayList());
-    private final ListProperty<SortCriterionViewModel> sortCriteriaProperty = new SimpleListProperty<>(FXCollections.observableArrayList(new ArrayList<>()));
-
     private final BooleanProperty grobidEnabledProperty = new SimpleBooleanProperty();
     private final StringProperty grobidURLProperty = new SimpleStringProperty("");
-    private final BooleanProperty warnAboutDuplicatesOnImportProperty = new SimpleBooleanProperty();
-    private final BooleanProperty shouldDownloadLinkedOnlineFiles = new SimpleBooleanProperty();
+
+    private final ListProperty<FetcherApiKey> apiKeys = new SimpleListProperty<>();
+    private final ObjectProperty<FetcherApiKey> selectedApiKeyProperty = new SimpleObjectProperty<>();
+    private final BooleanProperty apikeyPersistProperty = new SimpleBooleanProperty();
+    private final BooleanProperty apikeyPersistAvailableProperty = 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;
     private final FilePreferences filePreferences;
 
-    public ImportExportTabViewModel(PreferencesService preferencesService, DialogService dialogService) {
+    public WebSearchTabViewModel(PreferencesService preferencesService, DialogService dialogService) {
         this.dialogService = dialogService;
         this.preferencesService = preferencesService;
         this.importerPreferences = preferencesService.getImporterPreferences();
         this.grobidPreferences = preferencesService.getGrobidPreferences();
         this.doiPreferences = preferencesService.getDOIPreferences();
-        this.initialExportOrder = preferencesService.getExportSaveOrder();
-        this.importExportPreferences = preferencesService.getImportExportPreferences();
         this.filePreferences = preferencesService.getFilePreferences();
     }
 
     @Override
     public void setValues() {
+        enableWebSearchProperty.setValue(importerPreferences.areImporterEnabled());
         generateKeyOnImportProperty.setValue(importerPreferences.isGenerateNewKeyOnImport());
-        useCustomDOIProperty.setValue(doiPreferences.isUseCustom());
-        useCustomDOINameProperty.setValue(doiPreferences.getDefaultBaseURI());
-        warnAboutDuplicatesOnImportProperty.setValue(importExportPreferences.shouldWarnAboutDuplicatesOnImport());
-
+        warnAboutDuplicatesOnImportProperty.setValue(importerPreferences.shouldWarnAboutDuplicatesOnImport());
         shouldDownloadLinkedOnlineFiles.setValue(filePreferences.shouldDownloadLinkedFiles());
 
-        switch (initialExportOrder.getOrderType()) {
-            case SPECIFIED -> exportInSpecifiedOrderProperty.setValue(true);
-            case ORIGINAL -> exportInOriginalProperty.setValue(true);
-            case TABLE -> exportInTableOrderProperty.setValue(true);
-        }
-
-        List<Field> fieldNames = new ArrayList<>(FieldFactory.getCommonFields());
-        fieldNames.sort(Comparator.comparing(Field::getDisplayName));
-
-        sortableFieldsProperty.addAll(fieldNames);
-        sortCriteriaProperty.addAll(initialExportOrder.getSortCriteria().stream()
-                                                      .map(SortCriterionViewModel::new)
-                                                      .toList());
+        useCustomDOIProperty.setValue(doiPreferences.isUseCustom());
+        useCustomDOINameProperty.setValue(doiPreferences.getDefaultBaseURI());
 
         grobidEnabledProperty.setValue(grobidPreferences.isGrobidEnabled());
         grobidURLProperty.setValue(grobidPreferences.getGrobidURL());
 
         apiKeys.setValue(FXCollections.observableArrayList(preferencesService.getImporterPreferences().getApiKeys()));
+        apikeyPersistAvailableProperty.setValue(OS.isKeyringAvailable());
+        apikeyPersistProperty.setValue(preferencesService.getImporterPreferences().shouldPersistCustomKeys());
     }
 
     @Override
     public void storeSettings() {
+        importerPreferences.setImporterEnabled(enableWebSearchProperty.getValue());
         importerPreferences.setGenerateNewKeyOnImport(generateKeyOnImportProperty.getValue());
+        importerPreferences.setWarnAboutDuplicatesOnImport(warnAboutDuplicatesOnImportProperty.getValue());
+        filePreferences.setDownloadLinkedFiles(shouldDownloadLinkedOnlineFiles.getValue());
+
         grobidPreferences.setGrobidEnabled(grobidEnabledProperty.getValue());
         grobidPreferences.setGrobidOptOut(grobidPreferences.isGrobidOptOut());
         grobidPreferences.setGrobidURL(grobidURLProperty.getValue());
 
-        filePreferences.setDownloadLinkedFiles(shouldDownloadLinkedOnlineFiles.getValue());
-
         doiPreferences.setUseCustom(useCustomDOIProperty.get());
         doiPreferences.setDefaultBaseURI(useCustomDOINameProperty.getValue().trim());
 
-        SaveOrderConfig newSaveOrderConfig = new SaveOrderConfig(
-                SaveOrderConfig.OrderType.fromBooleans(exportInSpecifiedOrderProperty.getValue(), exportInOriginalProperty.getValue()),
-                sortCriteriaProperty.stream().map(SortCriterionViewModel::getCriterion).toList());
-        preferencesService.storeExportSaveOrder(newSaveOrderConfig);
-
-        importExportPreferences.setWarnAboutDuplicatesOnImport(warnAboutDuplicatesOnImportProperty.getValue());
-
-        // API keys
+        importerPreferences.setPersistCustomKeys(apikeyPersistProperty.get());
         preferencesService.getImporterPreferences().getApiKeys().clear();
-        preferencesService.getImporterPreferences().getApiKeys().addAll(apiKeys);
+        if (apikeyPersistAvailableProperty.get()) {
+            preferencesService.getImporterPreferences().getApiKeys().addAll(apiKeys);
+        }
+    }
+
+    public BooleanProperty enableWebSearchProperty() {
+        return enableWebSearchProperty;
     }
 
     public BooleanProperty generateKeyOnImportProperty() {
@@ -146,28 +121,6 @@ public StringProperty useCustomDOINameProperty() {
         return this.useCustomDOINameProperty;
     }
 
-    // SaveOrderConfigPanel
-
-    public BooleanProperty saveInOriginalProperty() {
-        return exportInOriginalProperty;
-    }
-
-    public BooleanProperty saveInTableOrderProperty() {
-        return exportInTableOrderProperty;
-    }
-
-    public BooleanProperty saveInSpecifiedOrderProperty() {
-        return exportInSpecifiedOrderProperty;
-    }
-
-    public ListProperty<Field> sortableFieldsProperty() {
-        return sortableFieldsProperty;
-    }
-
-    public ListProperty<SortCriterionViewModel> sortCriteriaProperty() {
-        return sortCriteriaProperty;
-    }
-
     public BooleanProperty grobidEnabledProperty() {
         return grobidEnabledProperty;
     }
@@ -192,6 +145,14 @@ public BooleanProperty shouldDownloadLinkedOnlineFiles() {
         return shouldDownloadLinkedOnlineFiles;
     }
 
+    public ReadOnlyBooleanProperty apiKeyPersistAvailable() {
+        return apikeyPersistAvailableProperty;
+    }
+
+    public BooleanProperty getApikeyPersistProperty() {
+        return apikeyPersistProperty;
+    }
+
     public void checkCustomApiKey() {
         final String apiKeyName = selectedApiKeyProperty.get().getName();
 
diff --git a/src/main/java/org/jabref/gui/preview/CopyCitationAction.java b/src/main/java/org/jabref/gui/preview/CopyCitationAction.java
index 453e81b3d9e..164eec87b57 100644
--- a/src/main/java/org/jabref/gui/preview/CopyCitationAction.java
+++ b/src/main/java/org/jabref/gui/preview/CopyCitationAction.java
@@ -19,15 +19,15 @@
 import org.jabref.logic.citationstyle.CitationStyleGenerator;
 import org.jabref.logic.citationstyle.CitationStyleOutputFormat;
 import org.jabref.logic.citationstyle.CitationStylePreviewLayout;
+import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.layout.Layout;
-import org.jabref.logic.layout.LayoutFormatterPreferences;
 import org.jabref.logic.layout.LayoutHelper;
 import org.jabref.logic.layout.TextBasedPreviewLayout;
 import org.jabref.logic.preview.PreviewLayout;
 import org.jabref.logic.util.OS;
 import org.jabref.model.entry.BibEntry;
-import org.jabref.preferences.PreviewPreferences;
+import org.jabref.preferences.PreferencesService;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -40,29 +40,30 @@ public class CopyCitationAction extends SimpleCommand {
     private static final Logger LOGGER = LoggerFactory.getLogger(CopyCitationAction.class);
 
     private final List<BibEntry> selectedEntries;
-    private final PreviewLayout previewLayout;
-    private final TextBasedPreviewLayout customPreviewLayout;
     private final CitationStyleOutputFormat outputFormat;
 
     private final StateManager stateManager;
     private final DialogService dialogService;
     private final ClipBoardManager clipBoardManager;
     private final TaskExecutor taskExecutor;
+    private final PreferencesService preferencesService;
+    private final JournalAbbreviationRepository abbreviationRepository;
 
     public CopyCitationAction(CitationStyleOutputFormat outputFormat,
                               DialogService dialogService,
                               StateManager stateManager,
                               ClipBoardManager clipBoardManager,
                               TaskExecutor taskExecutor,
-                              PreviewPreferences previewPreferences) {
+                              PreferencesService preferencesService,
+                              JournalAbbreviationRepository abbreviationRepository) {
         this.outputFormat = outputFormat;
         this.dialogService = dialogService;
         this.stateManager = stateManager;
         this.selectedEntries = stateManager.getSelectedEntries();
         this.clipBoardManager = clipBoardManager;
         this.taskExecutor = taskExecutor;
-        this.previewLayout = previewPreferences.getSelectedPreviewLayout();
-        this.customPreviewLayout = previewPreferences.getCustomPreviewLayout();
+        this.preferencesService = preferencesService;
+        this.abbreviationRepository = abbreviationRepository;
 
         this.executable.bind(ActionHelper.needsEntriesSelected(stateManager));
     }
@@ -79,6 +80,7 @@ private List<String> generateCitations() throws IOException {
         // This worker stored the style as filename. The CSLAdapter and the CitationStyleCache store the source of the
         // style. Therefore, we extract the style source from the file.
         String styleSource = null;
+        PreviewLayout previewLayout = preferencesService.getPreviewPreferences().getSelectedPreviewLayout();
 
         if (previewLayout instanceof CitationStylePreviewLayout citationStyleLayout) {
             styleSource = citationStyleLayout.getSource();
@@ -96,9 +98,10 @@ private List<String> generateTextBasedPreviewLayoutCitations() throws IOExceptio
             return Collections.emptyList();
         }
 
+        TextBasedPreviewLayout customPreviewLayout = preferencesService.getPreviewPreferences().getCustomPreviewLayout();
         StringReader customLayoutReader = new StringReader(customPreviewLayout.getText().replace("__NEWLINE__", "\n"));
-        LayoutFormatterPreferences layoutFormatterPreferences = Globals.prefs.getLayoutFormatterPreferences(Globals.journalAbbreviationRepository);
-        Layout layout = new LayoutHelper(customLayoutReader, layoutFormatterPreferences).getLayoutFromText();
+        Layout layout = new LayoutHelper(customLayoutReader, preferencesService.getLayoutFormatterPreferences(), abbreviationRepository)
+                .getLayoutFromText();
 
         List<String> citations = new ArrayList<>(selectedEntries.size());
         for (BibEntry entry : selectedEntries) {
@@ -149,6 +152,8 @@ protected static ClipboardContent processHtml(List<String> citations) {
     }
 
     private void setClipBoardContent(List<String> citations) {
+        PreviewLayout previewLayout = preferencesService.getPreviewPreferences().getSelectedPreviewLayout();
+
         // if it's not a citation style take care of the preview
         if (!(previewLayout instanceof CitationStylePreviewLayout)) {
             clipBoardManager.setContent(processPreview(citations));
diff --git a/src/main/java/org/jabref/gui/preview/PreviewPanel.java b/src/main/java/org/jabref/gui/preview/PreviewPanel.java
index 94cf57cd1e3..eea343507d3 100644
--- a/src/main/java/org/jabref/gui/preview/PreviewPanel.java
+++ b/src/main/java/org/jabref/gui/preview/PreviewPanel.java
@@ -50,19 +50,19 @@ public class PreviewPanel extends VBox {
     public PreviewPanel(BibDatabaseContext database,
                         DialogService dialogService,
                         KeyBindingRepository keyBindingRepository,
-                        PreferencesService preferences,
+                        PreferencesService preferencesService,
                         StateManager stateManager,
                         ThemeManager themeManager,
                         IndexingTaskManager indexingTaskManager) {
         this.keyBindingRepository = keyBindingRepository;
         this.dialogService = dialogService;
         this.stateManager = stateManager;
-        this.previewPreferences = preferences.getPreviewPreferences();
+        this.previewPreferences = preferencesService.getPreviewPreferences();
         this.indexingTaskManager = indexingTaskManager;
-        this.fileLinker = new ExternalFilesEntryLinker(preferences.getFilePreferences(), database);
+        this.fileLinker = new ExternalFilesEntryLinker(preferencesService.getFilePreferences(), database, dialogService);
 
-        PreviewPreferences previewPreferences = preferences.getPreviewPreferences();
-        previewView = new PreviewViewer(database, dialogService, stateManager, themeManager);
+        PreviewPreferences previewPreferences = preferencesService.getPreviewPreferences();
+        previewView = new PreviewViewer(database, dialogService, preferencesService, stateManager, themeManager);
         previewView.setLayout(previewPreferences.getSelectedPreviewLayout());
         previewView.setContextMenu(createPopupMenu());
         previewView.setOnDragDetected(event -> {
@@ -90,7 +90,7 @@ public PreviewPanel(BibDatabaseContext database,
 
                 if (event.getTransferMode() == TransferMode.MOVE) {
                     LOGGER.debug("Mode MOVE"); // shift on win or no modifier
-                    fileLinker.moveFilesToFileDirAndAddToEntry(entry, files, indexingTaskManager);
+                    fileLinker.moveFilesToFileDirRenameAndAddToEntry(entry, files, indexingTaskManager);
                 }
                 if (event.getTransferMode() == TransferMode.LINK) {
                     LOGGER.debug("Node LINK"); // alt on win
diff --git a/src/main/java/org/jabref/gui/preview/PreviewViewer.java b/src/main/java/org/jabref/gui/preview/PreviewViewer.java
index 222478609e0..979c30a5049 100644
--- a/src/main/java/org/jabref/gui/preview/PreviewViewer.java
+++ b/src/main/java/org/jabref/gui/preview/PreviewViewer.java
@@ -23,13 +23,14 @@
 import org.jabref.gui.theme.ThemeManager;
 import org.jabref.gui.util.BackgroundTask;
 import org.jabref.gui.util.TaskExecutor;
-import org.jabref.logic.exporter.ExporterFactory;
 import org.jabref.logic.l10n.Localization;
+import org.jabref.logic.layout.format.Number;
 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;
+import org.jabref.preferences.PreferencesService;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -119,6 +120,7 @@ function getSelectionHtml() {
 
     private final ClipBoardManager clipBoardManager;
     private final DialogService dialogService;
+    private final PreferencesService preferencesService;
 
     private final TaskExecutor taskExecutor = Globals.TASK_EXECUTOR;
     private final WebView previewView;
@@ -143,10 +145,12 @@ function getSelectionHtml() {
      */
     public PreviewViewer(BibDatabaseContext database,
                          DialogService dialogService,
+                         PreferencesService preferencesService,
                          StateManager stateManager,
                          ThemeManager themeManager) {
         this.database = Objects.requireNonNull(database);
         this.dialogService = dialogService;
+        this.preferencesService = preferencesService;
         this.clipBoardManager = Globals.getClipboardManager();
 
         setFitToHeight(true);
@@ -177,7 +181,7 @@ public PreviewViewer(BibDatabaseContext database,
                     String href = anchorElement.getHref();
                     if (href != null) {
                         try {
-                            JabRefDesktop.openBrowser(href);
+                            JabRefDesktop.openBrowser(href, preferencesService.getFilePreferences());
                         } catch (MalformedURLException exception) {
                             LOGGER.error("Invalid URL", exception);
                         } catch (IOException exception) {
@@ -249,7 +253,7 @@ private void update() {
             return;
         }
 
-        ExporterFactory.entryNumber = 1; // Set entry number in case that is included in the preview layout.
+        Number.serialExportNumber = 1; // Set entry number in case that is included in the preview layout.
 
         BackgroundTask
                 .wrap(() -> layout.generatePreview(entry.get(), database))
diff --git a/src/main/java/org/jabref/gui/push/AbstractPushToApplication.java b/src/main/java/org/jabref/gui/push/AbstractPushToApplication.java
index 8642082dbdd..5c3ceeac981 100644
--- a/src/main/java/org/jabref/gui/push/AbstractPushToApplication.java
+++ b/src/main/java/org/jabref/gui/push/AbstractPushToApplication.java
@@ -13,6 +13,7 @@
 import org.jabref.logic.util.OS;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
+import org.jabref.model.strings.StringUtil;
 import org.jabref.preferences.PreferencesService;
 import org.jabref.preferences.PushToApplicationPreferences;
 
@@ -64,7 +65,7 @@ public void pushEntries(BibDatabaseContext database, List<BibEntry> entries, Str
         commandPath = preferencesService.getPushToApplicationPreferences().getCommandPaths().get(this.getDisplayName());
 
         // Check if a path to the command has been specified
-        if ((commandPath == null) || commandPath.trim().isEmpty()) {
+        if (StringUtil.isNullOrEmpty(commandPath)) {
             notDefined = true;
             return;
         }
@@ -145,6 +146,7 @@ protected String getCiteCommand() {
         return preferencesService.getExternalApplicationsPreferences().getCiteCommand();
     }
 
+    @Override
     public PushToApplicationSettings getSettings(PushToApplication application, PushToApplicationPreferences preferences) {
         return new PushToApplicationSettings(application, dialogService, preferencesService.getFilePreferences(), preferences);
     }
diff --git a/src/main/java/org/jabref/gui/push/PushToApplicationCommand.java b/src/main/java/org/jabref/gui/push/PushToApplicationCommand.java
index 8209f1c509a..1c5f1ee5e10 100644
--- a/src/main/java/org/jabref/gui/push/PushToApplicationCommand.java
+++ b/src/main/java/org/jabref/gui/push/PushToApplicationCommand.java
@@ -72,7 +72,7 @@ public void registerReconfigurable(Object node) {
     }
 
     private void setApplication(String applicationName) {
-        final ActionFactory factory = new ActionFactory(Globals.getKeyPrefs());
+        final ActionFactory factory = new ActionFactory(preferencesService.getKeyBindingRepository());
         PushToApplication application = PushToApplications.getApplicationByName(
                                                                   applicationName,
                                                                   dialogService,
diff --git a/src/main/java/org/jabref/gui/push/PushToApplications.java b/src/main/java/org/jabref/gui/push/PushToApplications.java
index e53e55b304d..3550bbac28b 100644
--- a/src/main/java/org/jabref/gui/push/PushToApplications.java
+++ b/src/main/java/org/jabref/gui/push/PushToApplications.java
@@ -15,6 +15,7 @@ public class PushToApplications {
     public static final String TEXSTUDIO = "TeXstudio";
     public static final String VIM = "Vim";
     public static final String WIN_EDT = "WinEdt";
+    public static final String SUBLIME_TEXT = "Sublime Text";
 
     private static final List<PushToApplication> APPLICATIONS = new ArrayList<>();
 
@@ -29,6 +30,7 @@ public static List<PushToApplication> getAllApplications(DialogService dialogSer
         APPLICATIONS.addAll(List.of(
                 new PushToEmacs(dialogService, preferencesService),
                 new PushToLyx(dialogService, preferencesService),
+                new PushToSublimeText(dialogService, preferencesService),
                 new PushToTexmaker(dialogService, preferencesService),
                 new PushToTeXstudio(dialogService, preferencesService),
                 new PushToVim(dialogService, preferencesService),
diff --git a/src/main/java/org/jabref/gui/push/PushToLyx.java b/src/main/java/org/jabref/gui/push/PushToLyx.java
index 756a912ed52..02a043f30a7 100644
--- a/src/main/java/org/jabref/gui/push/PushToLyx.java
+++ b/src/main/java/org/jabref/gui/push/PushToLyx.java
@@ -4,6 +4,7 @@
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.util.List;
 
 import org.jabref.gui.DialogService;
@@ -86,7 +87,7 @@ public void pushEntries(BibDatabaseContext database, final List<BibEntry> entrie
         final File lyxpipe = lp;
 
         JabRefExecutorService.INSTANCE.executeAndWait(() -> {
-            try (FileWriter fw = new FileWriter(lyxpipe); BufferedWriter lyxOut = new BufferedWriter(fw)) {
+            try (FileWriter fw = new FileWriter(lyxpipe, StandardCharsets.UTF_8); BufferedWriter lyxOut = new BufferedWriter(fw)) {
                 String citeStr = "LYXCMD:sampleclient:citation-insert:" + keyString;
                 lyxOut.write(citeStr + "\n");
             } catch (IOException excep) {
diff --git a/src/main/java/org/jabref/gui/push/PushToSublimeText.java b/src/main/java/org/jabref/gui/push/PushToSublimeText.java
new file mode 100644
index 00000000000..56567bf76b6
--- /dev/null
+++ b/src/main/java/org/jabref/gui/push/PushToSublimeText.java
@@ -0,0 +1,84 @@
+package org.jabref.gui.push;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Map;
+
+import org.jabref.gui.DialogService;
+import org.jabref.gui.JabRefExecutorService;
+import org.jabref.gui.icon.IconTheme;
+import org.jabref.gui.icon.JabRefIcon;
+import org.jabref.gui.util.StreamGobbler;
+import org.jabref.logic.util.OS;
+import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.strings.StringUtil;
+import org.jabref.preferences.PreferencesService;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class PushToSublimeText extends AbstractPushToApplication {
+
+    public static final String NAME = PushToApplications.SUBLIME_TEXT;
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(PushToSublimeText.class);
+
+    public PushToSublimeText(DialogService dialogService, PreferencesService preferencesService) {
+        super(dialogService, preferencesService);
+    }
+
+    @Override
+    public String getDisplayName() {
+        return NAME;
+    }
+
+    @Override
+    public JabRefIcon getApplicationIcon() {
+        return IconTheme.JabRefIcons.APPLICATION_SUBLIMETEXT;
+    }
+
+    @Override
+    public void pushEntries(BibDatabaseContext database, List<BibEntry> entries, String keyString) {
+        couldNotConnect = false;
+        couldNotCall = false;
+        notDefined = false;
+
+        commandPath = preferencesService.getPushToApplicationPreferences().getCommandPaths().get(this.getDisplayName());
+
+        // Check if a path to the command has been specified
+        if (StringUtil.isNullOrEmpty(commandPath)) {
+            notDefined = true;
+            return;
+        }
+        try {
+
+            LOGGER.debug("Sublime string: {}", String.join(" ", getCommandLine(keyString)));
+            ProcessBuilder processBuilder = new ProcessBuilder(getCommandLine(keyString));
+            processBuilder.inheritIO();
+            Map<String, String> envs = processBuilder.environment();
+            envs.put("PATH", Path.of(commandPath).getParent().toString());
+
+            Process process = processBuilder.start();
+            StreamGobbler streamGobblerInput = new StreamGobbler(process.getInputStream(), LOGGER::info);
+            StreamGobbler streamGobblerError = new StreamGobbler(process.getErrorStream(), LOGGER::info);
+
+            JabRefExecutorService.INSTANCE.execute(streamGobblerInput);
+            JabRefExecutorService.INSTANCE.execute(streamGobblerError);
+        } catch (IOException excep) {
+            LOGGER.warn("Error: Could not call executable '{}'", commandPath, excep);
+            couldNotCall = true;
+        }
+    }
+
+    @Override
+    protected String[] getCommandLine(String keyString) {
+        if (OS.WINDOWS) {
+            // TODO we might need to escape the inner double quotes with """ """
+            return new String[] {"cmd.exe", "/c", "\"" + commandPath + "\"" + "--command \"insert {\\\"characters\\\": \"\\" + getCiteCommand() + "{" + keyString + "}\"}\""};
+        } else {
+            return new String[] {"sh", "-c", "\"" + commandPath + "\"" + " --command 'insert {\"characters\": \"\\" + getCiteCommand() + "{" + keyString + "}\"}'"};
+        }
+    }
+}
diff --git a/src/main/java/org/jabref/gui/remote/CLIMessageHandler.java b/src/main/java/org/jabref/gui/remote/CLIMessageHandler.java
index 8a796e45be6..7ac1ebe879e 100644
--- a/src/main/java/org/jabref/gui/remote/CLIMessageHandler.java
+++ b/src/main/java/org/jabref/gui/remote/CLIMessageHandler.java
@@ -8,6 +8,8 @@
 import org.jabref.gui.JabRefGUI;
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.logic.remote.server.RemoteMessageHandler;
+import org.jabref.model.entry.BibEntryTypesManager;
+import org.jabref.model.util.FileUpdateMonitor;
 import org.jabref.preferences.PreferencesService;
 
 import org.apache.commons.cli.ParseException;
@@ -18,15 +20,24 @@ public class CLIMessageHandler implements RemoteMessageHandler {
     private static final Logger LOGGER = LoggerFactory.getLogger(CLIMessageHandler.class);
 
     private final PreferencesService preferencesService;
+    private final FileUpdateMonitor fileUpdateMonitor;
+    private final BibEntryTypesManager entryTypesManager;
 
-    public CLIMessageHandler(PreferencesService preferencesService) {
+    public CLIMessageHandler(PreferencesService preferencesService, FileUpdateMonitor fileUpdateMonitor, BibEntryTypesManager entryTypesManager) {
         this.preferencesService = preferencesService;
+        this.fileUpdateMonitor = fileUpdateMonitor;
+        this.entryTypesManager = entryTypesManager;
     }
 
     @Override
     public void handleCommandLineArguments(String[] message) {
         try {
-            ArgumentProcessor argumentProcessor = new ArgumentProcessor(message, ArgumentProcessor.Mode.REMOTE_START, preferencesService);
+            ArgumentProcessor argumentProcessor = new ArgumentProcessor(
+                    message,
+                    ArgumentProcessor.Mode.REMOTE_START,
+                    preferencesService,
+                    fileUpdateMonitor,
+                    entryTypesManager);
 
             List<ParserResult> loaded = argumentProcessor.getParserResults();
             for (int i = 0; i < loaded.size(); i++) {
diff --git a/src/main/java/org/jabref/gui/search/GlobalSearchBar.java b/src/main/java/org/jabref/gui/search/GlobalSearchBar.java
index 0f7cb05553b..34ac62b9de0 100644
--- a/src/main/java/org/jabref/gui/search/GlobalSearchBar.java
+++ b/src/main/java/org/jabref/gui/search/GlobalSearchBar.java
@@ -1,6 +1,7 @@
 package org.jabref.gui.search;
 
 import java.lang.reflect.Field;
+import java.time.Duration;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
@@ -42,7 +43,6 @@
 
 import org.jabref.gui.ClipBoardManager;
 import org.jabref.gui.DialogService;
-import org.jabref.gui.Globals;
 import org.jabref.gui.JabRefFrame;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.autocompleter.AppendPersonNamesStrategy;
@@ -127,11 +127,11 @@ public GlobalSearchBar(JabRefFrame frame, StateManager stateManager, Preferences
         searchFieldTooltip.setMaxHeight(10);
         updateHintVisibility();
 
-        KeyBindingRepository keyBindingRepository = Globals.getKeyPrefs();
+        KeyBindingRepository keyBindingRepository = preferencesService.getKeyBindingRepository();
         searchField.addEventFilter(KeyEvent.KEY_PRESSED, event -> {
             Optional<KeyBinding> keyBinding = keyBindingRepository.mapToKeyBinding(event);
             if (keyBinding.isPresent()) {
-                if (keyBinding.get().equals(KeyBinding.CLOSE)) {
+                if (keyBinding.get() == KeyBinding.CLOSE) {
                     // Clear search and select first entry, if available
                     searchField.setText("");
                     frame.getCurrentLibraryTab().getMainTable().getSelectionModel().selectFirst();
@@ -143,14 +143,16 @@ public GlobalSearchBar(JabRefFrame frame, StateManager stateManager, Preferences
         searchField.setContextMenu(SearchFieldRightClickMenu.create(
                 keyBindingRepository,
                 stateManager,
-                searchField));
+                searchField,
+                frame));
 
         ObservableList<String> search = stateManager.getWholeSearchHistory();
         search.addListener((ListChangeListener.Change<? extends String> change) -> {
             searchField.setContextMenu(SearchFieldRightClickMenu.create(
                     keyBindingRepository,
                     stateManager,
-                    searchField));
+                    searchField,
+                    frame));
         });
 
         ClipBoardManager.addX11Support(searchField);
@@ -199,7 +201,7 @@ public GlobalSearchBar(JabRefFrame frame, StateManager stateManager, Preferences
         this.setSpacing(4.0);
         this.setAlignment(Pos.CENTER_LEFT);
 
-        Timer searchTask = FxTimer.create(java.time.Duration.ofMillis(SEARCH_DELAY), this::performSearch);
+        Timer searchTask = FxTimer.create(Duration.ofMillis(SEARCH_DELAY), this::performSearch);
         BindingsHelper.bindBidirectional(
                 stateManager.activeSearchQueryProperty(),
                 searchField.textProperty(),
@@ -211,6 +213,18 @@ public GlobalSearchBar(JabRefFrame frame, StateManager stateManager, Preferences
 
         this.stateManager.activeSearchQueryProperty().addListener((obs, oldvalue, newValue) -> newValue.ifPresent(this::updateSearchResultsForQuery));
         this.stateManager.activeDatabaseProperty().addListener((obs, oldValue, newValue) -> stateManager.activeSearchQueryProperty().get().ifPresent(this::updateSearchResultsForQuery));
+        /*
+         * The listener tracks a change on the focus property value.
+         * This happens, from active (user types a query) to inactive / focus
+         * lost (e.g., user selects an entry or triggers the search).
+         * The search history should only be filled, if focus is lost.
+         */
+        searchField.focusedProperty().addListener((obs, oldValue, newValue) -> {
+            // Focus lost can be derived by checking that there is no newValue (or the text is empty)
+            if (oldValue && !(newValue || searchField.getText().isBlank())) {
+                this.stateManager.addSearchHistory(searchField.textProperty().get());
+            }
+        });
     }
 
     private void updateSearchResultsForQuery(SearchQuery query) {
@@ -286,7 +300,7 @@ public void focus() {
 
     public void performSearch() {
         LOGGER.debug("Flags: {}", searchPreferences.getSearchFlags());
-        LOGGER.debug("Run search " + searchField.getText());
+        LOGGER.debug("Run search {}", searchField.getText());
 
         // An empty search field should cause the search to be cleared.
         if (searchField.getText().isEmpty()) {
@@ -307,7 +321,6 @@ public void performSearch() {
             informUserAboutInvalidSearchQuery();
             return;
         }
-        this.stateManager.addSearchHistory(searchField.textProperty().get());
         stateManager.setSearchQuery(searchQuery);
     }
 
@@ -377,7 +390,7 @@ private void updateResults(int matched, TextFlow description, boolean grammarBas
     }
 
     private void setSearchFieldHintTooltip(TextFlow description) {
-        if (preferencesService.getGeneralPreferences().shouldShowAdvancedHints()) {
+        if (preferencesService.getWorkspacePreferences().shouldShowAdvancedHints()) {
             String genericDescription = Localization.lang("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>");
             List<Text> genericDescriptionTexts = TooltipTextUtil.createTextsFromHtml(genericDescription);
 
@@ -429,12 +442,12 @@ public SearchPopupSkin(AutoCompletePopup<T> control) {
         }
 
         private void registerEventListener() {
-            this.suggestionList.setOnMouseClicked((me) -> {
+            this.suggestionList.setOnMouseClicked(me -> {
                 if (me.getButton() == MouseButton.PRIMARY) {
                     this.onSuggestionChosen(this.suggestionList.getSelectionModel().getSelectedItem());
                 }
             });
-            this.suggestionList.setOnKeyPressed((ke) -> {
+            this.suggestionList.setOnKeyPressed(ke -> {
                 switch (ke.getCode()) {
                     case TAB:
                     case ENTER:
diff --git a/src/main/java/org/jabref/gui/search/GlobalSearchResultDialog.java b/src/main/java/org/jabref/gui/search/GlobalSearchResultDialog.java
index 605034aa0eb..14de1499f95 100644
--- a/src/main/java/org/jabref/gui/search/GlobalSearchResultDialog.java
+++ b/src/main/java/org/jabref/gui/search/GlobalSearchResultDialog.java
@@ -51,13 +51,13 @@ public GlobalSearchResultDialog(UndoManager undoManager) {
     private void initialize() {
         viewModel = new GlobalSearchResultDialogViewModel(preferencesService);
 
-        PreviewViewer previewViewer = new PreviewViewer(viewModel.getSearchDatabaseContext(), dialogService, stateManager, themeManager);
+        PreviewViewer previewViewer = new PreviewViewer(viewModel.getSearchDatabaseContext(), dialogService, preferencesService, stateManager, themeManager);
         previewViewer.setLayout(preferencesService.getPreviewPreferences().getSelectedPreviewLayout());
 
         SearchResultsTableDataModel model = new SearchResultsTableDataModel(viewModel.getSearchDatabaseContext(), preferencesService, stateManager);
         SearchResultsTable resultsTable = new SearchResultsTable(model, viewModel.getSearchDatabaseContext(), preferencesService, undoManager, dialogService, stateManager);
 
-        resultsTable.getColumns().removeIf(col -> col instanceof SpecialFieldColumn);
+        resultsTable.getColumns().removeIf(SpecialFieldColumn.class::isInstance);
         resultsTable.getSelectionModel().selectFirst();
 
         if (resultsTable.getSelectionModel().getSelectedItem() != null) {
diff --git a/src/main/java/org/jabref/gui/search/SearchFieldRightClickMenu.java b/src/main/java/org/jabref/gui/search/SearchFieldRightClickMenu.java
index 2e7a0156276..5839619b881 100644
--- a/src/main/java/org/jabref/gui/search/SearchFieldRightClickMenu.java
+++ b/src/main/java/org/jabref/gui/search/SearchFieldRightClickMenu.java
@@ -5,6 +5,7 @@
 import javafx.scene.control.MenuItem;
 import javafx.scene.control.SeparatorMenuItem;
 
+import org.jabref.gui.JabRefFrame;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.ActionFactory;
 import org.jabref.gui.actions.SimpleCommand;
@@ -18,17 +19,18 @@
 public class SearchFieldRightClickMenu {
     public static ContextMenu create(KeyBindingRepository keyBindingRepository,
                                      StateManager stateManager,
-                                     CustomTextField searchField) {
+                                     CustomTextField searchField,
+                                     JabRefFrame frame) {
         ActionFactory factory = new ActionFactory(keyBindingRepository);
         ContextMenu contextMenu = new ContextMenu();
 
         contextMenu.getItems().addAll(
-                factory.createMenuItem(StandardActions.UNDO, new EditAction(StandardActions.UNDO, null, stateManager)),
-                factory.createMenuItem(StandardActions.REDO, new EditAction(StandardActions.REDO, null, stateManager)),
-                factory.createMenuItem(StandardActions.CUT, new EditAction(StandardActions.CUT, null, stateManager)),
-                factory.createMenuItem(StandardActions.COPY, new EditAction(StandardActions.COPY, null, stateManager)),
-                factory.createMenuItem(StandardActions.PASTE, new EditAction(StandardActions.PASTE, null, stateManager)),
-                factory.createMenuItem(StandardActions.DELETE, new EditAction(StandardActions.DELETE, null, stateManager)),
+                factory.createMenuItem(StandardActions.UNDO, new EditAction(StandardActions.UNDO, frame, stateManager)),
+                factory.createMenuItem(StandardActions.REDO, new EditAction(StandardActions.REDO, frame, stateManager)),
+                factory.createMenuItem(StandardActions.CUT, new EditAction(StandardActions.CUT, frame, stateManager)),
+                factory.createMenuItem(StandardActions.COPY, new EditAction(StandardActions.COPY, frame, stateManager)),
+                factory.createMenuItem(StandardActions.PASTE, new EditAction(StandardActions.PASTE, frame, stateManager)),
+                factory.createMenuItem(StandardActions.DELETE, new EditAction(StandardActions.DELETE, frame, stateManager)),
 
                 new SeparatorMenuItem(),
 
diff --git a/src/main/java/org/jabref/gui/search/SearchResultsTable.java b/src/main/java/org/jabref/gui/search/SearchResultsTable.java
index a6f0ab707eb..5d839d2a4a1 100644
--- a/src/main/java/org/jabref/gui/search/SearchResultsTable.java
+++ b/src/main/java/org/jabref/gui/search/SearchResultsTable.java
@@ -41,7 +41,7 @@ public SearchResultsTable(SearchResultsTableDataModel model,
                                    dialogService,
                                    stateManager).createColumns();
 
-        if (allCols.stream().noneMatch(col -> col instanceof LibraryColumn)) {
+        if (allCols.stream().noneMatch(LibraryColumn.class::isInstance)) {
             allCols.add(0, new LibraryColumn());
         }
         this.getColumns().addAll(allCols);
@@ -66,7 +66,7 @@ public SearchResultsTable(SearchResultsTableDataModel model,
         this.getStylesheets().add(MainTable.class.getResource("MainTable.css").toExternalForm());
 
         // Store visual state
-        new PersistenceVisualStateTable(this, preferencesService.getSearchDialogColumnPreferences());
+        new PersistenceVisualStateTable(this, preferencesService.getSearchDialogColumnPreferences()).addListeners();
 
         database.getDatabase().registerListener(this);
     }
diff --git a/src/main/java/org/jabref/gui/search/SearchResultsTableDataModel.java b/src/main/java/org/jabref/gui/search/SearchResultsTableDataModel.java
index b0b039f4a98..967c397b799 100644
--- a/src/main/java/org/jabref/gui/search/SearchResultsTableDataModel.java
+++ b/src/main/java/org/jabref/gui/search/SearchResultsTableDataModel.java
@@ -42,7 +42,7 @@ public SearchResultsTableDataModel(BibDatabaseContext bibDatabaseContext, Prefer
         }
 
         entriesFiltered = new FilteredList<>(entriesViewModel);
-        entriesFiltered.predicateProperty().bind(EasyBind.map(stateManager.activeSearchQueryProperty(), (query) -> entry -> isMatchedBySearch(query, entry)));
+        entriesFiltered.predicateProperty().bind(EasyBind.map(stateManager.activeSearchQueryProperty(), query -> entry -> isMatchedBySearch(query, entry)));
 
         // We need to wrap the list since otherwise sorting in the table does not work
         entriesSorted = new SortedList<>(entriesFiltered);
diff --git a/src/main/java/org/jabref/gui/search/SearchTextField.java b/src/main/java/org/jabref/gui/search/SearchTextField.java
index ba6faeeaaea..5073d01475a 100644
--- a/src/main/java/org/jabref/gui/search/SearchTextField.java
+++ b/src/main/java/org/jabref/gui/search/SearchTextField.java
@@ -12,6 +12,7 @@ public static CustomTextField create() {
         CustomTextField textField = (CustomTextField) TextFields.createClearableTextField();
         textField.setPromptText(Localization.lang("Search") + "...");
         textField.setLeft(IconTheme.JabRefIcons.SEARCH.getGraphicNode());
+        textField.setId("searchField");
         return textField;
     }
 }
diff --git a/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogView.java b/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogView.java
index 992ed0482b0..8c95576ba09 100644
--- a/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogView.java
+++ b/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogView.java
@@ -17,6 +17,7 @@
 import org.jabref.gui.util.IconValidationDecorator;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.shared.DBMSType;
+import org.jabref.model.util.FileUpdateMonitor;
 import org.jabref.preferences.PreferencesService;
 
 import com.airhacks.afterburner.views.ViewLoader;
@@ -47,6 +48,7 @@ public class SharedDatabaseLoginDialogView extends BaseDialog<Void> {
 
     @Inject private DialogService dialogService;
     @Inject private PreferencesService preferencesService;
+    @Inject private FileUpdateMonitor fileUpdateMonitor;
 
     private SharedDatabaseLoginDialogViewModel viewModel;
     private final ControlsFxVisualizer visualizer = new ControlsFxVisualizer();
@@ -63,7 +65,7 @@ public SharedDatabaseLoginDialogView(JabRefFrame frame) {
         Button btnConnect = (Button) this.getDialogPane().lookupButton(connectButton);
         // must be set here, because in initialize the button is still null
         btnConnect.disableProperty().bind(viewModel.formValidation().validProperty().not());
-        btnConnect.textProperty().bind(EasyBind.map(viewModel.loadingProperty(), loading -> (loading) ? Localization.lang("Connecting...") : Localization.lang("Connect")));
+        btnConnect.textProperty().bind(EasyBind.map(viewModel.loadingProperty(), loading -> loading ? Localization.lang("Connecting...") : Localization.lang("Connect")));
     }
 
     @FXML
@@ -79,7 +81,7 @@ private void openDatabase() {
     private void initialize() {
         visualizer.setDecoration(new IconValidationDecorator());
 
-        viewModel = new SharedDatabaseLoginDialogViewModel(frame, dialogService, preferencesService);
+        viewModel = new SharedDatabaseLoginDialogViewModel(frame, dialogService, preferencesService, fileUpdateMonitor);
         databaseType.getItems().addAll(DBMSType.values());
         databaseType.getSelectionModel().select(0);
 
diff --git a/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogViewModel.java b/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogViewModel.java
index 36411223cae..2430a8bbdae 100644
--- a/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogViewModel.java
@@ -40,6 +40,7 @@
 import org.jabref.logic.shared.security.Password;
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.util.FileUpdateMonitor;
 import org.jabref.preferences.PreferencesService;
 
 import com.tobiasdiez.easybind.EasyBind;
@@ -75,6 +76,7 @@ public class SharedDatabaseLoginDialogViewModel extends AbstractViewModel {
     private final DialogService dialogService;
     private final PreferencesService preferencesService;
     private final SharedDatabasePreferences sharedDatabasePreferences = new SharedDatabasePreferences();
+    private final FileUpdateMonitor fileUpdateMonitor;
 
     private final Validator databaseValidator;
     private final Validator hostValidator;
@@ -84,10 +86,14 @@ public class SharedDatabaseLoginDialogViewModel extends AbstractViewModel {
     private final Validator keystoreValidator;
     private final CompositeValidator formValidator;
 
-    public SharedDatabaseLoginDialogViewModel(JabRefFrame frame, DialogService dialogService, PreferencesService preferencesService) {
+    public SharedDatabaseLoginDialogViewModel(JabRefFrame frame,
+                                              DialogService dialogService,
+                                              PreferencesService preferencesService,
+                                              FileUpdateMonitor fileUpdateMonitor) {
         this.frame = frame;
         this.dialogService = dialogService;
         this.preferencesService = preferencesService;
+        this.fileUpdateMonitor = fileUpdateMonitor;
 
         EasyBind.subscribe(selectedDBMSType, selected -> port.setValue(Integer.toString(selected.getDefaultPort())));
 
@@ -157,7 +163,7 @@ private boolean openSharedDatabase(DBMSConnectionProperties connectionProperties
         loading.set(true);
 
         try {
-            SharedDatabaseUIManager manager = new SharedDatabaseUIManager(frame, preferencesService);
+            SharedDatabaseUIManager manager = new SharedDatabaseUIManager(frame, preferencesService, fileUpdateMonitor);
             LibraryTab libraryTab = manager.openNewSharedDatabaseTab(connectionProperties);
             setPreferences();
 
@@ -184,7 +190,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 -> new HelpAction(HelpFile.SQL_DATABASE_MIGRATION, dialogService).execute());
+            result.filter(btn -> btn.equals(openHelp)).ifPresent(btn -> new HelpAction(HelpFile.SQL_DATABASE_MIGRATION, dialogService, preferencesService.getFilePreferences()).execute());
             result.filter(btn -> btn.equals(ButtonType.OK)).ifPresent(btn -> openSharedDatabase(connectionProperties));
         }
         loading.set(false);
@@ -263,8 +269,8 @@ private boolean isSharedDatabaseAlreadyPresent(DBMSConnectionProperties connecti
         return panels.parallelStream().anyMatch(panel -> {
             BibDatabaseContext context = panel.getBibDatabaseContext();
 
-            return ((context.getLocation() == DatabaseLocation.SHARED) &&
-                    connectionProperties.equals(context.getDBMSSynchronizer().getConnectionProperties()));
+            return (context.getLocation() == DatabaseLocation.SHARED) &&
+                    connectionProperties.equals(context.getDBMSSynchronizer().getConnectionProperties());
         });
     }
 
diff --git a/src/main/java/org/jabref/gui/shared/SharedDatabaseUIManager.java b/src/main/java/org/jabref/gui/shared/SharedDatabaseUIManager.java
index 67593b9fbb5..914c6899b19 100644
--- a/src/main/java/org/jabref/gui/shared/SharedDatabaseUIManager.java
+++ b/src/main/java/org/jabref/gui/shared/SharedDatabaseUIManager.java
@@ -10,7 +10,6 @@
 import javafx.scene.control.ButtonType;
 
 import org.jabref.gui.DialogService;
-import org.jabref.gui.Globals;
 import org.jabref.gui.JabRefFrame;
 import org.jabref.gui.LibraryTab;
 import org.jabref.gui.entryeditor.EntryEditor;
@@ -33,6 +32,7 @@
 import org.jabref.logic.shared.prefs.SharedDatabasePreferences;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
+import org.jabref.model.util.FileUpdateMonitor;
 import org.jabref.preferences.PreferencesService;
 
 import com.google.common.eventbus.Subscribe;
@@ -43,11 +43,13 @@ public class SharedDatabaseUIManager {
     private DatabaseSynchronizer dbmsSynchronizer;
     private final DialogService dialogService;
     private final PreferencesService preferencesService;
+    private final FileUpdateMonitor fileUpdateMonitor;
 
-    public SharedDatabaseUIManager(JabRefFrame jabRefFrame, PreferencesService preferencesService) {
+    public SharedDatabaseUIManager(JabRefFrame jabRefFrame, PreferencesService preferencesService, FileUpdateMonitor fileUpdateMonitor) {
         this.jabRefFrame = jabRefFrame;
         this.dialogService = jabRefFrame.getDialogService();
         this.preferencesService = preferencesService;
+        this.fileUpdateMonitor = fileUpdateMonitor;
     }
 
     @Subscribe
@@ -96,7 +98,7 @@ public void listen(UpdateRefusedEvent updateRefusedEvent) {
         Optional<ButtonType> response = dialogService.showCustomButtonDialogAndWait(AlertType.CONFIRMATION, Localization.lang("Update refused"), message, ButtonType.CANCEL, merge);
 
         if (response.isPresent() && response.get().equals(merge)) {
-            MergeEntriesDialog dialog = new MergeEntriesDialog(localBibEntry, sharedBibEntry, preferencesService.getBibEntryPreferences());
+            MergeEntriesDialog dialog = new MergeEntriesDialog(localBibEntry, sharedBibEntry, preferencesService);
             dialog.setTitle(Localization.lang("Update refused"));
             Optional<BibEntry> mergedEntry = dialogService.showCustomDialogAndWait(dialog).map(EntriesMergeResult::mergedEntry);
 
@@ -136,12 +138,12 @@ public LibraryTab openNewSharedDatabaseTab(DBMSConnectionProperties dbmsConnecti
             throws SQLException, DatabaseNotSupportedException, InvalidDBMSConnectionPropertiesException {
 
         BibDatabaseContext bibDatabaseContext = new BibDatabaseContext();
-        bibDatabaseContext.setMode(preferencesService.getGeneralPreferences().getDefaultBibDatabaseMode());
+        bibDatabaseContext.setMode(preferencesService.getLibraryPreferences().getDefaultBibDatabaseMode());
         DBMSSynchronizer synchronizer = new DBMSSynchronizer(
                 bibDatabaseContext,
                 preferencesService.getBibEntryPreferences().getKeywordSeparator(),
                 preferencesService.getCitationKeyPatternPreferences().getKeyPattern(),
-                Globals.getFileUpdateMonitor());
+                fileUpdateMonitor);
         bibDatabaseContext.convertToSharedDatabase(synchronizer);
 
         dbmsSynchronizer = bibDatabaseContext.getDBMSSynchronizer();
@@ -165,12 +167,12 @@ public void openSharedDatabaseFromParserResult(ParserResult parserResult)
         DBMSConnectionProperties dbmsConnectionProperties = new DBMSConnectionProperties(new SharedDatabasePreferences(sharedDatabaseID));
 
         BibDatabaseContext bibDatabaseContext = new BibDatabaseContext();
-        bibDatabaseContext.setMode(preferencesService.getGeneralPreferences().getDefaultBibDatabaseMode());
+        bibDatabaseContext.setMode(preferencesService.getLibraryPreferences().getDefaultBibDatabaseMode());
         DBMSSynchronizer synchronizer = new DBMSSynchronizer(
                 bibDatabaseContext,
                 preferencesService.getBibEntryPreferences().getKeywordSeparator(),
                 preferencesService.getCitationKeyPatternPreferences().getKeyPattern(),
-                Globals.getFileUpdateMonitor());
+                fileUpdateMonitor);
         bibDatabaseContext.convertToSharedDatabase(synchronizer);
 
         bibDatabaseContext.getDatabase().setSharedDatabaseID(sharedDatabaseID);
diff --git a/src/main/java/org/jabref/gui/sidepane/SidePane.java b/src/main/java/org/jabref/gui/sidepane/SidePane.java
index 6e9476abcb7..f9eb7e89631 100644
--- a/src/main/java/org/jabref/gui/sidepane/SidePane.java
+++ b/src/main/java/org/jabref/gui/sidepane/SidePane.java
@@ -14,6 +14,7 @@
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.gui.util.TaskExecutor;
+import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.preferences.PreferencesService;
 
 public class SidePane extends VBox {
@@ -26,13 +27,14 @@ public class SidePane extends VBox {
     private final Map<SidePaneType, BooleanBinding> visibleBindings = new HashMap<>();
 
     public SidePane(PreferencesService preferencesService,
+                    JournalAbbreviationRepository abbreviationRepository,
                     TaskExecutor taskExecutor,
                     DialogService dialogService,
                     StateManager stateManager,
                     UndoManager undoManager) {
         this.stateManager = stateManager;
         this.preferencesService = preferencesService;
-        this.viewModel = new SidePaneViewModel(preferencesService, stateManager, taskExecutor, dialogService, undoManager);
+        this.viewModel = new SidePaneViewModel(preferencesService, abbreviationRepository, stateManager, taskExecutor, dialogService, undoManager);
 
         stateManager.getVisibleSidePaneComponents().addListener((ListChangeListener<SidePaneType>) c -> updateView());
         updateView();
@@ -57,4 +59,8 @@ public BooleanBinding paneVisibleBinding(SidePaneType pane) {
     public SimpleCommand getToggleCommandFor(SidePaneType sidePane) {
         return new TogglePaneAction(stateManager, sidePane, preferencesService.getSidePanePreferences());
     }
+
+    public SidePaneComponent getSidePaneComponent(SidePaneType type) {
+        return viewModel.getSidePaneComponent(type);
+    }
 }
diff --git a/src/main/java/org/jabref/gui/sidepane/SidePaneComponent.java b/src/main/java/org/jabref/gui/sidepane/SidePaneComponent.java
index 104a3c42518..8abb96582dc 100644
--- a/src/main/java/org/jabref/gui/sidepane/SidePaneComponent.java
+++ b/src/main/java/org/jabref/gui/sidepane/SidePaneComponent.java
@@ -10,6 +10,7 @@
 import javafx.scene.layout.VBox;
 
 import org.jabref.gui.actions.SimpleCommand;
+import org.jabref.gui.groups.GroupTreeView;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.logic.l10n.Localization;
 
@@ -71,4 +72,13 @@ private Node createHeaderView() {
     protected void addExtraButtonToHeader(Button button, int position) {
         this.buttonContainer.getChildren().add(position, button);
     }
+
+    public void requestFocus() {
+        for (Node child : getChildren()) {
+            if (child instanceof GroupTreeView groupTreeView) {
+                groupTreeView.requestFocusGroupTree();
+                break;
+            }
+        }
+    }
 }
diff --git a/src/main/java/org/jabref/gui/sidepane/SidePaneContentFactory.java b/src/main/java/org/jabref/gui/sidepane/SidePaneContentFactory.java
index f3da681a510..7fe1f43fcc5 100644
--- a/src/main/java/org/jabref/gui/sidepane/SidePaneContentFactory.java
+++ b/src/main/java/org/jabref/gui/sidepane/SidePaneContentFactory.java
@@ -10,21 +10,25 @@
 import org.jabref.gui.importer.fetcher.WebSearchPaneView;
 import org.jabref.gui.openoffice.OpenOfficePanel;
 import org.jabref.gui.util.TaskExecutor;
+import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.preferences.PreferencesService;
 
 public class SidePaneContentFactory {
     private final PreferencesService preferences;
+    private final JournalAbbreviationRepository abbreviationRepository;
     private final TaskExecutor taskExecutor;
     private final DialogService dialogService;
     private final StateManager stateManager;
     private final UndoManager undoManager;
 
     public SidePaneContentFactory(PreferencesService preferences,
+                                  JournalAbbreviationRepository abbreviationRepository,
                                   TaskExecutor taskExecutor,
                                   DialogService dialogService,
                                   StateManager stateManager,
                                   UndoManager undoManager) {
         this.preferences = preferences;
+        this.abbreviationRepository = abbreviationRepository;
         this.taskExecutor = taskExecutor;
         this.dialogService = dialogService;
         this.stateManager = stateManager;
@@ -40,8 +44,8 @@ public Node create(SidePaneType sidePaneType) {
                     dialogService);
             case OPEN_OFFICE -> new OpenOfficePanel(
                     preferences,
-                    preferences.getOpenOfficePreferences(),
                     preferences.getKeyBindingRepository(),
+                    abbreviationRepository,
                     taskExecutor,
                     dialogService,
                     stateManager,
diff --git a/src/main/java/org/jabref/gui/sidepane/SidePaneViewModel.java b/src/main/java/org/jabref/gui/sidepane/SidePaneViewModel.java
index 03a72d7c073..e27d5c22d08 100644
--- a/src/main/java/org/jabref/gui/sidepane/SidePaneViewModel.java
+++ b/src/main/java/org/jabref/gui/sidepane/SidePaneViewModel.java
@@ -18,6 +18,7 @@
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.gui.util.TaskExecutor;
+import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.preferences.PreferencesService;
 import org.jabref.preferences.SidePanePreferences;
 
@@ -35,6 +36,7 @@ public class SidePaneViewModel extends AbstractViewModel {
     private final DialogService dialogService;
 
     public SidePaneViewModel(PreferencesService preferencesService,
+                             JournalAbbreviationRepository abbreviationRepository,
                              StateManager stateManager,
                              TaskExecutor taskExecutor,
                              DialogService dialogService,
@@ -44,6 +46,7 @@ public SidePaneViewModel(PreferencesService preferencesService,
         this.dialogService = dialogService;
         this.sidePaneContentFactory = new SidePaneContentFactory(
                 preferencesService,
+                abbreviationRepository,
                 taskExecutor,
                 dialogService,
                 stateManager,
diff --git a/src/main/java/org/jabref/gui/slr/ExistingStudySearchAction.java b/src/main/java/org/jabref/gui/slr/ExistingStudySearchAction.java
index f61ca0c801a..827a25edc25 100644
--- a/src/main/java/org/jabref/gui/slr/ExistingStudySearchAction.java
+++ b/src/main/java/org/jabref/gui/slr/ExistingStudySearchAction.java
@@ -9,20 +9,15 @@
 import org.jabref.gui.actions.ActionHelper;
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.gui.importer.actions.OpenDatabaseAction;
-import org.jabref.gui.theme.ThemeManager;
 import org.jabref.gui.util.BackgroundTask;
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.crawler.Crawler;
-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.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.util.FileUpdateMonitor;
-import org.jabref.preferences.GeneralPreferences;
 import org.jabref.preferences.PreferencesService;
 
 import org.eclipse.jgit.api.errors.GitAPIException;
@@ -40,11 +35,6 @@ public class ExistingStudySearchAction extends SimpleCommand {
 
     private final FileUpdateMonitor fileUpdateMonitor;
     private final TaskExecutor taskExecutor;
-    private final ThemeManager themeManager;
-    private final GeneralPreferences generalPreferences;
-    private final ImportFormatPreferences importFormatPreferences;
-    private final ImporterPreferences importerPreferences;
-    private final SavePreferences savePreferences;
     private final JabRefFrame frame;
     private final OpenDatabaseAction openDatabaseAction;
 
@@ -59,9 +49,15 @@ public ExistingStudySearchAction(
             FileUpdateMonitor fileUpdateMonitor,
             TaskExecutor taskExecutor,
             PreferencesService preferencesService,
-            StateManager stateManager,
-            ThemeManager themeManager) {
-        this(frame, openDatabaseAction, dialogService, fileUpdateMonitor, taskExecutor, preferencesService, stateManager, themeManager, false);
+            StateManager stateManager) {
+        this(frame,
+                openDatabaseAction,
+                dialogService,
+                fileUpdateMonitor,
+                taskExecutor,
+                preferencesService,
+                stateManager,
+                false);
     }
 
     protected ExistingStudySearchAction(
@@ -72,7 +68,6 @@ protected ExistingStudySearchAction(
             TaskExecutor taskExecutor,
             PreferencesService preferencesService,
             StateManager stateManager,
-            ThemeManager themeManager,
             boolean isNew) {
         this.frame = frame;
         this.openDatabaseAction = openDatabaseAction;
@@ -81,11 +76,6 @@ protected ExistingStudySearchAction(
         this.taskExecutor = taskExecutor;
         this.preferencesService = preferencesService;
         this.stateManager = stateManager;
-        this.generalPreferences = preferencesService.getGeneralPreferences();
-        this.themeManager = themeManager;
-        this.importFormatPreferences = preferencesService.getImportFormatPreferences();
-        this.importerPreferences = preferencesService.getImporterPreferences();
-        this.savePreferences = preferencesService.getSavePreferences();
 
         if (!isNew) {
             this.executable.bind(ActionHelper.needsStudyDatabase(stateManager));
@@ -122,10 +112,7 @@ protected void crawl() {
             crawler = new Crawler(
                     this.studyDirectory,
                     new SlrGitHandler(this.studyDirectory),
-                    generalPreferences,
-                    importFormatPreferences,
-                    importerPreferences,
-                    savePreferences,
+                    preferencesService,
                     new BibEntryTypesManager(),
                     fileUpdateMonitor);
         } catch (IOException | ParseException e) {
diff --git a/src/main/java/org/jabref/gui/slr/ManageStudyDefinition.fxml b/src/main/java/org/jabref/gui/slr/ManageStudyDefinition.fxml
index 6aef2a901e6..cc2297a0fcf 100644
--- a/src/main/java/org/jabref/gui/slr/ManageStudyDefinition.fxml
+++ b/src/main/java/org/jabref/gui/slr/ManageStudyDefinition.fxml
@@ -208,21 +208,21 @@
                             </VBox>
                         </ScrollPane>
                     </Tab>
-                    <Tab text="%Databases">
+                    <Tab text="%Catalogs">
                         <ScrollPane
                                 fitToWidth="true"
                                 fitToHeight="true"
                                 styleClass="slr-tab">
                             <VBox spacing="20.0">
-                                <Label text="%Select Databases:"/>
+                                <Label text="%Select Catalogs:"/>
                                 <HBox alignment="CENTER_LEFT">
                                     <TableView
-                                            fx:id="databaseTable"
+                                            fx:id="catalogTable"
                                             HBox.hgrow="ALWAYS"
                                             editable="true">
                                         <columns>
                                             <TableColumn
-                                                    fx:id="databaseEnabledColumn"
+                                                    fx:id="catalogEnabledColumn"
                                                     text="%Enabled"
                                                     maxWidth="80.0"
                                                     prefWidth="80.0"
@@ -230,8 +230,8 @@
                                                     reorderable="false"
                                                     resizable="false"/>
                                             <TableColumn
-                                                    fx:id="databaseColumn"
-                                                    text="%Database"/>
+                                                    fx:id="catalogColumn"
+                                                    text="%Catalog"/>
                                         </columns>
                                         <columnResizePolicy>
                                             <TableView
diff --git a/src/main/java/org/jabref/gui/slr/ManageStudyDefinitionView.java b/src/main/java/org/jabref/gui/slr/ManageStudyDefinitionView.java
index db9e074a596..912d42c6645 100644
--- a/src/main/java/org/jabref/gui/slr/ManageStudyDefinitionView.java
+++ b/src/main/java/org/jabref/gui/slr/ManageStudyDefinitionView.java
@@ -66,9 +66,9 @@ public class ManageStudyDefinitionView extends BaseDialog<SlrStudyAndDirectory>
     @FXML private TableColumn<String, String> queriesColumn;
     @FXML private TableColumn<String, String> queriesActionColumn;
 
-    @FXML private TableView<StudyDatabaseItem> databaseTable;
-    @FXML private TableColumn<StudyDatabaseItem, Boolean> databaseEnabledColumn;
-    @FXML private TableColumn<StudyDatabaseItem, String> databaseColumn;
+    @FXML private TableView<StudyCatalogItem> catalogTable;
+    @FXML private TableColumn<StudyCatalogItem, Boolean> catalogEnabledColumn;
+    @FXML private TableColumn<StudyCatalogItem, String> catalogColumn;
 
     @Inject private DialogService dialogService;
     @Inject private PreferencesService prefs;
@@ -124,7 +124,7 @@ public ManageStudyDefinitionView(Study study, Path studyDirectory) {
     }
 
     private void setupSaveSurveyButton(boolean isEdit) {
-        Button saveSurveyButton = ((Button) this.getDialogPane().lookupButton(saveSurveyButtonType));
+        Button saveSurveyButton = (Button) this.getDialogPane().lookupButton(saveSurveyButtonType);
 
         if (!isEdit) {
             saveSurveyButton.setText(Localization.lang("Start survey"));
@@ -132,7 +132,7 @@ private void setupSaveSurveyButton(boolean isEdit) {
 
         saveSurveyButton.disableProperty().bind(Bindings.or(Bindings.or(Bindings.or(Bindings.or(
                                 Bindings.isEmpty(viewModel.getQueries()),
-                                Bindings.isEmpty(viewModel.getDatabases())),
+                                Bindings.isEmpty(viewModel.getCatalogs())),
                                 Bindings.isEmpty(viewModel.getAuthors())),
                                 viewModel.getTitle().isEmpty()),
                                 viewModel.getDirectory().isEmpty()));
@@ -166,14 +166,14 @@ private void initialize() {
             selectStudyDirectory.setDisable(true);
         }
 
-        // Listen whether any databases are removed from selection -> Add back to the database selector
+        // Listen whether any catalogs are removed from selection -> Add back to the catalog selector
         studyTitle.textProperty().bindBidirectional(viewModel.titleProperty());
         studyDirectory.textProperty().bindBidirectional(viewModel.getDirectory());
 
         initAuthorTab();
         initQuestionsTab();
         initQueriesTab();
-        initDatabasesTab();
+        initCatalogsTab();
     }
 
     private void initAuthorTab() {
@@ -202,27 +202,27 @@ private void initQueriesTab() {
                 .toString()));
     }
 
-    private void initDatabasesTab() {
-        new ViewModelTableRowFactory<StudyDatabaseItem>()
+    private void initCatalogsTab() {
+        new ViewModelTableRowFactory<StudyCatalogItem>()
                 .withOnMouseClickedEvent((entry, event) -> {
                     if (event.getButton() == MouseButton.PRIMARY) {
                         entry.setEnabled(!entry.isEnabled());
                     }
                 })
-                .install(databaseTable);
+                .install(catalogTable);
 
-        databaseColumn.setReorderable(false);
-        databaseColumn.setCellFactory(TextFieldTableCell.forTableColumn());
+        catalogColumn.setReorderable(false);
+        catalogColumn.setCellFactory(TextFieldTableCell.forTableColumn());
 
-        databaseEnabledColumn.setResizable(false);
-        databaseEnabledColumn.setReorderable(false);
-        databaseEnabledColumn.setCellFactory(CheckBoxTableCell.forTableColumn(databaseEnabledColumn));
-        databaseEnabledColumn.setCellValueFactory(param -> param.getValue().enabledProperty());
+        catalogEnabledColumn.setResizable(false);
+        catalogEnabledColumn.setReorderable(false);
+        catalogEnabledColumn.setCellFactory(CheckBoxTableCell.forTableColumn(catalogEnabledColumn));
+        catalogEnabledColumn.setCellValueFactory(param -> param.getValue().enabledProperty());
 
-        databaseColumn.setEditable(false);
-        databaseColumn.setCellValueFactory(param -> param.getValue().nameProperty());
+        catalogColumn.setEditable(false);
+        catalogColumn.setCellValueFactory(param -> param.getValue().nameProperty());
 
-        databaseTable.setItems(viewModel.getDatabases());
+        catalogTable.setItems(viewModel.getCatalogs());
     }
 
     private void setupCommonPropertiesForTables(Node addControl,
diff --git a/src/main/java/org/jabref/gui/slr/ManageStudyDefinitionViewModel.java b/src/main/java/org/jabref/gui/slr/ManageStudyDefinitionViewModel.java
index bc013c2e7f3..54267048793 100644
--- a/src/main/java/org/jabref/gui/slr/ManageStudyDefinitionViewModel.java
+++ b/src/main/java/org/jabref/gui/slr/ManageStudyDefinitionViewModel.java
@@ -53,7 +53,7 @@ public class ManageStudyDefinitionViewModel {
     private final ObservableList<String> authors = FXCollections.observableArrayList();
     private final ObservableList<String> researchQuestions = FXCollections.observableArrayList();
     private final ObservableList<String> queries = FXCollections.observableArrayList();
-    private final ObservableList<StudyDatabaseItem> databases = FXCollections.observableArrayList();
+    private final ObservableList<StudyCatalogItem> databases = FXCollections.observableArrayList();
 
     // Hold the complement of databases for the selector
     private final SimpleStringProperty directory = new SimpleStringProperty();
@@ -74,7 +74,7 @@ public ManageStudyDefinitionViewModel(ImportFormatPreferences importFormatPrefer
                                     .filter(name -> !name.equals(CompositeSearchBasedFetcher.FETCHER_NAME))
                                     .map(name -> {
                                         boolean enabled = DEFAULT_SELECTION.contains(name);
-                                        return new StudyDatabaseItem(name, enabled);
+                                        return new StudyCatalogItem(name, enabled);
                                     })
                                     .toList());
         this.dialogService = Objects.requireNonNull(dialogService);
@@ -105,7 +105,7 @@ public ManageStudyDefinitionViewModel(Study study,
                                     .filter(name -> !name.equals(CompositeSearchBasedFetcher.FETCHER_NAME))
                                     .map(name -> {
                                         boolean enabled = studyDatabases.contains(new StudyDatabase(name, true));
-                                        return new StudyDatabaseItem(name, enabled);
+                                        return new StudyCatalogItem(name, enabled);
                                     })
                                     .toList());
 
@@ -133,7 +133,7 @@ public ObservableList<String> getQueries() {
         return queries;
     }
 
-    public ObservableList<StudyDatabaseItem> getDatabases() {
+    public ObservableList<StudyCatalogItem> getCatalogs() {
         return databases;
     }
 
diff --git a/src/main/java/org/jabref/gui/slr/StartNewStudyAction.java b/src/main/java/org/jabref/gui/slr/StartNewStudyAction.java
index f04f692a84a..848d36d4cb5 100644
--- a/src/main/java/org/jabref/gui/slr/StartNewStudyAction.java
+++ b/src/main/java/org/jabref/gui/slr/StartNewStudyAction.java
@@ -6,7 +6,6 @@
 
 import org.jabref.gui.JabRefFrame;
 import org.jabref.gui.StateManager;
-import org.jabref.gui.theme.ThemeManager;
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.crawler.StudyRepository;
 import org.jabref.logic.crawler.StudyYamlParser;
@@ -36,8 +35,19 @@ public class StartNewStudyAction extends ExistingStudySearchAction {
 
     Study newStudy;
 
-    public StartNewStudyAction(JabRefFrame frame, FileUpdateMonitor fileUpdateMonitor, TaskExecutor taskExecutor, PreferencesService preferencesService, StateManager stateManager, ThemeManager themeManager) {
-        super(frame, frame.getOpenDatabaseAction(), frame.getDialogService(), fileUpdateMonitor, taskExecutor, preferencesService, stateManager, themeManager, true);
+    public StartNewStudyAction(JabRefFrame frame,
+                               FileUpdateMonitor fileUpdateMonitor,
+                               TaskExecutor taskExecutor,
+                               PreferencesService preferencesService,
+                               StateManager stateManager) {
+        super(frame,
+                frame.getOpenDatabaseAction(),
+                frame.getDialogService(),
+                fileUpdateMonitor,
+                taskExecutor,
+                preferencesService,
+                stateManager,
+                true);
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/slr/StudyDatabaseItem.java b/src/main/java/org/jabref/gui/slr/StudyCatalogItem.java
similarity index 89%
rename from src/main/java/org/jabref/gui/slr/StudyDatabaseItem.java
rename to src/main/java/org/jabref/gui/slr/StudyCatalogItem.java
index bc2cb7ac859..b379d373bf9 100644
--- a/src/main/java/org/jabref/gui/slr/StudyDatabaseItem.java
+++ b/src/main/java/org/jabref/gui/slr/StudyCatalogItem.java
@@ -12,11 +12,11 @@
 /**
  * View representation of {@link StudyDatabase}
  */
-public class StudyDatabaseItem {
+public class StudyCatalogItem {
     private final StringProperty name;
     private final BooleanProperty enabled;
 
-    public StudyDatabaseItem(String name, boolean enabled) {
+    public StudyCatalogItem(String name, boolean enabled) {
         this.name = new SimpleStringProperty(Objects.requireNonNull(name));
         this.enabled = new SimpleBooleanProperty(enabled);
     }
@@ -47,7 +47,7 @@ public BooleanProperty enabledProperty() {
 
     @Override
     public String toString() {
-        return "StudyDatabaseItem{" +
+        return "StudyCatalogItem{" +
                 "name=" + name.get() +
                 ", enabled=" + enabled.get() +
                 '}';
@@ -61,7 +61,7 @@ public boolean equals(Object o) {
         if (o == null || getClass() != o.getClass()) {
             return false;
         }
-        StudyDatabaseItem that = (StudyDatabaseItem) o;
+        StudyCatalogItem that = (StudyCatalogItem) o;
         return Objects.equals(getName(), that.getName()) && Objects.equals(isEnabled(), that.isEnabled());
     }
 
diff --git a/src/main/java/org/jabref/gui/texparser/ParseLatexDialogViewModel.java b/src/main/java/org/jabref/gui/texparser/ParseLatexDialogViewModel.java
index 0982fa7002d..a374ee73f99 100644
--- a/src/main/java/org/jabref/gui/texparser/ParseLatexDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/texparser/ParseLatexDialogViewModel.java
@@ -69,7 +69,7 @@ public ParseLatexDialogViewModel(BibDatabaseContext databaseContext,
         this.taskExecutor = taskExecutor;
         this.preferencesService = preferencesService;
         this.fileMonitor = fileMonitor;
-        this.latexFileDirectory = new SimpleStringProperty(databaseContext.getMetaData().getLatexFileDirectory(preferencesService.getFilePreferences().getUser())
+        this.latexFileDirectory = new SimpleStringProperty(databaseContext.getMetaData().getLatexFileDirectory(preferencesService.getFilePreferences().getUserAndHost())
                                                                           .orElse(FileUtil.getInitialDirectory(databaseContext, preferencesService.getFilePreferences().getWorkingDirectory()))
                                                                           .toAbsolutePath().toString());
         this.root = new SimpleObjectProperty<>();
@@ -204,7 +204,7 @@ public void parseButtonClicked() {
 
         TexBibEntriesResolver entriesResolver = new TexBibEntriesResolver(
                 databaseContext.getDatabase(),
-                preferencesService.getGeneralPreferences(),
+                preferencesService.getLibraryPreferences(),
                 preferencesService.getImportFormatPreferences(),
                 fileMonitor);
 
diff --git a/src/main/java/org/jabref/gui/theme/Theme.java b/src/main/java/org/jabref/gui/theme/Theme.java
index 39d737d49c0..8100343cb5a 100644
--- a/src/main/java/org/jabref/gui/theme/Theme.java
+++ b/src/main/java/org/jabref/gui/theme/Theme.java
@@ -25,7 +25,7 @@ public enum Type {
     public Theme(String name) {
         Objects.requireNonNull(name);
 
-        if (name.equals("") || BASE_CSS.equalsIgnoreCase(name)) {
+        if ("".equals(name) || BASE_CSS.equalsIgnoreCase(name)) {
             this.additionalStylesheet = Optional.empty();
             this.type = Type.DEFAULT;
             this.name = "";
diff --git a/src/main/java/org/jabref/gui/theme/ThemeManager.java b/src/main/java/org/jabref/gui/theme/ThemeManager.java
index b6f42071d76..b6aecb3112d 100644
--- a/src/main/java/org/jabref/gui/theme/ThemeManager.java
+++ b/src/main/java/org/jabref/gui/theme/ThemeManager.java
@@ -17,7 +17,7 @@
 import org.jabref.gui.util.DefaultTaskExecutor;
 import org.jabref.model.util.FileUpdateListener;
 import org.jabref.model.util.FileUpdateMonitor;
-import org.jabref.preferences.AppearancePreferences;
+import org.jabref.preferences.WorkspacePreferences;
 
 import com.tobiasdiez.easybind.EasyBind;
 import org.slf4j.Logger;
@@ -40,7 +40,7 @@ public class ThemeManager {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ThemeManager.class);
 
-    private final AppearancePreferences appearancePreferences;
+    private final WorkspacePreferences workspacePreferences;
     private final FileUpdateMonitor fileUpdateMonitor;
     private final Consumer<Runnable> updateRunner;
 
@@ -50,28 +50,28 @@ public class ThemeManager {
     private Scene mainWindowScene;
     private final Set<WebEngine> webEngines = Collections.newSetFromMap(new WeakHashMap<>());
 
-    public ThemeManager(AppearancePreferences appearancePreferences,
+    public ThemeManager(WorkspacePreferences workspacePreferences,
                         FileUpdateMonitor fileUpdateMonitor,
                         Consumer<Runnable> updateRunner) {
-        this.appearancePreferences = Objects.requireNonNull(appearancePreferences);
+        this.workspacePreferences = Objects.requireNonNull(workspacePreferences);
         this.fileUpdateMonitor = Objects.requireNonNull(fileUpdateMonitor);
         this.updateRunner = Objects.requireNonNull(updateRunner);
 
         this.baseStyleSheet = StyleSheet.create(Theme.BASE_CSS).get();
-        this.theme = appearancePreferences.getTheme();
+        this.theme = workspacePreferences.getTheme();
 
         // Watching base CSS only works in development and test scenarios, where the build system exposes the CSS as a
         // file (e.g. for Gradle run task it will be in build/resources/main/org/jabref/gui/Base.css)
         addStylesheetToWatchlist(this.baseStyleSheet, this::baseCssLiveUpdate);
         baseCssLiveUpdate();
 
-        EasyBind.subscribe(appearancePreferences.themeProperty(), theme -> updateThemeSettings());
-        EasyBind.subscribe(appearancePreferences.shouldOverrideDefaultFontSizeProperty(), should -> updateFontSettings());
-        EasyBind.subscribe(appearancePreferences.mainFontSizeProperty(), size -> updateFontSettings());
+        EasyBind.subscribe(workspacePreferences.themeProperty(), theme -> updateThemeSettings());
+        EasyBind.subscribe(workspacePreferences.shouldOverrideDefaultFontSizeProperty(), should -> updateFontSettings());
+        EasyBind.subscribe(workspacePreferences.mainFontSizeProperty(), size -> updateFontSettings());
     }
 
     private void updateThemeSettings() {
-        Theme newTheme = Objects.requireNonNull(appearancePreferences.getTheme());
+        Theme newTheme = Objects.requireNonNull(workspacePreferences.getTheme());
 
         if (newTheme.equals(theme)) {
             LOGGER.info("Not updating theme because it hasn't changed");
@@ -160,8 +160,8 @@ private void updateBaseCss() {
     private void updateAdditionalCss() {
         getMainWindowScene().ifPresent(scene -> scene.getStylesheets().setAll(List.of(
                 baseStyleSheet.getSceneStylesheet().toExternalForm(),
-                appearancePreferences.getTheme()
-                                     .getAdditionalStylesheet().map(styleSheet -> {
+                workspacePreferences.getTheme()
+                                    .getAdditionalStylesheet().map(styleSheet -> {
                                          URL stylesheetUrl = styleSheet.getSceneStylesheet();
                                          if (stylesheetUrl != null) {
                                              return stylesheetUrl.toExternalForm();
@@ -169,7 +169,7 @@ private void updateAdditionalCss() {
                                              return "";
                                          }
                                      })
-                                     .orElse("")
+                                    .orElse("")
         )));
     }
 
@@ -210,10 +210,10 @@ public void installCss(WebEngine webEngine) {
      * @param scene is the scene, the font size should be applied to
      */
     public void updateFontStyle(Scene scene) {
-        if (appearancePreferences.shouldOverrideDefaultFontSize()) {
-            scene.getRoot().setStyle("-fx-font-size: " + appearancePreferences.getMainFontSize() + "pt;");
+        if (workspacePreferences.shouldOverrideDefaultFontSize()) {
+            scene.getRoot().setStyle("-fx-font-size: " + workspacePreferences.getMainFontSize() + "pt;");
         } else {
-            scene.getRoot().setStyle("-fx-font-size: " + appearancePreferences.getDefaultFontSize() + "pt;");
+            scene.getRoot().setStyle("-fx-font-size: " + workspacePreferences.getDefaultFontSize() + "pt;");
         }
     }
 
diff --git a/src/main/java/org/jabref/gui/undo/CountingUndoManager.java b/src/main/java/org/jabref/gui/undo/CountingUndoManager.java
index 9cb372a29b1..75a044a6a1f 100644
--- a/src/main/java/org/jabref/gui/undo/CountingUndoManager.java
+++ b/src/main/java/org/jabref/gui/undo/CountingUndoManager.java
@@ -44,7 +44,7 @@ public synchronized void markUnchanged() {
     }
 
     public synchronized boolean hasChanged() {
-        return (current != unchangedPoint);
+        return current != unchangedPoint;
     }
 
     public void registerListener(Object object) {
diff --git a/src/main/java/org/jabref/gui/undo/UndoableStringChange.java b/src/main/java/org/jabref/gui/undo/UndoableStringChange.java
index 684e5942b7d..883f1675750 100644
--- a/src/main/java/org/jabref/gui/undo/UndoableStringChange.java
+++ b/src/main/java/org/jabref/gui/undo/UndoableStringChange.java
@@ -20,10 +20,10 @@ public UndoableStringChange(BibtexString string, boolean nameChange, String oldV
 
     @Override
     public String getPresentationName() {
-        return (nameChange ? Localization.lang("change string name %0 to %1", StringUtil.boldHTML(oldValue),
+        return nameChange ? Localization.lang("change string name %0 to %1", StringUtil.boldHTML(oldValue),
                 StringUtil.boldHTML(newValue)) :
                 Localization.lang("change string content %0 to %1",
-                        StringUtil.boldHTML(oldValue), StringUtil.boldHTML(newValue)));
+                        StringUtil.boldHTML(oldValue), StringUtil.boldHTML(newValue));
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/util/CustomTitledPaneSkin.java b/src/main/java/org/jabref/gui/util/CustomTitledPaneSkin.java
index c0ea9bdce4a..f9bc58e5aaf 100644
--- a/src/main/java/org/jabref/gui/util/CustomTitledPaneSkin.java
+++ b/src/main/java/org/jabref/gui/util/CustomTitledPaneSkin.java
@@ -189,8 +189,8 @@ public boolean isSettable(TitledPane styleable) {
             @Override
             public StyleableProperty<ArrowSide> getStyleableProperty(TitledPane styleable) {
                 Skin<?> skin = styleable.getSkin();
-                if (skin instanceof CustomTitledPaneSkin) {
-                    return ((CustomTitledPaneSkin) skin).arrowSide;
+                if (skin instanceof CustomTitledPaneSkin paneSkin) {
+                    return paneSkin.arrowSide;
                 }
                 return null;
             }
diff --git a/src/main/java/org/jabref/gui/util/DefaultTaskExecutor.java b/src/main/java/org/jabref/gui/util/DefaultTaskExecutor.java
index cb066d57c1a..8240a5b209f 100644
--- a/src/main/java/org/jabref/gui/util/DefaultTaskExecutor.java
+++ b/src/main/java/org/jabref/gui/util/DefaultTaskExecutor.java
@@ -177,8 +177,8 @@ public V call() throws Exception {
     }
 
     private Exception convertToException(Throwable throwable) {
-        if (throwable instanceof Exception) {
-            return (Exception) throwable;
+        if (throwable instanceof Exception exception) {
+            return exception;
         } else {
             return new Exception(throwable);
         }
diff --git a/src/main/java/org/jabref/gui/util/FieldsUtil.java b/src/main/java/org/jabref/gui/util/FieldsUtil.java
index fc5a6adfbc9..398c3e120d7 100644
--- a/src/main/java/org/jabref/gui/util/FieldsUtil.java
+++ b/src/main/java/org/jabref/gui/util/FieldsUtil.java
@@ -31,8 +31,8 @@ public Field fromString(String string) {
     };
 
     public static String getNameWithType(Field field) {
-        if (field instanceof SpecialField) {
-            return new SpecialFieldViewModel((SpecialField) field, Globals.prefs, Globals.undoManager).getLocalization()
+        if (field instanceof SpecialField specialField) {
+            return new SpecialFieldViewModel(specialField, Globals.prefs, Globals.undoManager).getLocalization()
                     + " (" + Localization.lang("Special") + ")";
         } else if (field instanceof IEEEField) {
             return field.getDisplayName() + " (" + Localization.lang("IEEE") + ")";
diff --git a/src/main/java/org/jabref/gui/util/FileFilterConverter.java b/src/main/java/org/jabref/gui/util/FileFilterConverter.java
index 3f51bf534ee..3e7a6c33315 100644
--- a/src/main/java/org/jabref/gui/util/FileFilterConverter.java
+++ b/src/main/java/org/jabref/gui/util/FileFilterConverter.java
@@ -27,7 +27,8 @@ private FileFilterConverter() {
     }
 
     public static FileChooser.ExtensionFilter toExtensionFilter(FileType fileType) {
-        String description = Localization.lang("%0 file", fileType.toString());
+        String fileList = String.join(", ", fileType.getExtensionsWithAsteriskAndDot());
+        String description = Localization.lang("%0 file (%1)", fileType.getName(), fileList);
         return new FileChooser.ExtensionFilter(description, fileType.getExtensionsWithAsteriskAndDot());
     }
 
diff --git a/src/main/java/org/jabref/gui/util/OpenHyperlinksInExternalBrowser.java b/src/main/java/org/jabref/gui/util/OpenHyperlinksInExternalBrowser.java
deleted file mode 100644
index a16c0aa29ee..00000000000
--- a/src/main/java/org/jabref/gui/util/OpenHyperlinksInExternalBrowser.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package org.jabref.gui.util;
-
-import java.io.IOException;
-
-import javafx.beans.value.ChangeListener;
-import javafx.beans.value.ObservableValue;
-import javafx.concurrent.Worker;
-import javafx.concurrent.Worker.State;
-import javafx.scene.web.WebView;
-
-import org.jabref.gui.desktop.JabRefDesktop;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.events.Event;
-import org.w3c.dom.events.EventListener;
-import org.w3c.dom.events.EventTarget;
-import org.w3c.dom.html.HTMLAnchorElement;
-
-/**
- * A Hyperlink Click Listener for javafx.WebView to open links on click in the browser
- *  Code adapted from: <a href="https://stackoverflow.com/a/33445383/">https://stackoverflow.com/a/33445383/</a>
- */
-public class OpenHyperlinksInExternalBrowser implements ChangeListener<Worker.State>, EventListener {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(OpenHyperlinksInExternalBrowser.class);
-    private static final String CLICK_EVENT = "click";
-    private static final String ANCHOR_TAG = "a";
-
-    private final WebView webView;
-
-    public OpenHyperlinksInExternalBrowser(WebView webView) {
-        this.webView = webView;
-    }
-
-    @Override
-    public void changed(ObservableValue<? extends State> observable, State oldValue, State newValue) {
-        if (State.SUCCEEDED.equals(newValue)) {
-            Document document = webView.getEngine().getDocument();
-            NodeList anchors = document.getElementsByTagName(ANCHOR_TAG);
-            for (int i = 0; i < anchors.getLength(); i++) {
-                Node node = anchors.item(i);
-                EventTarget eventTarget = (EventTarget) node;
-                eventTarget.addEventListener(CLICK_EVENT, this, false);
-            }
-        }
-    }
-
-    @Override
-    public void handleEvent(Event event) {
-        HTMLAnchorElement anchorElement = (HTMLAnchorElement) event.getCurrentTarget();
-        String href = anchorElement.getHref();
-
-        try {
-            JabRefDesktop.openBrowser(href);
-        } catch (IOException e) {
-            LOGGER.error("Problem opening browser", e);
-        }
-        event.preventDefault();
-    }
-}
diff --git a/src/main/java/org/jabref/gui/util/RadioButtonCell.java b/src/main/java/org/jabref/gui/util/RadioButtonCell.java
deleted file mode 100644
index 1019c6ebe0c..00000000000
--- a/src/main/java/org/jabref/gui/util/RadioButtonCell.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package org.jabref.gui.util;
-
-import java.util.EnumSet;
-
-import javafx.geometry.Pos;
-import javafx.scene.control.RadioButton;
-import javafx.scene.control.TableCell;
-import javafx.scene.control.ToggleGroup;
-import javafx.scene.layout.HBox;
-import javafx.scene.layout.Priority;
-
-public class RadioButtonCell<S, T extends Enum<T>> extends TableCell<S, T> {
-
-    private final EnumSet<T> enumeration;
-
-    public RadioButtonCell(EnumSet<T> enumeration) {
-        this.enumeration = enumeration;
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    protected void updateItem(T item, boolean empty) {
-        super.updateItem(item, empty);
-        if (empty || (item == null)) {
-            setGraphic(null);
-        } else {
-            // gui setup
-            HBox hb = new HBox(7);
-            hb.setAlignment(Pos.CENTER);
-            final ToggleGroup group = new ToggleGroup();
-
-            // create a radio button for each 'element' of the enumeration
-            for (Enum<T> enumElement : enumeration) {
-                RadioButton radioButton = new RadioButton(enumElement.toString());
-                radioButton.setUserData(enumElement);
-                radioButton.setToggleGroup(group);
-                radioButton.setMinWidth(USE_PREF_SIZE);
-                hb.getChildren().add(radioButton);
-                if (enumElement.equals(item)) {
-                    radioButton.setSelected(true);
-                }
-                hb.setMinWidth(USE_PREF_SIZE);
-                hb.setHgrow(radioButton, Priority.ALWAYS);
-            }
-
-            // issue events on change of the selected radio button
-            group.selectedToggleProperty().addListener((oservable, oldValue, newValue) -> {
-                getTableView().edit(getIndex(), getTableColumn());
-                RadioButtonCell.this.commitEdit((T) newValue.getUserData());
-            });
-
-            setGraphic(hb);
-        }
-    }
-}
diff --git a/src/main/java/org/jabref/gui/util/RecursiveTreeItem.java b/src/main/java/org/jabref/gui/util/RecursiveTreeItem.java
index 6bf002c59d0..75519a2f9e4 100644
--- a/src/main/java/org/jabref/gui/util/RecursiveTreeItem.java
+++ b/src/main/java/org/jabref/gui/util/RecursiveTreeItem.java
@@ -16,8 +16,8 @@
 import com.tobiasdiez.easybind.EasyBind;
 
 /**
- * @implNote Taken from https://gist.github.com/lestard/011e9ed4433f9eb791a8
- * @implNote As CheckBoxTreeItem extends TreeItem, this class will work for both.
+ * Taken from https://gist.github.com/lestard/011e9ed4433f9eb791a8
+ * As CheckBoxTreeItem extends TreeItem, this class will work for both.
  */
 public class RecursiveTreeItem<T> extends CheckBoxTreeItem<T> {
 
diff --git a/src/main/java/org/jabref/gui/util/TooltipTextUtil.java b/src/main/java/org/jabref/gui/util/TooltipTextUtil.java
index a34ada6914e..bc07e000068 100644
--- a/src/main/java/org/jabref/gui/util/TooltipTextUtil.java
+++ b/src/main/java/org/jabref/gui/util/TooltipTextUtil.java
@@ -115,7 +115,7 @@ private static void splitReplace(List<Text> textList, TextReplacement replacemen
             textList.remove(index);
             String[] textParts = original.split(replacement.toReplace);
             if (textParts.length == 2) {
-                if (textParts[0].equals("")) {
+                if ("".equals(textParts[0])) {
                     textList.add(index, TooltipTextUtil.createText(replacement.replacement, replacement.textType));
                     textList.add(index + 1, TooltipTextUtil.createText(textParts[1], TooltipTextUtil.TextType.NORMAL));
                 } else {
diff --git a/src/main/java/org/jabref/gui/util/ViewModelTreeCellFactory.java b/src/main/java/org/jabref/gui/util/ViewModelTreeCellFactory.java
index c4d01133406..b3b551d4fd6 100644
--- a/src/main/java/org/jabref/gui/util/ViewModelTreeCellFactory.java
+++ b/src/main/java/org/jabref/gui/util/ViewModelTreeCellFactory.java
@@ -18,7 +18,6 @@
 /**
  * Constructs a {@link TreeTableCell} based on the view model of the row and a bunch of specified converter methods.
  *
- * @param <S> view model
  * @param <T> cell value
  */
 public class ViewModelTreeCellFactory<T> implements Callback<TreeView<T>, TreeCell<T>> {
diff --git a/src/main/java/org/jabref/gui/util/ViewModelTreeTableRowFactory.java b/src/main/java/org/jabref/gui/util/ViewModelTreeTableRowFactory.java
index cae8d1c353c..acb4ee65fd0 100644
--- a/src/main/java/org/jabref/gui/util/ViewModelTreeTableRowFactory.java
+++ b/src/main/java/org/jabref/gui/util/ViewModelTreeTableRowFactory.java
@@ -10,6 +10,8 @@
 
 import javafx.beans.value.ObservableValue;
 import javafx.css.PseudoClass;
+import javafx.event.Event;
+import javafx.event.EventType;
 import javafx.geometry.Bounds;
 import javafx.geometry.Point2D;
 import javafx.scene.control.ContextMenu;
@@ -36,6 +38,7 @@ public class ViewModelTreeTableRowFactory<S> implements Callback<TreeTableView<S
     private TriConsumer<TreeTableRow<S>, S, ? super DragEvent> toOnDragExited;
     private TriConsumer<TreeTableRow<S>, S, ? super DragEvent> toOnDragOver;
     private TriConsumer<TreeTableRow<S>, S, ? super MouseDragEvent> toOnMouseDragEntered;
+    private final Map<EventType<?>, BiConsumer<S, ? super Event>> eventFilters = new HashMap<>();
     private final Map<PseudoClass, Callback<TreeTableRow<S>, ObservableValue<Boolean>>> pseudoClasses = new HashMap<>();
 
     public ViewModelTreeTableRowFactory<S> withOnMouseClickedEvent(BiConsumer<S, ? super MouseEvent> event) {
@@ -114,6 +117,11 @@ public ViewModelTreeTableRowFactory<S> withPseudoClass(PseudoClass pseudoClass,
         return this;
     }
 
+    public ViewModelTreeTableRowFactory<S> withEventFilter(EventType<?> event, BiConsumer<S, ? super Event> toCondition) {
+        this.eventFilters.putIfAbsent(event, toCondition);
+        return this;
+    }
+
     public void install(TreeTableView<S> table) {
         table.setRowFactory(this);
     }
@@ -192,6 +200,10 @@ protected void updateItem(S row, boolean empty) {
                         setOnMouseDragEntered(event -> toOnMouseDragEntered.accept(this, getItem(), event));
                     }
 
+                    for (Map.Entry<EventType<?>, BiConsumer<S, ? super Event>> eventFilter : eventFilters.entrySet()) {
+                        addEventFilter(eventFilter.getKey(), event -> eventFilter.getValue().accept(getItem(), event));
+                    }
+
                     for (Map.Entry<PseudoClass, Callback<TreeTableRow<S>, ObservableValue<Boolean>>> pseudoClassWithCondition : pseudoClasses.entrySet()) {
                         ObservableValue<Boolean> condition = pseudoClassWithCondition.getValue().call(this);
                         subscriptions.add(BindingsHelper.includePseudoClassWhen(
diff --git a/src/main/java/org/jabref/gui/util/component/DiffHighlightingTextPane.java b/src/main/java/org/jabref/gui/util/component/DiffHighlightingTextPane.java
deleted file mode 100644
index f055d0eff75..00000000000
--- a/src/main/java/org/jabref/gui/util/component/DiffHighlightingTextPane.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.jabref.gui.util.component;
-
-import javafx.scene.text.TextFlow;
-
-public class DiffHighlightingTextPane extends TextFlow {
-
-    private static final String BODY_STYLE = "body{font:sans-serif}";
-    private static final String ADDITION_STYLE = ".add{color:blue;text-decoration:underline}";
-    private static final String REMOVAL_STYLE = ".del{color:red;text-decoration:line-through;}";
-    private static final String CHANGE_STYLE = ".change{color:#006400;text-decoration:underline}";
-
-    private static final String CONTENT_TYPE = "text/html";
-
-    public DiffHighlightingTextPane() {
-        super();
-//        setContentType(CONTENT_TYPE);
-//        StyleSheet sheet = ((HTMLEditorKit) getEditorKit()).getStyleSheet();
-//        sheet.addRule(BODY_STYLE);
-//        sheet.addRule(ADDITION_STYLE);
-//        sheet.addRule(REMOVAL_STYLE);
-//        sheet.addRule(CHANGE_STYLE);
-//        setEditable(false);
-    }
-}
diff --git a/src/main/java/org/jabref/gui/util/component/Tag.fxml b/src/main/java/org/jabref/gui/util/component/Tag.fxml
deleted file mode 100644
index 847c44e4060..00000000000
--- a/src/main/java/org/jabref/gui/util/component/Tag.fxml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.Tooltip?>
-<?import javafx.scene.layout.HBox?>
-<?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" styleClass="tag"
-         fx:controller="org.jabref.gui.util.component.Tag">
-    <Label fx:id="text">
-        <HBox.margin>
-            <Insets right="5" left="3"/>
-        </HBox.margin>
-    </Label>
-    <Button
-            styleClass="icon-button"
-            onAction="#removeButtonClicked">
-        <graphic>
-            <JabRefIconView glyph="CLOSE"/>
-        </graphic>
-        <tooltip>
-            <Tooltip text="%Remove"/>
-        </tooltip>
-    </Button>
-</fx:root>
diff --git a/src/main/java/org/jabref/gui/util/component/Tag.java b/src/main/java/org/jabref/gui/util/component/Tag.java
deleted file mode 100644
index 998f044eac5..00000000000
--- a/src/main/java/org/jabref/gui/util/component/Tag.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package org.jabref.gui.util.component;
-
-import java.util.Objects;
-import java.util.function.Consumer;
-import java.util.function.Function;
-
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.SimpleObjectProperty;
-import javafx.event.ActionEvent;
-import javafx.fxml.FXML;
-import javafx.scene.control.Label;
-import javafx.scene.layout.HBox;
-
-import com.airhacks.afterburner.views.ViewLoader;
-import com.tobiasdiez.easybind.EasyBind;
-
-/**
- * A tag item in a {@link TagBar}.
- */
-public class Tag<T> extends HBox {
-
-    private final ObjectProperty<T> value;
-    private Consumer<T> tagRemovedConsumer;
-    @FXML private Label text;
-
-    public Tag(Function<T, String> toString) {
-        Objects.requireNonNull(toString);
-
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
-
-        value = new SimpleObjectProperty<>();
-        text.textProperty().bind(EasyBind.map(value, toString));
-    }
-
-    public Tag(Function<T, String> toString, T value) {
-        this(toString);
-        setValue(value);
-    }
-
-    public T getValue() {
-        return value.get();
-    }
-
-    public void setValue(T value) {
-        this.value.set(value);
-    }
-
-    public ObjectProperty<T> valueProperty() {
-        return value;
-    }
-
-    @FXML
-    private void removeButtonClicked(ActionEvent event) {
-        if (tagRemovedConsumer != null) {
-            tagRemovedConsumer.accept(value.get());
-        }
-    }
-
-    public final void setOnTagRemoved(Consumer<T> tagRemovedConsumer) {
-        this.tagRemovedConsumer = tagRemovedConsumer;
-    }
-}
diff --git a/src/main/java/org/jabref/gui/util/component/TagBar.css b/src/main/java/org/jabref/gui/util/component/TagBar.css
deleted file mode 100644
index d940858d283..00000000000
--- a/src/main/java/org/jabref/gui/util/component/TagBar.css
+++ /dev/null
@@ -1,14 +0,0 @@
-.tagBar > HBox {
-    -fx-spacing: 3;
-}
-
-.tagBar .tag {
-    -fx-background-color: transparent;
-    -fx-alignment: center;
-    -fx-border-width: 1;
-    -fx-border-color: darkgrey;
-}
-
-.tagBar .tag .button {
-    -fx-background-color: transparent;
-}
diff --git a/src/main/java/org/jabref/gui/util/component/TagBar.fxml b/src/main/java/org/jabref/gui/util/component/TagBar.fxml
deleted file mode 100644
index 12af8b3b8d9..00000000000
--- a/src/main/java/org/jabref/gui/util/component/TagBar.fxml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.scene.control.TextField?>
-<?import javafx.scene.layout.HBox?>
-<fx:root xmlns:fx="http://javafx.com/fxml/1" type="HBox" xmlns="http://javafx.com/javafx/8.0.112" styleClass="tagBar"
-         fx:controller="org.jabref.gui.util.component.TagBar">
-    <HBox fx:id="tagList"/>
-    <TextField fx:id="inputTextField" onAction="#addTextAsNewTag" HBox.hgrow="ALWAYS" prefHeight="Infinity"/>
-</fx:root>
diff --git a/src/main/java/org/jabref/gui/util/component/TagBar.java b/src/main/java/org/jabref/gui/util/component/TagBar.java
deleted file mode 100644
index da63e602893..00000000000
--- a/src/main/java/org/jabref/gui/util/component/TagBar.java
+++ /dev/null
@@ -1,112 +0,0 @@
-package org.jabref.gui.util.component;
-
-import java.util.Collection;
-import java.util.Set;
-import java.util.function.BiConsumer;
-import java.util.stream.Collectors;
-
-import javafx.beans.property.ListProperty;
-import javafx.beans.property.SimpleListProperty;
-import javafx.collections.FXCollections;
-import javafx.collections.ListChangeListener;
-import javafx.collections.ObservableList;
-import javafx.event.ActionEvent;
-import javafx.fxml.FXML;
-import javafx.scene.control.TextField;
-import javafx.scene.input.MouseEvent;
-import javafx.scene.layout.HBox;
-import javafx.util.StringConverter;
-
-import org.jabref.model.entry.field.FieldProperty;
-import org.jabref.model.strings.StringUtil;
-
-import com.airhacks.afterburner.views.ViewLoader;
-
-/**
- * Field editor that provides various pre-defined options as a drop-down combobox.
- */
-public class TagBar<T> extends HBox {
-
-    private final ListProperty<T> tags;
-    private StringConverter<T> stringConverter;
-    @FXML
-    private TextField inputTextField;
-    @FXML
-    private HBox tagList;
-    private BiConsumer<T, MouseEvent> onTagClicked;
-    private java.util.Set<FieldProperty> properties;
-
-    public TagBar() {
-        tags = new SimpleListProperty<>(FXCollections.observableArrayList());
-        tags.addListener(this::onTagsChanged);
-
-        // Load FXML
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
-        getStylesheets().add(0, TagBar.class.getResource("TagBar.css").toExternalForm());
-    }
-
-    public TextField getInputTextField() {
-        return inputTextField;
-    }
-
-    public ObservableList<T> getTags() {
-        return tags.get();
-    }
-
-    public void setTags(Collection<T> newTags) {
-        this.tags.setAll(newTags);
-    }
-
-    public ListProperty<T> tagsProperty() {
-        return tags;
-    }
-
-    private void onTagsChanged(ListChangeListener.Change<? extends T> change) {
-        while (change.next()) {
-            if (change.wasRemoved()) {
-                tagList.getChildren().subList(change.getFrom(), change.getFrom() + change.getRemovedSize()).clear();
-            } else if (change.wasAdded()) {
-                tagList.getChildren().addAll(change.getFrom(), change.getAddedSubList().stream().map(this::createTag).collect(Collectors.toList()));
-            }
-        }
-        if (this.properties.contains(FieldProperty.SINGLE_ENTRY_LINK)) {
-            inputTextField.setDisable(!tags.isEmpty());
-        }
-    }
-
-    private Tag<T> createTag(T item) {
-        Tag<T> tag = new Tag<>(stringConverter::toString);
-        tag.setOnTagRemoved(tags::remove);
-        tag.setValue(item);
-        if (onTagClicked != null) {
-            tag.setOnMouseClicked(event -> onTagClicked.accept(item, event));
-        }
-        return tag;
-    }
-
-    @FXML
-    private void addTextAsNewTag(ActionEvent event) {
-        String inputText = inputTextField.getText();
-        if (StringUtil.isNotBlank(inputText)) {
-            T newTag = stringConverter.fromString(inputText);
-            if ((newTag != null) && !tags.contains(newTag) && (tags.isEmpty() || this.properties.contains(FieldProperty.MULTIPLE_ENTRY_LINK))) {
-                tags.add(newTag);
-                inputTextField.clear();
-            }
-        }
-    }
-
-    public void setStringConverter(StringConverter<T> stringConverter) {
-        this.stringConverter = stringConverter;
-    }
-
-    public void setOnTagClicked(BiConsumer<T, MouseEvent> onTagClicked) {
-        this.onTagClicked = onTagClicked;
-    }
-
-    public void setFieldProperties(Set<FieldProperty> properties) {
-        this.properties = properties;
-    }
-}
diff --git a/src/main/java/org/jabref/http/dto/BibEntryDTO.java b/src/main/java/org/jabref/http/dto/BibEntryDTO.java
index a0d20d4353e..b9369d2566f 100644
--- a/src/main/java/org/jabref/http/dto/BibEntryDTO.java
+++ b/src/main/java/org/jabref/http/dto/BibEntryDTO.java
@@ -5,7 +5,7 @@
 
 import org.jabref.logic.bibtex.BibEntryWriter;
 import org.jabref.logic.bibtex.FieldWriter;
-import org.jabref.logic.bibtex.FieldWriterPreferences;
+import org.jabref.logic.bibtex.FieldPreferences;
 import org.jabref.logic.exporter.BibWriter;
 import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.model.entry.BibEntry;
@@ -28,7 +28,7 @@ public record BibEntryDTO(SharedBibEntryData sharingMetadata, String userComment
 
     public static final Logger LOGGER = LoggerFactory.getLogger(BibEntryDTO.class);
 
-    public BibEntryDTO(BibEntry bibEntry, BibDatabaseMode bibDatabaseMode, FieldWriterPreferences fieldWriterPreferences, BibEntryTypesManager bibEntryTypesManager) {
+    public BibEntryDTO(BibEntry bibEntry, BibDatabaseMode bibDatabaseMode, FieldPreferences fieldWriterPreferences, BibEntryTypesManager bibEntryTypesManager) {
         this(bibEntry.getSharedBibEntryData(),
                 bibEntry.getUserComments(),
                 bibEntry.getCitationKey().orElse(""),
@@ -36,7 +36,7 @@ public BibEntryDTO(BibEntry bibEntry, BibDatabaseMode bibDatabaseMode, FieldWrit
         );
     }
 
-    private static String convertToString(BibEntry entry, BibDatabaseMode bibDatabaseMode, FieldWriterPreferences fieldWriterPreferences, BibEntryTypesManager bibEntryTypesManager) {
+    private static String convertToString(BibEntry entry, BibDatabaseMode bibDatabaseMode, FieldPreferences fieldWriterPreferences, BibEntryTypesManager bibEntryTypesManager) {
         StringWriter rawEntry = new StringWriter();
         BibWriter bibWriter = new BibWriter(rawEntry, "\n");
         BibEntryWriter bibtexEntryWriter = new BibEntryWriter(new FieldWriter(fieldWriterPreferences), bibEntryTypesManager);
diff --git a/src/main/java/org/jabref/http/server/LibraryResource.java b/src/main/java/org/jabref/http/server/LibraryResource.java
index 9e10afa7fa1..349cd272b3a 100644
--- a/src/main/java/org/jabref/http/server/LibraryResource.java
+++ b/src/main/java/org/jabref/http/server/LibraryResource.java
@@ -43,11 +43,8 @@ public class LibraryResource {
     public String getJson(@PathParam("id") String id) {
         ParserResult parserResult = getParserResult(id);
         List<BibEntryDTO> list = parserResult.getDatabase().getEntries().stream()
-                                             .map(bibEntry -> {
-                                                 bibEntry.getSharedBibEntryData().setSharedID(Objects.hash(bibEntry));
-                                                 return bibEntry;
-                                             })
-                                             .map(entry -> new BibEntryDTO(entry, parserResult.getDatabaseContext().getMode(), preferences.getFieldWriterPreferences(), Globals.entryTypesManager))
+                                             .peek(bibEntry -> bibEntry.getSharedBibEntryData().setSharedID(Objects.hash(bibEntry)))
+                                             .map(entry -> new BibEntryDTO(entry, parserResult.getDatabaseContext().getMode(), preferences.getFieldPreferences(), Globals.entryTypesManager))
                                              .toList();
         return gson.toJson(list);
     }
@@ -90,12 +87,11 @@ public Response getBibtex(@PathParam("id") String id) {
     }
 
     private java.nio.file.Path getLibraryPath(String id) {
-        java.nio.file.Path library = preferences.getGuiPreferences().getLastFilesOpened()
-                                                .stream()
-                                                .map(java.nio.file.Path::of)
-                                                .filter(p -> (p.getFileName() + "-" + BackupFileUtil.getUniqueFilePrefix(p)).equals(id))
-                                                .findAny()
-                                                .orElseThrow(() -> new NotFoundException());
-        return library;
+        return preferences.getGuiPreferences().getLastFilesOpened()
+                          .stream()
+                          .map(java.nio.file.Path::of)
+                          .filter(p -> (p.getFileName() + "-" + BackupFileUtil.getUniqueFilePrefix(p)).equals(id))
+                          .findAny()
+                          .orElseThrow(NotFoundException::new);
     }
 }
diff --git a/src/main/java/org/jabref/logic/bibtex/BibEntryWriter.java b/src/main/java/org/jabref/logic/bibtex/BibEntryWriter.java
index 11ebd5ffebe..663fa3e3fee 100644
--- a/src/main/java/org/jabref/logic/bibtex/BibEntryWriter.java
+++ b/src/main/java/org/jabref/logic/bibtex/BibEntryWriter.java
@@ -24,6 +24,7 @@
 import org.jabref.model.entry.field.BibField;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.InternalField;
+import org.jabref.model.entry.field.OrFields;
 import org.jabref.model.strings.StringUtil;
 
 import org.slf4j.LoggerFactory;
@@ -103,11 +104,12 @@ private void writeRequiredFieldsFirstRemainingFieldsSecond(BibEntry entry, BibWr
         if (type.isPresent()) {
             // Write required fields first
             List<Field> requiredFields = type.get()
-                                             .getRequiredFields()
-                                             .stream()
-                                             .flatMap(Collection::stream)
-                                             .sorted(Comparator.comparing(Field::getName))
-                                             .collect(Collectors.toList());
+                    .getRequiredFields()
+                    .stream()
+                    .map(OrFields::getFields)
+                    .flatMap(Collection::stream)
+                    .sorted(Comparator.comparing(Field::getName))
+                    .collect(Collectors.toList());
 
             for (Field field : requiredFields) {
                 writeField(entry, out, field, indent);
@@ -173,7 +175,7 @@ private void writeField(BibEntry entry, BibWriter out, Field field, int indent)
     }
 
     static int getLengthOfLongestFieldName(BibEntry entry) {
-        Predicate<Field> isNotCitationKey = field -> !InternalField.KEY_FIELD.equals(field);
+        Predicate<Field> isNotCitationKey = field -> InternalField.KEY_FIELD != field;
         return entry.getFields()
                     .stream()
                     .filter(isNotCitationKey)
diff --git a/src/main/java/org/jabref/logic/bibtex/FieldContentFormatter.java b/src/main/java/org/jabref/logic/bibtex/FieldContentFormatter.java
index c2fdab6b40c..726ea97de55 100644
--- a/src/main/java/org/jabref/logic/bibtex/FieldContentFormatter.java
+++ b/src/main/java/org/jabref/logic/bibtex/FieldContentFormatter.java
@@ -20,7 +20,7 @@ public class FieldContentFormatter {
 
     private final Set<Field> multiLineFields;
 
-    public FieldContentFormatter(FieldContentFormatterPreferences preferences) {
+    public FieldContentFormatter(FieldPreferences preferences) {
         Objects.requireNonNull(preferences);
 
         multiLineFields = new HashSet<>();
diff --git a/src/main/java/org/jabref/logic/bibtex/FieldContentFormatterPreferences.java b/src/main/java/org/jabref/logic/bibtex/FieldContentFormatterPreferences.java
deleted file mode 100644
index d5a8248adf8..00000000000
--- a/src/main/java/org/jabref/logic/bibtex/FieldContentFormatterPreferences.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.jabref.logic.bibtex;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.jabref.model.entry.field.Field;
-
-public class FieldContentFormatterPreferences {
-
-    private final List<Field> nonWrappableFields;
-
-    /**
-     * Constructor defining that there are not any non-wrappable fields
-     */
-    public FieldContentFormatterPreferences() {
-        this.nonWrappableFields = Collections.emptyList();
-    }
-
-    public FieldContentFormatterPreferences(List<Field> nonWrappableFields) {
-        this.nonWrappableFields = nonWrappableFields;
-    }
-
-    public List<Field> getNonWrappableFields() {
-        return nonWrappableFields;
-    }
-}
diff --git a/src/main/java/org/jabref/logic/bibtex/FieldPreferences.java b/src/main/java/org/jabref/logic/bibtex/FieldPreferences.java
new file mode 100644
index 00000000000..7390f932c74
--- /dev/null
+++ b/src/main/java/org/jabref/logic/bibtex/FieldPreferences.java
@@ -0,0 +1,59 @@
+package org.jabref.logic.bibtex;
+
+import java.util.Collection;
+import java.util.List;
+
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+
+import org.jabref.model.entry.field.Field;
+
+public class FieldPreferences {
+
+    private final BooleanProperty resolveStrings = new SimpleBooleanProperty();
+    private final ObservableList<Field> resolvableFields;
+    private final ObservableList<Field> nonWrappableFields;
+
+    /**
+     * @param resolveStrings true - The character {@link FieldWriter#BIBTEX_STRING_START_END_SYMBOL} should be interpreted as indicator of BibTeX strings
+     */
+    public FieldPreferences(boolean resolveStrings,
+                            List<Field> resolvableFields,
+                            List<Field> nonWrappableFields) {
+        this.resolveStrings.set(resolveStrings);
+        this.resolvableFields = FXCollections.observableArrayList(resolvableFields);
+        this.nonWrappableFields = FXCollections.observableArrayList(nonWrappableFields);
+    }
+
+    public boolean shouldResolveStrings() {
+        return resolveStrings.get();
+    }
+
+    public BooleanProperty resolveStringsProperty() {
+        return resolveStrings;
+    }
+
+    public void setResolveStrings(boolean resolveStrings) {
+        this.resolveStrings.set(resolveStrings);
+    }
+
+    public ObservableList<Field> getResolvableFields() {
+        return resolvableFields;
+    }
+
+    public void setResolvableFields(Collection<Field> list) {
+        resolvableFields.clear();
+        resolvableFields.addAll(list);
+    }
+
+    public ObservableList<Field> getNonWrappableFields() {
+        return nonWrappableFields;
+    }
+
+    public void setNonWrappableFields(Collection<Field> list) {
+        nonWrappableFields.clear();
+        nonWrappableFields.addAll(list);
+    }
+}
diff --git a/src/main/java/org/jabref/logic/bibtex/FieldWriter.java b/src/main/java/org/jabref/logic/bibtex/FieldWriter.java
index 3654da1f118..7e9c91e46b7 100644
--- a/src/main/java/org/jabref/logic/bibtex/FieldWriter.java
+++ b/src/main/java/org/jabref/logic/bibtex/FieldWriter.java
@@ -19,21 +19,21 @@ public class FieldWriter {
     private static final char FIELD_END = '}';
 
     private final boolean neverFailOnHashes;
-    private final FieldWriterPreferences preferences;
+    private final FieldPreferences preferences;
     private final FieldContentFormatter formatter;
 
-    public FieldWriter(FieldWriterPreferences preferences) {
+    public FieldWriter(FieldPreferences preferences) {
         this(true, preferences);
     }
 
-    private FieldWriter(boolean neverFailOnHashes, FieldWriterPreferences preferences) {
+    private FieldWriter(boolean neverFailOnHashes, FieldPreferences preferences) {
         this.neverFailOnHashes = neverFailOnHashes;
         this.preferences = preferences;
 
-        formatter = new FieldContentFormatter(preferences.getFieldContentFormatterPreferences());
+        formatter = new FieldContentFormatter(preferences);
     }
 
-    public static FieldWriter buildIgnoreHashes(FieldWriterPreferences prefs) {
+    public static FieldWriter buildIgnoreHashes(FieldPreferences prefs) {
         return new FieldWriter(true, prefs);
     }
 
@@ -58,11 +58,11 @@ private static void checkBraces(String text) throws InvalidFieldValueException {
         }
 
         // Then we throw an exception if the error criteria are met.
-        if (!(right == 0) && (left == 0)) {
+        if (right != 0 && (left == 0)) {
             LOGGER.error("Unescaped '}' character without opening bracket ends string prematurely. Field value: {}", text);
             throw new InvalidFieldValueException("Unescaped '}' character without opening bracket ends string prematurely. Field value: " + text);
         }
-        if (!(right == 0) && (right < left)) {
+        if (right != 0 && (right < left)) {
             LOGGER.error("Unescaped '}' character without opening bracket ends string prematurely. Field value: {}", text);
             throw new InvalidFieldValueException("Unescaped '}' character without opening bracket ends string prematurely. Field value: " + text);
         }
@@ -166,9 +166,9 @@ private String formatAndResolveStrings(String content, Field field) throws Inval
     }
 
     private boolean shouldResolveStrings(Field field) {
-        if (preferences.isResolveStrings()) {
+        if (preferences.shouldResolveStrings()) {
             // Resolve strings for the list of fields only
-            return preferences.getResolveStringsForFields().contains(field);
+            return preferences.getResolvableFields().contains(field);
         }
         return false;
     }
diff --git a/src/main/java/org/jabref/logic/bibtex/FieldWriterPreferences.java b/src/main/java/org/jabref/logic/bibtex/FieldWriterPreferences.java
deleted file mode 100644
index d519a18330b..00000000000
--- a/src/main/java/org/jabref/logic/bibtex/FieldWriterPreferences.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.jabref.logic.bibtex;
-
-import java.util.List;
-
-import org.jabref.model.entry.field.Field;
-
-public class FieldWriterPreferences {
-
-    private final boolean resolveStrings;
-    private final List<Field> resolveStringsForFields;
-    private final FieldContentFormatterPreferences fieldContentFormatterPreferences;
-
-    /**
-     * @param resolveStrings true - The character {@link FieldWriter#BIBTEX_STRING_START_END_SYMBOL} should be interpreted as indicator of BibTeX strings
-     */
-    public FieldWriterPreferences(boolean resolveStrings, List<Field> resolveStringsForFields,
-                                  FieldContentFormatterPreferences fieldContentFormatterPreferences) {
-        this.resolveStrings = resolveStrings;
-        this.resolveStringsForFields = resolveStringsForFields;
-        this.fieldContentFormatterPreferences = fieldContentFormatterPreferences;
-    }
-
-    public boolean isResolveStrings() {
-        return resolveStrings;
-    }
-
-    public List<Field> getResolveStringsForFields() {
-        return resolveStringsForFields;
-    }
-
-    public FieldContentFormatterPreferences getFieldContentFormatterPreferences() {
-        return fieldContentFormatterPreferences;
-    }
-}
diff --git a/src/main/java/org/jabref/logic/bibtex/comparator/BibDatabaseDiff.java b/src/main/java/org/jabref/logic/bibtex/comparator/BibDatabaseDiff.java
index cad1eea0a5b..7645ed85d1c 100644
--- a/src/main/java/org/jabref/logic/bibtex/comparator/BibDatabaseDiff.java
+++ b/src/main/java/org/jabref/logic/bibtex/comparator/BibDatabaseDiff.java
@@ -21,7 +21,7 @@ public class BibDatabaseDiff {
     private final List<BibStringDiff> bibStringDiffs;
     private final List<BibEntryDiff> entryDiffs;
 
-    private BibDatabaseDiff(BibDatabaseContext originalDatabase, BibDatabaseContext newDatabase) {
+    private BibDatabaseDiff(BibDatabaseContext originalDatabase, BibDatabaseContext newDatabase, boolean includeEmptyEntries) {
         metaDataDiff = MetaDataDiff.compare(originalDatabase.getMetaData(), newDatabase.getMetaData()).orElse(null);
         preambleDiff = PreambleDiff.compare(originalDatabase, newDatabase).orElse(null);
         bibStringDiffs = BibStringDiff.compare(originalDatabase.getDatabase(), newDatabase.getDatabase());
@@ -31,6 +31,11 @@ private BibDatabaseDiff(BibDatabaseContext originalDatabase, BibDatabaseContext
         List<BibEntry> originalEntriesSorted = originalDatabase.getDatabase().getEntriesSorted(comparator);
         List<BibEntry> newEntriesSorted = newDatabase.getDatabase().getEntriesSorted(comparator);
 
+        if (!includeEmptyEntries) {
+            originalEntriesSorted.removeIf(BibEntry::isEmpty);
+            newEntriesSorted.removeIf(BibEntry::isEmpty);
+        }
+
         entryDiffs = compareEntries(originalEntriesSorted, newEntriesSorted, originalDatabase.getMode());
     }
 
@@ -110,7 +115,7 @@ private static boolean hasEqualCitationKey(BibEntry oneEntry, BibEntry twoEntry)
     }
 
     public static BibDatabaseDiff compare(BibDatabaseContext base, BibDatabaseContext changed) {
-        return new BibDatabaseDiff(base, changed);
+        return new BibDatabaseDiff(base, changed, false);
     }
 
     public Optional<MetaDataDiff> getMetaDataDifferences() {
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 7e11b1d8de0..8575b65c59b 100644
--- a/src/main/java/org/jabref/logic/bibtex/comparator/EntryComparator.java
+++ b/src/main/java/org/jabref/logic/bibtex/comparator/EntryComparator.java
@@ -109,14 +109,14 @@ public int compare(BibEntry e1, BibEntry e2) {
 
         int result;
 
-        if ((f1 instanceof Integer) && (f2 instanceof Integer)) {
-            result = ((Integer) f1).compareTo((Integer) f2);
-        } else if (f2 instanceof Integer) {
+        if ((f1 instanceof Integer f1i) && (f2 instanceof Integer f2i)) {
+            result = f1i.compareTo(f2i);
+        } else if (f2 instanceof Integer integer) {
             Integer f1AsInteger = Integer.valueOf(f1.toString());
-            result = f1AsInteger.compareTo((Integer) f2);
-        } else if (f1 instanceof Integer) {
+            result = f1AsInteger.compareTo(integer);
+        } else if (f1 instanceof Integer integer) {
             Integer f2AsInteger = Integer.valueOf(f2.toString());
-            result = ((Integer) f1).compareTo(f2AsInteger);
+            result = integer.compareTo(f2AsInteger);
         } else {
             String ours = ((String) f1).toLowerCase(Locale.ROOT);
             String theirs = ((String) f2).toLowerCase(Locale.ROOT);
diff --git a/src/main/java/org/jabref/logic/bibtex/comparator/FieldComparator.java b/src/main/java/org/jabref/logic/bibtex/comparator/FieldComparator.java
index 005ef6577ee..42f86e0d78d 100644
--- a/src/main/java/org/jabref/logic/bibtex/comparator/FieldComparator.java
+++ b/src/main/java/org/jabref/logic/bibtex/comparator/FieldComparator.java
@@ -15,7 +15,7 @@
 import org.jabref.model.entry.field.InternalField;
 import org.jabref.model.entry.field.OrFields;
 import org.jabref.model.entry.field.StandardField;
-import org.jabref.model.metadata.SaveOrderConfig;
+import org.jabref.model.metadata.SaveOrder;
 import org.jabref.model.strings.StringUtil;
 
 /**
@@ -38,7 +38,7 @@ public FieldComparator(Field field) {
         this(new OrFields(field), false);
     }
 
-    public FieldComparator(SaveOrderConfig.SortCriterion sortCriterion) {
+    public FieldComparator(SaveOrder.SortCriterion sortCriterion) {
         this(new OrFields(sortCriterion.field), sortCriterion.descending);
     }
 
@@ -59,13 +59,13 @@ private static Collator getCollator() {
     }
 
     private FieldType determineFieldType() {
-        if (InternalField.TYPE_HEADER.equals(this.fields.getPrimary())) {
+        if (InternalField.TYPE_HEADER == this.fields.getPrimary()) {
             return FieldType.TYPE;
         } else if (this.fields.getPrimary().getProperties().contains(FieldProperty.PERSON_NAMES)) {
             return FieldType.NAME;
-        } else if (StandardField.YEAR.equals(this.fields.getPrimary())) {
+        } else if (StandardField.YEAR == this.fields.getPrimary()) {
             return FieldType.YEAR;
-        } else if (StandardField.MONTH.equals(this.fields.getPrimary())) {
+        } else if (StandardField.MONTH == this.fields.getPrimary()) {
             return FieldType.MONTH;
         } else {
             return FieldType.OTHER;
@@ -73,7 +73,7 @@ private FieldType determineFieldType() {
     }
 
     private String getFieldValue(BibEntry entry) {
-        for (Field aField : fields) {
+        for (Field aField : fields.getFields()) {
             Optional<String> o = entry.getFieldOrAliasLatexFree(aField);
             if (o.isPresent()) {
                 return o.get();
@@ -92,8 +92,6 @@ public int compare(BibEntry e1, BibEntry e2) {
             f1 = e1.getType().getDisplayName();
             f2 = e2.getType().getDisplayName();
         } else {
-            // If the field is author or editor, we rearrange names so they are
-            // sorted according to last name.
             f1 = getFieldValue(e1);
             f2 = getFieldValue(e2);
         }
@@ -102,9 +100,9 @@ public int compare(BibEntry e1, BibEntry e2) {
         if ((f1 == null) && (f2 == null)) {
             return 0;
         } else if (f1 == null) {
-            return multiplier;
-        } else if (f2 == null) {
             return -multiplier;
+        } else if (f2 == null) {
+            return +multiplier;
         }
 
         // Now we know that both f1 and f2 are != null
diff --git a/src/main/java/org/jabref/logic/bibtex/comparator/MetaDataDiff.java b/src/main/java/org/jabref/logic/bibtex/comparator/MetaDataDiff.java
index b1ac75dcc3e..5420ef97391 100644
--- a/src/main/java/org/jabref/logic/bibtex/comparator/MetaDataDiff.java
+++ b/src/main/java/org/jabref/logic/bibtex/comparator/MetaDataDiff.java
@@ -1,6 +1,7 @@
 package org.jabref.logic.bibtex.comparator;
 
-import java.util.EnumSet;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
 
@@ -8,7 +9,7 @@
 import org.jabref.preferences.PreferencesService;
 
 public class MetaDataDiff {
-    public enum Difference {
+    public enum DifferenceType {
         PROTECTED,
         GROUPS_ALTERED,
         ENCODING,
@@ -23,6 +24,9 @@ public enum Difference {
         CONTENT_SELECTOR
     }
 
+    public record Difference(DifferenceType differenceType, Object originalObject, Object newObject) {
+    }
+
     private final Optional<GroupDiff> groupDiff;
     private final MetaData originalMetaData;
     private final MetaData newMetaData;
@@ -41,50 +45,31 @@ public static Optional<MetaDataDiff> compare(MetaData originalMetaData, MetaData
         }
     }
 
+    private void addToListIfDiff(List<Difference> changes, DifferenceType differenceType, Object originalObject, Object newObject) {
+        if (!Objects.equals(originalObject, newObject)) {
+            changes.add(new Difference(differenceType, originalObject, newObject));
+        }
+    }
+
     /**
-     * @implNote Should be kept in sync with {@link MetaData#equals(Object)}
+     * Should be kept in sync with {@link MetaData#equals(Object)}
      */
-    public EnumSet<Difference> getDifferences(PreferencesService preferences) {
-        EnumSet<Difference> changes = EnumSet.noneOf(Difference.class);
-
-        if (originalMetaData.isProtected() != newMetaData.isProtected()) {
-            changes.add(Difference.PROTECTED);
-        }
-        if (!Objects.equals(originalMetaData.getGroups(), newMetaData.getGroups())) {
-            changes.add(Difference.GROUPS_ALTERED);
-        }
-        if (!Objects.equals(originalMetaData.getEncoding(), newMetaData.getEncoding())) {
-            changes.add(Difference.ENCODING);
-        }
-        if (!Objects.equals(originalMetaData.getSaveOrderConfig(), newMetaData.getSaveOrderConfig())) {
-            changes.add(Difference.SAVE_SORT_ORDER);
-        }
-        if (!Objects.equals(
+    public List<Difference> getDifferences(PreferencesService preferences) {
+        List<Difference> changes = new ArrayList<>();
+        addToListIfDiff(changes, DifferenceType.PROTECTED, originalMetaData.isProtected(), newMetaData.isProtected());
+        addToListIfDiff(changes, DifferenceType.GROUPS_ALTERED, originalMetaData.getGroups(), newMetaData.getGroups());
+        addToListIfDiff(changes, DifferenceType.ENCODING, originalMetaData.getEncoding(), newMetaData.getEncoding());
+        addToListIfDiff(changes, DifferenceType.SAVE_SORT_ORDER, originalMetaData.getSaveOrder(), newMetaData.getSaveOrder());
+        addToListIfDiff(changes, DifferenceType.KEY_PATTERNS,
                 originalMetaData.getCiteKeyPattern(preferences.getCitationKeyPatternPreferences().getKeyPattern()),
-                newMetaData.getCiteKeyPattern(preferences.getCitationKeyPatternPreferences().getKeyPattern()))) {
-            changes.add(Difference.KEY_PATTERNS);
-        }
-        if (!Objects.equals(originalMetaData.getUserFileDirectories(), newMetaData.getUserFileDirectories())) {
-            changes.add(Difference.USER_FILE_DIRECTORY);
-        }
-        if (!Objects.equals(originalMetaData.getLatexFileDirectories(), newMetaData.getLatexFileDirectories())) {
-            changes.add(Difference.LATEX_FILE_DIRECTORY);
-        }
-        if (!Objects.equals(originalMetaData.getDefaultCiteKeyPattern(), newMetaData.getDefaultCiteKeyPattern())) {
-            changes.add(Difference.DEFAULT_KEY_PATTERN);
-        }
-        if (!Objects.equals(originalMetaData.getSaveActions(), newMetaData.getSaveActions())) {
-            changes.add(Difference.SAVE_ACTIONS);
-        }
-        if (!originalMetaData.getMode().equals(newMetaData.getMode())) {
-            changes.add(Difference.MODE);
-        }
-        if (!Objects.equals(originalMetaData.getDefaultFileDirectory(), newMetaData.getDefaultFileDirectory())) {
-            changes.add(Difference.GENERAL_FILE_DIRECTORY);
-        }
-        if (!Objects.equals(originalMetaData.getContentSelectors(), newMetaData.getContentSelectors())) {
-            changes.add(Difference.CONTENT_SELECTOR);
-        }
+                newMetaData.getCiteKeyPattern(preferences.getCitationKeyPatternPreferences().getKeyPattern()));
+        addToListIfDiff(changes, DifferenceType.USER_FILE_DIRECTORY, originalMetaData.getUserFileDirectories(), newMetaData.getUserFileDirectories());
+        addToListIfDiff(changes, DifferenceType.LATEX_FILE_DIRECTORY, originalMetaData.getLatexFileDirectories(), newMetaData.getLatexFileDirectories());
+        addToListIfDiff(changes, DifferenceType.DEFAULT_KEY_PATTERN, originalMetaData.getDefaultCiteKeyPattern(), newMetaData.getDefaultCiteKeyPattern());
+        addToListIfDiff(changes, DifferenceType.SAVE_ACTIONS, originalMetaData.getSaveActions(), newMetaData.getSaveActions());
+        addToListIfDiff(changes, DifferenceType.MODE, originalMetaData.getMode(), newMetaData.getMode());
+        addToListIfDiff(changes, DifferenceType.GENERAL_FILE_DIRECTORY, originalMetaData.getDefaultFileDirectory(), newMetaData.getDefaultFileDirectory());
+        addToListIfDiff(changes, DifferenceType.CONTENT_SELECTOR, originalMetaData.getContentSelectors(), newMetaData.getContentSelectors());
         return changes;
     }
 
diff --git a/src/main/java/org/jabref/logic/bst/BstVMVisitor.java b/src/main/java/org/jabref/logic/bst/BstVMVisitor.java
index a815480e506..100279e35a3 100644
--- a/src/main/java/org/jabref/logic/bst/BstVMVisitor.java
+++ b/src/main/java/org/jabref/logic/bst/BstVMVisitor.java
@@ -1,13 +1,13 @@
 package org.jabref.logic.bst;
 
+import java.util.Collections;
 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.FieldPreferences;
 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;
@@ -73,7 +73,7 @@ public Integer visitMacroCommand(BstParser.MacroCommandContext ctx) {
 
     @Override
     public Integer visitReadCommand(BstParser.ReadCommandContext ctx) {
-        FieldWriter fieldWriter = new FieldWriter(new FieldWriterPreferences(true, List.of(StandardField.MONTH), new FieldContentFormatterPreferences()));
+        FieldWriter fieldWriter = new FieldWriter(new FieldPreferences(true, List.of(StandardField.MONTH), Collections.emptyList()));
         for (BstEntry e : bstVMContext.entries()) {
             for (Map.Entry<String, String> mEntry : e.fields.entrySet()) {
                 Field field = FieldFactory.parseField(mEntry.getKey());
@@ -253,7 +253,7 @@ public Integer visitStackitem(BstParser.StackitemContext ctx) {
                 }
             } catch (BstVMException e) {
                 bstVMContext.path().ifPresentOrElse(
-                        (path) -> LOGGER.error("{} ({})", e.getMessage(), path),
+                        path -> LOGGER.error("{} ({})", e.getMessage(), path),
                         () -> LOGGER.error(e.getMessage()));
                 throw e;
             }
diff --git a/src/main/java/org/jabref/logic/bst/util/BstNameFormatter.java b/src/main/java/org/jabref/logic/bst/util/BstNameFormatter.java
index c4986dc12dd..cd65735aa57 100644
--- a/src/main/java/org/jabref/logic/bst/util/BstNameFormatter.java
+++ b/src/main/java/org/jabref/logic/bst/util/BstNameFormatter.java
@@ -95,7 +95,7 @@ public static String formatName(Author author, String format) {
                     continue;
                 }
 
-                if ((control.length() > 2)) {
+                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);
                 }
 
@@ -216,7 +216,7 @@ public static String formatName(Author author, String format) {
             }
             i++;
         }
-        if ((braceLevel != 0)) {
+        if (braceLevel != 0) {
             LOGGER.warn("Unbalanced brace in format string for nameFormat: {}", format);
         }
 
diff --git a/src/main/java/org/jabref/logic/bst/util/BstPurifier.java b/src/main/java/org/jabref/logic/bst/util/BstPurifier.java
index 90818a0749f..2b0fce0b735 100644
--- a/src/main/java/org/jabref/logic/bst/util/BstPurifier.java
+++ b/src/main/java/org/jabref/logic/bst/util/BstPurifier.java
@@ -67,7 +67,7 @@ public static String purify(String toPurify) {
             }
             i++;
         }
-        if ((braceLevel != 0)) {
+        if (braceLevel != 0) {
             LOGGER.warn("Unbalanced brace in string for purify$: {}", toPurify);
         }
 
diff --git a/src/main/java/org/jabref/logic/citationkeypattern/BracketedPattern.java b/src/main/java/org/jabref/logic/citationkeypattern/BracketedPattern.java
index ea7615db8bd..4fd02d39c1f 100644
--- a/src/main/java/org/jabref/logic/citationkeypattern/BracketedPattern.java
+++ b/src/main/java/org/jabref/logic/citationkeypattern/BracketedPattern.java
@@ -39,10 +39,13 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * The BracketedExpressionExpander provides methods to expand bracketed expressions, such as
- * [year]_[author]_[firstpage], using information from a provided BibEntry. The above-mentioned expression would yield
- * 2017_Kitsune_123 when expanded using the BibTeX entry "@Article{ authors = {O. Kitsune}, year = {2017},
- * pages={123-6}}".
+ * This class provides methods to expand bracketed expressions, such as
+ * <code>[year]_[author]_[firstpage]</code>, using information from a provided BibEntry. The above-mentioned expression would yield
+ * <code>2017_Kitsune_123</code> when expanded using the BibTeX entry <code>@Article{ authors = {O. Kitsune}, year = {2017},
+ * pages={123-6}}</code>.
+ * <p>
+ * The embedding in JabRef is explained at <a href="https://docs.jabref.org/setup/citationkeypattern">Customize the citation key generator</a>.
+ * </p>
  */
 public class BracketedPattern {
     private static final Logger LOGGER = LoggerFactory.getLogger(BracketedPattern.class);
@@ -51,6 +54,7 @@ public class BracketedPattern {
      * The maximum number of characters in the first author's last name.
      */
     private static final int CHARS_OF_FIRST = 5;
+
     /**
      * The maximum number of name abbreviations that can be used. If there are more authors, {@code MAX_ALPHA_AUTHORS -
      * 1} name abbreviations will be displayed, and a + sign will be appended at the end.
@@ -61,18 +65,23 @@ public class BracketedPattern {
      * Matches everything that is not a unicode decimal digit.
      */
     private static final Pattern NOT_DECIMAL_DIGIT = Pattern.compile("\\P{Nd}");
+
     /**
      * Matches everything that is not an uppercase ASCII letter. The intended use is to remove all lowercase letters
      */
     private static final Pattern NOT_CAPITAL_CHARACTER = Pattern.compile("[^A-Z]");
+
     /**
      * Matches uppercase english letters between "({" and "})", which should be used to abbreviate the name of an institution
      */
+
     private static final Pattern INLINE_ABBREVIATION = Pattern.compile("(?<=\\(\\{)[A-Z]+(?=}\\))");
+
     /**
-     * Matches with "dep"/"dip", case insensitive
+     * Matches with "dep"/"dip", case-insensitive
      */
     private static final Pattern DEPARTMENTS = Pattern.compile("^d[ei]p.*", Pattern.CASE_INSENSITIVE);
+
     private static final Pattern WHITESPACE = Pattern.compile("\\p{javaWhitespace}");
 
     private enum Institution {
@@ -85,10 +94,12 @@ private enum Institution {
          * Matches "uni" followed by "v" or "b", at the start of a string or after a space, case insensitive
          */
         private static final Pattern UNIVERSITIES = Pattern.compile("^uni(v|b|$).*", Pattern.CASE_INSENSITIVE);
+
         /**
-         * Matches with "tech", case insensitive
+         * Matches with "tech", case-insensitive
          */
         private static final Pattern TECHNOLOGICAL_INSTITUTES = Pattern.compile("^tech.*", Pattern.CASE_INSENSITIVE);
+
         /**
          * Matches with "dep"/"dip"/"lab", case insensitive
          */
@@ -357,7 +368,7 @@ public static String getFieldValue(BibEntry entry, String pattern, Character key
                     case "authEtAl":
                         return authEtal(authorList, "", "EtAl");
                     case "authshort":
-                        return authshort(authorList);
+                        return authShort(authorList);
                 }
 
                 if (pattern.matches("authIni[\\d]+")) {
@@ -400,7 +411,7 @@ public static String getFieldValue(BibEntry entry, String pattern, Character key
                     case "edtr.edtr.ea":
                         return authAuthEa(editorList);
                     case "edtrshort":
-                        return authshort(editorList);
+                        return authShort(editorList);
                 }
 
                 if (pattern.matches("edtrIni[\\d]+")) {
@@ -410,7 +421,7 @@ public static String getFieldValue(BibEntry entry, String pattern, Character key
                     String[] nums = pattern.substring(4).split("_");
                     return authNofMth(editorList,
                             Integer.parseInt(nums[0]),
-                            Integer.parseInt(nums[1]) - 1);
+                            Integer.parseInt(nums[1]));
                 } else if (pattern.matches("edtr\\d+")) {
                     String fa = firstAuthor(editorList);
                     int num = Integer.parseInt(pattern.substring(4));
@@ -510,7 +521,7 @@ public static String getFieldValue(BibEntry entry, String pattern, Character key
      */
     private static AuthorList createAuthorList(String unparsedAuthors) {
         return AuthorList.parse(unparsedAuthors).getAuthors().stream()
-                         .map((author) -> {
+                         .map(author -> {
                              // If the author is an institution, use an institution key instead of the full name
                              String lastName = author.getLast()
                                                      .map(lastPart -> isInstitution(author) ?
@@ -542,9 +553,9 @@ private static boolean isInstitution(Author author) {
     /**
      * Applies modifiers to a label generated based on a field marker.
      *
-     * @param label  The generated label.
-     * @param parts  String array containing the modifiers.
-     * @param offset The number of initial items in the modifiers array to skip.
+     * @param label                The generated label.
+     * @param parts                String array containing the modifiers.
+     * @param offset               The number of initial items in the modifiers array to skip.
      * @param expandBracketContent a function to expand the content in the parentheses.
      * @return The modified label.
      */
@@ -745,7 +756,7 @@ private static String firstAuthorForenameInitials(AuthorList authorList) {
      */
     private static String firstAuthorVonAndLast(AuthorList authorList) {
         return authorList.isEmpty() ? "" :
-                authorList.getAuthor(0).getLastOnly().replaceAll(" ", "");
+                authorList.getAuthor(0).getLastOnly().replace(" ", "");
     }
 
     /**
@@ -777,13 +788,17 @@ private static String lastAuthorForenameInitials(AuthorList authorList) {
     }
 
     /**
-     * Gets the last name of all authors/editors
+     * Gets the last name of all authors/editors.
+     * Pattern <code>[authors]</code>.
+     * <p>
+     * <code>and others</code> is converted to <code>EtAl</code>
+     * </p>
      *
      * @param authorList an {@link AuthorList}
-     * @return the sur name of all authors/editors
+     * @return the surname of all authors/editors
      */
-    private static String allAuthors(AuthorList authorList) {
-        return joinAuthorsOnLastName(authorList, authorList.getNumberOfAuthors(), "", "");
+    static String allAuthors(AuthorList authorList) {
+        return joinAuthorsOnLastName(authorList, authorList.getNumberOfAuthors(), "", "EtAl");
     }
 
     /**
@@ -792,10 +807,17 @@ private static String allAuthors(AuthorList authorList) {
      * @param authorList an {@link AuthorList}
      * @return the initials of all authors' names
      */
-    private static String authorsAlpha(AuthorList authorList) {
+    static String authorsAlpha(AuthorList authorList) {
         StringBuilder alphaStyle = new StringBuilder();
-        int maxAuthors = authorList.getNumberOfAuthors() <= MAX_ALPHA_AUTHORS ?
-                authorList.getNumberOfAuthors() : (MAX_ALPHA_AUTHORS - 1);
+        int maxAuthors;
+        final boolean maxAuthorsExceeded;
+        if (authorList.getNumberOfAuthors() <= MAX_ALPHA_AUTHORS) {
+            maxAuthors = authorList.getNumberOfAuthors();
+            maxAuthorsExceeded = false;
+        } else {
+            maxAuthors = MAX_ALPHA_AUTHORS - 1;
+            maxAuthorsExceeded = true;
+        }
 
         if (authorList.getNumberOfAuthors() == 1) {
             String[] firstAuthor = authorList.getAuthor(0).getLastOnly()
@@ -808,8 +830,13 @@ private static String authorsAlpha(AuthorList authorList) {
             alphaStyle.append(firstAuthor[firstAuthor.length - 1], 0,
                     Math.min(3, firstAuthor[firstAuthor.length - 1].length()));
         } else {
+            boolean andOthersPresent = authorList.getAuthor(maxAuthors - 1).equals(Author.OTHERS);
+            if (andOthersPresent) {
+                maxAuthors--;
+            }
             List<String> vonAndLastNames = authorList.getAuthors().stream()
-                                                     .limit(maxAuthors).map(Author::getLastOnly)
+                                                     .limit(maxAuthors)
+                                                     .map(Author::getLastOnly)
                                                      .collect(Collectors.toList());
             for (String vonAndLast : vonAndLastNames) {
                 // replace all whitespaces by " "
@@ -820,7 +847,7 @@ private static String authorsAlpha(AuthorList authorList) {
                     alphaStyle.append(part, 0, 1);
                 }
             }
-            if (authorList.getNumberOfAuthors() > MAX_ALPHA_AUTHORS) {
+            if (andOthersPresent || maxAuthorsExceeded) {
                 alphaStyle.append("+");
             }
         }
@@ -834,15 +861,27 @@ private static String authorsAlpha(AuthorList authorList) {
      * @param authorList the list of authors
      * @param maxAuthors the maximum number of authors in the string
      * @param delimiter  delimiter separating the last names of the authors
-     * @param suffix     to replace excess authors with
+     * @param suffix     to replace excess authors with. Also used to replace <code>and others</code>.
      * @return a string consisting of authors' last names separated by a `delimiter` and with any authors excess of
      * `maxAuthors` replaced with `suffix`
      */
-    private static String joinAuthorsOnLastName(AuthorList authorList, int maxAuthors, String delimiter, String suffix) {
-        suffix = authorList.getNumberOfAuthors() > maxAuthors ? suffix : "";
+    private static String joinAuthorsOnLastName(AuthorList authorList, int maxAuthors, String delimiter, final String suffix) {
+        final String finalSuffix = authorList.getNumberOfAuthors() > maxAuthors ? suffix : "";
         return authorList.getAuthors().stream()
-                         .map(Author::getLast).flatMap(Optional::stream)
-                         .limit(maxAuthors).collect(Collectors.joining(delimiter, "", suffix));
+                         .map(author -> {
+                             if (author.equals(Author.OTHERS)) {
+                                 if (suffix.startsWith(delimiter)) {
+                                     return Optional.of(suffix.substring(delimiter.length()));
+                                 } else {
+                                     return Optional.of(suffix);
+                                 }
+                             } else {
+                                 return author.getLast();
+                             }
+                         })
+                         .flatMap(Optional::stream)
+                         .limit(maxAuthors)
+                         .collect(Collectors.joining(delimiter, "", finalSuffix));
     }
 
     /**
@@ -863,7 +902,7 @@ private static String nAuthors(AuthorList authorList, int n) {
      * @param authorList an <{@link AuthorList}
      * @return the surname of all authors/editors
      */
-    private static String oneAuthorPlusInitials(AuthorList authorList) {
+    static String oneAuthorPlusInitials(AuthorList authorList) {
         if (authorList.isEmpty()) {
             return "";
         }
@@ -877,46 +916,21 @@ private static String oneAuthorPlusInitials(AuthorList authorList) {
         return authorSB.toString();
     }
 
-    /**
-     * auth.auth.ea format:
-     * <ol>
-     * <li>Isaac Newton and James Maxwell and Albert Einstein (1960)</li>
-     * <li>Isaac Newton and James Maxwell (1960)</li>
-     * </ol>
-     * give:
-     * <ol>
-     * <li>Newton.Maxwell.ea</li>
-     * <li>Newton.Maxwell</li>
-     * </ol>
-     */
-    private static String authAuthEa(AuthorList authorList) {
+    static String authAuthEa(AuthorList authorList) {
         return joinAuthorsOnLastName(authorList, 2, ".", ".ea");
     }
 
     /**
-     * auth.etal, authEtAl, ... format:
-     * <ol>
-     * <li>Isaac Newton and James Maxwell and Albert Einstein (1960)</li>
-     * <li>Isaac Newton and James Maxwell (1960)</li>
-     * </ol>
-     * <p>
-     * auth.etal give (delim=".", append=".etal"):
-     * <ol>
-     * <li>Newton.etal</li>
-     * <li>Newton.Maxwell</li>
-     * </ol>
-     * </p>
-     * <p>
-     * authEtAl give (delim="", append="EtAl"):
-     * <ol>
-     * <li>NewtonEtAl</li>
-     * <li>NewtonMaxwell</li>
-     * </ol>
-     * </p>
-     * Note that [authEtAl] equals [authors2]
+     * auth.etal, authEtAl, ... format
      */
-    private static String authEtal(AuthorList authorList, String delim, String append) {
-        if (authorList.getNumberOfAuthors() <= 2) {
+    static String authEtal(AuthorList authorList, String delim, String append) {
+        if (authorList.isEmpty()) {
+            return "";
+        }
+        if ((authorList.getNumberOfAuthors() <= 2)
+                && ((authorList.getNumberOfAuthors() == 1) || !authorList.getAuthor(1).equals(Author.OTHERS))) {
+            // in case 1 or two authors, just name them
+            // exception: If the second author is "and others", then do the appendix handling (in the other branch)
             return joinAuthorsOnLastName(authorList, 2, delim, "");
         } else {
             return authorList.getAuthor(0).getLast().orElse("") + append;
@@ -924,7 +938,8 @@ private static String authEtal(AuthorList authorList, String delim, String appen
     }
 
     /**
-     * The first N characters of the Mth author's or editor's last name. M starts counting from 1
+     * The first N characters of the Mth author's or editor's last name. M starts counting from 1.
+     * In case the Mth author is {@link Author#OTHERS}, <code>+</code> is returned.
      */
     private static String authNofMth(AuthorList authorList, int n, int m) {
         // have m counting from 0
@@ -934,7 +949,11 @@ private static String authNofMth(AuthorList authorList, int n, int m) {
             return "";
         }
 
-        String lastName = authorList.getAuthor(mminusone).getLast()
+        Author lastAuthor = authorList.getAuthor(mminusone);
+        if (lastAuthor.equals(Author.OTHERS)) {
+            return "+";
+        }
+        String lastName = lastAuthor.getLast()
                                     .map(CitationKeyGenerator::removeDefaultUnwantedCharacters).orElse("");
         return lastName.length() > n ? lastName.substring(0, n) : lastName;
     }
@@ -947,21 +966,9 @@ private static String authN(AuthorList authorList, int num) {
     }
 
     /**
-     * authshort format:
-     * <p>
-     * given author names
-     * <ol><li>Isaac Newton and James Maxwell and Albert Einstein and N. Bohr</li>
-     * <li>Isaac Newton and James Maxwell and Albert Einstein</li>
-     * <li>Isaac Newton and James Maxwell</li>
-     * <li>Isaac Newton</li></ol>
-     * yield
-     * <ol><li>NME+</li>
-     * <li>NME</li>
-     * <li>NM</li>
-     * <li>Newton</li></ol></p>
-     * {@author added by Kolja Brix, kbx@users.sourceforge.net}
+     * authshort format
      */
-    private static String authshort(AuthorList authorList) {
+    static String authShort(AuthorList authorList) {
         StringBuilder author = new StringBuilder();
         final int numberOfAuthors = authorList.getNumberOfAuthors();
 
@@ -980,37 +987,32 @@ private static String authshort(AuthorList authorList) {
     }
 
     /**
-     * authIniN format:
-     * <p>
-     * Each author gets (N div #authors) chars, the remaining (N mod #authors) chars are equally distributed to the
-     * authors first in the row. If (N < #authors), only the first N authors get mentioned.
-     * <p>
-     * For example if
-     * <ol>
-     * <li> I. Newton and J. Maxwell and A. Einstein and N. Bohr (..) </li>
-     * <li> I. Newton and J. Maxwell and A. Einstein </li>
-     * <li> I. Newton and J. Maxwell </li>
-     * <li> I. Newton </li>
-     * </ol>
-     * authIni4 gives:
-     * <ol>
-     * <li> NMEB </li>
-     * <li> NeME </li>
-     * <li> NeMa </li>
-     * <li> Newt </li>
-     * </ol>
+     * authIniN format
      *
      * @param authorList The authors to format.
      * @param n          The maximum number of characters this string will be long. A negative number or zero will lead
      *                   to "" be returned.
      */
-    private static String authIniN(AuthorList authorList, int n) {
+    static String authIniN(AuthorList authorList, int n) {
         if ((n <= 0) || authorList.isEmpty()) {
             return "";
         }
 
-        StringBuilder author = new StringBuilder();
         final int numberOfAuthors = authorList.getNumberOfAuthors();
+        final boolean lastAuthorIsOthers = authorList.getAuthor(numberOfAuthors - 1).equals(Author.OTHERS);
+        if ((n > 1) && ((n < numberOfAuthors) || lastAuthorIsOthers)) {
+            final int limit = Math.min(n - 1, numberOfAuthors - 1);
+            // special handling if the last author is "Others"
+            // This gets the single char "+" only
+            AuthorList allButOthers = AuthorList.of(
+                    authorList.getAuthors()
+                              .stream()
+                              .limit(limit)
+                              .toList());
+            return authIniN(allButOthers, n - 1) + "+";
+        }
+
+        StringBuilder author = new StringBuilder();
 
         int charsAll = n / numberOfAuthors;
         for (int i = 0; i < numberOfAuthors; i++) {
@@ -1262,7 +1264,7 @@ private static String generateInstitutionKey(String content) {
                     // If there are more than 3 parts, only keep the first character of each word
                     final int[] codePoints = tokenParts.stream()
                                                        .filter(Predicate.not(String::isBlank))
-                                                       .mapToInt((s) -> s.codePointAt(0))
+                                                       .mapToInt(s -> s.codePointAt(0))
                                                        .toArray();
                     rest = new String(codePoints, 0, codePoints.length);
                 } else {
diff --git a/src/main/java/org/jabref/logic/citationkeypattern/CitationKeyGenerator.java b/src/main/java/org/jabref/logic/citationkeypattern/CitationKeyGenerator.java
index 2f3f5bba0f7..aa3b78d9db6 100644
--- a/src/main/java/org/jabref/logic/citationkeypattern/CitationKeyGenerator.java
+++ b/src/main/java/org/jabref/logic/citationkeypattern/CitationKeyGenerator.java
@@ -21,14 +21,23 @@
  * This is the utility class of the LabelPattern package.
  */
 public class CitationKeyGenerator extends BracketedPattern {
-    /*
+    /**
      * All single characters that we can use for extending a key to make it unique.
      */
     public static final String APPENDIX_CHARACTERS = "abcdefghijklmnopqrstuvwxyz";
-    public static final String DEFAULT_UNWANTED_CHARACTERS = "-`ʹ:!;?^+";
+
+    /**
+     * List of unwanted characters. These will be removed at the end.
+     * Note that <code>+</code> is a wanted character to indicate "et al." in authorsAlpha.
+     * Example: "ABC+". See {@link org.jabref.logic.citationkeypattern.BracketedPatternTest#authorsAlpha()} for examples.
+     */
+    public static final String DEFAULT_UNWANTED_CHARACTERS = "-`ʹ:!;?^";
+
     private static final Logger LOGGER = LoggerFactory.getLogger(CitationKeyGenerator.class);
+
     // Source of disallowed characters : https://tex.stackexchange.com/a/408548/9075
     private static final List<Character> DISALLOWED_CHARACTERS = Arrays.asList('{', '}', '(', ')', ',', '=', '\\', '"', '#', '%', '~', '\'');
+
     private final AbstractCitationKeyPattern citeKeyPattern;
     private final BibDatabase database;
     private final CitationKeyPatternPreferences citationKeyPatternPreferences;
diff --git a/src/main/java/org/jabref/logic/citationstyle/CSLAdapter.java b/src/main/java/org/jabref/logic/citationstyle/CSLAdapter.java
index 215c9a14719..7c015d570d0 100644
--- a/src/main/java/org/jabref/logic/citationstyle/CSLAdapter.java
+++ b/src/main/java/org/jabref/logic/citationstyle/CSLAdapter.java
@@ -17,13 +17,15 @@
  * Provides an adapter class to CSL. It holds a CSL instance under the hood that is only recreated when
  * the style changes.
  *
- * @apiNote The first call to {@link #makeBibliography} is expensive since the
+ * Note on the API: The first call to {@link #makeBibliography} is expensive since the
  * CSL instance will be created. As long as the style stays the same, we can reuse this instance. On style-change, the
  * engine is re-instantiated. Therefore, the use-case of this class is many calls to {@link #makeBibliography} with the
  * same style. Changing the output format is cheap.
- * @implNote The main function {@link #makeBibliography} will enforce
+ *
+ * Note on the implementation:
+ * The main function {@link #makeBibliography} will enforce
  * synchronized calling. The main CSL engine under the hood is not thread-safe. Since this class is usually called from
- * a BackgroundTakk, the only other option would be to create several CSL instances which is wasting a lot of resources and very slow.
+ * a BackgroundTask, the only other option would be to create several CSL instances which is wasting a lot of resources and very slow.
  * In the current scheme, {@link #makeBibliography} can be called as usual
  * background task and to the best of my knowledge, concurrent calls will pile up and processed sequentially.
  */
diff --git a/src/main/java/org/jabref/logic/citationstyle/JabRefItemDataProvider.java b/src/main/java/org/jabref/logic/citationstyle/JabRefItemDataProvider.java
index 32c3d95ef6e..c4eac582e22 100644
--- a/src/main/java/org/jabref/logic/citationstyle/JabRefItemDataProvider.java
+++ b/src/main/java/org/jabref/logic/citationstyle/JabRefItemDataProvider.java
@@ -2,6 +2,7 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Optional;
@@ -148,14 +149,14 @@ private CSLItemData bibEntryToCSLItemData(BibEntry originalBibEntry, BibDatabase
             }
         }
 
-        Set<Field> fields = entryType.map(BibEntryType::getAllFields).orElse(bibEntry.getFields());
+        Set<Field> fields = new LinkedHashSet<>(entryType.map(BibEntryType::getAllFields).orElse(bibEntry.getFields()));
         fields.addAll(bibEntry.getFields());
         for (Field key : fields) {
             bibEntry.getResolvedFieldOrAlias(key, bibDatabaseContext.getDatabase())
                     .map(removeNewlinesFormatter::format)
                     .map(LatexToUnicodeAdapter::format)
                     .ifPresent(value -> {
-                        if (StandardField.MONTH.equals(key)) {
+                        if (StandardField.MONTH == key) {
                             // Change month from #mon# to mon because CSL does not support the former format
                             value = bibEntry.getMonth().map(Month::getShortName).orElse(value);
                         }
@@ -185,16 +186,6 @@ public void setData(List<BibEntry> data, BibDatabaseContext bibDatabaseContext,
         this.pagesChecker = new PagesChecker(ctx);
     }
 
-    public String toJson() {
-        List<BibEntry> entries = bibDatabaseContext.getEntries();
-        this.setData(entries, bibDatabaseContext, entryTypesManager);
-        return entries.stream()
-                .map(entry -> bibEntryToCSLItemData(entry, bibDatabaseContext, entryTypesManager))
-                .map(item -> item.toJson(stringJsonBuilderFactory.createJsonBuilder()))
-                .map(item -> (String) item)
-                .collect(Collectors.joining(",", "[", "]"));
-    }
-
     @Override
     public CSLItemData retrieveItem(String id) {
         return data.stream()
@@ -209,4 +200,16 @@ public Collection<String> getIds() {
                    .map(entry -> entry.getCitationKey().orElse(""))
                    .toList();
     }
+
+    public String toJson() {
+        List<BibEntry> entries = bibDatabaseContext.getEntries();
+        this.setData(entries, bibDatabaseContext, entryTypesManager);
+        return entries.stream()
+                      .map(entry -> bibEntryToCSLItemData(entry, bibDatabaseContext, entryTypesManager))
+                      .map(item -> item.toJson(stringJsonBuilderFactory.createJsonBuilder()))
+                      .map(String.class::cast)
+                      .collect(Collectors.joining(",", "[", "]"));
+    }
+
+
 }
diff --git a/src/main/java/org/jabref/logic/cleanup/CleanupWorker.java b/src/main/java/org/jabref/logic/cleanup/CleanupWorker.java
index d6ead59176f..1663db75f87 100644
--- a/src/main/java/org/jabref/logic/cleanup/CleanupWorker.java
+++ b/src/main/java/org/jabref/logic/cleanup/CleanupWorker.java
@@ -57,6 +57,8 @@ private CleanupJob toJob(CleanupPreferences.CleanupStep action) {
                     new DoiCleanup();
             case CLEANUP_EPRINT ->
                     new EprintCleanup();
+            case CLEAN_UP_URL ->
+                    new URLCleanup();
             case MAKE_PATHS_RELATIVE ->
                     new RelativePathsCleanup(databaseContext, filePreferences);
             case RENAME_PDF ->
diff --git a/src/main/java/org/jabref/logic/cleanup/ConvertToBibtexCleanup.java b/src/main/java/org/jabref/logic/cleanup/ConvertToBibtexCleanup.java
index 5d14bec9eef..1b289c091d9 100644
--- a/src/main/java/org/jabref/logic/cleanup/ConvertToBibtexCleanup.java
+++ b/src/main/java/org/jabref/logic/cleanup/ConvertToBibtexCleanup.java
@@ -31,7 +31,7 @@ public List<FieldChange> cleanup(BibEntry entry) {
                 date.getMonth().flatMap(month -> entry.setField(StandardField.MONTH, month.getJabRefFormat())).ifPresent(changes::add);
             }
 
-            if (changes.size() > 0) {
+            if (!changes.isEmpty()) {
                 entry.clearField(StandardField.DATE).ifPresent(changes::add);
             }
         });
diff --git a/src/main/java/org/jabref/logic/cleanup/FieldFormatterCleanup.java b/src/main/java/org/jabref/logic/cleanup/FieldFormatterCleanup.java
index 3696ac294ae..197debd20fd 100644
--- a/src/main/java/org/jabref/logic/cleanup/FieldFormatterCleanup.java
+++ b/src/main/java/org/jabref/logic/cleanup/FieldFormatterCleanup.java
@@ -29,9 +29,9 @@ public FieldFormatterCleanup(Field field, Formatter formatter) {
 
     @Override
     public List<FieldChange> cleanup(BibEntry entry) {
-        if (InternalField.INTERNAL_ALL_FIELD.equals(field)) {
+        if (InternalField.INTERNAL_ALL_FIELD == field) {
             return cleanupAllFields(entry);
-        } else if (InternalField.INTERNAL_ALL_TEXT_FIELDS_FIELD.equals(field)) {
+        } else if (InternalField.INTERNAL_ALL_TEXT_FIELDS_FIELD == field) {
             return cleanupAllTextFields(entry);
         } else {
             return cleanupSingleField(field, entry);
diff --git a/src/main/java/org/jabref/logic/cleanup/FieldFormatterCleanups.java b/src/main/java/org/jabref/logic/cleanup/FieldFormatterCleanups.java
index 17e88ab6955..bb9651f9145 100644
--- a/src/main/java/org/jabref/logic/cleanup/FieldFormatterCleanups.java
+++ b/src/main/java/org/jabref/logic/cleanup/FieldFormatterCleanups.java
@@ -3,12 +3,11 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.Comparator;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.StringJoiner;
-import java.util.TreeMap;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -31,6 +30,9 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.strings.StringUtil;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 public class FieldFormatterCleanups {
 
     public static final List<FieldFormatterCleanup> DEFAULT_SAVE_ACTIONS;
@@ -40,25 +42,27 @@ public class FieldFormatterCleanups {
     public static final String ENABLED = "enabled";
     public static final String DISABLED = "disabled";
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(FieldFormatterCleanups.class);
+
     /**
      * This parses the key/list map of fields and clean up actions for the field.
-     *
+     * <p>
      * General format for one key/list map: <code>...[...]</code> - <code>field[formatter1,formatter2,...]</code>
      * Multiple are written as <code>...[...]...[...]...[...]</code>
-     *   <code>field1[formatter1,formatter2,...]field2[formatter3,formatter4,...]</code>
-     *
+     * <code>field1[formatter1,formatter2,...]field2[formatter3,formatter4,...]</code>
+     * <p>
      * The idea is that characters are field names until <code>[</code> is reached and that formatter lists are terminated by <code>]</code>
-     *
+     * <p>
      * Example: <code>pages[normalize_page_numbers]title[escapeAmpersands,escapeDollarSign,escapeUnderscores,latex_cleanup]</code>
      */
     private static final Pattern FIELD_FORMATTER_CLEANUP_PATTERN = Pattern.compile("([^\\[]+)\\[([^]]+)]");
 
     static {
         DEFAULT_SAVE_ACTIONS = List.of(
-            new FieldFormatterCleanup(StandardField.PAGES, new NormalizePagesFormatter()),
-            new FieldFormatterCleanup(StandardField.DATE, new NormalizeDateFormatter()),
-            new FieldFormatterCleanup(StandardField.MONTH, new NormalizeMonthFormatter()),
-            new FieldFormatterCleanup(InternalField.INTERNAL_ALL_TEXT_FIELDS_FIELD, new ReplaceUnicodeLigaturesFormatter()));
+                new FieldFormatterCleanup(StandardField.PAGES, new NormalizePagesFormatter()),
+                new FieldFormatterCleanup(StandardField.DATE, new NormalizeDateFormatter()),
+                new FieldFormatterCleanup(StandardField.MONTH, new NormalizeMonthFormatter()),
+                new FieldFormatterCleanup(InternalField.INTERNAL_ALL_TEXT_FIELDS_FIELD, new ReplaceUnicodeLigaturesFormatter()));
 
         List<FieldFormatterCleanup> recommendedBibtexFormatters = new ArrayList<>(DEFAULT_SAVE_ACTIONS);
         recommendedBibtexFormatters.addAll(List.of(
@@ -87,8 +91,9 @@ public FieldFormatterCleanups(boolean enabled, List<FieldFormatterCleanup> actio
      * Note: String parsing is done at {@link FieldFormatterCleanups#parse(String)}
      */
     public static String getMetaDataString(List<FieldFormatterCleanup> actionList, String newLineSeparator) {
-        // first, group all formatters by the field for which they apply
-        Map<Field, List<String>> groupedByField = new TreeMap<>(Comparator.comparing(Field::getName));
+        // First, group all formatters by the field for which they apply
+        // Order of the list should be kept
+        Map<Field, List<String>> groupedByField = new LinkedHashMap<>();
         for (FieldFormatterCleanup cleanup : actionList) {
             Field key = cleanup.getField();
 
@@ -198,12 +203,13 @@ public static FieldFormatterCleanups parse(List<String> formatterMetaList) {
         }
     }
 
-    private static Formatter getFormatterFromString(String formatterName) {
+    static Formatter getFormatterFromString(String formatterName) {
         for (Formatter formatter : Formatters.getAll()) {
             if (formatterName.equals(formatter.getKey())) {
                 return formatter;
             }
         }
+        LOGGER.info("Formatter {} not found.", formatterName);
         return new IdentityFormatter();
     }
 
diff --git a/src/main/java/org/jabref/logic/cleanup/Formatter.java b/src/main/java/org/jabref/logic/cleanup/Formatter.java
index e1e377fdcc3..8420f639bfc 100644
--- a/src/main/java/org/jabref/logic/cleanup/Formatter.java
+++ b/src/main/java/org/jabref/logic/cleanup/Formatter.java
@@ -67,8 +67,8 @@ public int hashCode() {
      */
     @Override
     public boolean equals(Object obj) {
-        if (obj instanceof Formatter) {
-            return getKey().equals(((Formatter) obj).getKey());
+        if (obj instanceof Formatter formatter) {
+            return getKey().equals(formatter.getKey());
         } else {
             return false;
         }
diff --git a/src/main/java/org/jabref/logic/cleanup/URLCleanup.java b/src/main/java/org/jabref/logic/cleanup/URLCleanup.java
new file mode 100644
index 00000000000..924a3e5af70
--- /dev/null
+++ b/src/main/java/org/jabref/logic/cleanup/URLCleanup.java
@@ -0,0 +1,112 @@
+package org.jabref.logic.cleanup;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.jabref.logic.formatter.bibtexfields.NormalizeDateFormatter;
+import org.jabref.model.FieldChange;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.Date;
+import org.jabref.model.entry.field.Field;
+import org.jabref.model.entry.field.StandardField;
+
+/**
+ * Checks whether URL exists in note field, and stores it under url field.
+ */
+public class URLCleanup implements CleanupJob {
+
+    /*
+     * The urlRegex was originally fetched from a suggested solution in
+     * https://stackoverflow.com/questions/28185064/python-infinite-loop-in-regex-to-match-url.
+     * In order to be functional, we made the necessary adjustments regarding Java
+     * features (mainly doubled backslashes).
+     */
+    public static final String URL_REGEX = "(?i)\\b((?:https?://|www\\d{0,3}[.]|[a-z0-9.\\-]+[.]"
+            + "[a-z]{2,4}/)(?:[^\\s()<>\\\\]+|\\(([^\\s()<>\\\\]+|(\\([^\\s()"
+            + "<>\\\\]+\\)))*\\))+(?:\\(([^\\s()<>\\\\]+|(\\([^\\s()<>\\\\]+\\"
+            + ")))*\\)|[^\\s`!()\\[\\]{};:'\".,<>?«»“”‘’]))";
+
+    public static final String DATE_TERMS_REGEX = "accessed on|visited on|retrieved on|viewed on";
+
+    private static final Field NOTE_FIELD = StandardField.NOTE;
+    private static final Field URL_FIELD = StandardField.URL;
+    private static final Field URLDATE_FIELD = StandardField.URLDATE;
+
+    final Pattern urlPattern = Pattern.compile(URL_REGEX, Pattern.CASE_INSENSITIVE);
+    final Pattern dateTermsPattern = Pattern.compile(DATE_TERMS_REGEX, Pattern.CASE_INSENSITIVE);
+    final Pattern datePattern = Pattern.compile(Date.DATE_REGEX, Pattern.CASE_INSENSITIVE);
+
+    private NormalizeDateFormatter formatter = new NormalizeDateFormatter();
+
+    @Override
+    public List<FieldChange> cleanup(BibEntry entry) {
+        List<FieldChange> changes = new ArrayList<>();
+
+        String noteFieldValue = entry.getField(NOTE_FIELD).orElse(null);
+
+        final Matcher urlMatcher = urlPattern.matcher(noteFieldValue);
+        final Matcher dateTermsMatcher = dateTermsPattern.matcher(noteFieldValue);
+        final Matcher dateMatcher = datePattern.matcher(noteFieldValue);
+
+        if (urlMatcher.find()) {
+            String url = urlMatcher.group();
+
+            // Remove the URL from the NoteFieldValue
+            String newNoteFieldValue = noteFieldValue
+                    .replace(url, "")
+
+                    /*
+                     * The following regex erases unnecessary remaining
+                     * content in note field. Explanation:
+                     * <ul>
+                     *     <li>"(, )?": Matches an optional comma followed by a space</li>
+                     *     <li>"\\?": Matches an optional backslash</li>
+                     *     <li>"url\{\}": Matches the literal string "url{}"</li>
+                     * </ul>
+                     * Note that the backslashes are doubled as Java requirement
+                     */
+                    .replaceAll("(, )?\\\\?url\\{\\}(, )?", "");
+
+            /*
+             * In case the url and note fields hold the same URL, then we just
+             * remove it from the note field, and no other action is performed.
+             */
+            if (entry.hasField(URL_FIELD)) {
+                String urlFieldValue = entry.getField(URL_FIELD).orElse(null);
+                if (urlFieldValue.equals(url)) {
+                    entry.setField(NOTE_FIELD, newNoteFieldValue).ifPresent(changes::add);
+                }
+            } else {
+                entry.setField(NOTE_FIELD, newNoteFieldValue).ifPresent(changes::add);
+                entry.setField(URL_FIELD, url).ifPresent(changes::add);
+            }
+
+            if (dateTermsMatcher.find()) {
+                String term = dateTermsMatcher.group();
+                newNoteFieldValue = newNoteFieldValue
+                        .replace(term, "");
+                if (dateMatcher.find()) {
+                    String date = dateMatcher.group();
+                    String formattedDate = formatter.format(date);
+                    newNoteFieldValue = newNoteFieldValue
+                            .replace(date, "").trim()
+                            .replaceAll("^,|,$", "").trim(); // either starts or ends with a comma
+
+                    // Same approach with the URL cleanup.
+                    if (entry.hasField(URLDATE_FIELD)) {
+                        String urlDateFieldValue = entry.getField(URLDATE_FIELD).orElse(null);
+                        if (urlDateFieldValue.equals(formattedDate)) {
+                            entry.setField(NOTE_FIELD, newNoteFieldValue).ifPresent(changes::add);
+                        }
+                    } else {
+                        entry.setField(NOTE_FIELD, newNoteFieldValue).ifPresent(changes::add);
+                        entry.setField(URLDATE_FIELD, formattedDate).ifPresent(changes::add);
+                    }
+                }
+            }
+        }
+        return changes;
+    }
+}
diff --git a/src/main/java/org/jabref/logic/crawler/Crawler.java b/src/main/java/org/jabref/logic/crawler/Crawler.java
index c5ae3cec68e..16eaf006b57 100644
--- a/src/main/java/org/jabref/logic/crawler/Crawler.java
+++ b/src/main/java/org/jabref/logic/crawler/Crawler.java
@@ -5,15 +5,12 @@
 import java.util.List;
 
 import org.jabref.logic.exporter.SaveException;
-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;
 import org.jabref.model.util.FileUpdateMonitor;
-import org.jabref.preferences.GeneralPreferences;
+import org.jabref.preferences.PreferencesService;
 
 import org.eclipse.jgit.api.errors.GitAPIException;
 
@@ -37,27 +34,21 @@ public class Crawler {
      */
     public Crawler(Path studyRepositoryRoot,
                    SlrGitHandler gitHandler,
-                   GeneralPreferences generalPreferences,
-                   ImportFormatPreferences importFormatPreferences,
-                   ImporterPreferences importerPreferences,
-                   SavePreferences savePreferences,
+                   PreferencesService preferencesService,
                    BibEntryTypesManager bibEntryTypesManager,
                    FileUpdateMonitor fileUpdateMonitor) throws IllegalArgumentException, IOException, ParseException {
         this.studyRepository = new StudyRepository(
                 studyRepositoryRoot,
                 gitHandler,
-                generalPreferences,
-                importFormatPreferences,
-                importerPreferences,
+                preferencesService,
                 fileUpdateMonitor,
-                savePreferences,
                 bibEntryTypesManager);
-        StudyDatabaseToFetcherConverter studyDatabaseToFetcherConverter = new StudyDatabaseToFetcherConverter(
+        StudyCatalogToFetcherConverter studyCatalogToFetcherConverter = new StudyCatalogToFetcherConverter(
                 studyRepository.getActiveLibraryEntries(),
-                importFormatPreferences,
-                importerPreferences);
+                preferencesService.getImportFormatPreferences(),
+                preferencesService.getImporterPreferences());
         this.studyFetcher = new StudyFetcher(
-                studyDatabaseToFetcherConverter.getActiveFetchers(),
+                studyCatalogToFetcherConverter.getActiveFetchers(),
                 studyRepository.getSearchQueryStrings());
     }
 
diff --git a/src/main/java/org/jabref/logic/crawler/StudyDatabaseToFetcherConverter.java b/src/main/java/org/jabref/logic/crawler/StudyCatalogToFetcherConverter.java
similarity index 90%
rename from src/main/java/org/jabref/logic/crawler/StudyDatabaseToFetcherConverter.java
rename to src/main/java/org/jabref/logic/crawler/StudyCatalogToFetcherConverter.java
index 70eef519aa3..b0f0c26be4d 100644
--- a/src/main/java/org/jabref/logic/crawler/StudyDatabaseToFetcherConverter.java
+++ b/src/main/java/org/jabref/logic/crawler/StudyCatalogToFetcherConverter.java
@@ -14,14 +14,14 @@
 /**
  * Converts library entries from the given study into their corresponding fetchers.
  */
-class StudyDatabaseToFetcherConverter {
+class StudyCatalogToFetcherConverter {
     private final List<StudyDatabase> libraryEntries;
     private final ImportFormatPreferences importFormatPreferences;
     private final ImporterPreferences importerPreferences;
 
-    public StudyDatabaseToFetcherConverter(List<StudyDatabase> libraryEntries,
-                                           ImportFormatPreferences importFormatPreferences,
-                                           ImporterPreferences importerPreferences) {
+    public StudyCatalogToFetcherConverter(List<StudyDatabase> libraryEntries,
+                                          ImportFormatPreferences importFormatPreferences,
+                                          ImporterPreferences importerPreferences) {
         this.libraryEntries = libraryEntries;
         this.importFormatPreferences = importFormatPreferences;
         this.importerPreferences = importerPreferences;
diff --git a/src/main/java/org/jabref/logic/crawler/StudyFetcher.java b/src/main/java/org/jabref/logic/crawler/StudyFetcher.java
index c39ba7efe52..d37738a1a30 100644
--- a/src/main/java/org/jabref/logic/crawler/StudyFetcher.java
+++ b/src/main/java/org/jabref/logic/crawler/StudyFetcher.java
@@ -48,7 +48,7 @@ private QueryResult getQueryResult(String searchQuery) {
     }
 
     /**
-     * Queries all Databases on the given searchQuery.
+     * Queries all catalogs on the given searchQuery.
      *
      * @param searchQuery The query the search is performed for.
      * @return Mapping of each fetcher by name and all their retrieved publications as a BibDatabase
@@ -63,10 +63,10 @@ private List<FetchResult> performSearchOnQuery(String searchQuery) {
     private FetchResult performSearchOnQueryForFetcher(String searchQuery, SearchBasedFetcher fetcher) {
         try {
             List<BibEntry> fetchResult = new ArrayList<>();
-            if (fetcher instanceof PagedSearchBasedFetcher) {
-                int pages = ((int) Math.ceil(((double) MAX_AMOUNT_OF_RESULTS_PER_FETCHER) / ((PagedSearchBasedFetcher) fetcher).getPageSize()));
+            if (fetcher instanceof PagedSearchBasedFetcher basedFetcher) {
+                int pages = (int) Math.ceil(((double) MAX_AMOUNT_OF_RESULTS_PER_FETCHER) / basedFetcher.getPageSize());
                 for (int page = 0; page < pages; page++) {
-                    fetchResult.addAll(((PagedSearchBasedFetcher) fetcher).performSearchPaged(searchQuery, page).getContent());
+                    fetchResult.addAll(basedFetcher.performSearchPaged(searchQuery, page).getContent());
                 }
             } else {
                 fetchResult = fetcher.performSearch(searchQuery);
diff --git a/src/main/java/org/jabref/logic/crawler/StudyRepository.java b/src/main/java/org/jabref/logic/crawler/StudyRepository.java
index 21e32c00f2b..dc490090339 100644
--- a/src/main/java/org/jabref/logic/crawler/StudyRepository.java
+++ b/src/main/java/org/jabref/logic/crawler/StudyRepository.java
@@ -17,10 +17,8 @@
 import org.jabref.logic.exporter.BibWriter;
 import org.jabref.logic.exporter.BibtexDatabaseWriter;
 import org.jabref.logic.exporter.SaveException;
-import org.jabref.logic.exporter.SavePreferences;
+import org.jabref.logic.exporter.SelfContainedSaveConfiguration;
 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.SearchBasedFetcher;
 import org.jabref.logic.l10n.Localization;
@@ -29,13 +27,15 @@
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntryTypesManager;
+import org.jabref.model.metadata.SaveOrder;
+import org.jabref.model.metadata.SelfContainedSaveOrder;
 import org.jabref.model.study.FetchResult;
 import org.jabref.model.study.QueryResult;
 import org.jabref.model.study.Study;
 import org.jabref.model.study.StudyDatabase;
 import org.jabref.model.study.StudyQuery;
 import org.jabref.model.util.FileUpdateMonitor;
-import org.jabref.preferences.GeneralPreferences;
+import org.jabref.preferences.PreferencesService;
 
 import org.eclipse.jgit.api.errors.GitAPIException;
 import org.slf4j.Logger;
@@ -66,11 +66,8 @@ public class StudyRepository {
     private final Path studyDefinitionFile;
     private final SlrGitHandler gitHandler;
     private final Study study;
-    private final GeneralPreferences generalPreferences;
-    private final ImportFormatPreferences importFormatPreferences;
-    private final ImporterPreferences importerPreferences;
+    private final PreferencesService preferencesService;
     private final FileUpdateMonitor fileUpdateMonitor;
-    private final SavePreferences savePreferences;
     private final BibEntryTypesManager bibEntryTypesManager;
 
     /**
@@ -80,25 +77,19 @@ public class StudyRepository {
      * @param gitHandler       The git handler that manages any interaction with the remote repository
      * @throws IllegalArgumentException If the repository root directory does not exist, or the root directory does not
      *                                  contain the study definition file.
-     * @throws IOException              Thrown if the given repository does not exists, or the study definition file
+     * @throws IOException              Thrown if the given repository does not exist, or the study definition file
      *                                  does not exist
      */
     public StudyRepository(Path pathToRepository,
                            SlrGitHandler gitHandler,
-                           GeneralPreferences generalPreferences,
-                           ImportFormatPreferences importFormatPreferences,
-                           ImporterPreferences importerPreferences,
+                           PreferencesService preferencesService,
                            FileUpdateMonitor fileUpdateMonitor,
-                           SavePreferences savePreferences,
                            BibEntryTypesManager bibEntryTypesManager) throws IOException {
         this.repositoryPath = pathToRepository;
         this.gitHandler = gitHandler;
-        this.generalPreferences = generalPreferences;
-        this.importFormatPreferences = importFormatPreferences;
-        this.importerPreferences = importerPreferences;
+        this.preferencesService = preferencesService;
         this.fileUpdateMonitor = fileUpdateMonitor;
         this.studyDefinitionFile = Path.of(repositoryPath.toString(), STUDY_DEFINITION_FILE_NAME);
-        this.savePreferences = savePreferences;
         this.bibEntryTypesManager = bibEntryTypesManager;
 
         if (Files.notExists(repositoryPath)) {
@@ -145,7 +136,9 @@ 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), importFormatPreferences, fileUpdateMonitor).getDatabaseContext();
+            return OpenDatabase.loadDatabase(getPathToFetcherResultFile(query, fetcherName),
+                    preferencesService.getImportFormatPreferences(),
+                    fileUpdateMonitor).getDatabaseContext();
         }
         return new BibDatabaseContext();
     }
@@ -155,7 +148,9 @@ public BibDatabaseContext getFetcherResultEntries(String query, String fetcherNa
      */
     public BibDatabaseContext getQueryResultEntries(String query) throws IOException {
         if (Files.exists(getPathToQueryResultFile(query))) {
-            return OpenDatabase.loadDatabase(getPathToQueryResultFile(query), importFormatPreferences, fileUpdateMonitor).getDatabaseContext();
+            return OpenDatabase.loadDatabase(getPathToQueryResultFile(query),
+                    preferencesService.getImportFormatPreferences(),
+                    fileUpdateMonitor).getDatabaseContext();
         }
         return new BibDatabaseContext();
     }
@@ -165,7 +160,9 @@ public BibDatabaseContext getQueryResultEntries(String query) throws IOException
      */
     public BibDatabaseContext getStudyResultEntries() throws IOException {
         if (Files.exists(getPathToStudyResultFile())) {
-            return OpenDatabase.loadDatabase(getPathToStudyResultFile(), importFormatPreferences, fileUpdateMonitor).getDatabaseContext();
+            return OpenDatabase.loadDatabase(getPathToStudyResultFile(),
+                    preferencesService.getImportFormatPreferences(),
+                    fileUpdateMonitor).getDatabaseContext();
         }
         return new BibDatabaseContext();
     }
@@ -284,10 +281,10 @@ private void updateWorkAndSearchBranch() throws IOException, GitAPIException {
      */
     private void setUpRepositoryStructureForQueriesAndFetchers() throws IOException {
         // Cannot use stream here since IOException has to be thrown
-        StudyDatabaseToFetcherConverter converter = new StudyDatabaseToFetcherConverter(
+        StudyCatalogToFetcherConverter converter = new StudyCatalogToFetcherConverter(
                 this.getActiveLibraryEntries(),
-                importFormatPreferences,
-                importerPreferences);
+                preferencesService.getImportFormatPreferences(),
+                preferencesService.getImporterPreferences());
         for (String query : this.getSearchQueryStrings()) {
             createQueryResultFolder(query);
             converter.getActiveFetchers()
@@ -385,7 +382,7 @@ private String computeIDForQuery(String query) {
      * @param crawlResults The results that shall be persisted.
      */
     private void persistResults(List<QueryResult> crawlResults) throws IOException, SaveException {
-        DatabaseMerger merger = new DatabaseMerger(importFormatPreferences.bibEntryPreferences().getKeywordSeparator());
+        DatabaseMerger merger = new DatabaseMerger(preferencesService.getBibEntryPreferences().getKeywordSeparator());
         BibDatabase newStudyResultEntries = new BibDatabase();
 
         for (QueryResult result : crawlResults) {
@@ -403,35 +400,44 @@ private void persistResults(List<QueryResult> crawlResults) throws IOException,
                 // Aggregate each fetcher result into the query result
                 merger.merge(queryResultEntries, fetcherEntries);
 
-                writeResultToFile(getPathToFetcherResultFile(result.getQuery(), fetcherResult.getFetcherName()), existingFetcherResult.getDatabase());
+                writeResultToFile(getPathToFetcherResultFile(result.getQuery(), fetcherResult.getFetcherName()), existingFetcherResult);
             }
-            BibDatabase existingQueryEntries = getQueryResultEntries(result.getQuery()).getDatabase();
+            BibDatabaseContext existingQueryEntries = getQueryResultEntries(result.getQuery());
 
             // Merge new entries into query result file
-            merger.merge(existingQueryEntries, queryResultEntries);
+            merger.merge(existingQueryEntries.getDatabase(), queryResultEntries);
             // Aggregate all new entries for every query into the study result
             merger.merge(newStudyResultEntries, queryResultEntries);
 
             writeResultToFile(getPathToQueryResultFile(result.getQuery()), existingQueryEntries);
         }
-        BibDatabase existingStudyResultEntries = getStudyResultEntries().getDatabase();
+        BibDatabaseContext existingStudyResultEntries = getStudyResultEntries();
 
         // Merge new entries into study result file
-        merger.merge(existingStudyResultEntries, newStudyResultEntries);
+        merger.merge(existingStudyResultEntries.getDatabase(), newStudyResultEntries);
 
         writeResultToFile(getPathToStudyResultFile(), existingStudyResultEntries);
     }
 
     private void generateCiteKeys(BibDatabaseContext existingEntries, BibDatabase targetEntries) {
-        CitationKeyGenerator citationKeyGenerator = new CitationKeyGenerator(existingEntries, savePreferences.getCitationKeyPatternPreferences());
+        CitationKeyGenerator citationKeyGenerator = new CitationKeyGenerator(existingEntries,
+                preferencesService.getCitationKeyPatternPreferences());
         targetEntries.getEntries().stream().filter(bibEntry -> !bibEntry.hasCitationKey()).forEach(citationKeyGenerator::generateAndSetKey);
     }
 
-    private void writeResultToFile(Path pathToFile, BibDatabase entries) throws SaveException {
+    private void writeResultToFile(Path pathToFile, BibDatabaseContext context) throws SaveException {
         try (AtomicFileWriter fileWriter = new AtomicFileWriter(pathToFile, StandardCharsets.UTF_8)) {
+            SelfContainedSaveConfiguration saveConfiguration = (SelfContainedSaveConfiguration) new SelfContainedSaveConfiguration()
+                    .withSaveOrder(context.getMetaData().getSaveOrder().map(so -> SelfContainedSaveOrder.of(so)).orElse(SaveOrder.getDefaultSaveOrder()))
+                    .withReformatOnSave(preferencesService.getLibraryPreferences().shouldAlwaysReformatOnSave());
             BibWriter bibWriter = new BibWriter(fileWriter, OS.NEWLINE);
-            BibtexDatabaseWriter databaseWriter = new BibtexDatabaseWriter(bibWriter, generalPreferences, savePreferences, bibEntryTypesManager);
-            databaseWriter.saveDatabase(new BibDatabaseContext(entries));
+            BibtexDatabaseWriter databaseWriter = new BibtexDatabaseWriter(
+                    bibWriter,
+                    saveConfiguration,
+                    preferencesService.getFieldPreferences(),
+                    preferencesService.getCitationKeyPatternPreferences(),
+                    bibEntryTypesManager);
+            databaseWriter.saveDatabase(context);
         } catch (UnsupportedCharsetException ex) {
             throw new SaveException(Localization.lang("Character encoding UTF-8 is not supported.", ex));
         } catch (IOException ex) {
diff --git a/src/main/java/org/jabref/logic/database/DuplicateCheck.java b/src/main/java/org/jabref/logic/database/DuplicateCheck.java
index c665fe5aec9..3090c9a8778 100644
--- a/src/main/java/org/jabref/logic/database/DuplicateCheck.java
+++ b/src/main/java/org/jabref/logic/database/DuplicateCheck.java
@@ -171,11 +171,11 @@ private static int compareSingleField(final Field field, final BibEntry one, fin
 
         if (field.getProperties().contains(FieldProperty.PERSON_NAMES)) {
             return compareAuthorField(stringOne, stringTwo);
-        } else if (StandardField.PAGES.equals(field)) {
+        } else if (StandardField.PAGES == field) {
             return comparePagesField(stringOne, stringTwo);
-        } else if (StandardField.JOURNAL.equals(field)) {
+        } else if (StandardField.JOURNAL == field) {
             return compareJournalField(stringOne, stringTwo);
-        } else if (StandardField.CHAPTER.equals(field)) {
+        } else if (StandardField.CHAPTER == field) {
             return compareChapterField(stringOne, stringTwo);
         }
 
@@ -264,8 +264,8 @@ private static boolean isSingleFieldEqual(BibEntry one, BibEntry two, Field fiel
         if (stringOne.isEmpty() || stringTwo.isEmpty()) {
             return false;
         }
-        return (StringUtil.unifyLineBreaks(stringOne.get(), OS.NEWLINE).equals(
-                StringUtil.unifyLineBreaks(stringTwo.get(), OS.NEWLINE)));
+        return StringUtil.unifyLineBreaks(stringOne.get(), OS.NEWLINE).equals(
+                StringUtil.unifyLineBreaks(stringTwo.get(), OS.NEWLINE));
     }
 
     /**
diff --git a/src/main/java/org/jabref/logic/exporter/AtomicFileOutputStream.java b/src/main/java/org/jabref/logic/exporter/AtomicFileOutputStream.java
index 58f98365592..249e7fa04bb 100644
--- a/src/main/java/org/jabref/logic/exporter/AtomicFileOutputStream.java
+++ b/src/main/java/org/jabref/logic/exporter/AtomicFileOutputStream.java
@@ -105,8 +105,8 @@ public AtomicFileOutputStream(Path path) throws IOException {
 
         try {
             // Lock files (so that at least not another JabRef instance writes at the same time to the same tmp file)
-            if (out instanceof FileOutputStream) {
-                temporaryFileLock = ((FileOutputStream) out).getChannel().lock();
+            if (out instanceof FileOutputStream stream) {
+                temporaryFileLock = stream.getChannel().lock();
             } else {
                 temporaryFileLock = null;
             }
@@ -184,8 +184,8 @@ public void close() throws IOException {
             try {
                 // Make sure we have written everything to the temporary file
                 flush();
-                if (out instanceof FileOutputStream) {
-                    ((FileOutputStream) out).getFD().sync();
+                if (out instanceof FileOutputStream stream) {
+                    stream.getFD().sync();
                 }
             } catch (IOException exception) {
                 // Try to close nonetheless
diff --git a/src/main/java/org/jabref/logic/exporter/BibDatabaseWriter.java b/src/main/java/org/jabref/logic/exporter/BibDatabaseWriter.java
index de558fddca0..68df8656bf1 100644
--- a/src/main/java/org/jabref/logic/exporter/BibDatabaseWriter.java
+++ b/src/main/java/org/jabref/logic/exporter/BibDatabaseWriter.java
@@ -7,16 +7,14 @@
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
-import java.util.Set;
+import java.util.SortedSet;
 import java.util.TreeSet;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import org.jabref.logic.bibtex.comparator.BibtexStringComparator;
@@ -25,6 +23,7 @@
 import org.jabref.logic.bibtex.comparator.FieldComparatorStack;
 import org.jabref.logic.bibtex.comparator.IdComparator;
 import org.jabref.logic.citationkeypattern.CitationKeyGenerator;
+import org.jabref.logic.citationkeypattern.CitationKeyPatternPreferences;
 import org.jabref.logic.citationkeypattern.GlobalCitationKeyPattern;
 import org.jabref.logic.cleanup.FieldFormatterCleanup;
 import org.jabref.logic.cleanup.FieldFormatterCleanups;
@@ -39,9 +38,11 @@
 import org.jabref.model.entry.BibtexString;
 import org.jabref.model.entry.field.InternalField;
 import org.jabref.model.metadata.MetaData;
-import org.jabref.model.metadata.SaveOrderConfig;
+import org.jabref.model.metadata.SaveOrder;
+import org.jabref.model.metadata.SelfContainedSaveOrder;
 import org.jabref.model.strings.StringUtil;
-import org.jabref.preferences.GeneralPreferences;
+
+import org.jooq.lambda.Unchecked;
 
 /**
  * A generic writer for our database. This is independent of the concrete serialization format.
@@ -53,18 +54,24 @@
  */
 public abstract class BibDatabaseWriter {
 
+    public enum SaveType { WITH_JABREF_META_DATA, PLAIN_BIBTEX }
+
     private static final Pattern REFERENCE_PATTERN = Pattern.compile("(#[A-Za-z]+#)"); // Used to detect string references in strings
     protected final BibWriter bibWriter;
-    protected final GeneralPreferences generalPreferences;
-    protected final SavePreferences savePreferences;
+    protected final SelfContainedSaveConfiguration saveConfiguration;
+    protected final CitationKeyPatternPreferences keyPatternPreferences;
     protected final List<FieldChange> saveActionsFieldChanges = new ArrayList<>();
     protected final BibEntryTypesManager entryTypesManager;
 
-    public BibDatabaseWriter(BibWriter bibWriter, GeneralPreferences generalPreferences, SavePreferences savePreferences, BibEntryTypesManager entryTypesManager) {
+    public BibDatabaseWriter(BibWriter bibWriter,
+                             SelfContainedSaveConfiguration saveConfiguration,
+                             CitationKeyPatternPreferences keyPatternPreferences,
+                             BibEntryTypesManager entryTypesManager) {
         this.bibWriter = Objects.requireNonNull(bibWriter);
-        this.generalPreferences = generalPreferences;
-        this.savePreferences = savePreferences;
+        this.saveConfiguration = saveConfiguration;
+        this.keyPatternPreferences = keyPatternPreferences;
         this.entryTypesManager = entryTypesManager;
+        assert saveConfiguration.getSaveOrder().getOrderType() != SaveOrder.OrderType.TABLE;
     }
 
     private static List<FieldChange> applySaveActions(List<BibEntry> toChange, MetaData metaData) {
@@ -82,7 +89,7 @@ private static List<FieldChange> applySaveActions(List<BibEntry> toChange, MetaD
         List<FieldFormatterCleanup> preSaveCleanups =
                 Stream.of(new TrimWhitespaceFormatter())
                       .map(formatter -> new FieldFormatterCleanup(InternalField.INTERNAL_ALL_FIELD, formatter))
-                      .collect(Collectors.toList());
+                      .toList();
         for (FieldFormatterCleanup formatter : preSaveCleanups) {
             for (BibEntry entry : toChange) {
                 changes.addAll(formatter.cleanup(entry));
@@ -96,23 +103,21 @@ public static List<FieldChange> applySaveActions(BibEntry entry, MetaData metaDa
         return applySaveActions(Collections.singletonList(entry), metaData);
     }
 
-    private static List<Comparator<BibEntry>> getSaveComparators(MetaData metaData, SavePreferences preferences) {
+    private static List<Comparator<BibEntry>> getSaveComparators(SaveOrder saveOrder) {
         List<Comparator<BibEntry>> comparators = new ArrayList<>();
-        Optional<SaveOrderConfig> saveOrder = getSaveOrder(metaData, preferences);
 
         // Take care, using CrossRefEntry-Comparator, that referred entries occur after referring
         // ones. This is a necessary requirement for BibTeX to be able to resolve referenced entries correctly.
         comparators.add(new CrossRefEntryComparator());
 
-        if (saveOrder.isEmpty()) {
+        if (saveOrder.getOrderType() == SaveOrder.OrderType.ORIGINAL) {
             // entries will be sorted based on their internal IDs
             comparators.add(new IdComparator());
         } else {
             // use configured sorting strategy
-            List<FieldComparator> fieldComparators = saveOrder.get()
-                                                              .getSortCriteria().stream()
+            List<FieldComparator> fieldComparators = saveOrder.getSortCriteria().stream()
                                                               .map(FieldComparator::new)
-                                                              .collect(Collectors.toList());
+                                                              .toList();
             comparators.addAll(fieldComparators);
             comparators.add(new FieldComparator(InternalField.KEY_FIELD));
         }
@@ -121,20 +126,15 @@ private static List<Comparator<BibEntry>> getSaveComparators(MetaData metaData,
     }
 
     /**
-     * We have begun to use getSortedEntries() for both database save operations and non-database save operations.  In a
+     * We have begun to use getSortedEntries() for both database save operations and non-database save operations. In a
      * non-database save operation (such as the exportDatabase call), we do not wish to use the global preference of
      * saving in standard order.
      */
-    public static List<BibEntry> getSortedEntries(BibDatabaseContext bibDatabaseContext, List<BibEntry> entriesToSort, SavePreferences preferences) {
-        Objects.requireNonNull(bibDatabaseContext);
+    public static List<BibEntry> getSortedEntries(List<BibEntry> entriesToSort, SelfContainedSaveOrder saveOrder) {
         Objects.requireNonNull(entriesToSort);
+        Objects.requireNonNull(saveOrder);
 
-        // if no meta data are present, simply return in original order
-        if (bibDatabaseContext.getMetaData() == null) {
-            return new LinkedList<>(entriesToSort);
-        }
-
-        List<Comparator<BibEntry>> comparators = getSaveComparators(bibDatabaseContext.getMetaData(), preferences);
+        List<Comparator<BibEntry>> comparators = getSaveComparators(saveOrder);
         FieldComparatorStack<BibEntry> comparatorStack = new FieldComparatorStack<>(comparators);
 
         List<BibEntry> sorted = new ArrayList<>(entriesToSort);
@@ -142,24 +142,6 @@ public static List<BibEntry> getSortedEntries(BibDatabaseContext bibDatabaseCont
         return sorted;
     }
 
-    private static Optional<SaveOrderConfig> getSaveOrder(MetaData metaData, SavePreferences preferences) {
-        /* three options:
-         * 1. original order
-         * 2. order specified in metaData
-         * 3. order specified in preferences
-         */
-
-        if (preferences.shouldSaveInOriginalOrder()) {
-            return Optional.empty();
-        }
-
-        if (preferences.takeMetadataSaveOrderInAccount()) {
-            return metaData.getSaveOrderConfig();
-        }
-
-        return Optional.ofNullable(preferences.getSaveOrder());
-    }
-
     public List<FieldChange> getSaveActionsFieldChanges() {
         return Collections.unmodifiableList(saveActionsFieldChanges);
     }
@@ -168,21 +150,24 @@ public List<FieldChange> getSaveActionsFieldChanges() {
      * Saves the complete database.
      */
     public void saveDatabase(BibDatabaseContext bibDatabaseContext) throws IOException {
-        savePartOfDatabase(bibDatabaseContext, bibDatabaseContext.getDatabase().getEntries());
+        List<BibEntry> entries = bibDatabaseContext.getDatabase().getEntries()
+                                                .stream()
+                                                .filter(entry -> !entry.isEmpty())
+                                                .toList();
+        savePartOfDatabase(bibDatabaseContext, entries);
     }
 
     /**
      * Saves the database, including only the specified entries.
+     *
+     * @param entries A list of entries to save. The list itself is not modified in this code
      */
     public void savePartOfDatabase(BibDatabaseContext bibDatabaseContext, List<BibEntry> entries) throws IOException {
         Optional<String> sharedDatabaseIDOptional = bibDatabaseContext.getDatabase().getSharedDatabaseID();
-        if (sharedDatabaseIDOptional.isPresent()) {
-            // may throw an IOException. Thus, we do not use "ifPresent", but the "old" isPresent way
-            writeDatabaseID(sharedDatabaseIDOptional.get());
-        }
+        sharedDatabaseIDOptional.ifPresent(Unchecked.consumer(id -> writeDatabaseID(id)));
 
         // Some file formats write something at the start of the file (like the encoding)
-        if (savePreferences.getSaveType() != SavePreferences.DatabaseSaveType.PLAIN_BIBTEX) {
+        if (saveConfiguration.getSaveType() == SaveType.WITH_JABREF_META_DATA) {
             Charset charset = bibDatabaseContext.getMetaData().getEncoding().orElse(StandardCharsets.UTF_8);
             writeProlog(bibDatabaseContext, charset);
         }
@@ -196,16 +181,16 @@ public void savePartOfDatabase(BibDatabaseContext bibDatabaseContext, List<BibEn
         writeStrings(bibDatabaseContext.getDatabase());
 
         // Write database entries.
-        List<BibEntry> sortedEntries = getSortedEntries(bibDatabaseContext, entries, savePreferences);
+        List<BibEntry> sortedEntries = getSortedEntries(entries, saveConfiguration.getSelfContainedSaveOrder());
         List<FieldChange> saveActionChanges = applySaveActions(sortedEntries, bibDatabaseContext.getMetaData());
         saveActionsFieldChanges.addAll(saveActionChanges);
-        if (savePreferences.getCitationKeyPatternPreferences().shouldGenerateCiteKeysBeforeSaving()) {
+        if (keyPatternPreferences.shouldGenerateCiteKeysBeforeSaving()) {
             List<FieldChange> keyChanges = generateCitationKeys(bibDatabaseContext, sortedEntries);
             saveActionsFieldChanges.addAll(keyChanges);
         }
 
         // Map to collect entry type definitions that we must save along with entries using them.
-        Set<BibEntryType> typesToWrite = new TreeSet<>();
+        SortedSet<BibEntryType> typesToWrite = new TreeSet<>();
 
         for (BibEntry entry : sortedEntries) {
             // Check if we must write the type definition for this
@@ -220,9 +205,9 @@ public void savePartOfDatabase(BibDatabaseContext bibDatabaseContext, List<BibEn
             writeEntry(entry, bibDatabaseContext.getMode());
         }
 
-        if (savePreferences.getSaveType() != SavePreferences.DatabaseSaveType.PLAIN_BIBTEX) {
+        if (saveConfiguration.getSaveType() == SaveType.WITH_JABREF_META_DATA) {
             // Write meta data.
-            writeMetaData(bibDatabaseContext.getMetaData(), savePreferences.getCitationKeyPatternPreferences().getKeyPattern());
+            writeMetaData(bibDatabaseContext.getMetaData(), keyPatternPreferences.getKeyPattern());
 
             // Write type definitions, if any:
             writeEntryTypeDefinitions(typesToWrite);
@@ -269,7 +254,7 @@ private void writeStrings(BibDatabase database) throws IOException {
                                              .stream()
                                              .map(database::getString)
                                              .sorted(new BibtexStringComparator(true))
-                                             .collect(Collectors.toList());
+                                             .toList();
         // First, make a Map of all entries:
         Map<String, BibtexString> remaining = new HashMap<>();
         int maxKeyLength = 0;
@@ -318,7 +303,7 @@ protected void writeString(BibtexString bibtexString, Map<String, BibtexString>
     protected abstract void writeString(BibtexString bibtexString, int maxKeyLength)
             throws IOException;
 
-    protected void writeEntryTypeDefinitions(Set<BibEntryType> types) throws IOException {
+    protected void writeEntryTypeDefinitions(SortedSet<BibEntryType> types) throws IOException {
         for (BibEntryType type : types) {
             writeEntryTypeDefinition(type);
         }
@@ -331,7 +316,7 @@ protected void writeEntryTypeDefinitions(Set<BibEntryType> types) throws IOExcep
      */
     protected List<FieldChange> generateCitationKeys(BibDatabaseContext databaseContext, List<BibEntry> entries) {
         List<FieldChange> changes = new ArrayList<>();
-        CitationKeyGenerator keyGenerator = new CitationKeyGenerator(databaseContext, savePreferences.getCitationKeyPatternPreferences());
+        CitationKeyGenerator keyGenerator = new CitationKeyGenerator(databaseContext, keyPatternPreferences);
         for (BibEntry bes : entries) {
             Optional<String> oldKey = bes.getCitationKey();
             if (StringUtil.isBlank(oldKey)) {
diff --git a/src/main/java/org/jabref/logic/exporter/BibWriter.java b/src/main/java/org/jabref/logic/exporter/BibWriter.java
index fd03941cf74..dedeb4e64eb 100644
--- a/src/main/java/org/jabref/logic/exporter/BibWriter.java
+++ b/src/main/java/org/jabref/logic/exporter/BibWriter.java
@@ -26,7 +26,7 @@ public BibWriter(Writer writer, String newLineSeparator) {
     }
 
     /**
-     * Writes the given string. The newlines of the given string are converted to the newline set for this clas
+     * Writes the given string. The newlines of the given string are converted to the newline set for this class
      */
     public void write(String string) throws IOException {
         if (precedingNewLineRequired) {
diff --git a/src/main/java/org/jabref/logic/exporter/BibtexDatabaseWriter.java b/src/main/java/org/jabref/logic/exporter/BibtexDatabaseWriter.java
index 471b6f1b304..558687ca21d 100644
--- a/src/main/java/org/jabref/logic/exporter/BibtexDatabaseWriter.java
+++ b/src/main/java/org/jabref/logic/exporter/BibtexDatabaseWriter.java
@@ -7,8 +7,10 @@
 import java.util.Map;
 
 import org.jabref.logic.bibtex.BibEntryWriter;
+import org.jabref.logic.bibtex.FieldPreferences;
 import org.jabref.logic.bibtex.FieldWriter;
 import org.jabref.logic.bibtex.InvalidFieldValueException;
+import org.jabref.logic.citationkeypattern.CitationKeyPatternPreferences;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.model.entry.BibEntry;
@@ -18,7 +20,6 @@
 import org.jabref.model.entry.field.InternalField;
 import org.jabref.model.metadata.MetaData;
 import org.jabref.model.strings.StringUtil;
-import org.jabref.preferences.GeneralPreferences;
 
 /**
  * Writes a .bib file following the BibTeX / BibLaTeX format using the provided {@link BibWriter}
@@ -31,12 +32,33 @@ public class BibtexDatabaseWriter extends BibDatabaseWriter {
     private static final String PREAMBLE_PREFIX = "@Preamble";
     private static final String STRING_PREFIX = "@String";
 
-    public BibtexDatabaseWriter(BibWriter bibWriter, GeneralPreferences generalPreferences, SavePreferences savePreferences, BibEntryTypesManager entryTypesManager) {
-        super(bibWriter, generalPreferences, savePreferences, entryTypesManager);
+    private final FieldPreferences fieldPreferences;
+
+    public BibtexDatabaseWriter(BibWriter bibWriter,
+                                SelfContainedSaveConfiguration saveConfiguration,
+                                FieldPreferences fieldPreferences,
+                                CitationKeyPatternPreferences citationKeyPatternPreferences,
+                                BibEntryTypesManager entryTypesManager) {
+        super(bibWriter,
+                saveConfiguration,
+                citationKeyPatternPreferences,
+                entryTypesManager);
+
+        this.fieldPreferences = fieldPreferences;
     }
 
-    public BibtexDatabaseWriter(Writer writer, String newline, GeneralPreferences generalPreferences, SavePreferences savePreferences, BibEntryTypesManager entryTypesManager) {
-        super(new BibWriter(writer, newline), generalPreferences, savePreferences, entryTypesManager);
+    public BibtexDatabaseWriter(Writer writer,
+                                String newline,
+                                SelfContainedSaveConfiguration saveConfiguration,
+                                FieldPreferences fieldPreferences,
+                                CitationKeyPatternPreferences citationKeyPatternPreferences,
+                                BibEntryTypesManager entryTypesManager) {
+        super(new BibWriter(writer, newline),
+                saveConfiguration,
+                citationKeyPatternPreferences,
+                entryTypesManager);
+
+        this.fieldPreferences = fieldPreferences;
     }
 
     @Override
@@ -71,7 +93,7 @@ protected void writePreamble(String preamble) throws IOException {
     @Override
     protected void writeString(BibtexString bibtexString, int maxKeyLength) throws IOException {
         // If the string has not been modified, write it back as it was
-        if (!savePreferences.shouldReformatFile() && !bibtexString.hasChanged()) {
+        if (!saveConfiguration.shouldReformatFile() && !bibtexString.hasChanged()) {
             bibWriter.write(bibtexString.getParsedSerialization());
             return;
         }
@@ -88,9 +110,8 @@ protected void writeString(BibtexString bibtexString, int maxKeyLength) throws I
             bibWriter.write("{}");
         } else {
             try {
-                String formatted = new FieldWriter(savePreferences.getFieldWriterPreferences())
-                        .write(InternalField.BIBTEX_STRING, bibtexString.getContent()
-                        );
+                String formatted = new FieldWriter(fieldPreferences)
+                        .write(InternalField.BIBTEX_STRING, bibtexString.getContent());
                 bibWriter.write(formatted);
             } catch (InvalidFieldValueException ex) {
                 throw new IOException(ex);
@@ -114,13 +135,13 @@ protected void writeProlog(BibDatabaseContext bibDatabaseContext, Charset encodi
         //   - 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))) {
+        if ((encoding == null) || (!bibDatabaseContext.getMetaData().getEncodingExplicitlySupplied() && (encoding.equals(StandardCharsets.UTF_8)))) {
             return;
         }
 
         // Writes the file encoding information.
         bibWriter.write("% ");
-        bibWriter.writeLine(SavePreferences.ENCODING_PREFIX + encoding);
+        bibWriter.writeLine(SaveConfiguration.ENCODING_PREFIX + encoding);
     }
 
     @Override
@@ -133,7 +154,7 @@ protected void writeDatabaseID(String sharedDatabaseID) throws IOException {
 
     @Override
     protected void writeEntry(BibEntry entry, BibDatabaseMode mode) throws IOException {
-        BibEntryWriter bibtexEntryWriter = new BibEntryWriter(new FieldWriter(savePreferences.getFieldWriterPreferences()), entryTypesManager);
-        bibtexEntryWriter.write(entry, bibWriter, mode, savePreferences.shouldReformatFile());
+        BibEntryWriter bibtexEntryWriter = new BibEntryWriter(new FieldWriter(fieldPreferences), entryTypesManager);
+        bibtexEntryWriter.write(entry, bibWriter, mode, saveConfiguration.shouldReformatFile());
     }
 }
diff --git a/src/main/java/org/jabref/logic/exporter/EmbeddedBibFilePdfExporter.java b/src/main/java/org/jabref/logic/exporter/EmbeddedBibFilePdfExporter.java
index 8950795b539..4de255e7127 100644
--- a/src/main/java/org/jabref/logic/exporter/EmbeddedBibFilePdfExporter.java
+++ b/src/main/java/org/jabref/logic/exporter/EmbeddedBibFilePdfExporter.java
@@ -13,8 +13,8 @@
 import java.util.Objects;
 
 import org.jabref.logic.bibtex.BibEntryWriter;
+import org.jabref.logic.bibtex.FieldPreferences;
 import org.jabref.logic.bibtex.FieldWriter;
-import org.jabref.logic.bibtex.FieldWriterPreferences;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.OS;
 import org.jabref.logic.util.StandardFileType;
@@ -41,13 +41,13 @@ public class EmbeddedBibFilePdfExporter extends Exporter {
 
     private final BibDatabaseMode bibDatabaseMode;
     private final BibEntryTypesManager bibEntryTypesManager;
-    private final FieldWriterPreferences fieldWriterPreferences;
+    private final FieldPreferences fieldPreferences;
 
-    public EmbeddedBibFilePdfExporter(BibDatabaseMode bibDatabaseMode, BibEntryTypesManager bibEntryTypesManager, FieldWriterPreferences fieldWriterPreferences) {
+    public EmbeddedBibFilePdfExporter(BibDatabaseMode bibDatabaseMode, BibEntryTypesManager bibEntryTypesManager, FieldPreferences fieldPreferences) {
         super("bib", "Embedded BibTeX", StandardFileType.PDF);
         this.bibDatabaseMode = bibDatabaseMode;
         this.bibEntryTypesManager = bibEntryTypesManager;
-        this.fieldWriterPreferences = fieldWriterPreferences;
+        this.fieldPreferences = fieldPreferences;
     }
 
     /**
@@ -136,7 +136,7 @@ private void embedBibTex(String bibTeX, Path path) throws IOException {
     private String getBibString(List<BibEntry> entries) throws IOException {
         StringWriter stringWriter = new StringWriter();
         BibWriter bibWriter = new BibWriter(stringWriter, OS.NEWLINE);
-        FieldWriter fieldWriter = FieldWriter.buildIgnoreHashes(fieldWriterPreferences);
+        FieldWriter fieldWriter = FieldWriter.buildIgnoreHashes(fieldPreferences);
         BibEntryWriter bibEntryWriter = new BibEntryWriter(fieldWriter, bibEntryTypesManager);
         for (BibEntry entry : entries) {
             bibEntryWriter.write(entry, bibWriter, bibDatabaseMode);
diff --git a/src/main/java/org/jabref/logic/exporter/Exporter.java b/src/main/java/org/jabref/logic/exporter/Exporter.java
index 6fdfe20accb..61e1c5751ae 100644
--- a/src/main/java/org/jabref/logic/exporter/Exporter.java
+++ b/src/main/java/org/jabref/logic/exporter/Exporter.java
@@ -6,8 +6,8 @@
 import java.util.List;
 import java.util.Optional;
 
+import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.util.FileType;
-import org.jabref.model.database.BibDatabase;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.LinkedFile;
@@ -60,28 +60,33 @@ public String toString() {
      */
     public abstract void export(BibDatabaseContext databaseContext, Path file, List<BibEntry> entries) throws Exception;
 
-    public void export(BibDatabaseContext databaseContext, Path file, List<BibEntry> entries, List<Path> fileDirForDatabase) throws Exception {
+    public void export(BibDatabaseContext databaseContext, Path file, List<BibEntry> entries, List<Path> fileDirForDatabase, JournalAbbreviationRepository abbreviationRepository) throws Exception {
         export(databaseContext, file, entries);
     }
 
     /**
      * Exports to all files linked to a given entry
      *
-     * @param databaseContext   the database to export from
-     * @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
+     * @param databaseContext        the database to export from
+     * @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
+     * @param abbreviationRepository the opened repository of journal abbreviations
      * @return whether any file was written on
      * @throws Exception if the writing fails
      */
-    public boolean exportToAllFilesOfEntry(BibDatabaseContext databaseContext, FilePreferences filePreferences, BibEntry entryToWriteOn, List<BibEntry> entriesToWrite) throws Exception {
+    public boolean exportToAllFilesOfEntry(BibDatabaseContext databaseContext,
+                                           FilePreferences filePreferences,
+                                           BibEntry entryToWriteOn,
+                                           List<BibEntry> entriesToWrite,
+                                           JournalAbbreviationRepository abbreviationRepository) 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(), entriesToWrite, Collections.emptyList());
+                    export(databaseContext, filePath.get(), entriesToWrite, Collections.emptyList(), abbreviationRepository);
                     writtenToAFile = true;
                 }
             }
@@ -96,24 +101,27 @@ public boolean exportToAllFilesOfEntry(BibDatabaseContext databaseContext, FileP
      * 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 filePreferences   the filePreferences to use for resolving paths
-     * @param filePath          the path to the file we want to write on
+     * @param databaseContext        the database-context to export from
+     * @param filePreferences        the filePreferences to use for resolving paths
+     * @param filePath               the path to the file we want to write on
+     * @param abbreviationRepository the opened repository of journal abbreviations
      * @return whether the file was written on at least once
      * @throws Exception if the writing fails
      */
-    public boolean exportToFileByPath(BibDatabaseContext databaseContext, BibDatabase dataBase, FilePreferences filePreferences, Path filePath) throws Exception {
+    public boolean exportToFileByPath(BibDatabaseContext databaseContext,
+                                      FilePreferences filePreferences,
+                                      Path filePath,
+                                      JournalAbbreviationRepository abbreviationRepository) throws Exception {
         if (!Files.exists(filePath)) {
             return false;
         }
         boolean writtenABibEntry = false;
-        for (BibEntry entry : dataBase.getEntries()) {
+        for (BibEntry entry : databaseContext.getEntries()) {
             for (LinkedFile linkedFile : entry.getFiles()) {
                 if (linkedFile.getFileType().equals(fileType.getName())) {
                     Optional<Path> linkedFilePath = linkedFile.findIn(databaseContext.getFileDirectories(filePreferences));
                     if (linkedFilePath.isPresent() && Files.exists(linkedFilePath.get()) && Files.isSameFile(linkedFilePath.get(), filePath)) {
-                        export(databaseContext, filePath, List.of(entry), Collections.emptyList());
+                        export(databaseContext, filePath, List.of(entry), Collections.emptyList(), abbreviationRepository);
                         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 dd503ae2be4..4eaa28e4dea 100644
--- a/src/main/java/org/jabref/logic/exporter/ExporterFactory.java
+++ b/src/main/java/org/jabref/logic/exporter/ExporterFactory.java
@@ -6,24 +6,18 @@
 import java.util.Objects;
 import java.util.Optional;
 
-import org.jabref.logic.journals.JournalAbbreviationRepository;
+import org.jabref.logic.bibtex.FieldPreferences;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.layout.LayoutFormatterPreferences;
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.logic.xmp.XmpPreferences;
 import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.model.entry.BibEntryTypesManager;
+import org.jabref.model.metadata.SelfContainedSaveOrder;
 import org.jabref.preferences.PreferencesService;
 
 public class ExporterFactory {
 
-    /**
-     * Global variable that is used for counting output entries when exporting:
-     *
-     * @deprecated find a better way to do this
-     */
-    @Deprecated public static int entryNumber;
-
     private final List<Exporter> exporters;
 
     private ExporterFactory(List<Exporter> exporters) {
@@ -31,53 +25,42 @@ private ExporterFactory(List<Exporter> exporters) {
     }
 
     public static ExporterFactory create(PreferencesService preferencesService,
-                                         BibEntryTypesManager entryTypesManager,
-                                         JournalAbbreviationRepository abbreviationRepository) {
-        return ExporterFactory.create(
-                preferencesService.getCustomExportFormats(abbreviationRepository),
-                preferencesService.getLayoutFormatterPreferences(abbreviationRepository),
-                preferencesService.getSavePreferencesForExport(),
-                preferencesService.getXmpPreferences(),
-                preferencesService.getGeneralPreferences().getDefaultBibDatabaseMode(),
-                entryTypesManager);
-    }
-
-    public static ExporterFactory create(List<TemplateExporter> customFormats,
-                                         LayoutFormatterPreferences layoutPreferences,
-                                         SavePreferences savePreferences,
-                                         XmpPreferences xmpPreferences,
-                                         BibDatabaseMode bibDatabaseMode,
                                          BibEntryTypesManager entryTypesManager) {
 
-        List<Exporter> exporters = new ArrayList<>();
+        List<TemplateExporter> customFormats = preferencesService.getExportPreferences().getCustomExporters();
+        LayoutFormatterPreferences layoutPreferences = preferencesService.getLayoutFormatterPreferences();
+        SelfContainedSaveOrder saveOrder = SelfContainedSaveOrder.of(preferencesService.getSelfContainedExportConfiguration().getSaveOrder());
+        XmpPreferences xmpPreferences = preferencesService.getXmpPreferences();
+        FieldPreferences fieldPreferences = preferencesService.getFieldPreferences();
+        BibDatabaseMode bibDatabaseMode = preferencesService.getLibraryPreferences().getDefaultBibDatabaseMode();
 
-        // Initialize build-in exporters
+        List<Exporter> exporters = new ArrayList<>();
 
         // Initialize build-in exporters
-        exporters.add(new TemplateExporter("HTML", "html", "html", null, StandardFileType.HTML, layoutPreferences, savePreferences));
-        exporters.add(new TemplateExporter(Localization.lang("Simple HTML"), "simplehtml", "simplehtml", null, StandardFileType.HTML, layoutPreferences, savePreferences));
-        exporters.add(new TemplateExporter("DocBook 5.1", "docbook5", "docbook5", null, StandardFileType.XML, layoutPreferences, savePreferences));
-        exporters.add(new TemplateExporter("DocBook 4", "docbook4", "docbook4", null, StandardFileType.XML, layoutPreferences, savePreferences));
-        exporters.add(new TemplateExporter("DIN 1505", "din1505", "din1505winword", "din1505", StandardFileType.RTF, layoutPreferences, savePreferences));
-        exporters.add(new TemplateExporter("BibO RDF", "bibordf", "bibordf", null, StandardFileType.RDF, layoutPreferences, savePreferences));
-        exporters.add(new TemplateExporter(Localization.lang("HTML table"), "tablerefs", "tablerefs", "tablerefs", StandardFileType.HTML, layoutPreferences, savePreferences));
-        exporters.add(new TemplateExporter(Localization.lang("HTML list"), "listrefs", "listrefs", "listrefs", StandardFileType.HTML, layoutPreferences, savePreferences));
-        exporters.add(new TemplateExporter(Localization.lang("HTML table (with Abstract & BibTeX)"), "tablerefsabsbib", "tablerefsabsbib", "tablerefsabsbib", StandardFileType.HTML, layoutPreferences, savePreferences));
-        exporters.add(new TemplateExporter("Harvard RTF", "harvard", "harvard", "harvard", StandardFileType.RTF, layoutPreferences, savePreferences));
-        exporters.add(new TemplateExporter("ISO 690 RTF", "iso690rtf", "iso690RTF", "iso690rtf", StandardFileType.RTF, layoutPreferences, savePreferences));
-        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));
-        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 TemplateExporter("HTML", "html", "html", null, StandardFileType.HTML, layoutPreferences, saveOrder));
+        exporters.add(new TemplateExporter(Localization.lang("Simple HTML"), "simplehtml", "simplehtml", null, StandardFileType.HTML, layoutPreferences, saveOrder));
+        exporters.add(new TemplateExporter("DocBook 5.1", "docbook5", "docbook5", null, StandardFileType.XML, layoutPreferences, saveOrder));
+        exporters.add(new TemplateExporter("DocBook 4", "docbook4", "docbook4", null, StandardFileType.XML, layoutPreferences, saveOrder));
+        exporters.add(new TemplateExporter("DIN 1505", "din1505", "din1505winword", "din1505", StandardFileType.RTF, layoutPreferences, saveOrder));
+        exporters.add(new TemplateExporter("BibO RDF", "bibordf", "bibordf", null, StandardFileType.RDF, layoutPreferences, saveOrder));
+        exporters.add(new TemplateExporter(Localization.lang("HTML table"), "tablerefs", "tablerefs", "tablerefs", StandardFileType.HTML, layoutPreferences, saveOrder));
+        exporters.add(new TemplateExporter(Localization.lang("HTML list"), "listrefs", "listrefs", "listrefs", StandardFileType.HTML, layoutPreferences, saveOrder));
+        exporters.add(new TemplateExporter(Localization.lang("HTML table (with Abstract & BibTeX)"), "tablerefsabsbib", "tablerefsabsbib", "tablerefsabsbib", StandardFileType.HTML, layoutPreferences, saveOrder));
+        exporters.add(new TemplateExporter("Harvard RTF", "harvard", "harvard", "harvard", StandardFileType.RTF, layoutPreferences, saveOrder));
+        exporters.add(new TemplateExporter("ISO 690 RTF", "iso690rtf", "iso690RTF", "iso690rtf", StandardFileType.RTF, layoutPreferences, saveOrder));
+        exporters.add(new TemplateExporter("ISO 690", "iso690txt", "iso690", "iso690txt", StandardFileType.TXT, layoutPreferences, saveOrder));
+        exporters.add(new TemplateExporter("Endnote", "endnote", "EndNote", "endnote", StandardFileType.TXT, layoutPreferences, saveOrder));
+        exporters.add(new TemplateExporter("OpenOffice/LibreOffice CSV", "oocsv", "openoffice-csv", "openoffice", StandardFileType.CSV, layoutPreferences, saveOrder));
+        exporters.add(new TemplateExporter("RIS", "ris", "ris", "ris", StandardFileType.RIS, layoutPreferences, saveOrder, BlankLineBehaviour.DELETE_BLANKS));
+        exporters.add(new TemplateExporter("MIS Quarterly", "misq", "misq", "misq", StandardFileType.RTF, layoutPreferences, saveOrder));
+        exporters.add(new TemplateExporter("CSL YAML", "yaml", "yaml", null, StandardFileType.YAML, layoutPreferences, saveOrder, BlankLineBehaviour.DELETE_BLANKS));
         exporters.add(new OpenOfficeDocumentCreator());
         exporters.add(new OpenDocumentSpreadsheetCreator());
         exporters.add(new MSBibExporter());
         exporters.add(new ModsExporter());
         exporters.add(new XmpExporter(xmpPreferences));
         exporters.add(new XmpPdfExporter(xmpPreferences));
-        exporters.add(new EmbeddedBibFilePdfExporter(bibDatabaseMode, entryTypesManager, savePreferences.getFieldWriterPreferences()));
+        exporters.add(new EmbeddedBibFilePdfExporter(bibDatabaseMode, entryTypesManager, fieldPreferences));
 
         // Now add custom export formats
         exporters.addAll(customFormats);
diff --git a/src/main/java/org/jabref/logic/exporter/GroupSerializer.java b/src/main/java/org/jabref/logic/exporter/GroupSerializer.java
index d9ae19ad5ef..609a1aa4827 100644
--- a/src/main/java/org/jabref/logic/exporter/GroupSerializer.java
+++ b/src/main/java/org/jabref/logic/exporter/GroupSerializer.java
@@ -116,18 +116,18 @@ public List<String> serializeTree(GroupTreeNode node) {
     private String serializeGroup(AbstractGroup group) {
         if (group instanceof AllEntriesGroup) {
             return serializeAllEntriesGroup();
-        } else if (group instanceof ExplicitGroup) {
-            return serializeExplicitGroup((ExplicitGroup) group);
-        } else if (group instanceof KeywordGroup) {
-            return serializeKeywordGroup((KeywordGroup) group);
-        } else if (group instanceof SearchGroup) {
-            return serializeSearchGroup((SearchGroup) group);
-        } else if (group instanceof AutomaticKeywordGroup) {
-            return serializeAutomaticKeywordGroup((AutomaticKeywordGroup) group);
-        } else if (group instanceof AutomaticPersonsGroup) {
-            return serializeAutomaticPersonsGroup((AutomaticPersonsGroup) group);
-        } else if (group instanceof TexGroup) {
-            return serializeTexGroup((TexGroup) group);
+        } else if (group instanceof ExplicitGroup explicitGroup) {
+            return serializeExplicitGroup(explicitGroup);
+        } else if (group instanceof KeywordGroup keywordGroup) {
+            return serializeKeywordGroup(keywordGroup);
+        } else if (group instanceof SearchGroup searchGroup) {
+            return serializeSearchGroup(searchGroup);
+        } else if (group instanceof AutomaticKeywordGroup keywordGroup) {
+            return serializeAutomaticKeywordGroup(keywordGroup);
+        } else if (group instanceof AutomaticPersonsGroup personsGroup) {
+            return serializeAutomaticPersonsGroup(personsGroup);
+        } else if (group instanceof TexGroup texGroup) {
+            return serializeTexGroup(texGroup);
         } else {
             throw new UnsupportedOperationException("Don't know how to serialize group" + group.getClass().getName());
         }
diff --git a/src/main/java/org/jabref/logic/exporter/MetaDataSerializer.java b/src/main/java/org/jabref/logic/exporter/MetaDataSerializer.java
index f9450d47a14..60c143dab88 100644
--- a/src/main/java/org/jabref/logic/exporter/MetaDataSerializer.java
+++ b/src/main/java/org/jabref/logic/exporter/MetaDataSerializer.java
@@ -5,6 +5,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.StringJoiner;
 import java.util.TreeMap;
 import java.util.stream.Collectors;
 
@@ -21,6 +22,9 @@
 import org.jabref.model.metadata.MetaData;
 import org.jabref.model.strings.StringUtil;
 
+/**
+ * Reading is done at {@link org.jabref.logic.importer.util.MetaDataParser}
+ */
 public class MetaDataSerializer {
 
     private MetaDataSerializer() {
@@ -32,9 +36,13 @@ private MetaDataSerializer() {
     public static Map<String, String> getSerializedStringMap(MetaData metaData,
                                                              GlobalCitationKeyPattern globalCiteKeyPattern) {
 
-        // First write all meta data except groups
+        // metadata-key, list of contents
+        //  - contents to be separated by OS.NEWLINE
+        //  - each meta data item is written as separate @Comment entry - see org.jabref.logic.exporter.BibtexDatabaseWriter.writeMetaDataItem
         Map<String, List<String>> stringyMetaData = new HashMap<>();
-        metaData.getSaveOrderConfig().ifPresent(
+
+        // First write all meta data except groups
+        metaData.getSaveOrder().ifPresent(
                 saveOrderConfig -> stringyMetaData.put(MetaData.SAVE_ORDER_CONFIG, saveOrderConfig.getAsStringList()));
         metaData.getSaveActions().ifPresent(
                 saveActions -> stringyMetaData.put(MetaData.SAVE_ACTIONS, saveActions.getAsStringList(OS.NEWLINE)));
@@ -49,9 +57,9 @@ public static Map<String, String> getSerializedStringMap(MetaData metaData,
         metaData.getUserFileDirectories().forEach((user, path) -> stringyMetaData
                 .put(MetaData.FILE_DIRECTORY + '-' + user, Collections.singletonList(path.trim())));
         metaData.getLatexFileDirectories().forEach((user, path) -> stringyMetaData
-                .put(MetaData.FILE_DIRECTORY + "Latex-" + user, Collections.singletonList(path.toString().trim())));
+                .put(MetaData.FILE_DIRECTORY_LATEX + '-' + user, Collections.singletonList(path.toString().trim())));
         metaData.getVersionDBStructure().ifPresent(
-                VersionDBStructure -> stringyMetaData.put(MetaData.VERSION_DB_STRUCT, Collections.singletonList(VersionDBStructure.trim())));
+                versionDBStructure -> stringyMetaData.put(MetaData.VERSION_DB_STRUCT, Collections.singletonList(versionDBStructure.trim())));
 
         for (ContentSelector selector : metaData.getContentSelectorList()) {
             stringyMetaData.put(MetaData.SELECTOR_META_PREFIX + selector.getField().getName(), selector.getValues());
@@ -67,10 +75,10 @@ public static Map<String, String> getSerializedStringMap(MetaData metaData,
         // finally add all unknown meta data items to the serialization map
         Map<String, List<String>> unknownMetaData = metaData.getUnknownMetaData();
         for (Map.Entry<String, List<String>> entry : unknownMetaData.entrySet()) {
-            StringBuilder value = new StringBuilder();
-            value.append(OS.NEWLINE);
+            // The last "MetaData.SEPARATOR_STRING" adds compatibility to JabRef v5.9 and earlier
+            StringJoiner value = new StringJoiner(MetaData.SEPARATOR_STRING + OS.NEWLINE, OS.NEWLINE, MetaData.SEPARATOR_STRING + OS.NEWLINE);
             for (String line : entry.getValue()) {
-                value.append(line.replaceAll(";", "\\\\;") + MetaData.SEPARATOR_STRING + OS.NEWLINE);
+                value.add(line.replace(MetaData.SEPARATOR_STRING, "\\" + MetaData.SEPARATOR_STRING));
             }
             serializedMetaData.put(entry.getKey(), value.toString());
         }
@@ -81,25 +89,33 @@ public static Map<String, String> getSerializedStringMap(MetaData metaData,
     private static Map<String, String> serializeMetaData(Map<String, List<String>> stringyMetaData) {
         Map<String, String> serializedMetaData = new TreeMap<>();
         for (Map.Entry<String, List<String>> metaItem : stringyMetaData.entrySet()) {
-            StringBuilder stringBuilder = new StringBuilder();
-            for (String dataItem : metaItem.getValue()) {
-                if (!metaItem.getKey().equals(MetaData.VERSION_DB_STRUCT)) {
-                    stringBuilder.append(StringUtil.quote(dataItem, MetaData.SEPARATOR_STRING, MetaData.ESCAPE_CHARACTER)).append(MetaData.SEPARATOR_STRING);
+            List<String> itemList = metaItem.getValue();
+            if (itemList.isEmpty()) {
+                // Only add non-empty values
+                continue;
+            }
+
+            boolean isSaveActions = metaItem.getKey().equals(MetaData.SAVE_ACTIONS);
+            // The last "MetaData.SEPARATOR_STRING" adds compatibility to JabRef v5.9 and earlier
+            StringJoiner joiner = new StringJoiner(MetaData.SEPARATOR_STRING, "", MetaData.SEPARATOR_STRING);
+            boolean lastWasSaveActionsEnablement = false;
+            for (String dataItem : itemList) {
+                String string;
+                if (lastWasSaveActionsEnablement) {
+                    string = OS.NEWLINE;
                 } else {
-                    stringBuilder.append(StringUtil.quote(dataItem, MetaData.SEPARATOR_STRING, MetaData.ESCAPE_CHARACTER));
+                    string = "";
                 }
-
+                string += StringUtil.quote(dataItem, MetaData.SEPARATOR_STRING, MetaData.ESCAPE_CHARACTER);
                 // in case of save actions, add an additional newline after the enabled flag
-                if (metaItem.getKey().equals(MetaData.SAVE_ACTIONS)
+                lastWasSaveActionsEnablement = isSaveActions
                         && (FieldFormatterCleanups.ENABLED.equals(dataItem)
-                        || FieldFormatterCleanups.DISABLED.equals(dataItem))) {
-                    stringBuilder.append(OS.NEWLINE);
-                }
+                        || FieldFormatterCleanups.DISABLED.equals(dataItem));
+                joiner.add(string);
             }
-
-            String serializedItem = stringBuilder.toString();
-            // Only add non-empty values
-            if (!serializedItem.isEmpty() && !MetaData.SEPARATOR_STRING.equals(serializedItem)) {
+            String serializedItem = joiner.toString();
+            if (!serializedItem.isEmpty()) {
+                // Only add non-empty values
                 serializedMetaData.put(metaItem.getKey(), serializedItem);
             }
         }
diff --git a/src/main/java/org/jabref/logic/exporter/ModsExporter.java b/src/main/java/org/jabref/logic/exporter/ModsExporter.java
index ba07204ed92..893f93980b9 100644
--- a/src/main/java/org/jabref/logic/exporter/ModsExporter.java
+++ b/src/main/java/org/jabref/logic/exporter/ModsExporter.java
@@ -1,44 +1,29 @@
 package org.jabref.logic.exporter;
 
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.StringReader;
+import java.io.StringWriter;
 import java.math.BigInteger;
+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.Map;
 import java.util.Objects;
 import java.util.TreeMap;
 
-import javax.xml.namespace.QName;
-
-import org.jabref.logic.importer.fileformat.mods.AbstractDefinition;
-import org.jabref.logic.importer.fileformat.mods.CodeOrText;
-import org.jabref.logic.importer.fileformat.mods.DateDefinition;
-import org.jabref.logic.importer.fileformat.mods.DetailDefinition;
-import org.jabref.logic.importer.fileformat.mods.ExtentDefinition;
-import org.jabref.logic.importer.fileformat.mods.GenreDefinition;
-import org.jabref.logic.importer.fileformat.mods.IdentifierDefinition;
-import org.jabref.logic.importer.fileformat.mods.IssuanceDefinition;
-import org.jabref.logic.importer.fileformat.mods.LanguageDefinition;
-import org.jabref.logic.importer.fileformat.mods.LanguageTermDefinition;
-import org.jabref.logic.importer.fileformat.mods.LocationDefinition;
-import org.jabref.logic.importer.fileformat.mods.ModsCollectionDefinition;
-import org.jabref.logic.importer.fileformat.mods.ModsDefinition;
-import org.jabref.logic.importer.fileformat.mods.NameDefinition;
-import org.jabref.logic.importer.fileformat.mods.NamePartDefinition;
-import org.jabref.logic.importer.fileformat.mods.NoteDefinition;
-import org.jabref.logic.importer.fileformat.mods.OriginInfoDefinition;
-import org.jabref.logic.importer.fileformat.mods.PartDefinition;
-import org.jabref.logic.importer.fileformat.mods.PhysicalLocationDefinition;
-import org.jabref.logic.importer.fileformat.mods.PlaceDefinition;
-import org.jabref.logic.importer.fileformat.mods.PlaceTermDefinition;
-import org.jabref.logic.importer.fileformat.mods.RelatedItemDefinition;
-import org.jabref.logic.importer.fileformat.mods.StringPlusLanguage;
-import org.jabref.logic.importer.fileformat.mods.StringPlusLanguagePlusAuthority;
-import org.jabref.logic.importer.fileformat.mods.StringPlusLanguagePlusSupplied;
-import org.jabref.logic.importer.fileformat.mods.SubjectDefinition;
-import org.jabref.logic.importer.fileformat.mods.TitleInfoDefinition;
-import org.jabref.logic.importer.fileformat.mods.TypeOfResourceDefinition;
-import org.jabref.logic.importer.fileformat.mods.UrlDefinition;
+import javax.xml.stream.XMLOutputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamWriter;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
@@ -47,10 +32,8 @@
 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;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * TemplateExporter for exporting in MODS XML format.
@@ -61,7 +44,8 @@ class ModsExporter extends Exporter {
     private static final String MINUS = "-";
     private static final String DOUBLE_MINUS = "--";
     private static final String MODS_SCHEMA_LOCATION = "http://www.loc.gov/standards/mods/v3/mods-3-6.xsd";
-    private JAXBContext context;
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(ModsExporter.class);
 
     public ModsExporter() {
         super("mods", "MODS", StandardFileType.XML);
@@ -75,268 +59,349 @@ public void export(final BibDatabaseContext databaseContext, final Path file, Li
             return;
         }
 
+        XMLStreamWriter writer = null;
         try {
-            ModsCollectionDefinition modsCollection = new ModsCollectionDefinition();
+            StringWriter sw = new StringWriter();
+            // writer is not an auto closable!
+            writer = createWriter(sw);
+
             for (BibEntry bibEntry : entries) {
-                ModsDefinition mods = new ModsDefinition();
-                bibEntry.getCitationKey().ifPresent(citeKey -> addIdentifier(new UnknownField("citekey"), citeKey, mods));
+                if (bibEntry.getCitationKey().isPresent()) {
+                    String citekey = bibEntry.getCitationKey().get();
+                    addIdentifier(writer, new UnknownField("citekey"), citekey);
+                } else {
+                    writer.writeStartElement("mods", "mods", MODS_NAMESPACE_URI);
+                }
 
                 Map<Field, String> fieldMap = new TreeMap<>(Comparator.comparing(Field::getName));
                 fieldMap.putAll(bibEntry.getFieldMap());
-                addGenre(mods, bibEntry.getType());
+                addGenre(writer, bibEntry.getType());
 
-                OriginInfoDefinition originInfo = new OriginInfoDefinition();
-                PartDefinition partDefinition = new PartDefinition();
-                RelatedItemDefinition relatedItem = new RelatedItemDefinition();
+                List<String> originItems = new ArrayList<>();
+                List<String> parts = new ArrayList<>();
 
                 for (Map.Entry<Field, String> entry : fieldMap.entrySet()) {
                     Field field = entry.getKey();
                     String value = entry.getValue();
 
-                    if (StandardField.AUTHOR.equals(field)) {
-                        handleAuthors(mods, value);
+                    if (StandardField.AUTHOR == field) {
+                        handleAuthors(writer, value);
                     } else if (new UnknownField("affiliation").equals(field)) {
-                        addAffiliation(mods, value);
-                    } else if (StandardField.ABSTRACT.equals(field)) {
-                        addAbstract(mods, value);
-                    } else if (StandardField.TITLE.equals(field)) {
-                        addTitle(mods, value);
-                    } else if (StandardField.LANGUAGE.equals(field)) {
-                        addLanguage(mods, value);
-                    } else if (StandardField.LOCATION.equals(field)) {
-                        addLocation(mods, value);
-                    } else if (StandardField.URL.equals(field)) {
-                        addUrl(mods, value);
-                    } else if (StandardField.NOTE.equals(field)) {
-                        addNote(mods, value);
-                    } else if (StandardField.KEYWORDS.equals(field)) {
-                        addKeyWords(mods, value);
-                    } else if (StandardField.VOLUME.equals(field)) {
-                        addDetail(StandardField.VOLUME, value, partDefinition);
-                    } else if (StandardField.ISSUE.equals(field)) {
-                        addDetail(StandardField.ISSUE, value, partDefinition);
-                    } else if (StandardField.PAGES.equals(field)) {
-                        addPages(partDefinition, value);
-                    } else if (StandardField.URI.equals(field)) {
-                        addIdentifier(StandardField.URI, value, mods);
-                    } else if (StandardField.ISBN.equals(field)) {
-                        addIdentifier(StandardField.ISBN, value, mods);
-                    } else if (StandardField.ISSN.equals(field)) {
-                        addIdentifier(StandardField.ISSN, value, mods);
-                    } else if (StandardField.DOI.equals(field)) {
-                        addIdentifier(StandardField.DOI, value, mods);
-                    } else if (StandardField.PMID.equals(field)) {
-                        addIdentifier(StandardField.PMID, value, mods);
-                    } else if (StandardField.JOURNAL.equals(field)) {
-                        addJournal(value, relatedItem);
+                        addAffiliation(writer, value);
+                    } else if (StandardField.ABSTRACT == field) {
+                        addAbstract(writer, value);
+                    } else if (StandardField.TITLE == field) {
+                        addTitle(writer, value);
+                    } else if (StandardField.LANGUAGE == field) {
+                        addLanguage(writer, value);
+                    } else if (StandardField.LOCATION == field) {
+                        addLocation(writer, value);
+                    } else if (StandardField.URL == field) {
+                        addUrl(writer, value);
+                    } else if (StandardField.NOTE == field) {
+                        addNote(writer, value);
+                    } else if (StandardField.KEYWORDS == field) {
+                        addKeyWords(writer, value);
+                    } else if (StandardField.URI == field) {
+                        addIdentifier(writer, StandardField.URI, value);
+                    } else if (StandardField.ISBN == field) {
+                        addIdentifier(writer, StandardField.ISBN, value);
+                    } else if (StandardField.ISSN == field) {
+                        addIdentifier(writer, StandardField.ISSN, value);
+                    } else if (StandardField.DOI == field) {
+                        addIdentifier(writer, StandardField.DOI, value);
+                    } else if (StandardField.PMID == field) {
+                        addIdentifier(writer, StandardField.PMID, value);
+                    } else if (StandardField.PAGES == field) {
+                        addPart(parts, value);
+                    } else if (StandardField.VOLUME == field) {
+                        addPart(parts, value);
+                    } else if (StandardField.ISSUE == field) {
+                        addPart(parts, value);
                     }
-
-                    addOriginInformation(field, value, originInfo);
+                    trackOriginInformation(originItems, field, value);
                 }
-                mods.getModsGroup().add(originInfo);
-
-                addRelatedAndOriginInfoToModsGroup(relatedItem, partDefinition, mods);
-                modsCollection.getMods().add(mods);
+                writeOriginInformation(writer, originItems, fieldMap);
+                // Write related items
+                writeRelatedInformation(writer, parts, fieldMap);
+                writer.writeEndElement(); // end mods
             }
+            writer.writeEndDocument();
+            writerFormatted(file, sw);
+        } catch (XMLStreamException | IOException | TransformerException ex) {
+            throw new SaveException(ex);
+        } finally {
+            try {
+                if (writer != null) {
+                    writer.flush();
+                    writer.close();
+                }
+            } catch (XMLStreamException e) {
+                LOGGER.error("Error closing XML writer", e);
+            }
+        }
+    }
 
-            JAXBElement<ModsCollectionDefinition> jaxbElement = new JAXBElement<>(
-                    new QName(MODS_NAMESPACE_URI, "modsCollection"), ModsCollectionDefinition.class, modsCollection);
+    private XMLStreamWriter createWriter(StringWriter sw) throws XMLStreamException {
+        XMLOutputFactory outputFactory = XMLOutputFactory.newFactory();
+
+        XMLStreamWriter writer = outputFactory.createXMLStreamWriter(new StreamResult(sw));
+        writer.writeDTD("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n");
+        writer.writeStartElement("mods", "modsCollection", MODS_NAMESPACE_URI);
+        writer.writeNamespace("mods", MODS_NAMESPACE_URI);
+        writer.writeNamespace("ns2", "http://www.w3.org/1999/xlink");
+        writer.writeNamespace("xsi", "http://www.w3.org/2001/XMLSchema-instance");
+        writer.writeAttribute("xsi", "http://www.w3.org/2001/XMLSchema-instance", "schemaLocation", MODS_SCHEMA_LOCATION);
+        return writer;
+    }
 
-            createMarshallerAndWriteToFile(file, jaxbElement);
-        } catch (JAXBException ex) {
-            throw new SaveException(ex);
+    private void writerFormatted(Path file, StringWriter sw) throws TransformerException, IOException {
+        Transformer transformer = TransformerFactory.newInstance().newTransformer();
+        transformer.setOutputProperty(OutputKeys.INDENT, "yes");
+        transformer.setOutputProperty(OutputKeys.STANDALONE, "yes");
+        transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "4");
+
+        try (OutputStream outputStream = Files.newOutputStream(file)) {
+            transformer.transform(new StreamSource(new StringReader(sw.toString())), new StreamResult(outputStream));
         }
     }
 
-    private void createMarshallerAndWriteToFile(Path file, JAXBElement<ModsCollectionDefinition> jaxbElement)
-            throws JAXBException {
+    private void writeOriginInformation(XMLStreamWriter writer, List<String> originItems, Map<Field, String> fieldMap) throws XMLStreamException {
+        if (originItems.isEmpty()) {
+            writer.writeEmptyElement("mods", "originInfo", MODS_NAMESPACE_URI);
+        } else {
+            writer.writeStartElement("mods", "originInfo", MODS_NAMESPACE_URI);
+            for (Map.Entry<Field, String> entry : fieldMap.entrySet()) {
+                Field field = entry.getKey();
+                String value = entry.getValue();
+                addOriginInformation(writer, field, value);
+            }
+            writer.writeEndElement();
+        }
+    }
+
+    private void writeRelatedInformation(XMLStreamWriter writer, List<String> parts, Map<Field, String> fieldMap) throws XMLStreamException {
+        writer.writeStartElement("mods", "relatedItem", MODS_NAMESPACE_URI);
+        writer.writeAttribute("type", "host");
 
-        if (context == null) {
-            context = JAXBContext.newInstance(ModsCollectionDefinition.class);
+        for (Map.Entry<Field, String> entry : fieldMap.entrySet()) {
+            Field field = entry.getKey();
+            String value = entry.getValue();
+            if (StandardField.JOURNAL == field) {
+                addJournal(writer, value);
+            }
         }
-        Marshaller marshaller = context.createMarshaller();
-        // format the output
-        marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);
-        marshaller.setProperty(Marshaller.JAXB_SCHEMA_LOCATION, MODS_SCHEMA_LOCATION);
+        writePartInformation(writer, parts, fieldMap);
 
-        // Write to File
-        marshaller.marshal(jaxbElement, file.toFile());
+        writer.writeEndElement(); // end relatedItem
+
+        writer.writeStartElement("mods", "typeOfResource", MODS_NAMESPACE_URI);
+        writer.writeCharacters("text");
+        writer.writeEndElement(); // end typeOfResource
     }
 
-    private void addRelatedAndOriginInfoToModsGroup(RelatedItemDefinition relatedItem, PartDefinition partDefinition,
-                                                    ModsDefinition mods) {
+    private void writePartInformation(XMLStreamWriter writer, List<String> parts, Map<Field, String> fieldMap) throws XMLStreamException {
+        if (parts.isEmpty()) {
+            writer.writeEmptyElement("mods", "part", MODS_NAMESPACE_URI);
+        } else {
+            writer.writeStartElement("mods", "part", MODS_NAMESPACE_URI);
+            for (Map.Entry<Field, String> entry : fieldMap.entrySet()) {
+                Field field = entry.getKey();
+                String value = entry.getValue();
+                if (StandardField.PAGES == field) {
+                    addPages(writer, value);
+                } else if (StandardField.VOLUME == field) {
+                    addDetail(writer, StandardField.VOLUME, value);
+                } else if (StandardField.ISSUE == field) {
+                    addDetail(writer, StandardField.ISSUE, value);
+                }
+            }
+            writer.writeEndElement(); // end part
+        }
+    }
 
-        relatedItem.getModsGroup().add(partDefinition);
-        relatedItem.setAtType("host");
-        mods.getModsGroup().add(relatedItem);
-        TypeOfResourceDefinition typeOfResource = new TypeOfResourceDefinition();
-        typeOfResource.setValue("text");
-        mods.getModsGroup().add(typeOfResource);
+    private void trackOriginInformation(List<String> originItems, Field field, String value) {
+        if (field.equals(StandardField.YEAR)) {
+            originItems.add(value);
+        } else if (field.equals(new UnknownField("created"))) {
+            originItems.add(value);
+        } else if (field.equals(StandardField.MODIFICATIONDATE)) {
+            originItems.add(value);
+        } else if (field.equals(StandardField.CREATIONDATE)) {
+            originItems.add(value);
+        } else if (StandardField.PUBLISHER == field) {
+            originItems.add(value);
+        } else if (field.equals(new UnknownField("issuance"))) {
+            originItems.add(value);
+        } else if (field.equals(StandardField.ADDRESS)) {
+            originItems.add(value);
+        } else if (field.equals(StandardField.EDITION)) {
+            originItems.add(value);
+        }
+    }
+
+    private void addPart(List<String> part, String value) {
+        part.add(value);
     }
 
-    private void addGenre(ModsDefinition mods, EntryType entryType) {
-        GenreDefinition genre = new GenreDefinition();
-        genre.setValue(entryType.getName());
-        mods.getModsGroup().add(genre);
+    private void addGenre(XMLStreamWriter writer, EntryType entryType) throws XMLStreamException {
+        writer.writeStartElement("mods", "genre", MODS_NAMESPACE_URI);
+        writer.writeCharacters(entryType.getName());
+        writer.writeEndElement();
     }
 
-    private void addAbstract(ModsDefinition mods, String value) {
-        AbstractDefinition abstractDefinition = new AbstractDefinition();
-        abstractDefinition.setValue(value);
-        mods.getModsGroup().add(abstractDefinition);
+    private void addAbstract(XMLStreamWriter writer, String value) throws XMLStreamException {
+        writer.writeStartElement("mods", "abstract", MODS_NAMESPACE_URI);
+        writer.writeCharacters(value);
+        writer.writeEndElement(); // end abstract
     }
 
-    private void addTitle(ModsDefinition mods, String value) {
-        TitleInfoDefinition titleInfo = new TitleInfoDefinition();
-        StringPlusLanguage title = new StringPlusLanguage();
-        title.setValue(value);
-        JAXBElement<StringPlusLanguage> element = new JAXBElement<>(new QName(MODS_NAMESPACE_URI, "title"),
-                StringPlusLanguage.class, title);
-        titleInfo.getTitleOrSubTitleOrPartNumber().add(element);
-        mods.getModsGroup().add(titleInfo);
+    private void addTitle(XMLStreamWriter writer, String value) throws XMLStreamException {
+        writer.writeStartElement("mods", "titleInfo", MODS_NAMESPACE_URI);
+        writer.writeStartElement("mods", "title", MODS_NAMESPACE_URI);
+        writer.writeCharacters(value);
+        writer.writeEndElement(); // end title
+        writer.writeEndElement(); // end titleInfo
     }
 
-    private void addAffiliation(ModsDefinition mods, String value) {
-        NameDefinition nameDefinition = new NameDefinition();
-        StringPlusLanguage affiliation = new StringPlusLanguage();
-        affiliation.setValue(value);
-        JAXBElement<StringPlusLanguage> element = new JAXBElement<>(new QName(MODS_NAMESPACE_URI, "affiliation"),
-                StringPlusLanguage.class, affiliation);
-        nameDefinition.getAffiliationOrRoleOrDescription().add(element);
-        mods.getModsGroup().add(nameDefinition);
+    private void addAffiliation(XMLStreamWriter writer, String value) throws XMLStreamException {
+        writer.writeStartElement("mods", "name", MODS_NAMESPACE_URI);
+        writer.writeStartElement("mods", "affiliation", MODS_NAMESPACE_URI);
+        writer.writeCharacters(value);
+        writer.writeEndElement(); // end affiliation
+        writer.writeEndElement(); // end name
     }
 
-    private void addLocation(ModsDefinition mods, String value) {
-        LocationDefinition locationDefinition = new LocationDefinition();
-        // There can be more than one location
+    private void addLocation(XMLStreamWriter writer, String value) throws XMLStreamException {
+        writer.writeStartElement("mods", "location", MODS_NAMESPACE_URI);
         String[] locations = value.split(", ");
         for (String location : locations) {
-            PhysicalLocationDefinition physicalLocation = new PhysicalLocationDefinition();
-            physicalLocation.setValue(location);
-            locationDefinition.getPhysicalLocation().add(physicalLocation);
+            writer.writeStartElement("mods", "physicalLocation", MODS_NAMESPACE_URI);
+            writer.writeCharacters(location);
+            writer.writeEndElement();
         }
-        mods.getModsGroup().add(locationDefinition);
+        writer.writeEndElement();
     }
 
-    private void addNote(ModsDefinition mods, String value) {
+    private void addNote(XMLStreamWriter writer, String value) throws XMLStreamException {
         String[] notes = value.split(", ");
         for (String note : notes) {
-            NoteDefinition noteDefinition = new NoteDefinition();
-            noteDefinition.setValue(note);
-            mods.getModsGroup().add(noteDefinition);
+            writer.writeStartElement("mods", "note", MODS_NAMESPACE_URI);
+            writer.writeCharacters(note);
+            writer.writeEndElement();
         }
     }
 
-    private void addUrl(ModsDefinition mods, String value) {
+    private void addUrl(XMLStreamWriter writer, String value) throws XMLStreamException {
         String[] urls = value.split(", ");
-        LocationDefinition location = new LocationDefinition();
+        writer.writeStartElement("mods", "location", MODS_NAMESPACE_URI);
         for (String url : urls) {
-            UrlDefinition urlDefinition = new UrlDefinition();
-            urlDefinition.setValue(url);
-            location.getUrl().add(urlDefinition);
-            mods.getModsGroup().add(location);
+            writer.writeStartElement("mods", "url", MODS_NAMESPACE_URI);
+            writer.writeCharacters(url);
+            writer.writeEndElement();
         }
+        writer.writeEndElement();
     }
 
-    private void addJournal(String value, RelatedItemDefinition relatedItem) {
-        TitleInfoDefinition titleInfo = new TitleInfoDefinition();
-        StringPlusLanguage title = new StringPlusLanguage();
-        title.setValue(value);
-        JAXBElement<StringPlusLanguage> element = new JAXBElement<>(new QName(MODS_NAMESPACE_URI, "title"),
-                StringPlusLanguage.class, title);
-        titleInfo.getTitleOrSubTitleOrPartNumber().add(element);
-        relatedItem.getModsGroup().add(titleInfo);
+    private void addJournal(XMLStreamWriter writer, String value) throws XMLStreamException { // this may also need to be called within second for loop?
+        // Start TitleInfoDefinition
+        writer.writeStartElement("mods", "titleInfo", MODS_NAMESPACE_URI);
+
+        // Write title element
+        writer.writeStartElement("mods", "title", MODS_NAMESPACE_URI);
+        writer.writeCharacters(value);
+        writer.writeEndElement(); // End title element
+
+        // End TitleInfoDefinition
+        writer.writeEndElement(); // End titleInfo element
     }
 
-    private void addLanguage(ModsDefinition mods, String value) {
-        LanguageDefinition language = new LanguageDefinition();
-        LanguageTermDefinition languageTerm = new LanguageTermDefinition();
-        languageTerm.setValue(value);
-        language.getLanguageTerm().add(languageTerm);
-        mods.getModsGroup().add(language);
+    private void addLanguage(XMLStreamWriter writer, String value) throws XMLStreamException {
+        writer.writeStartElement("mods", "language", MODS_NAMESPACE_URI);
+        writer.writeStartElement("mods", "languageTerm", MODS_NAMESPACE_URI);
+        writer.writeCharacters(value);
+        writer.writeEndElement(); // end languageTerm
+        writer.writeEndElement(); // end language
     }
 
-    private void addPages(PartDefinition partDefinition, String value) {
+    private void addPages(XMLStreamWriter writer, String value) throws XMLStreamException {
         if (value.contains(DOUBLE_MINUS)) {
-            addStartAndEndPage(value, partDefinition, DOUBLE_MINUS);
+            addStartAndEndPage(writer, value, DOUBLE_MINUS);
         } else if (value.contains(MINUS)) {
-            addStartAndEndPage(value, partDefinition, MINUS);
+            addStartAndEndPage(writer, value, MINUS);
         } else {
             BigInteger total = new BigInteger(value);
-            ExtentDefinition extent = new ExtentDefinition();
-            extent.setTotal(total);
-            partDefinition.getDetailOrExtentOrDate().add(extent);
+            writer.writeStartElement("mods", "extent", MODS_NAMESPACE_URI);
+            writer.writeStartElement("mods", "total", MODS_NAMESPACE_URI);
+            writer.writeCharacters(total.toString());
+            writer.writeEndElement();
+            writer.writeEndElement();
         }
     }
 
-    private void addKeyWords(ModsDefinition mods, String value) {
+    private void addKeyWords(XMLStreamWriter writer, String value) throws XMLStreamException {
         String[] keywords = value.split(", ");
 
         for (String keyword : keywords) {
-            SubjectDefinition subject = new SubjectDefinition();
-            StringPlusLanguagePlusAuthority topic = new StringPlusLanguagePlusAuthority();
-            topic.setValue(keyword);
-            JAXBElement<?> element = new JAXBElement<>(new QName(MODS_NAMESPACE_URI, "topic"),
-                    StringPlusLanguagePlusAuthority.class, topic);
-            subject.getTopicOrGeographicOrTemporal().add(element);
-            mods.getModsGroup().add(subject);
+            writer.writeStartElement("mods", "subject", MODS_NAMESPACE_URI);
+            writer.writeStartElement("mods", "topic", MODS_NAMESPACE_URI);
+            writer.writeCharacters(keyword);
+            writer.writeEndElement();
+            writer.writeEndElement();
         }
     }
 
-    private void handleAuthors(ModsDefinition mods, String value) {
+    private void handleAuthors(XMLStreamWriter writer, String value) throws XMLStreamException {
         String[] authors = value.split("and");
         for (String author : authors) {
-            NameDefinition name = new NameDefinition();
-            name.setAtType("personal");
-            NamePartDefinition namePart = new NamePartDefinition();
+            writer.writeStartElement("mods", "name", MODS_NAMESPACE_URI);
+            writer.writeAttribute("type", "personal");
+
             if (author.contains(",")) {
                 // if author contains ","  then this indicates that the author has a forename and family name
                 int commaIndex = author.indexOf(',');
                 String familyName = author.substring(0, commaIndex);
-                namePart.setAtType("family");
-                namePart.setValue(familyName);
-
-                JAXBElement<NamePartDefinition> element = new JAXBElement<>(new QName(MODS_NAMESPACE_URI, "namePart"),
-                        NamePartDefinition.class, namePart);
-                name.getNamePartOrDisplayFormOrAffiliation().add(element);
+                writer.writeStartElement("mods", "namePart", MODS_NAMESPACE_URI);
+                writer.writeAttribute("type", "family");
+                writer.writeCharacters(familyName);
+                writer.writeEndElement();
 
                 // now take care of the forenames
                 String forename = author.substring(commaIndex + 1);
                 String[] forenames = forename.split(" ");
                 for (String given : forenames) {
                     if (!given.isEmpty()) {
-                        NamePartDefinition namePartDefinition = new NamePartDefinition();
-                        namePartDefinition.setAtType("given");
-                        namePartDefinition.setValue(given);
-                        element = new JAXBElement<>(new QName(MODS_NAMESPACE_URI, "namePart"), NamePartDefinition.class,
-                                namePartDefinition);
-                        name.getNamePartOrDisplayFormOrAffiliation().add(element);
+                        writer.writeStartElement("mods", "namePart", MODS_NAMESPACE_URI);
+                        writer.writeAttribute("type", "given");
+                        writer.writeCharacters(given);
+                        writer.writeEndElement();
                     }
                 }
-                mods.getModsGroup().add(name);
+                writer.writeEndElement();
             } else {
                 // no "," indicates that there should only be a family name
-                namePart.setAtType("family");
-                namePart.setValue(author);
-                JAXBElement<NamePartDefinition> element = new JAXBElement<>(new QName(MODS_NAMESPACE_URI, "namePart"),
-                        NamePartDefinition.class, namePart);
-                name.getNamePartOrDisplayFormOrAffiliation().add(element);
-                mods.getModsGroup().add(name);
+                writer.writeStartElement("mods", "namePart", MODS_NAMESPACE_URI);
+                writer.writeAttribute("type", "family");
+                writer.writeCharacters(author);
+                writer.writeEndElement();
+                writer.writeEndElement();
             }
         }
     }
 
-    private void addIdentifier(Field field, String value, ModsDefinition mods) {
+    private void addIdentifier(XMLStreamWriter writer, Field field, String value) throws XMLStreamException {
+
         if (new UnknownField("citekey").equals(field)) {
-            mods.setID(value);
+            writer.writeStartElement("mods", "mods", MODS_NAMESPACE_URI);
+            writer.writeAttribute("ID", value);
         }
-        IdentifierDefinition identifier = new IdentifierDefinition();
-        identifier.setType(field.getName());
-        identifier.setValue(value);
-        mods.getModsGroup().add(identifier);
+        writer.writeStartElement("mods", "identifier", MODS_NAMESPACE_URI);
+        writer.writeAttribute("type", field.getName());
+        writer.writeCharacters(value);
+        writer.writeEndElement(); // end identifier
     }
 
-    private void addStartAndEndPage(String value, PartDefinition partDefinition, String minus) {
+    private void addStartAndEndPage(XMLStreamWriter writer, String value, String minus) throws XMLStreamException {
         int minusIndex = value.indexOf(minus);
         String startPage = value.substring(0, minusIndex);
         String endPage = "";
@@ -346,78 +411,65 @@ private void addStartAndEndPage(String value, PartDefinition partDefinition, Str
             endPage = value.substring(minusIndex + 2);
         }
 
-        StringPlusLanguage start = new StringPlusLanguage();
-        start.setValue(startPage);
-        StringPlusLanguage end = new StringPlusLanguage();
-        end.setValue(endPage);
-        ExtentDefinition extent = new ExtentDefinition();
-        extent.setStart(start);
-        extent.setEnd(end);
-
-        partDefinition.getDetailOrExtentOrDate().add(extent);
+        writer.writeStartElement("mods", "extent", MODS_NAMESPACE_URI);
+        writer.writeStartElement("mods", "start", MODS_NAMESPACE_URI);
+        writer.writeCharacters(startPage);
+        writer.writeEndElement();
+        writer.writeStartElement("mods", "end", MODS_NAMESPACE_URI);
+        writer.writeCharacters(endPage);
+        writer.writeEndElement();
+        writer.writeEndElement();
     }
 
-    private void addDetail(Field field, String value, PartDefinition partDefinition) {
-        DetailDefinition detail = new DetailDefinition();
-        StringPlusLanguage detailType = new StringPlusLanguage();
-        detailType.setValue(value);
-        detail.setType(field.getName());
-        JAXBElement<StringPlusLanguage> element = new JAXBElement<>(new QName(MODS_NAMESPACE_URI, "number"),
-                StringPlusLanguage.class, detailType);
-        detail.getNumberOrCaptionOrTitle().add(element);
-        partDefinition.getDetailOrExtentOrDate().add(detail);
+    private void addDetail(XMLStreamWriter writer, Field field, String value) throws XMLStreamException {
+        writer.writeStartElement("mods", "detail", MODS_NAMESPACE_URI);
+        writer.writeAttribute("type", field.getName());
+        writer.writeStartElement("mods", "number", MODS_NAMESPACE_URI);
+        writer.writeCharacters(value);
+        writer.writeEndElement(); // end number
+        writer.writeEndElement(); // end detail
     }
 
-    private void addOriginInformation(Field field, String value, OriginInfoDefinition originInfo) {
+    private void addOriginInformation(XMLStreamWriter writer, Field field, String value) throws XMLStreamException {
+
         if (field.equals(StandardField.YEAR)) {
-            addDate("dateIssued", value, originInfo);
+            addDate(writer, "dateIssued", value);
         } else if (field.equals(new UnknownField("created"))) {
-            addDate("dateCreated", value, originInfo);
+            addDate(writer, "dateCreated", value);
         } else if (field.equals(StandardField.MODIFICATIONDATE)) {
-            addDate("dateModified", value, originInfo);
+            addDate(writer, "dateModified", value);
         } else if (field.equals(StandardField.CREATIONDATE)) {
-            addDate("dateCaptured", value, originInfo);
-        } else if (StandardField.PUBLISHER.equals(field)) {
-            StringPlusLanguagePlusSupplied publisher = new StringPlusLanguagePlusSupplied();
-            publisher.setValue(value);
-            JAXBElement<StringPlusLanguagePlusSupplied> element = new JAXBElement<>(
-                    new QName(MODS_NAMESPACE_URI, "publisher"), StringPlusLanguagePlusSupplied.class, publisher);
-            originInfo.getPlaceOrPublisherOrDateIssued().add(element);
+            addDate(writer, "dateCaptured", value);
+        } else if (StandardField.PUBLISHER == field) {
+            writer.writeStartElement("mods", "publisher", MODS_NAMESPACE_URI);
+            writer.writeAttribute("xsi", MODS_NAMESPACE_URI, "type", "mods:stringPlusLanguagePlusSupplied");
+            writer.writeCharacters(value);
+            writer.writeEndElement();
         } else if (field.equals(new UnknownField("issuance"))) {
-            IssuanceDefinition issuance = IssuanceDefinition.fromValue(value);
-            JAXBElement<IssuanceDefinition> element = new JAXBElement<>(new QName(MODS_NAMESPACE_URI, "issuance"),
-                    IssuanceDefinition.class, issuance);
-            originInfo.getPlaceOrPublisherOrDateIssued().add(element);
+            writer.writeStartElement("mods", "issuance", MODS_NAMESPACE_URI);
+            writer.writeCharacters(value);
+            writer.writeEndElement();
         } else if (field.equals(StandardField.ADDRESS)) {
-            PlaceDefinition placeDefinition = new PlaceDefinition();
-            // There can be more than one place, so we split to get all places and add them
+            writer.writeStartElement("mods", "place", MODS_NAMESPACE_URI);
             String[] places = value.split(", ");
             for (String place : places) {
-                PlaceTermDefinition placeTerm = new PlaceTermDefinition();
-                // There's no possibility to see from a bib entry whether it is code or text, but since it is in the bib entry
-                // we assume that it is text
-                placeTerm.setType(CodeOrText.TEXT);
-                placeTerm.setValue(place);
-                placeDefinition.getPlaceTerm().add(placeTerm);
+                writer.writeStartElement("mods", "placeTerm", MODS_NAMESPACE_URI);
+                writer.writeAttribute("type", "text");
+                writer.writeCharacters(place);
+                writer.writeEndElement();
             }
-            JAXBElement<PlaceDefinition> element = new JAXBElement<>(new QName(MODS_NAMESPACE_URI, "place"),
-                    PlaceDefinition.class, placeDefinition);
-            originInfo.getPlaceOrPublisherOrDateIssued().add(element);
+            writer.writeEndElement();
         } else if (field.equals(StandardField.EDITION)) {
-            StringPlusLanguagePlusSupplied edition = new StringPlusLanguagePlusSupplied();
-            edition.setValue(value);
-            JAXBElement<StringPlusLanguagePlusSupplied> element = new JAXBElement<>(
-                    new QName(MODS_NAMESPACE_URI, "edition"), StringPlusLanguagePlusSupplied.class, edition);
-            originInfo.getPlaceOrPublisherOrDateIssued().add(element);
+            writer.writeStartElement("mods", "edition", MODS_NAMESPACE_URI);
+            writer.writeCharacters(value);
+            writer.writeEndElement();
         }
     }
 
-    private void addDate(String dateName, String value, OriginInfoDefinition originInfo) {
-        DateDefinition dateIssued = new DateDefinition();
-        dateIssued.setKeyDate("yes");
-        dateIssued.setValue(value);
-        JAXBElement<DateDefinition> element = new JAXBElement<>(new QName(MODS_NAMESPACE_URI, dateName),
-                DateDefinition.class, dateIssued);
-        originInfo.getPlaceOrPublisherOrDateIssued().add(element);
+    private void addDate(XMLStreamWriter writer, String dateName, String value) throws XMLStreamException {
+        writer.writeStartElement("mods", dateName, MODS_NAMESPACE_URI);
+        writer.writeAttribute("keyDate", "yes");
+        writer.writeCharacters(value);
+        writer.writeEndElement(); // close date element
     }
 }
diff --git a/src/main/java/org/jabref/logic/exporter/SaveConfiguration.java b/src/main/java/org/jabref/logic/exporter/SaveConfiguration.java
new file mode 100644
index 00000000000..358659113e5
--- /dev/null
+++ b/src/main/java/org/jabref/logic/exporter/SaveConfiguration.java
@@ -0,0 +1,73 @@
+package org.jabref.logic.exporter;
+
+import org.jabref.gui.autosaveandbackup.BackupManager;
+import org.jabref.model.metadata.SaveOrder;
+
+public class SaveConfiguration {
+
+    // Encoding written at the top of the .bib file.
+    public static final String ENCODING_PREFIX = "Encoding: ";
+
+    private boolean reformatFile;
+    private SaveOrder saveOrder;
+    private boolean makeBackup;
+    private BibDatabaseWriter.SaveType saveType;
+
+    public SaveConfiguration(SaveOrder saveOrder,
+                             Boolean makeBackup,
+                             BibDatabaseWriter.SaveType saveType,
+                             Boolean reformatFile) {
+        this.saveOrder = saveOrder;
+        this.makeBackup = makeBackup;
+        this.saveType = saveType;
+        this.reformatFile = reformatFile;
+    }
+
+    public SaveConfiguration() {
+        this(SaveOrder.getDefaultSaveOrder(),
+                false,
+                BibDatabaseWriter.SaveType.WITH_JABREF_META_DATA,
+                false);
+    }
+
+    public SaveOrder getSaveOrder() {
+        return saveOrder;
+    }
+
+    public SaveConfiguration withSaveOrder(SaveOrder newSaveOrder) {
+        this.saveOrder = newSaveOrder;
+        return this;
+    }
+
+    public boolean shouldMakeBackup() {
+        return makeBackup;
+    }
+
+    /**
+     * Required by {@link BackupManager}. Should not be used in other settings
+     *
+     * @param newMakeBackup whether a backup (.bak file) should be made
+     */
+    public SaveConfiguration withMakeBackup(Boolean newMakeBackup) {
+        this.makeBackup = newMakeBackup;
+        return this;
+    }
+
+    public BibDatabaseWriter.SaveType getSaveType() {
+        return saveType;
+    }
+
+    public SaveConfiguration withSaveType(BibDatabaseWriter.SaveType newSaveType) {
+        this.saveType = newSaveType;
+        return this;
+    }
+
+    public boolean shouldReformatFile() {
+        return reformatFile;
+    }
+
+    public SaveConfiguration withReformatOnSave(boolean newReformat) {
+        this.reformatFile = newReformat;
+        return this;
+    }
+}
diff --git a/src/main/java/org/jabref/logic/exporter/SavePreferences.java b/src/main/java/org/jabref/logic/exporter/SavePreferences.java
deleted file mode 100644
index a566c0c3449..00000000000
--- a/src/main/java/org/jabref/logic/exporter/SavePreferences.java
+++ /dev/null
@@ -1,121 +0,0 @@
-package org.jabref.logic.exporter;
-
-import org.jabref.logic.bibtex.FieldWriterPreferences;
-import org.jabref.logic.citationkeypattern.CitationKeyPatternPreferences;
-import org.jabref.model.metadata.SaveOrderConfig;
-
-public class SavePreferences {
-
-    public enum DatabaseSaveType { ALL, PLAIN_BIBTEX }
-
-    // Encoding written at the top of the .bib file.
-    public static final String ENCODING_PREFIX = "Encoding: ";
-
-    private final boolean reformatFile;
-    private boolean saveInOriginalOrder;
-    private SaveOrderConfig saveOrder;
-    private boolean makeBackup;
-    private DatabaseSaveType saveType;
-    private boolean takeMetadataSaveOrderInAccount;
-    private final FieldWriterPreferences fieldWriterPreferences;
-    private final CitationKeyPatternPreferences citationKeyPatternPreferences;
-
-    private SavePreferences(Boolean saveInOriginalOrder,
-                            SaveOrderConfig saveOrder,
-                            Boolean makeBackup,
-                            DatabaseSaveType saveType,
-                            Boolean takeMetadataSaveOrderInAccount,
-                            Boolean reformatFile,
-                            FieldWriterPreferences fieldWriterPreferences,
-                            CitationKeyPatternPreferences citationKeyPatternPreferences) {
-
-        this.saveInOriginalOrder = saveInOriginalOrder;
-        this.saveOrder = saveOrder;
-        this.makeBackup = makeBackup;
-        this.saveType = saveType;
-        this.takeMetadataSaveOrderInAccount = takeMetadataSaveOrderInAccount;
-        this.reformatFile = reformatFile;
-        this.fieldWriterPreferences = fieldWriterPreferences;
-        this.citationKeyPatternPreferences = citationKeyPatternPreferences;
-    }
-
-    public SavePreferences(Boolean saveInOriginalOrder,
-                           SaveOrderConfig saveOrder,
-                           DatabaseSaveType saveType,
-                           Boolean takeMetadataSaveOrderInAccount,
-                           Boolean reformatFile,
-                           FieldWriterPreferences fieldWriterPreferences,
-                           CitationKeyPatternPreferences citationKeyPatternPreferences) {
-
-        this(saveInOriginalOrder,
-                saveOrder,
-                false,
-                saveType,
-                takeMetadataSaveOrderInAccount,
-                reformatFile,
-                fieldWriterPreferences,
-                citationKeyPatternPreferences);
-    }
-
-    public boolean takeMetadataSaveOrderInAccount() {
-        return takeMetadataSaveOrderInAccount;
-    }
-
-    public SavePreferences withTakeMetadataSaveOrderInAccount(boolean newTakeMetadataSaveOrderInAccount) {
-        this.takeMetadataSaveOrderInAccount = newTakeMetadataSaveOrderInAccount;
-        return this;
-    }
-
-    public SaveOrderConfig getSaveOrder() {
-        return saveOrder;
-    }
-
-    public SavePreferences withSaveOrder(SaveOrderConfig newSaveOrder) {
-        this.saveOrder = newSaveOrder;
-        return this;
-    }
-
-    public boolean shouldSaveInOriginalOrder() {
-        return saveInOriginalOrder;
-    }
-
-    public SavePreferences withSaveInOriginalOrder(Boolean newSaveInOriginalOrder) {
-        this.saveInOriginalOrder = newSaveInOriginalOrder;
-        return this;
-    }
-
-    public boolean shouldMakeBackup() {
-        return makeBackup;
-    }
-
-    /**
-     * Required by {@link org.jabref.logic.autosaveandbackup.BackupManager}. Should not be used in other settings
-     *
-     * @param newMakeBackup whether a backup (.bak file) should be made
-     */
-    public SavePreferences withMakeBackup(Boolean newMakeBackup) {
-        this.makeBackup = newMakeBackup;
-        return this;
-    }
-
-    public DatabaseSaveType getSaveType() {
-        return saveType;
-    }
-
-    public SavePreferences withSaveType(DatabaseSaveType newSaveType) {
-        this.saveType = newSaveType;
-        return this;
-    }
-
-    public boolean shouldReformatFile() {
-        return reformatFile;
-    }
-
-    public FieldWriterPreferences getFieldWriterPreferences() {
-        return fieldWriterPreferences;
-    }
-
-    public CitationKeyPatternPreferences getCitationKeyPatternPreferences() {
-        return citationKeyPatternPreferences;
-    }
-}
diff --git a/src/main/java/org/jabref/logic/exporter/SelfContainedSaveConfiguration.java b/src/main/java/org/jabref/logic/exporter/SelfContainedSaveConfiguration.java
new file mode 100644
index 00000000000..1e5cb241a1e
--- /dev/null
+++ b/src/main/java/org/jabref/logic/exporter/SelfContainedSaveConfiguration.java
@@ -0,0 +1,25 @@
+package org.jabref.logic.exporter;
+
+import org.jabref.model.metadata.SaveOrder;
+import org.jabref.model.metadata.SelfContainedSaveOrder;
+
+/**
+ * This is a {@link SaveOrder} where the contained saveConfiguration is a {@link org.jabref.model.metadata.SelfContainedSaveOrder}
+ */
+public class SelfContainedSaveConfiguration extends SaveConfiguration {
+    public SelfContainedSaveConfiguration() {
+        super();
+    }
+
+    public SelfContainedSaveConfiguration(
+            SelfContainedSaveOrder saveOrder,
+            Boolean makeBackup,
+            BibDatabaseWriter.SaveType saveType,
+            Boolean reformatFile) {
+        super(saveOrder, makeBackup, saveType, reformatFile);
+    }
+
+    public SelfContainedSaveOrder getSelfContainedSaveOrder() {
+        return (SelfContainedSaveOrder) getSaveOrder();
+    }
+}
diff --git a/src/main/java/org/jabref/logic/exporter/TemplateExporter.java b/src/main/java/org/jabref/logic/exporter/TemplateExporter.java
index 44c751661cc..c2e0e7e6e1c 100644
--- a/src/main/java/org/jabref/logic/exporter/TemplateExporter.java
+++ b/src/main/java/org/jabref/logic/exporter/TemplateExporter.java
@@ -16,15 +16,20 @@
 import java.util.Map;
 import java.util.Objects;
 
+import org.jabref.logic.journals.JournalAbbreviationLoader;
+import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.layout.Layout;
 import org.jabref.logic.layout.LayoutFormatterPreferences;
 import org.jabref.logic.layout.LayoutHelper;
+import org.jabref.logic.layout.format.Number;
 import org.jabref.logic.util.FileType;
 import org.jabref.logic.util.OS;
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.types.EntryType;
+import org.jabref.model.metadata.SaveOrder;
+import org.jabref.model.metadata.SelfContainedSaveOrder;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -46,7 +51,7 @@ public class TemplateExporter extends Exporter {
     private final String lfFileName;
     private final String directory;
     private final LayoutFormatterPreferences layoutPreferences;
-    private final SavePreferences savePreferences;
+    private final SelfContainedSaveOrder saveOrder;
     private boolean customExport;
     private BlankLineBehaviour blankLineBehaviour;
 
@@ -59,8 +64,12 @@ public class TemplateExporter extends Exporter {
      * @param directory   Directory in which to find the layout file.
      * @param extension   Should contain the . (for instance .txt).
      */
-    public TemplateExporter(String displayName, String consoleName, String lfFileName, String directory, FileType extension) {
-        this(displayName, consoleName, lfFileName, directory, extension, null, null);
+    public TemplateExporter(String displayName,
+                            String consoleName,
+                            String lfFileName,
+                            String directory,
+                            FileType extension) {
+        this(displayName, consoleName, lfFileName, directory, extension, null, null, null);
     }
 
     /**
@@ -69,12 +78,19 @@ public TemplateExporter(String displayName, String consoleName, String lfFileNam
      * @param name              to display to the user and to call this format in the console.
      * @param lfFileName        Name of the main layout file.
      * @param extension         May or may not contain the . (for instance .txt).
-     * @param layoutPreferences Preferences for the layout
-     * @param savePreferences   Preferences for saving
      */
-    public TemplateExporter(String name, String lfFileName, String extension, LayoutFormatterPreferences layoutPreferences,
-                            SavePreferences savePreferences) {
-        this(name, name, lfFileName, null, StandardFileType.fromExtensions(extension), layoutPreferences, savePreferences);
+    public TemplateExporter(String name,
+                            String lfFileName,
+                            String extension,
+                            LayoutFormatterPreferences layoutPreferences,
+                            SelfContainedSaveOrder saveOrder) {
+        this(name,
+                name,
+                lfFileName,
+                null,
+                StandardFileType.fromExtensions(extension),
+                layoutPreferences,
+                saveOrder);
     }
 
     /**
@@ -85,20 +101,15 @@ public TemplateExporter(String name, String lfFileName, String extension, Layout
      * @param lfFileName        Name of the main layout file.
      * @param directory         Directory in which to find the layout file.
      * @param extension         Should contain the . (for instance .txt).
-     * @param layoutPreferences Preferences for layout
-     * @param savePreferences   Preferences for saving
      */
-    public TemplateExporter(String displayName, String consoleName, String lfFileName, String directory, FileType extension,
-                            LayoutFormatterPreferences layoutPreferences, SavePreferences savePreferences) {
-        super(consoleName, displayName, extension);
-        if (Objects.requireNonNull(lfFileName).endsWith(LAYOUT_EXTENSION)) {
-            this.lfFileName = lfFileName.substring(0, lfFileName.length() - LAYOUT_EXTENSION.length());
-        } else {
-            this.lfFileName = lfFileName;
-        }
-        this.directory = directory;
-        this.layoutPreferences = layoutPreferences;
-        this.savePreferences = savePreferences;
+    public TemplateExporter(String displayName,
+                            String consoleName,
+                            String lfFileName,
+                            String directory,
+                            FileType extension,
+                            LayoutFormatterPreferences layoutPreferences,
+                            SelfContainedSaveOrder saveOrder) {
+        this(displayName, consoleName, lfFileName, directory, extension, layoutPreferences, saveOrder, null);
     }
 
     /**
@@ -110,11 +121,15 @@ public TemplateExporter(String displayName, String consoleName, String lfFileNam
      * @param directory         Directory in which to find the layout file.
      * @param extension         Should contain the . (for instance .txt).
      * @param layoutPreferences Preferences for layout
-     * @param savePreferences   Preferences for saving
      * @param blankLineBehaviour how to behave regarding blank lines.
      */
-    public TemplateExporter(String displayName, String consoleName, String lfFileName, String directory, FileType extension,
-                            LayoutFormatterPreferences layoutPreferences, SavePreferences savePreferences,
+    public TemplateExporter(String displayName,
+                            String consoleName,
+                            String lfFileName,
+                            String directory,
+                            FileType extension,
+                            LayoutFormatterPreferences layoutPreferences,
+                            SelfContainedSaveOrder saveOrder,
                             BlankLineBehaviour blankLineBehaviour) {
         super(consoleName, displayName, extension);
         if (Objects.requireNonNull(lfFileName).endsWith(LAYOUT_EXTENSION)) {
@@ -124,7 +139,7 @@ public TemplateExporter(String displayName, String consoleName, String lfFileNam
         }
         this.directory = directory;
         this.layoutPreferences = layoutPreferences;
-        this.savePreferences = savePreferences;
+        this.saveOrder = saveOrder == null ? SaveOrder.getDefaultSaveOrder() : saveOrder;
         this.blankLineBehaviour = blankLineBehaviour;
     }
 
@@ -178,14 +193,15 @@ private Reader getReader(String filename) throws IOException {
 
     @Override
     public void export(BibDatabaseContext databaseContext, Path file, List<BibEntry> entries) throws Exception {
-        export(databaseContext, file, entries, Collections.emptyList());
+        export(databaseContext, file, entries, Collections.emptyList(), JournalAbbreviationLoader.loadBuiltInRepository());
     }
 
     @Override
     public void export(final BibDatabaseContext databaseContext,
                        final Path file,
                        List<BibEntry> entries,
-                       List<Path> fileDirForDatabase) throws Exception {
+                       List<Path> fileDirForDatabase,
+                       JournalAbbreviationRepository abbreviationRepository) throws Exception {
         Objects.requireNonNull(databaseContext);
         Objects.requireNonNull(entries);
 
@@ -206,7 +222,7 @@ public void export(final BibDatabaseContext databaseContext,
 
             // Print header
             try (Reader reader = getReader(lfFileName + BEGIN_INFIX + LAYOUT_EXTENSION)) {
-                LayoutHelper layoutHelper = new LayoutHelper(reader, fileDirForDatabase, layoutPreferences);
+                LayoutHelper layoutHelper = new LayoutHelper(reader, fileDirForDatabase, layoutPreferences, abbreviationRepository);
                 beginLayout = layoutHelper.getLayoutFromText();
             } catch (IOException ex) {
                 // If an exception was cast, export filter doesn't have a begin
@@ -220,18 +236,15 @@ public void export(final BibDatabaseContext databaseContext,
 
             /*
              * Write database entries; entries will be sorted as they appear on the
-             * screen, or sorted by author, depending on Preferences. We also supply
-             * the Set entries - if we are to export only certain entries, it will
-             * be non-null, and be used to choose entries. Otherwise, it will be
-             * null, and be ignored.
+             * screen, or sorted by author, depending on Preferences.
              */
-            List<BibEntry> sorted = BibDatabaseWriter.getSortedEntries(databaseContext, entries, savePreferences);
+            List<BibEntry> sorted = BibDatabaseWriter.getSortedEntries(entries, saveOrder);
 
             // Load default layout
             Layout defLayout;
             LayoutHelper layoutHelper;
             try (Reader reader = getReader(lfFileName + LAYOUT_EXTENSION)) {
-                layoutHelper = new LayoutHelper(reader, fileDirForDatabase, layoutPreferences);
+                layoutHelper = new LayoutHelper(reader, fileDirForDatabase, layoutPreferences, abbreviationRepository);
                 defLayout = layoutHelper.getLayoutFromText();
             }
             if (defLayout != null) {
@@ -243,9 +256,9 @@ public void export(final BibDatabaseContext databaseContext,
             Map<EntryType, Layout> layouts = new HashMap<>();
             Layout layout;
 
-            ExporterFactory.entryNumber = 0;
+            Number.serialExportNumber = 0;
             for (BibEntry entry : sorted) {
-                ExporterFactory.entryNumber++; // Increment entry counter.
+                Number.serialExportNumber++; // Increment entry counter.
                 // Get the layout
                 EntryType type = entry.getType();
                 if (layouts.containsKey(type)) {
@@ -253,7 +266,7 @@ public void export(final BibDatabaseContext databaseContext,
                 } else {
                     try (Reader reader = getReader(lfFileName + '.' + type.getName() + LAYOUT_EXTENSION)) {
                         // We try to get a type-specific layout for this entry.
-                        layoutHelper = new LayoutHelper(reader, fileDirForDatabase, layoutPreferences);
+                        layoutHelper = new LayoutHelper(reader, fileDirForDatabase, layoutPreferences, abbreviationRepository);
                         layout = layoutHelper.getLayoutFromText();
                         layouts.put(type, layout);
                         if (layout != null) {
@@ -285,7 +298,7 @@ public void export(final BibDatabaseContext databaseContext,
             // Print footer
             Layout endLayout = null;
             try (Reader reader = getReader(lfFileName + END_INFIX + LAYOUT_EXTENSION)) {
-                layoutHelper = new LayoutHelper(reader, fileDirForDatabase, layoutPreferences);
+                layoutHelper = new LayoutHelper(reader, fileDirForDatabase, layoutPreferences, abbreviationRepository);
                 endLayout = layoutHelper.getLayoutFromText();
             } catch (IOException ex) {
                 // If an exception was thrown, export filter doesn't have an end
diff --git a/src/main/java/org/jabref/logic/formatter/Formatters.java b/src/main/java/org/jabref/logic/formatter/Formatters.java
index cc89cfcfb03..ad57b7f6202 100644
--- a/src/main/java/org/jabref/logic/formatter/Formatters.java
+++ b/src/main/java/org/jabref/logic/formatter/Formatters.java
@@ -35,6 +35,7 @@
 import org.jabref.logic.formatter.minifier.MinifyNameListFormatter;
 import org.jabref.logic.formatter.minifier.TruncateFormatter;
 import org.jabref.logic.layout.format.LatexToUnicodeFormatter;
+import org.jabref.logic.layout.format.ReplaceUnicodeLigaturesFormatter;
 
 public class Formatters {
     private static final Pattern TRUNCATE_PATTERN = Pattern.compile("\\Atruncate\\d+\\z");
@@ -78,6 +79,7 @@ public static List<Formatter> getOthers() {
                 new EscapeAmpersandsFormatter(),
                 new EscapeDollarSignFormatter(),
                 new ShortenDOIFormatter(),
+                new ReplaceUnicodeLigaturesFormatter(),
                 new UnprotectTermsFormatter()
         );
     }
diff --git a/src/main/java/org/jabref/logic/formatter/casechanger/UpperCaseFormatter.java b/src/main/java/org/jabref/logic/formatter/casechanger/UpperCaseFormatter.java
index d4abdc47103..b3c52eebe1c 100644
--- a/src/main/java/org/jabref/logic/formatter/casechanger/UpperCaseFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/casechanger/UpperCaseFormatter.java
@@ -30,7 +30,7 @@ public String format(String input) {
     @Override
     public String getDescription() {
         return Localization.lang(
-                "CHANGES ALL LETTER TO UPPER CASE.");
+                "CHANGES ALL LETTERS TO UPPER CASE.");
     }
 
     @Override
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 5c777df9a00..d6cee8237b0 100644
--- a/src/main/java/org/jabref/logic/formatter/casechanger/Word.java
+++ b/src/main/java/org/jabref/logic/formatter/casechanger/Word.java
@@ -128,11 +128,7 @@ private boolean isConjunction(char[] chars, int i) {
                 word += chars[i];
                 i++;
             }
-        if (CONJUNCTIONS.contains(word)) {
-            return false;
-        } else {
-            return true;
-        }
+        return !CONJUNCTIONS.contains(word);
     }
 
     public void stripConsonants() {
diff --git a/src/main/java/org/jabref/logic/importer/AuthorListParser.java b/src/main/java/org/jabref/logic/importer/AuthorListParser.java
index 41acfd2a503..08a4028c458 100644
--- a/src/main/java/org/jabref/logic/importer/AuthorListParser.java
+++ b/src/main/java/org/jabref/logic/importer/AuthorListParser.java
@@ -12,6 +12,7 @@
 
 import org.jabref.model.entry.Author;
 import org.jabref.model.entry.AuthorList;
+import org.jabref.model.strings.StringUtil;
 
 public class AuthorListParser {
 
@@ -96,6 +97,18 @@ private static StringBuilder buildWithAffix(Collection<Integer> indexArray, List
     public AuthorList parse(String listOfNames) {
         Objects.requireNonNull(listOfNames);
 
+        // Handling of "and others"
+        // Remove it from the list; it will be added at the very end of this method as special Author.OTHERS
+        listOfNames = listOfNames.trim();
+        final String andOthersSuffix = " and others";
+        final boolean andOthersPresent;
+        if (StringUtil.endsWithIgnoreCase(listOfNames, andOthersSuffix)) {
+            andOthersPresent = true;
+            listOfNames = StringUtil.removeStringAtTheEnd(listOfNames, " and others");
+        } else {
+            andOthersPresent = false;
+        }
+
         // Handle case names in order lastname, firstname and separated by ","
         // E.g., Ali Babar, M., Dingsøyr, T., Lago, P., van der Vliet, H.
         final boolean authorsContainAND = listOfNames.toUpperCase(Locale.ENGLISH).contains(" AND ");
@@ -116,7 +129,7 @@ public AuthorList parse(String listOfNames) {
             // Usually the getAsLastFirstNamesWithAnd method would separate them if pre- and lastname are separated with "and"
             // If not, we check if spaces separate pre- and lastname
             if (spaceInAllParts) {
-                listOfNames = listOfNames.replaceAll(",", " and");
+                listOfNames = listOfNames.replace(",", " and");
             } else {
                 // Looking for name affixes to avoid
                 // arrayNameList needs to reduce by the count off avoiding terms
@@ -150,6 +163,11 @@ public AuthorList parse(String listOfNames) {
         while (tokenStart < original.length()) {
             getAuthor().ifPresent(authors::add);
         }
+
+        if (andOthersPresent) {
+            authors.add(Author.OTHERS);
+        }
+
         return AuthorList.of(authors);
     }
 
diff --git a/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java b/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java
index e70a79b0683..83d939a3085 100644
--- a/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java
@@ -1,10 +1,10 @@
 package org.jabref.logic.importer;
 
 import java.util.Optional;
+import java.util.stream.Stream;
 
 import org.jabref.logic.importer.fetcher.ArXivFetcher;
 import org.jabref.logic.importer.fetcher.DoiFetcher;
-import org.jabref.logic.importer.fetcher.isbntobibtex.EbookDeIsbnFetcher;
 import org.jabref.logic.importer.fetcher.isbntobibtex.IsbnFetcher;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.identifier.ArXivIdentifier;
@@ -20,7 +20,7 @@ public CompositeIdFetcher(ImportFormatPreferences importFormatPreferences) {
     }
 
     public Optional<BibEntry> performSearchById(String identifier) throws FetcherException {
-        Optional<DOI> doi = DOI.parse(identifier);
+        Optional<DOI> doi = DOI.findInText(identifier);
         if (doi.isPresent()) {
             return new DoiFetcher(importFormatPreferences).performSearchById(doi.get().getNormalized());
         }
@@ -31,7 +31,7 @@ public Optional<BibEntry> performSearchById(String identifier) throws FetcherExc
         Optional<ISBN> isbn = ISBN.parse(identifier);
         if (isbn.isPresent()) {
             return new IsbnFetcher(importFormatPreferences)
-                    .addRetryFetcher(new EbookDeIsbnFetcher(importFormatPreferences))
+                    // .addRetryFetcher(new EbookDeIsbnFetcher(importFormatPreferences))
                     // .addRetryFetcher(new DoiToBibtexConverterComIsbnFetcher(importFormatPreferences))
                     .performSearchById(isbn.get().getNormalized());
         }
@@ -47,4 +47,12 @@ public Optional<BibEntry> performSearchById(String identifier) throws FetcherExc
     public String getName() {
         return "CompositeIdFetcher";
     }
+
+    public static boolean containsValidId(String identifier) {
+        Optional<DOI> doi = DOI.findInText(identifier);
+        Optional<ArXivIdentifier> arXivIdentifier = ArXivIdentifier.parse(identifier);
+        Optional<ISBN> isbn = ISBN.parse(identifier);
+
+        return Stream.of(doi, arXivIdentifier, isbn).anyMatch(Optional::isPresent);
+    }
 }
diff --git a/src/main/java/org/jabref/logic/importer/EntryBasedFetcher.java b/src/main/java/org/jabref/logic/importer/EntryBasedFetcher.java
index 781a0ed6288..2cc1544a93f 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 <emph>complete</emph> an existing entry with fetched information.
+ * Useful to <b>complete</b> 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
index 8de9d0d6114..ada85e02903 100644
--- a/src/main/java/org/jabref/logic/importer/FetcherClientException.java
+++ b/src/main/java/org/jabref/logic/importer/FetcherClientException.java
@@ -1,14 +1,20 @@
 package org.jabref.logic.importer;
 
 /**
- *  Should be thrown when you encounter a http status code error >= 400 and < 500
+ * Should be thrown when you encounter an HTTP status code error &gt;= 400 and &lt; 500.
  */
 public class FetcherClientException extends FetcherException {
+    private int statusCode;
 
     public FetcherClientException(String errorMessage, Throwable cause) {
         super(errorMessage, cause);
     }
 
+    public FetcherClientException(String errorMessage, Throwable cause, int statusCode) {
+        super(errorMessage, cause);
+        this.statusCode = statusCode;
+    }
+
     public FetcherClientException(String errorMessage) {
         super(errorMessage);
     }
@@ -16,4 +22,8 @@ public FetcherClientException(String errorMessage) {
     public FetcherClientException(String errorMessage, String localizedMessage, Throwable cause) {
         super(errorMessage, localizedMessage, cause);
     }
+
+    public int getStatusCode() {
+        return statusCode;
+    }
 }
diff --git a/src/main/java/org/jabref/logic/importer/FetcherServerException.java b/src/main/java/org/jabref/logic/importer/FetcherServerException.java
index 537d71ff530..7b657553b5f 100644
--- a/src/main/java/org/jabref/logic/importer/FetcherServerException.java
+++ b/src/main/java/org/jabref/logic/importer/FetcherServerException.java
@@ -3,11 +3,17 @@
  *  Should be thrown when you encounter a http status code error >= 500
  */
 public class FetcherServerException extends FetcherException {
+    private int statusCode;
 
     public FetcherServerException(String errorMessage, Throwable cause) {
         super(errorMessage, cause);
     }
 
+    public FetcherServerException(String errorMessage, Throwable cause, int statusCode) {
+        super(errorMessage, cause);
+        this.statusCode = statusCode;
+    }
+
     public FetcherServerException(String errorMessage) {
         super(errorMessage);
     }
@@ -15,4 +21,8 @@ public FetcherServerException(String errorMessage) {
     public FetcherServerException(String errorMessage, String localizedMessage, Throwable cause) {
         super(errorMessage, localizedMessage, cause);
     }
+
+    public int getStatusCode() {
+        return statusCode;
+    }
 }
diff --git a/src/main/java/org/jabref/logic/importer/ImportFormatPreferences.java b/src/main/java/org/jabref/logic/importer/ImportFormatPreferences.java
index 4c7df21f0da..62319455519 100644
--- a/src/main/java/org/jabref/logic/importer/ImportFormatPreferences.java
+++ b/src/main/java/org/jabref/logic/importer/ImportFormatPreferences.java
@@ -1,6 +1,6 @@
 package org.jabref.logic.importer;
 
-import org.jabref.logic.bibtex.FieldContentFormatterPreferences;
+import org.jabref.logic.bibtex.FieldPreferences;
 import org.jabref.logic.citationkeypattern.CitationKeyPatternPreferences;
 import org.jabref.logic.importer.fetcher.GrobidPreferences;
 import org.jabref.logic.preferences.DOIPreferences;
@@ -10,7 +10,7 @@
 public record ImportFormatPreferences(
         BibEntryPreferences bibEntryPreferences,
         CitationKeyPatternPreferences citationKeyPatternPreferences,
-        FieldContentFormatterPreferences fieldContentFormatterPreferences,
+        FieldPreferences fieldPreferences,
         XmpPreferences xmpPreferences,
         DOIPreferences doiPreferences,
         GrobidPreferences grobidPreferences) {
diff --git a/src/main/java/org/jabref/logic/importer/ImportFormatReader.java b/src/main/java/org/jabref/logic/importer/ImportFormatReader.java
index 3d17c035cc4..34e8553b3f1 100644
--- a/src/main/java/org/jabref/logic/importer/ImportFormatReader.java
+++ b/src/main/java/org/jabref/logic/importer/ImportFormatReader.java
@@ -35,7 +35,6 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabases;
 import org.jabref.model.entry.BibEntry;
-import org.jabref.model.strings.StringUtil;
 import org.jabref.model.util.FileUpdateMonitor;
 
 public class ImportFormatReader {
@@ -48,15 +47,20 @@ public class ImportFormatReader {
      */
     private final List<Importer> formats = new ArrayList<>();
 
-    private ImportFormatPreferences importFormatPreferences;
-
-    public void resetImportFormats(ImporterPreferences importerPreferences,
-                                   ImportFormatPreferences newImportFormatPreferences,
-                                   FileUpdateMonitor fileMonitor) {
-        this.importFormatPreferences = newImportFormatPreferences;
-
-        formats.clear();
+    private final ImporterPreferences importerPreferences;
+    private final ImportFormatPreferences importFormatPreferences;
+    private final FileUpdateMonitor fileUpdateMonitor;
+
+    public ImportFormatReader(ImporterPreferences importerPreferences,
+                              ImportFormatPreferences importFormatPreferences,
+                              FileUpdateMonitor fileUpdateMonitor) {
+        this.importerPreferences = importerPreferences;
+        this.importFormatPreferences = importFormatPreferences;
+        this.fileUpdateMonitor = fileUpdateMonitor;
+        reset();
+    }
 
+    public void reset() {
         formats.add(new CopacImporter());
         formats.add(new EndnoteImporter(importFormatPreferences));
         formats.add(new EndnoteXmlImporter(importFormatPreferences));
@@ -80,11 +84,11 @@ public void resetImportFormats(ImporterPreferences importerPreferences,
         formats.add(new SilverPlatterImporter());
         formats.add(new CffImporter());
         formats.add(new BiblioscapeImporter());
-        formats.add(new BibtexImporter(importFormatPreferences, fileMonitor));
+        formats.add(new BibtexImporter(importFormatPreferences, fileUpdateMonitor));
         formats.add(new CitaviXmlImporter());
 
         // Get custom import formats
-        formats.addAll(importerPreferences.getCustomImportList());
+        formats.addAll(importerPreferences.getCustomImporters());
     }
 
     /**
@@ -121,8 +125,7 @@ public ParserResult importFromFile(String format, Path file) throws ImportExcept
 
     /**
      * All importers.
-     * <p>
-     * <p>
+     *
      * Elements are sorted by name.
      * </p>
      *
@@ -132,40 +135,7 @@ public SortedSet<Importer> getImportFormats() {
         return new TreeSet<>(this.formats);
     }
 
-    /**
-     * Human readable list of all known import formats (name and CLI Id).
-     * <p>
-     * <p>List is sorted by importer name.</p>
-     *
-     * @return human readable list of all known import formats
-     */
-    public String getImportFormatList() {
-        StringBuilder sb = new StringBuilder();
-
-        for (Importer imFo : getImportFormats()) {
-            int pad = Math.max(0, 14 - imFo.getName().length());
-            sb.append("  ");
-            sb.append(imFo.getName());
-
-            sb.append(StringUtil.repeatSpaces(pad));
-
-            sb.append(" : ");
-            sb.append(imFo.getId());
-            sb.append('\n');
-        }
-
-        return sb.toString();
-    }
-
-    public static class UnknownFormatImport {
-
-        public final String format;
-        public final ParserResult parserResult;
-
-        public UnknownFormatImport(String format, ParserResult parserResult) {
-            this.format = format;
-            this.parserResult = parserResult;
-        }
+    public record UnknownFormatImport(String format, ParserResult parserResult) {
     }
 
     /**
diff --git a/src/main/java/org/jabref/logic/importer/ImporterPreferences.java b/src/main/java/org/jabref/logic/importer/ImporterPreferences.java
index 198eab8e51e..5923680af9e 100644
--- a/src/main/java/org/jabref/logic/importer/ImporterPreferences.java
+++ b/src/main/java/org/jabref/logic/importer/ImporterPreferences.java
@@ -1,9 +1,12 @@
 package org.jabref.logic.importer;
 
+import java.nio.file.Path;
 import java.util.Set;
 
 import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.SimpleObjectProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableSet;
 
@@ -12,16 +15,40 @@
 
 public class ImporterPreferences {
 
+    private final BooleanProperty importerEnabled;
     private final BooleanProperty generateNewKeyOnImport;
+    private final BooleanProperty warnAboutDuplicatesOnImport;
+    private final ObjectProperty<Path> importWorkingDirectory;
     private final ObservableSet<FetcherApiKey> apiKeys;
-    private final ObservableSet<CustomImporter> customImportList;
+    private final ObservableSet<CustomImporter> customImporters;
+    private final BooleanProperty persistCustomKeys;
 
-    public ImporterPreferences(boolean generateNewKeyOnImport,
-                               Set<CustomImporter> customImportList,
-                               Set<FetcherApiKey> apiKeys) {
+    public ImporterPreferences(boolean importerEnabled,
+                               boolean generateNewKeyOnImport,
+                               Path importWorkingDirectory,
+                               boolean warnAboutDuplicatesOnImport,
+                               Set<CustomImporter> customImporters,
+                               Set<FetcherApiKey> apiKeys,
+                               boolean persistCustomKeys) {
+        this.importerEnabled = new SimpleBooleanProperty(importerEnabled);
         this.generateNewKeyOnImport = new SimpleBooleanProperty(generateNewKeyOnImport);
-        this.customImportList = FXCollections.observableSet(customImportList);
+        this.importWorkingDirectory = new SimpleObjectProperty<>(importWorkingDirectory);
+        this.warnAboutDuplicatesOnImport = new SimpleBooleanProperty(warnAboutDuplicatesOnImport);
+        this.customImporters = FXCollections.observableSet(customImporters);
         this.apiKeys = FXCollections.observableSet(apiKeys);
+        this.persistCustomKeys = new SimpleBooleanProperty(persistCustomKeys);
+    }
+
+    public boolean areImporterEnabled() {
+        return importerEnabled.get();
+    }
+
+    public BooleanProperty importerEnabledProperty() {
+        return importerEnabled;
+    }
+
+    public void setImporterEnabled(boolean importerEnabled) {
+        this.importerEnabled.set(importerEnabled);
     }
 
     public boolean isGenerateNewKeyOnImport() {
@@ -36,11 +63,52 @@ public void setGenerateNewKeyOnImport(boolean generateNewKeyOnImport) {
         this.generateNewKeyOnImport.set(generateNewKeyOnImport);
     }
 
+    public Path getImportWorkingDirectory() {
+        return importWorkingDirectory.get();
+    }
+
+    public ObjectProperty<Path> importWorkingDirectoryProperty() {
+        return importWorkingDirectory;
+    }
+
+    public void setImportWorkingDirectory(Path importWorkingDirectory) {
+        this.importWorkingDirectory.set(importWorkingDirectory);
+    }
+
+    public boolean shouldWarnAboutDuplicatesOnImport() {
+        return warnAboutDuplicatesOnImport.get();
+    }
+
+    public BooleanProperty warnAboutDuplicatesOnImportProperty() {
+        return warnAboutDuplicatesOnImport;
+    }
+
+    public void setWarnAboutDuplicatesOnImport(boolean warnAboutDuplicatesOnImport) {
+        this.warnAboutDuplicatesOnImport.set(warnAboutDuplicatesOnImport);
+    }
+
     public ObservableSet<FetcherApiKey> getApiKeys() {
         return apiKeys;
     }
 
-    public ObservableSet<CustomImporter> getCustomImportList() {
-        return customImportList;
+    public ObservableSet<CustomImporter> getCustomImporters() {
+        return customImporters;
+    }
+
+    public void setCustomImporters(Set<CustomImporter> importers) {
+        customImporters.clear();
+        customImporters.addAll(importers);
+    }
+
+    public boolean shouldPersistCustomKeys() {
+        return persistCustomKeys.get();
+    }
+
+    public BooleanProperty persistCustomKeysProperty() {
+        return persistCustomKeys;
+    }
+
+    public void setPersistCustomKeys(boolean persistCustomKeys) {
+        this.persistCustomKeys.set(persistCustomKeys);
     }
 }
diff --git a/src/main/java/org/jabref/logic/importer/WebFetchers.java b/src/main/java/org/jabref/logic/importer/WebFetchers.java
index efd400edbcd..918eacd3a13 100644
--- a/src/main/java/org/jabref/logic/importer/WebFetchers.java
+++ b/src/main/java/org/jabref/logic/importer/WebFetchers.java
@@ -14,7 +14,7 @@
 import org.jabref.logic.importer.fetcher.AstrophysicsDataSystem;
 import org.jabref.logic.importer.fetcher.BiodiversityLibrary;
 import org.jabref.logic.importer.fetcher.BvbFetcher;
-import org.jabref.logic.importer.fetcher.CollectionOfComputerScienceBibliographiesFetcher;
+import org.jabref.logic.importer.fetcher.CiteSeer;
 import org.jabref.logic.importer.fetcher.CompositeSearchBasedFetcher;
 import org.jabref.logic.importer.fetcher.CrossRef;
 import org.jabref.logic.importer.fetcher.CustomizableKeyFetcher;
@@ -41,7 +41,6 @@
 import org.jabref.logic.importer.fetcher.SpringerLink;
 import org.jabref.logic.importer.fetcher.TitleFetcher;
 import org.jabref.logic.importer.fetcher.ZbMATH;
-import org.jabref.logic.importer.fetcher.isbntobibtex.EbookDeIsbnFetcher;
 import org.jabref.logic.importer.fetcher.isbntobibtex.IsbnFetcher;
 import org.jabref.logic.importer.fileformat.PdfMergeMetadataImporter;
 import org.jabref.model.database.BibDatabaseContext;
@@ -65,8 +64,8 @@ public static Optional<IdBasedFetcher> getIdBasedFetcherForField(Field field, Im
         if (field == StandardField.DOI) {
             fetcher = new DoiFetcher(importFormatPreferences);
         } else if (field == ISBN) {
-            fetcher = new IsbnFetcher(importFormatPreferences)
-                    .addRetryFetcher(new EbookDeIsbnFetcher(importFormatPreferences));
+            fetcher = new IsbnFetcher(importFormatPreferences);
+                    // .addRetryFetcher(new EbookDeIsbnFetcher(importFormatPreferences));
                     // .addRetryFetcher(new DoiToBibtexConverterComIsbnFetcher(importFormatPreferences));
         } else if (field == EPRINT) {
             fetcher = new ArXivFetcher(importFormatPreferences);
@@ -99,7 +98,7 @@ public static SortedSet<SearchBasedFetcher> getSearchBasedFetchers(ImportFormatP
         SortedSet<SearchBasedFetcher> set = new TreeSet<>(Comparator.comparing(WebFetcher::getName));
         set.add(new ArXivFetcher(importFormatPreferences));
         set.add(new INSPIREFetcher(importFormatPreferences));
-        set.add(new GvkFetcher());
+        set.add(new GvkFetcher(importFormatPreferences));
         set.add(new BvbFetcher());
         set.add(new MedlineFetcher());
         set.add(new AstrophysicsDataSystem(importFormatPreferences, importerPreferences));
@@ -110,11 +109,11 @@ public static SortedSet<SearchBasedFetcher> getSearchBasedFetchers(ImportFormatP
         set.add(new DBLPFetcher(importFormatPreferences));
         set.add(new SpringerFetcher(importerPreferences));
         set.add(new CrossRef());
-        // set.add(new CiteSeer());
+        set.add(new CiteSeer());
         set.add(new DOAJFetcher(importFormatPreferences));
         set.add(new IEEE(importFormatPreferences, importerPreferences));
         set.add(new CompositeSearchBasedFetcher(set, 30));
-        set.add(new CollectionOfComputerScienceBibliographiesFetcher(importFormatPreferences));
+        // set.add(new CollectionOfComputerScienceBibliographiesFetcher(importFormatPreferences));
         set.add(new DOABFetcher());
         // set.add(new JstorFetcher(importFormatPreferences));
         set.add(new SemanticScholar());
@@ -131,8 +130,8 @@ public static SortedSet<IdBasedFetcher> getIdBasedFetchers(ImportFormatPreferenc
         SortedSet<IdBasedFetcher> set = new TreeSet<>(Comparator.comparing(WebFetcher::getName));
         set.add(new ArXivFetcher(importFormatPreferences));
         set.add(new AstrophysicsDataSystem(importFormatPreferences, importerPreferences));
-        set.add(new IsbnFetcher(importFormatPreferences)
-                .addRetryFetcher(new EbookDeIsbnFetcher(importFormatPreferences)));
+        set.add(new IsbnFetcher(importFormatPreferences));
+                // .addRetryFetcher(new EbookDeIsbnFetcher(importFormatPreferences)));
                 // .addRetryFetcher(new DoiToBibtexConverterComIsbnFetcher(importFormatPreferences)));
         set.add(new DiVA(importFormatPreferences));
         set.add(new DoiFetcher(importFormatPreferences));
@@ -160,8 +159,8 @@ public static SortedSet<EntryBasedFetcher> getEntryBasedFetchers(ImporterPrefere
         set.add(new INSPIREFetcher(importFormatPreferences));
         set.add(new AstrophysicsDataSystem(importFormatPreferences, importerPreferences));
         set.add(new DoiFetcher(importFormatPreferences));
-        set.add(new IsbnFetcher(importFormatPreferences)
-                .addRetryFetcher(new EbookDeIsbnFetcher(importFormatPreferences)));
+        set.add(new IsbnFetcher(importFormatPreferences));
+                // .addRetryFetcher(new EbookDeIsbnFetcher(importFormatPreferences)));
                 // .addRetryFetcher(new DoiToBibtexConverterComIsbnFetcher(importFormatPreferences)));
         set.add(new MathSciNet(importFormatPreferences));
         set.add(new CrossRef());
@@ -203,6 +202,7 @@ public static Set<FulltextFetcher> getFullTextFetchers(ImportFormatPreferences i
         // Meta search
         // fetchers.add(new JstorFetcher(importFormatPreferences));
         // fetchers.add(new GoogleScholar(importFormatPreferences));
+        fetchers.add(new CiteSeer());
         fetchers.add(new OpenAccessDoi());
         fetchers.add(new SemanticScholar());
         fetchers.add(new ResearchGate(importFormatPreferences));
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/AbstractIsbnFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/AbstractIsbnFetcher.java
index 5d10910a1f1..efa37343f95 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/AbstractIsbnFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/AbstractIsbnFetcher.java
@@ -10,7 +10,6 @@
 import org.jabref.logic.importer.fileformat.BibtexParser;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.identifier.ISBN;
-import org.jabref.model.util.DummyFileUpdateMonitor;
 
 public abstract class AbstractIsbnFetcher implements IdBasedParserFetcher {
 
@@ -34,6 +33,6 @@ protected void ensureThatIsbnIsValid(String identifier) throws FetcherException
 
     @Override
     public Parser getParser() {
-        return new BibtexParser(importFormatPreferences, new DummyFileUpdateMonitor());
+        return new BibtexParser(importFormatPreferences);
     }
 }
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/ArXivFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/ArXivFetcher.java
index 8ac63c4056c..b3abf1fd699 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/ArXivFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/ArXivFetcher.java
@@ -388,11 +388,11 @@ public String getIdentifierName() {
      * <p>
      * Similar implementions:
      * <a href="https://github.com/nathangrigg/arxiv2bib">arxiv2bib</a> which is <a href="https://arxiv2bibtex.org/">live</a>
-     * <a herf="https://gitlab.c3sl.ufpr.br/portalmec/dspace-portalmec/blob/aa209d15082a9870f9daac42c78a35490ce77b52/dspace-api/src/main/java/org/dspace/submit/lookup/ArXivService.java">dspace-portalmec</a>
+     * <a href="https://gitlab.c3sl.ufpr.br/portalmec/dspace-portalmec/blob/aa209d15082a9870f9daac42c78a35490ce77b52/dspace-api/src/main/java/org/dspace/submit/lookup/ArXivService.java">dspace-portalmec</a>
      */
     protected class ArXiv implements FulltextFetcher, PagedSearchBasedFetcher, IdBasedFetcher, IdFetcher<ArXivIdentifier> {
 
-        private static final Logger LOGGER = LoggerFactory.getLogger(org.jabref.logic.importer.fetcher.ArXivFetcher.ArXiv.class);
+        private static final Logger LOGGER = LoggerFactory.getLogger(ArXivFetcher.ArXiv.class);
 
         private static final String API_URL = "https://export.arxiv.org/api/query";
 
@@ -601,7 +601,7 @@ public Page<BibEntry> performSearchPaged(QueryNode luceneQuery, int pageNumber)
             String transformedQuery = transformer.transformLuceneQuery(luceneQuery).orElse("");
             List<BibEntry> searchResult = searchForEntries(transformedQuery, pageNumber)
                     .stream()
-                    .map((arXivEntry) -> arXivEntry.toBibEntry(importFormatPreferences.bibEntryPreferences().getKeywordSeparator()))
+                    .map(arXivEntry -> arXivEntry.toBibEntry(importFormatPreferences.bibEntryPreferences().getKeywordSeparator()))
                     .collect(Collectors.toList());
             return new Page<>(transformedQuery, pageNumber, filterYears(searchResult, transformer));
         }
@@ -628,7 +628,7 @@ protected CompletableFuture<Optional<BibEntry>> asyncPerformSearchById(String id
         @Override
         public Optional<BibEntry> performSearchById(String identifier) throws FetcherException {
             return searchForEntryById(identifier)
-                    .map((arXivEntry) -> arXivEntry.toBibEntry(importFormatPreferences.bibEntryPreferences().getKeywordSeparator()));
+                    .map(arXivEntry -> arXivEntry.toBibEntry(importFormatPreferences.bibEntryPreferences().getKeywordSeparator()));
         }
 
         @Override
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 d59df7ed972..60fc30e718c 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/AstrophysicsDataSystem.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/AstrophysicsDataSystem.java
@@ -38,7 +38,6 @@
 import org.jabref.model.entry.field.UnknownField;
 import org.jabref.model.paging.Page;
 import org.jabref.model.strings.StringUtil;
-import org.jabref.model.util.DummyFileUpdateMonitor;
 
 import kong.unirest.json.JSONArray;
 import kong.unirest.json.JSONException;
@@ -156,7 +155,7 @@ public Optional<HelpFile> getHelpPage() {
 
     @Override
     public Parser getParser() {
-        return new BibtexParser(preferences, new DummyFileUpdateMonitor());
+        return new BibtexParser(preferences);
     }
 
     @Override
@@ -172,7 +171,7 @@ public void doPostCleanup(BibEntry entry) {
         // Move adsurl to url field
         new MoveFieldCleanup(new UnknownField("adsurl"), StandardField.URL).cleanup(entry);
         entry.getField(StandardField.ABSTRACT)
-             .filter(abstractText -> abstractText.equals("Not Available <P />"))
+             .filter(abstractText -> "Not Available <P />".equals(abstractText))
              .ifPresent(abstractText -> entry.clearField(StandardField.ABSTRACT));
 
         entry.getField(StandardField.ABSTRACT)
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/BibsonomyScraper.java b/src/main/java/org/jabref/logic/importer/fetcher/BibsonomyScraper.java
index c973954a731..f506d0128f2 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/BibsonomyScraper.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/BibsonomyScraper.java
@@ -9,7 +9,6 @@
 import org.jabref.logic.importer.fileformat.BibtexParser;
 import org.jabref.logic.net.URLDownload;
 import org.jabref.model.entry.BibEntry;
-import org.jabref.model.util.DummyFileUpdateMonitor;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -29,9 +28,6 @@ private BibsonomyScraper() {
 
     /**
      * Return a BibEntry by looking up the given url from the BibSonomy scraper.
-     *
-     * @param entryUrl
-     * @return
      */
     public static Optional<BibEntry> getEntry(String entryUrl, ImportFormatPreferences importFormatPreferences) {
         try {
@@ -41,7 +37,7 @@ public static Optional<BibEntry> getEntry(String entryUrl, ImportFormatPreferenc
 
             URL url = new URL(BibsonomyScraper.BIBSONOMY_SCRAPER + cleanURL + BibsonomyScraper.BIBSONOMY_SCRAPER_POST);
             String bibtex = new URLDownload(url).asString();
-            return BibtexParser.singleFromString(bibtex, importFormatPreferences, new DummyFileUpdateMonitor());
+            return BibtexParser.singleFromString(bibtex, importFormatPreferences);
         } catch (IOException ex) {
             LOGGER.warn("Could not download entry", ex);
             return Optional.empty();
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/BiodiversityLibrary.java b/src/main/java/org/jabref/logic/importer/fetcher/BiodiversityLibrary.java
index 7a75a38675e..52af28c9766 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/BiodiversityLibrary.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/BiodiversityLibrary.java
@@ -35,8 +35,7 @@
 /**
  * Fetches data from the Biodiversity Heritage Library
  *
- * @implNote
- * <a href="https://www.biodiversitylibrary.org/docs/api3.html">API documentation</a>
+ * @see <a href="https://www.biodiversitylibrary.org/docs/api3.html">API documentation</a>
  */
 public class BiodiversityLibrary implements SearchBasedParserFetcher, CustomizableKeyFetcher {
 
@@ -162,7 +161,7 @@ private String toAuthors(JSONArray authors) {
         // input: list of { "Name": "Author name,"}
         return IntStream.range(0, authors.length())
                         .mapToObj(authors::getJSONObject)
-                        .map((author) -> new Author(
+                        .map(author -> new Author(
                                 author.optString("Name", ""), "", "", "", ""))
                         .collect(AuthorList.collect())
                         .getAsFirstLastNamesWithAnd();
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/CiteSeer.java b/src/main/java/org/jabref/logic/importer/fetcher/CiteSeer.java
index 4c72717d730..f8a16138a6c 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/CiteSeer.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/CiteSeer.java
@@ -1,36 +1,36 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.net.MalformedURLException;
-import java.net.URISyntaxException;
+import java.io.IOException;
 import java.net.URL;
-import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-
-import org.jabref.logic.cleanup.FieldFormatterCleanup;
-import org.jabref.logic.cleanup.Formatter;
-import org.jabref.logic.formatter.bibtexfields.HtmlToUnicodeFormatter;
-import org.jabref.logic.formatter.casechanger.TitleCaseFormatter;
+
 import org.jabref.logic.help.HelpFile;
 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.fileformat.CoinsParser;
-import org.jabref.logic.util.OS;
+import org.jabref.logic.importer.FulltextFetcher;
+import org.jabref.logic.importer.ParseException;
+import org.jabref.logic.importer.SearchBasedFetcher;
+import org.jabref.logic.importer.fetcher.transformers.CiteSeerQueryTransformer;
+import org.jabref.logic.importer.fileformat.CiteSeerParser;
 import org.jabref.model.entry.BibEntry;
-import org.jabref.model.entry.field.InternalField;
 import org.jabref.model.entry.field.StandardField;
 
-import org.apache.http.client.utils.URIBuilder;
+import kong.unirest.JsonNode;
+import kong.unirest.Unirest;
+import kong.unirest.json.JSONArray;
+import kong.unirest.json.JSONElement;
 import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 
-public class CiteSeer implements SearchBasedParserFetcher {
+public class CiteSeer implements SearchBasedFetcher, FulltextFetcher {
+
+    private static final String BASE_URL = "citeseerx.ist.psu.edu";
+
+    private static final String API_URL = "https://citeseerx.ist.psu.edu/api/search";
+
+    private static final String PDF_URL = "https://" + BASE_URL + "/document?repid=rep1&type=pdf&doi=%s";
+
+    private CiteSeerQueryTransformer transformer;
 
     public CiteSeer() {
     }
@@ -46,52 +46,59 @@ public Optional<HelpFile> getHelpPage() {
     }
 
     @Override
-    public URL getURLForQuery(QueryNode luceneQuery) throws URISyntaxException, MalformedURLException, FetcherException {
-        URIBuilder uriBuilder = new URIBuilder("https://citeseer.ist.psu.edu/search");
-        uriBuilder.addParameter("sort", "rlv"); // Sort by relevance
-        uriBuilder.addParameter("q", new DefaultQueryTransformer().transformLuceneQuery(luceneQuery).orElse("")); // Query
-        uriBuilder.addParameter("t", "doc"); // Type: documents
-        // uriBuilder.addParameter("start", "0"); // Start index (not supported at the moment)
-        return uriBuilder.build().toURL();
-    }
+    public List<BibEntry> performSearch(QueryNode luceneQuery) throws FetcherException {
+        // ADR-0014
+        try {
+            JSONElement payload = getPayloadJSON(luceneQuery);
+            JsonNode requestResponse = Unirest.post(API_URL)
+                                              .header("authority", BASE_URL)
+                                              .header("accept", "application/json, text/plain, */*")
+                                              .header("content-type", "application/json;charset=UTF-8")
+                                              .header("origin", "https://" + BASE_URL)
+                                              .body(payload)
+                                              .asJson().getBody();
 
-    @Override
-    public Parser getParser() {
-        // MathSciNet returns COinS result embedded in HTML
-        // So we extract the data string from the <span class="Z3988" title="<data>"></span> tags and pass the content to the COinS parser
-        return inputStream -> {
-            String response = new BufferedReader(new InputStreamReader(inputStream)).lines().collect(Collectors.joining(OS.NEWLINE));
-            List<BibEntry> entries = new ArrayList<>();
-            CoinsParser parser = new CoinsParser();
-            Pattern pattern = Pattern.compile("<span class=\"Z3988\" title=\"(.*)\"></span>");
-            Matcher matcher = pattern.matcher(response);
-            while (matcher.find()) {
-                String encodedDataString = matcher.group(1);
-                entries.addAll(parser.parseEntries(encodedDataString));
+            Optional<JSONArray> jsonResponse = Optional.of(requestResponse)
+                                                    .map(JsonNode::getObject)
+                                                    .filter(Objects::nonNull)
+                                                    .map(response -> response.optJSONArray("response"))
+                                                    .filter(Objects::nonNull);
+
+            if (!jsonResponse.isPresent()) {
+                return List.of();
             }
-            return entries;
-        };
+
+            CiteSeerParser parser = new CiteSeerParser();
+            List<BibEntry> fetchedEntries = parser.parseCiteSeerResponse(jsonResponse.orElse(new JSONArray()));
+            return fetchedEntries;
+        } catch (ParseException ex) {
+            throw new FetcherException("An internal parser error occurred while parsing CiteSeer entries, ", ex);
+        }
+    }
+
+    private JSONElement getPayloadJSON(QueryNode luceneQuery) {
+        transformer = new CiteSeerQueryTransformer();
+        String transformedQuery = transformer.transformLuceneQuery(luceneQuery).orElse("");
+        return transformer.getJSONPayload();
     }
 
     @Override
-    public void doPostCleanup(BibEntry entry) {
-        // CiteSeer escapes some characters in a way that is not recognized by the normal html to unicode formatter
-        // We, of course, also want to convert these special characters
-        Formatter extendedHtmlFormatter = new HtmlToUnicodeFormatter() {
-            @Override
-            public String format(String fieldText) {
-                String formatted = super.format(fieldText);
-                formatted = formatted.replaceAll("%3A", ":");
-                formatted = formatted.replaceAll("%3Cem%3", "");
-                formatted = formatted.replaceAll("%3C%2Fem%3E", "");
-                formatted = formatted.replaceAll("%2C\\+", " ");
-                formatted = formatted.replaceAll("\\+", " ");
-                return formatted;
-            }
-        };
-        new FieldFormatterCleanup(InternalField.INTERNAL_ALL_FIELD, extendedHtmlFormatter).cleanup(entry);
+    public Optional<URL> findFullText(BibEntry entry) throws IOException, FetcherException {
+        Objects.requireNonNull(entry);
+
+        // does not use a valid DOI, but Cite Seer's id / hash available for each entry
+        Optional<String> id = entry.getField(StandardField.DOI);
+        if (id.isPresent()) {
+            String source = String.format(PDF_URL, id.get());
+            return Optional.of(new URL(source));
+        }
+
+        // if using id fails, we can try the source URL
+        Optional<String> urlString = entry.getField(StandardField.URL);
+        if (urlString.isPresent()) {
+            return Optional.of(new URL(urlString.get()));
+        }
 
-        // Many titles in the CiteSeer database have all-capital titles, for convenience we convert them to title case
-        new FieldFormatterCleanup(StandardField.TITLE, new TitleCaseFormatter()).cleanup(entry);
+        return Optional.empty();
     }
 }
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/CollectionOfComputerScienceBibliographiesParser.java b/src/main/java/org/jabref/logic/importer/fetcher/CollectionOfComputerScienceBibliographiesParser.java
index 4b075d0ff3c..4a351e40cfc 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/CollectionOfComputerScienceBibliographiesParser.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/CollectionOfComputerScienceBibliographiesParser.java
@@ -15,7 +15,6 @@
 import org.jabref.logic.importer.fileformat.BibtexParser;
 import org.jabref.logic.net.URLDownload;
 import org.jabref.model.entry.BibEntry;
-import org.jabref.model.util.DummyFileUpdateMonitor;
 
 public class CollectionOfComputerScienceBibliographiesParser implements Parser {
 
@@ -26,7 +25,7 @@ public class CollectionOfComputerScienceBibliographiesParser implements Parser {
     final HtmlToUnicodeFormatter htmlToUnicodeFormatter;
 
     public CollectionOfComputerScienceBibliographiesParser(ImportFormatPreferences importFormatPreferences) {
-        this.bibtexParser = new BibtexParser(importFormatPreferences, new DummyFileUpdateMonitor());
+        this.bibtexParser = new BibtexParser(importFormatPreferences);
         this.htmlToUnicodeFormatter = new HtmlToUnicodeFormatter();
     }
 
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/CrossRef.java b/src/main/java/org/jabref/logic/importer/fetcher/CrossRef.java
index 9c201e1e7c1..d8684039af0 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/CrossRef.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/CrossRef.java
@@ -154,7 +154,7 @@ private String toAuthors(JSONArray authors) {
         // input: list of {"given":"A.","family":"Riel","affiliation":[]}
         return IntStream.range(0, authors.length())
                         .mapToObj(authors::getJSONObject)
-                        .map((author) -> new Author(
+                        .map(author -> new Author(
                                 author.optString("given", ""), "", "",
                                 author.optString("family", ""), ""))
                         .collect(AuthorList.collect())
@@ -162,7 +162,7 @@ private String toAuthors(JSONArray authors) {
     }
 
     private EntryType convertType(String type) {
-        return type.equals("journal-article") ? StandardEntryType.Article : StandardEntryType.Misc;
+        return "journal-article".equals(type) ? StandardEntryType.Article : StandardEntryType.Misc;
     }
 
     @Override
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/DBLPFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/DBLPFetcher.java
index 19d1d67ec1a..1eef08ff5f6 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/DBLPFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/DBLPFetcher.java
@@ -22,7 +22,6 @@
 import org.jabref.logic.layout.format.RemoveLatexCommandsFormatter;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
-import org.jabref.model.util.DummyFileUpdateMonitor;
 
 import org.apache.http.client.utils.URIBuilder;
 import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
@@ -58,7 +57,7 @@ public URL getURLForQuery(QueryNode luceneQuery) throws URISyntaxException, Malf
 
     @Override
     public Parser getParser() {
-        return new BibtexParser(importFormatPreferences, new DummyFileUpdateMonitor());
+        return new BibtexParser(importFormatPreferences);
     }
 
     @Override
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/DOABFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/DOABFetcher.java
index 1b744e16f04..ff10e62c69d 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/DOABFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/DOABFetcher.java
@@ -169,7 +169,7 @@ private BibEntry jsonToBibEntry(JSONArray metadataArray, JSONArray bitstreamArra
     }
 
     private Author toAuthor(String author) {
-        return AuthorList.parse((author)).getAuthor(0);
+        return AuthorList.parse(author).getAuthor(0);
     }
 
     private String namePreprocessing(String name) {
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/DOAJFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/DOAJFetcher.java
index ee949f00fed..815996d311f 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/DOAJFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/DOAJFetcher.java
@@ -34,7 +34,7 @@
 /**
  * Fetches data from the Directory of Open Access Journals (DOAJ)
  *
- * @implNote <a href="https://doaj.org/api/v1/docs">API documentation</a>
+ * @see <a href="https://doaj.org/api/v1/docs">API documentation</a>
  */
 public class DOAJFetcher implements SearchBasedParserFetcher {
 
@@ -155,10 +155,8 @@ public static BibEntry parseBibJSONtoBibtex(JSONObject bibJsonEntry, Character k
         return entry;
     }
 
-    /**
-     * @implNote slightly altered version based on https://gist.github.com/enginer/230e2dc2f1d213a825d5
-     */
     public static URIBuilder addPath(URIBuilder base, String subPath) {
+        // slightly altered version based on https://gist.github.com/enginer/230e2dc2f1d213a825d5
         if (StringUtil.isBlank(subPath) || "/".equals(subPath)) {
             return base;
         } else {
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/DiVA.java b/src/main/java/org/jabref/logic/importer/fetcher/DiVA.java
index ae6a02a9e85..b9a5dc4cc1b 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/DiVA.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/DiVA.java
@@ -11,7 +11,6 @@
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.Parser;
 import org.jabref.logic.importer.fileformat.BibtexParser;
-import org.jabref.model.util.DummyFileUpdateMonitor;
 
 import org.apache.http.client.utils.URIBuilder;
 
@@ -49,7 +48,7 @@ public URL getUrlForIdentifier(String identifier) throws URISyntaxException, Mal
 
     @Override
     public Parser getParser() {
-        return new BibtexParser(importFormatPreferences, new DummyFileUpdateMonitor());
+        return new BibtexParser(importFormatPreferences);
     }
 
     public boolean isValidId(String identifier) {
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 41bedef4c2e..276b9883d4d 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/DoiFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/DoiFetcher.java
@@ -28,7 +28,6 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.identifier.DOI;
 import org.jabref.model.entry.types.StandardEntryType;
-import org.jabref.model.util.DummyFileUpdateMonitor;
 import org.jabref.model.util.OptionalUtil;
 
 import com.google.common.util.concurrent.RateLimiter;
@@ -85,14 +84,14 @@ private void doAPILimiting(String identifier) {
             Optional<String> agency;
             if (doi.isPresent() && (agency = getAgency(doi.get())).isPresent()) {
                 double waitingTime = 0.0;
-                if (agency.get().equalsIgnoreCase("datacite")) {
+                if ("datacite".equalsIgnoreCase(agency.get())) {
                     waitingTime = DATA_CITE_DCN_RATE_LIMITER.acquire();
-                } else if (agency.get().equalsIgnoreCase("crossref")) {
+                } else if ("crossref".equalsIgnoreCase(agency.get())) {
                     waitingTime = CROSSREF_DCN_RATE_LIMITER.acquire();
                 } // mEDRA does not explicit an API rating
 
                 LOGGER.trace(String.format("Thread %s, searching for DOI '%s', waited %.2fs because of API rate limiter",
-                        Thread.currentThread().getId(), identifier, waitingTime));
+                        Thread.currentThread().threadId(), identifier, waitingTime));
             }
         } catch (IOException e) {
             LOGGER.warn("Could not limit DOI API access rate", e);
@@ -143,11 +142,11 @@ public Optional<BibEntry> performSearchById(String identifier) throws FetcherExc
                 }
 
                 // BibTeX entry
-                fetchedEntry = BibtexParser.singleFromString(bibtexString, preferences, new DummyFileUpdateMonitor());
+                fetchedEntry = BibtexParser.singleFromString(bibtexString, preferences);
                 fetchedEntry.ifPresent(this::doPostCleanup);
 
                 // Crossref has a dynamic API rate limit
-                if (agency.isPresent() && agency.get().equalsIgnoreCase("crossref")) {
+                if (agency.isPresent() && "crossref".equalsIgnoreCase(agency.get())) {
                     updateCrossrefAPIRate(openConnection);
                 }
 
@@ -159,8 +158,8 @@ public Optional<BibEntry> performSearchById(String identifier) throws FetcherExc
                     }
                 }
 
-                if (openConnection instanceof HttpURLConnection) {
-                    ((HttpURLConnection) openConnection).disconnect();
+                if (openConnection instanceof HttpURLConnection connection) {
+                    connection.disconnect();
                 }
                 return fetchedEntry;
             } else {
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 e8c341427ac..db14fad1dc3 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/DoiResolution.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/DoiResolution.java
@@ -13,6 +13,9 @@
 import java.util.stream.Collectors;
 
 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.logic.net.URLDownload;
 import org.jabref.logic.preferences.DOIPreferences;
 import org.jabref.model.entry.BibEntry;
@@ -32,7 +35,7 @@
  * FulltextFetcher implementation that follows the DOI resolution redirects and scans for a full-text PDF URL.
  *
  * Note that we also have custom fetchers in place.
- * See {@link org.jabref.logic.importer.WebFetchers#getFullTextFetchers(org.jabref.logic.importer.ImportFormatPreferences)}.
+ * See {@link WebFetchers#getFullTextFetchers(ImportFormatPreferences, ImporterPreferences)}.
  */
 public class DoiResolution implements FulltextFetcher {
 
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/GoogleScholar.java b/src/main/java/org/jabref/logic/importer/fetcher/GoogleScholar.java
index fc72717086f..f931190e135 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/GoogleScholar.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/GoogleScholar.java
@@ -26,7 +26,6 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.paging.Page;
-import org.jabref.model.util.DummyFileUpdateMonitor;
 
 import org.apache.http.client.utils.URIBuilder;
 import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
@@ -147,7 +146,7 @@ private void addHitsFromQuery(List<BibEntry> entryList, String queryURL) throws
 
     private BibEntry downloadEntry(String link) throws IOException, FetcherException {
         String downloadedContent = new URLDownload(link).asString();
-        BibtexParser parser = new BibtexParser(importFormatPreferences, new DummyFileUpdateMonitor());
+        BibtexParser parser = new BibtexParser(importFormatPreferences);
         ParserResult result = parser.parse(new StringReader(downloadedContent));
         if ((result == null) || (result.getDatabase() == null)) {
             throw new FetcherException("Parsing entries from Google Scholar bib file failed.");
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 c33d7e83ac8..8ca9d967444 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/GrobidCitationFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/GrobidCitationFetcher.java
@@ -16,6 +16,8 @@
 import org.jabref.model.entry.BibEntry;
 
 import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
+import org.jooq.lambda.Unchecked;
+import org.jsoup.HttpStatusException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -40,14 +42,19 @@ public GrobidCitationFetcher(GrobidPreferences grobidPreferences, ImportFormatPr
      * server has to look up the entry.
      *
      * @return A BibTeX string if extraction is successful
+     * @throws FetcherException
      */
-    private Optional<BibEntry> parseUsingGrobid(String plainText) throws RuntimeException {
+    private Optional<BibEntry> parseUsingGrobid(String plainText) throws FetcherException {
         try {
             return grobidService.processCitation(plainText, importFormatPreferences, GrobidService.ConsolidateCitations.WITH_METADATA);
+        } catch (HttpStatusException e) {
+            String msg = "Connection failure.";
+            LOGGER.debug(msg, e);
+            throw new FetcherException(msg, e.getCause());
         } catch (SocketTimeoutException e) {
             String msg = "Connection timed out.";
             LOGGER.debug(msg, e);
-            throw new RuntimeException(msg, e);
+            throw new FetcherException(msg, e.getCause());
         } catch (IOException | ParseException e) {
             String msg = "Could not process citation. " + e.getMessage();
             LOGGER.debug(msg, e);
@@ -63,16 +70,12 @@ public String getName() {
     @Override
     public List<BibEntry> performSearch(String searchQuery) throws FetcherException {
         List<BibEntry> collect;
-        try {
-            collect = Arrays.stream(searchQuery.split("\\r\\r+|\\n\\n+|\\r\\n(\\r\\n)+"))
-                            .map(String::trim)
-                            .filter(str -> !str.isBlank())
-                            .map(this::parseUsingGrobid)
-                            .flatMap(Optional::stream)
-                            .collect(Collectors.toList());
-        } catch (RuntimeException e) {
-            throw new FetcherException(e.getMessage(), e.getCause());
-        }
+        collect = Arrays.stream(searchQuery.split("\\r\\r+|\\n\\n+|\\r\\n(\\r\\n)+"))
+                        .map(String::trim)
+                        .filter(str -> !str.isBlank())
+                        .map(Unchecked.function(this::parseUsingGrobid))
+                        .flatMap(Optional::stream)
+                        .collect(Collectors.toList());
         return collect;
     }
 
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/GvkFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/GvkFetcher.java
index ad3982d5dfe..5ae34a92fa8 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/GvkFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/GvkFetcher.java
@@ -7,19 +7,25 @@
 import java.util.Collection;
 import java.util.Optional;
 
+import org.jabref.logic.cleanup.FieldFormatterCleanup;
+import org.jabref.logic.formatter.bibtexfields.NormalizeNamesFormatter;
+import org.jabref.logic.formatter.bibtexfields.NormalizePagesFormatter;
 import org.jabref.logic.help.HelpFile;
 import org.jabref.logic.importer.FetcherException;
+import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.Parser;
 import org.jabref.logic.importer.SearchBasedParserFetcher;
 import org.jabref.logic.importer.fetcher.transformers.GVKQueryTransformer;
 import org.jabref.logic.importer.fileformat.PicaXmlParser;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.field.StandardField;
 
 import org.apache.http.client.utils.URIBuilder;
 import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 
-public class GvkFetcher implements SearchBasedParserFetcher {
+public class GvkFetcher extends AbstractIsbnFetcher implements SearchBasedParserFetcher {
 
-    private static final String URL_PATTERN = "http://sru.gbv.de/gvk?";
+    private static final String URL_PATTERN = "https://sru.k10plus.de/opac-de-627?";
 
     /**
      * Searchkeys are used to specify a search request. For example "tit" stands for "title".
@@ -27,6 +33,10 @@ public class GvkFetcher implements SearchBasedParserFetcher {
      */
     private final Collection<String> searchKeys = Arrays.asList("all", "tit", "per", "thm", "slw", "txt", "num", "kon", "ppn", "bkl", "erj");
 
+    public GvkFetcher(ImportFormatPreferences importFormatPreferences) {
+        super(importFormatPreferences);
+    }
+
     @Override
     public String getName() {
         return "GVK";
@@ -49,8 +59,32 @@ public URL getURLForQuery(QueryNode luceneQuery) throws URISyntaxException, Malf
         return uriBuilder.build().toURL();
     }
 
+    @Override
+    public URL getUrlForIdentifier(String identifier) throws URISyntaxException, MalformedURLException, FetcherException {
+        this.ensureThatIsbnIsValid(identifier);
+        URIBuilder uriBuilder = new URIBuilder(URL_PATTERN);
+        uriBuilder.addParameter("version", "1.1");
+        uriBuilder.addParameter("operation", "searchRetrieve");
+        uriBuilder.addParameter("query", "pica.isb=" + identifier);
+        uriBuilder.addParameter("maximumRecords", "50");
+        uriBuilder.addParameter("recordSchema", "picaxml");
+        uriBuilder.addParameter("sortKeys", "Year,,1");
+        return uriBuilder.build().toURL();
+    }
+
     @Override
     public Parser getParser() {
         return new PicaXmlParser();
     }
+
+    @Override
+    public void doPostCleanup(BibEntry entry) {
+        super.doPostCleanup(entry);
+
+        // Fetcher returns page numbers as "30 Seiten" -> remove every non-digit character in the PAGETOTAL field
+        entry.getField(StandardField.PAGETOTAL).ifPresent(pages ->
+                entry.setField(StandardField.PAGETOTAL, pages.replaceAll("[\\D]", "")));
+        new FieldFormatterCleanup(StandardField.PAGETOTAL, new NormalizePagesFormatter()).cleanup(entry);
+        new FieldFormatterCleanup(StandardField.AUTHOR, new NormalizeNamesFormatter()).cleanup(entry);
+    }
 }
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 30d41bd5d77..20242693755 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/IEEE.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/IEEE.java
@@ -40,11 +40,11 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * Class for finding PDF URLs for entries on IEEE
- * Will first look for URLs of the type https://ieeexplore.ieee.org/stamp/stamp.jsp?[tp=&]arnumber=...
- * If not found, will resolve the DOI, if it starts with 10.1109, and try to find a similar link on the HTML page
+ * Class for finding PDF URLs for entries on IEEE.
+ * Will first look for URLs of the type <code>https://ieeexplore.ieee.org/stamp/stamp.jsp?[tp=&amp;]arnumber=...</code>.
+ * If not found, will resolve the DOI, if it starts with 10.1109, and try to find a similar link on the HTML page.
  *
- * @implNote <a href="https://developer.ieee.org/docs">API documentation</a>
+ * @see <a href="https://developer.ieee.org/docs">API documentation</a>
  */
 public class IEEE implements FulltextFetcher, PagedSearchBasedParserFetcher, CustomizableKeyFetcher {
 
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/INSPIREFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/INSPIREFetcher.java
index cfd7e4db48b..177c95f7e71 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/INSPIREFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/INSPIREFetcher.java
@@ -26,7 +26,6 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.field.UnknownField;
-import org.jabref.model.util.DummyFileUpdateMonitor;
 
 import org.apache.http.client.utils.URIBuilder;
 import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
@@ -83,7 +82,7 @@ public void doPostCleanup(BibEntry entry) {
 
     @Override
     public Parser getParser() {
-        return new BibtexParser(importFormatPreferences, new DummyFileUpdateMonitor());
+        return new BibtexParser(importFormatPreferences);
     }
 
     @Override
@@ -94,7 +93,7 @@ public List<BibEntry> performSearch(BibEntry entry) throws FetcherException {
         Optional<String> eprint = entry.getField(StandardField.EPRINT);
         String url;
 
-        if (archiveprefix.get() == "arXiv" && !eprint.isEmpty()) {
+        if ("arXiv".equals(archiveprefix.get()) && !eprint.isEmpty()) {
             url = INSPIRE_ARXIV_HOST + eprint.get();
         } else if (!doi.isEmpty()) {
             url = INSPIRE_DOI_HOST + doi.get();
@@ -108,7 +107,7 @@ public List<BibEntry> performSearch(BibEntry entry) throws FetcherException {
             results.forEach(this::doPostCleanup);
             return results;
         } catch (IOException | ParseException e) {
-            throw new FetcherException("Error occured during fetching", e);
+            throw new FetcherException("Error occurred during fetching", e);
         }
     }
 }
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 65419881b46..7233c998ae3 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/IacrEprintFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/IacrEprintFetcher.java
@@ -18,7 +18,6 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.strings.StringUtil;
-import org.jabref.model.util.DummyFileUpdateMonitor;
 
 public class IacrEprintFetcher implements FulltextFetcher, IdBasedFetcher {
 
@@ -63,7 +62,7 @@ private Optional<BibEntry> createEntryFromIacrCitation(String validIdentifier) t
         String actualEntry = getRequiredValueBetween("<pre id=\"bibtex\">", "</pre>", bibtexCitationHtml);
 
         try {
-            return BibtexParser.singleFromString(actualEntry, prefs, new DummyFileUpdateMonitor());
+            return BibtexParser.singleFromString(actualEntry, prefs);
         } catch (ParseException e) {
             throw new FetcherException(Localization.lang("Entry from %0 could not be parsed.", "IACR"), e);
         }
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/JournalInformationFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/JournalInformationFetcher.java
new file mode 100644
index 00000000000..7d12875b7c9
--- /dev/null
+++ b/src/main/java/org/jabref/logic/importer/fetcher/JournalInformationFetcher.java
@@ -0,0 +1,230 @@
+package org.jabref.logic.importer.fetcher;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.regex.Pattern;
+
+import javafx.util.Pair;
+
+import org.jabref.logic.importer.FetcherException;
+import org.jabref.logic.importer.WebFetcher;
+import org.jabref.logic.journals.JournalInformation;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.model.entry.identifier.ISSN;
+
+import kong.unirest.HttpResponse;
+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.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Fetches journal information from the JabRef Web API
+ */
+public class JournalInformationFetcher implements WebFetcher {
+    public static final String NAME = "Journal Information";
+    private static final Logger LOGGER = LoggerFactory.getLogger(JournalInformationFetcher.class);
+    private static final String API_URL = "https://jabref.org/api";
+    private static final Pattern QUOTES_BRACKET_PATTERN = Pattern.compile("[\"\\[\\]]");
+
+    @Override
+    public String getName() {
+        return JournalInformationFetcher.NAME;
+    }
+
+    public Optional<JournalInformation> getJournalInformation(String issnString, String journalName) throws FetcherException {
+        ISSN issn = new ISSN(issnString);
+        String cleanedISSN = "";
+
+        if (issn.isValidFormat() || issn.isCanBeCleaned()) {
+            cleanedISSN = issn.getCleanedISSN();
+        } else {
+            LOGGER.warn(Localization.lang("Incorrect ISSN format"));
+        }
+
+        Optional<JournalInformation> journalInformationOptional = Optional.empty();
+
+        JSONObject postData = buildPostData(cleanedISSN, journalName);
+
+        HttpResponse<JsonNode> httpResponse = Unirest.post(API_URL)
+                                                     .header("Content-Type", "application/json")
+                                                     .body(postData)
+                                                     .asJson();
+
+        if (httpResponse.getBody() != null) {
+            JSONObject responseJsonObject = httpResponse.getBody().getObject();
+            journalInformationOptional = Optional.of(parseResponse(responseJsonObject));
+        }
+
+        return journalInformationOptional;
+    }
+
+    private JournalInformation parseResponse(JSONObject responseJsonObject) throws FetcherException {
+        String title = "";
+        String publisher = "";
+        String coverageStartYear = "";
+        String coverageEndYear = "";
+        String subjectArea = "";
+        String country = "";
+        String categories = "";
+        String scimagoId = "";
+        String hIndex = "";
+        String issn = "";
+        List<Pair<Integer, Double>> sjrArray = new ArrayList<>();
+        List<Pair<Integer, Double>> snipArray = new ArrayList<>();
+        List<Pair<Integer, Double>> docsThisYear = new ArrayList<>();
+        List<Pair<Integer, Double>> docsPrevious3Years = new ArrayList<>();
+        List<Pair<Integer, Double>> citableDocsPrevious3Years = new ArrayList<>();
+        List<Pair<Integer, Double>> citesOutgoing = new ArrayList<>();
+        List<Pair<Integer, Double>> citesOutgoingPerDoc = new ArrayList<>();
+        List<Pair<Integer, Double>> citesIncomingByRecentlyPublished = new ArrayList<>();
+        List<Pair<Integer, Double>> citesIncomingPerDocByRecentlyPublished = new ArrayList<>();
+
+        try {
+            if (responseJsonObject.has("errors")) {
+                JSONArray errors = responseJsonObject.optJSONArray("errors");
+                if (errors != null && errors.length() > 0) {
+                    JSONObject error = errors.getJSONObject(0);
+                    String errorMessage = error.optString("message", "");
+                    LOGGER.error("Error accessing catalog: {}", errorMessage);
+                }
+                throw new FetcherException(Localization.lang("Error accessing catalog"));
+            }
+
+            if (responseJsonObject.has("data")) {
+                JSONObject data = responseJsonObject.getJSONObject("data");
+                if (data.has("journal") && data.get("journal") != null) {
+                    JSONObject journalData = data.getJSONObject("journal");
+
+                    title = journalData.optString("name", "");
+                    publisher = journalData.optString("publisher", "");
+                    coverageStartYear = journalData.optString("coverageStartYear", "");
+                    coverageEndYear = journalData.optString("coverageEndYear", "");
+                    scimagoId = journalData.optString("scimagoId", "");
+                    country = journalData.optString("country", "");
+                    issn = getConcatenatedString(journalData, "issn");
+                    subjectArea = getConcatenatedString(journalData, "areas");
+                    categories = getConcatenatedString(journalData, "categories");
+                    hIndex = journalData.optString("hIndex", "");
+
+                    JSONArray citationInfo = journalData.optJSONArray("citationInfo");
+                    if (citationInfo != null) {
+                        docsThisYear = parseCitationInfo(citationInfo, "docsThisYear");
+                        docsPrevious3Years = parseCitationInfo(citationInfo, "docsPrevious3Years");
+                        citableDocsPrevious3Years = parseCitationInfo(citationInfo, "citableDocsPrevious3Years");
+                        citesOutgoing = parseCitationInfo(citationInfo, "citesOutgoing");
+                        citesOutgoingPerDoc = parseCitationInfo(citationInfo, "citesOutgoingPerDoc");
+                        citesIncomingByRecentlyPublished = parseCitationInfo(citationInfo, "citesIncomingByRecentlyPublished");
+                        citesIncomingPerDocByRecentlyPublished = parseCitationInfo(citationInfo, "citesIncomingPerDocByRecentlyPublished");
+                        sjrArray = parseCitationInfo(citationInfo, "sjrIndex");
+                        snipArray = parseCitationInfo(citationInfo, "snipIndex");
+                    }
+                } else {
+                    throw new FetcherException(Localization.lang("ISSN and/or journal name not found in catalog"));
+                }
+            } else {
+                throw new FetcherException(Localization.lang("ISSN and/or journal name not found in catalog"));
+            }
+        } catch (JSONException e) {
+            throw new FetcherException(Localization.lang("Parsing error"), e);
+        }
+
+        return new JournalInformation(
+                title,
+                publisher,
+                coverageStartYear,
+                coverageEndYear,
+                subjectArea,
+                country,
+                categories,
+                scimagoId,
+                hIndex,
+                issn,
+                sjrArray,
+                snipArray,
+                docsThisYear,
+                docsPrevious3Years,
+                citableDocsPrevious3Years,
+                citesOutgoing,
+                citesOutgoingPerDoc,
+                citesIncomingByRecentlyPublished,
+                citesIncomingPerDocByRecentlyPublished
+        );
+    }
+
+    private static String getConcatenatedString(JSONObject jsonObject, String key) {
+        JSONArray jsonArray = jsonObject.optJSONArray(key);
+        if (jsonArray != null) {
+            return QUOTES_BRACKET_PATTERN.matcher(jsonArray.join(", ")).replaceAll("");
+        } else {
+            return "";
+        }
+    }
+
+    private JSONObject buildPostData(String issn, String journalName) {
+        String query = """
+                query GetJournal($issn: String, $name: String) {
+                  journal(issn: $issn, name: $name) {
+                    id
+                    name
+                    issn
+                    scimagoId
+                    country
+                    publisher
+                    areas
+                    categories
+                    citationInfo {
+                      year
+                      docsThisYear
+                      docsPrevious3Years
+                      citableDocsPrevious3Years
+                      citesOutgoing
+                      citesOutgoingPerDoc
+                      citesIncomingByRecentlyPublished
+                      citesIncomingPerDocByRecentlyPublished
+                      sjrIndex
+                    }
+                    hIndex
+                  }
+                }""";
+
+        JSONObject postData = new JSONObject();
+        postData.put("query", query);
+        postData.put("operationName", "GetJournal");
+
+        JSONObject variables = new JSONObject();
+        variables.put("issn", issn);
+        variables.put("name", journalName);
+        postData.put("variables", variables);
+
+        return postData;
+    }
+
+    private List<Pair<Integer, Double>> parseCitationInfo(JSONArray jsonArray, String key) {
+        List<Pair<Integer, Double>> parsedArray = new ArrayList<>();
+        Set<Integer> yearSet = new HashSet<>();
+
+        for (int i = 0; i < jsonArray.length(); i++) {
+            JSONObject item = jsonArray.getJSONObject(i);
+
+            if (item.has("year") && item.has(key)) {
+                int year = item.getInt("year");
+                double value = item.getDouble(key);
+                if (!yearSet.contains(year)) {
+                    parsedArray.add(new Pair<>(year, value));
+                    yearSet.add(year);
+                }
+            }
+        }
+
+        parsedArray.sort(Comparator.comparing(Pair::getKey));
+        return parsedArray;
+    }
+}
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/JstorFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/JstorFetcher.java
index 9e78db86377..4a168c70134 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/JstorFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/JstorFetcher.java
@@ -24,7 +24,6 @@
 import org.jabref.logic.net.URLDownload;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
-import org.jabref.model.util.DummyFileUpdateMonitor;
 
 import org.apache.http.client.utils.URIBuilder;
 import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
@@ -79,7 +78,7 @@ public URL getUrlForIdentifier(String identifier) throws FetcherException {
     @Override
     public Parser getParser() {
         return inputStream -> {
-            BibtexParser parser = new BibtexParser(importFormatPreferences, new DummyFileUpdateMonitor());
+            BibtexParser parser = new BibtexParser(importFormatPreferences);
             String text = new BufferedReader(
                     new InputStreamReader(inputStream, StandardCharsets.UTF_8)).lines().collect(Collectors.joining());
 
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/MathSciNet.java b/src/main/java/org/jabref/logic/importer/fetcher/MathSciNet.java
index 7266cb18215..e1b795c1062 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/MathSciNet.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/MathSciNet.java
@@ -9,8 +9,6 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 import org.jabref.logic.cleanup.DoiCleanup;
@@ -21,6 +19,7 @@
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.IdBasedParserFetcher;
 import org.jabref.logic.importer.ImportFormatPreferences;
+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.DefaultQueryTransformer;
@@ -32,14 +31,20 @@
 import org.jabref.model.entry.field.UnknownField;
 import org.jabref.model.util.DummyFileUpdateMonitor;
 
+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.jbibtex.TokenMgrException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Fetches data from the MathSciNet (http://www.ams.org/mathscinet)
  */
 public class MathSciNet implements SearchBasedParserFetcher, EntryBasedParserFetcher, IdBasedParserFetcher {
-
+    private static final Logger LOGGER = LoggerFactory.getLogger(MathSciNet.class);
     private final ImportFormatPreferences preferences;
 
     public MathSciNet(ImportFormatPreferences preferences) {
@@ -52,7 +57,7 @@ public String getName() {
     }
 
     /**
-     * We use MR Lookup (http://www.ams.org/mrlookup) instead of the usual search since this tool is also available
+     * We use MR Lookup (https://mathscinet.ams.org/mathscinet/freetools/mrlookup) instead of the usual search since this tool is also available
      * without subscription and, moreover, is optimized for finding a publication based on partial information.
      */
     @Override
@@ -63,51 +68,59 @@ public URL getURLForEntry(BibEntry entry) throws URISyntaxException, MalformedUR
             return getUrlForIdentifier(mrNumberInEntry.get());
         }
 
-        URIBuilder uriBuilder = new URIBuilder("https://mathscinet.ams.org/mrlookup");
-        uriBuilder.addParameter("format", "bibtex");
+        URIBuilder uriBuilder = new URIBuilder("https://mathscinet.ams.org/mathscinet/api/freetools/mrlookup");
 
-        entry.getFieldOrAlias(StandardField.TITLE).ifPresent(title -> uriBuilder.addParameter("ti", title));
-        entry.getFieldOrAlias(StandardField.AUTHOR).ifPresent(author -> uriBuilder.addParameter("au", author));
-        entry.getFieldOrAlias(StandardField.JOURNAL).ifPresent(journal -> uriBuilder.addParameter("jrnl", journal));
-        entry.getFieldOrAlias(StandardField.YEAR).ifPresent(year -> uriBuilder.addParameter("year", year));
+        uriBuilder.addParameter("author", entry.getFieldOrAlias(StandardField.AUTHOR).orElse(""));
+        uriBuilder.addParameter("title", entry.getFieldOrAlias(StandardField.TITLE).orElse(""));
+        uriBuilder.addParameter("journal", entry.getFieldOrAlias(StandardField.JOURNAL).orElse(""));
+        uriBuilder.addParameter("year", entry.getFieldOrAlias(StandardField.YEAR).orElse(""));
+        uriBuilder.addParameter("firstPage", "");
+        uriBuilder.addParameter("lastPage", "");
 
         return uriBuilder.build().toURL();
     }
 
     @Override
     public URL getURLForQuery(QueryNode luceneQuery) throws URISyntaxException, MalformedURLException, FetcherException {
-        URIBuilder uriBuilder = new URIBuilder("https://mathscinet.ams.org/mathscinet/search/publications.html");
+        URIBuilder uriBuilder = new URIBuilder("https://mathscinet.ams.org/mathscinet/publications-search");
         uriBuilder.addParameter("pg7", "ALLF"); // search all fields
         uriBuilder.addParameter("s7", new DefaultQueryTransformer().transformLuceneQuery(luceneQuery).orElse("")); // query
         uriBuilder.addParameter("r", "1"); // start index
         uriBuilder.addParameter("extend", "1"); // should return up to 100 items (instead of default 10)
         uriBuilder.addParameter("fmt", "bibtex"); // BibTeX format
+
         return uriBuilder.build().toURL();
     }
 
     @Override
     public URL getUrlForIdentifier(String identifier) throws URISyntaxException, MalformedURLException, FetcherException {
-        URIBuilder uriBuilder = new URIBuilder("https://mathscinet.ams.org/mathscinet/search/publications.html");
+        URIBuilder uriBuilder = new URIBuilder("https://mathscinet.ams.org/mathscinet/publications-search");
         uriBuilder.addParameter("pg1", "MR"); // search MR number
         uriBuilder.addParameter("s1", identifier); // identifier
         uriBuilder.addParameter("fmt", "bibtex"); // BibTeX format
+
         return uriBuilder.build().toURL();
     }
 
     @Override
     public Parser getParser() {
-        // MathSciNet returns the BibTeX result embedded in HTML
-        // So we extract the BibTeX string from the <pre>bibtex</pre> tags and pass the content to the BibTeX parser
         return inputStream -> {
             String response = new BufferedReader(new InputStreamReader(inputStream)).lines().collect(Collectors.joining(OS.NEWLINE));
 
             List<BibEntry> entries = new ArrayList<>();
-            BibtexParser bibtexParser = new BibtexParser(preferences, new DummyFileUpdateMonitor());
-            Pattern pattern = Pattern.compile("<pre>(?s)(.*)</pre>");
-            Matcher matcher = pattern.matcher(response);
-            while (matcher.find()) {
-                String bibtexEntryString = matcher.group();
-                entries.addAll(bibtexParser.parseEntries(bibtexEntryString));
+            try {
+                JSONObject jsonResponse = new JSONObject(response);
+                JSONArray entriesArray = jsonResponse.getJSONObject("all").getJSONArray("results");
+
+                BibtexParser bibtexParser = new BibtexParser(preferences, new DummyFileUpdateMonitor());
+
+                for (int i = 0; i < entriesArray.length(); i++) {
+                    String bibTexFormat = entriesArray.getJSONObject(i).getString("bibTexFormat");
+                    entries.addAll(bibtexParser.parseEntries(bibTexFormat));
+                }
+            } catch (JSONException | TokenMgrException e) {
+                LOGGER.error("An error occurred while parsing fetched data", e);
+                throw new ParseException("Error when parsing entry", e);
             }
             return entries;
         };
@@ -125,3 +138,4 @@ public void doPostCleanup(BibEntry entry) {
         entry.setCommentsBeforeEntry("");
     }
 }
+
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 b37eb30daed..f0cf950e1eb 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/MedlineFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/MedlineFetcher.java
@@ -77,11 +77,11 @@ private List<String> getPubMedIdsFromQuery(String query) throws FetcherException
 
                 switch (event) {
                     case XMLStreamConstants.START_ELEMENT:
-                        if (streamReader.getName().toString().equals("Count")) {
+                        if ("Count".equals(streamReader.getName().toString())) {
                             firstOccurrenceOfCount = true;
                         }
 
-                        if (streamReader.getName().toString().equals("IdList")) {
+                        if ("IdList".equals(streamReader.getName().toString())) {
                             fetchIDs = true;
                         }
                         break;
@@ -99,7 +99,7 @@ private List<String> getPubMedIdsFromQuery(String query) throws FetcherException
 
                     case XMLStreamConstants.END_ELEMENT:
                         // Everything relevant is listed before the IdList. So we break the loop right after the IdList tag closes.
-                        if (streamReader.getName().toString().equals("IdList")) {
+                        if ("IdList".equals(streamReader.getName().toString())) {
                             break fetchLoop;
                         }
                 }
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/Medra.java b/src/main/java/org/jabref/logic/importer/fetcher/Medra.java
index 0ce544ae7a2..22d457e9c1c 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/Medra.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/Medra.java
@@ -78,7 +78,7 @@ private BibEntry jsonItemToBibEntry(JSONObject item) throws ParseException {
     }
 
     private EntryType convertType(String type) {
-        return type.equals("article-journal") ? StandardEntryType.Article : StandardEntryType.Misc;
+        return "article-journal".equals(type) ? StandardEntryType.Article : StandardEntryType.Misc;
     }
 
     private String toAuthors(JSONArray authors) {
@@ -88,7 +88,7 @@ private String toAuthors(JSONArray authors) {
         // input: list of {"literal":"A."}
         return IntStream.range(0, authors.length())
                         .mapToObj(authors::getJSONObject)
-                        .map((author) -> author.has("literal") ? // quickly route through the literal string
+                        .map(author -> author.has("literal") ? // quickly route through the literal string
                                 new Author(author.getString("literal"), "", "", "", "") :
                                 new Author(author.optString("given", ""), "", "", author.optString("family", ""), ""))
                         .collect(AuthorList.collect())
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/MrDLibFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/MrDLibFetcher.java
index 5d9318edebc..6cad12a2190 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/MrDLibFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/MrDLibFetcher.java
@@ -101,8 +101,8 @@ private String makeServerRequest(String queryByTitle) throws FetcherException {
             String response = urlDownload.asString();
 
             // Conversion of < and >
-            response = response.replaceAll("&gt;", ">");
-            response = response.replaceAll("&lt;", "<");
+            response = response.replace("&gt;", ">");
+            response = response.replace("&lt;", "<");
             return response;
         } catch (IOException e) {
             throw new FetcherException("Problem downloading", e);
@@ -117,7 +117,7 @@ private String makeServerRequest(String queryByTitle) throws FetcherException {
      */
     private String constructQuery(String queryWithTitle) {
         // The encoding does not work for / so we convert them by our own
-        queryWithTitle = queryWithTitle.replaceAll("/", " ");
+        queryWithTitle = queryWithTitle.replace("/", " ");
         URIBuilder builder = new URIBuilder();
         builder.setScheme("http");
         builder.setHost(MDL_URL);
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/OpenAccessDoi.java b/src/main/java/org/jabref/logic/importer/fetcher/OpenAccessDoi.java
index b5290ca8cea..b7f91437772 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/OpenAccessDoi.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/OpenAccessDoi.java
@@ -21,7 +21,7 @@
 /**
  * A fulltext fetcher that uses <a href="https://oadoi.org/">oaDOI</a>.
  *
- * @implSpec API is documented at http://unpaywall.org/api/v2
+ * API is documented at http://unpaywall.org/api/v2
  */
 public class OpenAccessDoi implements FulltextFetcher {
     private static final Logger LOGGER = LoggerFactory.getLogger(FulltextFetcher.class);
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/ResearchGate.java b/src/main/java/org/jabref/logic/importer/fetcher/ResearchGate.java
index ca856474158..ca9236a3950 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/ResearchGate.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/ResearchGate.java
@@ -25,7 +25,6 @@
 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;
@@ -229,7 +228,7 @@ public List<BibEntry> performSearch(QueryNode luceneQuery) throws FetcherExcepti
 
         List<BibEntry> list = new ArrayList<>();
         for (String bib : urls) {
-            BibtexParser parser = new BibtexParser(formatPreferences, new DummyFileUpdateMonitor());
+            BibtexParser parser = new BibtexParser(formatPreferences);
             Optional<BibEntry> entry;
             try {
                 entry = parser.parseSingleEntry(bib);
@@ -243,7 +242,7 @@ public List<BibEntry> performSearch(QueryNode luceneQuery) throws FetcherExcepti
 
     private BufferedReader getInputStream(String urlString) {
         try {
-            URL url = new URL((urlString));
+            URL url = new URL(urlString);
             return new BufferedReader(new InputStreamReader(url.openStream()));
         } catch (IOException e) {
             LOGGER.debug("Wrong URL:", e);
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/RfcFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/RfcFetcher.java
index ca38ebe0d17..d846b346ccd 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/RfcFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/RfcFetcher.java
@@ -3,6 +3,7 @@
 import java.net.MalformedURLException;
 import java.net.URISyntaxException;
 import java.net.URL;
+import java.util.Locale;
 import java.util.Optional;
 
 import org.jabref.logic.help.HelpFile;
@@ -11,7 +12,6 @@
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.Parser;
 import org.jabref.logic.importer.fileformat.BibtexParser;
-import org.jabref.model.util.DummyFileUpdateMonitor;
 
 import org.apache.http.client.utils.URIBuilder;
 
@@ -47,21 +47,18 @@ public Optional<HelpFile> getHelpPage() {
      */
     @Override
     public URL getUrlForIdentifier(String identifier) throws URISyntaxException, MalformedURLException, FetcherException {
-
-        String prefixedIdentifier = identifier;
+        String prefixedIdentifier = identifier.toLowerCase(Locale.ENGLISH);
         // if not a "draft" version
-        if (!identifier.toLowerCase().startsWith(DRAFT_PREFIX)) {
+        if ((!prefixedIdentifier.startsWith(DRAFT_PREFIX)) && (!prefixedIdentifier.startsWith("rfc"))) {
             // Add "rfc" prefix if user's search entry was numerical
-            prefixedIdentifier = (!identifier.toLowerCase().startsWith("rfc")) ? "rfc" + prefixedIdentifier : prefixedIdentifier;
+            prefixedIdentifier = "rfc" + prefixedIdentifier;
         }
-
         URIBuilder uriBuilder = new URIBuilder("https://datatracker.ietf.org/doc/" + prefixedIdentifier + "/bibtex/");
-
         return uriBuilder.build().toURL();
     }
 
     @Override
     public Parser getParser() {
-        return new BibtexParser(importFormatPreferences, new DummyFileUpdateMonitor());
+        return new BibtexParser(importFormatPreferences);
     }
 }
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/SemanticScholar.java b/src/main/java/org/jabref/logic/importer/fetcher/SemanticScholar.java
index 76a96ad71f6..4d56eb7aa6d 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/SemanticScholar.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/SemanticScholar.java
@@ -102,7 +102,10 @@ public Optional<URL> findFullText(BibEntry entry) throws IOException, FetcherExc
             metaLinks = html.getElementsByClass("flex-paper-actions__button--primary");
             link = metaLinks.select("a").attr("href");
         }
-        LOGGER.info("Fulltext PDF found @ SemanticScholar.");
+        if (link.isBlank()) {
+            return Optional.empty();
+        }
+        LOGGER.info("Fulltext PDF found @ SemanticScholar. Link: {}", link);
         return Optional.of(new URL(link));
     }
 
@@ -185,7 +188,7 @@ private BibEntry jsonItemToBibEntry(JSONObject item) throws ParseException {
             entry.setField(StandardField.AUTHOR,
                     IntStream.range(0, item.optJSONArray("authors").length())
                              .mapToObj(item.optJSONArray("authors")::getJSONObject)
-                             .map((author) -> author.has("name") ? author.getString("name") : "")
+                             .map(author -> author.has("name") ? author.getString("name") : "")
                              .collect(Collectors.joining(" and ")));
 
             JSONObject externalIds = item.optJSONObject("externalIds");
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 e1764120e14..4815206a1ae 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/SpringerFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/SpringerFetcher.java
@@ -36,7 +36,7 @@
 /**
  * Fetches data from the Springer
  *
- * @implNote see <a href="https://dev.springernature.com/">API documentation</a> for more details
+ * @see <a href="https://dev.springernature.com/">API documentation</a> for more details
  */
 public class SpringerFetcher implements PagedSearchBasedParserFetcher, CustomizableKeyFetcher {
 
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/ZbMATH.java b/src/main/java/org/jabref/logic/importer/fetcher/ZbMATH.java
index eef84d495ef..51d1f734399 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/ZbMATH.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/ZbMATH.java
@@ -23,7 +23,6 @@
 import org.jabref.model.entry.field.AMSField;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.field.UnknownField;
-import org.jabref.model.util.DummyFileUpdateMonitor;
 
 import kong.unirest.HttpResponse;
 import kong.unirest.JsonNode;
@@ -125,7 +124,7 @@ public URL getUrlForIdentifier(String identifier) throws URISyntaxException, Mal
 
     @Override
     public Parser getParser() {
-        return new BibtexParser(preferences, new DummyFileUpdateMonitor());
+        return new BibtexParser(preferences);
     }
 
     @Override
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/isbntobibtex/IsbnFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/isbntobibtex/IsbnFetcher.java
index 579f13a7580..8b9fcd56e50 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/isbntobibtex/IsbnFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/isbntobibtex/IsbnFetcher.java
@@ -2,7 +2,9 @@
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Iterator;
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.regex.Pattern;
 
@@ -12,9 +14,10 @@
 import org.jabref.logic.importer.IdBasedFetcher;
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.fetcher.AbstractIsbnFetcher;
+import org.jabref.logic.importer.fetcher.GvkFetcher;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
-import org.jabref.model.strings.StringUtil;
+import org.jabref.model.entry.identifier.ISBN;
 import org.jabref.model.util.OptionalUtil;
 
 import org.slf4j.Logger;
@@ -33,11 +36,14 @@ public class IsbnFetcher implements EntryBasedFetcher, IdBasedFetcher {
     protected final ImportFormatPreferences importFormatPreferences;
     private final OpenLibraryIsbnFetcher openLibraryIsbnFetcher;
     private final List<AbstractIsbnFetcher> retryIsbnFetcher;
+    private final GvkFetcher gvkIbsnFetcher;
 
     public IsbnFetcher(ImportFormatPreferences importFormatPreferences) {
         this.importFormatPreferences = importFormatPreferences;
         this.openLibraryIsbnFetcher = new OpenLibraryIsbnFetcher(importFormatPreferences);
+        this.gvkIbsnFetcher = new GvkFetcher(importFormatPreferences);
         this.retryIsbnFetcher = new ArrayList<>();
+        this.addRetryFetcher(openLibraryIsbnFetcher);
     }
 
     @Override
@@ -52,32 +58,32 @@ public Optional<HelpFile> getHelpPage() {
 
     @Override
     public Optional<BibEntry> performSearchById(String identifier) throws FetcherException {
-        if (StringUtil.isBlank(identifier)) {
-            return Optional.empty();
-        }
-
         Optional<BibEntry> bibEntry = Optional.empty();
 
         try {
             identifier = removeNewlinesAndSpacesFromIdentifier(identifier);
-            bibEntry = openLibraryIsbnFetcher.performSearchById(identifier);
+            Optional<ISBN> isbn = ISBN.parse(identifier);
+            if (isbn.isPresent()) {
+                bibEntry = gvkIbsnFetcher.performSearchById(isbn.get().getNormalized());
+            }
         } catch (FetcherException ex) {
+            LOGGER.debug("Got a fetcher exception for IBSN search", ex);
             if (retryIsbnFetcher.isEmpty()) {
                 throw ex;
-            } else {
-                LOGGER.debug("Got a fetcher exception for IBSN search", ex);
-                LOGGER.debug("Try using the alternate ISBN fetchers to find an entry.");
             }
         } finally {
-            while (bibEntry.isEmpty() && retryIsbnFetcher.iterator().hasNext()) {
-                AbstractIsbnFetcher fetcher = retryIsbnFetcher.iterator().next();
-                LOGGER.debug("No entry found for ISBN=" + identifier + "; trying " + fetcher.getName() + " next.");
+            LOGGER.debug("Trying using the alternate ISBN fetchers to find an entry.");
+            // do not move the iterator in the loop as this would always return a new one and thus create and endless loop
+            Iterator<AbstractIsbnFetcher> iterator = retryIsbnFetcher.iterator();
+            while (bibEntry.isEmpty() && iterator.hasNext()) {
+                AbstractIsbnFetcher fetcher = iterator.next();
+                LOGGER.debug("No entry found for ISBN {}; trying {} next.", identifier, fetcher.getName());
                 bibEntry = fetcher.performSearchById(identifier);
             }
         }
 
         if (bibEntry.isEmpty()) {
-            LOGGER.debug("Could not found a entry for ISBN=" + identifier);
+            LOGGER.debug("Could not found a entry for ISBN {}", identifier);
         }
 
         return bibEntry;
@@ -94,9 +100,7 @@ public List<BibEntry> performSearch(BibEntry entry) throws FetcherException {
     }
 
     public IsbnFetcher addRetryFetcher(AbstractIsbnFetcher retryFetcher) {
-        if (retryFetcher == null) {
-            throw new IllegalArgumentException("Please provide a valid isbn fetcher.");
-        }
+        Objects.requireNonNull(retryFetcher, "Please provide a valid isbn fetcher.");
         retryIsbnFetcher.add(retryFetcher);
         return this;
     }
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/transformers/AbstractQueryTransformer.java b/src/main/java/org/jabref/logic/importer/fetcher/transformers/AbstractQueryTransformer.java
index 21d45a13952..0dad489964e 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/transformers/AbstractQueryTransformer.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/transformers/AbstractQueryTransformer.java
@@ -44,7 +44,7 @@ private Optional<String> transform(BooleanQueryNode query) {
                              .map(this::transform)
                              .flatMap(Optional::stream)
                              .collect(Collectors.joining(delimiter, "(", ")"));
-        if (result.equals("()")) {
+        if ("()".equals(result)) {
             return Optional.empty();
         }
         return Optional.of(result);
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/transformers/CiteSeerQueryTransformer.java b/src/main/java/org/jabref/logic/importer/fetcher/transformers/CiteSeerQueryTransformer.java
new file mode 100644
index 00000000000..626bb0240f3
--- /dev/null
+++ b/src/main/java/org/jabref/logic/importer/fetcher/transformers/CiteSeerQueryTransformer.java
@@ -0,0 +1,120 @@
+package org.jabref.logic.importer.fetcher.transformers;
+
+import java.util.Calendar;
+import java.util.Optional;
+
+import org.jabref.model.strings.StringUtil;
+
+import kong.unirest.json.JSONArray;
+import kong.unirest.json.JSONObject;
+
+public class CiteSeerQueryTransformer extends AbstractQueryTransformer {
+
+    private JSONObject payload = new JSONObject();
+
+    /**
+     * Default values for necessary parameters set in constructor
+     */
+    public CiteSeerQueryTransformer() {
+        handlePage("1");
+        handlePageSize("20");
+        this.getJSONPayload().put("must_have_pdf", "false");
+        handleSortBy("relevance");
+    }
+
+    @Override
+    protected String getLogicalAndOperator() {
+        return " ";
+    }
+
+    @Override
+    protected String getLogicalOrOperator() {
+        return " ";
+    }
+
+    @Override
+    protected String getLogicalNotOperator() {
+        return "";
+    }
+
+    @Override
+    protected String handleAuthor(String author) {
+        if (!getJSONPayload().has("author")) {
+            this.getJSONPayload().put("author", new JSONArray());
+        }
+        this.getJSONPayload().getJSONArray("author").put(author).toString();
+        return StringUtil.quoteStringIfSpaceIsContained(author);
+    }
+
+    @Override
+    protected String handleTitle(String title) {
+        this.getJSONPayload().put("queryString", title);
+        return StringUtil.quoteStringIfSpaceIsContained(title);
+    }
+
+    @Override
+    protected String handleJournal(String journalTitle) {
+        this.getJSONPayload().put("journal", journalTitle);
+        return StringUtil.quoteStringIfSpaceIsContained(journalTitle);
+    }
+
+    @Override
+    protected String handleYear(String year) {
+        this.getJSONPayload().put("yearStart", Integer.parseInt(year));
+        this.getJSONPayload().put("yearEnd", Integer.parseInt(year));
+        return StringUtil.quoteStringIfSpaceIsContained(year);
+    }
+
+    @Override
+    protected String handleYearRange(String yearRange) {
+         parseYearRange(yearRange);
+         if (endYear == Integer.MAX_VALUE) { // invalid year range
+             Calendar calendar = Calendar.getInstance();
+             this.getJSONPayload().put("yearEnd", calendar.get(Calendar.YEAR));
+             return "";
+         }
+         this.getJSONPayload().put("yearStart", startYear);
+         this.getJSONPayload().put("yearEnd", endYear);
+         return yearRange;
+    }
+
+    /**
+     * covers the five fields that are required to make a POST request
+     * except "must_have_pdf" as FullTextFetcher is not yet implemented for CiteSeer
+     */
+    @Override
+    protected Optional<String> handleOtherField(String fieldAsString, String term) {
+        return switch (fieldAsString) {
+            case "page" -> handlePage(term);
+            case "pageSize" -> handlePageSize(term);
+            case "must_have_pdf" -> handleMustHavePdf(term);
+            case "sortBy" -> handleSortBy(term);
+            default -> super.handleOtherField(fieldAsString, term);
+        };
+    }
+
+    // as mentioned before, there may be a Jabref constant for page/page-size
+    private Optional<String> handlePage(String page) {
+        this.getJSONPayload().put("page", StringUtil.intValueOf(page));
+        return Optional.of(page);
+    }
+
+    private Optional<String> handlePageSize(String pageSize) {
+        this.getJSONPayload().put("pageSize", StringUtil.intValueOf(pageSize));
+        return Optional.of(pageSize);
+    }
+
+    private Optional<String> handleMustHavePdf(String mustHavePdf) {
+        this.getJSONPayload().put("must_have_pdf", mustHavePdf);
+        return Optional.of(mustHavePdf);
+    }
+
+    private Optional<String> handleSortBy(String sortBy) {
+        this.getJSONPayload().put("sortBy", sortBy);
+        return Optional.of(sortBy);
+    }
+
+    public JSONObject getJSONPayload() {
+        return this.payload;
+    }
+}
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 b49cc5cf9ae..f0956cb5450 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/ACMPortalParser.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/ACMPortalParser.java
@@ -12,13 +12,14 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
-import java.util.StringJoiner;
 import java.util.stream.Collectors;
 
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.ParseException;
 import org.jabref.logic.importer.Parser;
 import org.jabref.logic.net.URLDownload;
+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;
@@ -150,14 +151,7 @@ public BibEntry parseBibEntry(String jsonStr) {
 
         if (jsonObject.has("author")) {
             JsonArray authors = jsonObject.getAsJsonArray("author");
-            StringJoiner authorsJoiner = new StringJoiner(" and ");
-            for (JsonElement author : authors) {
-                JsonObject authorJsonObject = author.getAsJsonObject();
-                authorsJoiner.add(
-                        authorJsonObject.get("given").getAsString() + " " + authorJsonObject.get("family").getAsString()
-                );
-            }
-            bibEntry.setField(StandardField.AUTHOR, authorsJoiner.toString());
+            bibEntry.setField(StandardField.AUTHOR, getAuthorsLastFirst(authors));
         }
 
         if (jsonObject.has("issued")) {
@@ -227,4 +221,24 @@ public BibEntry parseBibEntry(String jsonStr) {
 
         return bibEntry;
     }
+
+    private String getAuthorsLastFirst(JsonArray authors) {
+        List<Author> jabrefAuthors = new ArrayList<>();
+
+        for (JsonElement author : authors) {
+            JsonObject authorJsonObject = author.getAsJsonObject();
+
+            String given = null;
+            String family = null;
+            if (authorJsonObject.has("given")) {
+                given = authorJsonObject.get("given").getAsString();
+            }
+            if (authorJsonObject.has("family")) {
+                family = authorJsonObject.get("family").getAsString();
+            }
+            Author jabrefAuthor = new Author(given, null, null, family, null);
+            jabrefAuthors.add(jabrefAuthor);
+        }
+        return AuthorList.of(jabrefAuthors).getAsLastFirstNamesWithAnd(false);
+    }
 }
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 500a14a69c9..b3c17bc49ad 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/BibtexImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/BibtexImporter.java
@@ -13,7 +13,7 @@
 import java.util.Objects;
 import java.util.Optional;
 
-import org.jabref.logic.exporter.SavePreferences;
+import org.jabref.logic.exporter.SaveConfiguration;
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.Importer;
 import org.jabref.logic.importer.ParserResult;
@@ -150,26 +150,27 @@ private static Optional<Charset> getSuppliedEncoding(BufferedReader reader) {
             String line;
             while ((line = reader.readLine()) != null) {
                 line = line.trim();
-
+                // % = char 37, we might have some bom chars in front that we need to skip, so we use index of
+                var percentPos = line.indexOf('%', 0);
                 // Line does not start with %, so there are no comment lines for us and we can stop parsing
-                if (!line.startsWith("%")) {
+                if (percentPos == -1) {
                     return Optional.empty();
                 }
 
                 // Only keep the part after %
-                line = line.substring(1).trim();
+                line = line.substring(percentPos + 1).trim();
 
                 if (line.startsWith(BibtexImporter.SIGNATURE)) {
                     // Signature line, so keep reading and skip to next line
-                } else if (line.startsWith(SavePreferences.ENCODING_PREFIX)) {
+                } else if (line.startsWith(SaveConfiguration.ENCODING_PREFIX)) {
                     // Line starts with "Encoding: ", so the rest of the line should contain the name of the encoding
                     // Except if there is already a @ symbol signaling the starting of a BibEntry
                     Integer atSymbolIndex = line.indexOf('@');
                     String encoding;
                     if (atSymbolIndex > 0) {
-                        encoding = line.substring(SavePreferences.ENCODING_PREFIX.length(), atSymbolIndex);
+                        encoding = line.substring(SaveConfiguration.ENCODING_PREFIX.length(), atSymbolIndex);
                     } else {
-                        encoding = line.substring(SavePreferences.ENCODING_PREFIX.length());
+                        encoding = line.substring(SaveConfiguration.ENCODING_PREFIX.length());
                     }
 
                     return Optional.of(Charset.forName(encoding));
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 06981db0e72..a609d68ca8d 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/BibtexParser.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/BibtexParser.java
@@ -21,7 +21,7 @@
 import org.jabref.logic.bibtex.FieldContentFormatter;
 import org.jabref.logic.bibtex.FieldWriter;
 import org.jabref.logic.exporter.BibtexDatabaseWriter;
-import org.jabref.logic.exporter.SavePreferences;
+import org.jabref.logic.exporter.SaveConfiguration;
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.Importer;
 import org.jabref.logic.importer.ParseException;
@@ -41,6 +41,7 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.EntryTypeFactory;
 import org.jabref.model.metadata.MetaData;
+import org.jabref.model.util.DummyFileUpdateMonitor;
 import org.jabref.model.util.FileUpdateMonitor;
 
 import org.slf4j.Logger;
@@ -82,8 +83,12 @@ public class BibtexParser implements Parser {
 
     public BibtexParser(ImportFormatPreferences importFormatPreferences, FileUpdateMonitor fileMonitor) {
         this.importFormatPreferences = Objects.requireNonNull(importFormatPreferences);
-        fieldContentFormatter = new FieldContentFormatter(importFormatPreferences.fieldContentFormatterPreferences());
-        metaDataParser = new MetaDataParser(fileMonitor);
+        this.fieldContentFormatter = new FieldContentFormatter(importFormatPreferences.fieldPreferences());
+        this.metaDataParser = new MetaDataParser(fileMonitor);
+    }
+
+    public BibtexParser(ImportFormatPreferences importFormatPreferences) {
+        this(importFormatPreferences, new DummyFileUpdateMonitor());
     }
 
     /**
@@ -91,13 +96,10 @@ public BibtexParser(ImportFormatPreferences importFormatPreferences, FileUpdateM
      * <p>
      * It is undetermined which entry is returned, so use this in case you know there is only one entry in the string.
      *
-     * @param bibtexString
-     * @param fileMonitor
-     * @return An Optional&lt;BibEntry>. Optional.empty() if non was found or an error occurred.
-     * @throws ParseException
+     * @return An {@code Optional<BibEntry>. Optional.empty()} if non was found or an error occurred.
      */
-    public static Optional<BibEntry> singleFromString(String bibtexString, ImportFormatPreferences importFormatPreferences, FileUpdateMonitor fileMonitor) throws ParseException {
-        Collection<BibEntry> entries = new BibtexParser(importFormatPreferences, fileMonitor).parseEntries(bibtexString);
+    public static Optional<BibEntry> singleFromString(String bibtexString, ImportFormatPreferences importFormatPreferences) throws ParseException {
+        Collection<BibEntry> entries = new BibtexParser(importFormatPreferences).parseEntries(bibtexString);
         if ((entries == null) || entries.isEmpty()) {
             return Optional.empty();
         }
@@ -226,7 +228,9 @@ private ParserResult parseFileContent() throws IOException {
         }
 
         try {
-            parserResult.setMetaData(metaDataParser.parse(meta, importFormatPreferences.bibEntryPreferences().getKeywordSeparator()));
+            parserResult.setMetaData(metaDataParser.parse(
+                    meta,
+                    importFormatPreferences.bibEntryPreferences().getKeywordSeparator()));
         } catch (ParseException exception) {
             parserResult.addException(exception);
         }
@@ -355,8 +359,8 @@ private String dumpTextReadSoFarToString() {
             return purgeEOFCharacters(result);
         } else if (result.contains(BibtexDatabaseWriter.DATABASE_ID_PREFIX)) {
             return purge(result, BibtexDatabaseWriter.DATABASE_ID_PREFIX);
-        } else if (result.contains(SavePreferences.ENCODING_PREFIX)) {
-            return purge(result, SavePreferences.ENCODING_PREFIX);
+        } else if (result.contains(SaveConfiguration.ENCODING_PREFIX)) {
+            return purge(result, SaveConfiguration.ENCODING_PREFIX);
         } else {
             return result;
         }
@@ -617,7 +621,7 @@ private void parseField(BibEntry entry) throws IOException {
                 // for users if JabRef did not accept it.
                 if (field.getProperties().contains(FieldProperty.PERSON_NAMES)) {
                     entry.setField(field, entry.getField(field).get() + " and " + content);
-                } else if (StandardField.KEYWORDS.equals(field)) {
+                } else if (StandardField.KEYWORDS == field) {
                     // multiple keywords fields should be combined to one
                     entry.addKeyword(content, importFormatPreferences.bibEntryPreferences().getKeywordSeparator());
                 }
@@ -773,8 +777,6 @@ private String fixKey() throws IOException {
     /**
      * returns a new <code>StringBuilder</code> which corresponds to <code>toRemove</code> without whitespaces
      *
-     * @param toRemove
-     * @return
      */
     private StringBuilder removeWhitespaces(StringBuilder toRemove) {
         StringBuilder result = new StringBuilder();
@@ -791,7 +793,6 @@ private StringBuilder removeWhitespaces(StringBuilder toRemove) {
     /**
      * pushes buffer back into input
      *
-     * @param stringBuilder
      * @throws IOException can be thrown if buffer is bigger than LOOKAHEAD
      */
     private void unreadBuffer(StringBuilder stringBuilder) throws IOException {
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 afbe5af657d..a69d2c41991 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/CffImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/CffImporter.java
@@ -100,8 +100,8 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
         for (Map.Entry<String, String> property : citation.values.entrySet()) {
             if (fieldMap.containsKey(property.getKey())) {
                 entryMap.put(fieldMap.get(property.getKey()), property.getValue());
-            } else if (property.getKey().equals("type")) {
-                if (property.getValue().equals("dataset")) {
+            } else if ("type".equals(property.getKey())) {
+                if ("dataset".equals(property.getValue())) {
                     entryType = StandardEntryType.Dataset;
                 }
             } else if (getUnmappedFields().contains(property.getKey())) {
@@ -111,8 +111,8 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
 
         // Translate CFF author format to JabRef author format
         String authorStr = citation.authors.stream()
-                        .map((author) -> author.values)
-                        .map((vals) -> vals.get("name") != null ?
+                        .map(author -> author.values)
+                        .map(vals -> vals.get("name") != null ?
                                 new Author(vals.get("name"), "", "", "", "") :
                                 new Author(vals.get("given-names"), null, vals.get("name-particle"),
                                         vals.get("family-names"), vals.get("name-suffix")))
@@ -123,7 +123,7 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
         // Select DOI to keep
         if ((entryMap.get(StandardField.DOI) == null) && (citation.ids != null)) {
             List<CffIdentifier> doiIds = citation.ids.stream()
-                            .filter(id -> id.type.equals("doi"))
+                            .filter(id -> "doi".equals(id.type))
                             .collect(Collectors.toList());
             if (doiIds.size() == 1) {
                 entryMap.put(StandardField.DOI, doiIds.get(0).value);
@@ -133,7 +133,7 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
         // Select SWHID to keep
         if (citation.ids != null) {
             List<String> swhIds = citation.ids.stream()
-                                           .filter(id -> id.type.equals("swh"))
+                                           .filter(id -> "swh".equals(id.type))
                                            .map(id -> id.value)
                                            .collect(Collectors.toList());
 
@@ -142,7 +142,7 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
             } 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"))
+                                               .filter(id -> "rel".equals(id.split(":")[2]))
                                                .collect(Collectors.toList());
                 if (relSwhIds.size() == 1) {
                     entryMap.put(BiblatexSoftwareField.SWHID, relSwhIds.get(0));
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/CitaviXmlImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/CitaviXmlImporter.java
index c7f78d794ac..65ff437c7bc 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/CitaviXmlImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/CitaviXmlImporter.java
@@ -134,9 +134,7 @@ 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;
+            if (unmarshalledObject instanceof CitaviExchangeData data) {
                 List<BibEntry> bibEntries = parseDataList(data);
 
                 return new ParserResult(bibEntries);
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/CiteSeerParser.java b/src/main/java/org/jabref/logic/importer/fileformat/CiteSeerParser.java
new file mode 100644
index 00000000000..83ec9168171
--- /dev/null
+++ b/src/main/java/org/jabref/logic/importer/fileformat/CiteSeerParser.java
@@ -0,0 +1,65 @@
+package org.jabref.logic.importer.fileformat;
+
+import java.net.CookieHandler;
+import java.net.CookieManager;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+import org.jabref.logic.importer.AuthorListParser;
+import org.jabref.logic.importer.ParseException;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.field.StandardField;
+import org.jabref.model.strings.StringUtil;
+
+import kong.unirest.json.JSONArray;
+import kong.unirest.json.JSONObject;
+
+public class CiteSeerParser {
+
+    public List<BibEntry> parseCiteSeerResponse(JSONArray jsonResponse) throws ParseException {
+        List<BibEntry> response = new ArrayList<>();
+        CookieHandler.setDefault(new CookieManager());
+        for (int i = 0; i < jsonResponse.length(); ++i) {
+            response.add(parseBibEntry(jsonResponse.getJSONObject(i)));
+        }
+        return response;
+    }
+
+    /***
+     * WARNING: The DOI for each parsed BibEntry is not a valid DOI.
+     * Cite Seer associates an id with each response as a unique hash.
+     * However, it is not a valid variation of a DOI value.
+     *
+     * @param jsonObj Search response as a JSON Object
+     * @return BibEntry
+     * @throws ParseException
+     */
+    private BibEntry parseBibEntry(JSONObject jsonObj) throws ParseException {
+        BibEntry bibEntry = new BibEntry();
+        bibEntry.setField(StandardField.DOI, jsonObj.optString("id"));
+        bibEntry.setField(StandardField.TITLE, jsonObj.optString("title"));
+        bibEntry.setField(StandardField.VENUE, jsonObj.optString("venue"));
+        bibEntry.setField(StandardField.YEAR, jsonObj.optString("year"));
+        bibEntry.setField(StandardField.PUBLISHER, jsonObj.optString("publisher"));
+        bibEntry.setField(StandardField.ABSTRACT, jsonObj.optString("abstract"));
+        bibEntry.setField(StandardField.AUTHOR, parseAuthors(Optional.ofNullable(jsonObj.optJSONArray("authors"))));
+        bibEntry.setField(StandardField.JOURNAL, jsonObj.optString("journal"));
+        bibEntry.setField(StandardField.URL, jsonObj.optString("source"));
+        return bibEntry;
+    }
+
+    private String parseAuthors(Optional<JSONArray> authorsOpt) {
+        if (!authorsOpt.isPresent()) {
+            return "";
+        }
+        String separator = " and ";
+        JSONArray authorsArray = authorsOpt.get();
+        StringBuilder authorsStringBuilder = new StringBuilder();
+        for (int i = 0; i < authorsArray.length() - 1; i++) {
+            authorsStringBuilder.append(StringUtil.shaveString(authorsArray.getString(i))).append(separator);
+        }
+        authorsStringBuilder.append(authorsArray.getString(authorsArray.length() - 1));
+        return new AuthorListParser().parse(authorsStringBuilder.toString()).getAsLastFirstNamesWithAnd(false);
+    }
+}
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/CoinsParser.java b/src/main/java/org/jabref/logic/importer/fileformat/CoinsParser.java
index 9763529fb85..86e5bb01750 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/CoinsParser.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/CoinsParser.java
@@ -19,7 +19,7 @@
 import org.jabref.model.entry.types.StandardEntryType;
 
 /**
- * @implNote implemented by reverse-engineering <a href="https://github.com/SeerLabs/CiteSeerX/blob/4df28a98083be2829ec4c56ebbac09eb7772d379/src/java/edu/psu/citeseerx/domain/BiblioTransformer.java#L155-L249">the implementation by CiteSeerX</a>
+ * implemented by reverse-engineering <a href="https://github.com/SeerLabs/CiteSeerX/blob/4df28a98083be2829ec4c56ebbac09eb7772d379/src/java/edu/psu/citeseerx/domain/BiblioTransformer.java#L155-L249">the implementation by CiteSeerX</a>
  */
 public class CoinsParser implements Parser {
 
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 956e343816a..f928de20875 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/CustomImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/CustomImporter.java
@@ -9,6 +9,7 @@
 import java.util.List;
 import java.util.Objects;
 
+import org.jabref.logic.importer.ImportException;
 import org.jabref.logic.importer.Importer;
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.logic.util.FileType;
@@ -25,21 +26,21 @@ public class CustomImporter extends Importer {
 
     private final Importer importer;
 
-    public CustomImporter(String basePath, String className) throws ClassNotFoundException {
+    public CustomImporter(String basePath, String className) throws ImportException {
         this.basePath = Path.of(basePath);
         this.className = className;
         try {
             importer = load(this.basePath.toUri().toURL(), this.className);
-        } catch (IOException | InstantiationException | IllegalAccessException exception) {
-            throw new ClassNotFoundException("", exception);
+        } catch (IOException | ReflectiveOperationException exception) {
+            throw new ImportException(exception);
         }
     }
 
     private static Importer load(URL basePathURL, String className)
-            throws IOException, ClassNotFoundException, InstantiationException, IllegalAccessException {
-        try (URLClassLoader cl = new URLClassLoader(new URL[] {basePathURL})) {
+            throws IOException, ReflectiveOperationException {
+        try (URLClassLoader cl = new URLClassLoader(new URL[]{basePathURL})) {
             Class<?> clazz = Class.forName(className, true, cl);
-            return (Importer) clazz.newInstance();
+            return (Importer) clazz.getDeclaredConstructor().newInstance();
         }
     }
 
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 73edaa07433..9134f9288e6 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/EndnoteXmlImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/EndnoteXmlImporter.java
@@ -7,61 +7,38 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
+import java.util.Map;
 import java.util.Objects;
-import java.util.Optional;
-import java.util.stream.Collectors;
 
+import javax.xml.XMLConstants;
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
+import javax.xml.stream.events.XMLEvent;
 
 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;
-import org.jabref.logic.importer.fileformat.endnote.Abstract;
-import org.jabref.logic.importer.fileformat.endnote.Authors;
-import org.jabref.logic.importer.fileformat.endnote.Contributors;
-import org.jabref.logic.importer.fileformat.endnote.Dates;
-import org.jabref.logic.importer.fileformat.endnote.ElectronicResourceNum;
-import org.jabref.logic.importer.fileformat.endnote.Isbn;
-import org.jabref.logic.importer.fileformat.endnote.Keyword;
-import org.jabref.logic.importer.fileformat.endnote.Keywords;
-import org.jabref.logic.importer.fileformat.endnote.Label;
-import org.jabref.logic.importer.fileformat.endnote.Notes;
-import org.jabref.logic.importer.fileformat.endnote.Number;
-import org.jabref.logic.importer.fileformat.endnote.Pages;
-import org.jabref.logic.importer.fileformat.endnote.PdfUrls;
-import org.jabref.logic.importer.fileformat.endnote.Publisher;
-import org.jabref.logic.importer.fileformat.endnote.Record;
-import org.jabref.logic.importer.fileformat.endnote.RefType;
-import org.jabref.logic.importer.fileformat.endnote.RelatedUrls;
-import org.jabref.logic.importer.fileformat.endnote.SecondaryTitle;
-import org.jabref.logic.importer.fileformat.endnote.Style;
-import org.jabref.logic.importer.fileformat.endnote.Title;
-import org.jabref.logic.importer.fileformat.endnote.Titles;
-import org.jabref.logic.importer.fileformat.endnote.Url;
-import org.jabref.logic.importer.fileformat.endnote.Urls;
-import org.jabref.logic.importer.fileformat.endnote.Volume;
-import org.jabref.logic.importer.fileformat.endnote.Xml;
-import org.jabref.logic.importer.fileformat.endnote.Year;
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.KeywordList;
 import org.jabref.model.entry.LinkedFile;
+import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.field.UnknownField;
 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 org.jabref.model.util.OptionalUtil;
 
-import jakarta.xml.bind.JAXBContext;
-import jakarta.xml.bind.JAXBException;
-import jakarta.xml.bind.Unmarshaller;
+import com.google.common.base.Joiner;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -74,12 +51,15 @@ public class EndnoteXmlImporter extends Importer implements Parser {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(EndnoteXmlImporter.class);
     private final ImportFormatPreferences preferences;
-    private Unmarshaller unmarshaller;
 
     public EndnoteXmlImporter(ImportFormatPreferences preferences) {
         this.preferences = preferences;
     }
 
+    private static String join(List<String> list, String string) {
+        return Joiner.on(string).join(list);
+    }
+
     @Override
     public String getName() {
         return "EndNote XML";
@@ -115,51 +95,110 @@ public boolean isRecognizedFormat(BufferedReader reader) throws IOException {
     }
 
     @Override
-    public ParserResult importDatabase(BufferedReader reader) throws IOException {
-        Objects.requireNonNull(reader);
+    public ParserResult importDatabase(BufferedReader input) throws IOException {
+        Objects.requireNonNull(input);
+
+        List<BibEntry> bibItems = new ArrayList<>();
 
         try {
-            Object unmarshalledObject = unmarshallRoot(reader);
-
-            if (unmarshalledObject instanceof Xml) {
-                // Check whether we have an article set, an article, a book article or a book article set
-                Xml root = (Xml) unmarshalledObject;
-                List<BibEntry> bibEntries = root
-                        .getRecords().getRecord()
-                        .stream()
-                        .map(this::parseRecord)
-                        .collect(Collectors.toList());
-
-                return new ParserResult(bibEntries);
-            } else {
-                return ParserResult.fromErrorMessage("File does not start with xml tag.");
+            XMLInputFactory xmlInputFactory = XMLInputFactory.newInstance();
+
+            // prevent xxe (https://rules.sonarsource.com/java/RSPEC-2755)
+            xmlInputFactory.setProperty(XMLConstants.ACCESS_EXTERNAL_SCHEMA, "");
+            // required for reading Unicode characters such as &#xf6;
+            xmlInputFactory.setProperty(XMLInputFactory.IS_COALESCING, true);
+
+            XMLStreamReader reader = xmlInputFactory.createXMLStreamReader(input);
+
+            while (reader.hasNext()) {
+                reader.next();
+                if (isStartXMLEvent(reader)) {
+                    String elementName = reader.getName().getLocalPart();
+                    if ("record".equals(elementName)) {
+                         parseRecord(reader, bibItems, elementName);
+                    }
+                }
             }
-        } catch (JAXBException | XMLStreamException e) {
+        } catch (XMLStreamException e) {
             LOGGER.debug("could not parse document", e);
             return ParserResult.fromError(e);
         }
+        return new ParserResult(bibItems);
     }
 
-    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();
+    private void parseRecord(XMLStreamReader reader, List<BibEntry> bibItems, String startElement)
+        throws XMLStreamException {
+
+        Map<Field, String> fields = new HashMap<>();
+        EntryType entryType = StandardEntryType.Article;
+
+        KeywordList keywordList = new KeywordList();
+        List<LinkedFile> linkedFiles = new ArrayList<>();
+
+        while (reader.hasNext()) {
+            reader.next();
+            if (isStartXMLEvent(reader)) {
+                String elementName = reader.getName().getLocalPart();
+                switch (elementName) {
+                    case "ref-type" -> {
+                        String type = reader.getAttributeValue(null, "name");
+                        entryType = convertRefNameToType(type);
+                    }
+                    case "contributors" -> {
+                        handleAuthorList(reader, fields, elementName);
+                    }
+                    case "titles" -> {
+                        handleTitles(reader, fields, elementName);
+                    }
+                    case "pages" -> {
+                        parseStyleContent(reader, fields, StandardField.PAGES, elementName);
+                    }
+                    case "volume" -> {
+                        parseStyleContent(reader, fields, StandardField.VOLUME, elementName);
+                    }
+                    case "number" -> {
+                        parseStyleContent(reader, fields, StandardField.NUMBER, elementName);
+                    }
+                    case "dates" -> {
+                        parseYear(reader, fields);
+                    }
+                    case "notes" -> {
+                        parseStyleContent(reader, fields, StandardField.NOTE, elementName);
+                    }
+                    case "urls" -> {
+                       handleUrlList(reader, fields, linkedFiles);
+                    }
+                    case "keywords" -> {
+                        handleKeywordsList(reader, keywordList, elementName);
+                    }
+                    case "abstract" -> {
+                        parseStyleContent(reader, fields, StandardField.ABSTRACT, elementName);
+                    }
+                    case "isbn" -> {
+                        parseStyleContent(reader, fields, StandardField.ISBN, elementName);
+                    }
+                    case "electronic-resource-num" -> {
+                        parseStyleContent(reader, fields, StandardField.DOI, elementName);
+                    }
+                    case "publisher" -> {
+                        parseStyleContent(reader, fields, StandardField.PUBLISHER, elementName);
+                    }
+                    case "label" -> {
+                        parseStyleContent(reader, fields, new UnknownField("endnote-label"), elementName);
+                    }
+                }
+            }
+            if (isEndXMLEvent(reader) && reader.getName().getLocalPart().equals(startElement)) {
+                break;
+            }
         }
 
-        return unmarshaller.unmarshal(xmlStreamReader);
-    }
+        BibEntry entry = new BibEntry(entryType);
+        entry.putKeywords(keywordList, preferences.bibEntryPreferences().getKeywordSeparator());
 
-    private void initUnmarshaller() throws JAXBException {
-        if (unmarshaller == null) {
-            // Lazy init because this is expensive
-            JAXBContext context = JAXBContext.newInstance("org.jabref.logic.importer.fileformat.endnote");
-            unmarshaller = context.createUnmarshaller();
-        }
+        entry.setField(fields);
+        entry.setFiles(linkedFiles);
+        bibItems.add(entry);
     }
 
     private static EntryType convertRefNameToType(String refName) {
@@ -174,156 +213,258 @@ private static EntryType convertRefNameToType(String refName) {
         };
     }
 
-    private BibEntry parseRecord(Record endNoteRecord) {
-        BibEntry entry = new BibEntry();
-
-        entry.setType(getType(endNoteRecord));
-        Optional.ofNullable(getAuthors(endNoteRecord))
-                .ifPresent(value -> entry.setField(StandardField.AUTHOR, value));
-        Optional.ofNullable(endNoteRecord.getTitles())
-                .map(Titles::getTitle)
-                .map(Title::getStyle)
-                .map(this::mergeStyleContents)
-                .ifPresent(value -> entry.setField(StandardField.TITLE, clean(value)));
-        Optional.ofNullable(endNoteRecord.getTitles())
-                .map(Titles::getSecondaryTitle)
-                .map(SecondaryTitle::getStyle)
-                .map(Style::getContent)
-                .ifPresent(value -> entry.setField(StandardField.JOURNAL, clean(value)));
-        Optional.ofNullable(endNoteRecord.getPages())
-                .map(Pages::getStyle)
-                .map(Style::getContent)
-                .ifPresent(value -> entry.setField(StandardField.PAGES, value));
-        Optional.ofNullable(endNoteRecord.getNumber())
-                .map(Number::getStyle)
-                .map(Style::getContent)
-                .ifPresent(value -> entry.setField(StandardField.NUMBER, value));
-        Optional.ofNullable(endNoteRecord.getVolume())
-                .map(Volume::getStyle)
-                .map(Style::getContent)
-                .ifPresent(value -> entry.setField(StandardField.VOLUME, value));
-        Optional.ofNullable(endNoteRecord.getDates())
-                .map(Dates::getYear)
-                .map(Year::getStyle)
-                .map(Style::getContent)
-                .ifPresent(value -> entry.setField(StandardField.YEAR, value));
-        Optional.ofNullable(endNoteRecord.getNotes())
-                .map(Notes::getStyle)
-                .map(Style::getContent)
-                .ifPresent(value -> entry.setField(StandardField.NOTE, value.trim()));
-        getUrl(endNoteRecord)
-                .ifPresent(value -> entry.setField(StandardField.URL, value));
-        entry.putKeywords(getKeywords(endNoteRecord), preferences.bibEntryPreferences().getKeywordSeparator());
-        Optional.ofNullable(endNoteRecord.getAbstract())
-                .map(Abstract::getStyle)
-                .map(Style::getContent)
-                .ifPresent(value -> entry.setField(StandardField.ABSTRACT, value.trim()));
-        entry.setFiles(getLinkedFiles(endNoteRecord));
-        Optional.ofNullable(endNoteRecord.getIsbn())
-                .map(Isbn::getStyle)
-                .map(Style::getContent)
-                .ifPresent(value -> entry.setField(StandardField.ISBN, clean(value)));
-        Optional.ofNullable(endNoteRecord.getElectronicResourceNum())
-                .map(ElectronicResourceNum::getStyle)
-                .map(Style::getContent)
-                .ifPresent(doi -> entry.setField(StandardField.DOI, doi.trim()));
-        Optional.ofNullable(endNoteRecord.getPublisher())
-                .map(Publisher::getStyle)
-                .map(Style::getContent)
-                .ifPresent(value -> entry.setField(StandardField.PUBLISHER, value));
-        Optional.ofNullable(endNoteRecord.getLabel())
-                .map(Label::getStyle)
-                .map(Style::getContent)
-                .ifPresent(value -> entry.setField(new UnknownField("endnote-label"), value));
-
-        return entry;
+    private void handleAuthorList(XMLStreamReader reader, Map<Field, String> fields, String startElement) throws XMLStreamException {
+        List<String> authorNames = new ArrayList<>();
+
+        while (reader.hasNext()) {
+            reader.next();
+            if (isStartXMLEvent(reader)) {
+                String elementName = reader.getName().getLocalPart();
+                switch (elementName) {
+                    case "author" -> {
+                        parseAuthor(reader, authorNames);
+                    }
+                }
+            }
+
+            if (isEndXMLEvent(reader) && reader.getName().getLocalPart().equals(startElement)) {
+                break;
+            }
+        }
+        fields.put(StandardField.AUTHOR, join(authorNames, " and "));
     }
 
-    private EntryType getType(Record endNoteRecord) {
-        return Optional.ofNullable(endNoteRecord.getRefType())
-                       .map(RefType::getName)
-                       .map(EndnoteXmlImporter::convertRefNameToType)
-                       .orElse(StandardEntryType.Article);
+    private void parseAuthor(XMLStreamReader reader, List<String> authorNames) throws XMLStreamException {
+
+        while (reader.hasNext()) {
+            reader.next();
+            if (isStartXMLEvent(reader)) {
+                String elementName = reader.getName().getLocalPart();
+                switch (elementName) {
+                    case "style" -> {
+                        reader.next();
+                        if (isCharacterXMLEvent(reader)) {
+                            authorNames.add(reader.getText());
+                        }
+                    }
+                }
+            }
+
+            if (isEndXMLEvent(reader) && "author".equals(reader.getName().getLocalPart())) {
+                break;
+            }
+        }
     }
 
-    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())
-                           .flatMap(url -> OptionalUtil.toStream(getUrlValue(url)))
-                           .map(url -> {
-                               try {
-                                   return new LinkedFile(new URL(url), "PDF");
-                               } catch (MalformedURLException e) {
-                                   LOGGER.info("Unable to parse {}", url);
-                                   return null;
-                               }
-                           })
-                           .collect(Collectors.toList());
+    private void parseStyleContent(XMLStreamReader reader, Map<Field, String> fields, Field field, String elementName) throws XMLStreamException {
+        while (reader.hasNext()) {
+            reader.next();
+            if (isStartXMLEvent(reader)) {
+                String tag = reader.getName().getLocalPart();
+                if ("style".equals(tag)) {
+                    reader.next();
+                    if (isCharacterXMLEvent(reader)) {
+                        if ("abstract".equals(elementName) || "electronic-resource-num".equals(elementName) || "notes".equals(elementName)) {
+                            putIfValueNotNull(fields, field, reader.getText().trim());
+                        } else if ("isbn".equals(elementName) || "secondary-title".equals(elementName)) {
+                            putIfValueNotNull(fields, field, clean(reader.getText()));
+                        } else {
+                            putIfValueNotNull(fields, field, reader.getText());
+                        }
+                    }
+                }
+            }
+            if (isEndXMLEvent(reader) && reader.getName().getLocalPart().equals(elementName)) {
+                break;
+            }
+        }
     }
 
-    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())
-                           .flatMap(url -> OptionalUtil.toStream(getUrlValue(url)))
-                           .findFirst();
+    private void parseYear(XMLStreamReader reader, Map<Field, String> fields) throws XMLStreamException {
+        while (reader.hasNext()) {
+            reader.next();
+            if (isStartXMLEvent(reader)) {
+                String elementName = reader.getName().getLocalPart();
+                switch (elementName) {
+                    case "style" -> {
+                        reader.next();
+                        if (isCharacterXMLEvent(reader)) {
+                            putIfValueNotNull(fields, StandardField.YEAR, reader.getText());
+                        }
+                    }
+                }
+            }
+
+            if (isEndXMLEvent(reader) && "year".equals(reader.getName().getLocalPart())) {
+                break;
+            }
+        }
     }
 
-    private String mergeStyleContents(List<Style> styles) {
-        return styles.stream().map(Style::getContent).collect(Collectors.joining());
+    private void handleKeywordsList(XMLStreamReader reader, KeywordList keywordList, String startElement) throws XMLStreamException {
+
+        while (reader.hasNext()) {
+            reader.next();
+            if (isStartXMLEvent(reader)) {
+                String elementName = reader.getName().getLocalPart();
+                switch (elementName) {
+                    case "keyword" -> {
+                        parseKeyword(reader, keywordList);
+                    }
+                }
+            }
+            if (isEndXMLEvent(reader) && reader.getName().getLocalPart().equals(startElement)) {
+                break;
+            }
+        }
     }
 
-    private Optional<String> getUrlValue(Url url) {
-        Optional<List<Object>> urlContent = Optional.ofNullable(url).map(Url::getContent);
-        List<Object> list = urlContent.orElse(Collections.emptyList());
-        Optional<String> ret;
-        if (list.size() == 0) {
-            return Optional.empty();
-        } else {
-            boolean isStyleExist = false;
-            int style_index = -1;
-            for (int i = 0; i < list.size(); i++) {
-                if (list.get(i) instanceof Style) {
-                    isStyleExist = true;
-                    style_index = i;
+    private void parseKeyword(XMLStreamReader reader, KeywordList keywordList) throws XMLStreamException {
+
+        while (reader.hasNext()) {
+            reader.next();
+            if (isStartXMLEvent(reader)) {
+                String elementName = reader.getName().getLocalPart();
+                switch (elementName) {
+                    case "style" -> {
+                        reader.next();
+                        if (isCharacterXMLEvent(reader)) {
+                            if (reader.getText() != null) {
+                                keywordList.add(reader.getText());
+                            }
+                        }
+                    }
                 }
             }
-            if (!isStyleExist) {
-                ret = Optional.ofNullable((String) list.get(0))
-                        .map(this::clean);
-            } else {
-                ret = Optional.ofNullable((Style) list.get(style_index))
-                        .map(Style::getContent)
-                        .map(this::clean);
+
+            if (isEndXMLEvent(reader) && "keyword".equals(reader.getName().getLocalPart())) {
+                break;
             }
         }
-        return ret;
     }
 
-    private List<String> getKeywords(Record endNoteRecord) {
-        Keywords keywords = endNoteRecord.getKeywords();
-        if (keywords != null) {
-            return keywords.getKeyword()
-                           .stream()
-                           .map(Keyword::getStyle)
-                           .filter(Objects::nonNull)
-                           .map(Style::getContent)
-                           .collect(Collectors.toList());
-        } else {
-            return Collections.emptyList();
+    private void handleTitles(XMLStreamReader reader, Map<Field, String> fields, String startElement) throws XMLStreamException {
+
+        while (reader.hasNext()) {
+            reader.next();
+            if (isStartXMLEvent(reader)) {
+                String elementName = reader.getName().getLocalPart();
+                switch (elementName) {
+                    case "title" -> {
+                        List<String> titleStyleContent = new ArrayList<>();
+                        while (reader.hasNext()) {
+                            reader.next();
+                            if (isStartXMLEvent(reader)) {
+                                String tag = reader.getName().getLocalPart();
+                                if ("style".equals(tag)) {
+                                    reader.next();
+                                    if (isCharacterXMLEvent(reader)) {
+                                        if (reader.getText() != null) {
+                                            titleStyleContent.add((reader.getText()));
+                                        }
+                                    }
+                                }
+                            }
+                            if (isEndXMLEvent(reader) && reader.getName().getLocalPart().equals(elementName)) {
+                                break;
+                            }
+                        }
+                        putIfValueNotNull(fields, StandardField.TITLE, clean(join(titleStyleContent, "")));
+                    }
+                    case "secondary-title" -> {
+                        parseStyleContent(reader, fields, StandardField.JOURNAL, elementName);
+                    }
+                }
+            }
+
+            if (isEndXMLEvent(reader) && reader.getName().getLocalPart().equals(startElement)) {
+                break;
+            }
         }
     }
 
-    private String getAuthors(Record endNoteRecord) {
-        Optional<Authors> authors = Optional.ofNullable(endNoteRecord.getContributors())
-                                            .map(Contributors::getAuthors);
-        return OptionalUtil.toStream(authors)
-                           .flatMap(value -> value.getAuthor().stream())
-                           .map(author -> author.getStyle().getContent())
-                           .collect(Collectors.joining(" and "));
+    private void handleUrlList(XMLStreamReader reader, Map<Field, String> fields, List<LinkedFile> linkedFiles) throws XMLStreamException {
+        while (reader.hasNext()) {
+            reader.next();
+            if (isStartXMLEvent(reader)) {
+                String elementName = reader.getName().getLocalPart();
+                switch (elementName) {
+                    case "related-urls" -> {
+                        parseRelatedUrls(reader, fields);
+                    }
+                    case "pdf-urls" -> {
+                        parsePdfUrls(reader, fields, linkedFiles);
+                    }
+                }
+            }
+
+            if (isEndXMLEvent(reader) && "urls".equals(reader.getName().getLocalPart())) {
+                break;
+            }
+        }
+    }
+
+    private void parseRelatedUrls(XMLStreamReader reader, Map<Field, String> fields) throws XMLStreamException {
+
+        while (reader.hasNext()) {
+            reader.next();
+            if (isStartXMLEvent(reader)) {
+                String elementName = reader.getName().getLocalPart();
+                if ("style".equals(elementName)) {
+                    reader.next();
+                    if (isCharacterXMLEvent(reader)) {
+                        putIfValueNotNull(fields, StandardField.URL, reader.getText());
+                    }
+                }
+            } else if (isCharacterXMLEvent(reader)) {
+                String value = clean(reader.getText());
+                if (value.length() > 0) {
+                    putIfValueNotNull(fields, StandardField.URL, clean(value));
+                }
+            }
+
+            if (isEndXMLEvent(reader) && "related-urls".equals(reader.getName().getLocalPart())) {
+                break;
+            }
+        }
+    }
+
+    private void parsePdfUrls(XMLStreamReader reader, Map<Field, String> fields, List<LinkedFile> linkedFiles) throws XMLStreamException {
+
+        while (reader.hasNext()) {
+            reader.next();
+            if (isStartXMLEvent(reader)) {
+                String elementName = reader.getName().getLocalPart();
+                if ("url".equals(elementName)) {
+                    reader.next();
+                    if (isStartXMLEvent(reader)) {
+                        String tagName = reader.getName().getLocalPart();
+                        if ("style".equals(tagName)) {
+                            reader.next();
+                            if (isCharacterXMLEvent(reader)) {
+                                try {
+                                    linkedFiles.add(new LinkedFile(new URL(reader.getText()), "PDF"));
+                                } catch (
+                                        MalformedURLException e) {
+                                    LOGGER.info("Unable to parse {}", reader.getText());
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            if (isCharacterXMLEvent(reader)) {
+                try {
+                    linkedFiles.add(new LinkedFile(new URL(reader.getText()), "PDF"));
+                } catch (
+                        MalformedURLException e) {
+                    LOGGER.info("Unable to parse {}", reader.getText());
+                }
+            }
+            if (isEndXMLEvent(reader) && "pdf-urls".equals(reader.getName().getLocalPart())) {
+                break;
+            }
+        }
     }
 
     private String clean(String input) {
@@ -332,8 +473,26 @@ private String clean(String input) {
                          .replaceAll(" +", " ");
     }
 
+    private void putIfValueNotNull(Map<Field, String> fields, Field field, String value) {
+        if (value != null) {
+            fields.put(field, value);
+        }
+    }
+
+    private boolean isCharacterXMLEvent(XMLStreamReader reader) {
+        return reader.getEventType() == XMLEvent.CHARACTERS;
+    }
+
+    private boolean isStartXMLEvent(XMLStreamReader reader) {
+        return reader.getEventType() == XMLEvent.START_ELEMENT;
+    }
+
+    private boolean isEndXMLEvent(XMLStreamReader reader) {
+        return reader.getEventType() == XMLEvent.END_ELEMENT;
+    }
+
     @Override
-    public List<BibEntry> parseEntries(InputStream inputStream) {
+    public List<BibEntry> parseEntries(InputStream inputStream) throws ParseException {
         try {
             return importDatabase(
                     new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8))).getDatabase().getEntries();
@@ -343,3 +502,8 @@ public List<BibEntry> parseEntries(InputStream inputStream) {
         return Collections.emptyList();
     }
 }
+
+
+
+
+
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 977f6b249b0..6b5a4cead56 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/IsiImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/IsiImporter.java
@@ -29,17 +29,20 @@
 import org.slf4j.LoggerFactory;
 
 /**
+ * <p>
  * Importer for the ISI Web of Science, INSPEC and Medline format.
+ * </p>
  * <p>
  * Documentation about ISI WOS format:
- * <p>
  * <ul>
+ *
  * <li>https://web.archive.org/web/20131031052339/http://wos.isitrial.com/help/helpprn.html</li>
  * </ul>
  * <p>
  * <ul>
  * <li>Deal with capitalization correctly</li>
  * </ul>
+ * </p>
  */
 public class IsiImporter extends Importer {
     private static final Logger LOGGER = LoggerFactory.getLogger(IsiImporter.class);
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/MarcXmlParser.java b/src/main/java/org/jabref/logic/importer/fileformat/MarcXmlParser.java
index a3131abe24d..cc543ec2d37 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/MarcXmlParser.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/MarcXmlParser.java
@@ -23,6 +23,7 @@
 import org.jabref.model.entry.Date;
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.model.entry.field.StandardField;
+import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.model.strings.StringUtil;
 
 import org.slf4j.Logger;
@@ -95,27 +96,34 @@ private BibEntry parseEntry(Element element) {
             String tag = datafield.getAttribute("tag");
             LOGGER.debug("tag: " + tag);
 
-            if (tag.equals("020")) {
+            if ("020".equals(tag)) {
                 putIsbn(bibEntry, datafield);
-            } else if (tag.equals("100") || tag.equals("700") || tag.equals("710")) {
+            } else if ("100".equals(tag) || "700".equals(tag) || "710".equals(tag)) {
                 putPersonalName(bibEntry, datafield); // Author, Editor, Publisher
-            } else if (tag.equals("245")) {
+            } else if ("111".equals(tag)) {
+                // FixMe: Conference Information also in Subtitle (245) & Author (710)
+                putConferenceDetail(bibEntry, datafield);
+            } else if ("245".equals(tag)) {
                 putTitle(bibEntry, datafield);
-            } else if (tag.equals("250")) {
+            } else if ("250".equals(tag)) {
                 putEdition(bibEntry, datafield);
-            } else if (tag.equals("264")) {
+            } else if ("264".equals(tag)) {
                 putPublication(bibEntry, datafield);
-            } else if (tag.equals("300")) {
+            } else if ("300".equals(tag)) {
                 putPhysicalDescription(bibEntry, datafield);
-            } else if (tag.equals("490") || tag.equals("830")) {
+            } else if ("490".equals(tag) || "830".equals(tag)) {
                 putSeries(bibEntry, datafield);
-            } else if (tag.equals("520")) {
+            } else if ("502".equals(tag)) {
+                putThesisDescription(bibEntry, datafield); // Master's thesis, PhD thesis, Thesis
+            } else if ("520".equals(tag)) {
                 putSummary(bibEntry, datafield);
-            } else if (tag.equals("653")) {
+            } else if ("653".equals(tag)) {
                 putKeywords(bibEntry, datafield);
-            } else if (tag.equals("856")) {
+            } else if ("773".equals(tag)) {
+                putIssue(bibEntry, datafield);
+            } else if ("856".equals(tag)) {
                 putElectronicLocation(bibEntry, datafield);
-            } else if (tag.equals("966")) {
+            } else if ("966".equals(tag)) {
                 putDoi(bibEntry, datafield);
             } else if (Integer.parseInt(tag) >= 546 && Integer.parseInt(tag) <= 599) {
                 // Notes
@@ -125,16 +133,6 @@ private BibEntry parseEntry(Element element) {
                 LOGGER.debug("Unparsed tag: {}", tag);
             }
         }
-
-        /*
-         * ToDo:
-         *  pages
-         *  volume and number correct
-         *  series and journals stored in different tags
-         *  thesis
-         *  proceedings
-         */
-
         return bibEntry;
     }
 
@@ -184,7 +182,7 @@ private void putPersonalName(BibEntry bibEntry, Element datafield) {
             if (field.isPresent()) {
                 String ind1 = datafield.getAttribute("ind1");
                 String brackedName;
-                if (field.get() == StandardField.PUBLISHER && StringUtil.isNotBlank(ind1) && ind1.equals("2")) {
+                if (field.get() == StandardField.PUBLISHER && StringUtil.isNotBlank(ind1) && "2".equals(ind1)) {
                     // ind == 2 -> Corporate publisher
                     brackedName = "{" + name.getAsFirstLastNamesWithAnd() + "}";
                 } else {
@@ -200,6 +198,15 @@ private void putPersonalName(BibEntry bibEntry, Element datafield) {
         }
     }
 
+    private void putConferenceDetail(BibEntry bibEntry, Element datafield) {
+        String conference = getSubfield("a", datafield);
+        bibEntry.setType(StandardEntryType.Proceedings);
+
+        if (StringUtil.isNotBlank(conference)) {
+            bibEntry.setField(StandardField.EVENTTITLE, conference);
+        }
+    }
+
     private void putTitle(BibEntry bibEntry, Element datafield) {
         String title = getSubfield("a", datafield);
         String subtitle = getSubfield("b", datafield);
@@ -245,13 +252,13 @@ private void putEdition(BibEntry bibEntry, Element datafield) {
 
     private void putPublication(BibEntry bibEntry, Element datafield) {
         String ind2 = datafield.getAttribute("ind2");
-        if (StringUtil.isNotBlank(ind2) && ind2.equals("1")) { // Publisher
+        if (StringUtil.isNotBlank(ind2) && "1".equals(ind2)) { // Publisher
             String place = getSubfield("a", datafield);
             String name = getSubfield("b", datafield);
             String date = getSubfield("c", datafield);
 
             if (StringUtil.isNotBlank(place)) {
-                bibEntry.setField(StandardField.LOCATION, place);
+                bibEntry.setField(StandardField.ADDRESS, place);
             }
 
             if (StringUtil.isNotBlank(name)) {
@@ -274,8 +281,8 @@ private void putPublication(BibEntry bibEntry, Element datafield) {
     private void putPhysicalDescription(BibEntry bibEntry, Element datafield) {
         String pagetotal = getSubfield("a", datafield);
 
-        if (StringUtil.isNotBlank(pagetotal) && (pagetotal.contains("pages") || pagetotal.contains("p."))) {
-            pagetotal = pagetotal.replaceAll(" p\\.?$", "");
+        if (StringUtil.isNotBlank(pagetotal) && (pagetotal.contains("pages") || pagetotal.contains("p.") || pagetotal.contains("S") || pagetotal.contains("Seiten"))) {
+            pagetotal = pagetotal.replaceAll(".*?(\\d+)(?:\\s*Seiten|\\s*S|\\s*pages|\\s*p).*", "$1");
             bibEntry.setField(StandardField.PAGETOTAL, pagetotal);
         }
     }
@@ -301,11 +308,25 @@ private void putSeries(BibEntry bibEntry, Element datafield) {
         }
     }
 
+    private void putThesisDescription(BibEntry bibEntry, Element datafield) {
+        String thesisDegree = getSubfield("b", datafield);
+        String school = getSubfield("c", datafield);
+        bibEntry.setType(StandardEntryType.MastersThesis);
+
+        if (StringUtil.isNotBlank(school)) {
+            bibEntry.setField(StandardField.SCHOOL, school);
+        }
+
+        if ("Dissertation".equals(thesisDegree)) {
+            bibEntry.setType(StandardEntryType.PhdThesis);
+        }
+    }
+
     private void putSummary(BibEntry bibEntry, Element datafield) {
         String summary = getSubfield("a", datafield);
 
         String ind1 = datafield.getAttribute("ind1");
-        if (StringUtil.isNotBlank(summary) && StringUtil.isNotBlank(ind1) && ind1.equals("3")) { // Abstract
+        if (StringUtil.isNotBlank(summary) && StringUtil.isNotBlank(ind1) && "3".equals(ind1)) { // Abstract
             if (bibEntry.getField(StandardField.ABSTRACT).isPresent()) {
                 bibEntry.setField(StandardField.ABSTRACT, bibEntry.getField(StandardField.ABSTRACT).get().concat(summary));
             } else {
@@ -327,6 +348,31 @@ private void putKeywords(BibEntry bibEntry, Element datafield) {
         }
     }
 
+    private void putIssue(BibEntry bibEntry, Element datafield) {
+        bibEntry.setType(StandardEntryType.Article);
+
+        List<String> issues = getSubfields("g", datafield);
+
+        for (String issue : issues) {
+            String[] parts = issue.split(":");
+            if (parts.length == 2) {
+                String key = parts[0].trim();
+                String value = parts[1].trim();
+
+                if (StringUtil.isNotBlank(value)) {
+                    switch (key) {
+                        case "number" -> bibEntry.setField(StandardField.NUMBER, value);
+                        case "year" -> bibEntry.setField(StandardField.YEAR, value);
+                        case "pages" -> bibEntry.setField(StandardField.PAGES, value);
+                        case "volume" -> bibEntry.setField(StandardField.VOLUME, value);
+                        case "day" -> bibEntry.setField(StandardField.DAY, value);
+                        case "month" -> bibEntry.setField(StandardField.MONTH, value);
+                    }
+                }
+            }
+        }
+    }
+
     private void putDoi(BibEntry bibEntry, Element datafield) {
         String ind1 = datafield.getAttribute("ind1");
         String resource = getSubfield("u", datafield);
@@ -403,12 +449,19 @@ private String getSubfield(String a, Element datafield) {
 
         for (Element subfield : subfields) {
             if (subfield.getAttribute("code").equals(a)) {
-                return (subfield.getTextContent());
+                return subfield.getTextContent();
             }
         }
+
         return null;
     }
 
+    private List<String> getSubfields(String a, Element datafield) {
+        List<Element> subfields = getChildren("subfield", datafield);
+
+        return subfields.stream().filter(field -> field.getAttribute("code").equals(a)).map(Node::getTextContent).toList();
+    }
+
     private Element getChild(String name, Element e) {
         if (e == null) {
             return null;
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 4522c34429f..741f758d0e6 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/MedlineImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/MedlineImporter.java
@@ -29,6 +29,7 @@
 import org.jabref.logic.importer.fileformat.medline.MeshHeading;
 import org.jabref.logic.importer.fileformat.medline.OtherId;
 import org.jabref.logic.importer.fileformat.medline.PersonalNameSubject;
+import org.jabref.logic.importer.util.MathMLParser;
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.Date;
@@ -324,10 +325,10 @@ private void parseBookInformation(XMLStreamReader reader, Map<Field, String> fie
     }
 
     private void handleElocationId(Map<Field, String> fields, XMLStreamReader reader, String eidType) {
-        if (eidType.equals("doi")) {
+        if ("doi".equals(eidType)) {
             fields.put(StandardField.DOI, reader.getText());
         }
-        if (eidType.equals("pii")) {
+        if ("pii".equals(eidType)) {
             fields.put(new UnknownField("pii"), reader.getText());
         }
     }
@@ -353,7 +354,7 @@ private void parseSections(XMLStreamReader reader, List<String> sectionTitleList
                 }
             }
 
-            if (isEndXMLEvent(reader) && reader.getName().getLocalPart().equals("Section")) {
+            if (isEndXMLEvent(reader) && "Section".equals(reader.getName().getLocalPart())) {
                 if (sectionLevel == 0) {
                     break;
                 } else {
@@ -664,7 +665,7 @@ private void parseGeneSymbolList(XMLStreamReader reader, Map<Field, String> fiel
             reader.next();
             if (isStartXMLEvent(reader)) {
                 String elementName = reader.getName().getLocalPart();
-                if (elementName.equals("GeneSymbol")) {
+                if ("GeneSymbol".equals(elementName)) {
                     reader.next();
                     if (isCharacterXMLEvent(reader)) {
                         geneSymbols.add(reader.getText());
@@ -690,7 +691,7 @@ private void parseChemicalList(XMLStreamReader reader, Map<Field, String> fields
             reader.next();
             if (isStartXMLEvent(reader)) {
                 String elementName = reader.getName().getLocalPart();
-                if (elementName.equals("NameOfSubstance")) {
+                if ("NameOfSubstance".equals(elementName)) {
                     reader.next();
                     if (isCharacterXMLEvent(reader)) {
                         chemicalNames.add(reader.getText());
@@ -782,7 +783,7 @@ private void parseArticleInformation(XMLStreamReader reader, Map<Field, String>
                 }
             }
 
-            if (isEndXMLEvent(reader) && reader.getName().getLocalPart().equals("Article")) {
+            if (isEndXMLEvent(reader) && "Article".equals(reader.getName().getLocalPart())) {
                 break;
             }
         }
@@ -828,7 +829,7 @@ private void parseJournal(XMLStreamReader reader, Map<Field, String> fields) thr
                 }
             }
 
-            if (isEndXMLEvent(reader) && reader.getName().getLocalPart().equals("Journal")) {
+            if (isEndXMLEvent(reader) && "Journal".equals(reader.getName().getLocalPart())) {
                 break;
             }
         }
@@ -1082,6 +1083,9 @@ private void handleTextElement(XMLStreamReader reader, List<String> textList, St
             if (isStartXMLEvent(reader)) {
                 String elementName = reader.getName().getLocalPart();
                 switch (elementName) {
+                    case "math" -> {
+                        result.append(MathMLParser.parse(reader));
+                    }
                     case "sup", "sub" -> {
                         reader.next();
                         if (isCharacterXMLEvent(reader)) {
@@ -1199,12 +1203,12 @@ private void parseAuthor(XMLStreamReader reader, List<String> authorNames) throw
                 }
             }
 
-            if (isEndXMLEvent(reader) && reader.getName().getLocalPart().equals("Author")) {
+            if (isEndXMLEvent(reader) && "Author".equals(reader.getName().getLocalPart())) {
                 break;
             }
         }
 
-        if (collectiveNames.size() > 0) {
+        if (!collectiveNames.isEmpty()) {
             authorNames.addAll(collectiveNames);
         }
         if (!authorName.toString().isBlank()) {
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 b5ce8310ede..287158c04f2 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/MedlinePlainImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/MedlinePlainImporter.java
@@ -340,7 +340,7 @@ private void addAbstract(Map<Field, String> hm, String lab, String value) {
             if (value.contains("Copyright")) {
                 int copyrightIndex = value.lastIndexOf("Copyright");
                 // remove the copyright from the field since the name of the field is copyright
-                String copyrightInfo = value.substring(copyrightIndex).replaceAll("Copyright ", "");
+                String copyrightInfo = value.substring(copyrightIndex).replace("Copyright ", "");
                 hm.put(new UnknownField("copyright"), copyrightInfo);
                 abstractValue = value.substring(0, copyrightIndex);
             } else {
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 e6f9b92019a..9eebfde4c7b 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/ModsImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/ModsImporter.java
@@ -92,7 +92,7 @@ public ParserResult importDatabase(BufferedReader input) throws IOException {
     private void parseModsCollection(List<BibEntry> bibItems, XMLStreamReader reader) throws XMLStreamException {
         while (reader.hasNext()) {
             reader.next();
-            if (isStartXMLEvent(reader) && reader.getName().getLocalPart().equals("mods")) {
+            if (isStartXMLEvent(reader) && "mods".equals(reader.getName().getLocalPart())) {
                 BibEntry entry = new BibEntry();
                 Map<Field, String> fields = new HashMap<>();
 
@@ -174,7 +174,7 @@ private void parseModsGroup(Map<Field, String> fields, XMLStreamReader reader, B
                 }
             }
 
-            if (isEndXMLEvent(reader) && reader.getName().getLocalPart().equals("mods")) {
+            if (isEndXMLEvent(reader) && "mods".equals(reader.getName().getLocalPart())) {
                 break;
             }
         }
@@ -210,7 +210,7 @@ private void parseRelatedItem(XMLStreamReader reader, Map<Field, String> fields)
                 }
             }
 
-            if (isEndXMLEvent(reader) && reader.getName().getLocalPart().equals("relatedItem")) {
+            if (isEndXMLEvent(reader) && "relatedItem".equals(reader.getName().getLocalPart())) {
                 break;
             }
         }
@@ -246,7 +246,7 @@ private void handleExtent(XMLStreamReader reader, Map<Field, String> fields) thr
                 }
             }
 
-            if (isEndXMLEvent(reader) && reader.getName().getLocalPart().equals("extent")) {
+            if (isEndXMLEvent(reader) && "extent".equals(reader.getName().getLocalPart())) {
                 break;
             }
         }
@@ -279,7 +279,7 @@ private void handleDetail(XMLStreamReader reader, Map<Field, String> fields) thr
                 }
             }
 
-            if (isEndXMLEvent(reader) && reader.getName().getLocalPart().equals("detail")) {
+            if (isEndXMLEvent(reader) && "detail".equals(reader.getName().getLocalPart())) {
                 break;
             }
         }
@@ -292,12 +292,12 @@ private void parseName(XMLStreamReader reader, Map<Field, String> fields, List<S
             reader.next();
 
             if (isStartXMLEvent(reader)) {
-                if (reader.getName().getLocalPart().equals("affiliation")) {
+                if ("affiliation".equals(reader.getName().getLocalPart())) {
                     reader.next();
                     if (isCharacterXMLEvent(reader)) {
                         putIfValueNotNull(fields, new UnknownField("affiliation"), reader.getText());
                     }
-                } else if (reader.getName().getLocalPart().equals("namePart")) {
+                } else if ("namePart".equals(reader.getName().getLocalPart())) {
                     String type = reader.getAttributeValue(null, "type");
                     reader.next();
                     if (isCharacterXMLEvent(reader)) {
@@ -306,7 +306,7 @@ private void parseName(XMLStreamReader reader, Map<Field, String> fields, List<S
                 }
             }
 
-            if (isEndXMLEvent(reader) && reader.getName().getLocalPart().equals("name")) {
+            if (isEndXMLEvent(reader) && "name".equals(reader.getName().getLocalPart())) {
                 break;
             }
         }
@@ -356,7 +356,7 @@ private void parseOriginInfo(XMLStreamReader reader, Map<Field, String> fields)
                 }
             }
 
-            if (isEndXMLEvent(reader) && reader.getName().getLocalPart().equals("originInfo")) {
+            if (isEndXMLEvent(reader) && "originInfo".equals(reader.getName().getLocalPart())) {
                 break;
             }
         }
@@ -391,7 +391,7 @@ private void parseSubject(XMLStreamReader reader, Map<Field, String> fields, Lis
                 }
             }
 
-            if (isEndXMLEvent(reader) && reader.getName().getLocalPart().equals("subject")) {
+            if (isEndXMLEvent(reader) && "subject".equals(reader.getName().getLocalPart())) {
                 break;
             }
         }
@@ -411,7 +411,7 @@ private void parseRecordInfo(XMLStreamReader reader, Map<Field, String> fields)
                     if (isCharacterXMLEvent(reader)) {
                         recordContents.add(0, reader.getText());
                     }
-                } else if (reader.getName().getLocalPart().equals("languageTerm")) {
+                } else if ("languageTerm".equals(reader.getName().getLocalPart())) {
                     reader.next();
                     if (isCharacterXMLEvent(reader)) {
                         languages.add(reader.getText());
@@ -419,7 +419,7 @@ private void parseRecordInfo(XMLStreamReader reader, Map<Field, String> fields)
                 }
             }
 
-            if (isEndXMLEvent(reader) && reader.getName().getLocalPart().equals("recordInfo")) {
+            if (isEndXMLEvent(reader) && "recordInfo".equals(reader.getName().getLocalPart())) {
                 break;
             }
         }
@@ -434,14 +434,14 @@ private void parseLanguage(XMLStreamReader reader, Map<Field, String> fields) th
         while (reader.hasNext()) {
             reader.next();
 
-            if (isStartXMLEvent(reader) && reader.getName().getLocalPart().equals("languageTerm")) {
+            if (isStartXMLEvent(reader) && "languageTerm".equals(reader.getName().getLocalPart())) {
                 reader.next();
                 if (isCharacterXMLEvent(reader)) {
                     putIfValueNotNull(fields, StandardField.LANGUAGE, reader.getText());
                 }
             }
 
-            if (isEndXMLEvent(reader) && reader.getName().getLocalPart().equals("language")) {
+            if (isEndXMLEvent(reader) && "language".equals(reader.getName().getLocalPart())) {
                 break;
             }
         }
@@ -451,14 +451,14 @@ private void parseTitle(XMLStreamReader reader, Map<Field, String> fields) throw
         while (reader.hasNext()) {
             reader.next();
 
-            if (isStartXMLEvent(reader) && reader.getName().getLocalPart().equals("title")) {
+            if (isStartXMLEvent(reader) && "title".equals(reader.getName().getLocalPart())) {
                 reader.next();
                 if (isCharacterXMLEvent(reader)) {
                     putIfValueNotNull(fields, StandardField.TITLE, reader.getText());
                 }
             }
 
-            if (isEndXMLEvent(reader) && reader.getName().getLocalPart().equals("titleInfo")) {
+            if (isEndXMLEvent(reader) && "titleInfo".equals(reader.getName().getLocalPart())) {
                 break;
             }
         }
@@ -472,12 +472,12 @@ private void parseLocationAndUrl(XMLStreamReader reader, Map<Field, String> fiel
             reader.next();
 
             if (isStartXMLEvent(reader)) {
-                if (reader.getName().getLocalPart().equals("physicalLocation")) {
+                if ("physicalLocation".equals(reader.getName().getLocalPart())) {
                     reader.next();
                     if (isCharacterXMLEvent(reader)) {
                         locations.add(reader.getText());
                     }
-                } else if (reader.getName().getLocalPart().equals("url")) {
+                } else if ("url".equals(reader.getName().getLocalPart())) {
                     reader.next();
                     if (isCharacterXMLEvent(reader)) {
                         urls.add(reader.getText());
@@ -485,7 +485,7 @@ private void parseLocationAndUrl(XMLStreamReader reader, Map<Field, String> fiel
                 }
             }
 
-            if (isEndXMLEvent(reader) && reader.getName().getLocalPart().equals("location")) {
+            if (isEndXMLEvent(reader) && "location".equals(reader.getName().getLocalPart())) {
                 break;
             }
         }
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 73eb86a0789..518a5659f8a 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/PdfEmbeddedBibFileImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/PdfEmbeddedBibFileImporter.java
@@ -18,7 +18,6 @@
 import org.jabref.logic.xmp.EncryptedPdfsNotSupportedException;
 import org.jabref.logic.xmp.XmpUtilReader;
 import org.jabref.model.entry.BibEntry;
-import org.jabref.model.util.DummyFileUpdateMonitor;
 
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDDocumentNameDictionary;
@@ -40,7 +39,7 @@ public class PdfEmbeddedBibFileImporter extends Importer {
 
     public PdfEmbeddedBibFileImporter(ImportFormatPreferences importFormatPreferences) {
         this.importFormatPreferences = importFormatPreferences;
-        bibtexParser = new BibtexParser(importFormatPreferences, new DummyFileUpdateMonitor());
+        bibtexParser = new BibtexParser(importFormatPreferences);
     }
 
     @Override
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 0420c3a7006..b17c05bfa8b 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/PdfMergeMetadataImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/PdfMergeMetadataImporter.java
@@ -16,7 +16,6 @@
 import org.jabref.logic.importer.Importer;
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.logic.importer.fetcher.DoiFetcher;
-import org.jabref.logic.importer.fetcher.isbntobibtex.EbookDeIsbnFetcher;
 import org.jabref.logic.importer.fetcher.isbntobibtex.IsbnFetcher;
 import org.jabref.logic.importer.util.FileFieldParser;
 import org.jabref.logic.util.StandardFileType;
@@ -77,7 +76,7 @@ public ParserResult importDatabase(Path filePath) throws IOException {
 
         for (Importer metadataImporter : metadataImporters) {
             List<BibEntry> extractedEntries = metadataImporter.importDatabase(filePath).getDatabase().getEntries();
-            if (extractedEntries.size() == 0) {
+            if (extractedEntries.isEmpty()) {
                 continue;
             }
             candidates.add(extractedEntries.get(0));
@@ -97,7 +96,7 @@ public ParserResult importDatabase(Path filePath) throws IOException {
             if (candidate.hasField(StandardField.ISBN)) {
                 try {
                     new IsbnFetcher(importFormatPreferences)
-                            .addRetryFetcher(new EbookDeIsbnFetcher(importFormatPreferences))
+                            // .addRetryFetcher(new EbookDeIsbnFetcher(importFormatPreferences))
                             // .addRetryFetcher(new DoiToBibtexConverterComIsbnFetcher(importFormatPreferences))
                             .performSearchById(candidate.getField(StandardField.ISBN).get()).ifPresent(fetchedCandidates::add);
                 } catch (FetcherException e) {
@@ -115,7 +114,7 @@ public ParserResult importDatabase(Path filePath) throws IOException {
             for (Map.Entry<Field, String> fieldEntry : candidate.getFieldMap().entrySet()) {
                 // Don't merge FILE fields that point to a stored file as we set that to filePath anyway.
                 // Nevertheless, retain online links.
-                if (StandardField.FILE.equals(fieldEntry.getKey()) &&
+                if (StandardField.FILE == fieldEntry.getKey() &&
                         FileFieldParser.parse(fieldEntry.getValue()).stream().noneMatch(LinkedFile::isOnlineLink)) {
                     continue;
                 }
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 aa16875ecf2..2e4cf062f0f 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/PdfVerbatimBibTextImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/PdfVerbatimBibTextImporter.java
@@ -18,7 +18,6 @@
 import org.jabref.logic.xmp.XmpUtilReader;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.LinkedFile;
-import org.jabref.model.util.DummyFileUpdateMonitor;
 
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.text.PDFTextStripper;
@@ -58,7 +57,7 @@ public ParserResult importDatabase(Path filePath) {
         List<BibEntry> result = new ArrayList<>(1);
         try (PDDocument document = new XmpUtilReader().loadWithAutomaticDecryption(filePath)) {
             String firstPageContents = getFirstPageContents(document);
-            BibtexParser parser = new BibtexParser(importFormatPreferences, new DummyFileUpdateMonitor());
+            BibtexParser parser = new BibtexParser(importFormatPreferences);
             result = parser.parseEntries(firstPageContents);
         } catch (EncryptedPdfsNotSupportedException e) {
             return ParserResult.fromErrorMessage(Localization.lang("Decryption not supported."));
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/PicaXmlParser.java b/src/main/java/org/jabref/logic/importer/fileformat/PicaXmlParser.java
index d97bfd81ed3..9b0fd526a3d 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/PicaXmlParser.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/PicaXmlParser.java
@@ -445,8 +445,8 @@ private String getSubfield(String a, Element datafield) {
         List<Element> liste = getChildren("subfield", datafield);
 
         for (Element subfield : liste) {
-            if (subfield.getAttribute("code").equals(a)) {
-                return (subfield.getTextContent());
+            if (subfield.getAttribute("code").equalsIgnoreCase(a)) {
+                return subfield.getTextContent();
             }
         }
         return null;
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 3b09fd7634e..6e3d235a748 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/RepecNepImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/RepecNepImporter.java
@@ -230,7 +230,6 @@ private String readMultipleLines(BufferedReader in) throws IOException {
     /**
      * Implements grammar rule "TitleString".
      *
-     * @param be
      * @throws IOException
      */
     private void parseTitleString(BibEntry be, BufferedReader in) throws IOException {
@@ -242,7 +241,6 @@ private void parseTitleString(BibEntry be, BufferedReader in) throws IOException
     /**
      * Implements grammar rule "Authors"
      *
-     * @param be
      * @throws IOException
      */
     private void parseAuthors(BibEntry be, BufferedReader in) throws IOException {
@@ -295,7 +293,6 @@ private void parseAuthors(BibEntry be, BufferedReader in) throws IOException {
     /**
      * Implements grammar rule "Abstract".
      *
-     * @param be
      * @throws IOException
      */
     private void parseAbstract(BibEntry be, BufferedReader in) throws IOException {
@@ -309,7 +306,6 @@ private void parseAbstract(BibEntry be, BufferedReader in) throws IOException {
     /**
      * Implements grammar rule "AdditionalFields".
      *
-     * @param be
      * @throws IOException
      */
     private void parseAdditionalFields(BibEntry be, boolean multilineUrlFieldAllowed, BufferedReader in)
diff --git a/src/main/java/org/jabref/logic/importer/util/FileFieldParser.java b/src/main/java/org/jabref/logic/importer/util/FileFieldParser.java
index 7e68a3a789e..4b2804bb976 100644
--- a/src/main/java/org/jabref/logic/importer/util/FileFieldParser.java
+++ b/src/main/java/org/jabref/logic/importer/util/FileFieldParser.java
@@ -18,10 +18,15 @@ public class FileFieldParser {
     private final String value;
 
     private StringBuilder charactersOfCurrentElement;
+
     private boolean windowsPath;
 
     public FileFieldParser(String value) {
-        this.value = value;
+        if (value == null) {
+            this.value = null;
+        } else {
+            this.value = value.replace("$\\backslash$", "\\");
+        }
     }
 
     /**
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 f824b351d4f..d8556fdb8ae 100644
--- a/src/main/java/org/jabref/logic/importer/util/GrobidService.java
+++ b/src/main/java/org/jabref/logic/importer/util/GrobidService.java
@@ -11,7 +11,6 @@
 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;
 
 import org.jsoup.Connection;
 import org.jsoup.Jsoup;
@@ -67,11 +66,11 @@ public Optional<BibEntry> processCitation(String rawCitation, ImportFormatPrefer
                 .execute();
         String httpResponse = response.body();
 
-        if (httpResponse == null || httpResponse.equals("@misc{-1,\n  author = {}\n}\n") || httpResponse.equals("@misc{-1,\n  author = {" + rawCitation + "}\n}\n")) { // This filters empty BibTeX entries
+        if (httpResponse == null || "@misc{-1,\n  author = {}\n}\n".equals(httpResponse) || httpResponse.equals("@misc{-1,\n  author = {" + rawCitation + "}\n}\n")) { // This filters empty BibTeX entries
             throw new IOException("The GROBID server response does not contain anything.");
         }
 
-        return BibtexParser.singleFromString(httpResponse, importFormatPreferences, new DummyFileUpdateMonitor());
+        return BibtexParser.singleFromString(httpResponse, importFormatPreferences);
     }
 
     public List<BibEntry> processPDF(Path filePath, ImportFormatPreferences importFormatPreferences) throws IOException, ParseException {
@@ -85,13 +84,13 @@ public List<BibEntry> processPDF(Path filePath, ImportFormatPreferences importFo
 
         String httpResponse = response.body();
 
-        if (httpResponse == null || httpResponse.equals("@misc{-1,\n  author = {}\n}\n")) { // This filters empty BibTeX entries
+        if (httpResponse == null || "@misc{-1,\n  author = {}\n}\n".equals(httpResponse)) { // This filters empty BibTeX entries
             throw new IOException("The GROBID server response does not contain anything.");
         }
 
-        BibtexParser parser = new BibtexParser(importFormatPreferences, new DummyFileUpdateMonitor());
+        BibtexParser parser = new BibtexParser(importFormatPreferences);
         List<BibEntry> result = parser.parseEntries(httpResponse);
-        result.forEach((entry) -> entry.setCitationKey(""));
+        result.forEach(entry -> entry.setCitationKey(""));
         return result;
     }
 }
diff --git a/src/main/java/org/jabref/logic/importer/util/GroupsParser.java b/src/main/java/org/jabref/logic/importer/util/GroupsParser.java
index da08aae3abc..642aadf1453 100644
--- a/src/main/java/org/jabref/logic/importer/util/GroupsParser.java
+++ b/src/main/java/org/jabref/logic/importer/util/GroupsParser.java
@@ -137,7 +137,7 @@ private static AbstractGroup texGroupFromString(String string, FileUpdateMonitor
                 // Problem accessing file -> create without file monitoring
                 LOGGER.warn("Could not access file {}. The group {} will not reflect changes to the aux file.", path, name, ex);
 
-                TexGroup newGroup = TexGroup.createWithoutFileMonitoring(name, context, path, new DefaultAuxParser(new BibDatabase()), fileMonitor, metaData);
+                TexGroup newGroup = TexGroup.create(name, context, path, new DefaultAuxParser(new BibDatabase()), metaData);
                 addGroupDetails(tok, newGroup);
                 return newGroup;
             }
diff --git a/src/main/java/org/jabref/logic/importer/util/IdentifierParser.java b/src/main/java/org/jabref/logic/importer/util/IdentifierParser.java
index 6cb727fd231..30a6fee0dd7 100644
--- a/src/main/java/org/jabref/logic/importer/util/IdentifierParser.java
+++ b/src/main/java/org/jabref/logic/importer/util/IdentifierParser.java
@@ -29,13 +29,13 @@ public Optional<? extends Identifier> parse(Field field) {
             return Optional.empty();
         }
 
-        if (StandardField.DOI.equals(field)) {
+        if (StandardField.DOI == field) {
             return DOI.parse(fieldValue);
-        } else if (StandardField.ISBN.equals(field)) {
+        } else if (StandardField.ISBN == field) {
             return ISBN.parse(fieldValue);
-        } else if (StandardField.EPRINT.equals(field)) {
+        } else if (StandardField.EPRINT == field) {
             return parseEprint(fieldValue);
-        } else if (StandardField.MR_NUMBER.equals(field)) {
+        } else if (StandardField.MR_NUMBER == field) {
             return MathSciNetId.parse(fieldValue);
         }
 
diff --git a/src/main/java/org/jabref/logic/importer/util/MathMLParser.java b/src/main/java/org/jabref/logic/importer/util/MathMLParser.java
new file mode 100644
index 00000000000..039acf47155
--- /dev/null
+++ b/src/main/java/org/jabref/logic/importer/util/MathMLParser.java
@@ -0,0 +1,69 @@
+package org.jabref.logic.importer.util;
+
+import java.io.IOException;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.Objects;
+
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+import javax.xml.transform.Result;
+import javax.xml.transform.Source;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class MathMLParser {
+    private static final Logger LOGGER = LoggerFactory.getLogger(MathMLParser.class);
+    private static final String XSLT_FILE_PATH = "/xslt/mathml_latex/mmltex.xsl";
+
+    /**
+     * Parses the MathML element into its corresponding
+     * LaTeX representation, using an XSLT transformation file
+     *
+     * @param reader the stream reader
+     * @return Returns the LaTeX representation
+     */
+    public static String parse(XMLStreamReader reader) {
+        String xmlContent = "";
+        String latexResult = "<Unsupported MathML expression>";
+
+        try {
+            // extract XML content
+            xmlContent = StaxParser.getXMLContent(reader);
+
+            // convert to LaTeX using XSLT file
+            Source xmlSource = new StreamSource(new StringReader(xmlContent));
+
+            URL xsltResource = MathMLParser.class.getResource(XSLT_FILE_PATH);
+            Source xsltSource = new StreamSource(Objects.requireNonNull(xsltResource).openStream(), xsltResource.toURI().toASCIIString());
+
+            TransformerFactory transformerFactory = TransformerFactory.newInstance();
+            Transformer transformer = transformerFactory.newTransformer(xsltSource);
+
+            StringWriter writer = new StringWriter();
+            Result result = new StreamResult(writer);
+            transformer.transform(xmlSource, result);
+
+            latexResult = writer.getBuffer().toString();
+        } catch (XMLStreamException e) {
+            LOGGER.debug("An exception occurred when getting XML content", e);
+        } catch (IOException e) {
+            LOGGER.debug("An I/O exception occurred", e);
+        } catch (URISyntaxException e) {
+            LOGGER.debug("XSLT Source URI invalid", e);
+        } catch (TransformerException e) {
+            LOGGER.debug("An exception occurred during transformation", e);
+        }
+
+        return latexResult;
+    }
+}
+
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 a42d848f7b2..b5b733f7973 100644
--- a/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java
+++ b/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java
@@ -11,6 +11,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.regex.Pattern;
 
 import org.jabref.logic.cleanup.FieldFormatterCleanups;
 import org.jabref.logic.importer.ParseException;
@@ -22,18 +23,23 @@
 import org.jabref.model.entry.types.EntryTypeFactory;
 import org.jabref.model.metadata.ContentSelectors;
 import org.jabref.model.metadata.MetaData;
-import org.jabref.model.metadata.SaveOrderConfig;
+import org.jabref.model.metadata.SaveOrder;
 import org.jabref.model.strings.StringUtil;
 import org.jabref.model.util.FileUpdateMonitor;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+/**
+ * Writing is done at {@link org.jabref.logic.exporter.MetaDataSerializer}.
+ */
 public class MetaDataParser {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(MetaDataParser.class);
     private static FileUpdateMonitor fileMonitor;
 
+    private static final Pattern SINGLE_BACKSLASH = Pattern.compile("[^\\\\]\\\\[^\\\\]");
+
     public MetaDataParser(FileUpdateMonitor fileMonitor) {
         MetaDataParser.fileMonitor = fileMonitor;
     }
@@ -54,11 +60,12 @@ public static Optional<BibEntryType> parseCustomEntryType(String comment) {
         EntryType type = EntryTypeFactory.parse(rest.substring(0, indexEndOfName));
         String reqFields = fieldsDescription.substring(4, indexEndOfRequiredFields);
         String optFields = fieldsDescription.substring(indexEndOfRequiredFields + 6, indexEndOfOptionalFields);
-
         BibEntryTypeBuilder entryTypeBuilder = new BibEntryTypeBuilder()
                 .withType(type)
-                .withImportantFields(FieldFactory.parseFieldList(optFields))
-                .withRequiredFields(FieldFactory.parseOrFieldsList(reqFields));
+                .withRequiredFields(FieldFactory.parseOrFieldsList(reqFields))
+                // Important fields are optional fields, but displayed first. Thus, they do not need to be separated by "/".
+                // See org.jabref.model.entry.field.FieldPriority for details on important optional fields.
+                .withImportantFields(FieldFactory.parseFieldList(optFields));
         return Optional.of(entryTypeBuilder.build());
     }
 
@@ -81,46 +88,46 @@ public MetaData parse(MetaData metaData, Map<String, String> data, Character key
         entryList.sort(groupsLast());
 
         for (Map.Entry<String, String> entry : entryList) {
-            List<String> value = getAsList(entry.getValue());
+            List<String> values = getAsList(entry.getValue());
 
             if (entry.getKey().startsWith(MetaData.PREFIX_KEYPATTERN)) {
                 EntryType entryType = EntryTypeFactory.parse(entry.getKey().substring(MetaData.PREFIX_KEYPATTERN.length()));
-                nonDefaultCiteKeyPatterns.put(entryType, Collections.singletonList(getSingleItem(value)));
-            } else if (entry.getKey().startsWith(MetaData.FILE_DIRECTORY + '-')) {
-                // The user name comes directly after "FILE_DIRECTORY-"
-                String user = entry.getKey().substring(MetaData.FILE_DIRECTORY.length() + 1);
-                metaData.setUserFileDirectory(user, getSingleItem(value));
+                nonDefaultCiteKeyPatterns.put(entryType, Collections.singletonList(getSingleItem(values)));
             } 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-"
-                String user = entry.getKey().substring(MetaData.FILE_DIRECTORY.length() + 6);
-                Path path = Path.of(getSingleItem(value)).normalize();
+            } else if (entry.getKey().equals(MetaData.FILE_DIRECTORY)) {
+                metaData.setDefaultFileDirectory(parseDirectory(entry.getValue()));
+            } else if (entry.getKey().startsWith(MetaData.FILE_DIRECTORY + '-')) {
+                // The user name starts directly after FILE_DIRECTORY + '-'
+                String user = entry.getKey().substring(MetaData.FILE_DIRECTORY.length() + 1);
+                metaData.setUserFileDirectory(user, parseDirectory(entry.getValue()));
+            } else if (entry.getKey().startsWith(MetaData.FILE_DIRECTORY_LATEX)) {
+                // The user name starts directly after FILE_DIRECTORY_LATEX" + '-'
+                String user = entry.getKey().substring(MetaData.FILE_DIRECTORY_LATEX.length() + 1);
+                Path path = Path.of(parseDirectory(entry.getValue())).normalize();
                 metaData.setLatexFileDirectory(user, path);
             } else if (entry.getKey().equals(MetaData.SAVE_ACTIONS)) {
-                metaData.setSaveActions(FieldFormatterCleanups.parse(value));
+                metaData.setSaveActions(FieldFormatterCleanups.parse(values));
             } else if (entry.getKey().equals(MetaData.DATABASE_TYPE)) {
-                metaData.setMode(BibDatabaseMode.parse(getSingleItem(value)));
+                metaData.setMode(BibDatabaseMode.parse(getSingleItem(values)));
             } else if (entry.getKey().equals(MetaData.KEYPATTERNDEFAULT)) {
-                defaultCiteKeyPattern = Collections.singletonList(getSingleItem(value));
+                defaultCiteKeyPattern = Collections.singletonList(getSingleItem(values));
             } else if (entry.getKey().equals(MetaData.PROTECTED_FLAG_META)) {
-                if (Boolean.parseBoolean(getSingleItem(value))) {
+                if (Boolean.parseBoolean(getSingleItem(values))) {
                     metaData.markAsProtected();
                 } else {
                     metaData.markAsNotProtected();
                 }
-            } else if (entry.getKey().equals(MetaData.FILE_DIRECTORY)) {
-                metaData.setDefaultFileDirectory(getSingleItem(value));
             } else if (entry.getKey().equals(MetaData.SAVE_ORDER_CONFIG)) {
-                metaData.setSaveOrderConfig(SaveOrderConfig.parse(value));
+                metaData.setSaveOrder(SaveOrder.parse(values));
             } else if (entry.getKey().equals(MetaData.GROUPSTREE) || entry.getKey().equals(MetaData.GROUPSTREE_LEGACY)) {
-                metaData.setGroups(GroupsParser.importGroups(value, keywordSeparator, fileMonitor, metaData));
+                metaData.setGroups(GroupsParser.importGroups(values, keywordSeparator, fileMonitor, metaData));
             } else if (entry.getKey().equals(MetaData.VERSION_DB_STRUCT)) {
-                metaData.setVersionDBStructure(getSingleItem(value));
+                metaData.setVersionDBStructure(getSingleItem(values));
             } else {
                 // Keep meta data items that we do not know in the file
-                metaData.putUnknownMetaDataItem(entry.getKey(), value);
+                metaData.putUnknownMetaDataItem(entry.getKey(), values);
             }
         }
 
@@ -131,6 +138,30 @@ public MetaData parse(MetaData metaData, Map<String, String> data, Character key
         return metaData;
     }
 
+    /**
+     * Parse the content of the value as provided by "raw" content.
+     *
+     * We do not use unescaped value (created by @link{#getAsList(java.lang.String)}),
+     * because this leads to difficulties with UNC names.
+     *
+     * No normalization is done - the general file directory could be passed as Mac OS X path, but the user could sit on Windows.
+     *
+     * @param value the raw value (as stored in the .bib file)
+     */
+    static String parseDirectory(String value) {
+        value = StringUtil.removeStringAtTheEnd(value, MetaData.SEPARATOR_STRING);
+        if (value.contains("\\\\\\\\")) {
+            // This is an escaped Windows UNC path
+            return value.replace("\\\\", "\\");
+        } else if (value.contains("\\\\") && !SINGLE_BACKSLASH.matcher(value).find()) {
+            // All backslashes escaped
+            return value.replace("\\\\", "\\");
+        } else {
+            // No backslash escaping
+            return value;
+        }
+    }
+
     private static Comparator<? super Map.Entry<String, String>> groupsLast() {
         return (s1, s2) -> MetaData.GROUPSTREE.equals(s1.getKey()) || MetaData.GROUPSTREE_LEGACY.equals(s1.getKey()) ? 1 :
                 MetaData.GROUPSTREE.equals(s2.getKey()) || MetaData.GROUPSTREE_LEGACY.equals(s2.getKey()) ? -1 : 0;
@@ -174,7 +205,14 @@ private static Optional<String> getNextUnit(Reader reader) throws IOException {
         StringBuilder res = new StringBuilder();
         while ((c = reader.read()) != -1) {
             if (escape) {
-                res.append((char) c);
+                // at org.jabref.logic.exporter.MetaDataSerializer.serializeMetaData, only MetaData.SEPARATOR_CHARACTER, MetaData.ESCAPE_CHARACTER are quoted
+                // That means ; and \\
+                char character = (char) c;
+                if (character != MetaData.SEPARATOR_CHARACTER && character != MetaData.ESCAPE_CHARACTER) {
+                    // Keep the escape character
+                    res.append("\\");
+                }
+                res.append(character);
                 escape = false;
             } else if (c == MetaData.ESCAPE_CHARACTER) {
                 escape = true;
diff --git a/src/main/java/org/jabref/logic/importer/util/StaxParser.java b/src/main/java/org/jabref/logic/importer/util/StaxParser.java
new file mode 100644
index 00000000000..10037d79a51
--- /dev/null
+++ b/src/main/java/org/jabref/logic/importer/util/StaxParser.java
@@ -0,0 +1,128 @@
+package org.jabref.logic.importer.util;
+
+import javax.xml.stream.XMLStreamConstants;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+
+public class StaxParser {
+
+    /**
+     * Extracts the XML content inside the first
+     * encountered parent tag, including tag elements,
+     * attributes, namespace, prefix and contained text
+     *
+     * @param reader the stream reader
+     * @return Returns the inner XML content
+     */
+    public static String getXMLContent(XMLStreamReader reader) throws XMLStreamException {
+        // skip over START DOCUMENT event
+        while (reader.getEventType() == XMLStreamConstants.START_DOCUMENT && reader.hasNext()) {
+            reader.next();
+        }
+
+        StringBuilder content = new StringBuilder();
+
+        String parentTag = reader.getLocalName();
+        int depth = 1;
+        content.append(getXMLStartTag(reader, true));
+
+        while (reader.hasNext()) {
+            int event = reader.next();
+            if (event == XMLStreamConstants.START_ELEMENT) {
+                String tagName = reader.getLocalName();
+
+                if (tagName.equals(parentTag)) {
+                    // nested tag of same type
+                    depth++;
+                }
+
+                // append the start tag
+                content.append(getXMLStartTag(reader, false));
+            } else if (event == XMLStreamConstants.END_ELEMENT) {
+                String tagName = reader.getLocalName();
+
+                // append the end tag
+                content.append(getXMLEndTag(reader));
+
+                if (tagName.equals(parentTag)) {
+                    depth--;
+
+                    if (depth == 0) {
+                        // reached the closing tag of the first parent tag
+                        break;
+                    }
+                }
+            } else if (event == XMLStreamConstants.CHARACTERS) {
+                content.append(getXMLText(reader));
+            } else if (event == XMLStreamConstants.CDATA) {
+                content.append(getXMLCData(reader));
+            } else if (event == XMLStreamConstants.COMMENT) {
+                content.append(getXMLComment(reader));
+            } else if (event == XMLStreamConstants.PROCESSING_INSTRUCTION) {
+                content.append(getXMLProcessingInstruction(reader));
+            } else if (event == XMLStreamConstants.SPACE || event == XMLStreamConstants.ENTITY_REFERENCE) {
+                content.append(getXMLText(reader));
+            }
+        }
+
+        return content.toString().trim();
+    }
+
+    private static String getXMLStartTag(XMLStreamReader reader, boolean addNamespaceURI) {
+        StringBuilder startTag = new StringBuilder();
+
+        String prefix = reader.getPrefix();
+
+        startTag.append("<")
+                .append(prefix != null && !prefix.isBlank() ? prefix + ":" : "")
+                .append(reader.getName().getLocalPart());
+
+        String namespaceURI = reader.getNamespaceURI();
+        if (addNamespaceURI && namespaceURI != null) {
+            startTag.append(" xmlns")
+                    .append(prefix != null && !prefix.isBlank() ? ":" + prefix : "")
+                    .append("=\"")
+                    .append(namespaceURI)
+                    .append("\"");
+        }
+
+        for (int i = 0; i < reader.getAttributeCount(); i++) {
+            startTag.append(" ").append(reader.getAttributeLocalName(i)).append("=\"").append(reader.getAttributeValue(i)).append("\"");
+        }
+
+        if (reader.isEndElement()) {
+            startTag.append("/");
+        }
+
+        startTag.append(">");
+        return startTag.toString();
+    }
+
+    private static String getXMLEndTag(XMLStreamReader reader) {
+        StringBuilder endTag = new StringBuilder();
+        String prefix = reader.getPrefix();
+
+        endTag.append("</")
+              .append(prefix != null && !prefix.isBlank() ? prefix + ":" : "")
+              .append(reader.getName().getLocalPart())
+              .append(">");
+
+        return endTag.toString();
+    }
+
+    private static String getXMLCData(XMLStreamReader reader) {
+        return "<![CDATA[" + reader.getText() + "]]>";
+    }
+
+    private static String getXMLComment(XMLStreamReader reader) {
+        return "<!--" + reader.getText() + "-->";
+    }
+
+    private static String getXMLProcessingInstruction(XMLStreamReader reader) {
+        return "<?" + reader.getPITarget() + " " + reader.getPIData() + "?>";
+    }
+
+    private static String getXMLText(XMLStreamReader reader) {
+        return reader.getText().trim();
+    }
+}
diff --git a/src/main/java/org/jabref/logic/integrity/TypeChecker.java b/src/main/java/org/jabref/logic/integrity/TypeChecker.java
index f26db2a0e06..a22663e53bf 100644
--- a/src/main/java/org/jabref/logic/integrity/TypeChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/TypeChecker.java
@@ -18,7 +18,7 @@ public List<IntegrityMessage> check(BibEntry entry) {
             return Collections.emptyList();
         }
 
-        if (StandardEntryType.Proceedings.equals(entry.getType())) {
+        if (StandardEntryType.Proceedings == entry.getType()) {
             return Collections.singletonList(new IntegrityMessage(
                     Localization.lang("wrong entry type as proceedings has page numbers"), entry, StandardField.PAGES));
         }
diff --git a/src/main/java/org/jabref/logic/journals/AbbreviationFormat.java b/src/main/java/org/jabref/logic/journals/AbbreviationFormat.java
index 0388b048e94..21734cad692 100644
--- a/src/main/java/org/jabref/logic/journals/AbbreviationFormat.java
+++ b/src/main/java/org/jabref/logic/journals/AbbreviationFormat.java
@@ -4,20 +4,24 @@
 
 public final class AbbreviationFormat {
 
-    public static final char DELIMITER = ';';
+    public static final char DELIMITER = ',';
     public static final char ESCAPE = '\\';
     public static final char QUOTE = '"';
 
     private AbbreviationFormat() {
     }
 
-    public static CSVFormat getCSVFormat() {
+    public static CSVFormat getCSVFormatWithDelimiter(char delimiter) {
         return CSVFormat.DEFAULT.builder()
                 .setIgnoreEmptyLines(true)
-                .setDelimiter(DELIMITER)
+                .setDelimiter(delimiter)
                 .setEscape(ESCAPE)
                 .setQuote(QUOTE)
                 .setTrim(true)
                 .build();
     }
+
+    public static CSVFormat getCSVFormatWithDefaultDilimeter() {
+        return getCSVFormatWithDelimiter(DELIMITER);
+    }
 }
diff --git a/src/main/java/org/jabref/logic/journals/AbbreviationParser.java b/src/main/java/org/jabref/logic/journals/AbbreviationParser.java
index 9a9f67f0bfe..5c84eb8ec17 100644
--- a/src/main/java/org/jabref/logic/journals/AbbreviationParser.java
+++ b/src/main/java/org/jabref/logic/journals/AbbreviationParser.java
@@ -2,58 +2,37 @@
 
 import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.LinkedHashSet;
 
 import org.apache.commons.csv.CSVParser;
 import org.apache.commons.csv.CSVRecord;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * Reads abbreviation files (CSV format) into a list of Abbreviations.
  */
 public class AbbreviationParser {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(AbbreviationParser.class);
+    private static final Character[] DELIMITERS = {';', ','};
+    private static final char NO_DELIMITER = '\0'; // empty char
 
     // Ensures ordering while preventing duplicates
     private final LinkedHashSet<Abbreviation> abbreviations = new LinkedHashSet<>();
 
-    void readJournalListFromResource(String resourceFileName) {
-        try (InputStream stream = JournalAbbreviationRepository.class.getResourceAsStream(resourceFileName);
-             BufferedReader reader = new BufferedReader(new InputStreamReader(stream, StandardCharsets.UTF_8))) {
-            readJournalList(reader);
-        } catch (IOException e) {
-            LOGGER.error(String.format("Could not read journal list from file %s", resourceFileName), e);
-        }
-    }
-
-    public void readJournalListFromFile(Path file) throws IOException {
-        readJournalListFromFile(file, StandardCharsets.UTF_8);
-    }
-
-    public void readJournalListFromFile(Path file, Charset encoding) throws IOException {
-        try (BufferedReader reader = Files.newBufferedReader(file, encoding)) {
-            readJournalList(reader);
-        }
-    }
-
-    /**
+    /*
      * Read the given file, which should contain a list of journal names and their abbreviations. Each line should be
-     * formatted as: "Full Journal Name;Abbr. Journal Name;[Shortest Unique Abbreviation]"
+     * formatted as: "Full Journal Name,Abbr. Journal Name,[Shortest Unique Abbreviation]"
+     * Tries to detect the delimiter, if comma or semicolon is used to ensure backwards compatibility
      *
-     * @param reader a given file into a Reader object
+     * @param file Path the given file
      */
-    private void readJournalList(Reader reader) throws IOException {
-        try (CSVParser csvParser = new CSVParser(reader, AbbreviationFormat.getCSVFormat())) {
+    void readJournalListFromFile(Path file) throws IOException {
+        char delimiter = detectDelimiter(file);
+
+        try (CSVParser csvParser = new CSVParser(Files.newBufferedReader(file, StandardCharsets.UTF_8), AbbreviationFormat.getCSVFormatWithDelimiter(delimiter))) {
             for (CSVRecord csvRecord : csvParser) {
                 String name = csvRecord.size() > 0 ? csvRecord.get(0) : "";
                 String abbreviation = csvRecord.size() > 1 ? csvRecord.get(1) : "";
@@ -70,6 +49,20 @@ private void readJournalList(Reader reader) throws IOException {
         }
     }
 
+    private char detectDelimiter(Path file) throws IOException {
+        try (BufferedReader reader = Files.newBufferedReader(file, StandardCharsets.UTF_8)) {
+            String line = reader.readLine();
+
+            if (line == null) {
+                return NO_DELIMITER;
+            }
+            return Arrays.stream(DELIMITERS)
+                         .filter(s -> line.contains(s.toString()))
+                         .findFirst()
+                         .orElse(NO_DELIMITER);
+        }
+    }
+
     public Collection<Abbreviation> getAbbreviations() {
         return abbreviations;
     }
diff --git a/src/main/java/org/jabref/logic/journals/AbbreviationWriter.java b/src/main/java/org/jabref/logic/journals/AbbreviationWriter.java
index 4a3054f7634..e60954c521b 100644
--- a/src/main/java/org/jabref/logic/journals/AbbreviationWriter.java
+++ b/src/main/java/org/jabref/logic/journals/AbbreviationWriter.java
@@ -26,7 +26,7 @@ private AbbreviationWriter() {
      */
     public static void writeOrCreate(Path path, List<Abbreviation> abbreviations) throws IOException {
         try (OutputStreamWriter writer = new OutputStreamWriter(Files.newOutputStream(path), StandardCharsets.UTF_8);
-             CSVPrinter csvPrinter = new CSVPrinter(writer, AbbreviationFormat.getCSVFormat())) {
+             CSVPrinter csvPrinter = new CSVPrinter(writer, AbbreviationFormat.getCSVFormatWithDefaultDilimeter())) {
             for (Abbreviation entry : abbreviations) {
                 if (entry.isDefaultShortestUniqueAbbreviation()) {
                     csvPrinter.printRecord(entry.getName(), entry.getAbbreviation());
diff --git a/src/main/java/org/jabref/logic/journals/JournalAbbreviationLoader.java b/src/main/java/org/jabref/logic/journals/JournalAbbreviationLoader.java
index 1c0717a943c..2607293ac10 100644
--- a/src/main/java/org/jabref/logic/journals/JournalAbbreviationLoader.java
+++ b/src/main/java/org/jabref/logic/journals/JournalAbbreviationLoader.java
@@ -46,7 +46,7 @@ public static JournalAbbreviationRepository loadRepository(JournalAbbreviationPr
 
         // Read external lists
         List<String> lists = journalAbbreviationPreferences.getExternalJournalLists();
-        if (!(lists.isEmpty())) {
+        if (lists != null && !(lists.isEmpty())) {
             // reversing ensures that the latest lists overwrites the former one
             Collections.reverse(lists);
             for (String filename : lists) {
diff --git a/src/main/java/org/jabref/logic/journals/JournalAbbreviationRepository.java b/src/main/java/org/jabref/logic/journals/JournalAbbreviationRepository.java
index ca0db044368..10f9778f825 100644
--- a/src/main/java/org/jabref/logic/journals/JournalAbbreviationRepository.java
+++ b/src/main/java/org/jabref/logic/journals/JournalAbbreviationRepository.java
@@ -27,22 +27,23 @@ public class JournalAbbreviationRepository {
     private final TreeSet<Abbreviation> customAbbreviations = new TreeSet<>();
 
     public JournalAbbreviationRepository(Path journalList) {
-        MVStore store = new MVStore.Builder().readOnly().fileName(journalList.toAbsolutePath().toString()).open();
-        MVMap<String, Abbreviation> mvFullToAbbreviationObject = store.openMap("FullToAbbreviation");
-
-        mvFullToAbbreviationObject.forEach((name, abbreviation) -> {
-            String abbrevationString = abbreviation.getAbbreviation();
-            String shortestUniqueAbbreviation = abbreviation.getShortestUniqueAbbreviation();
-            Abbreviation newAbbreviation = new Abbreviation(
-                    name,
-                    abbrevationString,
-                    shortestUniqueAbbreviation
-            );
-            fullToAbbreviationObject.put(name, newAbbreviation);
-            abbreviationToAbbreviationObject.put(abbrevationString, newAbbreviation);
-            dotlessToAbbreviationObject.put(newAbbreviation.getDotlessAbbreviation(), newAbbreviation);
-            shortestUniqueToAbbreviationObject.put(shortestUniqueAbbreviation, newAbbreviation);
-        });
+        MVMap<String, Abbreviation> mvFullToAbbreviationObject;
+        try (MVStore store = new MVStore.Builder().readOnly().fileName(journalList.toAbsolutePath().toString()).open()) {
+            mvFullToAbbreviationObject = store.openMap("FullToAbbreviation");
+            mvFullToAbbreviationObject.forEach((name, abbreviation) -> {
+                String abbrevationString = abbreviation.getAbbreviation();
+                String shortestUniqueAbbreviation = abbreviation.getShortestUniqueAbbreviation();
+                Abbreviation newAbbreviation = new Abbreviation(
+                        name,
+                        abbrevationString,
+                        shortestUniqueAbbreviation
+                );
+                fullToAbbreviationObject.put(name, newAbbreviation);
+                abbreviationToAbbreviationObject.put(abbrevationString, newAbbreviation);
+                dotlessToAbbreviationObject.put(newAbbreviation.getDotlessAbbreviation(), newAbbreviation);
+                shortestUniqueToAbbreviationObject.put(shortestUniqueAbbreviation, newAbbreviation);
+            });
+        }
     }
 
     private static boolean isMatched(String name, Abbreviation abbreviation) {
@@ -57,10 +58,9 @@ private static boolean isMatchedAbbreviated(String name, Abbreviation abbreviati
         if (isExpanded) {
             return false;
         }
-        boolean isAbbreviated = name.equalsIgnoreCase(abbreviation.getAbbreviation())
+        return name.equalsIgnoreCase(abbreviation.getAbbreviation())
                 || name.equalsIgnoreCase(abbreviation.getDotlessAbbreviation())
                 || name.equalsIgnoreCase(abbreviation.getShortestUniqueAbbreviation());
-        return isAbbreviated;
     }
 
     /**
diff --git a/src/main/java/org/jabref/logic/journals/JournalInformation.java b/src/main/java/org/jabref/logic/journals/JournalInformation.java
new file mode 100644
index 00000000000..406735325c8
--- /dev/null
+++ b/src/main/java/org/jabref/logic/journals/JournalInformation.java
@@ -0,0 +1,28 @@
+package org.jabref.logic.journals;
+
+import java.util.List;
+
+import javafx.util.Pair;
+
+public record JournalInformation(
+        String title,
+        String publisher,
+        String coverageStartYear,
+        String coverageEndYear,
+        String subjectArea,
+        String country,
+        String categories,
+        String scimagoId,
+        String hIndex,
+        String issn,
+        List<Pair<Integer, Double>> sjrArray,
+        List<Pair<Integer, Double>> snipArray,
+        List<Pair<Integer, Double>> docsThisYear,
+        List<Pair<Integer, Double>> docsPrevious3Years,
+        List<Pair<Integer, Double>> citableDocsPrevious3Years,
+        List<Pair<Integer, Double>> citesOutgoing,
+        List<Pair<Integer, Double>> citesOutgoingPerDoc,
+        List<Pair<Integer, Double>> citesIncomingByRecentlyPublished,
+        List<Pair<Integer, Double>> citesIncomingPerDocByRecentlyPublished
+) {
+}
diff --git a/src/main/java/org/jabref/logic/l10n/Language.java b/src/main/java/org/jabref/logic/l10n/Language.java
index 7325e469f1b..2805b6b3ee5 100644
--- a/src/main/java/org/jabref/logic/l10n/Language.java
+++ b/src/main/java/org/jabref/logic/l10n/Language.java
@@ -14,6 +14,7 @@ public enum Language {
     DANISH("Dansk", "da"),
     DUTCH("Nederlands", "nl"),
     ENGLISH("English", "en"),
+    FINNISH("Suomi", "fi"),
     FRENCH("Français", "fr"),
     GERMAN("Deutsch", "de"),
     GREEK("ελληνικά (Greek)", "el"),
@@ -52,9 +53,9 @@ public static Optional<Locale> convertToSupportedLocale(Language language) {
         String[] languageParts = language.getId().split("_");
         Locale locale;
         if (languageParts.length == 1) {
-            locale = new Locale(languageParts[0]);
+            locale = Locale.of(languageParts[0]);
         } else if (languageParts.length == 2) {
-            locale = new Locale(languageParts[0], languageParts[1]);
+            locale = Locale.of(languageParts[0], languageParts[1]);
         } else {
             locale = Locale.ENGLISH;
         }
diff --git a/src/main/java/org/jabref/logic/l10n/Localization.java b/src/main/java/org/jabref/logic/l10n/Localization.java
index 5b4df6782f0..75a2c7e91e2 100644
--- a/src/main/java/org/jabref/logic/l10n/Localization.java
+++ b/src/main/java/org/jabref/logic/l10n/Localization.java
@@ -14,7 +14,8 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import org.slf4j.Logger;
+import org.jabref.architecture.AllowedToUseStandardStreams;
+
 import org.slf4j.LoggerFactory;
 
 /**
@@ -32,11 +33,9 @@
  * The access to this is given by the functions {@link Localization#lang(String, String...)} and
  * that developers should use whenever they use strings for the e.g. GUI that need to be translatable.
  */
+@AllowedToUseStandardStreams("Needs to have acess to System.err because it's called very early before our loggers")
 public class Localization {
     static final String RESOURCE_PREFIX = "l10n/JabRef";
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(Localization.class);
-
     private static Locale locale;
     private static LocalizationBundle localizedMessages;
 
@@ -52,12 +51,10 @@ private Localization() {
      */
     public static String lang(String key, Object... params) {
         if (localizedMessages == null) {
-            // I'm logging this because it should never happen
-            LOGGER.error("Messages are not initialized before accessing key: {}", key);
+            System.err.println("Messages are not initialized before accessing key: " + key);
             setLanguage(Language.ENGLISH);
         }
         var stringParams = Arrays.stream(params).map(Object::toString).toArray(String[]::new);
-
         return lookup(localizedMessages, key, stringParams);
     }
 
@@ -71,7 +68,7 @@ public static void setLanguage(Language language) {
         Optional<Locale> knownLanguage = Language.convertToSupportedLocale(language);
         final Locale defaultLocale = Locale.getDefault();
         if (knownLanguage.isEmpty()) {
-            LOGGER.warn("Language {} is not supported by JabRef (Default: {})", language, defaultLocale);
+            LoggerFactory.getLogger(Localization.class).warn("Language {} is not supported by JabRef (Default: {})", language, defaultLocale);
             setLanguage(Language.ENGLISH);
             return;
         }
@@ -87,7 +84,7 @@ public static void setLanguage(Language language) {
             createResourceBundles(locale);
         } catch (MissingResourceException ex) {
             // should not happen as we have scripts to enforce this
-            LOGGER.warn("Could not find bundles for language " + locale + ", switching to full english language", ex);
+            LoggerFactory.getLogger(Localization.class).warn("Could not find bundles for language " + locale + ", switching to full english language", ex);
             setLanguage(Language.ENGLISH);
         }
     }
@@ -130,7 +127,7 @@ private static Map<String, String> createLookupMap(ResourceBundle baseBundle) {
                 Collectors.toMap(
                         // not required to unescape content, because that is already done by the ResourceBundle itself
                         key -> key,
-                        key -> baseBundle.getString(key))
+                        baseBundle::getString)
         ));
     }
 
@@ -148,7 +145,7 @@ private static String lookup(LocalizationBundle bundle, String key, String... pa
 
         String translation = bundle.containsKey(key) ? bundle.getString(key) : "";
         if (translation.isEmpty()) {
-            LOGGER.warn("Warning: could not get translation for \"{}\" for locale {}", key, Locale.getDefault());
+            LoggerFactory.getLogger(Localization.class).warn("Warning: could not get translation for \"{}\" for locale {}", key, Locale.getDefault());
             translation = key;
         }
         return new LocalizationKeyParams(translation, params).replacePlaceholders();
diff --git a/src/main/java/org/jabref/logic/layout/Layout.java b/src/main/java/org/jabref/logic/layout/Layout.java
index ea566fbe510..a465d578fd0 100644
--- a/src/main/java/org/jabref/logic/layout/Layout.java
+++ b/src/main/java/org/jabref/logic/layout/Layout.java
@@ -6,6 +6,7 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
+import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
@@ -21,7 +22,10 @@ public class Layout {
 
     private final List<String> missingFormatters = new ArrayList<>();
 
-    public Layout(List<StringInt> parsedEntries, List<Path> fileDirForDatabase, LayoutFormatterPreferences prefs) {
+    public Layout(List<StringInt> parsedEntries,
+                  List<Path> fileDirForDatabase,
+                  LayoutFormatterPreferences layoutPreferences,
+                  JournalAbbreviationRepository abbreviationRepository) {
         List<LayoutEntry> tmpEntries = new ArrayList<>(parsedEntries.size());
 
         List<StringInt> blockEntries = null;
@@ -48,7 +52,8 @@ public Layout(List<StringInt> parsedEntries, List<Path> fileDirForDatabase, Layo
                             le = new LayoutEntry(blockEntries,
                                     parsedEntry.i == LayoutHelper.IS_FIELD_END ? LayoutHelper.IS_FIELD_START : LayoutHelper.IS_GROUP_START,
                                     fileDirForDatabase,
-                                    prefs);
+                                    layoutPreferences,
+                                    abbreviationRepository);
                             tmpEntries.add(le);
                             blockEntries = null;
                         } else {
@@ -63,7 +68,7 @@ public Layout(List<StringInt> parsedEntries, List<Path> fileDirForDatabase, Layo
             }
 
             if (blockEntries == null) {
-                tmpEntries.add(new LayoutEntry(parsedEntry, fileDirForDatabase, prefs));
+                tmpEntries.add(new LayoutEntry(parsedEntry, fileDirForDatabase, layoutPreferences, abbreviationRepository));
             } else {
                 blockEntries.add(parsedEntry);
             }
diff --git a/src/main/java/org/jabref/logic/layout/LayoutEntry.java b/src/main/java/org/jabref/logic/layout/LayoutEntry.java
index 495795417a5..cafd87dc8bc 100644
--- a/src/main/java/org/jabref/logic/layout/LayoutEntry.java
+++ b/src/main/java/org/jabref/logic/layout/LayoutEntry.java
@@ -12,6 +12,7 @@
 
 import org.jabref.logic.formatter.bibtexfields.HtmlToLatexFormatter;
 import org.jabref.logic.formatter.bibtexfields.UnicodeToLatexFormatter;
+import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.layout.format.AuthorAbbreviator;
 import org.jabref.logic.layout.format.AuthorAndToSemicolonReplacer;
 import org.jabref.logic.layout.format.AuthorAndsCommaReplacer;
@@ -108,31 +109,37 @@ class LayoutEntry {
 
     private final List<Path> fileDirForDatabase;
     private final LayoutFormatterPreferences preferences;
+    private final JournalAbbreviationRepository abbreviationRepository;
 
-    public LayoutEntry(StringInt si, List<Path> fileDirForDatabase, LayoutFormatterPreferences preferences) {
+    public LayoutEntry(StringInt si,
+                       List<Path> fileDirForDatabase,
+                       LayoutFormatterPreferences preferences,
+                       JournalAbbreviationRepository abbreviationRepository) {
         this.preferences = preferences;
+        this.abbreviationRepository = abbreviationRepository;
         this.fileDirForDatabase = Objects.requireNonNullElse(fileDirForDatabase, Collections.emptyList());
 
         type = si.i;
         switch (type) {
-            case LayoutHelper.IS_LAYOUT_TEXT:
-                text = si.s;
-                break;
-            case LayoutHelper.IS_SIMPLE_COMMAND:
-                text = si.s.trim();
-                break;
-            case LayoutHelper.IS_OPTION_FIELD:
-                doOptionField(si.s);
-                break;
-            case LayoutHelper.IS_FIELD_START:
-            case LayoutHelper.IS_FIELD_END:
-            default:
-                break;
+            case LayoutHelper.IS_LAYOUT_TEXT ->
+                    text = si.s;
+            case LayoutHelper.IS_SIMPLE_COMMAND ->
+                    text = si.s.trim();
+            case LayoutHelper.IS_OPTION_FIELD ->
+                    doOptionField(si.s);
+            default -> {
+                // IS_FIELD_START and IS_FIELD_END
+            }
         }
     }
 
-    public LayoutEntry(List<StringInt> parsedEntries, int layoutType, List<Path> fileDirForDatabase, LayoutFormatterPreferences preferences) {
+    public LayoutEntry(List<StringInt> parsedEntries,
+                       int layoutType,
+                       List<Path> fileDirForDatabase,
+                       LayoutFormatterPreferences preferences,
+                       JournalAbbreviationRepository abbreviationRepository) {
         this.preferences = preferences;
+        this.abbreviationRepository = abbreviationRepository;
         this.fileDirForDatabase = Objects.requireNonNullElse(fileDirForDatabase, Collections.emptyList());
 
         List<LayoutEntry> tmpEntries = new ArrayList<>();
@@ -159,7 +166,7 @@ public LayoutEntry(List<StringInt> parsedEntries, int layoutType, List<Path> fil
                         blockEntries.add(parsedEntry);
                         int groupType = parsedEntry.i == LayoutHelper.IS_GROUP_END ? LayoutHelper.IS_GROUP_START :
                                 LayoutHelper.IS_FIELD_START;
-                        LayoutEntry le = new LayoutEntry(blockEntries, groupType, fileDirForDatabase, preferences);
+                        LayoutEntry le = new LayoutEntry(blockEntries, groupType, fileDirForDatabase, preferences, abbreviationRepository);
                         tmpEntries.add(le);
                         blockEntries = null;
                     } else {
@@ -175,7 +182,7 @@ public LayoutEntry(List<StringInt> parsedEntries, int layoutType, List<Path> fil
             }
 
             if (blockEntries == null) {
-                tmpEntries.add(new LayoutEntry(parsedEntry, fileDirForDatabase, preferences));
+                tmpEntries.add(new LayoutEntry(parsedEntry, fileDirForDatabase, preferences, abbreviationRepository));
             } else {
                 blockEntries.add(parsedEntry);
             }
@@ -391,8 +398,8 @@ private void doOptionField(String s) {
             option = getOptionalLayout(v.get(1));
             // See if there was an undefined formatter:
             for (LayoutFormatter anOption : option) {
-                if (anOption instanceof NotFoundFormatter) {
-                    String notFound = ((NotFoundFormatter) anOption).getNotFound();
+                if (anOption instanceof NotFoundFormatter formatter) {
+                    String notFound = formatter.getNotFound();
 
                     invalidFormatter.add(notFound);
                 }
@@ -446,7 +453,7 @@ private LayoutFormatter getLayoutFormatterByName(String name) {
             case "HTMLParagraphs" -> new HTMLParagraphs();
             case "Iso690FormatDate" -> new Iso690FormatDate();
             case "Iso690NamesAuthors" -> new Iso690NamesAuthors();
-            case "JournalAbbreviator" -> new JournalAbbreviator(preferences.getJournalAbbreviationRepository());
+            case "JournalAbbreviator" -> new JournalAbbreviator(abbreviationRepository);
             case "LastPage" -> new LastPage();
 // For backward compatibility
             case "FormatChars", "LatexToUnicode" -> new LatexToUnicodeFormatter();
@@ -504,8 +511,8 @@ private List<LayoutFormatter> getOptionalLayout(String formatterName) {
             LayoutFormatter formatter = getLayoutFormatterByName(nameFormatterName);
             if (formatter != null) {
                 // If this formatter accepts an argument, check if we have one, and set it if so
-                if ((formatter instanceof ParamLayoutFormatter) && (strings.size() >= 2)) {
-                    ((ParamLayoutFormatter) formatter).setArgument(strings.get(1));
+                if ((formatter instanceof ParamLayoutFormatter layoutFormatter) && (strings.size() >= 2)) {
+                    layoutFormatter.setArgument(strings.get(1));
                 }
                 results.add(formatter);
                 continue;
diff --git a/src/main/java/org/jabref/logic/layout/LayoutFormatterPreferences.java b/src/main/java/org/jabref/logic/layout/LayoutFormatterPreferences.java
index 64c8e438117..b2177cbd543 100644
--- a/src/main/java/org/jabref/logic/layout/LayoutFormatterPreferences.java
+++ b/src/main/java/org/jabref/logic/layout/LayoutFormatterPreferences.java
@@ -6,7 +6,6 @@
 
 import javafx.beans.property.StringProperty;
 
-import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.layout.format.NameFormatterPreferences;
 
 public class LayoutFormatterPreferences {
@@ -14,14 +13,11 @@ public class LayoutFormatterPreferences {
     private final NameFormatterPreferences nameFormatterPreferences;
     private final StringProperty mainFileDirectoryProperty;
     private final Map<String, String> customExportNameFormatters = new HashMap<>();
-    private final JournalAbbreviationRepository journalAbbreviationRepository;
 
     public LayoutFormatterPreferences(NameFormatterPreferences nameFormatterPreferences,
-                                      StringProperty mainFileDirectoryProperty,
-                                      JournalAbbreviationRepository journalAbbreviationRepository) {
+                                      StringProperty mainFileDirectoryProperty) {
         this.nameFormatterPreferences = nameFormatterPreferences;
         this.mainFileDirectoryProperty = mainFileDirectoryProperty;
-        this.journalAbbreviationRepository = journalAbbreviationRepository;
     }
 
     public NameFormatterPreferences getNameFormatterPreferences() {
@@ -32,8 +28,8 @@ public String getMainFileDirectory() {
         return mainFileDirectoryProperty.get();
     }
 
-    public JournalAbbreviationRepository getJournalAbbreviationRepository() {
-        return journalAbbreviationRepository;
+    public Optional<String> getCustomExportNameFormatter(String formatterName) {
+        return Optional.ofNullable(customExportNameFormatters.get(formatterName));
     }
 
     public void clearCustomExportNameFormatters() {
@@ -43,8 +39,4 @@ public void clearCustomExportNameFormatters() {
     public void putCustomExportNameFormatter(String formatterName, String contents) {
         customExportNameFormatters.put(formatterName, contents);
     }
-
-    public Optional<String> getCustomExportNameFormatter(String formatterName) {
-        return Optional.ofNullable(customExportNameFormatters.get(formatterName));
-    }
 }
diff --git a/src/main/java/org/jabref/logic/layout/LayoutHelper.java b/src/main/java/org/jabref/logic/layout/LayoutHelper.java
index 69aafdd1dcf..0a01c49dac5 100644
--- a/src/main/java/org/jabref/logic/layout/LayoutHelper.java
+++ b/src/main/java/org/jabref/logic/layout/LayoutHelper.java
@@ -10,6 +10,8 @@
 import java.util.Locale;
 import java.util.Objects;
 
+import org.jabref.logic.journals.JournalAbbreviationRepository;
+
 /**
  * Helper class to get a Layout object.
  *
@@ -39,16 +41,23 @@ public class LayoutHelper {
     private final List<StringInt> parsedEntries = new ArrayList<>();
     private final List<Path> fileDirForDatabase;
     private final LayoutFormatterPreferences preferences;
+    private final JournalAbbreviationRepository abbreviationRepository;
     private boolean endOfFile;
 
-    public LayoutHelper(Reader in, List<Path> fileDirForDatabase, LayoutFormatterPreferences preferences) {
+    public LayoutHelper(Reader in,
+                        List<Path> fileDirForDatabase,
+                        LayoutFormatterPreferences preferences,
+                        JournalAbbreviationRepository abbreviationRepository) {
         this.in = new PushbackReader(Objects.requireNonNull(in));
         this.preferences = Objects.requireNonNull(preferences);
+        this.abbreviationRepository = abbreviationRepository;
         this.fileDirForDatabase = fileDirForDatabase;
     }
 
-    public LayoutHelper(Reader in, LayoutFormatterPreferences preferences) {
-        this(in, Collections.emptyList(), preferences);
+    public LayoutHelper(Reader in,
+                        LayoutFormatterPreferences preferences,
+                        JournalAbbreviationRepository abbreviationRepository) {
+        this(in, Collections.emptyList(), preferences, abbreviationRepository);
     }
 
     public Layout getLayoutFromText() throws IOException {
@@ -62,7 +71,7 @@ public Layout getLayoutFromText() throws IOException {
             }
         }
 
-        return new Layout(parsedEntries, fileDirForDatabase, preferences);
+        return new Layout(parsedEntries, fileDirForDatabase, preferences, abbreviationRepository);
     }
 
     public static String getCurrentGroup() {
diff --git a/src/main/java/org/jabref/logic/layout/StringInt.java b/src/main/java/org/jabref/logic/layout/StringInt.java
index 6244b82c1da..6032e8afe8f 100644
--- a/src/main/java/org/jabref/logic/layout/StringInt.java
+++ b/src/main/java/org/jabref/logic/layout/StringInt.java
@@ -1,9 +1,11 @@
 package org.jabref.logic.layout;
 
+import java.io.Serializable;
+
 /**
  * String and integer value.
  */
-public class StringInt implements java.io.Serializable {
+public class StringInt implements Serializable {
 
     /**
      * Description of the Field
diff --git a/src/main/java/org/jabref/logic/layout/TextBasedPreviewLayout.java b/src/main/java/org/jabref/logic/layout/TextBasedPreviewLayout.java
index bb7091dce3f..80bdd02aa2d 100644
--- a/src/main/java/org/jabref/logic/layout/TextBasedPreviewLayout.java
+++ b/src/main/java/org/jabref/logic/layout/TextBasedPreviewLayout.java
@@ -3,6 +3,7 @@
 import java.io.IOException;
 import java.io.StringReader;
 
+import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.preview.PreviewLayout;
 import org.jabref.model.database.BibDatabaseContext;
@@ -12,7 +13,7 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * Implements the preview based JabRef's <a href="https://docs.jabref.org/import-export/export/customexports">Custom export fitlters</a>.
+ * Implements the preview based JabRef's <a href="https://docs.jabref.org/import-export/export/customexports">Custom export filters</a>.
  */
 public class TextBasedPreviewLayout implements PreviewLayout {
     public static final String NAME = "PREVIEW";
@@ -21,9 +22,11 @@ public class TextBasedPreviewLayout implements PreviewLayout {
     private Layout layout;
     private String text;
     private LayoutFormatterPreferences layoutFormatterPreferences;
+    private JournalAbbreviationRepository abbreviationRepository;
 
-    public TextBasedPreviewLayout(String text, LayoutFormatterPreferences layoutFormatterPreferences) {
+    public TextBasedPreviewLayout(String text, LayoutFormatterPreferences layoutFormatterPreferences, JournalAbbreviationRepository abbreviationRepository) {
         this.layoutFormatterPreferences = layoutFormatterPreferences;
+        this.abbreviationRepository = abbreviationRepository;
         setText(text);
     }
 
@@ -36,7 +39,7 @@ public void setText(String text) {
         this.text = text;
         StringReader sr = new StringReader(text.replace("__NEWLINE__", "\n"));
         try {
-            layout = new LayoutHelper(sr, layoutFormatterPreferences).getLayoutFromText();
+            layout = new LayoutHelper(sr, layoutFormatterPreferences, abbreviationRepository).getLayoutFromText();
         } catch (IOException e) {
             LOGGER.error("Could not generate layout", e);
         }
diff --git a/src/main/java/org/jabref/logic/layout/format/AuthorAndToSemicolonReplacer.java b/src/main/java/org/jabref/logic/layout/format/AuthorAndToSemicolonReplacer.java
index 11ae9e70f75..2699baaac56 100644
--- a/src/main/java/org/jabref/logic/layout/format/AuthorAndToSemicolonReplacer.java
+++ b/src/main/java/org/jabref/logic/layout/format/AuthorAndToSemicolonReplacer.java
@@ -6,6 +6,6 @@ public class AuthorAndToSemicolonReplacer implements LayoutFormatter {
 
     @Override
     public String format(String fieldText) {
-        return fieldText.replaceAll(" and ", "; ");
+        return fieldText.replace(" and ", "; ");
     }
 }
diff --git a/src/main/java/org/jabref/logic/layout/format/DocBookAuthorFormatter.java b/src/main/java/org/jabref/logic/layout/format/DocBookAuthorFormatter.java
index 5905970cea5..01bdfe29c46 100644
--- a/src/main/java/org/jabref/logic/layout/format/DocBookAuthorFormatter.java
+++ b/src/main/java/org/jabref/logic/layout/format/DocBookAuthorFormatter.java
@@ -11,10 +11,7 @@ public class DocBookAuthorFormatter {
     private static final XMLChars XML_CHARS = new XMLChars();
 
     /**
-     * @param sb      {@link StringBuilder}
-     * @param al      {@link AuthorList}
      * @param tagName Editor or author field/tag
-     * @param version @link {@link DocBookVersion}
      */
     public void addBody(StringBuilder sb, AuthorList al, String tagName, DocBookVersion version) {
         for (int i = 0; i < al.getNumberOfAuthors(); i++) {
diff --git a/src/main/java/org/jabref/logic/layout/format/Number.java b/src/main/java/org/jabref/logic/layout/format/Number.java
index e2daa7297f7..18e5415f27e 100644
--- a/src/main/java/org/jabref/logic/layout/format/Number.java
+++ b/src/main/java/org/jabref/logic/layout/format/Number.java
@@ -1,6 +1,5 @@
 package org.jabref.logic.layout.format;
 
-import org.jabref.logic.exporter.ExporterFactory;
 import org.jabref.logic.layout.ParamLayoutFormatter;
 
 /**
@@ -9,6 +8,8 @@
  */
 public class Number implements ParamLayoutFormatter {
 
+    public static int serialExportNumber;
+
     @Override
     public void setArgument(String arg) {
         // No effect currently.
@@ -16,6 +17,6 @@ public void setArgument(String arg) {
 
     @Override
     public String format(String fieldText) {
-        return String.valueOf(ExporterFactory.entryNumber);
+        return String.valueOf(serialExportNumber);
     }
 }
diff --git a/src/main/java/org/jabref/logic/layout/format/RemoveLatexCommandsFormatter.java b/src/main/java/org/jabref/logic/layout/format/RemoveLatexCommandsFormatter.java
index e9681c4d698..f84d21efca2 100644
--- a/src/main/java/org/jabref/logic/layout/format/RemoveLatexCommandsFormatter.java
+++ b/src/main/java/org/jabref/logic/layout/format/RemoveLatexCommandsFormatter.java
@@ -59,7 +59,7 @@ public String format(String field) {
                     }
                     if (incommand) {
                         // eat up all whitespace characters
-                        while ((currentFieldPosition + 1 < field.length() && Character.isWhitespace(field.charAt(currentFieldPosition + 1)))) {
+                        while (currentFieldPosition + 1 < field.length() && Character.isWhitespace(field.charAt(currentFieldPosition + 1))) {
                             currentFieldPosition++;
                         }
                     }
diff --git a/src/main/java/org/jabref/logic/layout/format/ReplaceUnicodeLigaturesFormatter.java b/src/main/java/org/jabref/logic/layout/format/ReplaceUnicodeLigaturesFormatter.java
index 0824258087b..1d2db81c090 100644
--- a/src/main/java/org/jabref/logic/layout/format/ReplaceUnicodeLigaturesFormatter.java
+++ b/src/main/java/org/jabref/logic/layout/format/ReplaceUnicodeLigaturesFormatter.java
@@ -28,13 +28,12 @@ public String getName() {
 
     @Override
     public String getKey() {
-        return "remove_unicode_ligatures";
+        return "replace_unicode_ligatures";
     }
 
     @Override
     public String format(String fieldText) {
         String result = fieldText;
-
         for (Pattern key : ligaturesMap.keySet()) {
             result = key.matcher(result).replaceAll(ligaturesMap.get(key));
         }
diff --git a/src/main/java/org/jabref/logic/msbib/MSBibConverter.java b/src/main/java/org/jabref/logic/msbib/MSBibConverter.java
index 961e5541d19..c7dbfb44557 100644
--- a/src/main/java/org/jabref/logic/msbib/MSBibConverter.java
+++ b/src/main/java/org/jabref/logic/msbib/MSBibConverter.java
@@ -74,10 +74,10 @@ public static MSBibEntry convert(BibEntry entry) {
         entry.getLatexFreeField(StandardField.LANGUAGE)
              .ifPresent(lang -> result.fields.put("LCID", String.valueOf(MSBibMapping.getLCID(lang))));
         StringBuilder sbNumber = new StringBuilder();
-        entry.getLatexFreeField(StandardField.ISBN).ifPresent(isbn -> sbNumber.append(" ISBN: " + isbn));
-        entry.getLatexFreeField(StandardField.ISSN).ifPresent(issn -> sbNumber.append(" ISSN: " + issn));
-        entry.getLatexFreeField(new UnknownField("lccn")).ifPresent(lccn -> sbNumber.append("LCCN: " + lccn));
-        entry.getLatexFreeField(StandardField.MR_NUMBER).ifPresent(mrnumber -> sbNumber.append(" MRN: " + mrnumber));
+        entry.getLatexFreeField(StandardField.ISBN).ifPresent(isbn -> sbNumber.append(" ISBN: ").append(isbn));
+        entry.getLatexFreeField(StandardField.ISSN).ifPresent(issn -> sbNumber.append(" ISSN: ").append(issn));
+        entry.getLatexFreeField(new UnknownField("lccn")).ifPresent(lccn -> sbNumber.append("LCCN: ").append(lccn));
+        entry.getLatexFreeField(StandardField.MR_NUMBER).ifPresent(mrnumber -> sbNumber.append(" MRN: ").append(mrnumber));
 
         result.standardNumber = sbNumber.toString();
         if (result.standardNumber.isEmpty()) {
@@ -101,7 +101,7 @@ public static MSBibEntry convert(BibEntry entry) {
         }
 
         // TODO: currently this can never happen
-        if (("InternetSite".equals(msBibType) || "DocumentFromInternetSite".equals(msBibType))) {
+        if ("InternetSite".equals(msBibType) || "DocumentFromInternetSite".equals(msBibType)) {
             result.internetSiteTitle = entry.getLatexFreeField(StandardField.TITLE).orElse(null);
         }
 
diff --git a/src/main/java/org/jabref/logic/msbib/MSBibDatabase.java b/src/main/java/org/jabref/logic/msbib/MSBibDatabase.java
index 76db56ce666..f2040674fef 100644
--- a/src/main/java/org/jabref/logic/msbib/MSBibDatabase.java
+++ b/src/main/java/org/jabref/logic/msbib/MSBibDatabase.java
@@ -66,7 +66,6 @@ public MSBibDatabase(BibDatabase database, List<BibEntry> entries) {
     /**
      * Imports entries from an office xml file
      *
-     * @param reader
      * @return List of {@link BibEntry}
      */
     public List<BibEntry> importEntriesFromXml(BufferedReader reader) {
diff --git a/src/main/java/org/jabref/logic/msbib/MSBibEntry.java b/src/main/java/org/jabref/logic/msbib/MSBibEntry.java
index 2808d8a0050..28618a6f60e 100644
--- a/src/main/java/org/jabref/logic/msbib/MSBibEntry.java
+++ b/src/main/java/org/jabref/logic/msbib/MSBibEntry.java
@@ -82,9 +82,7 @@ public MSBibEntry() {
     }
 
     /**
-     * Createa new {@link MsBibEntry} to import from an xml element
-     *
-     * @param entry
+     * Create a new {@link MsBibEntry} to import from an xml element
      */
     public MSBibEntry(Element entry) {
         populateFromXml(entry);
diff --git a/src/main/java/org/jabref/logic/net/ProxyPreferences.java b/src/main/java/org/jabref/logic/net/ProxyPreferences.java
index 5479e6beb72..dc5311ab139 100644
--- a/src/main/java/org/jabref/logic/net/ProxyPreferences.java
+++ b/src/main/java/org/jabref/logic/net/ProxyPreferences.java
@@ -15,22 +15,25 @@ public class ProxyPreferences {
     private final BooleanProperty useAuthentication;
     private final StringProperty username;
     private final StringProperty password;
+    private final BooleanProperty persistPassword;
 
     public ProxyPreferences(Boolean useProxy,
                             String hostname,
                             String port,
                             Boolean useAuthentication,
                             String username,
-                            String password) {
+                            String password,
+                            boolean persistPassword) {
         this.useProxy = new SimpleBooleanProperty(useProxy);
         this.hostname = new SimpleStringProperty(hostname);
         this.port = new SimpleStringProperty(port);
         this.useAuthentication = new SimpleBooleanProperty(useAuthentication);
         this.username = new SimpleStringProperty(username);
         this.password = new SimpleStringProperty(password);
+        this.persistPassword = new SimpleBooleanProperty(persistPassword);
     }
 
-    public final Boolean shouldUseProxy() {
+    public final boolean shouldUseProxy() {
         return useProxy.getValue();
     }
 
@@ -66,8 +69,8 @@ public void setPort(String port) {
         this.port.set(port);
     }
 
-    public final Boolean shouldUseAuthentication() {
-        return useAuthentication.getValue();
+    public final boolean shouldUseAuthentication() {
+        return useAuthentication.get();
     }
 
     public BooleanProperty useAuthenticationProperty() {
@@ -102,6 +105,18 @@ public void setPassword(String password) {
         this.password.set(password);
     }
 
+    public boolean shouldPersistPassword() {
+        return persistPassword.get();
+    }
+
+    public BooleanProperty persistPasswordProperty() {
+        return persistPassword;
+    }
+
+    public void setPersistPassword(boolean persistPassword) {
+        this.persistPassword.set(persistPassword);
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) {
@@ -118,7 +133,8 @@ public boolean equals(Object o) {
                 && Objects.equals(port.getValue(), other.port.getValue())
                 && Objects.equals(useAuthentication.getValue(), other.useAuthentication.getValue())
                 && Objects.equals(username.getValue(), other.username.getValue())
-                && Objects.equals(password.getValue(), other.password.getValue());
+                && Objects.equals(password.getValue(), other.password.getValue())
+                && Objects.equals(persistPassword.getValue(), other.persistPassword.getValue());
     }
 
     @Override
@@ -129,6 +145,7 @@ public int hashCode() {
                 port.getValue(),
                 useAuthentication.getValue(),
                 username.getValue(),
-                password.getValue());
+                password.getValue(),
+                persistPassword.getValue());
     }
 }
diff --git a/src/main/java/org/jabref/logic/net/URLDownload.java b/src/main/java/org/jabref/logic/net/URLDownload.java
index c171a86ff4d..e357b621ac0 100644
--- a/src/main/java/org/jabref/logic/net/URLDownload.java
+++ b/src/main/java/org/jabref/logic/net/URLDownload.java
@@ -386,9 +386,9 @@ public URLConnection openConnection() throws IOException {
             }
         }
 
-        if (connection instanceof HttpURLConnection) {
+        if (connection instanceof HttpURLConnection lConnection) {
             // normally, 3xx is redirect
-            int status = ((HttpURLConnection) connection).getResponseCode();
+            int status = lConnection.getResponseCode();
 
             if ((status == HttpURLConnection.HTTP_MOVED_TEMP)
                 || (status == HttpURLConnection.HTTP_MOVED_PERM)
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 eebdf65d4f5..c958d53e5d2 100644
--- a/src/main/java/org/jabref/logic/openoffice/action/EditMerge.java
+++ b/src/main/java/org/jabref/logic/openoffice/action/EditMerge.java
@@ -59,9 +59,9 @@ public static boolean mergeCitationGroups(XTextDocument doc, OOFrontend frontend
             for (JoinableGroupData joinableGroupData : joinableGroups) {
                 List<CitationGroup> groups = joinableGroupData.group;
 
-                List<Citation> newCitations = (groups.stream()
+                List<Citation> newCitations = groups.stream()
                                                      .flatMap(group -> group.citationsInStorageOrder.stream())
-                                                     .collect(Collectors.toList()));
+                                                     .collect(Collectors.toList());
 
                 CitationType citationType = groups.get(0).citationType;
                 List<Optional<OOText>> pageInfos = frontend.backend.combinePageInfos(groups);
@@ -179,7 +179,7 @@ private static boolean checkAddToGroup(ScanState state, CitationGroup group, XTe
 
             // Sanity check: the current range should start later than the previous.
             int textOrder = UnoTextRange.compareStarts(state.prevRange, currentRange);
-            if (textOrder != (-1)) {
+            if (textOrder != -1) {
                 String msg =
                         String.format("MergeCitationGroups:"
                                         + " \"%s\" supposed to be followed by \"%s\","
@@ -214,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)) {
             //
@@ -264,8 +264,8 @@ private static void addToCurrentGroup(ScanState state, CitationGroup group, XTex
 
         // If new group, create currentGroupCursor
         if (isNewGroup) {
-            state.currentGroupCursor = (currentRange.getText()
-                                                    .createTextCursorByRange(currentRange.getStart()));
+            state.currentGroupCursor = currentRange.getText()
+                                                    .createTextCursorByRange(currentRange.getStart());
         }
 
         // include currentRange in currentGroupCursor
@@ -298,8 +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));
+            XTextRange currentRange = frontend.getMarkRange(doc, group)
+                                               .orElseThrow(IllegalStateException::new);
 
             /*
              * Decide if we add group to the group. False when the group is empty.
@@ -311,7 +311,7 @@ private static List<JoinableGroupData> scan(XTextDocument doc, OOFrontend fronte
              *
              * Can it start a new group?
              */
-            boolean canStartGroup = (group.citationType == CitationType.AUTHORYEAR_PAR);
+            boolean canStartGroup = group.citationType == CitationType.AUTHORYEAR_PAR;
 
             if (!addToGroup) {
                 // close currentGroup
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 ffe6c59dc0c..5f087001d02 100644
--- a/src/main/java/org/jabref/logic/openoffice/action/EditSeparate.java
+++ b/src/main/java/org/jabref/logic/openoffice/action/EditSeparate.java
@@ -55,9 +55,9 @@ public static boolean separateCitations(XTextDocument doc,
             UnoScreenRefresh.lockControllers(doc);
 
             for (CitationGroup group : groups) {
-                XTextRange range1 = (frontend
+                XTextRange range1 = frontend
                         .getMarkRange(doc, group)
-                        .orElseThrow(IllegalStateException::new));
+                        .orElseThrow(IllegalStateException::new);
                 XTextCursor textCursor = range1.getText().createTextCursorByRange(range1);
 
                 List<Citation> citations = group.citationsInStorageOrder;
@@ -71,7 +71,7 @@ public static boolean separateCitations(XTextDocument doc,
                 // Create a citation group for each citation.
                 final int last = citations.size() - 1;
                 for (int i = 0; i < citations.size(); i++) {
-                    boolean insertSpaceAfter = (i != last);
+                    boolean insertSpaceAfter = i != last;
                     Citation citation = citations.get(i);
 
                     UpdateCitationMarkers.createAndFillCitationGroup(frontend,
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 e433d18e72f..0769a7f9b5b 100644
--- a/src/main/java/org/jabref/logic/openoffice/backend/Backend52.java
+++ b/src/main/java/org/jabref/logic/openoffice/backend/Backend52.java
@@ -131,18 +131,18 @@ public CitationGroup readCitationGroupFromDocumentOrThrow(XTextDocument doc, Str
 
         Codec52.ParsedMarkName parsed = Codec52.parseMarkName(markName).orElseThrow(IllegalArgumentException::new);
 
-        List<Citation> citations = (parsed.citationKeys.stream()
+        List<Citation> citations = parsed.citationKeys.stream()
                                                        .map(Citation::new)
-                                                       .collect(Collectors.toList()));
+                                                       .collect(Collectors.toList());
 
-        Optional<OOText> pageInfo = (UnoUserDefinedProperty.getStringValue(doc, markName)
-                                                           .map(OOText::fromString));
+        Optional<OOText> pageInfo = UnoUserDefinedProperty.getStringValue(doc, markName)
+                                                           .map(OOText::fromString);
         pageInfo = PageInfo.normalizePageInfo(pageInfo);
 
         setPageInfoInDataInitial(citations, pageInfo);
 
-        NamedRange namedRange = (citationStorageManager.getNamedRangeFromDocument(doc, markName)
-                                                       .orElseThrow(IllegalArgumentException::new));
+        NamedRange namedRange = citationStorageManager.getNamedRangeFromDocument(doc, markName)
+                                                       .orElseThrow(IllegalArgumentException::new);
 
         CitationGroupId groupId = new CitationGroupId(markName);
         CitationGroup group = new CitationGroup(OODataModel.JabRef52,
@@ -226,7 +226,7 @@ public CitationGroup createCitationGroup(XTextDocument doc,
         /*
          * Apply to document
          */
-        boolean withoutBrackets = (citationType == CitationType.INVISIBLE_CIT);
+        boolean withoutBrackets = citationType == CitationType.INVISIBLE_CIT;
         NamedRange namedRange = this.citationStorageManager.createNamedRange(doc,
                 markName,
                 position,
@@ -271,25 +271,25 @@ public CitationGroup createCitationGroup(XTextDocument doc,
                         Backend52::getPageInfoFromData);
 
                 // Try to do something of the pageInfos.
-                String singlePageInfo = (pageInfos.stream()
+                String singlePageInfo = pageInfos.stream()
                                                   .filter(Optional::isPresent)
                                                   .map(pi -> OOText.toString(pi.get()))
                                                   .distinct()
-                                                  .collect(Collectors.joining("; ")));
+                                                  .collect(Collectors.joining("; "));
 
-                int totalCitations = (joinableGroup.stream()
+                int totalCitations = joinableGroup.stream()
                                                    .map(CitationGroup::numberOfCitations)
-                                                   .mapToInt(Integer::intValue).sum());
+                                                   .mapToInt(Integer::intValue).sum();
                 if ("".equals(singlePageInfo)) {
                     singlePageInfo = null;
                 }
                 return OODataModel.fakePageInfos(singlePageInfo, totalCitations);
 
             case JabRef60:
-                return (joinableGroup.stream()
+                return joinableGroup.stream()
                                      .flatMap(group -> (group.citationsInStorageOrder.stream()
                                                                                      .map(Citation::getPageInfo)))
-                                     .collect(Collectors.toList()));
+                                     .collect(Collectors.toList());
             default:
                 throw new IllegalArgumentException("unhandled dataModel here");
         }
@@ -378,14 +378,14 @@ public List<CitationEntry> getCitationEntries(XTextDocument doc, CitationGroups
                 List<CitationEntry> citations = new ArrayList<>(citationGroups.numberOfCitationGroups());
                 for (CitationGroup group : citationGroups.getCitationGroupsUnordered()) {
                     String name = group.groupId.citationGroupIdAsString();
-                    XTextCursor cursor = (this
+                    XTextCursor cursor = this
                             .getRawCursorForCitationGroup(group, doc)
-                            .orElseThrow(IllegalStateException::new));
+                            .orElseThrow(IllegalStateException::new);
                     String context = GetContext.getCursorStringWithContext(cursor, 30, 30, true);
-                    Optional<String> pageInfo = (group.numberOfCitations() > 0
+                    Optional<String> pageInfo = group.numberOfCitations() > 0
                             ? (getPageInfoFromData(group)
                             .map(e -> OOText.toString(e)))
-                            : Optional.empty());
+                            : Optional.empty();
                     CitationEntry entry = new CitationEntry(name, context, pageInfo);
                     citations.add(entry);
                 }
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 af131fa5300..5d567539799 100644
--- a/src/main/java/org/jabref/logic/openoffice/backend/Codec52.java
+++ b/src/main/java/org/jabref/logic/openoffice/backend/Codec52.java
@@ -114,14 +114,14 @@ public static Optional<ParsedMarkName> parseMarkName(String refMarkName) {
         String index = citeMatcher.group(1);
         int citTypeCode = Integer.parseInt(citeMatcher.group(2));
         CitationType citationType = citationTypeFromInt(citTypeCode);
-        return (Optional.of(new Codec52.ParsedMarkName(index, citationType, keys)));
+        return Optional.of(new Codec52.ParsedMarkName(index, citationType, keys));
     }
 
     /**
      * @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());
+        return CITE_PATTERN.matcher(name).find();
     }
 
     /**
@@ -130,8 +130,8 @@ public static boolean isJabRefReferenceMarkName(String name) {
      * @param names The list to be filtered.
      */
     public static List<String> filterIsJabRefReferenceMarkName(List<String> names) {
-        return (names.stream()
+        return names.stream()
                      .filter(Codec52::isJabRefReferenceMarkName)
-                     .collect(Collectors.toList()));
+                     .collect(Collectors.toList());
     }
 }
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 865682f0ccc..cad4ca6a640 100644
--- a/src/main/java/org/jabref/logic/openoffice/backend/GetContext.java
+++ b/src/main/java/org/jabref/logic/openoffice/backend/GetContext.java
@@ -19,7 +19,6 @@ private GetContext() {
      * <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.
@@ -67,9 +66,9 @@ public static String getCursorStringWithContext(XTextCursor cursor,
 
         String result = cursor.getString();
         if (htmlMarkup) {
-            result = (result.substring(0, addedBefore)
+            result = result.substring(0, addedBefore)
                     + "<b>" + citPart + "</b>"
-                    + result.substring(lengthWithBefore));
+                    + 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 fead1169b8e..37ad5499da5 100644
--- a/src/main/java/org/jabref/logic/openoffice/backend/NamedRangeManagerReferenceMark.java
+++ b/src/main/java/org/jabref/logic/openoffice/backend/NamedRangeManagerReferenceMark.java
@@ -38,9 +38,9 @@ public Optional<NamedRange> getNamedRangeFromDocument(XTextDocument doc, String
             throws
             NoDocumentException,
             WrappedTargetException {
-        return (NamedRangeReferenceMark
+        return NamedRangeReferenceMark
                 .getFromDocument(doc, refMarkName)
-                .map(x -> x));
+                .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 e816b3bfa97..377dd060805 100644
--- a/src/main/java/org/jabref/logic/openoffice/backend/NamedRangeReferenceMark.java
+++ b/src/main/java/org/jabref/logic/openoffice/backend/NamedRangeReferenceMark.java
@@ -96,9 +96,9 @@ 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
+        String bracketedContent = withoutBrackets
                 ? ""
-                : left + right);
+                : left + right;
 
         cursor.getText().insertString(cursor, bracketedContent, true);
 
@@ -133,8 +133,8 @@ static Optional<NamedRangeReferenceMark> getFromDocument(XTextDocument doc, Stri
             throws
             NoDocumentException,
             WrappedTargetException {
-        return (UnoReferenceMark.getAnchor(doc, refMarkName)
-                                .map(e -> new NamedRangeReferenceMark(refMarkName)));
+        return UnoReferenceMark.getAnchor(doc, refMarkName)
+                                .map(e -> new NamedRangeReferenceMark(refMarkName));
     }
 
     /**
@@ -403,19 +403,19 @@ public void cleanFillCursor(XTextDocument doc)
         final int fullTextLength = fullText.length();
         final short leftLength = (short) left.length();
         final short rightLength = (short) right.length();
-        final int contentLength = (fullTextLength - (leftLength + rightLength));
+        final int contentLength = fullTextLength - (leftLength + rightLength);
         if (contentLength < 0) {
             String msg = String.format("cleanFillCursor: length(%s) < 0", name);
             throw new IllegalStateException(msg);
         }
 
-        boolean removeRight = ((contentLength >= 1)
+        boolean removeRight = (contentLength >= 1)
                 || ((contentLength == 0) && removeBracketsFromEmpty)
-                || alwaysRemoveBrackets);
+                || alwaysRemoveBrackets;
 
-        boolean removeLeft = ((contentLength >= 2)
+        boolean removeLeft = (contentLength >= 2)
                 || ((contentLength == 0) && removeBracketsFromEmpty)
-                || alwaysRemoveBrackets);
+                || 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 492124242c7..7858e9230ad 100644
--- a/src/main/java/org/jabref/logic/openoffice/frontend/OOFrontend.java
+++ b/src/main/java/org/jabref/logic/openoffice/frontend/OOFrontend.java
@@ -107,9 +107,9 @@ private List<RangeSortable<CitationGroup>> createVisualSortInput(XTextDocument d
 
         List<RangeSortEntry<CitationGroup>> sortables = new ArrayList<>();
         for (CitationGroup group : citationGroups.getCitationGroupsUnordered()) {
-            XTextRange range = (this
+            XTextRange range = this
                     .getMarkRange(doc, group)
-                    .orElseThrow(IllegalStateException::new));
+                    .orElseThrow(IllegalStateException::new);
             sortables.add(new RangeSortEntry<>(range, 0, group));
         }
 
@@ -167,9 +167,9 @@ private List<CitationGroup> getVisuallySortedCitationGroups(XTextDocument doc,
 
         List<RangeSortable<CitationGroup>> sorted = RangeSortVisual.visualSort(sortables, doc, fcursor);
 
-        return (sorted.stream()
+        return sorted.stream()
                       .map(RangeSortable::getContent)
-                      .collect(Collectors.toList()));
+                      .collect(Collectors.toList());
     }
 
     /**
@@ -187,7 +187,7 @@ private List<CitationGroup> getVisuallySortedCitationGroups(XTextDocument doc,
         List<RangeSortable<CitationGroup>> sortables =
                 createVisualSortInput(doc, mapFootnotesToFootnoteMarks);
 
-        return (sortables.stream().map(RangeSortable::getContent).collect(Collectors.toList()));
+        return sortables.stream().map(RangeSortable::getContent).collect(Collectors.toList());
     }
 
     /**
@@ -197,7 +197,6 @@ private List<CitationGroup> getVisuallySortedCitationGroups(XTextDocument doc,
      *
      * @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.
      */
@@ -384,9 +383,9 @@ static String rangeOverlapsToMessage(List<RangeOverlap<RangeForOverlapCheck<Cita
 
         StringBuilder msg = new StringBuilder();
         for (RangeOverlap<RangeForOverlapCheck<CitationGroupId>> overlap : overlaps) {
-            String listOfRanges = (overlap.valuesForOverlappingRanges.stream()
+            String listOfRanges = overlap.valuesForOverlappingRanges.stream()
                                                                      .map(v -> String.format("'%s'", v.format()))
-                                                                     .collect(Collectors.joining(", ")));
+                                                                     .collect(Collectors.joining(", "));
             msg.append(
                     switch (overlap.kind) {
                         case EQUAL_RANGE -> Localization.lang("Found identical ranges");
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 d43734cb0f4..3993afdf9a0 100644
--- a/src/main/java/org/jabref/logic/openoffice/frontend/UpdateCitationMarkers.java
+++ b/src/main/java/org/jabref/logic/openoffice/frontend/UpdateCitationMarkers.java
@@ -34,7 +34,6 @@ private UpdateCitationMarkers() {
      * <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.
      */
     public static void applyNewCitationMarkers(XTextDocument doc, OOFrontend frontend, OOBibStyle style)
@@ -46,7 +45,7 @@ public static void applyNewCitationMarkers(XTextDocument doc, OOFrontend fronten
         CitationGroups citationGroups = frontend.citationGroups;
 
         for (CitationGroup group : citationGroups.getCitationGroupsUnordered()) {
-            boolean withText = (group.citationType != CitationType.INVISIBLE_CIT);
+            boolean withText = group.citationType != CitationType.INVISIBLE_CIT;
             Optional<OOText> marker = group.getCitationMarker();
 
             if (marker.isEmpty()) {
@@ -92,11 +91,8 @@ public static void fillCitationMarkInCursor(XTextDocument doc,
      * Inserts a citation group in the document: creates and fills it.
      *
      * @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 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.
      */
     public static void createAndFillCitationGroup(OOFrontend frontend,
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 1d14af0f6ea..d0e5fa605ab 100644
--- a/src/main/java/org/jabref/logic/openoffice/style/OOBibStyle.java
+++ b/src/main/java/org/jabref/logic/openoffice/style/OOBibStyle.java
@@ -19,6 +19,7 @@
 import java.util.TreeSet;
 import java.util.regex.Pattern;
 
+import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.layout.Layout;
 import org.jabref.logic.layout.LayoutFormatter;
 import org.jabref.logic.layout.LayoutFormatterPreferences;
@@ -130,7 +131,8 @@ public class OOBibStyle implements Comparable<OOBibStyle> {
     private final Map<String, Object> citProperties = new HashMap<>();
     private final boolean fromResource;
     private final String path;
-    private final LayoutFormatterPreferences prefs;
+    private final LayoutFormatterPreferences layoutPreferences;
+    private final JournalAbbreviationRepository abbreviationRepository;
     private String name = "";
     private Layout defaultBibLayout;
     private boolean valid;
@@ -139,8 +141,9 @@ public class OOBibStyle implements Comparable<OOBibStyle> {
     private String localCopy;
     private boolean isDefaultLayoutPresent;
 
-    public OOBibStyle(Path styleFile, LayoutFormatterPreferences prefs) throws IOException {
-        this.prefs = Objects.requireNonNull(prefs);
+    public OOBibStyle(Path styleFile, LayoutFormatterPreferences layoutPreferences, JournalAbbreviationRepository abbreviationRepository) throws IOException {
+        this.layoutPreferences = Objects.requireNonNull(layoutPreferences);
+        this.abbreviationRepository = abbreviationRepository;
         this.styleFile = Objects.requireNonNull(styleFile);
         setDefaultProperties();
         reload();
@@ -148,8 +151,10 @@ public OOBibStyle(Path styleFile, LayoutFormatterPreferences prefs) throws IOExc
         path = styleFile.toAbsolutePath().toString();
     }
 
-    public OOBibStyle(String resourcePath, LayoutFormatterPreferences prefs) throws IOException {
-        this.prefs = Objects.requireNonNull(prefs);
+    public OOBibStyle(String resourcePath, LayoutFormatterPreferences layoutPreferences, JournalAbbreviationRepository abbreviationRepository) throws IOException {
+        this.layoutPreferences = Objects.requireNonNull(layoutPreferences);
+        this.abbreviationRepository = abbreviationRepository;
+
         Objects.requireNonNull(resourcePath);
         setDefaultProperties();
         initialize(OOBibStyle.class.getResourceAsStream(resourcePath));
@@ -379,7 +384,7 @@ private void handleStructureLine(String line) {
             try {
                 final String typeName = line.substring(0, index);
                 final String formatString = line.substring(index + 1);
-                Layout layout = new LayoutHelper(new StringReader(formatString), this.prefs).getLayoutFromText();
+                Layout layout = new LayoutHelper(new StringReader(formatString), layoutPreferences, abbreviationRepository).getLayoutFromText();
                 EntryType type = EntryTypeFactory.parse(typeName);
 
                 if (!isDefaultLayoutPresent && OOBibStyle.DEFAULT_MARK.equals(typeName)) {
@@ -547,8 +552,7 @@ public boolean equals(Object object) {
         if (this == object) {
             return true;
         }
-        if (object instanceof OOBibStyle) {
-            OOBibStyle otherStyle = (OOBibStyle) object;
+        if (object instanceof OOBibStyle otherStyle) {
             return Objects.equals(path, otherStyle.path)
                     && Objects.equals(name, otherStyle.name)
                     && Objects.equals(citProperties, otherStyle.citProperties)
@@ -655,8 +659,8 @@ protected void setValid(boolean isValid) {
         valid = isValid;
     }
 
-    protected LayoutFormatterPreferences getPrefs() {
-        return prefs;
+    protected LayoutFormatterPreferences getLayoutPreferences() {
+        return layoutPreferences;
     }
 
     protected void setDefaultBibLayout(Layout layout) {
@@ -918,8 +922,8 @@ public OOText getFormattedBibliographyTitle() {
         OOBibStyle style = this;
         OOText title = style.getReferenceHeaderText();
         String parStyle = style.getReferenceHeaderParagraphFormat();
-        return (parStyle == null
+        return parStyle == null
                 ? OOFormat.paragraph(title)
-                : OOFormat.paragraph(title, parStyle));
+                : 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 21fe8454d57..278b05d9595 100644
--- a/src/main/java/org/jabref/logic/openoffice/style/OOBibStyleGetCitationMarker.java
+++ b/src/main/java/org/jabref/logic/openoffice/style/OOBibStyleGetCitationMarker.java
@@ -55,9 +55,9 @@ private static String getAuthorLastName(AuthorList authorList, int number) {
     }
 
     private static String markupAuthorName(OOBibStyle style, String name) {
-        return (style.getAuthorNameMarkupBefore()
+        return style.getAuthorNameMarkupBefore()
                 + name
-                + style.getAuthorNameMarkupAfter());
+                + style.getAuthorNameMarkupAfter();
     }
 
     /**
@@ -139,13 +139,13 @@ private static String formatAuthorList(OOBibStyle style,
         }
 
         // emitAllAuthors == false means use "et al."
-        boolean emitAllAuthors = ((nAuthors <= maxAuthors) || (maxAuthors == -1));
+        boolean emitAllAuthors = (nAuthors <= maxAuthors) || (maxAuthors == -1);
 
-        int nAuthorsToEmit = (emitAllAuthors
+        int nAuthorsToEmit = emitAllAuthors
                               ? nAuthors
                               // If we use "et al." maxAuthorsBeforeEtAl also limits the
                               // number of authors emitted.
-                              : Math.min(maxAuthorsBeforeEtAl, nAuthors));
+                              : Math.min(maxAuthorsBeforeEtAl, nAuthors);
 
         if (nAuthorsToEmit >= 1) {
             stringBuilder.append(style.getAuthorsPartMarkupBefore());
@@ -230,10 +230,10 @@ private static Optional<FieldAndContent> getRawCitationMarkerField(BibEntry entr
         Objects.requireNonNull(entry, "Entry cannot be null");
         Objects.requireNonNull(database, "database cannot be null");
 
-        for (Field field : fields /* FieldFactory.parseOrFields(fields)*/) {
+        for (Field field : fields.getFields() /* FieldFactory.parseOrFields(fields)*/) {
             Optional<String> optionalContent = entry.getResolvedFieldOrAlias(field, database);
-            final boolean foundSomething = (optionalContent.isPresent()
-                                            && !optionalContent.get().trim().isEmpty());
+            final boolean foundSomething = optionalContent.isPresent()
+                                            && !optionalContent.get().trim().isEmpty();
             if (foundSomething) {
                 return Optional.of(new FieldAndContent(field, optionalContent.get()));
             }
@@ -317,9 +317,9 @@ private static int calculateNAuthorsToEmit(OOBibStyle style, CitationMarkerEntry
             return 0;
         }
 
-        int maxAuthors = (entry.getIsFirstAppearanceOfSource()
+        int maxAuthors = entry.getIsFirstAppearanceOfSource()
                           ? style.getMaxAuthorsFirst()
-                          : style.getMaxAuthors());
+                          : style.getMaxAuthors();
 
         AuthorList authorList = getAuthorList(style, entry.getLookupResult().get());
         int nAuthors = authorList.getNumberOfAuthors();
@@ -373,13 +373,13 @@ private static OOText getAuthorYearParenthesisMarker2(OOBibStyle style,
                                                           boolean[] startsNewGroup,
                                                           Optional<Integer> maxAuthorsOverride) {
 
-        boolean inParenthesis = (purpose == AuthorYearMarkerPurpose.IN_PARENTHESIS
-                                 || purpose == AuthorYearMarkerPurpose.NORMALIZED);
+        boolean inParenthesis = purpose == AuthorYearMarkerPurpose.IN_PARENTHESIS
+                                 || purpose == AuthorYearMarkerPurpose.NORMALIZED;
 
         // The String to separate authors from year, e.g. "; ".
-        String yearSep = (inParenthesis
+        String yearSep = inParenthesis
                           ? style.getYearSeparator()
-                          : style.getYearSeparatorInText());
+                          : style.getYearSeparatorInText();
 
         // The opening parenthesis.
         String startBrace = style.getBracketBefore();
@@ -394,9 +394,9 @@ private static OOText getAuthorYearParenthesisMarker2(OOBibStyle style,
         OrFields yearFieldNames = style.getYearFieldNames();
 
         // The String to add between the two last author names, e.g. " & ".
-        String andString = (inParenthesis
+        String andString = inParenthesis
                             ? style.getAuthorLastSeparator()
-                            : style.getAuthorLastSeparatorInTextWithFallBack());
+                            : style.getAuthorLastSeparatorInTextWithFallBack();
 
         String pageInfoSeparator = style.getPageInfoSeparator();
         String uniquefierSeparator = style.getUniquefierSeparator();
@@ -451,9 +451,9 @@ private static OOText getAuthorYearParenthesisMarker2(OOBibStyle style,
             } else {
                 CitationLookupResult db = entry.getLookupResult().get();
 
-                int maxAuthors = (purpose == AuthorYearMarkerPurpose.NORMALIZED
+                int maxAuthors = purpose == AuthorYearMarkerPurpose.NORMALIZED
                                   ? style.getMaxAuthors()
-                                  : calculateNAuthorsToEmit(style, entry));
+                                  : calculateNAuthorsToEmit(style, entry);
 
                 if (maxAuthorsOverride.isPresent()) {
                     maxAuthors = maxAuthorsOverride.get();
@@ -716,38 +716,38 @@ static OOText getNormalizedCitationMarker(OOBibStyle style,
 
                 Optional<String> ul2 = ce2.getUniqueLetter();
                 Optional<String> ul1 = ce1.getUniqueLetter();
-                final boolean uniqueLetterPresenceChanged = (ul2.isPresent() != ul1.isPresent());
+                final boolean uniqueLetterPresenceChanged = ul2.isPresent() != ul1.isPresent();
                 final boolean uniqueLettersDiffer = !ul2.equals(ul1);
 
-                final boolean uniqueLetterDoesNotMakeUnique = (citationKeysDiffer
+                final boolean uniqueLetterDoesNotMakeUnique = citationKeysDiffer
                                                                && !normalizedMarkersDiffer
-                                                               && !uniqueLettersDiffer);
+                                                               && !uniqueLettersDiffer;
 
                 if (uniqueLetterDoesNotMakeUnique &&
-                    nonUniqueCitationMarkerHandling.equals(NonUniqueCitationMarker.THROWS)) {
+                        nonUniqueCitationMarkerHandling == NonUniqueCitationMarker.THROWS) {
                     throw new IllegalArgumentException("different citation keys,"
                                                        + " but same normalizedMarker and uniqueLetter");
                 }
 
-                final boolean pageInfoInhibitsJoin = (bothPageInfosAreEmpty
+                final boolean pageInfoInhibitsJoin = bothPageInfosAreEmpty
                                                       ? false
-                                                      : (citationKeysDiffer || pageInfosDiffer));
+                                                      : (citationKeysDiffer || pageInfosDiffer);
 
-                startingNewGroup = (normalizedMarkersDiffer
+                startingNewGroup = normalizedMarkersDiffer
                                     || nAuthorsShownInhibitsJoin
                                     || pageInfoInhibitsJoin
                                     || uniqueLetterPresenceChanged
-                                    || uniqueLetterDoesNotMakeUnique);
+                                    || uniqueLetterDoesNotMakeUnique;
 
                 if (!startingNewGroup) {
                     // inherit from first of group. Used at next i.
                     nAuthorsToEmitRevised[i] = nAuthorsToEmitRevised[i - 1];
                 }
 
-                sameAsPrev = (!startingNewGroup
+                sameAsPrev = !startingNewGroup
                               && !uniqueLettersDiffer
                               && !citationKeysDiffer
-                              && !pageInfosDiffer);
+                              && !pageInfosDiffer;
             }
 
             if (!sameAsPrev) {
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 5f7ac121750..2d5aa14272b 100644
--- a/src/main/java/org/jabref/logic/openoffice/style/OOBibStyleGetNumCitationMarker.java
+++ b/src/main/java/org/jabref/logic/openoffice/style/OOBibStyleGetNumCitationMarker.java
@@ -185,7 +185,7 @@ public static OOText getNumCitationMarker2(OOBibStyle style,
                                                List<CitationMarkerNumericEntry> entries,
                                                int minGroupingCount) {
 
-        final boolean joinIsDisabled = (minGroupingCount <= 0);
+        final boolean joinIsDisabled = minGroupingCount <= 0;
         final int nCitations = entries.size();
 
         final String bracketBefore = style.getBracketBefore();
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 5ae0f4be7be..d45eab65b7e 100644
--- a/src/main/java/org/jabref/logic/openoffice/style/OOFormatBibliography.java
+++ b/src/main/java/org/jabref/logic/openoffice/style/OOFormatBibliography.java
@@ -179,7 +179,7 @@ private static OOText formatCitedOnPages(CitationGroups citationGroups, CitedKey
         filteredList.sort((a, b) -> {
                 Integer aa = a.getIndexInGlobalOrder().orElseThrow(IllegalStateException::new);
                 Integer bb = b.getIndexInGlobalOrder().orElseThrow(IllegalStateException::new);
-                return (aa.compareTo(bb));
+                return aa.compareTo(bb);
             });
 
         int index = 0;
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 c09bedbb2ba..3e960e7e165 100644
--- a/src/main/java/org/jabref/logic/openoffice/style/OOProcessAuthorYearMarkers.java
+++ b/src/main/java/org/jabref/logic/openoffice/style/OOProcessAuthorYearMarkers.java
@@ -124,7 +124,6 @@ private static void setIsFirstAppearanceOfSourceInCitations(CitationGroups citat
      * Produce citMarkers for normal
      * (!isCitationKeyCiteMarkers &amp;&amp; !isNumberEntries) styles.
      *
-     * @param citationGroups
      * @param style              Bibliography style.
      */
     static void produceCitationMarkers(CitationGroups citationGroups, OOBibStyle style) {
@@ -142,7 +141,7 @@ static void produceCitationMarkers(CitationGroups citationGroups, OOBibStyle sty
         setIsFirstAppearanceOfSourceInCitations(citationGroups);
 
         for (CitationGroup group : citationGroups.getCitationGroupsInGlobalOrder()) {
-            final boolean inParenthesis = (group.citationType == CitationType.AUTHORYEAR_PAR);
+            final boolean inParenthesis = group.citationType == CitationType.AUTHORYEAR_PAR;
             final NonUniqueCitationMarker strictlyUnique = NonUniqueCitationMarker.THROWS;
 
             List<Citation> cits = group.getCitationsInLocalOrder();
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 a60b184030e..8ca01617b67 100644
--- a/src/main/java/org/jabref/logic/openoffice/style/OOProcessNumericMarkers.java
+++ b/src/main/java/org/jabref/logic/openoffice/style/OOProcessNumericMarkers.java
@@ -21,10 +21,6 @@ private OOProcessNumericMarkers() {
      * Numbered citation markers for each CitationGroup.
      * Numbering is according to first appearance.
      * Assumes global order and local order are already applied.
-     *
-     * @param citationGroups
-     * @param style
-     *
      */
     static void produceCitationMarkers(CitationGroups citationGroups, OOBibStyle style) {
         assert style.isNumberEntries();
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 90e1bc50158..ad7bad0e9cc 100644
--- a/src/main/java/org/jabref/logic/openoffice/style/StyleLoader.java
+++ b/src/main/java/org/jabref/logic/openoffice/style/StyleLoader.java
@@ -8,6 +8,7 @@
 import java.util.List;
 import java.util.Objects;
 
+import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.layout.LayoutFormatterPreferences;
 import org.jabref.logic.openoffice.OpenOfficePreferences;
 
@@ -27,15 +28,19 @@ public class StyleLoader {
 
     private final OpenOfficePreferences openOfficePreferences;
     private final LayoutFormatterPreferences layoutFormatterPreferences;
+    private final JournalAbbreviationRepository abbreviationRepository;
 
     // 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) {
+    public StyleLoader(OpenOfficePreferences openOfficePreferences,
+                       LayoutFormatterPreferences formatterPreferences,
+                       JournalAbbreviationRepository abbreviationRepository) {
         this.openOfficePreferences = Objects.requireNonNull(openOfficePreferences);
         this.layoutFormatterPreferences = Objects.requireNonNull(formatterPreferences);
+        this.abbreviationRepository = Objects.requireNonNull(abbreviationRepository);
         loadInternalStyles();
         loadExternalStyles();
     }
@@ -55,7 +60,7 @@ public List<OOBibStyle> getStyles() {
     public boolean addStyleIfValid(String filename) {
         Objects.requireNonNull(filename);
         try {
-            OOBibStyle newStyle = new OOBibStyle(Path.of(filename), layoutFormatterPreferences);
+            OOBibStyle newStyle = new OOBibStyle(Path.of(filename), layoutFormatterPreferences, abbreviationRepository);
             if (externalStyles.contains(newStyle)) {
                 LOGGER.info("External style file {} already existing.", filename);
             } else if (newStyle.isValid()) {
@@ -80,7 +85,7 @@ private void loadExternalStyles() {
         List<String> lists = openOfficePreferences.getExternalStyles();
         for (String filename : lists) {
             try {
-                OOBibStyle style = new OOBibStyle(Path.of(filename), layoutFormatterPreferences);
+                OOBibStyle style = new OOBibStyle(Path.of(filename), layoutFormatterPreferences, abbreviationRepository);
                 if (style.isValid()) { // Problem!
                     externalStyles.add(style);
                 } else {
@@ -99,7 +104,7 @@ private void loadInternalStyles() {
         internalStyles.clear();
         for (String filename : internalStyleFiles) {
             try {
-                internalStyles.add(new OOBibStyle(filename, layoutFormatterPreferences));
+                internalStyles.add(new OOBibStyle(filename, layoutFormatterPreferences, abbreviationRepository));
             } catch (IOException e) {
                 LOGGER.info("Problem reading internal style file {}", filename, e);
             }
diff --git a/src/main/java/org/jabref/logic/pdf/EntryAnnotationImporter.java b/src/main/java/org/jabref/logic/pdf/EntryAnnotationImporter.java
index e6d6c09beb7..5f22139593c 100644
--- a/src/main/java/org/jabref/logic/pdf/EntryAnnotationImporter.java
+++ b/src/main/java/org/jabref/logic/pdf/EntryAnnotationImporter.java
@@ -33,7 +33,7 @@ public EntryAnnotationImporter(BibEntry entry) {
      */
     private List<LinkedFile> getFilteredFileList() {
         return entry.getFiles().stream()
-                    .filter(parsedFileField -> parsedFileField.getFileType().equalsIgnoreCase("pdf"))
+                    .filter(parsedFileField -> "pdf".equalsIgnoreCase(parsedFileField.getFileType()))
                     .filter(parsedFileField -> !parsedFileField.isOnlineLink()).collect(Collectors.toList());
     }
 
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 831ca747cb1..e2e1c0f5b7e 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
@@ -83,7 +83,7 @@ public Optional<List<Document>> readLinkedPdf(BibDatabaseContext databaseContext
      */
     public List<Document> readLinkedPdfs(BibDatabaseContext databaseContext) {
         return entry.getFiles().stream()
-                    .map((pdf) -> readLinkedPdf(databaseContext, pdf))
+                    .map(pdf -> readLinkedPdf(databaseContext, pdf))
                     .filter(Optional::isPresent)
                     .map(Optional::get)
                     .flatMap(List::stream)
@@ -153,8 +153,8 @@ private void addContentIfNotEmpty(PDDocument pdfDocument, Document newDocument,
             newDocument.add(new TextField(CONTENT, mergeLines(pdfContent), Field.Store.YES));
         }
         PDPage page = pdfDocument.getPage(pageNumber);
-        List<String> annotations = page.getAnnotations().stream().filter((annotation) -> annotation.getContents() != null).map(PDAnnotation::getContents).collect(Collectors.toList());
-        if (annotations.size() > 0) {
+        List<String> annotations = page.getAnnotations().stream().filter(annotation -> annotation.getContents() != null).map(PDAnnotation::getContents).collect(Collectors.toList());
+        if (!annotations.isEmpty()) {
             newDocument.add(new TextField(ANNOTATIONS, annotations.stream().collect(Collectors.joining("\n")), Field.Store.YES));
         }
     }
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 8ebc6bddd04..a7457f327b1 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
@@ -86,7 +86,7 @@ public AutoCloseable blockNewTasks() {
     }
 
     public void createIndex(PdfIndexer indexer) {
-        enqueueTask(() -> indexer.createIndex());
+        enqueueTask(indexer::createIndex);
     }
 
     public void updateIndex(PdfIndexer indexer, BibDatabaseContext databaseContext) {
diff --git a/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsLoader.java b/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsLoader.java
index c57095e26fb..9f74b266ead 100644
--- a/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsLoader.java
+++ b/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsLoader.java
@@ -28,6 +28,7 @@ public class ProtectedTermsLoader {
         INTERNAL_LISTS.put("/protectedterms/months_weekdays.terms", () -> Localization.lang("Months and weekdays in English"));
         INTERNAL_LISTS.put("/protectedterms/countries_territories.terms", () -> Localization.lang("Countries and territories in English"));
         INTERNAL_LISTS.put("/protectedterms/electrical_engineering.terms", () -> Localization.lang("Electrical engineering terms"));
+        INTERNAL_LISTS.put("/protectedterms/computer_science.terms", () -> Localization.lang("Computer science"));
     }
 
     public ProtectedTermsLoader(ProtectedTermsPreferences preferences) {
diff --git a/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsParser.java b/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsParser.java
index 5cd8628f657..e0e9a54dc33 100644
--- a/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsParser.java
+++ b/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsParser.java
@@ -50,7 +50,7 @@ private void readTermsList(Path path) {
             return;
         }
         try (Stream<String> lines = Files.lines(path, StandardCharsets.UTF_8)) {
-            this.terms.addAll(lines.map(this::setDescription).filter(line -> line != null).collect(Collectors.toList()));
+            this.terms.addAll(lines.map(this::setDescription).filter(Objects::nonNull).collect(Collectors.toList()));
         } catch (IOException e) {
             LOGGER.warn("Could not read terms from file {}", path, e);
         }
@@ -59,7 +59,6 @@ private void readTermsList(Path path) {
     /**
      * Parse the description that starts after the # but don't include it in the terms
      *
-     * @param line
      * @return line or null if the line contains the description
      */
     private String setDescription(String line) {
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 915ffc5e598..6844547eef0 100644
--- a/src/main/java/org/jabref/logic/remote/client/RemoteClient.java
+++ b/src/main/java/org/jabref/logic/remote/client/RemoteClient.java
@@ -39,7 +39,7 @@ public boolean ping() {
                 return false;
             }
         } catch (IOException e) {
-            LOGGER.debug("Could not ping server at port " + port, e);
+            LOGGER.debug("Could not ping server at port {}", port, e);
             return false;
         }
     }
@@ -56,7 +56,7 @@ public boolean sendCommandLineArguments(String[] args) {
             Pair<RemoteMessage, Object> response = protocol.receiveMessage();
             return response.getKey() == RemoteMessage.OK;
         } catch (IOException e) {
-            LOGGER.debug("Could not send args " + String.join(", ", args) + " to the server at port " + port, e);
+            LOGGER.debug("Could not send args {} to the server at port {}", String.join(", ", args), port, e);
             return false;
         }
     }
diff --git a/src/main/java/org/jabref/logic/remote/server/RemoteListenerServer.java b/src/main/java/org/jabref/logic/remote/server/RemoteListenerServer.java
index 1585a32867c..bfa0e8829da 100644
--- a/src/main/java/org/jabref/logic/remote/server/RemoteListenerServer.java
+++ b/src/main/java/org/jabref/logic/remote/server/RemoteListenerServer.java
@@ -57,8 +57,8 @@ private void handleMessage(Protocol protocol, RemoteMessage type, Object argumen
                 protocol.sendMessage(RemoteMessage.PONG, Protocol.IDENTIFIER);
                 break;
             case SEND_COMMAND_LINE_ARGUMENTS:
-                if (argument instanceof String[]) {
-                    messageHandler.handleCommandLineArguments((String[]) argument);
+                if (argument instanceof String[] strings) {
+                    messageHandler.handleCommandLineArguments(strings);
                     protocol.sendMessage(RemoteMessage.OK);
                 } else {
                     throw new IOException("Argument for 'SEND_COMMAND_LINE_ARGUMENTS' is not of type String[]. Got " + argument);
diff --git a/src/main/java/org/jabref/logic/shared/DBMSProcessor.java b/src/main/java/org/jabref/logic/shared/DBMSProcessor.java
index 1946db7029a..b836bb34911 100644
--- a/src/main/java/org/jabref/logic/shared/DBMSProcessor.java
+++ b/src/main/java/org/jabref/logic/shared/DBMSProcessor.java
@@ -191,7 +191,7 @@ protected void insertIntoEntryTable(List<BibEntry> bibEntries) {
         }
 
         try (PreparedStatement preparedEntryStatement = connection.prepareStatement(insertIntoEntryQuery.toString(),
-                new String[] {"SHARED_ID"})) {
+                new String[]{"SHARED_ID"})) {
             for (int i = 0; i < bibEntries.size(); i++) {
                 preparedEntryStatement.setString(i + 1, bibEntries.get(i).getType().getName());
             }
@@ -224,7 +224,7 @@ private List<BibEntry> getNotYetExistingEntries(List<BibEntry> bibEntries) {
         List<Integer> localIds = bibEntries.stream()
                                            .map(BibEntry::getSharedBibEntryData)
                                            .map(SharedBibEntryData::getSharedID)
-                                           .filter((id) -> id != -1)
+                                           .filter(id -> id != -1)
                                            .collect(Collectors.toList());
         if (localIds.isEmpty()) {
             return bibEntries;
@@ -243,7 +243,7 @@ private List<BibEntry> getNotYetExistingEntries(List<BibEntry> bibEntries) {
         } catch (SQLException e) {
             LOGGER.error("SQL Error: ", e);
         }
-        return bibEntries.stream().filter((entry) ->
+        return bibEntries.stream().filter(entry ->
                 !remoteIds.contains(entry.getSharedBibEntryData().getSharedID()))
                          .collect(Collectors.toList());
     }
diff --git a/src/main/java/org/jabref/logic/shared/DBMSSynchronizer.java b/src/main/java/org/jabref/logic/shared/DBMSSynchronizer.java
index 8e60024f3b2..3a3d6658877 100644
--- a/src/main/java/org/jabref/logic/shared/DBMSSynchronizer.java
+++ b/src/main/java/org/jabref/logic/shared/DBMSSynchronizer.java
@@ -70,8 +70,6 @@ public DBMSSynchronizer(BibDatabaseContext bibDatabaseContext, Character keyword
 
     /**
      * Listening method. Inserts a new {@link BibEntry} into shared database.
-     *
-     * @param event {@link EntriesAddedEvent} object
      */
     @Subscribe
     public void listen(EntriesAddedEvent event) {
@@ -89,8 +87,6 @@ public void listen(EntriesAddedEvent event) {
 
     /**
      * Listening method. Updates an existing shared {@link BibEntry}.
-     *
-     * @param event {@link FieldChangedEvent} object
      */
     @Subscribe
     public void listen(FieldChangedEvent event) {
@@ -110,10 +106,7 @@ public void listen(FieldChangedEvent event) {
 
     /**
      * Listening method. Deletes the given list of {@link BibEntry} from shared database.
-     *
-     * @param event {@link EntriesRemovedEvent} object
      */
-
     @Subscribe
     public void listen(EntriesRemovedEvent event) {
         // While synchronizing the local database (see synchronizeLocalDatabase() below), some EntriesEvents may be posted.
@@ -128,8 +121,6 @@ public void listen(EntriesRemovedEvent event) {
 
     /**
      * Listening method. Synchronizes the shared {@link MetaData} and applies them locally.
-     *
-     * @param event
      */
     @Subscribe
     public void listen(MetaDataChangedEvent event) {
@@ -382,7 +373,7 @@ public boolean checkCurrentConnection() {
      */
     public boolean isEventSourceAccepted(EntriesEvent event) {
         EntriesEventSource eventSource = event.getEntriesEventSource();
-        return ((eventSource == EntriesEventSource.LOCAL) || (eventSource == EntriesEventSource.UNDO));
+        return (eventSource == EntriesEventSource.LOCAL) || (eventSource == EntriesEventSource.UNDO);
     }
 
     @Override
diff --git a/src/main/java/org/jabref/logic/shared/DatabaseLocation.java b/src/main/java/org/jabref/logic/shared/DatabaseLocation.java
index 836384bdd1e..736594fc69a 100644
--- a/src/main/java/org/jabref/logic/shared/DatabaseLocation.java
+++ b/src/main/java/org/jabref/logic/shared/DatabaseLocation.java
@@ -7,5 +7,5 @@
  */
 public enum DatabaseLocation {
     LOCAL,
-    SHARED;
+    SHARED
 }
diff --git a/src/main/java/org/jabref/logic/shared/OracleProcessor.java b/src/main/java/org/jabref/logic/shared/OracleProcessor.java
index accd94c1383..3221a211808 100644
--- a/src/main/java/org/jabref/logic/shared/OracleProcessor.java
+++ b/src/main/java/org/jabref/logic/shared/OracleProcessor.java
@@ -144,7 +144,7 @@ protected void insertIntoEntryTable(List<BibEntry> entries) {
                                 ") VALUES(?)";
 
                 try (PreparedStatement preparedEntryStatement = connection.prepareStatement(insertIntoEntryQuery,
-                        new String[] {"SHARED_ID"})) {
+                        new String[]{"SHARED_ID"})) {
 
                     preparedEntryStatement.setString(1, entry.getType().getName());
                     preparedEntryStatement.executeUpdate();
diff --git a/src/main/java/org/jabref/logic/texparser/TexBibEntriesResolver.java b/src/main/java/org/jabref/logic/texparser/TexBibEntriesResolver.java
index 75a30c14491..50bbbb495e1 100644
--- a/src/main/java/org/jabref/logic/texparser/TexBibEntriesResolver.java
+++ b/src/main/java/org/jabref/logic/texparser/TexBibEntriesResolver.java
@@ -17,7 +17,7 @@
 import org.jabref.model.texparser.LatexBibEntriesResolverResult;
 import org.jabref.model.texparser.LatexParserResult;
 import org.jabref.model.util.FileUpdateMonitor;
-import org.jabref.preferences.GeneralPreferences;
+import org.jabref.preferences.LibraryPreferences;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -27,13 +27,13 @@ public class TexBibEntriesResolver {
     private static final Logger LOGGER = LoggerFactory.getLogger(TexBibEntriesResolver.class);
 
     private final BibDatabase masterDatabase;
-    private final GeneralPreferences generalPreferences;
+    private final LibraryPreferences libraryPreferences;
     private final ImportFormatPreferences importFormatPreferences;
     private final FileUpdateMonitor fileMonitor;
 
-    public TexBibEntriesResolver(BibDatabase masterDatabase, GeneralPreferences generalPreferences, ImportFormatPreferences importFormatPreferences, FileUpdateMonitor fileMonitor) {
+    public TexBibEntriesResolver(BibDatabase masterDatabase, LibraryPreferences libraryPreferences, ImportFormatPreferences importFormatPreferences, FileUpdateMonitor fileMonitor) {
         this.masterDatabase = masterDatabase;
-        this.generalPreferences = generalPreferences;
+        this.libraryPreferences = libraryPreferences;
         this.importFormatPreferences = importFormatPreferences;
         this.fileMonitor = fileMonitor;
     }
diff --git a/src/main/java/org/jabref/logic/util/BuildInfo.java b/src/main/java/org/jabref/logic/util/BuildInfo.java
index 930357b3ab7..245e90b1d2e 100644
--- a/src/main/java/org/jabref/logic/util/BuildInfo.java
+++ b/src/main/java/org/jabref/logic/util/BuildInfo.java
@@ -64,7 +64,7 @@ private static String getValue(Properties properties, String key, String default
                                 // workaround unprocessed build.properties file --> just remove the reference to some variable used in build.gradle
                                 .map(value -> value.replaceAll("\\$\\{.*\\}", ""))
                                 .orElse("");
-        if (!result.equals("")) {
+        if (!"".equals(result)) {
             return result;
         }
         return defaultValue;
diff --git a/src/main/java/org/jabref/logic/util/CoarseChangeFilter.java b/src/main/java/org/jabref/logic/util/CoarseChangeFilter.java
index 9c50dad6aae..9160fba7938 100644
--- a/src/main/java/org/jabref/logic/util/CoarseChangeFilter.java
+++ b/src/main/java/org/jabref/logic/util/CoarseChangeFilter.java
@@ -34,10 +34,7 @@ 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;
-
+        if (event instanceof FieldChangedEvent fieldChange) {
             // If editing has started
             boolean isNewEdit = lastFieldChanged.isEmpty() || lastEntryChanged.isEmpty();
 
diff --git a/src/main/java/org/jabref/logic/util/OS.java b/src/main/java/org/jabref/logic/util/OS.java
index 52a29bcdedc..6c951ce4aa6 100644
--- a/src/main/java/org/jabref/logic/util/OS.java
+++ b/src/main/java/org/jabref/logic/util/OS.java
@@ -2,18 +2,31 @@
 
 import java.util.Locale;
 
-/***
+import org.jabref.gui.desktop.os.DefaultDesktop;
+import org.jabref.gui.desktop.os.Linux;
+import org.jabref.gui.desktop.os.NativeDesktop;
+import org.jabref.gui.desktop.os.OSX;
+import org.jabref.gui.desktop.os.Windows;
+
+import com.github.javakeyring.BackendNotSupportedException;
+import com.github.javakeyring.Keyring;
+import com.github.javakeyring.PasswordAccessException;
+import org.slf4j.LoggerFactory;
+
+/**
  * Operating system (OS) detection
+ *
+ * For OS-specific actions see {@link org.jabref.gui.desktop.JabRefDesktop} and {@link org.jabref.gui.desktop.os.NativeDesktop}.
  */
 public class OS {
+    // No LOGGER may be initialized directly
+    // Otherwise, org.jabref.cli.Launcher.addLogToDisk will fail, because tinylog's properties are frozen
+
     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");
-
     // https://commons.apache.org/proper/commons-lang/javadocs/api-2.6/org/apache/commons/lang/SystemUtils.html
     private static final String OS_NAME = System.getProperty("os.name", "unknown").toLowerCase(Locale.ROOT);
     public static final boolean LINUX = OS_NAME.startsWith("linux");
@@ -23,4 +36,35 @@ public class OS {
 
     private OS() {
     }
+
+    public static NativeDesktop getNativeDesktop() {
+        if (WINDOWS) {
+            return new Windows();
+        } else if (OS_X) {
+            return new OSX();
+        } else if (LINUX) {
+            return new Linux();
+        }
+        return new DefaultDesktop();
+    }
+
+    public static boolean isKeyringAvailable() {
+        try (Keyring keyring = Keyring.create()) {
+            keyring.setPassword("JabRef", "keyringTest", "keyringTest");
+            if (!"keyringTest".equals(keyring.getPassword("JabRef", "keyringTest"))) {
+                return false;
+            }
+            keyring.deletePassword("JabRef", "keyringTest");
+        } catch (BackendNotSupportedException ex) {
+            LoggerFactory.getLogger(OS.class).warn("Credential store not supported.");
+            return false;
+        } catch (PasswordAccessException ex) {
+            LoggerFactory.getLogger(OS.class).warn("Password storage in credential store failed.");
+            return false;
+        } catch (Exception ex) {
+            LoggerFactory.getLogger(OS.class).warn("Connection to credential store failed");
+            return false;
+        }
+        return true;
+    }
 }
diff --git a/src/main/java/org/jabref/logic/util/StandardFileType.java b/src/main/java/org/jabref/logic/util/StandardFileType.java
index 0b7f73e5a09..d71f5b50dec 100644
--- a/src/main/java/org/jabref/logic/util/StandardFileType.java
+++ b/src/main/java/org/jabref/logic/util/StandardFileType.java
@@ -10,7 +10,6 @@
  */
 public enum StandardFileType implements FileType {
 
-    BIBTEXML("BibTeXML", "bibx", "xml"),
     ENDNOTE("Endnote", "ref", "enw"),
     ISI("Isi", "isi", "txt"),
     MEDLINE("Medline", "nbib", "xml"),
@@ -73,7 +72,7 @@ public static FileType fromExtensions(String... extensions) {
         var exts = Arrays.asList(extensions);
 
         return OptionalUtil.orElse(Arrays.stream(StandardFileType.values())
-                                         .filter(field -> field.getExtensions().stream().anyMatch(elem -> exts.contains(elem)))
+                                         .filter(field -> field.getExtensions().stream().anyMatch(exts::contains))
                                          .findAny(),
                                    new UnknownFileType(extensions));
     }
diff --git a/src/main/java/org/jabref/logic/util/UpdateField.java b/src/main/java/org/jabref/logic/util/UpdateField.java
index 80f9633e543..93ab1b74ce7 100644
--- a/src/main/java/org/jabref/logic/util/UpdateField.java
+++ b/src/main/java/org/jabref/logic/util/UpdateField.java
@@ -17,10 +17,6 @@ private UpdateField() {
 
     /**
      * Updating a field will result in the entry being reformatted on save
-     *
-     * @param be       BibEntry
-     * @param field    Field name
-     * @param newValue New field value
      */
     public static Optional<FieldChange> updateField(BibEntry be, Field field, String newValue) {
         return updateField(be, field, newValue, false);
@@ -28,10 +24,6 @@ public static Optional<FieldChange> updateField(BibEntry be, Field field, String
 
     /**
      * Updating a non-displayable field does not result in the entry being reformatted on save
-     *
-     * @param be       BibEntry
-     * @param field    Field name
-     * @param newValue New field value
      */
     public static Optional<FieldChange> updateNonDisplayableField(BibEntry be, Field field, String newValue) {
         boolean changed = be.hasChanged();
@@ -43,9 +35,6 @@ public static Optional<FieldChange> updateNonDisplayableField(BibEntry be, Field
     /**
      * Undoable change of field value
      *
-     * @param be                        BibEntry
-     * @param field                     Field name
-     * @param newValue                  New field value
      * @param nullFieldIfValueIsTheSame If true the field value is removed when the current value is equals to newValue
      */
     public static Optional<FieldChange> updateField(BibEntry be, Field field, String newValue,
@@ -80,24 +69,6 @@ public static Optional<FieldChange> updateField(BibEntry be, Field field, String
         return Optional.of(new FieldChange(be, field, oldValue, writtenValue));
     }
 
-    /**
-     * Sets empty or non-existing owner fields of a bibtex entry to a specified default value. Timestamp field is also
-     * set. Preferences are checked to see if these options are enabled.
-     *
-     * @param entry              The entry to set fields for.
-     * @param overwriteOwner     Indicates whether owner should be set if it is already set.
-     * @param overwriteTimestamp Indicates whether timestamp should be set if it is already set.
-     */
-    public static void setAutomaticFields(BibEntry entry, boolean overwriteOwner, boolean overwriteTimestamp,
-                                          OwnerPreferences ownerPreferences, TimestampPreferences timestampPreferences) {
-        String defaultOwner = ownerPreferences.getDefaultOwner();
-        String timestamp = timestampPreferences.now();
-        boolean setOwner = ownerPreferences.isUseOwner() && (overwriteOwner || (!entry.hasField(StandardField.OWNER)));
-        boolean setTimeStamp = timestampPreferences.shouldAddCreationDate();
-
-        setAutomaticFields(entry, setOwner, defaultOwner, setTimeStamp, timestamp);
-    }
-
     private static void setAutomaticFields(BibEntry entry, boolean setOwner, String owner, boolean setTimeStamp, String timeStamp) {
         // Set owner field if this option is enabled:
         if (setOwner) {
@@ -113,12 +84,8 @@ private static void setAutomaticFields(BibEntry entry, boolean setOwner, String
     /**
      * Sets empty or non-existing owner fields of bibtex entries inside a List to a specified default value. Timestamp
      * field is also set. Preferences are checked to see if these options are enabled.
-     *
-     * @param bibs List of bibtex entries
      */
-    public static void setAutomaticFields(Collection<BibEntry> bibs, boolean overwriteOwner,
-                                          OwnerPreferences ownerPreferences, TimestampPreferences timestampPreferences) {
-
+    public static void setAutomaticFields(Collection<BibEntry> entries, OwnerPreferences ownerPreferences, TimestampPreferences timestampPreferences) {
         boolean globalSetOwner = ownerPreferences.isUseOwner();
         boolean setTimeStamp = timestampPreferences.shouldAddCreationDate();
 
@@ -128,20 +95,12 @@ public static void setAutomaticFields(Collection<BibEntry> bibs, boolean overwri
         }
 
         String defaultOwner = ownerPreferences.getDefaultOwner();
+        boolean overwriteOwner = ownerPreferences.isOverwriteOwner();
         String timestamp = timestampPreferences.now();
 
-        // Iterate through all entries
-        for (BibEntry curEntry : bibs) {
+        for (BibEntry curEntry : entries) {
             boolean setOwner = globalSetOwner && (overwriteOwner || (!curEntry.hasField(StandardField.OWNER)));
             setAutomaticFields(curEntry, setOwner, defaultOwner, setTimeStamp, timestamp);
         }
     }
-
-    public static void setAutomaticFields(Collection<BibEntry> bibs,
-                                          OwnerPreferences ownerPreferences, TimestampPreferences timestampPreferences) {
-        UpdateField.setAutomaticFields(bibs,
-                ownerPreferences.isOverwriteOwner(),
-                ownerPreferences,
-                timestampPreferences);
-    }
 }
diff --git a/src/main/java/org/jabref/logic/util/io/BackupFileUtil.java b/src/main/java/org/jabref/logic/util/io/BackupFileUtil.java
index c378386c1ed..bea88213b6f 100644
--- a/src/main/java/org/jabref/logic/util/io/BackupFileUtil.java
+++ b/src/main/java/org/jabref/logic/util/io/BackupFileUtil.java
@@ -9,10 +9,9 @@
 import java.util.HexFormat;
 import java.util.Optional;
 
+import org.jabref.gui.autosaveandbackup.BackupManager;
 import org.jabref.logic.util.BackupFileType;
-import org.jabref.logic.util.OS;
 
-import net.harawata.appdirs.AppDirsFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -23,15 +22,6 @@ public class BackupFileUtil {
     private BackupFileUtil() {
     }
 
-    public static Path getAppDataBackupDir() {
-        Path directory = Path.of(AppDirsFactory.getInstance()
-                                               .getUserDataDir(
-                                                       OS.APP_DIR_APP_NAME,
-                                                       "backups",
-                                                       OS.APP_DIR_APP_AUTHOR));
-        return directory;
-    }
-
     /**
      * Determines the path of the backup file (using the given extension)
      *
@@ -44,16 +34,17 @@ public static Path getAppDataBackupDir() {
      *     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}
+     *     Note that this backup is different from the <code>.sav</code> file generated by {@link BackupManager}
      *     (and configured in the preferences as "make backups")
      * </p>
      */
-    public static Path getPathForNewBackupFileAndCreateDirectory(Path targetFile, BackupFileType fileType) {
+
+    public static Path getPathForNewBackupFileAndCreateDirectory(Path targetFile, BackupFileType fileType, Path backupDir) {
         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();
+        Path directory = backupDir;
         try {
             Files.createDirectories(directory);
         } catch (IOException e) {
@@ -66,18 +57,12 @@ public static Path getPathForNewBackupFileAndCreateDirectory(Path targetFile, Ba
         return directory.resolve(fileName);
     }
 
-    /**
-     * Finds the latest backup (.sav). If it does not exist, an empty optional is returned
-     *
-     * @param targetFile the full path of the file to backup
-     */
-    public static Optional<Path> getPathOfLatestExistingBackupFile(Path targetFile, BackupFileType fileType) {
+    public static Optional<Path> getPathOfLatestExistingBackupFile(Path targetFile, BackupFileType fileType, Path backupDir) {
         // The code is similar to "getPathForNewBackupFileAndCreateDirectory"
 
         String extension = "." + fileType.getExtensions().get(0);
 
-        Path directory = getAppDataBackupDir();
-        if (Files.notExists(directory)) {
+        if (Files.notExists(backupDir)) {
             // 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)) {
@@ -91,11 +76,11 @@ public static Optional<Path> getPathOfLatestExistingBackupFile(Path targetFile,
         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);
+            mostRecentFile = Files.list(backupDir)
+                                  // 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();
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 12d1831ab5e..032a396dec8 100644
--- a/src/main/java/org/jabref/logic/util/io/FileNameUniqueness.java
+++ b/src/main/java/org/jabref/logic/util/io/FileNameUniqueness.java
@@ -67,7 +67,7 @@ public static boolean isDuplicatedFile(Path directory, Path fileName, DialogServ
         Objects.requireNonNull(dialogService);
 
         String extensionSuffix = FileUtil.getFileExtension(fileName).orElse("");
-        extensionSuffix = extensionSuffix.equals("") ? extensionSuffix : "." + extensionSuffix;
+        extensionSuffix = "".equals(extensionSuffix) ? extensionSuffix : "." + extensionSuffix;
         String newFilename = FileUtil.getBaseName(fileName) + extensionSuffix;
 
         String fileNameWithoutDuplicated = eraseDuplicateMarks(FileUtil.getBaseName(fileName));
diff --git a/src/main/java/org/jabref/logic/xmp/DocumentInformationExtractor.java b/src/main/java/org/jabref/logic/xmp/DocumentInformationExtractor.java
index 3f0c81ae592..9c6ce27e82f 100644
--- a/src/main/java/org/jabref/logic/xmp/DocumentInformationExtractor.java
+++ b/src/main/java/org/jabref/logic/xmp/DocumentInformationExtractor.java
@@ -63,7 +63,7 @@ private void extractOtherFields() {
                 String value = dict.getString(key);
                 key = key.substring("bibtex/".length());
                 Field field = FieldFactory.parseField(key);
-                if (InternalField.TYPE_HEADER.equals(field)) {
+                if (InternalField.TYPE_HEADER == field) {
                     bibEntry.setType(EntryTypeFactory.parse(value));
                 } else {
                     bibEntry.setField(field, value);
diff --git a/src/main/java/org/jabref/logic/xmp/DublinCoreExtractor.java b/src/main/java/org/jabref/logic/xmp/DublinCoreExtractor.java
index dc70cc048b9..8df2f2ed770 100644
--- a/src/main/java/org/jabref/logic/xmp/DublinCoreExtractor.java
+++ b/src/main/java/org/jabref/logic/xmp/DublinCoreExtractor.java
@@ -152,7 +152,7 @@ private void extractBibTexFields() {
                 // only for month field - override value
                 // workaround, because the date value of the xmp component of pdf box is corrupted
                 // see also DublinCoreExtractor#extractYearAndMonth
-                if (StandardField.MONTH.equals(key)) {
+                if (StandardField.MONTH == key) {
                     Optional<Month> parsedMonth = Month.parse(value);
                     parsedMonth.ifPresent(bibEntry::setMonth);
                 }
@@ -423,7 +423,7 @@ public void fillDublinCoreSchema() {
         // Query privacy filter settings
         boolean useXmpPrivacyFilter = xmpPreferences.shouldUseXmpPrivacyFilter();
 
-        SortedSet<Field> fields = new TreeSet<>(Comparator.comparing(field -> field.getName()));
+        SortedSet<Field> fields = new TreeSet<>(Comparator.comparing(Field::getName));
         fields.addAll(bibEntry.getFields());
         for (Field field : fields) {
             if (useXmpPrivacyFilter && xmpPreferences.getXmpPrivacyFilter().contains(field)) {
diff --git a/src/main/java/org/jabref/logic/xmp/XmpUtilWriter.java b/src/main/java/org/jabref/logic/xmp/XmpUtilWriter.java
index 75e62944ba1..023d2a66954 100644
--- a/src/main/java/org/jabref/logic/xmp/XmpUtilWriter.java
+++ b/src/main/java/org/jabref/logic/xmp/XmpUtilWriter.java
@@ -237,13 +237,13 @@ private void writeDocumentInformation(PDDocument document,
         for (Field field : resolvedEntry.getFields()) {
             if (useXmpPrivacyFilter && xmpPreferences.getXmpPrivacyFilter().contains(field)) {
                 // erase field instead of adding it
-                if (StandardField.AUTHOR.equals(field)) {
+                if (StandardField.AUTHOR == field) {
                     di.setAuthor(null);
-                } else if (StandardField.TITLE.equals(field)) {
+                } else if (StandardField.TITLE == field) {
                     di.setTitle(null);
-                } else if (StandardField.KEYWORDS.equals(field)) {
+                } else if (StandardField.KEYWORDS == field) {
                     di.setKeywords(null);
-                } else if (StandardField.ABSTRACT.equals(field)) {
+                } else if (StandardField.ABSTRACT == field) {
                     di.setSubject(null);
                 } else {
                     di.setCustomMetadataValue("bibtex/" + field, null);
@@ -254,13 +254,13 @@ private void writeDocumentInformation(PDDocument document,
             // 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)) {
+            if (StandardField.AUTHOR == field) {
                 di.setAuthor(value);
-            } else if (StandardField.TITLE.equals(field)) {
+            } else if (StandardField.TITLE == field) {
                 di.setTitle(value);
-            } else if (StandardField.KEYWORDS.equals(field)) {
+            } else if (StandardField.KEYWORDS == field) {
                 di.setKeywords(value);
-            } else if (StandardField.ABSTRACT.equals(field)) {
+            } else if (StandardField.ABSTRACT == field) {
                 di.setSubject(value);
             } else {
                 // We hit the case of an PDF-unsupported field --> write it directly
@@ -310,7 +310,7 @@ public void writeXmp(Path path,
             }
 
             // Write schemas (PDDocumentInformation and DublinCoreSchema) to the document metadata
-            if (resolvedEntries.size() > 0) {
+            if (!resolvedEntries.isEmpty()) {
                 writeDocumentInformation(document, resolvedEntries.get(0), null);
                 writeDublinCore(document, resolvedEntries, null);
             }
diff --git a/src/main/java/org/jabref/migrations/CustomEntryTypePreferenceMigration.java b/src/main/java/org/jabref/migrations/CustomEntryTypePreferenceMigration.java
index 7159ba1714c..e2973ea207a 100644
--- a/src/main/java/org/jabref/migrations/CustomEntryTypePreferenceMigration.java
+++ b/src/main/java/org/jabref/migrations/CustomEntryTypePreferenceMigration.java
@@ -5,10 +5,10 @@
 import java.util.Optional;
 import java.util.stream.Collectors;
 
-import org.jabref.gui.Globals;
 import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.model.entry.BibEntryType;
 import org.jabref.model.entry.BibEntryTypeBuilder;
+import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.entry.field.FieldFactory;
 import org.jabref.model.entry.types.EntryTypeFactory;
 import org.jabref.preferences.JabRefPreferences;
@@ -21,23 +21,23 @@ class CustomEntryTypePreferenceMigration {
     private static final String CUSTOM_TYPE_OPT = "customTypeOpt_";
     private static final String CUSTOM_TYPE_PRIOPT = "customTypePriOpt_";
 
-    private static JabRefPreferences prefs = Globals.prefs;
-
     private CustomEntryTypePreferenceMigration() {
     }
 
-    static void upgradeStoredBibEntryTypes(BibDatabaseMode defaultBibDatabaseMode) {
+    static void upgradeStoredBibEntryTypes(BibDatabaseMode defaultBibDatabaseMode,
+                                           JabRefPreferences preferences,
+                                           BibEntryTypesManager entryTypesManager) {
         List<BibEntryType> storedOldTypes = new ArrayList<>();
 
         int number = 0;
         Optional<BibEntryType> type;
-        while ((type = getBibEntryType(number)).isPresent()) {
-            Globals.entryTypesManager.addCustomOrModifiedType(type.get(), defaultBibDatabaseMode);
+        while ((type = getBibEntryType(number, preferences)).isPresent()) {
+            entryTypesManager.addCustomOrModifiedType(type.get(), defaultBibDatabaseMode);
             storedOldTypes.add(type.get());
             number++;
         }
 
-        prefs.storeCustomEntryTypesRepository(Globals.entryTypesManager);
+        preferences.storeCustomEntryTypesRepository(entryTypesManager);
     }
 
     /**
@@ -45,15 +45,15 @@ static void upgradeStoredBibEntryTypes(BibDatabaseMode defaultBibDatabaseMode) {
      * <p>
      * (old implementation which has been copied)
      */
-    private static Optional<BibEntryType> getBibEntryType(int number) {
+    private static Optional<BibEntryType> getBibEntryType(int number, JabRefPreferences preferences) {
         String nr = String.valueOf(number);
-        String name = prefs.get(CUSTOM_TYPE_NAME + nr);
+        String name = preferences.get(CUSTOM_TYPE_NAME + nr);
         if (name == null) {
             return Optional.empty();
         }
-        List<String> req = prefs.getStringList(CUSTOM_TYPE_REQ + nr);
-        List<String> opt = prefs.getStringList(CUSTOM_TYPE_OPT + nr);
-        List<String> priOpt = prefs.getStringList(CUSTOM_TYPE_PRIOPT + nr);
+        List<String> req = preferences.getStringList(CUSTOM_TYPE_REQ + nr);
+        List<String> opt = preferences.getStringList(CUSTOM_TYPE_OPT + nr);
+        List<String> priOpt = preferences.getStringList(CUSTOM_TYPE_PRIOPT + nr);
 
         BibEntryTypeBuilder entryTypeBuilder = new BibEntryTypeBuilder()
                 .withType(EntryTypeFactory.parse(name))
diff --git a/src/main/java/org/jabref/migrations/PreferencesMigrations.java b/src/main/java/org/jabref/migrations/PreferencesMigrations.java
index 8901d0369db..b9a1d6efae3 100644
--- a/src/main/java/org/jabref/migrations/PreferencesMigrations.java
+++ b/src/main/java/org/jabref/migrations/PreferencesMigrations.java
@@ -20,7 +20,9 @@
 import org.jabref.gui.maintable.MainTableColumnModel;
 import org.jabref.logic.citationkeypattern.GlobalCitationKeyPattern;
 import org.jabref.logic.cleanup.FieldFormatterCleanups;
+import org.jabref.logic.shared.security.Password;
 import org.jabref.logic.util.OS;
+import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.entry.field.SpecialField;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.EntryTypeFactory;
@@ -28,6 +30,7 @@
 import org.jabref.preferences.CleanupPreferences;
 import org.jabref.preferences.JabRefPreferences;
 
+import com.github.javakeyring.Keyring;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -41,7 +44,7 @@ private PreferencesMigrations() {
     /**
      * Perform checks and changes for users with a preference set from an older JabRef version.
      */
-    public static void runMigrations(JabRefPreferences preferences) {
+    public static void runMigrations(JabRefPreferences preferences, BibEntryTypesManager entryTypesManager) {
         Preferences mainPrefsNode = Preferences.userRoot().node("/org/jabref");
 
         upgradePrefsToOrgJabRef(mainPrefsNode);
@@ -49,18 +52,18 @@ public static void runMigrations(JabRefPreferences preferences) {
         upgradeFaultyEncodingStrings(preferences);
         upgradeLabelPatternToCitationKeyPattern(preferences, mainPrefsNode);
         upgradeImportFileAndDirePatterns(preferences, mainPrefsNode);
-        upgradeStoredBibEntryTypes(preferences, mainPrefsNode);
+        upgradeStoredBibEntryTypes(preferences, mainPrefsNode, entryTypesManager);
         upgradeKeyBindingsToJavaFX(preferences);
         addCrossRefRelatedFieldsForAutoComplete(preferences);
-        upgradePreviewStyleFromReviewToComment(preferences);
+        upgradePreviewStyle(preferences);
         // changeColumnVariableNamesFor51 needs to be run before upgradeColumnPre50Preferences to ensure
         // backwardcompatibility, as it copies the old values to new variable names and keeps th old sored with the old
         // variable names. However, the variables from 5.0 need to be copied to the new variable name too.
         changeColumnVariableNamesFor51(preferences);
         upgradeColumnPreferences(preferences);
         restoreVariablesForBackwardCompatibility(preferences);
-        upgradePreviewStyleAllowMarkdown(preferences);
         upgradeCleanups(preferences);
+        moveApiKeysToKeyring(preferences);
     }
 
     /**
@@ -87,7 +90,7 @@ private static void copyPrefsRecursively(Preferences from, Preferences to) throw
         for (String key : from.keys()) {
             String newValue = from.get(key, "");
             if (newValue.contains("net.sf")) {
-                newValue = newValue.replaceAll("net\\.sf", "org");
+                newValue = newValue.replace("net.sf", "org");
             }
             to.put(key, newValue);
         }
@@ -167,14 +170,17 @@ private static void upgradeSortOrder(JabRefPreferences prefs) {
     /**
      * Migrate all customized entry types from versions <=3.7
      */
-    private static void upgradeStoredBibEntryTypes(JabRefPreferences prefs, Preferences mainPrefsNode) {
+    private static void upgradeStoredBibEntryTypes(JabRefPreferences prefs, Preferences mainPrefsNode, BibEntryTypesManager entryTypesManager) {
         try {
             if (mainPrefsNode.nodeExists(JabRefPreferences.CUSTOMIZED_BIBTEX_TYPES) ||
                     mainPrefsNode.nodeExists(JabRefPreferences.CUSTOMIZED_BIBLATEX_TYPES)) {
                 // skip further processing as prefs already have been migrated
             } else {
                 LOGGER.info("Migrating old custom entry types.");
-                CustomEntryTypePreferenceMigration.upgradeStoredBibEntryTypes(prefs.getGeneralPreferences().getDefaultBibDatabaseMode());
+                CustomEntryTypePreferenceMigration.upgradeStoredBibEntryTypes(
+                        prefs.getLibraryPreferences().getDefaultBibDatabaseMode(),
+                        prefs,
+                        entryTypesManager);
             }
         } catch (BackingStoreException ex) {
             LOGGER.error("Migrating old custom entry types failed.", ex);
@@ -274,7 +280,7 @@ static void upgradeImportFileAndDirePatterns(JabRefPreferences prefs, Preference
     }
 
     private static void upgradeKeyBindingsToJavaFX(JabRefPreferences prefs) {
-        UnaryOperator<String> replaceKeys = (str) -> {
+        UnaryOperator<String> replaceKeys = str -> {
             String result = str.replace("ctrl ", "ctrl+");
             result = result.replace("shift ", "shift+");
             result = result.replace("alt ", "alt+");
@@ -310,21 +316,21 @@ private static void migrateTypedKeyPrefs(JabRefPreferences prefs, Preferences ol
         prefs.storeGlobalCitationKeyPattern(keyPattern);
     }
 
-    static void upgradePreviewStyleFromReviewToComment(JabRefPreferences prefs) {
-        String currentPreviewStyle = prefs.getPreviewStyle();
+    /**
+     * Customizable preview style migrations
+     * <ul>
+     *     <li> Since v5.0-alpha the custom preview layout shows the 'comment' field instead of the 'review' field (<a href="https://github.com/JabRef/jabref/pull/4100">#4100</a>).</li>
+     *     <li> Since v5.1 a marker enables markdown in comments (<a href="https://github.com/JabRef/jabref/pull/6232">#6232</a>).</li>
+     *     <li> Since v5.2 'bibtexkey' is rebranded as citationkey (<a href="https://github.com/JabRef/jabref/pull/6875">#6875</a>).</li>
+     * </ul>
+     */
+    protected static void upgradePreviewStyle(JabRefPreferences prefs) {
+        String currentPreviewStyle = prefs.get(JabRefPreferences.PREVIEW_STYLE);
         String migratedStyle = currentPreviewStyle.replace("\\begin{review}<BR><BR><b>Review: </b> \\format[HTMLChars]{\\review} \\end{review}", "\\begin{comment}<BR><BR><b>Comment: </b> \\format[HTMLChars]{\\comment} \\end{comment}")
+                                                  .replace("\\format[HTMLChars]{\\comment}", "\\format[Markdown,HTMLChars]{\\comment}")
                                                   .replace("<b><i>\\bibtextype</i><a name=\"\\bibtexkey\">\\begin{bibtexkey} (\\bibtexkey)</a>", "<b><i>\\bibtextype</i><a name=\"\\citationkey\">\\begin{citationkey} (\\citationkey)</a>")
                                                   .replace("\\end{bibtexkey}</b><br>__NEWLINE__", "\\end{citationkey}</b><br>__NEWLINE__");
-        prefs.setPreviewStyle(migratedStyle);
-    }
-
-    static void upgradePreviewStyleAllowMarkdown(JabRefPreferences prefs) {
-        String currentPreviewStyle = prefs.getPreviewStyle();
-        String migratedStyle = currentPreviewStyle.replace("\\format[HTMLChars]{\\comment}", "\\format[Markdown,HTMLChars]{\\comment}")
-                                                  .replace("<b><i>\\bibtextype</i><a name=\"\\bibtexkey\">\\begin{bibtexkey} (\\bibtexkey)</a>", "<b><i>\\bibtextype</i><a name=\"\\citationkey\">\\begin{citationkey} (\\citationkey)</a>")
-                                                  .replace("\\end{bibtexkey}</b><br>__NEWLINE__", "\\end{citationkey}</b><br>__NEWLINE__");
-
-        prefs.setPreviewStyle(migratedStyle);
+        prefs.put(JabRefPreferences.PREVIEW_STYLE, migratedStyle);
     }
 
     /**
@@ -517,4 +523,26 @@ private static void upgradeCleanups(JabRefPreferences prefs) {
             prefs.put(V6_0_CLEANUP_FIELD_FORMATTERS, String.join(OS.NEWLINE, formatterCleanups.subList(1, formatterCleanups.size() - 1)));
         }
     }
+
+    static void moveApiKeysToKeyring(JabRefPreferences preferences) {
+        final String V5_9_FETCHER_CUSTOM_KEY_NAMES = "fetcherCustomKeyNames";
+        final String V5_9_FETCHER_CUSTOM_KEYS = "fetcherCustomKeys";
+
+        List<String> names = preferences.getStringList(V5_9_FETCHER_CUSTOM_KEY_NAMES);
+        List<String> keys = preferences.getStringList(V5_9_FETCHER_CUSTOM_KEYS);
+
+        if (!keys.isEmpty() && names.size() == keys.size()) {
+            try (final Keyring keyring = Keyring.create()) {
+                for (int i = 0; i < names.size(); i++) {
+                    keyring.setPassword("org.jabref.customapikeys", names.get(i), new Password(
+                            keys.get(i),
+                            preferences.getInternalPreferences().getUserAndHost())
+                            .encrypt());
+                }
+                preferences.deleteKey(V5_9_FETCHER_CUSTOM_KEYS);
+            } catch (Exception ex) {
+                LOGGER.error("Unable to open key store", ex);
+            }
+        }
+    }
 }
diff --git a/src/main/java/org/jabref/model/ChainNode.java b/src/main/java/org/jabref/model/ChainNode.java
index 8e172c2b8f5..7b0a3625254 100644
--- a/src/main/java/org/jabref/model/ChainNode.java
+++ b/src/main/java/org/jabref/model/ChainNode.java
@@ -115,7 +115,7 @@ public void moveTo(T target) {
         }
 
         // Remove from previous parent
-        getParent().ifPresent(oldParent -> oldParent.removeChild());
+        getParent().ifPresent(ChainNode::removeChild);
 
         // Add as child
         target.setChild((T) this);
diff --git a/src/main/java/org/jabref/model/FieldChange.java b/src/main/java/org/jabref/model/FieldChange.java
index 74d4416ce39..02d4fd593e4 100644
--- a/src/main/java/org/jabref/model/FieldChange.java
+++ b/src/main/java/org/jabref/model/FieldChange.java
@@ -48,8 +48,7 @@ public boolean equals(Object obj) {
         if (this == obj) {
             return true;
         }
-        if (obj instanceof FieldChange) {
-            FieldChange other = (FieldChange) obj;
+        if (obj instanceof FieldChange other) {
             if (entry == null) {
                 if (other.entry != null) {
                     return false;
diff --git a/src/main/java/org/jabref/model/TreeNode.java b/src/main/java/org/jabref/model/TreeNode.java
index 634882d0f73..fcf0b8ab26e 100644
--- a/src/main/java/org/jabref/model/TreeNode.java
+++ b/src/main/java/org/jabref/model/TreeNode.java
@@ -342,7 +342,7 @@ public T getRoot() {
      * @return true if this node has no children
      */
     public boolean isLeaf() {
-        return (getNumberOfChildren() == 0);
+        return getNumberOfChildren() == 0;
     }
 
     /**
diff --git a/src/main/java/org/jabref/model/database/BibDatabase.java b/src/main/java/org/jabref/model/database/BibDatabase.java
index 820b8dcc107..a9bd3af43a0 100644
--- a/src/main/java/org/jabref/model/database/BibDatabase.java
+++ b/src/main/java/org/jabref/model/database/BibDatabase.java
@@ -112,7 +112,7 @@ public boolean hasEntries() {
     /**
      * Returns the list of entries sorted by the given comparator.
      */
-    public synchronized List<BibEntry> getEntriesSorted(Comparator<BibEntry> comparator) {
+    public List<BibEntry> getEntriesSorted(Comparator<BibEntry> comparator) {
         List<BibEntry> entriesSorted = new ArrayList<>(entries);
         entriesSorted.sort(comparator);
 
@@ -633,8 +633,6 @@ public boolean isDuplicateCitationKeyExisting(String key) {
 
     /**
      * Set the newline separator.
-     *
-     * @param newLineSeparator
      */
     public void setNewLineSeparator(String newLineSeparator) {
         this.newLineSeparator = newLineSeparator;
diff --git a/src/main/java/org/jabref/model/database/BibDatabaseContext.java b/src/main/java/org/jabref/model/database/BibDatabaseContext.java
index 48c7262ce02..12d67a71a2f 100644
--- a/src/main/java/org/jabref/model/database/BibDatabaseContext.java
+++ b/src/main/java/org/jabref/model/database/BibDatabaseContext.java
@@ -18,11 +18,9 @@
 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;
 import org.jabref.model.study.Study;
 import org.jabref.preferences.FilePreferences;
 
-import net.harawata.appdirs.AppDirsFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -156,7 +154,7 @@ public List<Path> getFileDirectories(FilePreferences preferences) {
         List<Path> fileDirs = new ArrayList<>();
 
         // 1. Metadata user-specific directory
-        metaData.getUserFileDirectory(preferences.getUser())
+        metaData.getUserFileDirectory(preferences.getUserAndHost())
                 .ifPresent(userFileDirectory -> fileDirs.add(getFileDirectoryPath(userFileDirectory)));
 
         // 2. Metadata general directory
@@ -239,21 +237,8 @@ public List<BibEntry> getEntries() {
         return database.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());
-    }
-
-    public static Path getFulltextIndexBasePath() {
-        return Path.of(AppDirsFactory.getInstance().getUserDataDir(OS.APP_DIR_APP_NAME, SearchFieldConstants.VERSION, OS.APP_DIR_APP_AUTHOR));
-    }
-
     public Path getFulltextIndexPath() {
-        Path appData = getFulltextIndexBasePath();
+        Path appData = OS.getNativeDesktop().getFulltextIndexBaseDirectory();
         Path indexPath;
 
         if (getDatabasePath().isPresent()) {
diff --git a/src/main/java/org/jabref/model/database/event/AutosaveEvent.java b/src/main/java/org/jabref/model/database/event/AutosaveEvent.java
index b89ffe7d8c4..dbfd66d9858 100644
--- a/src/main/java/org/jabref/model/database/event/AutosaveEvent.java
+++ b/src/main/java/org/jabref/model/database/event/AutosaveEvent.java
@@ -1,7 +1,9 @@
 package org.jabref.model.database.event;
 
+import org.jabref.gui.autosaveandbackup.AutosaveManager;
+
 /**
- * This Event is fired from {@link org.jabref.logic.autosaveandbackup.AutosaveManager} in case that a save task is pending.
+ * This Event is fired from {@link AutosaveManager} in case that a save task is pending.
  */
 public class AutosaveEvent {
     // no data
diff --git a/src/main/java/org/jabref/model/entry/Author.java b/src/main/java/org/jabref/model/entry/Author.java
index e8f1c07821d..fd45ddb1e05 100644
--- a/src/main/java/org/jabref/model/entry/Author.java
+++ b/src/main/java/org/jabref/model/entry/Author.java
@@ -12,6 +12,14 @@
  * Current usage: only methods <code>getLastOnly</code>, <code>getFirstLast</code>, and <code>getLastFirst</code> are used; all other methods are provided for completeness.
  */
 public class Author {
+
+    /**
+     * Object indicating the <code>others</code> author. This is a BibTeX feature mostly rendered in "et al." in LaTeX.
+     * Example: <code>authors = {Oliver Kopp and others}</code>. This is then appearing as "Oliver Kopp et al.".
+     * In the context of BibTeX key generation, this is "Kopp+" (<code>+</code> for "et al.") and not "KO".
+     */
+    public static final Author OTHERS = new Author("", "", null, "others", null);
+
     private final String firstPart;
     private final String firstAbbr;
     private final String vonPart;
@@ -136,8 +144,7 @@ public boolean equals(Object other) {
             return true;
         }
 
-        if (other instanceof Author) {
-            Author that = (Author) other;
+        if (other instanceof Author that) {
             return Objects.equals(firstPart, that.firstPart)
                     && Objects.equals(firstAbbr, that.firstAbbr)
                     && Objects.equals(vonPart, that.vonPart)
diff --git a/src/main/java/org/jabref/model/entry/AuthorList.java b/src/main/java/org/jabref/model/entry/AuthorList.java
index e717fb09edb..f35cf1b7549 100644
--- a/src/main/java/org/jabref/model/entry/AuthorList.java
+++ b/src/main/java/org/jabref/model/entry/AuthorList.java
@@ -1,6 +1,8 @@
 package org.jabref.model.entry;
 
+import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.WeakHashMap;
 import java.util.function.Function;
@@ -115,7 +117,7 @@
 @AllowedToUseLogic("because it needs access to AuthorList parser")
 public class AuthorList {
 
-    private static final WeakHashMap<String, AuthorList> AUTHOR_CACHE = new WeakHashMap<>();
+    private static final Map<String, AuthorList> AUTHOR_CACHE = Collections.synchronizedMap(new WeakHashMap<>());
     private final List<Author> authors;
     private AuthorList latexFreeAuthors;
 
@@ -361,7 +363,7 @@ public String getAsLastNames(boolean oxfordComma) {
      * Oxford comma.</a>
      */
     public String getAsLastFirstNames(boolean abbreviate, boolean oxfordComma) {
-        return andCoordinatedConjunction(getAuthors(), (auth) -> auth.getLastFirst(abbreviate), oxfordComma);
+        return andCoordinatedConjunction(getAuthors(), auth -> auth.getLastFirst(abbreviate), oxfordComma);
     }
 
     @Override
diff --git a/src/main/java/org/jabref/model/entry/BibEntry.java b/src/main/java/org/jabref/model/entry/BibEntry.java
index 5f5301d633a..7fdd429a597 100644
--- a/src/main/java/org/jabref/model/entry/BibEntry.java
+++ b/src/main/java/org/jabref/model/entry/BibEntry.java
@@ -158,7 +158,7 @@ public Optional<FieldChange> setMonth(Month parsedMonth) {
     }
 
     public Optional<String> getResolvedFieldOrAlias(OrFields fields, BibDatabase database) {
-        for (Field field : fields) {
+        for (Field field : fields.getFields()) {
             Optional<String> value = getResolvedFieldOrAlias(field, database);
             if (value.isPresent()) {
                 return value;
@@ -260,7 +260,7 @@ private Optional<Field> getSourceField(Field targetField, EntryType targetEntry,
             }
 
             // for these fields, inheritance is not allowed for the specified entry types
-            if ((targetField == StandardField.SHORTTITLE)) {
+            if (targetField == StandardField.SHORTTITLE) {
                 return Optional.empty();
             }
         }
@@ -281,7 +281,7 @@ private Optional<Field> getSourceField(Field targetField, EntryType targetEntry,
             }
 
             // for these fields, inheritance is not allowed for the specified entry types
-            if ((targetField == StandardField.SHORTTITLE)) {
+            if (targetField == StandardField.SHORTTITLE) {
                 return Optional.empty();
             }
         }
@@ -313,11 +313,11 @@ public Optional<String> getResolvedFieldOrAliasLatexFree(Field field, BibDatabas
     }
 
     private Optional<String> genericGetResolvedFieldOrAlias(Field field, BibDatabase database, BiFunction<BibEntry, Field, Optional<String>> getFieldOrAlias) {
-        if (InternalField.TYPE_HEADER.equals(field) || InternalField.OBSOLETE_TYPE_HEADER.equals(field)) {
+        if ((InternalField.TYPE_HEADER == field) || (InternalField.OBSOLETE_TYPE_HEADER == field)) {
             return Optional.of(type.get().getDisplayName());
         }
 
-        if (InternalField.KEY_FIELD.equals(field)) {
+        if (InternalField.KEY_FIELD == field) {
             return getCitationKey();
         }
 
@@ -434,7 +434,7 @@ public Optional<FieldChange> setType(EntryType newType, EntriesEventSource event
     }
 
     /**
-     * Returns a set containing the names of all fields that are set for this particular entry.
+     * Returns an {@link Collections#unmodifiableSet(Set)} containing the names of all fields that are set for this particular entry.
      *
      * @return a set of existing field names
      */
@@ -480,7 +480,7 @@ private Optional<String> genericGetFieldOrAlias(Field field, BiFunction<BibEntry
         }
 
         // Finally, handle dates
-        if (StandardField.DATE.equals(field)) {
+        if (StandardField.DATE == field) {
             Optional<Date> date = Date.parse(
                     getFieldValue.apply(this, StandardField.YEAR),
                     getFieldValue.apply(this, StandardField.MONTH),
@@ -489,7 +489,7 @@ private Optional<String> genericGetFieldOrAlias(Field field, BiFunction<BibEntry
             return date.map(Date::getNormalized);
         }
 
-        if (StandardField.YEAR.equals(field) || StandardField.MONTH.equals(field) || StandardField.DAY.equals(field)) {
+        if ((StandardField.YEAR == field) || (StandardField.MONTH == field) || (StandardField.DAY == field)) {
             Optional<String> date = getFieldValue.apply(this, StandardField.DATE);
             if (date.isEmpty()) {
                 return Optional.empty();
@@ -497,13 +497,13 @@ private Optional<String> genericGetFieldOrAlias(Field field, BiFunction<BibEntry
 
             Optional<Date> parsedDate = Date.parse(date.get());
             if (parsedDate.isPresent()) {
-                if (StandardField.YEAR.equals(field)) {
+                if (StandardField.YEAR == field) {
                     return parsedDate.get().getYear().map(Object::toString);
                 }
-                if (StandardField.MONTH.equals(field)) {
+                if (StandardField.MONTH == field) {
                     return parsedDate.get().getMonth().map(Month::getJabRefFormat);
                 }
-                if (StandardField.DAY.equals(field)) {
+                if (StandardField.DAY == field) {
                     return parsedDate.get().getDay().map(Object::toString);
                 }
             } else {
@@ -748,6 +748,16 @@ public void setChanged(boolean changed) {
         this.changed = changed;
     }
 
+    /**
+     * Required to trigger new serialization of the entry.
+     * Reason: We don't have a <code>build()</code> command, we don't want to create a new serialization at each call,
+     * we need to construct a BibEntry with <code>changed=false</code> (which is the default) and thus we need a workaround.
+     */
+    public BibEntry withChanged(boolean changed) {
+        this.changed = changed;
+        return this;
+    }
+
     public Optional<FieldChange> putKeywords(List<String> keywords, Character delimiter) {
         Objects.requireNonNull(delimiter);
         return putKeywords(new KeywordList(keywords), delimiter);
@@ -968,8 +978,8 @@ public Set<String> getFieldAsWords(Field field) {
     }
 
     public KeywordList getFieldAsKeywords(Field field, Character keywordSeparator) {
-        if (field instanceof StandardField) {
-            Optional<KeywordList> storedList = fieldsAsKeywords.get((StandardField) field, keywordSeparator);
+        if (field instanceof StandardField standardField) {
+            Optional<KeywordList> storedList = fieldsAsKeywords.get(standardField, keywordSeparator);
             if (storedList.isPresent()) {
                 return storedList.get();
             }
@@ -979,8 +989,8 @@ public KeywordList getFieldAsKeywords(Field field, Character keywordSeparator) {
                 .map(content -> KeywordList.parse(content, keywordSeparator))
                 .orElse(new KeywordList());
 
-        if (field instanceof StandardField) {
-            fieldsAsKeywords.put((StandardField) field, keywordSeparator, keywords);
+        if (field instanceof StandardField standardField) {
+            fieldsAsKeywords.put(standardField, keywordSeparator, keywords);
         }
         return keywords;
     }
@@ -993,16 +1003,16 @@ private void invalidateFieldCache(Field field) {
         latexFreeFields.remove(field);
         fieldsAsWords.remove(field);
 
-        if (field instanceof StandardField) {
-            fieldsAsKeywords.remove((StandardField) field);
+        if (field instanceof StandardField standardField) {
+            fieldsAsKeywords.remove(standardField);
         }
     }
 
     public Optional<String> getLatexFreeField(Field field) {
-        if (InternalField.KEY_FIELD.equals(field)) {
+        if (InternalField.KEY_FIELD == field) {
             // the key field should not be converted
             return getCitationKey();
-        } else if (InternalField.TYPE_HEADER.equals(field)) {
+        } else if (InternalField.TYPE_HEADER == field) {
             return Optional.of(type.get().getDisplayName());
         } else if (latexFreeFields.containsKey(field)) {
             return Optional.ofNullable(latexFreeFields.get(field));
@@ -1157,4 +1167,11 @@ public void mergeWith(BibEntry other, Set<Field> otherPrioritizedFields) {
             }
         }
     }
+
+    public boolean isEmpty() {
+        if (this.fields.isEmpty()) {
+            return true;
+        }
+        return StandardField.AUTOMATIC_FIELDS.containsAll(this.getFields());
+    }
 }
diff --git a/src/main/java/org/jabref/model/entry/BibEntryType.java b/src/main/java/org/jabref/model/entry/BibEntryType.java
index 01d5d452c74..4908aec875c 100644
--- a/src/main/java/org/jabref/model/entry/BibEntryType.java
+++ b/src/main/java/org/jabref/model/entry/BibEntryType.java
@@ -7,6 +7,8 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import org.jabref.gui.importer.BibEntryTypePrefsAndFileViewModel;
+import org.jabref.logic.exporter.MetaDataSerializer;
 import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.model.entry.field.BibField;
 import org.jabref.model.entry.field.Field;
@@ -24,25 +26,22 @@ public class BibEntryType implements Comparable<BibEntryType> {
     /**
      * Provides an enriched EntryType with information about defined standards as mandatory fields etc.
      *
+     * A builder is available at {@link BibEntryTypeBuilder}
+     *
      * @param type              The EntryType this BibEntryType is wrapped around.
      * @param fields            A BibFields list of all fields, including the required fields
      * @param requiredFields    A OrFields list of just the required fields
      */
     public BibEntryType(EntryType type, Collection<BibField> fields, Collection<OrFields> requiredFields) {
         this.type = Objects.requireNonNull(type);
-        this.requiredFields = new LinkedHashSet<>(requiredFields);
         this.fields = new LinkedHashSet<>(fields);
+        this.requiredFields = new LinkedHashSet<>(requiredFields);
     }
 
     public EntryType getType() {
         return type;
     }
 
-    /**
-     * Returns all supported optional field names.
-     *
-     * @return a Set of optional field name Strings
-     */
     public Set<BibField> getOptionalFields() {
         return getAllBibFields().stream()
                              .filter(field -> !isRequired(field.field()))
@@ -146,13 +145,21 @@ public int hashCode() {
         return Objects.hash(type, requiredFields, fields);
     }
 
+    /**
+     * Generates a **single line** string containing the information. This is used for debugging purposes.
+     *
+     * See "<a href="https://biratkirat.medium.com/learning-effective-java-item-10-84cc3ab553bc">Effective Java, Item 10</a>" for a discussion on contracts.
+     *
+     * We are sure, we are using this method in a) logs (which should use single lines for output) and b) in the UI. For the UI, we use {@link BibEntryTypePrefsAndFileViewModel},
+     * which in turn uses {@link MetaDataSerializer#serializeCustomEntryTypes(BibEntryType)}
+     */
     @Override
     public String toString() {
         return "BibEntryType{" +
-               "type=" + type +
-               ", requiredFields=" + requiredFields +
-               ", fields=" + fields +
-               '}';
+                "type=" + type +
+                ", allFields=" + fields +
+                ", requiredFields=" + requiredFields +
+                '}';
     }
 
     @Override
diff --git a/src/main/java/org/jabref/model/entry/BibEntryTypeBuilder.java b/src/main/java/org/jabref/model/entry/BibEntryTypeBuilder.java
index ddc510d7d4b..b8613157ac6 100644
--- a/src/main/java/org/jabref/model/entry/BibEntryTypeBuilder.java
+++ b/src/main/java/org/jabref/model/entry/BibEntryTypeBuilder.java
@@ -75,8 +75,9 @@ public BibEntryTypeBuilder withRequiredFields(List<OrFields> first, Field... req
     public BibEntryType build() {
         // Treat required fields as important ones
         Stream<BibField> requiredAsImportant = requiredFields.stream()
-                                                             .flatMap(Set::stream)
-                                                             .map(field -> new BibField(field, FieldPriority.IMPORTANT));
+                .map(OrFields::getFields)
+                .flatMap(Set::stream)
+                .map(field -> new BibField(field, FieldPriority.IMPORTANT));
         Set<BibField> allFields = Stream.concat(fields.stream(), requiredAsImportant).collect(Collectors.toCollection(LinkedHashSet::new));
         return new BibEntryType(type, allFields, requiredFields);
     }
diff --git a/src/main/java/org/jabref/model/entry/BibEntryTypesManager.java b/src/main/java/org/jabref/model/entry/BibEntryTypesManager.java
index 0ec4a06f175..eb25ad23972 100644
--- a/src/main/java/org/jabref/model/entry/BibEntryTypesManager.java
+++ b/src/main/java/org/jabref/model/entry/BibEntryTypesManager.java
@@ -100,7 +100,7 @@ public boolean isDifferentCustomOrModifiedType(BibEntryType type, BibDatabaseMod
             return true;
         } else {
             // different customization
-            return !EntryTypeFactory.isEqualNameAndFieldBased(type, currentlyStoredType.get());
+            return !EntryTypeFactory.nameAndFieldsAreEqual(type, currentlyStoredType.get());
         }
     }
 
diff --git a/src/main/java/org/jabref/model/entry/BibtexString.java b/src/main/java/org/jabref/model/entry/BibtexString.java
index 9b833849d23..d8e83fb6477 100644
--- a/src/main/java/org/jabref/model/entry/BibtexString.java
+++ b/src/main/java/org/jabref/model/entry/BibtexString.java
@@ -98,8 +98,6 @@ public void setId(String id) {
 
     /**
      * Returns the name/label of the string
-     *
-     * @return
      */
     public String getName() {
         return name;
@@ -178,12 +176,11 @@ 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) &&
-                Objects.equals(parsedSerialization, that.parsedSerialization));
+                Objects.equals(parsedSerialization, that.parsedSerialization);
     }
 
     @Override
diff --git a/src/main/java/org/jabref/model/entry/Date.java b/src/main/java/org/jabref/model/entry/Date.java
index 22253fbe2b6..219a7b294e5 100644
--- a/src/main/java/org/jabref/model/entry/Date.java
+++ b/src/main/java/org/jabref/model/entry/Date.java
@@ -19,6 +19,7 @@
 
 public class Date {
 
+    public static final String DATE_REGEX;
     private static final DateTimeFormatter NORMALIZED_DATE_FORMATTER = DateTimeFormatter.ofPattern("uuuu[-MM][-dd]");
     private static final DateTimeFormatter SIMPLE_DATE_FORMATS;
     private static final Logger LOGGER = LoggerFactory.getLogger(Date.class);
@@ -44,15 +45,39 @@ public class Date {
                 "uuuu.M.d",                             // covers 2015.1.15
                 "uuuu",                                 // covers 2015
                 "MMM, uuuu",                            // covers Jan, 2020
-                "uuuu.MM.d"                             // covers 2015.10.15
+                "uuuu.MM.d",                            // covers 2015.10.15
+                "d MMMM u/d MMMM u",                    // covers 20 January 2015/20 February 2015
+                "d MMMM u",                             // covers 20 January 2015
+                "d MMMM u / d MMMM u"
                 );
 
+        /* TODO: The following date formats do not yet work and need to be created with tests
+         *      "u G",                                  // covers 1 BC
+         *       "u G / u G",                           // covers 30 BC / 5 AD
+         *      "uuuu G / uuuu G",                      // covers 0030 BC / 0005 AD
+         *      "uuuu-MM G / uuuu-MM G",                // covers 0030-01 BC / 0005-02 AD
+         *      "u'-'",                                 // covers 2015-
+         *      "u'?'",                                 // covers 2023?
+         */
+
         SIMPLE_DATE_FORMATS = formatStrings.stream()
                                            .map(DateTimeFormatter::ofPattern)
                                            .reduce(new DateTimeFormatterBuilder(),
                                                    DateTimeFormatterBuilder::appendOptional,
                                                    (builder, formatterBuilder) -> builder.append(formatterBuilder.toFormatter()))
                                            .toFormatter(Locale.US);
+
+        /*
+         * There is also {@link org.jabref.model.entry.Date#parse(java.lang.String)}.
+         * The regex of that method cannot be used as we parse single dates here and that method parses:
+         * i) date ranges
+         * ii) two dates separated by '/'
+         * Additionally, parse method requires the reviewed String to hold only a date.
+         */
+        DATE_REGEX = "\\d{4}-\\d{1,2}-\\d{1,2}" + // covers YYYY-MM-DD, YYYY-M-DD, YYYY-MM-D, YYYY-M-D
+                "|\\d{4}\\.\\d{1,2}\\.\\d{1,2}|" + // covers YYYY.MM.DD, YYYY.M.DD, YYYY.MM.D, YYYY.M.D
+                "(January|February|March|April|May|June|July|August|September|" +
+                "October|November|December) \\d{1,2}, \\d{4}"; // covers Month DD, YYYY & Month D, YYYY
     }
 
     private final TemporalAccessor date;
@@ -99,15 +124,47 @@ public static Optional<Date> parse(String dateString) {
             return Optional.empty();
         }
 
-        // if dateString has format of uuuu/uuuu, treat as date range
-        if (dateString.matches("[0-9]{4}/[0-9]{4}")) {
+        // if dateString has range format, treat as date range
+        if (dateString.matches(
+               "\\d{4}/\\d{4}|" + // uuuu/uuuu
+               "\\d{4}-\\d{2}/\\d{4}-\\d{2}|" + // uuuu-mm/uuuu-mm
+               "\\d{4}-\\d{2}-\\d{2}/\\d{4}-\\d{2}-\\d{2}|" + // uuuu-mm-dd/uuuu-mm-dd
+               "(?i)(January|February|March|April|May|June|July|August|September|October|November|December)" +
+               "( |\\-)(\\d{1,4})/(January|February|March|April|May|June|July|August|September|October|November" +
+               "|December)( |\\-)(\\d{1,4})(?i-)|" + // January 2015/January 2015
+               "(?i)(\\d{1,2})( )(January|February|March|April|May|June|July|August|September|October|November|December)" +
+               "( |\\-)(\\d{1,4})/(\\d{1,2})( )" +
+               "(January|February|March|April|May|June|July|August|September|October|November|December)" +
+               "( |\\-)(\\d{1,4})(?i-)" // 20 January 2015/20 January 2015
+        )) {
             try {
                 String[] strDates = dateString.split("/");
-                TemporalAccessor parsedDate = SIMPLE_DATE_FORMATS.parse(strDates[0]);
-                TemporalAccessor parsedEndDate = SIMPLE_DATE_FORMATS.parse(strDates[1]);
+                TemporalAccessor parsedDate = SIMPLE_DATE_FORMATS.parse(strDates[0].strip());
+                TemporalAccessor parsedEndDate = SIMPLE_DATE_FORMATS.parse(strDates[1].strip());
+                return Optional.of(new Date(parsedDate, parsedEndDate));
+            } catch (DateTimeParseException e) {
+                LOGGER.debug("Invalid Date format for range", e);
+                return Optional.empty();
+            }
+        } else if (dateString.matches(
+              "\\d{4} / \\d{4}|" + // uuuu / uuuu
+              "\\d{4}-\\d{2} / \\d{4}-\\d{2}|" + // uuuu-mm / uuuu-mm
+              "\\d{4}-\\d{2}-\\d{2} / \\d{4}-\\d{2}-\\d{2}|" + // uuuu-mm-dd / uuuu-mm-dd
+              "(?i)(January|February|March|April|May|June|July|August|September|October|November|December)" +
+              "( |\\-)(\\d{1,4}) / (January|February|March|April|May|June|July|August|September|October|November" +
+              "|December)( |\\-)(\\d{1,4})(?i-)|" + // January 2015/January 2015
+              "(?i)(\\d{1,2})( )(January|February|March|April|May|June|July|August|September|October|November|December)" +
+              "( |\\-)(\\d{1,4}) / (\\d{1,2})( )" +
+              "(January|February|March|April|May|June|July|August|September|October|November|December)" +
+              "( |\\-)(\\d{1,4})(?i-)" // 20 January 2015/20 January 2015
+        )) {
+            try {
+                String[] strDates = dateString.split(" / ");
+                TemporalAccessor parsedDate = SIMPLE_DATE_FORMATS.parse(strDates[0].strip());
+                TemporalAccessor parsedEndDate = SIMPLE_DATE_FORMATS.parse(strDates[1].strip());
                 return Optional.of(new Date(parsedDate, parsedEndDate));
             } catch (DateTimeParseException e) {
-                LOGGER.debug("Invalid Date format", e);
+                LOGGER.debug("Invalid Date format range", e);
                 return Optional.empty();
             }
         }
@@ -202,21 +259,21 @@ public boolean equals(Object o) {
 
     @Override
     public String toString() {
-        String formattedDate;
+        String formattedDate = date.toString();
         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 {
+        } else if (date.isSupported(ChronoField.MONTH_OF_YEAR) && date.isSupported(ChronoField.DAY_OF_MONTH)) {
             formattedDate = DateTimeFormatter.ISO_DATE.format(date);
         }
         return "Date{" +
-                "date=" + formattedDate +
-                '}';
+               "date=" + formattedDate +
+               '}';
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(date);
+        return Objects.hash(getYear(), getMonth(), getDay(), get(ChronoField.HOUR_OF_DAY), get(ChronoField.MINUTE_OF_HOUR), get(ChronoField.OFFSET_SECONDS));
     }
 }
diff --git a/src/main/java/org/jabref/model/entry/EntryLinkList.java b/src/main/java/org/jabref/model/entry/EntryLinkList.java
index a1b50882b25..9b468f27e81 100644
--- a/src/main/java/org/jabref/model/entry/EntryLinkList.java
+++ b/src/main/java/org/jabref/model/entry/EntryLinkList.java
@@ -26,6 +26,6 @@ public static List<ParsedEntryLink> parse(String fieldValue, BibDatabase databas
     }
 
     public static String serialize(List<ParsedEntryLink> list) {
-        return String.join(SEPARATOR, list.stream().map(link -> link.getKey()).collect(Collectors.toList()));
+        return String.join(SEPARATOR, list.stream().map(ParsedEntryLink::getKey).collect(Collectors.toList()));
     }
 }
diff --git a/src/main/java/org/jabref/model/entry/LinkedFile.java b/src/main/java/org/jabref/model/entry/LinkedFile.java
index 094e2b5ecab..e3c296f5c90 100644
--- a/src/main/java/org/jabref/model/entry/LinkedFile.java
+++ b/src/main/java/org/jabref/model/entry/LinkedFile.java
@@ -109,8 +109,7 @@ public boolean equals(Object o) {
         if (this == o) {
             return true;
         }
-        if (o instanceof LinkedFile) {
-            LinkedFile that = (LinkedFile) o;
+        if (o instanceof LinkedFile that) {
             return Objects.equals(description.get(), that.description.get())
                     && Objects.equals(link.get(), that.link.get())
                     && Objects.equals(fileType.get(), that.fileType.get());
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 9165aa13f15..c7d6255a813 100644
--- a/src/main/java/org/jabref/model/entry/event/FieldChangedEvent.java
+++ b/src/main/java/org/jabref/model/entry/event/FieldChangedEvent.java
@@ -59,6 +59,7 @@ public FieldChangedEvent(FieldChange fieldChange) {
     }
 
     private int computeMajorCharacterChange(String oldValue, String newValue) {
+        // We do == because of performance reasons
         if (oldValue == newValue) {
             return 0;
         } else if ((oldValue == null) && (newValue != null)) {
diff --git a/src/main/java/org/jabref/model/entry/field/BibField.java b/src/main/java/org/jabref/model/entry/field/BibField.java
index 4d0729e4f4a..1453e6fc32d 100644
--- a/src/main/java/org/jabref/model/entry/field/BibField.java
+++ b/src/main/java/org/jabref/model/entry/field/BibField.java
@@ -24,7 +24,7 @@ public int hashCode() {
     @Override
     public String toString() {
         return "BibField{" +
-                "field=" + field.getName() +
+                "field=" + field.getDisplayName() +
                 ", priority=" + priority +
                 '}';
     }
diff --git a/src/main/java/org/jabref/model/entry/field/Field.java b/src/main/java/org/jabref/model/entry/field/Field.java
index abd9b270781..ec3055e493c 100644
--- a/src/main/java/org/jabref/model/entry/field/Field.java
+++ b/src/main/java/org/jabref/model/entry/field/Field.java
@@ -10,6 +10,8 @@ public interface Field {
     /**
      * properties contains mappings to tell the EntryEditor to add a specific function to this field,
      * for instance a dropdown for selecting the month for the month field.
+     *
+     * Note that this set needs to be mutable. This is required, because we allow standard fields to be modifiable via the UI.
      */
     Set<FieldProperty> getProperties();
 
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 2eceb820c10..645a1295221 100644
--- a/src/main/java/org/jabref/model/entry/field/FieldFactory.java
+++ b/src/main/java/org/jabref/model/entry/field/FieldFactory.java
@@ -3,14 +3,17 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Comparator;
 import java.util.EnumSet;
 import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.TreeSet;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
+import org.jabref.model.entry.types.EntryType;
 import org.jabref.model.strings.StringUtil;
 import org.jabref.model.util.OptionalUtil;
 
@@ -28,8 +31,16 @@ public static String serializeOrFields(Field... fields) {
     }
 
     public static String serializeOrFields(OrFields fields) {
-        return fields.stream()
-                     .map(Field::getName)
+        return fields.getFields().stream()
+                     .map(field -> {
+                         if (field instanceof UnknownField unknownField) {
+                             // In case a user has put a user-defined field, the casing of that field is kept
+                             return unknownField.getDisplayName();
+                         } else {
+                             // In all fields known to JabRef, the name is used - JabRef knows better than the user how to case the field
+                             return field.getName();
+                         }
+                     })
                      .collect(Collectors.joining(FIELD_OR_SEPARATOR));
     }
 
@@ -47,9 +58,9 @@ public static List<Field> getIdentifierFieldNames() {
 
     public static OrFields parseOrFields(String fieldNames) {
         Set<Field> fields = Arrays.stream(fieldNames.split(FieldFactory.FIELD_OR_SEPARATOR))
-                     .filter(StringUtil::isNotBlank)
-                     .map(FieldFactory::parseField)
-                     .collect(Collectors.toCollection(LinkedHashSet::new));
+                                  .filter(StringUtil::isNotBlank)
+                                  .map(FieldFactory::parseField)
+                                  .collect(Collectors.toCollection(LinkedHashSet::new));
         return new OrFields(fields);
     }
 
@@ -69,11 +80,28 @@ public static Set<Field> parseFieldList(String fieldNames) {
 
     public static String serializeFieldsList(Collection<Field> fields) {
         return fields.stream()
-                     .map(Field::getName)
+                     .map(field -> {
+                         if (field instanceof UnknownField unknownField) {
+                             // In case a user has put a user-defined field, the casing of that field is kept
+                             return unknownField.getDisplayName();
+                         } else {
+                             // In all fields known to JabRef, the name is used - JabRef knows better than the user how to case the field
+                             return field.getName();
+                         }
+                     })
                      .collect(Collectors.joining(DELIMITER));
     }
 
-    public static <T> Field parseField(T type, String fieldName) {
+    /**
+     * Type T is an entry type and is used to direct the mapping to the Java field class.
+     * This somehow acts as filter, BibLaTeX "APA" entry type has field "article", but we want to have StandardField (if not explicitly requested otherwise)
+     */
+    public static <T extends EntryType> Field parseField(T type, String fieldName) {
+        // Check if the field name starts with "comment-" which indicates it's a UserSpecificCommentField
+        if (fieldName.startsWith("comment-")) {
+            String username = fieldName.substring("comment-".length());
+            return new UserSpecificCommentField(username);
+        }
         return OptionalUtil.<Field>orElse(
               OptionalUtil.<Field>orElse(
                OptionalUtil.<Field>orElse(
@@ -87,7 +115,7 @@ public static <T> Field parseField(T type, String fieldName) {
               BiblatexSoftwareField.fromName(type, fieldName)),
               BiblatexApaField.fromName(type, fieldName)),
               AMSField.fromName(type, fieldName))
-              .orElse(new UnknownField(fieldName));
+              .orElse(UnknownField.fromDisplayName(fieldName));
     }
 
     public static Field parseField(String fieldName) {
@@ -107,7 +135,7 @@ public static Set<Field> getJournalNameFields() {
     }
 
     /**
-     * Returns a  List with all standard fields and including some common internal fields
+     * Returns a Set with all standard fields and including some common internal fields
      */
     public static Set<Field> getCommonFields() {
         EnumSet<StandardField> allFields = EnumSet.allOf(StandardField.class);
@@ -121,6 +149,17 @@ public static Set<Field> getCommonFields() {
         return publicAndInternalFields;
     }
 
+    /**
+     * Returns a sorted Set of Fields (by {@link Field#getDisplayName} with all fields without internal ones
+     */
+    public static Set<Field> getAllFieldsWithOutInternal() {
+        Set<Field> fields = new TreeSet<>(Comparator.comparing(Field::getDisplayName));
+        fields.addAll(getAllFields());
+        fields.removeAll(EnumSet.allOf(InternalField.class));
+
+        return fields;
+    }
+
     /**
      * Returns a  List with all standard fields and the citation key field
      */
@@ -156,12 +195,13 @@ private static Set<Field> getAllFields() {
         fields.addAll(EnumSet.allOf(InternalField.class));
         fields.addAll(EnumSet.allOf(SpecialField.class));
         fields.addAll(EnumSet.allOf(StandardField.class));
+        fields.removeIf(field -> field instanceof UserSpecificCommentField);
         return fields;
     }
 
     /**
      * These are the fields JabRef always displays as default {@link org.jabref.preferences.JabRefPreferences#setLanguageDependentDefaultValues()}
-     *
+     * <p>
      * A user can change them. The change is currently stored in the preferences only and not explicitly exposed as
      * separate preferences object
      */
@@ -171,9 +211,9 @@ public static List<Field> getDefaultGeneralFields() {
         return defaultGeneralFields;
     }
 
-    // TODO: This should ideally be user configurable! Move somewhere more appropriate in the future
+    // TODO: This should ideally be user configurable! (https://github.com/JabRef/jabref/issues/9840)
+    // TODO: Move somewhere more appropriate in the future
     public static boolean isMultiLineField(final Field field, List<Field> nonWrappableFields) {
-        // Treat unknown fields as multi-line fields
-        return nonWrappableFields.contains(field) || field.equals(StandardField.ABSTRACT) || field.equals(StandardField.COMMENT) || field.equals(StandardField.REVIEW);
+        return field.getProperties().contains(FieldProperty.MULTILINE_TEXT) || nonWrappableFields.contains(field);
     }
 }
diff --git a/src/main/java/org/jabref/model/entry/field/FieldPriority.java b/src/main/java/org/jabref/model/entry/field/FieldPriority.java
index 1c0e1cef4da..199151eeaf0 100644
--- a/src/main/java/org/jabref/model/entry/field/FieldPriority.java
+++ b/src/main/java/org/jabref/model/entry/field/FieldPriority.java
@@ -1,6 +1,19 @@
 package org.jabref.model.entry.field;
 
+import java.util.Locale;
+
+/**
+ * Determines whether the field is in the Optional1 or Optional2 tab
+ *
+ * See {@link org.jabref.model.entry.BibEntryType#getPrimaryOptionalFields()}
+ * and {@link org.jabref.model.entry.BibEntryType#getSecondaryOptionalFields()}.
+ */
 public enum FieldPriority {
     IMPORTANT,
-    DETAIL
+    DETAIL;
+
+    @Override
+    public String toString() {
+        return this.name().toLowerCase(Locale.ROOT);
+    }
 }
diff --git a/src/main/java/org/jabref/model/entry/field/FieldProperty.java b/src/main/java/org/jabref/model/entry/field/FieldProperty.java
index 2eae6e18b3a..cba4a76714b 100644
--- a/src/main/java/org/jabref/model/entry/field/FieldProperty.java
+++ b/src/main/java/org/jabref/model/entry/field/FieldProperty.java
@@ -23,5 +23,6 @@ public enum FieldProperty {
     SINGLE_ENTRY_LINK,
     TYPE,
     VERBATIM,
-    YES_NO
+    YES_NO,
+    COMMENT
 }
diff --git a/src/main/java/org/jabref/model/entry/field/InternalField.java b/src/main/java/org/jabref/model/entry/field/InternalField.java
index d284af643c4..26ccba31388 100644
--- a/src/main/java/org/jabref/model/entry/field/InternalField.java
+++ b/src/main/java/org/jabref/model/entry/field/InternalField.java
@@ -65,7 +65,7 @@ public enum InternalField implements Field {
     }
 
     public static Optional<InternalField> fromName(String name) {
-        if (name.equalsIgnoreCase("bibtexkey")) {
+        if ("bibtexkey".equalsIgnoreCase(name)) {
             // For backwards compatibility
             return Optional.of(InternalField.KEY_FIELD);
         }
diff --git a/src/main/java/org/jabref/model/entry/field/OrFields.java b/src/main/java/org/jabref/model/entry/field/OrFields.java
index baf848d4392..e0d24537be5 100644
--- a/src/main/java/org/jabref/model/entry/field/OrFields.java
+++ b/src/main/java/org/jabref/model/entry/field/OrFields.java
@@ -3,36 +3,80 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.LinkedHashSet;
+import java.util.Objects;
+import java.util.Set;
 import java.util.StringJoiner;
 
-public class OrFields extends LinkedHashSet<Field> implements Comparable<OrFields> {
+public class OrFields implements Comparable<OrFields> {
+
+    private LinkedHashSet<Field> fields = new LinkedHashSet<>();
 
     public OrFields(Field field) {
-        add(field);
+        fields.add(field);
     }
 
-    public OrFields(Field... fields) {
-        addAll(Arrays.asList(fields));
+    public OrFields(Field... fieldsToAdd) {
+        Arrays.stream(fieldsToAdd).forEach(fields::add);
     }
 
-    public OrFields(Collection<Field> fields) {
-        addAll(fields);
+    public OrFields(Collection<Field> fieldsToAdd) {
+        fields.addAll(fieldsToAdd);
     }
 
     public String getDisplayName() {
         StringJoiner joiner = new StringJoiner("/");
-        for (Field field : this) {
+        for (Field field : fields) {
             joiner.add(field.getDisplayName());
         }
         return joiner.toString();
     }
 
     public Field getPrimary() {
-        return this.iterator().next();
+        return fields.iterator().next();
+    }
+
+    public Set<Field> getFields() {
+        return this.fields;
+    }
+
+    public boolean contains(Field field) {
+        return fields.contains(field);
     }
 
     @Override
     public int compareTo(OrFields o) {
         return FieldFactory.serializeOrFields(this).compareTo(FieldFactory.serializeOrFields(o));
     }
+
+    public boolean hasExactlyOne() {
+        return this.fields.size() == 1;
+    }
+
+    public boolean isEmpty() {
+        return this.fields.isEmpty();
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        OrFields orFields = (OrFields) o;
+        return Objects.equals(fields, orFields.fields);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(fields);
+    }
+
+    @Override
+    public String toString() {
+        return "OrFields{" +
+                "fields=" + fields +
+                '}';
+    }
 }
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 6012b38b596..ff939f9f722 100644
--- a/src/main/java/org/jabref/model/entry/field/StandardField.java
+++ b/src/main/java/org/jabref/model/entry/field/StandardField.java
@@ -14,7 +14,7 @@
  */
 public enum StandardField implements Field {
 
-    ABSTRACT("abstract"),
+    ABSTRACT("abstract", FieldProperty.MULTILINE_TEXT),
     ADDENDUM("addendum"),
     ADDRESS("address"),
     AFTERWORD("afterword", FieldProperty.PERSON_NAMES),
@@ -31,7 +31,7 @@ public enum StandardField implements Field {
     BOOKTITLEADDON("booktitleaddon"),
     CHAPTER("chapter"),
     COMMENTATOR("commentator", FieldProperty.PERSON_NAMES),
-    COMMENT("comment"),
+    COMMENT("comment", FieldProperty.COMMENT, FieldProperty.MULTILINE_TEXT),
     CROSSREF("crossref", FieldProperty.SINGLE_ENTRY_LINK),
     DATE("date", FieldProperty.DATE),
     DAY("day"),
@@ -102,7 +102,7 @@ public enum StandardField implements Field {
     PRIMARYCLASS("primaryclass"),
     RELATED("related", FieldProperty.MULTIPLE_ENTRY_LINK),
     REPORTNO("reportno"),
-    REVIEW("review"),
+    REVIEW("review", FieldProperty.MULTILINE_TEXT),
     REVISION("revision"),
     SCHOOL("school"),
     SERIES("series"),
@@ -137,6 +137,8 @@ public enum StandardField implements Field {
     CREATIONDATE("creationdate", FieldProperty.DATE),
     MODIFICATIONDATE("modificationdate", FieldProperty.DATE);
 
+    public static Set<Field> AUTOMATIC_FIELDS = Set.of(OWNER, TIMESTAMP, CREATIONDATE, MODIFICATIONDATE);
+
     private final String name;
     private final String displayName;
     private final Set<FieldProperty> properties;
diff --git a/src/main/java/org/jabref/model/entry/field/UnknownField.java b/src/main/java/org/jabref/model/entry/field/UnknownField.java
index f1de44ce00a..a18779d3dc8 100644
--- a/src/main/java/org/jabref/model/entry/field/UnknownField.java
+++ b/src/main/java/org/jabref/model/entry/field/UnknownField.java
@@ -5,20 +5,37 @@
 import java.util.Objects;
 import java.util.Set;
 
+import org.jabref.model.strings.StringUtil;
+
 public class UnknownField implements Field {
-    private final String name;
+    private String name;
     private final Set<FieldProperty> properties;
+    private final String displayName;
 
     public UnknownField(String name) {
+        this(name, StringUtil.capitalizeFirst(name));
+    }
+
+    public UnknownField(String name, String displayName) {
         this.name = name;
+        this.displayName = displayName;
         this.properties = EnumSet.noneOf(FieldProperty.class);
     }
 
     public UnknownField(String name, FieldProperty first, FieldProperty... rest) {
+        this(name, StringUtil.capitalizeFirst(name), first, rest);
+    }
+
+    public UnknownField(String name, String displayName, FieldProperty first, FieldProperty... rest) {
         this.name = name;
+        this.displayName = displayName;
         this.properties = EnumSet.of(first, rest);
     }
 
+    public static UnknownField fromDisplayName(String displayName) {
+        return new UnknownField(displayName.toLowerCase(Locale.ROOT), displayName);
+    }
+
     @Override
     public Set<FieldProperty> getProperties() {
         return properties;
@@ -29,6 +46,15 @@ public String getName() {
         return name;
     }
 
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @Override
+    public String getDisplayName() {
+        return displayName;
+    }
+
     @Override
     public boolean isStandardField() {
         return false;
diff --git a/src/main/java/org/jabref/model/entry/field/UserSpecificCommentField.java b/src/main/java/org/jabref/model/entry/field/UserSpecificCommentField.java
new file mode 100644
index 00000000000..236a894ed4e
--- /dev/null
+++ b/src/main/java/org/jabref/model/entry/field/UserSpecificCommentField.java
@@ -0,0 +1,53 @@
+package org.jabref.model.entry.field;
+
+import java.util.EnumSet;
+import java.util.Objects;
+import java.util.Set;
+
+public class UserSpecificCommentField implements Field {
+    private static final Set<FieldProperty> PROPERTIES = EnumSet.of(FieldProperty.COMMENT, FieldProperty.MULTILINE_TEXT);
+    private final String name;
+
+    public UserSpecificCommentField(String username) {
+        this.name = "comment-" + username;
+    }
+
+    @Override
+    public Set<FieldProperty> getProperties() {
+        return PROPERTIES;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public boolean isStandardField() {
+        return false;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof Field)) {
+            return false;
+        }
+        Field other = (Field) o;
+        return name.equals(other.getName());
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(name);
+    }
+
+    @Override
+    public String toString() {
+        return "UnknownCommentField{" +
+                "name='" + name + '\'' +
+                '}';
+    }
+}
diff --git a/src/main/java/org/jabref/model/entry/identifier/ArXivIdentifier.java b/src/main/java/org/jabref/model/entry/identifier/ArXivIdentifier.java
index 0a9df1a14fe..4db64bad268 100644
--- a/src/main/java/org/jabref/model/entry/identifier/ArXivIdentifier.java
+++ b/src/main/java/org/jabref/model/entry/identifier/ArXivIdentifier.java
@@ -34,7 +34,7 @@ public class ArXivIdentifier extends EprintIdentifier {
     }
 
     public static Optional<ArXivIdentifier> parse(String value) {
-        String identifier = value.replaceAll(" ", "");
+        String identifier = value.replace(" ", "");
         Pattern identifierPattern = Pattern.compile("(" + ARXIV_PREFIX + ")?\\s?:?\\s?(?<id>\\d{4}\\.\\d{4,5})(v(?<version>\\d+))?\\s?(\\[(?<classification>\\S+)\\])?");
         Matcher identifierMatcher = identifierPattern.matcher(identifier);
         if (identifierMatcher.matches()) {
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 dc30c25dde4..da3a80217dd 100644
--- a/src/main/java/org/jabref/model/entry/identifier/DOI.java
+++ b/src/main/java/org/jabref/model/entry/identifier/DOI.java
@@ -37,7 +37,7 @@ public class DOI implements Identifier {
             + "("                               // begin group \1
             + "10"                              // directory indicator
             + "(?:\\.[0-9]+)+"                  // registrant codes
-            + "[/:%]" // divider
+            + "[/:%]"                           // divider
             + "(?:.+)"                          // suffix alphanumeric string
             + ")";                              // end group \1
     private static final String FIND_DOI_EXP = ""
diff --git a/src/main/java/org/jabref/model/entry/identifier/ISBN.java b/src/main/java/org/jabref/model/entry/identifier/ISBN.java
index 80d00470587..962f3459de7 100644
--- a/src/main/java/org/jabref/model/entry/identifier/ISBN.java
+++ b/src/main/java/org/jabref/model/entry/identifier/ISBN.java
@@ -62,13 +62,13 @@ private boolean isbn10check() {
 
         int sum = 0;
         for (int pos = 0; pos <= 8; pos++) {
-            sum += (isbnString.charAt(pos) - '0') * ((10 - pos));
+            sum += (isbnString.charAt(pos) - '0') * (10 - pos);
         }
         char control = isbnString.charAt(9);
         if ((control == 'x') || (control == 'X')) {
             control = '9' + 1;
         }
-        sum += (control - '0');
+        sum += control - '0';
         return (sum % 11) == 0;
     }
 
diff --git a/src/main/java/org/jabref/model/entry/identifier/ISSN.java b/src/main/java/org/jabref/model/entry/identifier/ISSN.java
index e60e582cde5..5063536eda9 100644
--- a/src/main/java/org/jabref/model/entry/identifier/ISSN.java
+++ b/src/main/java/org/jabref/model/entry/identifier/ISSN.java
@@ -17,12 +17,12 @@ public ISSN(String issnString) {
 
     public boolean isValidFormat() {
         Matcher issnMatcher = ISSN_PATTERN.matcher(issnString);
-        return (issnMatcher.matches());
+        return issnMatcher.matches();
     }
 
     public boolean isCanBeCleaned() {
         Matcher issnNoDashMatcher = ISSN_PATTERN_NODASH.matcher(issnString);
-        return (issnNoDashMatcher.matches());
+        return issnNoDashMatcher.matches();
     }
 
     public String getCleanedISSN() {
@@ -46,6 +46,6 @@ public boolean isValidChecksum() {
         if ((control == 'x') || (control == 'X')) {
             control = '9' + 1;
         }
-        return (((((sum % 11) + control) - '0') == 11) || ((sum % 11) == 0));
+        return ((((sum % 11) + control) - '0') == 11) || ((sum % 11) == 0);
     }
 }
diff --git a/src/main/java/org/jabref/model/entry/types/EntryType.java b/src/main/java/org/jabref/model/entry/types/EntryType.java
index 90d0264c00d..1a40be9a9ae 100644
--- a/src/main/java/org/jabref/model/entry/types/EntryType.java
+++ b/src/main/java/org/jabref/model/entry/types/EntryType.java
@@ -4,10 +4,11 @@ public interface EntryType {
 
     /**
      * Returns the tag name of the entry type.
-     *
-     * @return tag name of the entry type.
      */
     String getName();
 
+    /**
+     * Returns the name presented in the UI
+     */
     String getDisplayName();
 }
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 6b40a56c4f4..ae879fabafb 100644
--- a/src/main/java/org/jabref/model/entry/types/EntryTypeFactory.java
+++ b/src/main/java/org/jabref/model/entry/types/EntryTypeFactory.java
@@ -14,14 +14,12 @@ private EntryTypeFactory() {
     }
 
     /**
-     * Checks whether two EntryTypeFactory are equal or not based on the equality of the type names and on the equality of
-     * the required and optional field lists
+     * Checks whether two EntryTypeFactory are equal
+     * based on the equality of the type names and on the equality of the required and optional field lists
      *
-     * @param type1 the first EntryType to compare
-     * @param type2 the secend EntryType to compare
      * @return returns true if the two compared entry types have the same name and equal required and optional fields
      */
-    public static boolean isEqualNameAndFieldBased(BibEntryType type1, BibEntryType type2) {
+    public static boolean nameAndFieldsAreEqual(BibEntryType type1, BibEntryType type2) {
         if ((type1 == null) && (type2 == null)) {
             return true;
         } else if ((type1 == null) || (type2 == null)) {
diff --git a/src/main/java/org/jabref/model/groups/AllEntriesGroup.java b/src/main/java/org/jabref/model/groups/AllEntriesGroup.java
index d0b92fe4760..320b3306ce8 100644
--- a/src/main/java/org/jabref/model/groups/AllEntriesGroup.java
+++ b/src/main/java/org/jabref/model/groups/AllEntriesGroup.java
@@ -20,7 +20,7 @@ public AbstractGroup deepCopy() {
 
     @Override
     public boolean equals(Object o) {
-        return o instanceof AllEntriesGroup && Objects.equals(((AllEntriesGroup) o).getName(), getName());
+        return o instanceof AllEntriesGroup aeg && Objects.equals(aeg.getName(), getName());
     }
 
     @Override
diff --git a/src/main/java/org/jabref/model/groups/TexGroup.java b/src/main/java/org/jabref/model/groups/TexGroup.java
index d2cb5d16c0d..8d22c0a1d7f 100644
--- a/src/main/java/org/jabref/model/groups/TexGroup.java
+++ b/src/main/java/org/jabref/model/groups/TexGroup.java
@@ -14,6 +14,7 @@
 import org.jabref.logic.util.io.FileUtil;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.metadata.MetaData;
+import org.jabref.model.util.DummyFileUpdateMonitor;
 import org.jabref.model.util.FileUpdateListener;
 import org.jabref.model.util.FileUpdateMonitor;
 
@@ -51,8 +52,9 @@ public static TexGroup create(String name, GroupHierarchyType context, Path file
         return group;
     }
 
-    public static TexGroup createWithoutFileMonitoring(String name, GroupHierarchyType context, Path filePath, AuxParser auxParser, FileUpdateMonitor fileMonitor, MetaData metaData) throws IOException {
-        return new TexGroup(name, context, filePath, auxParser, fileMonitor, metaData);
+    // without FileUpdateMonitor
+    public static TexGroup create(String name, GroupHierarchyType context, Path filePath, AuxParser auxParser, MetaData metaData) throws IOException {
+        return new TexGroup(name, context, filePath, auxParser, new DummyFileUpdateMonitor(), metaData);
     }
 
     public Path getFilePathResolved() {
diff --git a/src/main/java/org/jabref/model/groups/WordKeywordGroup.java b/src/main/java/org/jabref/model/groups/WordKeywordGroup.java
index 46ca9fc7e49..32fe044cff5 100644
--- a/src/main/java/org/jabref/model/groups/WordKeywordGroup.java
+++ b/src/main/java/org/jabref/model/groups/WordKeywordGroup.java
@@ -36,7 +36,7 @@ public WordKeywordGroup(String name, GroupHierarchyType context, Field searchFie
         this.onlySplitWordsAtSeparator = onlySplitWordsAtSeparator;
 
         if (onlySplitWordsAtSeparator) {
-            if (InternalField.TYPE_HEADER.equals(searchField)) {
+            if (InternalField.TYPE_HEADER == searchField) {
                 searchStrategy = new TypeSearchStrategy();
             } else {
                 searchStrategy = new KeywordListSearchStrategy();
diff --git a/src/main/java/org/jabref/model/metadata/ContentSelectors.java b/src/main/java/org/jabref/model/metadata/ContentSelectors.java
index d8c70e565ee..93c85250ae9 100644
--- a/src/main/java/org/jabref/model/metadata/ContentSelectors.java
+++ b/src/main/java/org/jabref/model/metadata/ContentSelectors.java
@@ -86,4 +86,12 @@ public boolean equals(Object o) {
     public int hashCode() {
         return Objects.hash(contentSelectors);
     }
+
+    @Override
+    public String toString() {
+        return "ContentSelectors{" +
+                "contentSelectors=" + contentSelectors +
+                ", fieldsWithSelectors=" + getFieldsWithSelectors() +
+                '}';
+    }
 }
diff --git a/src/main/java/org/jabref/model/metadata/MetaData.java b/src/main/java/org/jabref/model/metadata/MetaData.java
index 57b653e4eea..faf537a59ef 100644
--- a/src/main/java/org/jabref/model/metadata/MetaData.java
+++ b/src/main/java/org/jabref/model/metadata/MetaData.java
@@ -36,7 +36,7 @@ public class MetaData {
 
     public static final String META_FLAG = "jabref-meta: ";
     public static final String ENTRYTYPE_FLAG = "jabref-entrytype: ";
-    public static final String SAVE_ORDER_CONFIG = "saveOrderConfig";
+    public static final String SAVE_ORDER_CONFIG = "saveOrderConfig"; // ToDo: Rename in next major version to saveOrder, adapt testbibs
     public static final String SAVE_ACTIONS = "saveActions";
     public static final String PREFIX_KEYPATTERN = "keypattern_";
     public static final String KEYPATTERNDEFAULT = "keypatterndefault";
@@ -45,6 +45,7 @@ public class MetaData {
     public static final String GROUPSTREE = "grouping";
     public static final String GROUPSTREE_LEGACY = "groupstree";
     public static final String FILE_DIRECTORY = "fileDirectory";
+    public static final String FILE_DIRECTORY_LATEX = "fileDirectoryLatex";
     public static final String PROTECTED_FLAG_META = "protectedFlag";
     public static final String SELECTOR_META_PREFIX = "selector_";
 
@@ -61,7 +62,7 @@ public class MetaData {
     private final ObjectProperty<GroupTreeNode> groupsRoot = new SimpleObjectProperty<>(null);
     private final OptionalBinding<GroupTreeNode> groupsRootBinding = new OptionalWrapper<>(groupsRoot);
     private Charset encoding;
-    private SaveOrderConfig saveOrderConfig;
+    private SaveOrder saveOrder;
     private String defaultCiteKeyPattern;
     private FieldFormatterCleanups saveActions;
     private BibDatabaseMode mode;
@@ -71,7 +72,7 @@ public class MetaData {
     private final Map<String, List<String>> unknownMetaData = new HashMap<>();
     private boolean isEventPropagationEnabled = true;
     private boolean encodingExplicitlySupplied;
-    private String VersionDBStructure;
+    private String versionDBStructure;
 
     /**
      * Constructs an empty metadata.
@@ -80,12 +81,12 @@ public MetaData() {
         // Do nothing
     }
 
-    public Optional<SaveOrderConfig> getSaveOrderConfig() {
-        return Optional.ofNullable(saveOrderConfig);
+    public Optional<SaveOrder> getSaveOrder() {
+        return Optional.ofNullable(saveOrder);
     }
 
-    public void setSaveOrderConfig(SaveOrderConfig saveOrderConfig) {
-        this.saveOrderConfig = saveOrderConfig;
+    public void setSaveOrder(SaveOrder saveOrder) {
+        this.saveOrder = saveOrder;
         postChange();
     }
 
@@ -213,11 +214,11 @@ public void setDefaultFileDirectory(String path) {
     }
 
     public Optional<String> getVersionDBStructure() {
-        return Optional.ofNullable(VersionDBStructure);
+        return Optional.ofNullable(versionDBStructure);
     }
 
     public void setVersionDBStructure(String version) {
-        VersionDBStructure = Objects.requireNonNull(version).trim();
+        versionDBStructure = Objects.requireNonNull(version).trim();
         postChange();
     }
 
@@ -269,8 +270,8 @@ public void clearSaveActions() {
         postChange();
     }
 
-    public void clearSaveOrderConfig() {
-        saveOrderConfig = null;
+    public void clearSaveOrder() {
+        saveOrder = null;
         postChange();
     }
 
@@ -374,7 +375,7 @@ public boolean equals(Object o) {
                 && Objects.equals(groupsRoot.getValue(), metaData.groupsRoot.getValue())
                 && Objects.equals(encoding, metaData.encoding)
                 && Objects.equals(encodingExplicitlySupplied, metaData.encodingExplicitlySupplied)
-                && Objects.equals(saveOrderConfig, metaData.saveOrderConfig)
+                && Objects.equals(saveOrder, metaData.saveOrder)
                 && Objects.equals(citeKeyPatterns, metaData.citeKeyPatterns)
                 && Objects.equals(userFileDirectory, metaData.userFileDirectory)
                 && Objects.equals(laTexFileDirectory, metaData.laTexFileDirectory)
@@ -383,17 +384,17 @@ public boolean equals(Object o) {
                 && (mode == metaData.mode)
                 && Objects.equals(defaultFileDirectory, metaData.defaultFileDirectory)
                 && Objects.equals(contentSelectors, metaData.contentSelectors)
-                && Objects.equals(VersionDBStructure, metaData.VersionDBStructure);
+                && Objects.equals(versionDBStructure, metaData.versionDBStructure);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(isProtected, groupsRoot.getValue(), encoding, encodingExplicitlySupplied, saveOrderConfig, citeKeyPatterns, userFileDirectory,
-                laTexFileDirectory, defaultCiteKeyPattern, saveActions, mode, defaultFileDirectory, contentSelectors, VersionDBStructure);
+        return Objects.hash(isProtected, groupsRoot.getValue(), encoding, encodingExplicitlySupplied, saveOrder, citeKeyPatterns, userFileDirectory,
+                laTexFileDirectory, defaultCiteKeyPattern, saveActions, mode, defaultFileDirectory, contentSelectors, versionDBStructure);
     }
 
     @Override
     public String toString() {
-        return "MetaData [citeKeyPatterns=" + citeKeyPatterns + ", userFileDirectory=" + userFileDirectory + ", laTexFileDirectory=" + laTexFileDirectory + ", groupsRoot=" + groupsRoot + ", encoding=" + encoding + ", saveOrderConfig=" + saveOrderConfig + ", defaultCiteKeyPattern=" + defaultCiteKeyPattern + ", saveActions=" + saveActions + ", mode=" + mode + ", isProtected=" + isProtected + ", defaultFileDirectory=" + defaultFileDirectory + ", contentSelectors=" + contentSelectors + ", encodingExplicitlySupplied=" + encodingExplicitlySupplied + ", VersionDBStructure=" + VersionDBStructure + "]";
+        return "MetaData [citeKeyPatterns=" + citeKeyPatterns + ", userFileDirectory=" + userFileDirectory + ", laTexFileDirectory=" + laTexFileDirectory + ", groupsRoot=" + groupsRoot + ", encoding=" + encoding + ", saveOrderConfig=" + saveOrder + ", defaultCiteKeyPattern=" + defaultCiteKeyPattern + ", saveActions=" + saveActions + ", mode=" + mode + ", isProtected=" + isProtected + ", defaultFileDirectory=" + defaultFileDirectory + ", contentSelectors=" + contentSelectors + ", encodingExplicitlySupplied=" + encodingExplicitlySupplied + ", VersionDBStructure=" + versionDBStructure + "]";
     }
 }
diff --git a/src/main/java/org/jabref/model/metadata/SaveOrderConfig.java b/src/main/java/org/jabref/model/metadata/SaveOrder.java
similarity index 67%
rename from src/main/java/org/jabref/model/metadata/SaveOrderConfig.java
rename to src/main/java/org/jabref/model/metadata/SaveOrder.java
index 17ae10559ee..8186a2514c3 100644
--- a/src/main/java/org/jabref/model/metadata/SaveOrderConfig.java
+++ b/src/main/java/org/jabref/model/metadata/SaveOrder.java
@@ -11,87 +11,64 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * Stores the save order config from MetaData
+ * Stores the save order config for a library
  * <p>
- * Format: &lt;choice>, pair of field + ascending (boolean)
+ * Format: &lt;choice> ({@link OrderType}, a pair of {@link Field} + descending (boolean)
+ * </p>
+ * <p>
+ * Note that {@link OrderType#TABLE} can only be used as "intermediate" setting. When passing <code>SaveOrder</code>
+ * to {@link org.jabref.logic.exporter.BibDatabaseWriter}, the orderType must be different. Reason: The writer
+ * does not have access to the UI.
+ * </p>
  */
-public class SaveOrderConfig {
-
-    public enum OrderType {
-        SPECIFIED("specified"),
-        ORIGINAL("original"),
-        TABLE("table");
-
-        private final String name;
-
-        OrderType(String name) {
-            this.name = name;
-        }
-
-        @Override
-        public String toString() {
-            return name;
-        }
+public class SaveOrder {
 
-        public static SaveOrderConfig.OrderType fromBooleans(boolean saveInSpecifiedOrder, boolean saveInOriginalOrder) {
-            SaveOrderConfig.OrderType orderType = SaveOrderConfig.OrderType.TABLE;
-            if (saveInSpecifiedOrder) {
-                orderType = SaveOrderConfig.OrderType.SPECIFIED;
-            } else if (saveInOriginalOrder) {
-                orderType = SaveOrderConfig.OrderType.ORIGINAL;
-            }
+    private static final Logger LOGGER = LoggerFactory.getLogger(SaveOrder.class);
 
-            return orderType;
-        }
-    }
+    private final OrderType orderType;
+    private final List<SortCriterion> sortCriteria;
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(SaveOrderConfig.class);
-
-    private final List<SortCriterion> sortCriteria = new ArrayList<>();
-    private OrderType orderType;
-
-    public SaveOrderConfig() {
-        this.orderType = OrderType.ORIGINAL;
-    }
-
-    public SaveOrderConfig(OrderType orderType, List<SortCriterion> sortCriteria) {
+    public SaveOrder(OrderType orderType, List<SortCriterion> sortCriteria) {
         this.orderType = orderType;
-        this.sortCriteria.addAll(sortCriteria);
+        this.sortCriteria = sortCriteria;
     }
 
-    private SaveOrderConfig(List<String> data) {
+    private SaveOrder(List<String> data) {
         Objects.requireNonNull(data);
 
         if (data.isEmpty()) {
             throw new IllegalArgumentException();
         }
 
+        OrderType orderType;
         try {
-            this.orderType = OrderType.valueOf(data.get(0).toUpperCase());
+            orderType = OrderType.valueOf(data.get(0).toUpperCase());
         } catch (IllegalArgumentException ex) {
             if (data.size() > 1 && data.size() % 2 == 1) {
                 LOGGER.warn("Could not parse sort order: {} - trying to parse the sort criteria", data.get(0));
-                this.orderType = OrderType.SPECIFIED;
+                orderType = OrderType.SPECIFIED;
             } else {
                 LOGGER.warn("Could not parse sort order: {}", data.get(0));
+                this.sortCriteria = List.of();
                 this.orderType = OrderType.ORIGINAL;
                 return;
             }
         }
+        this.orderType = orderType;
 
+        List<SortCriterion> sortCriteria = new ArrayList<>(data.size() / 2);
         for (int index = 1; index < data.size(); index = index + 2) {
             sortCriteria.add(new SortCriterion(FieldFactory.parseField(data.get(index)), data.get(index + 1)));
         }
+        this.sortCriteria = sortCriteria;
     }
 
-    public static SaveOrderConfig parse(List<String> orderedData) {
-        return new SaveOrderConfig(orderedData);
+    public static SaveOrder parse(List<String> orderedData) {
+        return new SaveOrder(orderedData);
     }
 
-    public static SaveOrderConfig getDefaultSaveOrder() {
-        SaveOrderConfig standard = new SaveOrderConfig();
-        standard.orderType = OrderType.ORIGINAL;
-        return standard;
+    public static SelfContainedSaveOrder getDefaultSaveOrder() {
+        return new SelfContainedSaveOrder(OrderType.ORIGINAL, List.of());
     }
 
     public OrderType getOrderType() {
@@ -107,7 +84,7 @@ public boolean equals(Object o) {
         if (this == o) {
             return true;
         }
-        if (o instanceof SaveOrderConfig that) {
+        if (o instanceof SaveOrder that) {
             return Objects.equals(sortCriteria, that.sortCriteria) &&
                     Objects.equals(orderType, that.orderType);
         }
@@ -131,11 +108,7 @@ public String toString() {
      */
     public List<String> getAsStringList() {
         List<String> res = new ArrayList<>(7);
-        if (orderType == OrderType.ORIGINAL) {
-            res.add(OrderType.ORIGINAL.toString());
-        } else {
-            res.add(OrderType.SPECIFIED.toString());
-        }
+        res.add(orderType.toString());
 
         for (SortCriterion sortCriterion : sortCriteria) {
             res.add(sortCriterion.field.getName());
@@ -147,12 +120,18 @@ public List<String> getAsStringList() {
 
     public static class SortCriterion {
 
-        public Field field;
+        public final Field field;
 
-        public boolean descending;
+        public final boolean descending;
+
+        /**
+         * Given field sorted ascending
+         */
+        public SortCriterion(Field field) {
+            this(field, false);
+        }
 
         /**
-         *
          * @param field The field
          * @param descending Must be a boolean value as string, e.g. "true", "false"
          */
@@ -166,9 +145,6 @@ public SortCriterion(Field field, boolean descending) {
             this.descending = descending;
         }
 
-        public SortCriterion() {
-        }
-
         @Override
         public String toString() {
             return "SortCriterion{" + "field='" + field + '\'' +
@@ -194,4 +170,32 @@ public int hashCode() {
             return Objects.hash(field, descending);
         }
     }
+
+    public enum OrderType {
+        SPECIFIED("specified"),
+        ORIGINAL("original"),
+        TABLE("table");
+
+        private final String name;
+
+        OrderType(String name) {
+            this.name = name;
+        }
+
+        @Override
+        public String toString() {
+            return name;
+        }
+
+        public static SaveOrder.OrderType fromBooleans(boolean saveInSpecifiedOrder, boolean saveInOriginalOrder) {
+            SaveOrder.OrderType orderType = SaveOrder.OrderType.TABLE;
+            if (saveInSpecifiedOrder) {
+                orderType = SaveOrder.OrderType.SPECIFIED;
+            } else if (saveInOriginalOrder) {
+                orderType = SaveOrder.OrderType.ORIGINAL;
+            }
+
+            return orderType;
+        }
+    }
 }
diff --git a/src/main/java/org/jabref/model/metadata/SelfContainedSaveOrder.java b/src/main/java/org/jabref/model/metadata/SelfContainedSaveOrder.java
new file mode 100644
index 00000000000..4b5cafc6b9c
--- /dev/null
+++ b/src/main/java/org/jabref/model/metadata/SelfContainedSaveOrder.java
@@ -0,0 +1,41 @@
+package org.jabref.model.metadata;
+
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * With this class, the user of an instance can directly sort things. Without looking up anything in the preferences or in the UI.
+ *
+ * To avoid confusion at the caller, we offer ORIGINAL and SPECIFIED only. Not TABLE.
+ */
+public class SelfContainedSaveOrder extends SaveOrder {
+
+    public static final Logger LOGGER = LoggerFactory.getLogger(SelfContainedSaveOrder.class);
+
+    public SelfContainedSaveOrder(OrderType orderType, List<SortCriterion> sortCriteria) {
+        super(orderType, sortCriteria);
+        if (orderType == OrderType.TABLE) {
+            LOGGER.debug("TABLE with sort criteria {}", sortCriteria);
+            throw new IllegalArgumentException("TABLE might require external lookup.");
+        }
+    }
+
+    /**
+     * Converts a SaveOrder to a SelfContainedSaveOrder
+     *
+     * @throws IllegalArgumentException if {@code saveOrder} has {@link OrderType#TABLE}
+     */
+    public static SelfContainedSaveOrder of(SaveOrder saveOrder) {
+        if (saveOrder instanceof SelfContainedSaveOrder order) {
+            return order;
+        }
+        if ((saveOrder.getOrderType() == OrderType.TABLE) && (!saveOrder.getSortCriteria().isEmpty())) {
+            // We map from TABLE to SPECIFIED to have the users of this class just to `switch` between
+            //   ORIGINAL and SPECIFIED
+            return new SelfContainedSaveOrder(OrderType.SPECIFIED, saveOrder.getSortCriteria());
+        }
+        return new SelfContainedSaveOrder(saveOrder.getOrderType(), saveOrder.getSortCriteria());
+    }
+}
diff --git a/src/main/java/org/jabref/model/openoffice/CitationEntry.java b/src/main/java/org/jabref/model/openoffice/CitationEntry.java
index 0d702c860ab..a662563b0b2 100644
--- a/src/main/java/org/jabref/model/openoffice/CitationEntry.java
+++ b/src/main/java/org/jabref/model/openoffice/CitationEntry.java
@@ -41,8 +41,7 @@ public boolean equals(Object object) {
         if (this == object) {
             return true;
         }
-        if (object instanceof CitationEntry) {
-            CitationEntry other = (CitationEntry) object;
+        if (object instanceof CitationEntry other) {
             return Objects.equals(this.refMarkName, other.refMarkName);
         }
         return false;
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 9c6190553a5..eb34293fe60 100644
--- a/src/main/java/org/jabref/model/openoffice/ootext/OOTextIntoOO.java
+++ b/src/main/java/org/jabref/model/openoffice/ootext/OOTextIntoOO.java
@@ -688,13 +688,13 @@ private static List<OOPair<String, Object>> setCharEscapement(Optional<Short> va
                                                                   boolean relative,
                                                                   MyPropertyStack formatStack) {
         List<OOPair<String, Object>> settings = new ArrayList<>();
-        Optional<Short> oldValue = (formatStack
+        Optional<Short> oldValue = formatStack
                 .getPropertyValue(CHAR_ESCAPEMENT)
-                .map(e -> (short) e));
+                .map(e -> (short) e);
 
-        Optional<Byte> oldHeight = (formatStack
+        Optional<Byte> oldHeight = formatStack
                 .getPropertyValue(CHAR_ESCAPEMENT_HEIGHT)
-                .map(e -> (byte) e));
+                .map(e -> (byte) e);
 
         if (relative && (value.isPresent() || height.isPresent())) {
             double oldHeightFloat = oldHeight.orElse(CHAR_ESCAPEMENT_HEIGHT_DEFAULT) * 0.01;
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 c3831d93f35..12c340376c3 100644
--- a/src/main/java/org/jabref/model/openoffice/rangesort/FunctionalTextViewCursor.java
+++ b/src/main/java/org/jabref/model/openoffice/rangesort/FunctionalTextViewCursor.java
@@ -87,7 +87,7 @@ public static OOResult<FunctionalTextViewCursor, String> get(XTextDocument doc)
         }
 
         if (initialSelection == null) {
-            String errorMessage = ("Selection is not available: cannot provide a functional view cursor");
+            String errorMessage = "Selection is not available: cannot provide a functional view cursor";
             return OOResult.error(errorMessage);
         } else if (Arrays.stream(initialSelection.getSupportedServiceNames())
                          .noneMatch("com.sun.star.text.TextRanges"::equals)) {
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 a5cb13fb4f0..8108befdbd3 100644
--- a/src/main/java/org/jabref/model/openoffice/rangesort/RangeOverlapBetween.java
+++ b/src/main/java/org/jabref/model/openoffice/rangesort/RangeOverlapBetween.java
@@ -76,14 +76,14 @@ List<RangeOverlap<V>> findFirst(XTextDocument doc,
                 }
 
                 boolean equal = UnoTextRange.compareStartsThenEndsUnsafe(cmp, aRange, bRange) == 0;
-                boolean touching = (abEndToStart == 0 || baEndToStart == 0);
+                boolean touching = abEndToStart == 0 || baEndToStart == 0;
 
                 // In case of two equal collapsed ranges there is an ambiguity : TOUCH or EQUAL_RANGE ?
                 //
                 // We return EQUAL_RANGE
-                RangeOverlapKind kind = (equal ? RangeOverlapKind.EQUAL_RANGE
+                RangeOverlapKind kind = equal ? RangeOverlapKind.EQUAL_RANGE
                         : (touching ? RangeOverlapKind.TOUCH
-                        : RangeOverlapKind.OVERLAP));
+                        : RangeOverlapKind.OVERLAP);
 
                 List<V> valuesForOverlappingRanges = new ArrayList<>();
                 valuesForOverlappingRanges.add(aHolder);
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 77982a9a7db..9657f90a212 100644
--- a/src/main/java/org/jabref/model/openoffice/rangesort/RangeSort.java
+++ b/src/main/java/org/jabref/model/openoffice/rangesort/RangeSort.java
@@ -30,8 +30,8 @@ private static class HolderComparatorWithinPartition implements Comparator<Range
         private final XTextRangeCompare cmp;
 
         HolderComparatorWithinPartition(XText text) {
-            cmp = (UnoCast.cast(XTextRangeCompare.class, text)
-                          .orElseThrow(java.lang.IllegalArgumentException::new));
+            cmp = UnoCast.cast(XTextRangeCompare.class, text)
+                          .orElseThrow(java.lang.IllegalArgumentException::new);
         }
 
         /**
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 899013773f2..54bfb937572 100644
--- a/src/main/java/org/jabref/model/openoffice/style/Citation.java
+++ b/src/main/java/org/jabref/model/openoffice/style/Citation.java
@@ -70,17 +70,17 @@ public Optional<BibEntry> getBibEntry() {
     }
 
     public static Optional<CitationLookupResult> lookup(BibDatabase database, String key) {
-        return (database
+        return database
                 .getEntryByCitationKey(key)
-                .map(bibEntry -> new CitationLookupResult(bibEntry, database)));
+                .map(bibEntry -> new CitationLookupResult(bibEntry, database));
     }
 
     public static Optional<CitationLookupResult> lookup(List<BibDatabase> databases, String key) {
-        return (databases.stream()
+        return databases.stream()
                          .map(database -> Citation.lookup(database, key))
                          .filter(Optional::isPresent)
                          .map(Optional::get)
-                         .findFirst());
+                         .findFirst();
     }
 
     public void lookupInDatabases(List<BibDatabase> databases) {
diff --git a/src/main/java/org/jabref/model/openoffice/style/CitationType.java b/src/main/java/org/jabref/model/openoffice/style/CitationType.java
index 567996ec56e..55c1d7c50ed 100644
--- a/src/main/java/org/jabref/model/openoffice/style/CitationType.java
+++ b/src/main/java/org/jabref/model/openoffice/style/CitationType.java
@@ -17,7 +17,7 @@ public boolean inParenthesis() {
     }
 
     public boolean withText() {
-        return (this != INVISIBLE_CIT);
+        return this != INVISIBLE_CIT;
     }
 }
 
diff --git a/src/main/java/org/jabref/model/openoffice/style/CompareCitedKey.java b/src/main/java/org/jabref/model/openoffice/style/CompareCitedKey.java
index 7f6d3adfab0..e8a99e6980b 100644
--- a/src/main/java/org/jabref/model/openoffice/style/CompareCitedKey.java
+++ b/src/main/java/org/jabref/model/openoffice/style/CompareCitedKey.java
@@ -22,7 +22,7 @@ public class CompareCitedKey implements Comparator<ComparableCitedKey> {
     public int compare(ComparableCitedKey a, ComparableCitedKey b) {
         Optional<BibEntry> aBibEntry = a.getBibEntry();
         Optional<BibEntry> bBibEntry = b.getBibEntry();
-        final int mul = unresolvedComesFirst ? (+1) : (-1);
+        final int mul = unresolvedComesFirst ? (+1) : -1;
 
         if (aBibEntry.isEmpty() && bBibEntry.isEmpty()) {
             // Both are unresolved: compare them by citation key.
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 f187527aeab..5f4f5ea40d7 100644
--- a/src/main/java/org/jabref/model/openoffice/uno/UnoBookmark.java
+++ b/src/main/java/org/jabref/model/openoffice/uno/UnoBookmark.java
@@ -44,7 +44,7 @@ public static Optional<XTextRange> getAnchor(XTextDocument doc, String name)
             NoDocumentException {
 
         XNameAccess nameAccess = getNameAccess(doc);
-        return (UnoNameAccess.getTextContentByName(nameAccess, name).map(XTextContent::getAnchor));
+        return UnoNameAccess.getTextContentByName(nameAccess, name).map(XTextContent::getAnchor);
     }
 
     /**
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 da29ee84d92..2bca7a1ff19 100644
--- a/src/main/java/org/jabref/model/openoffice/uno/UnoCursor.java
+++ b/src/main/java/org/jabref/model/openoffice/uno/UnoCursor.java
@@ -18,9 +18,9 @@ private UnoCursor() {
      * Get the cursor positioned by the user.
      */
     public static Optional<XTextViewCursor> getViewCursor(XTextDocument doc) {
-        return (UnoTextDocument.getCurrentController(doc)
+        return UnoTextDocument.getCurrentController(doc)
                                .flatMap(e -> UnoCast.cast(XTextViewCursorSupplier.class, e))
-                               .map(XTextViewCursorSupplier::getViewCursor));
+                               .map(XTextViewCursorSupplier::getViewCursor);
     }
 
     /**
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 b9f43e56f80..d3bf46668d1 100644
--- a/src/main/java/org/jabref/model/openoffice/uno/UnoNamed.java
+++ b/src/main/java/org/jabref/model/openoffice/uno/UnoNamed.java
@@ -39,13 +39,13 @@ static XNamed insertNamedTextContent(XTextDocument doc,
             throw new CreationException(e.getMessage());
         }
 
-        XNamed xNamed = (UnoCast.cast(XNamed.class, xObject)
-                                .orElseThrow(() -> new IllegalArgumentException("Service is not an XNamed")));
+        XNamed xNamed = UnoCast.cast(XNamed.class, xObject)
+                                .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")));
+        XTextContent xTextContent = UnoCast.cast(XTextContent.class, xObject)
+                                            .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 80ea0c11c80..bca3d90ab6c 100644
--- a/src/main/java/org/jabref/model/openoffice/uno/UnoProperties.java
+++ b/src/main/java/org/jabref/model/openoffice/uno/UnoProperties.java
@@ -27,8 +27,8 @@ public static Optional<XPropertySet> asPropertySet(XPropertyContainer propertyCo
     }
 
     public static Optional<XPropertySetInfo> getPropertySetInfo(XPropertySet propertySet) {
-        return (Optional.ofNullable(propertySet)
-                        .flatMap(e -> Optional.ofNullable(e.getPropertySetInfo())));
+        return Optional.ofNullable(propertySet)
+                        .flatMap(e -> Optional.ofNullable(e.getPropertySetInfo()));
     }
 
     public static Optional<XPropertySetInfo> getPropertySetInfo(XPropertyContainer propertyContainer) {
@@ -37,9 +37,9 @@ public static Optional<XPropertySetInfo> getPropertySetInfo(XPropertyContainer p
 
     public static List<String> getPropertyNames(Property[] properties) {
         Objects.requireNonNull(properties);
-        return (Arrays.stream(properties)
+        return Arrays.stream(properties)
                       .map(p -> p.Name)
-                      .collect(Collectors.toList()));
+                      .collect(Collectors.toList());
     }
 
     public static List<String> getPropertyNames(XPropertySetInfo propertySetInfo) {
@@ -51,9 +51,9 @@ public static List<String> getPropertyNames(XPropertySet propertySet) {
     }
 
     public static List<String> getPropertyNames(XPropertyContainer propertyContainer) {
-        return (asPropertySet(propertyContainer)
+        return asPropertySet(propertyContainer)
                 .map(UnoProperties::getPropertyNames)
-                .orElse(new ArrayList<>()));
+                .orElse(new ArrayList<>());
     }
 
     public static Optional<Object> getValueAsObject(XPropertySet propertySet, String property)
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 062564b8156..12e36fae46a 100644
--- a/src/main/java/org/jabref/model/openoffice/uno/UnoReferenceMark.java
+++ b/src/main/java/org/jabref/model/openoffice/uno/UnoReferenceMark.java
@@ -98,8 +98,8 @@ public static Optional<XTextRange> getAnchor(XTextDocument doc, String name)
             throws
             NoDocumentException,
             WrappedTargetException {
-        return (UnoReferenceMark.getAsTextContent(doc, name)
-                                .map(XTextContent::getAnchor));
+        return UnoReferenceMark.getAsTextContent(doc, name)
+                                .map(XTextContent::getAnchor);
     }
 
     /**
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 aa659919fab..5aba2010aac 100644
--- a/src/main/java/org/jabref/model/openoffice/uno/UnoStyle.java
+++ b/src/main/java/org/jabref/model/openoffice/uno/UnoStyle.java
@@ -59,8 +59,8 @@ public static Optional<String> getInternalNameOfStyle(XTextDocument doc, String
                                                           String name)
             throws
             WrappedTargetException {
-        return (getStyleFromFamily(doc, familyName, name)
-                .map(XStyle::getName));
+        return getStyleFromFamily(doc, familyName, name)
+                .map(XStyle::getName);
     }
 
     public static Optional<String> getInternalNameOfParagraphStyle(XTextDocument doc, String 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 6abe3959f29..200f7be55df 100644
--- a/src/main/java/org/jabref/model/openoffice/uno/UnoTextDocument.java
+++ b/src/main/java/org/jabref/model/openoffice/uno/UnoTextDocument.java
@@ -78,9 +78,9 @@ public static Optional<String> getFrameTitle(XTextDocument doc) {
     }
 
     static Optional<XDocumentProperties> getDocumentProperties(XTextDocument doc) {
-        return (Optional.ofNullable(doc)
+        return Optional.ofNullable(doc)
                         .flatMap(e -> UnoCast.cast(XDocumentPropertiesSupplier.class, e))
-                        .map(XDocumentPropertiesSupplier::getDocumentProperties));
+                        .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 520878833e5..883ab8de1fc 100644
--- a/src/main/java/org/jabref/model/openoffice/uno/UnoTextRange.java
+++ b/src/main/java/org/jabref/model/openoffice/uno/UnoTextRange.java
@@ -37,7 +37,7 @@ public static boolean comparables(XTextRange a, XTextRange b) {
      * 1 if  (a &gt; b); (-1) if (a &lt; b)
      */
     public static int compareStartsUnsafe(XTextRangeCompare compare, XTextRange a, XTextRange b) {
-        return (-1) * compare.compareRegionStarts(a, b);
+        return -1 * compare.compareRegionStarts(a, b);
     }
 
     public static int compareStarts(XTextRange a, XTextRange b) {
@@ -57,7 +57,7 @@ public static int compareEnds(XTextRange a, XTextRange b) {
             throw new java.lang.IllegalArgumentException("compareEnds: got incomparable regions");
         }
         final XTextRangeCompare compare = UnoCast.cast(XTextRangeCompare.class, a.getText()).get();
-        return (-1) * compare.compareRegionEnds(a, b);
+        return -1 * compare.compareRegionEnds(a, b);
     }
 
     /*
@@ -66,9 +66,9 @@ public static int compareEnds(XTextRange a, XTextRange b) {
     public static int compareStartsThenEndsUnsafe(XTextRangeCompare compare, XTextRange a, XTextRange b) {
         int res = compare.compareRegionStarts(a, b);
         if (res != 0) {
-            return (-1) * res;
+            return -1 * res;
         }
-        return (-1) * compare.compareRegionEnds(a, b);
+        return -1 * compare.compareRegionEnds(a, b);
     }
 
     public static int compareStartsThenEnds(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 56293eee947..1717795cfa7 100644
--- a/src/main/java/org/jabref/model/openoffice/uno/UnoTextSection.java
+++ b/src/main/java/org/jabref/model/openoffice/uno/UnoTextSection.java
@@ -58,7 +58,7 @@ public static Optional<XTextRange> getAnchor(XTextDocument doc, String name)
             NoDocumentException {
 
         XNameAccess nameAccess = getNameAccess(doc);
-        return (UnoNameAccess.getTextContentByName(nameAccess, name).map(XTextContent::getAnchor));
+        return UnoNameAccess.getTextContentByName(nameAccess, name).map(XTextContent::getAnchor);
     }
 
     /**
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 bd1f85e1690..9de5e149130 100644
--- a/src/main/java/org/jabref/model/openoffice/uno/UnoUndo.java
+++ b/src/main/java/org/jabref/model/openoffice/uno/UnoUndo.java
@@ -17,8 +17,8 @@ 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));
+        return UnoCast.cast(XUndoManagerSupplier.class, doc)
+                       .map(XUndoManagerSupplier::getUndoManager);
     }
 
     /**
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 85158db2d1c..3b6abb75b8e 100644
--- a/src/main/java/org/jabref/model/openoffice/uno/UnoUserDefinedProperty.java
+++ b/src/main/java/org/jabref/model/openoffice/uno/UnoUserDefinedProperty.java
@@ -39,9 +39,9 @@ public static Optional<XPropertyContainer> getPropertyContainer(XTextDocument do
     }
 
     public static List<String> getListOfNames(XTextDocument doc) {
-        return (UnoUserDefinedProperty.getPropertyContainer(doc)
+        return UnoUserDefinedProperty.getPropertyContainer(doc)
                                       .map(UnoProperties::getPropertyNames)
-                                      .orElse(new ArrayList<>()));
+                                      .orElse(new ArrayList<>());
     }
 
     /**
@@ -52,8 +52,8 @@ public static List<String> getListOfNames(XTextDocument doc) {
     public static Optional<String> getStringValue(XTextDocument doc, String property)
             throws
             WrappedTargetException {
-        Optional<XPropertySet> propertySet = (UnoUserDefinedProperty.getPropertyContainer(doc)
-                                                                    .flatMap(UnoProperties::asPropertySet));
+        Optional<XPropertySet> propertySet = UnoUserDefinedProperty.getPropertyContainer(doc)
+                                                                    .flatMap(UnoProperties::asPropertySet);
         if (propertySet.isEmpty()) {
             throw new java.lang.IllegalArgumentException("getting UserDefinedProperties as XPropertySet failed");
         }
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 835b7863485..b4fa07c5d34 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 = "lucene95";
+    public static final String VERSION = "95";
 }
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 71c35a7e33e..ba28e66b133 100644
--- a/src/main/java/org/jabref/model/search/rules/SearchRules.java
+++ b/src/main/java/org/jabref/model/search/rules/SearchRules.java
@@ -44,6 +44,6 @@ static SearchRule getSearchRule(EnumSet<SearchFlags> searchFlags) {
     }
 
     public enum SearchFlags {
-        CASE_SENSITIVE, REGULAR_EXPRESSION, FULLTEXT, KEEP_SEARCH_STRING;
+        CASE_SENSITIVE, REGULAR_EXPRESSION, FULLTEXT, KEEP_SEARCH_STRING
     }
 }
diff --git a/src/main/java/org/jabref/model/strings/StringUtil.java b/src/main/java/org/jabref/model/strings/StringUtil.java
index 2a443306e4d..c85521a5f71 100644
--- a/src/main/java/org/jabref/model/strings/StringUtil.java
+++ b/src/main/java/org/jabref/model/strings/StringUtil.java
@@ -50,9 +50,9 @@ public static String quote(String toQuote, String specials, char quoteChar) {
         for (int i = 0; i < toQuote.length(); ++i) {
             c = toQuote.charAt(i);
 
-            isSpecial = (c == quoteChar);
+            isSpecial = c == quoteChar;
             // If non-null specials performs logic-or with specials.indexOf(c) >= 0
-            isSpecial |= ((specials != null) && (specials.indexOf(c) >= 0));
+            isSpecial |= (specials != null) && (specials.indexOf(c) >= 0);
 
             if (isSpecial) {
                 result.append(quoteChar);
@@ -64,11 +64,6 @@ public static String quote(String toQuote, String specials, char quoteChar) {
 
     /**
      * Creates a substring from a text
-     *
-     * @param text
-     * @param startIndex
-     * @param terminateOnEndBraceOnly
-     * @return
      */
     public static String getPart(String text, int startIndex, boolean terminateOnEndBraceOnly) {
         char c;
@@ -103,11 +98,7 @@ public static String getPart(String text, int startIndex, boolean terminateOnEnd
     /**
      * Returns the string, after shaving off whitespace at the beginning and end,
      * and removing (at most) one pair of braces or " surrounding it.
-     *
-     * @param toShave
-     * @return
      */
-
     public static String shaveString(String toShave) {
         if ((toShave == null) || (toShave.isEmpty())) {
             return "";
@@ -128,11 +119,7 @@ public static String shaveString(String toShave) {
      * String[] s = "ab/cd/ed".split("/"); join(s, "\\", 0, s.length) ->
      * "ab\\cd\\ed"
      *
-     * @param strings
-     * @param separator
-     * @param from
      * @param to        Excluding strings[to]
-     * @return
      */
     public static String join(String[] strings, String separator, int from, int to) {
         if ((strings.length == 0) || (from >= to)) {
@@ -151,9 +138,6 @@ public static String join(String[] strings, String separator, int from, int to)
 
     /**
      * Removes optional square brackets from the string s
-     *
-     * @param toStrip
-     * @return
      */
     public static String stripBrackets(String toStrip) {
         if (isInSquareBrackets(toStrip)) {
@@ -620,7 +604,7 @@ public static String repeat(int n, char c) {
     }
 
     public static boolean isNullOrEmpty(String toTest) {
-        return ((toTest == null) || toTest.isEmpty());
+        return (toTest == null) || toTest.isEmpty();
     }
 
     public static boolean isBlank(String string) {
@@ -761,4 +745,14 @@ public static String quoteStringIfSpaceIsContained(String string) {
     public static boolean containsWhitespace(String s) {
         return s.chars().anyMatch(Character::isWhitespace);
     }
+
+    @ApacheCommonsLang3Allowed("No Guava equivalent existing - see https://stackoverflow.com/a/23825984")
+    public static String removeStringAtTheEnd(String string, String stringToBeRemoved) {
+        return StringUtils.removeEndIgnoreCase(string, stringToBeRemoved);
+    }
+
+    @ApacheCommonsLang3Allowed("No Guava equivalent existing")
+    public static boolean endsWithIgnoreCase(String string, String suffix) {
+        return StringUtils.endsWithIgnoreCase(string, suffix);
+    }
 }
diff --git a/src/main/java/org/jabref/model/strings/UnicodeToReadableCharMap.java b/src/main/java/org/jabref/model/strings/UnicodeToReadableCharMap.java
index b00022206b7..3e720b900ee 100644
--- a/src/main/java/org/jabref/model/strings/UnicodeToReadableCharMap.java
+++ b/src/main/java/org/jabref/model/strings/UnicodeToReadableCharMap.java
@@ -208,6 +208,10 @@ public UnicodeToReadableCharMap() {
         put("\u01EB", "o");
         put("\u1E0C", "D");
         put("\u1E0D", "d");
+        put("\u1E1A", "E"); // "~" subscript
+        put("\u1E1B", "e");
+        put("\u1E2C", "I");
+        put("\u1E2D", "i");
         put("\u1E24", "H");
         put("\u1E25", "h");
         put("\u1E36", "L");
@@ -226,6 +230,21 @@ public UnicodeToReadableCharMap() {
         put("\u1E63", "s");
         put("\u1E6C", "T");
         put("\u1E6D", "t");
+        put("\u1E74", "U");
+        put("\u1E75", "u");
+        put("\u1EA2", "A"); // hook
+        put("\u1EA3", "a");
+        put("\u1EBA", "E");
+        put("\u1EBB", "e");
+        put("\u1EC8", "I");
+        put("\u1EC9", "i");
+        put("\u1ECE", "O");
+        put("\u1ECF", "o");
+        put("\u1EE6", "U");
+        put("\u1EE7", "u");
+        put("\u1EF6", "Y");
+        put("\u1EF7", "y");
+
         put("\u00CF", "I");
 
         put("\u008C", "AE"); // doesn't work?
diff --git a/src/main/java/org/jabref/model/study/StudyDatabase.java b/src/main/java/org/jabref/model/study/StudyDatabase.java
index 375b59fb57c..dc035d558b1 100644
--- a/src/main/java/org/jabref/model/study/StudyDatabase.java
+++ b/src/main/java/org/jabref/model/study/StudyDatabase.java
@@ -1,7 +1,7 @@
 package org.jabref.model.study;
 
 /**
- * data model for the view {@link org.jabref.gui.slr.StudyDatabaseItem}
+ * data model for the view {@link org.jabref.gui.slr.StudyCatalogItem}
  */
 public class StudyDatabase {
     private String name;
diff --git a/src/main/java/org/jabref/preferences/AppearancePreferences.java b/src/main/java/org/jabref/preferences/AppearancePreferences.java
deleted file mode 100644
index f1dc8782c2d..00000000000
--- a/src/main/java/org/jabref/preferences/AppearancePreferences.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package org.jabref.preferences;
-
-import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.IntegerProperty;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.SimpleBooleanProperty;
-import javafx.beans.property.SimpleIntegerProperty;
-import javafx.beans.property.SimpleObjectProperty;
-
-import org.jabref.gui.theme.Theme;
-
-public class AppearancePreferences {
-    private final BooleanProperty shouldOverrideDefaultFontSize;
-    private final IntegerProperty mainFontSize;
-    private final IntegerProperty defaultFontSize;
-    private final ObjectProperty<Theme> theme;
-
-    public AppearancePreferences(boolean shouldOverrideDefaultFontSize, int mainFontSize, int defaultFontSize, Theme theme) {
-        this.shouldOverrideDefaultFontSize = new SimpleBooleanProperty(shouldOverrideDefaultFontSize);
-        this.mainFontSize = new SimpleIntegerProperty(mainFontSize);
-        this.defaultFontSize = new SimpleIntegerProperty(defaultFontSize);
-        this.theme = new SimpleObjectProperty<>(theme);
-    }
-
-    public boolean shouldOverrideDefaultFontSize() {
-        return shouldOverrideDefaultFontSize.get();
-    }
-
-    public void setShouldOverrideDefaultFontSize(boolean newValue) {
-        shouldOverrideDefaultFontSize.set(newValue);
-    }
-
-    public BooleanProperty shouldOverrideDefaultFontSizeProperty() {
-        return shouldOverrideDefaultFontSize;
-    }
-
-    public int getMainFontSize() {
-        return mainFontSize.get();
-    }
-
-    public int getDefaultFontSize() {
-        return defaultFontSize.get();
-    }
-
-    public void setMainFontSize(int mainFontSize) {
-        this.mainFontSize.set(mainFontSize);
-    }
-
-    public IntegerProperty mainFontSizeProperty() {
-        return mainFontSize;
-    }
-
-    public Theme getTheme() {
-        return theme.get();
-    }
-
-    public void setTheme(Theme theme) {
-        this.theme.set(theme);
-    }
-
-    public ObjectProperty<Theme> themeProperty() {
-        return theme;
-    }
-}
diff --git a/src/main/java/org/jabref/preferences/CleanupPreferences.java b/src/main/java/org/jabref/preferences/CleanupPreferences.java
index 516fd09e2d6..cf3b24491fa 100644
--- a/src/main/java/org/jabref/preferences/CleanupPreferences.java
+++ b/src/main/java/org/jabref/preferences/CleanupPreferences.java
@@ -80,6 +80,7 @@ public enum CleanupStep {
          */
         CLEAN_UP_DOI,
         CLEANUP_EPRINT,
+        CLEAN_UP_URL,
         MAKE_PATHS_RELATIVE,
         RENAME_PDF,
         RENAME_PDF_ONLY_RELATIVE_PATHS,
diff --git a/src/main/java/org/jabref/preferences/ExportPreferences.java b/src/main/java/org/jabref/preferences/ExportPreferences.java
new file mode 100644
index 00000000000..85e1129410e
--- /dev/null
+++ b/src/main/java/org/jabref/preferences/ExportPreferences.java
@@ -0,0 +1,78 @@
+package org.jabref.preferences;
+
+import java.nio.file.Path;
+import java.util.List;
+
+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.logic.exporter.TemplateExporter;
+import org.jabref.model.metadata.SaveOrder;
+
+public class ExportPreferences {
+
+    private final StringProperty lastExportExtension;
+    private final ObjectProperty<Path> exportWorkingDirectory;
+    private final ObjectProperty<SaveOrder> exportSaveOrder;
+    private final ObservableList<TemplateExporter> customExporters;
+
+    public ExportPreferences(String lastExportExtension,
+                             Path exportWorkingDirectory,
+                             SaveOrder exportSaveOrder,
+                             List<TemplateExporter> customExporters) {
+
+        this.lastExportExtension = new SimpleStringProperty(lastExportExtension);
+        this.exportWorkingDirectory = new SimpleObjectProperty<>(exportWorkingDirectory);
+        this.exportSaveOrder = new SimpleObjectProperty<>(exportSaveOrder);
+        this.customExporters = FXCollections.observableList(customExporters);
+    }
+
+    public String getLastExportExtension() {
+        return lastExportExtension.get();
+    }
+
+    public StringProperty lastExportExtensionProperty() {
+        return lastExportExtension;
+    }
+
+    public void setLastExportExtension(String lastExportExtension) {
+        this.lastExportExtension.set(lastExportExtension);
+    }
+
+    public Path getExportWorkingDirectory() {
+        return exportWorkingDirectory.get();
+    }
+
+    public ObjectProperty<Path> exportWorkingDirectoryProperty() {
+        return exportWorkingDirectory;
+    }
+
+    public void setExportWorkingDirectory(Path exportWorkingDirectory) {
+        this.exportWorkingDirectory.set(exportWorkingDirectory);
+    }
+
+    public SaveOrder getExportSaveOrder() {
+        return exportSaveOrder.get();
+    }
+
+    public ObjectProperty<SaveOrder> exportSaveOrderProperty() {
+        return exportSaveOrder;
+    }
+
+    public void setExportSaveOrder(SaveOrder exportSaveOrder) {
+        this.exportSaveOrder.set(exportSaveOrder);
+    }
+
+    public ObservableList<TemplateExporter> getCustomExporters() {
+        return customExporters;
+    }
+
+    public void setCustomExporters(List<TemplateExporter> exporters) {
+        customExporters.clear();
+        customExporters.addAll(exporters);
+    }
+}
diff --git a/src/main/java/org/jabref/preferences/ExternalApplicationsPreferences.java b/src/main/java/org/jabref/preferences/ExternalApplicationsPreferences.java
index 1f7e3399c95..94be5b71307 100644
--- a/src/main/java/org/jabref/preferences/ExternalApplicationsPreferences.java
+++ b/src/main/java/org/jabref/preferences/ExternalApplicationsPreferences.java
@@ -14,6 +14,7 @@ public class ExternalApplicationsPreferences {
     private final StringProperty customTerminalCommand;
     private final BooleanProperty useCustomFileBrowser;
     private final StringProperty customFileBrowserCommand;
+    private final StringProperty kindleEmail;
 
     public ExternalApplicationsPreferences(String eMailSubject,
                                            boolean shouldAutoOpenEmailAttachmentsFolder,
@@ -21,7 +22,8 @@ public ExternalApplicationsPreferences(String eMailSubject,
                                            boolean useCustomTerminal,
                                            String customTerminalCommand,
                                            boolean useCustomFileBrowser,
-                                           String customFileBrowserCommand) {
+                                           String customFileBrowserCommand,
+                                           String kindleEmail) {
 
         this.eMailSubject = new SimpleStringProperty(eMailSubject);
         this.shouldAutoOpenEmailAttachmentsFolder = new SimpleBooleanProperty(shouldAutoOpenEmailAttachmentsFolder);
@@ -30,6 +32,7 @@ public ExternalApplicationsPreferences(String eMailSubject,
         this.customTerminalCommand = new SimpleStringProperty(customTerminalCommand);
         this.useCustomFileBrowser = new SimpleBooleanProperty(useCustomFileBrowser);
         this.customFileBrowserCommand = new SimpleStringProperty(customFileBrowserCommand);
+        this.kindleEmail = new SimpleStringProperty(kindleEmail);
     }
 
     public String getEmailSubject() {
@@ -115,4 +118,16 @@ public StringProperty customFileBrowserCommandProperty() {
     public void setCustomFileBrowserCommand(String customFileBrowserCommand) {
         this.customFileBrowserCommand.set(customFileBrowserCommand);
     }
+
+    public String getKindleEmail() {
+        return kindleEmail.get();
+    }
+
+    public StringProperty kindleEmailProperty() {
+        return kindleEmail;
+    }
+
+    public void setKindleEmail(String kindleEmail) {
+        this.kindleEmail.set(kindleEmail);
+    }
 }
diff --git a/src/main/java/org/jabref/preferences/FilePreferences.java b/src/main/java/org/jabref/preferences/FilePreferences.java
index 264d778aeda..e937943fcca 100644
--- a/src/main/java/org/jabref/preferences/FilePreferences.java
+++ b/src/main/java/org/jabref/preferences/FilePreferences.java
@@ -18,11 +18,14 @@
 import org.jabref.gui.externalfiletype.ExternalFileType;
 import org.jabref.model.strings.StringUtil;
 
+/**
+ *  Preferences for the linked files
+ */
 public class FilePreferences {
 
     public static final String[] DEFAULT_FILENAME_PATTERNS = new String[] {"[bibtexkey]", "[bibtexkey] - [title]"};
 
-    private final StringProperty user = new SimpleStringProperty();
+    private final StringProperty userAndHost = new SimpleStringProperty();
     private final SimpleStringProperty mainFileDirectory = new SimpleStringProperty();
     private final BooleanProperty storeFilesRelativeToBibFile = new SimpleBooleanProperty();
     private final StringProperty fileNamePattern = new SimpleStringProperty();
@@ -31,8 +34,10 @@ public class FilePreferences {
     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)));
+    private final BooleanProperty createBackup = new SimpleBooleanProperty();
+    private final ObjectProperty<Path> backupDirectory = new SimpleObjectProperty<>();
 
-    public FilePreferences(String user,
+    public FilePreferences(String userAndHost,
                            String mainFileDirectory,
                            boolean storeFilesRelativeToBibFile,
                            String fileNamePattern,
@@ -40,8 +45,10 @@ public FilePreferences(String user,
                            boolean downloadLinkedFiles,
                            boolean fulltextIndexLinkedFiles,
                            Path workingDirectory,
-                           Set<ExternalFileType> externalFileTypes) {
-        this.user.setValue(user);
+                           Set<ExternalFileType> externalFileTypes,
+                           boolean createBackup,
+                           Path backupDirectory) {
+        this.userAndHost.setValue(userAndHost);
         this.mainFileDirectory.setValue(mainFileDirectory);
         this.storeFilesRelativeToBibFile.setValue(storeFilesRelativeToBibFile);
         this.fileNamePattern.setValue(fileNamePattern);
@@ -50,10 +57,12 @@ public FilePreferences(String user,
         this.fulltextIndexLinkedFiles.setValue(fulltextIndexLinkedFiles);
         this.workingDirectory.setValue(workingDirectory);
         this.externalFileTypes.addAll(externalFileTypes);
+        this.createBackup.setValue(createBackup);
+        this.backupDirectory.setValue(backupDirectory);
     }
 
-    public String getUser() {
-        return user.getValue();
+    public String getUserAndHost() {
+        return userAndHost.getValue();
     }
 
     public Optional<Path> getMainFileDirectory() {
@@ -147,4 +156,28 @@ public void setWorkingDirectory(Path workingDirectory) {
     public ObservableSet<ExternalFileType> getExternalFileTypes() {
         return this.externalFileTypes;
     }
+
+    public void setCreateBackup(boolean createBackup) {
+        this.createBackup.set(createBackup);
+    }
+
+    public boolean shouldCreateBackup() {
+        return this.createBackup.getValue();
+    }
+
+    public BooleanProperty createBackupProperty() {
+        return this.createBackup;
+    }
+
+    public ObjectProperty<Path> backupDirectoryProperty() {
+        return this.backupDirectory;
+    }
+
+    public void setBackupDirectory(Path backupPath) {
+        this.backupDirectory.set(backupPath);
+    }
+
+    public Path getBackupDirectory() {
+        return this.backupDirectory.getValue();
+    }
 }
diff --git a/src/main/java/org/jabref/preferences/GeneralPreferences.java b/src/main/java/org/jabref/preferences/GeneralPreferences.java
deleted file mode 100644
index 62d4971a6d6..00000000000
--- a/src/main/java/org/jabref/preferences/GeneralPreferences.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package org.jabref.preferences;
-
-import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.SimpleBooleanProperty;
-import javafx.beans.property.SimpleObjectProperty;
-
-import org.jabref.logic.l10n.Language;
-import org.jabref.model.database.BibDatabaseMode;
-
-public class GeneralPreferences {
-    private final ObjectProperty<Language> language;
-    private final ObjectProperty<BibDatabaseMode> defaultBibDatabaseMode;
-    private final BooleanProperty warnAboutDuplicatesInInspection;
-    private final BooleanProperty confirmDelete;
-
-    private final BooleanProperty memoryStickMode;
-    private final BooleanProperty showAdvancedHints;
-
-    public GeneralPreferences(Language language,
-                              BibDatabaseMode defaultBibDatabaseMode,
-                              boolean warnAboutDuplicatesInInspection,
-                              boolean confirmDelete,
-                              boolean memoryStickMode,
-                              boolean showAdvancedHints) {
-        this.language = new SimpleObjectProperty<>(language);
-        this.defaultBibDatabaseMode = new SimpleObjectProperty<>(defaultBibDatabaseMode);
-        this.warnAboutDuplicatesInInspection = new SimpleBooleanProperty(warnAboutDuplicatesInInspection);
-        this.confirmDelete = new SimpleBooleanProperty(confirmDelete);
-
-        this.memoryStickMode = new SimpleBooleanProperty(memoryStickMode);
-        this.showAdvancedHints = new SimpleBooleanProperty(showAdvancedHints);
-    }
-
-    public Language getLanguage() {
-        return language.get();
-    }
-
-    public ObjectProperty<Language> languageProperty() {
-        return language;
-    }
-
-    public void setLanguage(Language language) {
-        this.language.set(language);
-    }
-
-    public BibDatabaseMode getDefaultBibDatabaseMode() {
-        return defaultBibDatabaseMode.get();
-    }
-
-    public ObjectProperty<BibDatabaseMode> defaultBibDatabaseModeProperty() {
-        return defaultBibDatabaseMode;
-    }
-
-    public void setDefaultBibDatabaseMode(BibDatabaseMode defaultBibDatabaseMode) {
-        this.defaultBibDatabaseMode.set(defaultBibDatabaseMode);
-    }
-
-    public boolean warnAboutDuplicatesInInspection() {
-        return warnAboutDuplicatesInInspection.get();
-    }
-
-    public BooleanProperty isWarnAboutDuplicatesInInspectionProperty() {
-        return warnAboutDuplicatesInInspection;
-    }
-
-    public void setWarnAboutDuplicatesInInspection(boolean warnAboutDuplicatesInInspection) {
-        this.warnAboutDuplicatesInInspection.set(warnAboutDuplicatesInInspection);
-    }
-
-    public boolean shouldConfirmDelete() {
-        return confirmDelete.get();
-    }
-
-    public BooleanProperty confirmDeleteProperty() {
-        return confirmDelete;
-    }
-
-    public void setConfirmDelete(boolean confirmDelete) {
-        this.confirmDelete.set(confirmDelete);
-    }
-
-    public boolean isMemoryStickMode() {
-        return memoryStickMode.get();
-    }
-
-    public BooleanProperty memoryStickModeProperty() {
-        return memoryStickMode;
-    }
-
-    public void setMemoryStickMode(boolean memoryStickMode) {
-        this.memoryStickMode.set(memoryStickMode);
-    }
-
-    public boolean shouldShowAdvancedHints() {
-        return showAdvancedHints.get();
-    }
-
-    public BooleanProperty showAdvancedHintsProperty() {
-        return showAdvancedHints;
-    }
-
-    public void setShowAdvancedHints(boolean showAdvancedHints) {
-        this.showAdvancedHints.set(showAdvancedHints);
-    }
-}
diff --git a/src/main/java/org/jabref/preferences/GuiPreferences.java b/src/main/java/org/jabref/preferences/GuiPreferences.java
index c868ba3d751..06a948741a1 100644
--- a/src/main/java/org/jabref/preferences/GuiPreferences.java
+++ b/src/main/java/org/jabref/preferences/GuiPreferences.java
@@ -24,6 +24,7 @@ public class GuiPreferences {
     private final DoubleProperty sizeY;
 
     private final BooleanProperty windowMaximised;
+    private final BooleanProperty windowFullScreen;
 
     // the last libraries that were open when jabref closes and should be reopened on startup
     private final ObservableList<String> lastFilesOpened;
@@ -44,6 +45,7 @@ public GuiPreferences(double positionX,
                           double sizeX,
                           double sizeY,
                           boolean windowMaximised,
+                          boolean windowFullScreen,
                           List<String> lastFilesOpened,
                           Path lastFocusedFile,
                           FileHistory fileHistory,
@@ -59,6 +61,7 @@ public GuiPreferences(double positionX,
         this.sizeX = new SimpleDoubleProperty(sizeX);
         this.sizeY = new SimpleDoubleProperty(sizeY);
         this.windowMaximised = new SimpleBooleanProperty(windowMaximised);
+        this.windowFullScreen = new SimpleBooleanProperty(windowFullScreen);
         this.lastFilesOpened = FXCollections.observableArrayList(lastFilesOpened);
         this.lastFocusedFile = new SimpleObjectProperty<>(lastFocusedFile);
         this.lastSelectedIdBasedFetcher = new SimpleStringProperty(lastSelectedIdBasedFetcher);
@@ -132,6 +135,18 @@ public void setWindowMaximised(boolean windowMaximised) {
         this.windowMaximised.set(windowMaximised);
     }
 
+    public BooleanProperty windowFullScreenProperty() {
+        return windowFullScreen;
+    }
+
+    public void setWindowFullScreen(boolean windowFullScreen) {
+        this.windowFullScreen.set(windowFullScreen);
+    }
+
+    public boolean isWindowFullscreen() {
+        return windowFullScreen.get();
+    }
+
     public ObservableList<String> getLastFilesOpened() {
         return lastFilesOpened;
     }
diff --git a/src/main/java/org/jabref/preferences/ImportExportPreferences.java b/src/main/java/org/jabref/preferences/ImportExportPreferences.java
deleted file mode 100644
index 000b644feb7..00000000000
--- a/src/main/java/org/jabref/preferences/ImportExportPreferences.java
+++ /dev/null
@@ -1,165 +0,0 @@
-package org.jabref.preferences;
-
-import java.nio.file.Path;
-
-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;
-
-public class ImportExportPreferences {
-    private final BooleanProperty shouldOpenLastEdited;
-    private final StringProperty nonWrappableFields;
-    private final BooleanProperty resolveStrings;
-    private final StringProperty resolvableFields;
-    private final BooleanProperty alwaysReformatOnSave;
-    private final ObjectProperty<Path> importWorkingDirectory;
-    private final StringProperty lastExportExtension;
-    private final ObjectProperty<Path> exportWorkingDirectory;
-    private final BooleanProperty autoSave;
-    private final BooleanProperty warnAboutDuplicatesOnImport;
-
-    public ImportExportPreferences(boolean shouldOpenLastEdited,
-                                   String nonWrappableFields,
-                                   boolean resolveStrings,
-                                   String resolvableFields,
-                                   boolean alwaysReformatOnSave,
-                                   Path importWorkingDirectory,
-                                   String lastExportExtension,
-                                   Path exportWorkingDirectory,
-                                   boolean autoSave,
-                                   boolean warnAboutDuplicatesOnImport) {
-        this.shouldOpenLastEdited = new SimpleBooleanProperty(shouldOpenLastEdited);
-        this.nonWrappableFields = new SimpleStringProperty(nonWrappableFields);
-        this.resolveStrings = new SimpleBooleanProperty(resolveStrings);
-        this.resolvableFields = new SimpleStringProperty(resolvableFields);
-        this.alwaysReformatOnSave = new SimpleBooleanProperty(alwaysReformatOnSave);
-        this.importWorkingDirectory = new SimpleObjectProperty<>(importWorkingDirectory);
-        this.lastExportExtension = new SimpleStringProperty(lastExportExtension);
-        this.exportWorkingDirectory = new SimpleObjectProperty<>(exportWorkingDirectory);
-        this.autoSave = new SimpleBooleanProperty(autoSave);
-        this.warnAboutDuplicatesOnImport = new SimpleBooleanProperty(warnAboutDuplicatesOnImport);
-    }
-
-    public boolean shouldOpenLastEdited() {
-        return shouldOpenLastEdited.get();
-    }
-
-    public BooleanProperty openLastEditedProperty() {
-        return shouldOpenLastEdited;
-    }
-
-    public void setOpenLastEdited(boolean shouldOpenLastEdited) {
-        this.shouldOpenLastEdited.set(shouldOpenLastEdited);
-    }
-
-    public String getNonWrappableFields() {
-        return nonWrappableFields.get();
-    }
-
-    public StringProperty nonWrappableFieldsProperty() {
-        return nonWrappableFields;
-    }
-
-    public void setNonWrappableFields(String nonWrappableFields) {
-        this.nonWrappableFields.set(nonWrappableFields);
-    }
-
-    public boolean resolveStrings() {
-        return resolveStrings.get();
-    }
-
-    public BooleanProperty resolveStringsProperty() {
-        return resolveStrings;
-    }
-
-    public void setResolveStrings(boolean resolveStrings) {
-        this.resolveStrings.set(resolveStrings);
-    }
-
-    public String getResolvableFields() {
-        return resolvableFields.get();
-    }
-
-    public StringProperty resolvableFieldsProperty() {
-        return resolvableFields;
-    }
-
-    public void setResolvableFields(String resolvableFields) {
-        this.resolvableFields.set(resolvableFields);
-    }
-
-    public boolean shouldAlwaysReformatOnSave() {
-        return alwaysReformatOnSave.get();
-    }
-
-    public BooleanProperty alwaysReformatOnSaveProperty() {
-        return alwaysReformatOnSave;
-    }
-
-    public void setAlwaysReformatOnSave(boolean alwaysReformatOnSave) {
-        this.alwaysReformatOnSave.set(alwaysReformatOnSave);
-    }
-
-    public Path getImportWorkingDirectory() {
-        return importWorkingDirectory.get();
-    }
-
-    public ObjectProperty<Path> importWorkingDirectoryProperty() {
-        return importWorkingDirectory;
-    }
-
-    public void setImportWorkingDirectory(Path importWorkingDirectory) {
-        this.importWorkingDirectory.set(importWorkingDirectory);
-    }
-
-    public String getLastExportExtension() {
-        return lastExportExtension.get();
-    }
-
-    public StringProperty lastExportExtensionProperty() {
-        return lastExportExtension;
-    }
-
-    public void setLastExportExtension(String lastExportExtension) {
-        this.lastExportExtension.set(lastExportExtension);
-    }
-
-    public Path getExportWorkingDirectory() {
-        return exportWorkingDirectory.get();
-    }
-
-    public ObjectProperty<Path> exportWorkingDirectoryProperty() {
-        return exportWorkingDirectory;
-    }
-
-    public void setExportWorkingDirectory(Path exportWorkingDirectory) {
-        this.exportWorkingDirectory.set(exportWorkingDirectory);
-    }
-
-    public boolean shouldAutoSave() {
-        return autoSave.get();
-    }
-
-    public BooleanProperty autoSaveProperty() {
-        return autoSave;
-    }
-
-    public void setAutoSave(boolean shouldAutoSave) {
-        this.autoSave.set(shouldAutoSave);
-    }
-
-    public boolean shouldWarnAboutDuplicatesOnImport() {
-        return warnAboutDuplicatesOnImport.get();
-    }
-
-    public BooleanProperty warnAboutDuplicatesOnImportProperty() {
-        return warnAboutDuplicatesOnImport;
-    }
-
-    public void setWarnAboutDuplicatesOnImport(boolean warnAboutDuplicatesOnImport) {
-        this.warnAboutDuplicatesOnImport.set(warnAboutDuplicatesOnImport);
-    }
-}
diff --git a/src/main/java/org/jabref/preferences/InternalPreferences.java b/src/main/java/org/jabref/preferences/InternalPreferences.java
index be26c95a8b3..0276dc88ca0 100644
--- a/src/main/java/org/jabref/preferences/InternalPreferences.java
+++ b/src/main/java/org/jabref/preferences/InternalPreferences.java
@@ -2,7 +2,9 @@
 
 import java.nio.file.Path;
 
+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;
@@ -12,13 +14,21 @@
 public class InternalPreferences {
 
     private final ObjectProperty<Version> ignoredVersion;
+    private final BooleanProperty versionCheckEnabled;
     private final ObjectProperty<Path> lastPreferencesExportPath;
-    private final StringProperty user;
+    private final StringProperty userAndHost;
+    private final BooleanProperty memoryStickMode;
 
-    public InternalPreferences(Version ignoredVersion, Path exportPath, String user) {
+    public InternalPreferences(Version ignoredVersion,
+                               boolean versionCheck,
+                               Path exportPath,
+                               String userAndHost,
+                               boolean memoryStickMode) {
         this.ignoredVersion = new SimpleObjectProperty<>(ignoredVersion);
+        this.versionCheckEnabled = new SimpleBooleanProperty(versionCheck);
         this.lastPreferencesExportPath = new SimpleObjectProperty<>(exportPath);
-        this.user = new SimpleStringProperty(user);
+        this.userAndHost = new SimpleStringProperty(userAndHost);
+        this.memoryStickMode = new SimpleBooleanProperty(memoryStickMode);
     }
 
     public Version getIgnoredVersion() {
@@ -33,6 +43,18 @@ public void setIgnoredVersion(Version ignoredVersion) {
         this.ignoredVersion.set(ignoredVersion);
     }
 
+    public boolean isVersionCheckEnabled() {
+        return versionCheckEnabled.get();
+    }
+
+    public BooleanProperty versionCheckEnabledProperty() {
+        return versionCheckEnabled;
+    }
+
+    public void setVersionCheckEnabled(boolean versionCheckEnabled) {
+        this.versionCheckEnabled.set(versionCheckEnabled);
+    }
+
     public Path getLastPreferencesExportPath() {
         return lastPreferencesExportPath.get();
     }
@@ -45,7 +67,19 @@ public void setLastPreferencesExportPath(Path lastPreferencesExportPath) {
         this.lastPreferencesExportPath.set(lastPreferencesExportPath);
     }
 
-    public String getUser() {
-        return user.get();
+    public String getUserAndHost() {
+        return userAndHost.get();
+    }
+
+    public boolean isMemoryStickMode() {
+        return memoryStickMode.get();
+    }
+
+    public BooleanProperty memoryStickModeProperty() {
+        return memoryStickMode;
+    }
+
+    public void setMemoryStickMode(boolean memoryStickMode) {
+        this.memoryStickMode.set(memoryStickMode);
     }
 }
diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java
index f068e1921b0..447026bd16b 100644
--- a/src/main/java/org/jabref/preferences/JabRefPreferences.java
+++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java
@@ -6,8 +6,6 @@
 import java.io.OutputStream;
 import java.io.Reader;
 import java.io.StringReader;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -35,13 +33,13 @@
 
 import javafx.beans.InvalidationListener;
 import javafx.collections.ListChangeListener;
+import javafx.collections.ObservableList;
 import javafx.collections.SetChangeListener;
 import javafx.scene.control.TableColumn.SortType;
 
 import org.jabref.gui.Globals;
 import org.jabref.gui.autocompleter.AutoCompleteFirstNameMode;
 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;
@@ -61,15 +59,15 @@
 import org.jabref.gui.specialfields.SpecialFieldsPreferences;
 import org.jabref.gui.theme.Theme;
 import org.jabref.logic.JabRefException;
-import org.jabref.logic.bibtex.FieldContentFormatterPreferences;
-import org.jabref.logic.bibtex.FieldWriterPreferences;
+import org.jabref.logic.bibtex.FieldPreferences;
 import org.jabref.logic.citationkeypattern.CitationKeyPatternPreferences;
 import org.jabref.logic.citationkeypattern.GlobalCitationKeyPattern;
 import org.jabref.logic.citationstyle.CitationStyle;
 import org.jabref.logic.citationstyle.CitationStylePreviewLayout;
 import org.jabref.logic.cleanup.FieldFormatterCleanups;
+import org.jabref.logic.exporter.BibDatabaseWriter;
 import org.jabref.logic.exporter.MetaDataSerializer;
-import org.jabref.logic.exporter.SavePreferences;
+import org.jabref.logic.exporter.SelfContainedSaveConfiguration;
 import org.jabref.logic.exporter.TemplateExporter;
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.ImporterPreferences;
@@ -78,7 +76,6 @@
 import org.jabref.logic.importer.fileformat.CustomImporter;
 import org.jabref.logic.importer.util.MetaDataParser;
 import org.jabref.logic.journals.JournalAbbreviationPreferences;
-import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.l10n.Language;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.layout.LayoutFormatterPreferences;
@@ -98,6 +95,7 @@
 import org.jabref.logic.protectedterms.ProtectedTermsPreferences;
 import org.jabref.logic.remote.RemotePreferences;
 import org.jabref.logic.shared.prefs.SharedDatabasePreferences;
+import org.jabref.logic.shared.security.Password;
 import org.jabref.logic.util.OS;
 import org.jabref.logic.util.Version;
 import org.jabref.logic.util.io.AutoLinkPreferences;
@@ -113,13 +111,15 @@
 import org.jabref.model.entry.types.EntryType;
 import org.jabref.model.entry.types.EntryTypeFactory;
 import org.jabref.model.groups.GroupHierarchyType;
-import org.jabref.model.metadata.SaveOrderConfig;
+import org.jabref.model.metadata.SaveOrder;
+import org.jabref.model.metadata.SelfContainedSaveOrder;
 import org.jabref.model.search.rules.SearchRules;
 import org.jabref.model.strings.StringUtil;
 
+import com.github.javakeyring.Keyring;
+import com.github.javakeyring.PasswordAccessException;
 import com.tobiasdiez.easybind.EasyBind;
 import jakarta.inject.Singleton;
-import net.harawata.appdirs.AppDirsFactory;
 import org.jvnet.hk2.annotations.Service;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -131,7 +131,7 @@
  * Internally it defines symbols used to pick a value from the {@code java.util.prefs} interface and keeps a hashmap
  * with all the default values.
  * <p>
- * There are still some similar preferences classes (OpenOfficePreferences and SharedDatabasePreferences) which also use
+ * There are still some similar preferences classes ({@link org.jabref.logic.openoffice.OpenOfficePreferences} and {@link org.jabref.logic.shared.prefs.SharedDatabasePreferences}) which also use
  * the {@code java.util.prefs} API.
  */
 @Singleton
@@ -147,6 +147,7 @@ public class JabRefPreferences implements PreferencesService {
     public static final String PUSH_TEXMAKER_PATH = "texmakerPath";
     public static final String PUSH_VIM_SERVER = "vimServer";
     public static final String PUSH_VIM = "vim";
+    public static final String PUSH_SUBLIME_TEXT_PATH = "sublimeTextPath";
 
     /* contents of the defaults HashMap that are defined in this class.
      * There are more default parameters in this map which belong to separate preference classes.
@@ -163,6 +164,7 @@ public class JabRefPreferences implements PreferencesService {
     public static final String ENTRY_EDITOR_HEIGHT = "entryEditorHeightFX";
     public static final String AUTO_RESIZE_MODE = "autoResizeMode";
     public static final String WINDOW_MAXIMISED = "windowMaximised";
+    public static final String WINDOW_FULLSCREEN = "windowFullscreen";
 
     public static final String REFORMAT_FILE_ON_SAVE_AND_EXPORT = "reformatFileOnSaveAndExport";
     public static final String EXPORT_IN_ORIGINAL_ORDER = "exportInOriginalOrder";
@@ -197,6 +199,7 @@ public class JabRefPreferences implements PreferencesService {
     public static final String SIZE_X = "mainWindowSizeX";
     public static final String POS_Y = "mainWindowPosY";
     public static final String POS_X = "mainWindowPosX";
+
     public static final String LAST_EDITED = "lastEdited";
     public static final String OPEN_LAST_EDITED = "openLastEdited";
     public static final String LAST_FOCUSED = "lastFocused";
@@ -205,6 +208,8 @@ public class JabRefPreferences implements PreferencesService {
     public static final String LAST_USED_EXPORT = "lastUsedExport";
     public static final String EXPORT_WORKING_DIRECTORY = "exportWorkingDirectory";
     public static final String WORKING_DIRECTORY = "workingDirectory";
+    public static final String BACKUP_DIRECTORY = "backupDirectory";
+    public static final String CREATE_BACKUP = "createBackup";
 
     public static final String KEYWORD_SEPARATOR = "groupKeywordSeparator";
     public static final String AUTO_ASSIGN_GROUP = "autoAssignGroup";
@@ -221,10 +226,6 @@ 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";
@@ -269,21 +270,27 @@ public class JabRefPreferences implements PreferencesService {
     public static final String SEARCH_KEEP_GLOBAL_WINDOW_ON_TOP = "keepOnTop";
     public static final String SEARCH_WINDOW_HEIGHT = "searchWindowHeight";
     public static final String SEARCH_WINDOW_WIDTH = "searchWindowWidth";
+
+    public static final String IMPORTERS_ENABLED = "importersEnabled";
     public static final String GENERATE_KEY_ON_IMPORT = "generateKeyOnImport";
     public static final String GROBID_ENABLED = "grobidEnabled";
     public static final String GROBID_OPT_OUT = "grobidOptOut";
     public static final String GROBID_URL = "grobidURL";
 
+    public static final String JOURNAL_POPUP = "journalPopup";
+
     public static final String DEFAULT_CITATION_KEY_PATTERN = "defaultBibtexKeyPattern";
     public static final String UNWANTED_CITATION_KEY_CHARACTERS = "defaultUnwantedBibtexKeyCharacters";
     public static final String CONFIRM_DELETE = "confirmDelete";
     public static final String WARN_BEFORE_OVERWRITING_KEY = "warnBeforeOverwritingKey";
     public static final String AVOID_OVERWRITING_KEY = "avoidOverwritingKey";
     public static final String AUTOLINK_EXACT_KEY_ONLY = "autolinkExactKeyOnly";
+    public static final String AUTOLINK_FILES_ENABLED = "autoLinkFilesEnabled";
     public static final String SIDE_PANE_WIDTH = "sidePaneWidthFX";
     public static final String CITE_COMMAND = "citeCommand";
     public static final String GENERATE_KEYS_BEFORE_SAVING = "generateKeysBeforeSaving";
     public static final String EMAIL_SUBJECT = "emailSubject";
+    public static final String KINDLE_EMAIL = "kindleEmail";
     public static final String OPEN_FOLDERS_OF_ATTACHED_FILES = "openFoldersOfAttachedFiles";
     public static final String KEY_GEN_ALWAYS_ADD_LETTER = "keyGenAlwaysAddLetter";
     public static final String KEY_GEN_FIRST_LETTER_A = "keyGenFirstLetterA";
@@ -335,6 +342,7 @@ public class JabRefPreferences implements PreferencesService {
     public static final String CUSTOMIZED_BIBLATEX_TYPES = "customizedBiblatexTypes";
     // Version
     public static final String VERSION_IGNORED_UPDATE = "versionIgnoreUpdate";
+    public static final String VERSION_CHECK_ENABLED = "versionCheck";
     // KeyBindings - keys - public because needed for pref migration
     public static final String BINDINGS = "bindings";
 
@@ -347,22 +355,28 @@ public class JabRefPreferences implements PreferencesService {
     // String delimiter
     public static final Character STRINGLIST_DELIMITER = ';';
 
+    // Preview - public for pref migrations
+    public static final String PREVIEW_STYLE = "previewStyle";
+    public static final String CYCLE_PREVIEW_POS = "cyclePreviewPos";
+    public static final String CYCLE_PREVIEW = "cyclePreview";
+    public static final String PREVIEW_AS_TAB = "previewAsTab";
+
     // UI
     private static final String FONT_FAMILY = "fontFamily";
 
-    // Preview
-    private static final String PREVIEW_STYLE = "previewStyle";
-    private static final String CYCLE_PREVIEW_POS = "cyclePreviewPos";
-    private static final String CYCLE_PREVIEW = "cyclePreview";
-    private static final String PREVIEW_AS_TAB = "previewAsTab";
-
     // Proxy
     private static final String PROXY_PORT = "proxyPort";
     private static final String PROXY_HOSTNAME = "proxyHostname";
     private static final String PROXY_USE = "useProxy";
+    private static final String PROXY_USE_AUTHENTICATION = "useProxyAuthentication";
     private static final String PROXY_USERNAME = "proxyUsername";
     private static final String PROXY_PASSWORD = "proxyPassword";
-    private static final String PROXY_USE_AUTHENTICATION = "useProxyAuthentication";
+    private static final String PROXY_PERSIST_PASSWORD = "persistPassword";
+
+    // Web search
+    private static final String FETCHER_CUSTOM_KEY_NAMES = "fetcherCustomKeyNames";
+    private static final String FETCHER_CUSTOM_KEY_USES = "fetcherCustomKeyUses";
+    private static final String FETCHER_CUSTOM_KEY_PERSIST = "fetcherCustomKeyPersist";
 
     // SSL
     private static final String TRUSTSTORE_PATH = "truststorePath";
@@ -425,10 +439,9 @@ public class JabRefPreferences implements PreferencesService {
     /**
      * Cache variables
      */
-    private Map<String, Set<Field>> entryEditorTabList;
-    private String userName;
+    private String userAndHost;
 
-    private GeneralPreferences generalPreferences;
+    private LibraryPreferences libraryPreferences;
     private TelemetryPreferences telemetryPreferences;
     private DOIPreferences doiPreferences;
     private OwnerPreferences ownerPreferences;
@@ -436,7 +449,7 @@ public class JabRefPreferences implements PreferencesService {
     private PreviewPreferences previewPreferences;
     private OpenOfficePreferences openOfficePreferences;
     private SidePanePreferences sidePanePreferences;
-    private AppearancePreferences appearancePreferences;
+    private WorkspacePreferences workspacePreferences;
     private ImporterPreferences importerPreferences;
     private GrobidPreferences grobidPreferences;
     private ProtectedTermsPreferences protectedTermsPreferences;
@@ -449,7 +462,7 @@ public class JabRefPreferences implements PreferencesService {
     private SSLPreferences sslPreferences;
     private SearchPreferences searchPreferences;
     private AutoLinkPreferences autoLinkPreferences;
-    private ImportExportPreferences importExportPreferences;
+    private ExportPreferences exportPreferences;
     private NameFormatterPreferences nameFormatterPreferences;
     private BibEntryPreferences bibEntryPreferences;
     private InternalPreferences internalPreferences;
@@ -466,6 +479,7 @@ public class JabRefPreferences implements PreferencesService {
     private ColumnPreferences mainTableColumnPreferences;
     private ColumnPreferences searchDialogColumnPreferences;
     private JournalAbbreviationPreferences journalAbbreviationPreferences;
+    private FieldPreferences fieldPreferences;
 
     // The constructor is made private to enforce this as a singleton class:
     private JabRefPreferences() {
@@ -495,14 +509,18 @@ private JabRefPreferences() {
         defaults.put(SEARCH_WINDOW_HEIGHT, 176.0);
         defaults.put(SEARCH_WINDOW_WIDTH, 600.0);
 
+        defaults.put(IMPORTERS_ENABLED, Boolean.TRUE);
         defaults.put(GENERATE_KEY_ON_IMPORT, Boolean.TRUE);
         defaults.put(GROBID_ENABLED, Boolean.FALSE);
         defaults.put(GROBID_OPT_OUT, Boolean.FALSE);
         defaults.put(GROBID_URL, "http://grobid.jabref.org:8070");
 
-        defaults.put(PUSH_TEXMAKER_PATH, JabRefDesktop.getNativeDesktop().detectProgramPath("texmaker", "Texmaker"));
-        defaults.put(PUSH_WINEDT_PATH, JabRefDesktop.getNativeDesktop().detectProgramPath("WinEdt", "WinEdt Team\\WinEdt"));
-        defaults.put(PUSH_TEXSTUDIO_PATH, JabRefDesktop.getNativeDesktop().detectProgramPath("texstudio", "TeXstudio"));
+        defaults.put(JOURNAL_POPUP, EntryEditorPreferences.JournalPopupEnabled.FIRST_START.toString());
+
+        defaults.put(PUSH_TEXMAKER_PATH, OS.getNativeDesktop().detectProgramPath("texmaker", "Texmaker"));
+        defaults.put(PUSH_WINEDT_PATH, OS.getNativeDesktop().detectProgramPath("WinEdt", "WinEdt Team\\WinEdt"));
+        defaults.put(PUSH_TEXSTUDIO_PATH, OS.getNativeDesktop().detectProgramPath("texstudio", "TeXstudio"));
+        defaults.put(PUSH_SUBLIME_TEXT_PATH, OS.getNativeDesktop().detectProgramPath("subl", "Sublime"));
         defaults.put(PUSH_LYXPIPE, USER_HOME + File.separator + ".lyx/lyxpipe");
         defaults.put(PUSH_VIM, "vim");
         defaults.put(PUSH_VIM_SERVER, "vim");
@@ -541,20 +559,19 @@ private JabRefPreferences() {
         defaults.put(PROXY_USE_AUTHENTICATION, Boolean.FALSE);
         defaults.put(PROXY_USERNAME, "");
         defaults.put(PROXY_PASSWORD, "");
+        defaults.put(PROXY_PERSIST_PASSWORD, Boolean.FALSE);
 
         // 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(TRUSTSTORE_PATH, OS.getNativeDesktop()
+                                        .getSslDirectory()
+                                        .resolve("truststore.jks").toString());
 
         defaults.put(POS_X, 0);
         defaults.put(POS_Y, 0);
         defaults.put(SIZE_X, 1024);
         defaults.put(SIZE_Y, 768);
         defaults.put(WINDOW_MAXIMISED, Boolean.TRUE);
+        defaults.put(WINDOW_FULLSCREEN, Boolean.FALSE);
         defaults.put(AUTO_RESIZE_MODE, Boolean.FALSE); // By default disable "Fit table horizontally on the screen"
         defaults.put(ENTRY_EDITOR_HEIGHT, 0.65);
         defaults.put(NAMES_AS_IS, Boolean.FALSE); // "Show names unchanged"
@@ -577,7 +594,7 @@ private JabRefPreferences() {
         defaults.put(EXPORT_SECONDARY_SORT_FIELD, StandardField.AUTHOR.getName());
         defaults.put(EXPORT_SECONDARY_SORT_DESCENDING, Boolean.FALSE);
         defaults.put(EXPORT_TERTIARY_SORT_FIELD, StandardField.TITLE.getName());
-        defaults.put(EXPORT_TERTIARY_SORT_DESCENDING, Boolean.TRUE);
+        defaults.put(EXPORT_TERTIARY_SORT_DESCENDING, Boolean.FALSE);
 
         defaults.put(NEWLINE, System.lineSeparator());
 
@@ -591,6 +608,9 @@ private JabRefPreferences() {
         defaults.put(USE_XMP_PRIVACY_FILTER, Boolean.FALSE);
         defaults.put(WORKING_DIRECTORY, USER_HOME);
         defaults.put(EXPORT_WORKING_DIRECTORY, USER_HOME);
+
+        defaults.put(CREATE_BACKUP, Boolean.TRUE);
+
         // Remembers working directory of last import
         defaults.put(IMPORT_WORKING_DIRECTORY, USER_HOME);
         defaults.put(PREFS_EXPORT_PATH, USER_HOME);
@@ -654,7 +674,7 @@ private JabRefPreferences() {
 
         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(FETCHER_CUSTOM_KEY_PERSIST, Boolean.FALSE);
 
         defaults.put(USE_OWNER, Boolean.FALSE);
         defaults.put(OVERWRITE_OWNER, Boolean.FALSE);
@@ -691,6 +711,7 @@ private JabRefPreferences() {
         defaults.put(OVERRIDE_DEFAULT_FONT_SIZE, false);
 
         defaults.put(AUTOLINK_EXACT_KEY_ONLY, Boolean.FALSE);
+        defaults.put(AUTOLINK_FILES_ENABLED, Boolean.TRUE);
         defaults.put(LOCAL_AUTO_SAVE, Boolean.FALSE);
         defaults.put(ALLOW_INTEGER_EDITION_BIBTEX, Boolean.FALSE);
         // Curly brackets ({}) are the default delimiters, not quotes (") as these cause trouble when they appear within the field value:
@@ -698,6 +719,7 @@ private JabRefPreferences() {
         defaults.put(KEY_GEN_FIRST_LETTER_A, Boolean.TRUE);
         defaults.put(KEY_GEN_ALWAYS_ADD_LETTER, Boolean.FALSE);
         defaults.put(EMAIL_SUBJECT, Localization.lang("References"));
+        defaults.put(KINDLE_EMAIL, "");
         defaults.put(OPEN_FOLDERS_OF_ATTACHED_FILES, Boolean.FALSE);
         defaults.put(WEB_SEARCH_VISIBLE, Boolean.TRUE);
         defaults.put(GROUP_SIDEPANE_VISIBLE, Boolean.TRUE);
@@ -734,8 +756,9 @@ private JabRefPreferences() {
             defaults.put(FILE_BROWSER_COMMAND, "");
         }
 
-        // versioncheck defaults
+        // version check defaults
         defaults.put(VERSION_IGNORED_UPDATE, "");
+        defaults.put(VERSION_CHECK_ENABLED, Boolean.TRUE);
 
         // preview
         defaults.put(CYCLE_PREVIEW, "Preview;" + CitationStyle.DEFAULT);
@@ -766,6 +789,23 @@ private JabRefPreferences() {
         setLanguageDependentDefaultValues();
     }
 
+    public void setLanguageDependentDefaultValues() {
+        // Entry editor tab 0:
+        defaults.put(CUSTOM_TAB_NAME + "_def0", Localization.lang("General"));
+        String fieldNames = FieldFactory.getDefaultGeneralFields().stream().map(Field::getName).collect(Collectors.joining(STRINGLIST_DELIMITER.toString()));
+        defaults.put(CUSTOM_TAB_FIELDS + "_def0", fieldNames);
+
+        // Entry editor tab 1:
+        defaults.put(CUSTOM_TAB_FIELDS + "_def1", StandardField.ABSTRACT.getName());
+        defaults.put(CUSTOM_TAB_NAME + "_def1", Localization.lang("Abstract"));
+
+        // Entry editor tab 2: Comments Field - used for research comments, etc.
+        defaults.put(CUSTOM_TAB_FIELDS + "_def2", StandardField.COMMENT.getName());
+        defaults.put(CUSTOM_TAB_NAME + "_def2", Localization.lang("Comments"));
+
+        defaults.put(EMAIL_SUBJECT, Localization.lang("References"));
+    }
+
     /**
      * @return Instance of JaRefPreferences
      * @deprecated Use {@link PreferencesService} instead
@@ -778,6 +818,10 @@ public static JabRefPreferences getInstance() {
         return JabRefPreferences.singleton;
     }
 
+    //*************************************************************************************************************
+    // Common serializer logic
+    //*************************************************************************************************************
+
     private static String convertListToString(List<String> value) {
         return value.stream().map(val -> StringUtil.quote(val, STRINGLIST_DELIMITER.toString(), '\\')).collect(Collectors.joining(STRINGLIST_DELIMITER.toString()));
     }
@@ -844,22 +888,9 @@ private static Optional<String> getNextUnit(Reader data) throws IOException {
         }
     }
 
-    public void setLanguageDependentDefaultValues() {
-        // Entry editor tab 0:
-        defaults.put(CUSTOM_TAB_NAME + "_def0", Localization.lang("General"));
-        String fieldNames = FieldFactory.getDefaultGeneralFields().stream().map(Field::getName).collect(Collectors.joining(STRINGLIST_DELIMITER.toString()));
-        defaults.put(CUSTOM_TAB_FIELDS + "_def0", fieldNames);
-
-        // Entry editor tab 1:
-        defaults.put(CUSTOM_TAB_FIELDS + "_def1", StandardField.ABSTRACT.getName());
-        defaults.put(CUSTOM_TAB_NAME + "_def1", Localization.lang("Abstract"));
-
-        // Entry editor tab 2: Comments Field - used for research comments, etc.
-        defaults.put(CUSTOM_TAB_FIELDS + "_def2", StandardField.COMMENT.getName());
-        defaults.put(CUSTOM_TAB_NAME + "_def2", Localization.lang("Comments"));
-
-        defaults.put(EMAIL_SUBJECT, Localization.lang("References"));
-    }
+    //*************************************************************************************************************
+    // Backingstore access logic
+    //*************************************************************************************************************
 
     /**
      * Check whether a key is set (differently from null).
@@ -972,6 +1003,7 @@ public void clear() throws BackingStoreException {
         clearAllBibEntryTypes();
         clearCitationKeyPatterns();
         clearTruststoreFromCustomCertificates();
+        clearCustomFetcherKeys();
         prefs.clear();
         new SharedDatabasePreferences().clear();
     }
@@ -1120,12 +1152,26 @@ public void importPreferences(Path file) throws JabRefException {
         }
     }
 
+    //*************************************************************************************************************
+    // ToDo: Cleanup
+    //*************************************************************************************************************
+
     @Override
-    public LayoutFormatterPreferences getLayoutFormatterPreferences(JournalAbbreviationRepository repository) {
+    public LayoutFormatterPreferences getLayoutFormatterPreferences() {
         return new LayoutFormatterPreferences(
                 getNameFormatterPreferences(),
-                getFilePreferences().mainFileDirectoryProperty(),
-                repository);
+                getFilePreferences().mainFileDirectoryProperty());
+    }
+
+    @Override
+    public KeyBindingRepository getKeyBindingRepository() {
+        return new KeyBindingRepository(getStringList(BIND_NAMES), getStringList(BINDINGS));
+    }
+
+    @Override
+    public void storeKeyBindingRepository(KeyBindingRepository keyBindingRepository) {
+        putStringList(BIND_NAMES, keyBindingRepository.getBindNames());
+        putStringList(BINDINGS, keyBindingRepository.getBindings());
     }
 
     @Override
@@ -1146,25 +1192,6 @@ public JournalAbbreviationPreferences getJournalAbbreviationPreferences() {
         return journalAbbreviationPreferences;
     }
 
-    @Override
-    public KeyBindingRepository getKeyBindingRepository() {
-        return new KeyBindingRepository(getStringList(BIND_NAMES), getStringList(BINDINGS));
-    }
-
-    @Override
-    public void storeKeyBindingRepository(KeyBindingRepository keyBindingRepository) {
-        putStringList(BIND_NAMES, keyBindingRepository.getBindNames());
-        putStringList(BINDINGS, keyBindingRepository.getBindings());
-    }
-
-    public String getPreviewStyle() {
-        return get(PREVIEW_STYLE);
-    }
-
-    public void setPreviewStyle(String previewStyle) {
-        put(PREVIEW_STYLE, previewStyle);
-    }
-
     //*************************************************************************************************************
     // CustomEntryTypes
     //*************************************************************************************************************
@@ -1210,8 +1237,8 @@ private void clearBibEntryTypes(BibDatabaseMode mode) {
     @Override
     public void storeCustomEntryTypesRepository(BibEntryTypesManager entryTypesManager) {
         clearAllBibEntryTypes();
-        storeBibEntryTypes(entryTypesManager.getAllCustomTypes(BibDatabaseMode.BIBTEX), BibDatabaseMode.BIBTEX);
-        storeBibEntryTypes(entryTypesManager.getAllCustomTypes(BibDatabaseMode.BIBLATEX), BibDatabaseMode.BIBLATEX);
+        storeBibEntryTypes(entryTypesManager.getAllTypes(BibDatabaseMode.BIBTEX), BibDatabaseMode.BIBTEX);
+        storeBibEntryTypes(entryTypesManager.getAllTypes(BibDatabaseMode.BIBLATEX), BibDatabaseMode.BIBLATEX);
     }
 
     private void storeBibEntryTypes(Collection<BibEntryType> bibEntryTypes, BibDatabaseMode bibDatabaseMode) {
@@ -1236,6 +1263,10 @@ private static Preferences getPrefsNodeForCustomizedEntryTypes(BibDatabaseMode m
                 : PREFS_NODE.node(CUSTOMIZED_BIBLATEX_TYPES);
     }
 
+    //*************************************************************************************************************
+    // Misc
+    //*************************************************************************************************************
+
     @Override
     public OpenOfficePreferences getOpenOfficePreferences() {
         if (Objects.nonNull(openOfficePreferences)) {
@@ -1259,45 +1290,22 @@ public OpenOfficePreferences getOpenOfficePreferences() {
         return openOfficePreferences;
     }
 
-    //*************************************************************************************************************
-    // GeneralPreferences
-    //*************************************************************************************************************
-
     @Override
-    public GeneralPreferences getGeneralPreferences() {
-        if (Objects.nonNull(generalPreferences)) {
-            return generalPreferences;
+    public LibraryPreferences getLibraryPreferences() {
+        if (Objects.nonNull(libraryPreferences)) {
+            return libraryPreferences;
         }
 
-        generalPreferences = new GeneralPreferences(
-                getLanguage(),
+        libraryPreferences = new LibraryPreferences(
                 getBoolean(BIBLATEX_DEFAULT_MODE) ? BibDatabaseMode.BIBLATEX : BibDatabaseMode.BIBTEX,
-                getBoolean(WARN_ABOUT_DUPLICATES_IN_INSPECTION),
-                getBoolean(CONFIRM_DELETE),
-                getBoolean(MEMORY_STICK_MODE),
-                getBoolean(SHOW_ADVANCED_HINTS));
-
-        EasyBind.listen(generalPreferences.languageProperty(), (obs, oldValue, newValue) -> {
-            put(LANGUAGE, newValue.getId());
-            if (oldValue != newValue) {
-                setLanguageDependentDefaultValues();
-                Localization.setLanguage(newValue);
-            }
-        });
-        EasyBind.listen(generalPreferences.defaultBibDatabaseModeProperty(), (obs, oldValue, newValue) -> putBoolean(BIBLATEX_DEFAULT_MODE, (newValue == BibDatabaseMode.BIBLATEX)));
-        EasyBind.listen(generalPreferences.isWarnAboutDuplicatesInInspectionProperty(), (obs, oldValue, newValue) -> putBoolean(WARN_ABOUT_DUPLICATES_IN_INSPECTION, newValue));
-        EasyBind.listen(generalPreferences.confirmDeleteProperty(), (obs, oldValue, newValue) -> putBoolean(CONFIRM_DELETE, newValue));
-        EasyBind.listen(generalPreferences.memoryStickModeProperty(), (obs, oldValue, newValue) -> putBoolean(MEMORY_STICK_MODE, newValue));
-        EasyBind.listen(generalPreferences.showAdvancedHintsProperty(), (obs, oldValue, newValue) -> putBoolean(SHOW_ADVANCED_HINTS, newValue));
+                getBoolean(REFORMAT_FILE_ON_SAVE_AND_EXPORT),
+                getBoolean(LOCAL_AUTO_SAVE));
 
-        return generalPreferences;
-    }
+        EasyBind.listen(libraryPreferences.defaultBibDatabaseModeProperty(), (obs, oldValue, newValue) -> putBoolean(BIBLATEX_DEFAULT_MODE, (newValue == BibDatabaseMode.BIBLATEX)));
+        EasyBind.listen(libraryPreferences.alwaysReformatOnSaveProperty(), (obs, oldValue, newValue) -> putBoolean(REFORMAT_FILE_ON_SAVE_AND_EXPORT, newValue));
+        EasyBind.listen(libraryPreferences.autoSaveProperty(), (obs, oldValue, newValue) -> putBoolean(LOCAL_AUTO_SAVE, newValue));
 
-    private Language getLanguage() {
-        return Stream.of(Language.values())
-                     .filter(language -> language.getId().equalsIgnoreCase(get(LANGUAGE)))
-                     .findFirst()
-                     .orElse(Language.ENGLISH);
+        return libraryPreferences;
     }
 
     @Override
@@ -1357,7 +1365,13 @@ public OwnerPreferences getOwnerPreferences() {
                 getBoolean(OVERWRITE_OWNER));
 
         EasyBind.listen(ownerPreferences.useOwnerProperty(), (obs, oldValue, newValue) -> putBoolean(USE_OWNER, newValue));
-        EasyBind.listen(ownerPreferences.defaultOwnerProperty(), (obs, oldValue, newValue) -> put(DEFAULT_OWNER, newValue));
+        EasyBind.listen(ownerPreferences.defaultOwnerProperty(), (obs, oldValue, newValue) -> {
+            put(DEFAULT_OWNER, newValue);
+            // trigger re-determination of userAndHost and the dependent preferences
+            userAndHost = null;
+            filePreferences = null;
+            internalPreferences = null;
+        });
         EasyBind.listen(ownerPreferences.overwriteOwnerProperty(), (obs, oldValue, newValue) -> putBoolean(OVERWRITE_OWNER, newValue));
 
         return ownerPreferences;
@@ -1382,10 +1396,6 @@ public TimestampPreferences getTimestampPreferences() {
         return timestampPreferences;
     }
 
-    //*************************************************************************************************************
-    // GroupsPreferences
-    //*************************************************************************************************************
-
     @Override
     public GroupsPreferences getGroupsPreferences() {
         if (Objects.nonNull(groupsPreferences)) {
@@ -1411,22 +1421,46 @@ public GroupsPreferences getGroupsPreferences() {
     // EntryEditorPreferences
     //*************************************************************************************************************
 
-    /**
-     * Creates a list of defined tabs in the entry editor from cache
-     *
-     * @return a map of defined tabs and associated fields
-     */
-    private Map<String, Set<Field>> getEntryEditorTabList() {
-        if (entryEditorTabList == null) {
-            updateEntryEditorTabList();
+    @Override
+    public EntryEditorPreferences getEntryEditorPreferences() {
+        if (Objects.nonNull(entryEditorPreferences)) {
+            return entryEditorPreferences;
         }
-        return entryEditorTabList;
+
+        entryEditorPreferences = new EntryEditorPreferences(
+                getEntryEditorTabs(),
+                getDefaultEntryEditorTabs(),
+                getBoolean(AUTO_OPEN_FORM),
+                getBoolean(SHOW_RECOMMENDATIONS),
+                getBoolean(SHOW_LATEX_CITATIONS),
+                getBoolean(DEFAULT_SHOW_SOURCE),
+                getBoolean(VALIDATE_IN_ENTRY_EDITOR),
+                getBoolean(ALLOW_INTEGER_EDITION_BIBTEX),
+                getDouble(ENTRY_EDITOR_HEIGHT),
+                getBoolean(AUTOLINK_FILES_ENABLED),
+                EntryEditorPreferences.JournalPopupEnabled.fromString(get(JOURNAL_POPUP)));
+
+        EasyBind.listen(entryEditorPreferences.entryEditorTabs(), (obs, oldValue, newValue) -> storeEntryEditorTabs(newValue));
+        // defaultEntryEditorTabs are read-only
+        EasyBind.listen(entryEditorPreferences.shouldOpenOnNewEntryProperty(), (obs, oldValue, newValue) -> putBoolean(AUTO_OPEN_FORM, newValue));
+        EasyBind.listen(entryEditorPreferences.shouldShowRecommendationsTabProperty(), (obs, oldValue, newValue) -> putBoolean(SHOW_RECOMMENDATIONS, newValue));
+        EasyBind.listen(entryEditorPreferences.shouldShowLatexCitationsTabProperty(), (obs, oldValue, newValue) -> putBoolean(SHOW_LATEX_CITATIONS, newValue));
+        EasyBind.listen(entryEditorPreferences.showSourceTabByDefaultProperty(), (obs, oldValue, newValue) -> putBoolean(DEFAULT_SHOW_SOURCE, newValue));
+        EasyBind.listen(entryEditorPreferences.enableValidationProperty(), (obs, oldValue, newValue) -> putBoolean(VALIDATE_IN_ENTRY_EDITOR, newValue));
+        EasyBind.listen(entryEditorPreferences.allowIntegerEditionBibtexProperty(), (obs, oldValue, newValue) -> putBoolean(ALLOW_INTEGER_EDITION_BIBTEX, newValue));
+        EasyBind.listen(entryEditorPreferences.dividerPositionProperty(), (obs, oldValue, newValue) -> putDouble(ENTRY_EDITOR_HEIGHT, newValue.doubleValue()));
+        EasyBind.listen(entryEditorPreferences.autoLinkEnabledProperty(), (obs, oldValue, newValue) -> putBoolean(AUTOLINK_FILES_ENABLED, newValue));
+        EasyBind.listen(entryEditorPreferences.enableJournalPopupProperty(), (obs, oldValue, newValue) -> put(JOURNAL_POPUP, newValue.toString()));
+
+        return entryEditorPreferences;
     }
 
     /**
-     * Reloads the list of the currently defined tabs  in the entry editor from scratch to cache
+     * Get a Map of defined tab names to default tab fields.
+     *
+     * @return A map of the currently defined tabs in the entry editor from scratch to cache
      */
-    private void updateEntryEditorTabList() {
+    private Map<String, Set<Field>> getEntryEditorTabs() {
         Map<String, Set<Field>> tabs = new LinkedHashMap<>();
         List<String> tabNames = getSeries(CUSTOM_TAB_NAME);
         List<String> tabFields = getSeries(CUSTOM_TAB_FIELDS);
@@ -1440,7 +1474,7 @@ private void updateEntryEditorTabList() {
         for (int i = 0; i < tabNames.size(); i++) {
             tabs.put(tabNames.get(i), FieldFactory.parseFieldList(tabFields.get(i)));
         }
-        entryEditorTabList = tabs;
+        return tabs;
     }
 
     /**
@@ -1448,7 +1482,7 @@ private void updateEntryEditorTabList() {
      *
      * @param customTabs a map of tab names and the corresponding set of fields to be displayed in
      */
-    private void storeEntryEditorTabList(Map<String, Set<Field>> customTabs) {
+    private void storeEntryEditorTabs(Map<String, Set<Field>> customTabs) {
         String[] names = customTabs.keySet().toArray(String[]::new);
         String[] fields = customTabs.values().stream()
                                     .map(set -> set.stream()
@@ -1464,16 +1498,10 @@ private void storeEntryEditorTabList(Map<String, Set<Field>> customTabs) {
         purgeSeries(CUSTOM_TAB_NAME, customTabs.size());
         purgeSeries(CUSTOM_TAB_FIELDS, customTabs.size());
 
-        updateEntryEditorTabList();
+        getEntryEditorTabs();
     }
 
-    /**
-     * Get a Map of default tab names to default tab fields.
-     *
-     * @return A map of keys with tab names and a set of corresponding fields
-     */
-    @Override
-    public Map<String, Set<Field>> getDefaultTabNamesAndFields() {
+    private Map<String, Set<Field>> getDefaultEntryEditorTabs() {
         Map<String, Set<Field>> customTabsMap = new LinkedHashMap<>();
 
         int defNumber = 0;
@@ -1492,59 +1520,6 @@ public Map<String, Set<Field>> getDefaultTabNamesAndFields() {
         return customTabsMap;
     }
 
-    /**
-     * Get a Map of default tab names to default tab fields.
-     *
-     * @return A map of keys with tab names and a set of corresponding fields
-     */
-    @Override
-    public List<Field> getAllDefaultTabFieldNames() {
-        List<Field> customFields = new ArrayList<>();
-
-        int defNumber = 0;
-        while (true) {
-            // saved as CUSTOMTABNAME_def{number} and ; separated
-            String fields = (String) defaults.get(CUSTOM_TAB_FIELDS + "_def" + defNumber);
-
-            if (StringUtil.isNullOrEmpty(fields)) {
-                break;
-            }
-
-            customFields.addAll(Arrays.stream(fields.split(STRINGLIST_DELIMITER.toString())).map(FieldFactory::parseField).toList());
-            defNumber++;
-        }
-        return customFields;
-    }
-
-    @Override
-    public EntryEditorPreferences getEntryEditorPreferences() {
-        if (Objects.nonNull(entryEditorPreferences)) {
-            return entryEditorPreferences;
-        }
-
-        entryEditorPreferences = new EntryEditorPreferences(getEntryEditorTabList(),
-                getBoolean(AUTO_OPEN_FORM),
-                getBoolean(SHOW_RECOMMENDATIONS),
-                getBoolean(ACCEPT_RECOMMENDATIONS),
-                getBoolean(SHOW_LATEX_CITATIONS),
-                getBoolean(DEFAULT_SHOW_SOURCE),
-                getBoolean(VALIDATE_IN_ENTRY_EDITOR),
-                getBoolean(ALLOW_INTEGER_EDITION_BIBTEX),
-                getDouble(ENTRY_EDITOR_HEIGHT));
-
-        EasyBind.listen(entryEditorPreferences.entryEditorTabListProperty(), (obs, oldValue, newValue) -> storeEntryEditorTabList(newValue));
-        EasyBind.listen(entryEditorPreferences.shouldOpenOnNewEntryProperty(), (obs, oldValue, newValue) -> putBoolean(AUTO_OPEN_FORM, newValue));
-        EasyBind.listen(entryEditorPreferences.shouldShowRecommendationsTabProperty(), (obs, oldValue, newValue) -> putBoolean(SHOW_RECOMMENDATIONS, newValue));
-        EasyBind.listen(entryEditorPreferences.isMrdlibAcceptedProperty(), (obs, oldValue, newValue) -> putBoolean(ACCEPT_RECOMMENDATIONS, newValue));
-        EasyBind.listen(entryEditorPreferences.shouldShowLatexCitationsTabProperty(), (obs, oldValue, newValue) -> putBoolean(SHOW_LATEX_CITATIONS, newValue));
-        EasyBind.listen(entryEditorPreferences.showSourceTabByDefaultProperty(), (obs, oldValue, newValue) -> putBoolean(DEFAULT_SHOW_SOURCE, newValue));
-        EasyBind.listen(entryEditorPreferences.enableValidationProperty(), (obs, oldValue, newValue) -> putBoolean(VALIDATE_IN_ENTRY_EDITOR, newValue));
-        EasyBind.listen(entryEditorPreferences.allowIntegerEditionBibtexProperty(), (obs, oldValue, newValue) -> putBoolean(ALLOW_INTEGER_EDITION_BIBTEX, newValue));
-        EasyBind.listen(entryEditorPreferences.dividerPositionProperty(), (obs, oldValue, newValue) -> putDouble(ENTRY_EDITOR_HEIGHT, newValue.doubleValue()));
-
-        return entryEditorPreferences;
-    }
-
     //*************************************************************************************************************
     // Network preferences
     //*************************************************************************************************************
@@ -1577,17 +1552,62 @@ public ProxyPreferences getProxyPreferences() {
                 get(PROXY_PORT),
                 getBoolean(PROXY_USE_AUTHENTICATION),
                 get(PROXY_USERNAME),
-                (String) defaults.get(PROXY_PASSWORD));
+                getProxyPassword(),
+                getBoolean(PROXY_PERSIST_PASSWORD));
 
         EasyBind.listen(proxyPreferences.useProxyProperty(), (obs, oldValue, newValue) -> putBoolean(PROXY_USE, newValue));
         EasyBind.listen(proxyPreferences.hostnameProperty(), (obs, oldValue, newValue) -> put(PROXY_HOSTNAME, newValue));
         EasyBind.listen(proxyPreferences.portProperty(), (obs, oldValue, newValue) -> put(PROXY_PORT, newValue));
         EasyBind.listen(proxyPreferences.useAuthenticationProperty(), (obs, oldValue, newValue) -> putBoolean(PROXY_USE_AUTHENTICATION, newValue));
         EasyBind.listen(proxyPreferences.usernameProperty(), (obs, oldValue, newValue) -> put(PROXY_USERNAME, newValue));
+        EasyBind.listen(proxyPreferences.passwordProperty(), (obs, oldValue, newValue) -> setProxyPassword(newValue));
+        EasyBind.listen(proxyPreferences.persistPasswordProperty(), (obs, oldValue, newValue) -> {
+            putBoolean(PROXY_PERSIST_PASSWORD, newValue);
+            if (!newValue) {
+                try (final Keyring keyring = Keyring.create()) {
+                    keyring.deletePassword("org.jabref", "proxy");
+                } catch (Exception ex) {
+                    LOGGER.warn("Unable to remove proxy credentials");
+                }
+            }
+        });
 
         return proxyPreferences;
     }
 
+    private String getProxyPassword() {
+        if (getBoolean(PROXY_PERSIST_PASSWORD)) {
+            try (final Keyring keyring = Keyring.create()) {
+                return new Password(
+                        keyring.getPassword("org.jabref", "proxy"),
+                        getInternalPreferences().getUserAndHost())
+                        .decrypt();
+            } catch (PasswordAccessException ex) {
+                LOGGER.warn("JabRef uses proxy password from key store but no password is stored");
+            } catch (Exception ex) {
+                LOGGER.warn("JabRef could not open the key store");
+            }
+        }
+        return (String) defaults.get(PROXY_PASSWORD);
+    }
+
+    private void setProxyPassword(String password) {
+        if (getProxyPreferences().shouldPersistPassword()) {
+            try (final Keyring keyring = Keyring.create()) {
+                if (StringUtil.isBlank(password)) {
+                    keyring.deletePassword("org.jabref", "proxy");
+                } else {
+                    keyring.setPassword("org.jabref", "proxy", new Password(
+                            password.trim(),
+                            getInternalPreferences().getUserAndHost())
+                            .encrypt());
+                }
+            } catch (Exception ex) {
+                LOGGER.warn("Unable to open key store", ex);
+            }
+        }
+    }
+
     @Override
     public SSLPreferences getSSLPreferences() {
         if (Objects.nonNull(sslPreferences)) {
@@ -1661,19 +1681,11 @@ public CitationKeyPatternPreferences getCitationKeyPatternPreferences() {
             return citationKeyPatternPreferences;
         }
 
-        CitationKeyPatternPreferences.KeySuffix keySuffix =
-                CitationKeyPatternPreferences.KeySuffix.SECOND_WITH_B;
-        if (getBoolean(KEY_GEN_ALWAYS_ADD_LETTER)) {
-            keySuffix = CitationKeyPatternPreferences.KeySuffix.ALWAYS;
-        } else if (getBoolean(KEY_GEN_FIRST_LETTER_A)) {
-            keySuffix = CitationKeyPatternPreferences.KeySuffix.SECOND_WITH_A;
-        }
-
         citationKeyPatternPreferences = new CitationKeyPatternPreferences(
                 getBoolean(AVOID_OVERWRITING_KEY),
                 getBoolean(WARN_BEFORE_OVERWRITING_KEY),
                 getBoolean(GENERATE_KEYS_BEFORE_SAVING),
-                keySuffix,
+                getKeySuffix(),
                 get(KEY_PATTERN_REGEX),
                 get(KEY_PATTERN_REPLACEMENT),
                 get(UNWANTED_CITATION_KEY_CHARACTERS),
@@ -1688,22 +1700,9 @@ public CitationKeyPatternPreferences getCitationKeyPatternPreferences() {
         EasyBind.listen(citationKeyPatternPreferences.shouldGenerateCiteKeysBeforeSavingProperty(),
                 (obs, oldValue, newValue) -> putBoolean(GENERATE_KEYS_BEFORE_SAVING, newValue));
         EasyBind.listen(citationKeyPatternPreferences.keySuffixProperty(), (obs, oldValue, newValue) -> {
-                    switch (newValue) {
-                        case ALWAYS -> {
-                            putBoolean(KEY_GEN_ALWAYS_ADD_LETTER, true);
-                            putBoolean(KEY_GEN_FIRST_LETTER_A, false);
-                        }
-                        case SECOND_WITH_A -> {
-                            putBoolean(KEY_GEN_ALWAYS_ADD_LETTER, false);
-                            putBoolean(KEY_GEN_FIRST_LETTER_A, true);
-                        }
-                        case SECOND_WITH_B -> {
-                            putBoolean(KEY_GEN_ALWAYS_ADD_LETTER, false);
-                            putBoolean(KEY_GEN_FIRST_LETTER_A, false);
-                        }
-                    }
-                }
-        );
+            putBoolean(KEY_GEN_ALWAYS_ADD_LETTER, newValue == CitationKeyPatternPreferences.KeySuffix.ALWAYS);
+            putBoolean(KEY_GEN_FIRST_LETTER_A, newValue == CitationKeyPatternPreferences.KeySuffix.SECOND_WITH_A);
+        });
         EasyBind.listen(citationKeyPatternPreferences.keyPatternRegexProperty(),
                 (obs, oldValue, newValue) -> put(KEY_PATTERN_REGEX, newValue));
         EasyBind.listen(citationKeyPatternPreferences.keyPatternReplacementProperty(),
@@ -1716,6 +1715,17 @@ public CitationKeyPatternPreferences getCitationKeyPatternPreferences() {
         return citationKeyPatternPreferences;
     }
 
+    private CitationKeyPatternPreferences.KeySuffix getKeySuffix() {
+        CitationKeyPatternPreferences.KeySuffix keySuffix =
+                CitationKeyPatternPreferences.KeySuffix.SECOND_WITH_B;
+        if (getBoolean(KEY_GEN_ALWAYS_ADD_LETTER)) {
+            keySuffix = CitationKeyPatternPreferences.KeySuffix.ALWAYS;
+        } else if (getBoolean(KEY_GEN_FIRST_LETTER_A)) {
+            keySuffix = CitationKeyPatternPreferences.KeySuffix.SECOND_WITH_A;
+        }
+        return keySuffix;
+    }
+
     //*************************************************************************************************************
     // ExternalApplicationsPreferences
     //*************************************************************************************************************
@@ -1733,6 +1743,7 @@ public PushToApplicationPreferences getPushToApplicationPreferences() {
         applicationCommands.put(PushToApplications.TEXSTUDIO, get(PUSH_TEXSTUDIO_PATH));
         applicationCommands.put(PushToApplications.VIM, get(PUSH_VIM));
         applicationCommands.put(PushToApplications.WIN_EDT, get(PUSH_WINEDT_PATH));
+        applicationCommands.put(PushToApplications.SUBLIME_TEXT, get(PUSH_SUBLIME_TEXT_PATH));
 
         pushToApplicationPreferences = new PushToApplicationPreferences(
                 get(PUSH_TO_APPLICATION),
@@ -1742,31 +1753,34 @@ public PushToApplicationPreferences getPushToApplicationPreferences() {
         );
 
         EasyBind.listen(pushToApplicationPreferences.activeApplicationNameProperty(), (obs, oldValue, newValue) -> put(PUSH_TO_APPLICATION, newValue));
-
-        pushToApplicationPreferences.getCommandPaths().addListener((obs, oldValue, newValue) ->
-                newValue.forEach((key, value) -> {
-                    switch (key) {
-                        case PushToApplications.EMACS ->
-                                put(PUSH_EMACS_PATH, value);
-                        case PushToApplications.LYX ->
-                                put(PUSH_LYXPIPE, value);
-                        case PushToApplications.TEXMAKER ->
-                                put(PUSH_TEXMAKER_PATH, value);
-                        case PushToApplications.TEXSTUDIO ->
-                                put(PUSH_TEXSTUDIO_PATH, value);
-                        case PushToApplications.VIM ->
-                                put(PUSH_VIM, value);
-                        case PushToApplications.WIN_EDT ->
-                                put(PUSH_WINEDT_PATH, value);
-                    }
-                }));
-
+        pushToApplicationPreferences.getCommandPaths().addListener((obs, oldValue, newValue) -> storePushToApplicationPath(newValue));
         EasyBind.listen(pushToApplicationPreferences.emacsArgumentsProperty(), (obs, oldValue, newValue) -> put(PUSH_EMACS_ADDITIONAL_PARAMETERS, newValue));
         EasyBind.listen(pushToApplicationPreferences.vimServerProperty(), (obs, oldValue, newValue) -> put(PUSH_VIM_SERVER, newValue));
 
         return pushToApplicationPreferences;
     }
 
+    private void storePushToApplicationPath(Map<String, String> commandPair) {
+        commandPair.forEach((key, value) -> {
+            switch (key) {
+                case PushToApplications.EMACS ->
+                        put(PUSH_EMACS_PATH, value);
+                case PushToApplications.LYX ->
+                        put(PUSH_LYXPIPE, value);
+                case PushToApplications.TEXMAKER ->
+                        put(PUSH_TEXMAKER_PATH, value);
+                case PushToApplications.TEXSTUDIO ->
+                        put(PUSH_TEXSTUDIO_PATH, value);
+                case PushToApplications.VIM ->
+                        put(PUSH_VIM, value);
+                case PushToApplications.WIN_EDT ->
+                        put(PUSH_WINEDT_PATH, value);
+                case PushToApplications.SUBLIME_TEXT ->
+                        put(PUSH_SUBLIME_TEXT_PATH, value);
+            }
+        });
+    }
+
     @Override
     public ExternalApplicationsPreferences getExternalApplicationsPreferences() {
         if (Objects.nonNull(externalApplicationsPreferences)) {
@@ -1780,7 +1794,8 @@ public ExternalApplicationsPreferences getExternalApplicationsPreferences() {
                 !getBoolean(USE_DEFAULT_CONSOLE_APPLICATION), // mind the !
                 get(CONSOLE_COMMAND),
                 !getBoolean(USE_DEFAULT_FILE_BROWSER_APPLICATION), // mind the !
-                get(FILE_BROWSER_COMMAND));
+                get(FILE_BROWSER_COMMAND),
+                get(KINDLE_EMAIL));
 
         EasyBind.listen(externalApplicationsPreferences.eMailSubjectProperty(),
                 (obs, oldValue, newValue) -> put(EMAIL_SUBJECT, newValue));
@@ -1796,12 +1811,14 @@ public ExternalApplicationsPreferences getExternalApplicationsPreferences() {
                 (obs, oldValue, newValue) -> putBoolean(USE_DEFAULT_FILE_BROWSER_APPLICATION, !newValue)); // mind the !
         EasyBind.listen(externalApplicationsPreferences.customFileBrowserCommandProperty(),
                 (obs, oldValue, newValue) -> put(FILE_BROWSER_COMMAND, newValue));
+        EasyBind.listen(externalApplicationsPreferences.kindleEmailProperty(),
+                (obs, oldValue, newValue) -> put(KINDLE_EMAIL, newValue));
 
         return externalApplicationsPreferences;
     }
 
     //*************************************************************************************************************
-    // MainTablePreferences, SearchDialogColumnPreferences and ColumnPreferences
+    // Main table and search dialog preferences
     //*************************************************************************************************************
 
     @Override
@@ -1946,25 +1963,9 @@ public NameDisplayPreferences getNameDisplayPreferences() {
             return nameDisplayPreferences;
         }
 
-        DisplayStyle displayStyle = DisplayStyle.LASTNAME_FIRSTNAME; // default
-        if (getBoolean(NAMES_NATBIB)) {
-            displayStyle = DisplayStyle.NATBIB;
-        } else if (getBoolean(NAMES_AS_IS)) {
-            displayStyle = DisplayStyle.AS_IS;
-        } else if (getBoolean(NAMES_FIRST_LAST)) {
-            displayStyle = DisplayStyle.FIRSTNAME_LASTNAME;
-        }
-
-        AbbreviationStyle abbreviationStyle = AbbreviationStyle.NONE; // default
-        if (getBoolean(ABBR_AUTHOR_NAMES)) {
-            abbreviationStyle = AbbreviationStyle.FULL;
-        } else if (getBoolean(NAMES_LAST_ONLY)) {
-            abbreviationStyle = AbbreviationStyle.LASTNAME_ONLY;
-        }
-
         nameDisplayPreferences = new NameDisplayPreferences(
-                displayStyle,
-                abbreviationStyle);
+                getNameDisplayStyle(),
+                getNameAbbreviationStyle());
 
         EasyBind.listen(nameDisplayPreferences.displayStyleProperty(), (obs, oldValue, newValue) -> {
             putBoolean(NAMES_NATBIB, newValue == DisplayStyle.NATBIB);
@@ -1979,6 +1980,28 @@ public NameDisplayPreferences getNameDisplayPreferences() {
         return nameDisplayPreferences;
     }
 
+    private AbbreviationStyle getNameAbbreviationStyle() {
+        AbbreviationStyle abbreviationStyle = AbbreviationStyle.NONE; // default
+        if (getBoolean(ABBR_AUTHOR_NAMES)) {
+            abbreviationStyle = AbbreviationStyle.FULL;
+        } else if (getBoolean(NAMES_LAST_ONLY)) {
+            abbreviationStyle = AbbreviationStyle.LASTNAME_ONLY;
+        }
+        return abbreviationStyle;
+    }
+
+    private DisplayStyle getNameDisplayStyle() {
+        DisplayStyle displayStyle = DisplayStyle.LASTNAME_FIRSTNAME; // default
+        if (getBoolean(NAMES_NATBIB)) {
+            displayStyle = DisplayStyle.NATBIB;
+        } else if (getBoolean(NAMES_AS_IS)) {
+            displayStyle = DisplayStyle.AS_IS;
+        } else if (getBoolean(NAMES_FIRST_LAST)) {
+            displayStyle = DisplayStyle.FIRSTNAME_LASTNAME;
+        }
+        return displayStyle;
+    }
+
     //*************************************************************************************************************
     // BibEntryPreferences
     //*************************************************************************************************************
@@ -2010,156 +2033,113 @@ public InternalPreferences getInternalPreferences() {
 
         internalPreferences = new InternalPreferences(
                 Version.parse(get(VERSION_IGNORED_UPDATE)),
-                getPath(PREFS_EXPORT_PATH, JabRefDesktop.getNativeDesktop().getDefaultFileChooserDirectory()),
-                getUser()
-        );
+                getBoolean(VERSION_CHECK_ENABLED),
+                getPath(PREFS_EXPORT_PATH, OS.getNativeDesktop().getDefaultFileChooserDirectory()),
+                getUserAndHost(),
+                getBoolean(MEMORY_STICK_MODE));
 
         EasyBind.listen(internalPreferences.ignoredVersionProperty(),
                 (obs, oldValue, newValue) -> put(VERSION_IGNORED_UPDATE, newValue.toString()));
+        EasyBind.listen(internalPreferences.versionCheckEnabledProperty(),
+                (obs, oldValue, newValue) -> putBoolean(VERSION_CHECK_ENABLED, newValue));
         EasyBind.listen(internalPreferences.lastPreferencesExportPathProperty(),
                 (obs, oldValue, newValue) -> put(PREFS_EXPORT_PATH, newValue.toString()));
         // user is a static value, should only be changed for debugging
+        EasyBind.listen(internalPreferences.memoryStickModeProperty(), (obs, oldValue, newValue) -> {
+            putBoolean(MEMORY_STICK_MODE, newValue);
+            if (!newValue) {
+                try {
+                    Files.deleteIfExists(Path.of("jabref.xml"));
+                } catch (IOException e) {
+                    LOGGER.warn("Error accessing filesystem");
+                }
+            }
+        });
 
         return internalPreferences;
     }
 
-    private String getUser() {
-        if (StringUtil.isNotBlank(userName)) {
-            return userName;
-        }
-
-        try {
-            userName = get(DEFAULT_OWNER) + '-' + InetAddress.getLocalHost().getHostName();
-            return userName;
-        } catch (UnknownHostException ex) {
-            LOGGER.error("Hostname not found. Please go to https://docs.jabref.org/ to find possible problem resolution", ex);
-            return get(DEFAULT_OWNER);
+    private String getUserAndHost() {
+        if (StringUtil.isNotBlank(userAndHost)) {
+            return userAndHost;
         }
+        userAndHost = get(DEFAULT_OWNER) + '-' + OS.getNativeDesktop().getHostName();
+        return userAndHost;
     }
 
     //*************************************************************************************************************
-    // AppearancePreferences
+    // WorkspacePreferences
     //*************************************************************************************************************
 
     @Override
-    public AppearancePreferences getAppearancePreferences() {
-        if (appearancePreferences != null) {
-            return appearancePreferences;
+    public WorkspacePreferences getWorkspacePreferences() {
+        if (workspacePreferences != null) {
+            return workspacePreferences;
         }
 
-        appearancePreferences = new AppearancePreferences(
+        workspacePreferences = new WorkspacePreferences(
+                getLanguage(),
                 getBoolean(OVERRIDE_DEFAULT_FONT_SIZE),
                 getInt(MAIN_FONT_SIZE),
                 (Integer) defaults.get(MAIN_FONT_SIZE),
-                new Theme(get(FX_THEME))
-        );
-
-        EasyBind.listen(appearancePreferences.shouldOverrideDefaultFontSizeProperty(), (obs, oldValue, newValue) -> putBoolean(OVERRIDE_DEFAULT_FONT_SIZE, newValue));
-        EasyBind.listen(appearancePreferences.mainFontSizeProperty(), (obs, oldValue, newValue) -> putInt(MAIN_FONT_SIZE, newValue));
-        EasyBind.listen(appearancePreferences.themeProperty(), (obs, oldValue, newValue) -> put(FX_THEME, newValue.getName()));
-
-        return appearancePreferences;
-    }
-
-    //*************************************************************************************************************
-    // File preferences
-    //*************************************************************************************************************
-
-    @Override
-    public ImportFormatPreferences getImportFormatPreferences() {
-        return new ImportFormatPreferences(
-                getBibEntryPreferences(),
-                getCitationKeyPatternPreferences(),
-                getFieldContentParserPreferences(),
-                getXmpPreferences(),
-                getDOIPreferences(),
-                getGrobidPreferences());
-    }
-
-    @Override
-    public SaveOrderConfig getExportSaveOrder() {
-        List<SaveOrderConfig.SortCriterion> sortCriteria = List.of(
-                new SaveOrderConfig.SortCriterion(FieldFactory.parseField(get(EXPORT_PRIMARY_SORT_FIELD)), getBoolean(EXPORT_PRIMARY_SORT_DESCENDING)),
-                new SaveOrderConfig.SortCriterion(FieldFactory.parseField(get(EXPORT_SECONDARY_SORT_FIELD)), getBoolean(EXPORT_SECONDARY_SORT_DESCENDING)),
-                new SaveOrderConfig.SortCriterion(FieldFactory.parseField(get(EXPORT_TERTIARY_SORT_FIELD)), getBoolean(EXPORT_TERTIARY_SORT_DESCENDING))
-        );
-
-        return new SaveOrderConfig(
-                SaveOrderConfig.OrderType.fromBooleans(getBoolean(EXPORT_IN_SPECIFIED_ORDER), getBoolean(EXPORT_IN_ORIGINAL_ORDER)),
-                sortCriteria
-        );
-    }
+                new Theme(get(FX_THEME)),
+                getBoolean(OPEN_LAST_EDITED),
+                getBoolean(SHOW_ADVANCED_HINTS),
+                getBoolean(WARN_ABOUT_DUPLICATES_IN_INSPECTION),
+                getBoolean(CONFIRM_DELETE));
 
-    @Override
-    public void storeExportSaveOrder(SaveOrderConfig config) {
-        putBoolean(EXPORT_IN_ORIGINAL_ORDER, config.getOrderType() == SaveOrderConfig.OrderType.ORIGINAL);
-        putBoolean(EXPORT_IN_SPECIFIED_ORDER, config.getOrderType() == SaveOrderConfig.OrderType.SPECIFIED);
+        EasyBind.listen(workspacePreferences.languageProperty(), (obs, oldValue, newValue) -> {
+            put(LANGUAGE, newValue.getId());
+            if (oldValue != newValue) {
+                setLanguageDependentDefaultValues();
+                Localization.setLanguage(newValue);
+            }
+        });
+        EasyBind.listen(workspacePreferences.shouldOverrideDefaultFontSizeProperty(), (obs, oldValue, newValue) -> putBoolean(OVERRIDE_DEFAULT_FONT_SIZE, newValue));
+        EasyBind.listen(workspacePreferences.mainFontSizeProperty(), (obs, oldValue, newValue) -> putInt(MAIN_FONT_SIZE, newValue));
+        EasyBind.listen(workspacePreferences.themeProperty(), (obs, oldValue, newValue) -> put(FX_THEME, newValue.getName()));
+        EasyBind.listen(workspacePreferences.openLastEditedProperty(), (obs, oldValue, newValue) -> putBoolean(OPEN_LAST_EDITED, newValue));
+        EasyBind.listen(workspacePreferences.showAdvancedHintsProperty(), (obs, oldValue, newValue) -> putBoolean(SHOW_ADVANCED_HINTS, newValue));
+        EasyBind.listen(workspacePreferences.warnAboutDuplicatesInInspectionProperty(), (obs, oldValue, newValue) -> putBoolean(WARN_ABOUT_DUPLICATES_IN_INSPECTION, newValue));
+        EasyBind.listen(workspacePreferences.confirmDeleteProperty(), (obs, oldValue, newValue) -> putBoolean(CONFIRM_DELETE, newValue));
 
-        put(EXPORT_PRIMARY_SORT_FIELD, config.getSortCriteria().get(0).field.getName());
-        put(EXPORT_SECONDARY_SORT_FIELD, config.getSortCriteria().get(1).field.getName());
-        put(EXPORT_TERTIARY_SORT_FIELD, config.getSortCriteria().get(2).field.getName());
-        putBoolean(EXPORT_PRIMARY_SORT_DESCENDING, config.getSortCriteria().get(0).descending);
-        putBoolean(EXPORT_SECONDARY_SORT_DESCENDING, config.getSortCriteria().get(1).descending);
-        putBoolean(EXPORT_TERTIARY_SORT_DESCENDING, config.getSortCriteria().get(2).descending);
+        return workspacePreferences;
     }
 
-    private SaveOrderConfig loadTableSaveOrder() {
-        SaveOrderConfig config = new SaveOrderConfig();
-        List<MainTableColumnModel> sortOrder = mainTableColumnPreferences.getColumnSortOrder();
-
-        for (var column : sortOrder) {
-            boolean descending = (column.getSortType() == SortType.DESCENDING);
-            config.getSortCriteria().add(new SaveOrderConfig.SortCriterion(
-                    FieldFactory.parseField(column.getQualifier()),
-                    descending));
-        }
-
-        return config;
+    private Language getLanguage() {
+        return Stream.of(Language.values())
+                     .filter(language -> language.getId().equalsIgnoreCase(get(LANGUAGE)))
+                     .findFirst()
+                     .orElse(Language.ENGLISH);
     }
 
     @Override
-    public SavePreferences getSavePreferencesForExport() {
-        Boolean saveInOriginalOrder = this.getBoolean(EXPORT_IN_ORIGINAL_ORDER);
-        SaveOrderConfig saveOrder = null;
-        if (!saveInOriginalOrder) {
-            if (this.getBoolean(EXPORT_IN_SPECIFIED_ORDER)) {
-                saveOrder = this.getExportSaveOrder();
-            } else {
-                saveOrder = this.loadTableSaveOrder();
-            }
+    public FieldPreferences getFieldPreferences() {
+        if (Objects.nonNull(fieldPreferences)) {
+            return fieldPreferences;
         }
 
-        return getSavePreferences()
-                .withSaveInOriginalOrder(saveInOriginalOrder)
-                .withSaveOrder(saveOrder)
-                .withTakeMetadataSaveOrderInAccount(false);
-    }
+        fieldPreferences = new FieldPreferences(
+                !getBoolean(DO_NOT_RESOLVE_STRINGS), // mind the !
+                getStringList(RESOLVE_STRINGS_FOR_FIELDS).stream()
+                                                         .map(FieldFactory::parseField)
+                                                         .collect(Collectors.toList()),
+                getStringList(NON_WRAPPABLE_FIELDS).stream()
+                                                   .map(FieldFactory::parseField)
+                                                   .collect(Collectors.toList()));
 
-    @Override
-    public SavePreferences getSavePreferences() {
-        return new SavePreferences(
-                false,
-                null,
-                SavePreferences.DatabaseSaveType.ALL,
-                true,
-                this.getBoolean(REFORMAT_FILE_ON_SAVE_AND_EXPORT),
-                this.getFieldWriterPreferences(),
-                getCitationKeyPatternPreferences());
-    }
+        EasyBind.listen(fieldPreferences.resolveStringsProperty(), (obs, oldValue, newValue) -> putBoolean(DO_NOT_RESOLVE_STRINGS, !newValue));
+        fieldPreferences.getResolvableFields().addListener((InvalidationListener) change ->
+                put(RESOLVE_STRINGS_FOR_FIELDS, FieldFactory.serializeFieldsList(fieldPreferences.getResolvableFields())));
+        fieldPreferences.getNonWrappableFields().addListener((InvalidationListener) change ->
+                put(NON_WRAPPABLE_FIELDS, FieldFactory.serializeFieldsList(fieldPreferences.getNonWrappableFields())));
 
-    @Override
-    public FieldContentFormatterPreferences getFieldContentParserPreferences() {
-        return new FieldContentFormatterPreferences(
-                getStringList(NON_WRAPPABLE_FIELDS).stream().map(FieldFactory::parseField).collect(Collectors.toList()));
+        return fieldPreferences;
     }
 
-    @Override
-    public FieldWriterPreferences getFieldWriterPreferences() {
-        return new FieldWriterPreferences(
-                !getBoolean(DO_NOT_RESOLVE_STRINGS),
-                getStringList(RESOLVE_STRINGS_FOR_FIELDS).stream().map(FieldFactory::parseField).collect(Collectors.toList()),
-                getFieldContentParserPreferences());
-    }
+    //*************************************************************************************************************
+    // Linked files preferences
+    //*************************************************************************************************************
 
     @Override
     public FilePreferences getFilePreferences() {
@@ -2168,16 +2148,18 @@ public FilePreferences getFilePreferences() {
         }
 
         filePreferences = new FilePreferences(
-                getInternalPreferences().getUser(),
-                getPath(MAIN_FILE_DIRECTORY, JabRefDesktop.getNativeDesktop().getDefaultFileChooserDirectory()).toString(),
+                getInternalPreferences().getUserAndHost(),
+                getPath(MAIN_FILE_DIRECTORY, OS.getNativeDesktop().getDefaultFileChooserDirectory()).toString(),
                 getBoolean(STORE_RELATIVE_TO_BIB),
                 get(IMPORT_FILENAMEPATTERN),
                 get(IMPORT_FILEDIRPATTERN),
                 getBoolean(DOWNLOAD_LINKED_FILES),
                 getBoolean(FULLTEXT_INDEX_LINKED_FILES),
                 Path.of(get(WORKING_DIRECTORY)),
-                ExternalFileTypes.fromString(get(EXTERNAL_FILE_TYPES))
-        );
+                ExternalFileTypes.fromString(get(EXTERNAL_FILE_TYPES)),
+                getBoolean(CREATE_BACKUP),
+                // We choose the data directory, because a ".bak" file should survive cache cleanups
+                getPath(BACKUP_DIRECTORY, OS.getNativeDesktop().getBackupDirectory()));
 
         EasyBind.listen(filePreferences.mainFileDirectoryProperty(), (obs, oldValue, newValue) -> put(MAIN_FILE_DIRECTORY, newValue));
         EasyBind.listen(filePreferences.storeFilesRelativeToBibFileProperty(), (obs, oldValue, newValue) -> putBoolean(STORE_RELATIVE_TO_BIB, newValue));
@@ -2188,6 +2170,8 @@ public FilePreferences getFilePreferences() {
         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())));
+        EasyBind.listen(filePreferences.createBackupProperty(), (obs, oldValue, newValue) -> putBoolean(CREATE_BACKUP, newValue));
+        EasyBind.listen(filePreferences.backupDirectoryProperty(), (obs, oldValue, newValue) -> put(BACKUP_DIRECTORY, newValue.toString()));
 
         return filePreferences;
     }
@@ -2198,83 +2182,112 @@ public AutoLinkPreferences getAutoLinkPreferences() {
             return autoLinkPreferences;
         }
 
-        AutoLinkPreferences.CitationKeyDependency citationKeyDependency =
-                AutoLinkPreferences.CitationKeyDependency.START; // default
-        if (getBoolean(AUTOLINK_EXACT_KEY_ONLY)) {
-            citationKeyDependency = AutoLinkPreferences.CitationKeyDependency.EXACT;
-        } else if (getBoolean(AUTOLINK_USE_REG_EXP_SEARCH_KEY)) {
-            citationKeyDependency = AutoLinkPreferences.CitationKeyDependency.REGEX;
-        }
-
         autoLinkPreferences = new AutoLinkPreferences(
-                citationKeyDependency,
+                getAutoLinkKeyDependency(),
                 get(AUTOLINK_REG_EXP_SEARCH_EXPRESSION_KEY),
                 getBoolean(ASK_AUTO_NAMING_PDFS_AGAIN),
                 bibEntryPreferences.keywordSeparatorProperty());
 
         EasyBind.listen(autoLinkPreferences.citationKeyDependencyProperty(), (obs, oldValue, newValue) -> {
             // Starts bibtex only omitted, as it is not being saved
-            switch (newValue) {
-                case START -> {
-                    putBoolean(AUTOLINK_EXACT_KEY_ONLY, false);
-                    putBoolean(AUTOLINK_USE_REG_EXP_SEARCH_KEY, false);
-                }
-                case EXACT -> {
-                    putBoolean(AUTOLINK_EXACT_KEY_ONLY, true);
-                    putBoolean(AUTOLINK_USE_REG_EXP_SEARCH_KEY, false);
-                }
-                case REGEX -> {
-                    putBoolean(AUTOLINK_EXACT_KEY_ONLY, false);
-                    putBoolean(AUTOLINK_USE_REG_EXP_SEARCH_KEY, true);
-                }
-            }
+            putBoolean(AUTOLINK_EXACT_KEY_ONLY, newValue == AutoLinkPreferences.CitationKeyDependency.EXACT);
+            putBoolean(AUTOLINK_USE_REG_EXP_SEARCH_KEY, newValue == AutoLinkPreferences.CitationKeyDependency.REGEX);
         });
-        EasyBind.listen(autoLinkPreferences.askAutoNamingPdfsProperty(), (obs, oldValue, newValue) -> putBoolean(ASK_AUTO_NAMING_PDFS_AGAIN, newValue));
-        EasyBind.listen(autoLinkPreferences.regularExpressionProperty(), (obs, oldValue, newValue) -> put(AUTOLINK_REG_EXP_SEARCH_EXPRESSION_KEY, newValue));
+        EasyBind.listen(autoLinkPreferences.askAutoNamingPdfsProperty(),
+                (obs, oldValue, newValue) -> putBoolean(ASK_AUTO_NAMING_PDFS_AGAIN, newValue));
+        EasyBind.listen(autoLinkPreferences.regularExpressionProperty(),
+                (obs, oldValue, newValue) -> put(AUTOLINK_REG_EXP_SEARCH_EXPRESSION_KEY, newValue));
 
         return autoLinkPreferences;
     }
 
+    private AutoLinkPreferences.CitationKeyDependency getAutoLinkKeyDependency() {
+        AutoLinkPreferences.CitationKeyDependency citationKeyDependency =
+                AutoLinkPreferences.CitationKeyDependency.START; // default
+        if (getBoolean(AUTOLINK_EXACT_KEY_ONLY)) {
+            citationKeyDependency = AutoLinkPreferences.CitationKeyDependency.EXACT;
+        } else if (getBoolean(AUTOLINK_USE_REG_EXP_SEARCH_KEY)) {
+            citationKeyDependency = AutoLinkPreferences.CitationKeyDependency.REGEX;
+        }
+        return citationKeyDependency;
+    }
+
     //*************************************************************************************************************
     // Import/Export preferences
     //*************************************************************************************************************
 
     @Override
-    public ImportExportPreferences getImportExportPreferences() {
-        if (Objects.nonNull(importExportPreferences)) {
-            return importExportPreferences;
+    public ExportPreferences getExportPreferences() {
+        if (Objects.nonNull(exportPreferences)) {
+            return exportPreferences;
         }
 
-        importExportPreferences = new ImportExportPreferences(
-                getBoolean(OPEN_LAST_EDITED),
-                get(NON_WRAPPABLE_FIELDS),
-                !getBoolean(DO_NOT_RESOLVE_STRINGS),
-                get(RESOLVE_STRINGS_FOR_FIELDS),
-                getBoolean(REFORMAT_FILE_ON_SAVE_AND_EXPORT),
-                Path.of(get(IMPORT_WORKING_DIRECTORY)),
+        exportPreferences = new ExportPreferences(
                 get(LAST_USED_EXPORT),
                 Path.of(get(EXPORT_WORKING_DIRECTORY)),
-                getBoolean(LOCAL_AUTO_SAVE),
-                getBoolean(WARN_ABOUT_DUPLICATES_IN_INSPECTION));
+                getExportSaveOrder(),
+                getCustomExportFormats());
+
+        EasyBind.listen(exportPreferences.lastExportExtensionProperty(), (obs, oldValue, newValue) -> put(LAST_USED_EXPORT, newValue));
+        EasyBind.listen(exportPreferences.exportWorkingDirectoryProperty(), (obs, oldValue, newValue) -> put(EXPORT_WORKING_DIRECTORY, newValue.toString()));
+        EasyBind.listen(exportPreferences.exportSaveOrderProperty(), (obs, oldValue, newValue) -> storeExportSaveOrder(newValue));
+        exportPreferences.getCustomExporters().addListener((InvalidationListener) c -> storeCustomExportFormats(exportPreferences.getCustomExporters()));
+
+        return exportPreferences;
+    }
+
+    private SaveOrder getExportSaveOrder() {
+        List<SaveOrder.SortCriterion> sortCriteria = List.of(
+                new SaveOrder.SortCriterion(FieldFactory.parseField(get(EXPORT_PRIMARY_SORT_FIELD)), getBoolean(EXPORT_PRIMARY_SORT_DESCENDING)),
+                new SaveOrder.SortCriterion(FieldFactory.parseField(get(EXPORT_SECONDARY_SORT_FIELD)), getBoolean(EXPORT_SECONDARY_SORT_DESCENDING)),
+                new SaveOrder.SortCriterion(FieldFactory.parseField(get(EXPORT_TERTIARY_SORT_FIELD)), getBoolean(EXPORT_TERTIARY_SORT_DESCENDING))
+        );
 
-        EasyBind.listen(importExportPreferences.openLastEditedProperty(), (obs, oldValue, newValue) -> putBoolean(OPEN_LAST_EDITED, newValue));
-        EasyBind.listen(importExportPreferences.nonWrappableFieldsProperty(), (obs, oldValue, newValue) -> put(NON_WRAPPABLE_FIELDS, newValue));
-        EasyBind.listen(importExportPreferences.resolveStringsProperty(), (obs, oldValue, newValue) -> putBoolean(DO_NOT_RESOLVE_STRINGS, !newValue));
-        EasyBind.listen(importExportPreferences.resolvableFieldsProperty(), (obs, oldValue, newValue) -> put(RESOLVE_STRINGS_FOR_FIELDS, newValue));
-        EasyBind.listen(importExportPreferences.alwaysReformatOnSaveProperty(), (obs, oldValue, newValue) -> putBoolean(REFORMAT_FILE_ON_SAVE_AND_EXPORT, newValue));
-        EasyBind.listen(importExportPreferences.importWorkingDirectoryProperty(), (obs, oldValue, newValue) -> put(IMPORT_WORKING_DIRECTORY, newValue.toString()));
-        EasyBind.listen(importExportPreferences.lastExportExtensionProperty(), (obs, oldValue, newValue) -> put(LAST_USED_EXPORT, newValue));
-        EasyBind.listen(importExportPreferences.exportWorkingDirectoryProperty(), (obs, oldValue, newValue) -> put(EXPORT_WORKING_DIRECTORY, newValue.toString()));
-        EasyBind.listen(importExportPreferences.autoSaveProperty(), (obs, oldValue, newValue) -> putBoolean(LOCAL_AUTO_SAVE, newValue));
-        EasyBind.listen(importExportPreferences.warnAboutDuplicatesOnImportProperty(), (obs, oldValue, newValue) -> putBoolean(WARN_ABOUT_DUPLICATES_IN_INSPECTION, newValue));
+        return new SaveOrder(
+                SaveOrder.OrderType.fromBooleans(getBoolean(EXPORT_IN_SPECIFIED_ORDER), getBoolean(EXPORT_IN_ORIGINAL_ORDER)),
+                sortCriteria
+        );
+    }
+
+    private void storeExportSaveOrder(SaveOrder saveOrder) {
+        putBoolean(EXPORT_IN_ORIGINAL_ORDER, saveOrder.getOrderType() == SaveOrder.OrderType.ORIGINAL);
+        putBoolean(EXPORT_IN_SPECIFIED_ORDER, saveOrder.getOrderType() == SaveOrder.OrderType.SPECIFIED);
+
+        put(EXPORT_PRIMARY_SORT_FIELD, saveOrder.getSortCriteria().get(0).field.getName());
+        put(EXPORT_SECONDARY_SORT_FIELD, saveOrder.getSortCriteria().get(1).field.getName());
+        put(EXPORT_TERTIARY_SORT_FIELD, saveOrder.getSortCriteria().get(2).field.getName());
+        putBoolean(EXPORT_PRIMARY_SORT_DESCENDING, saveOrder.getSortCriteria().get(0).descending);
+        putBoolean(EXPORT_SECONDARY_SORT_DESCENDING, saveOrder.getSortCriteria().get(1).descending);
+        putBoolean(EXPORT_TERTIARY_SORT_DESCENDING, saveOrder.getSortCriteria().get(2).descending);
+    }
 
-        return importExportPreferences;
+    /**
+     * For the export configuration, generates the SelfContainedSaveOrder having the reference to TABLE resolved.
+     */
+    public SelfContainedSaveOrder getSelfContainedTableSaveOrder() {
+        List<MainTableColumnModel> sortOrder = mainTableColumnPreferences.getColumnSortOrder();
+        return new SelfContainedSaveOrder(
+                SaveOrder.OrderType.SPECIFIED,
+                sortOrder.stream().flatMap(model -> model.getSortCriteria().stream()).toList());
     }
 
     @Override
-    public List<TemplateExporter> getCustomExportFormats(JournalAbbreviationRepository abbreviationRepository) {
-        LayoutFormatterPreferences layoutPreferences = getLayoutFormatterPreferences(abbreviationRepository);
-        SavePreferences savePreferences = getSavePreferencesForExport();
+    public SelfContainedSaveConfiguration getSelfContainedExportConfiguration() {
+        SaveOrder exportSaveOrder = getExportSaveOrder();
+        SelfContainedSaveOrder saveOrder = switch (exportSaveOrder.getOrderType()) {
+            case TABLE -> this.getSelfContainedTableSaveOrder();
+            case SPECIFIED -> SelfContainedSaveOrder.of(exportSaveOrder);
+            case ORIGINAL -> SaveOrder.getDefaultSaveOrder();
+        };
+
+        return new SelfContainedSaveConfiguration(
+                saveOrder, false, BibDatabaseWriter.SaveType.WITH_JABREF_META_DATA, getLibraryPreferences()
+                .shouldAlwaysReformatOnSave());
+    }
+
+    private List<TemplateExporter> getCustomExportFormats() {
+        LayoutFormatterPreferences layoutPreferences = getLayoutFormatterPreferences();
+        SelfContainedSaveConfiguration saveConfiguration = getSelfContainedExportConfiguration();
         List<TemplateExporter> formats = new ArrayList<>();
 
         for (String toImport : getSeries(CUSTOM_EXPORT_FORMAT)) {
@@ -2284,15 +2297,14 @@ public List<TemplateExporter> getCustomExportFormats(JournalAbbreviationReposito
                     formatData.get(EXPORTER_FILENAME_INDEX),
                     formatData.get(EXPORTER_EXTENSION_INDEX),
                     layoutPreferences,
-                    savePreferences);
+                    saveConfiguration.getSelfContainedSaveOrder());
             format.setCustomExport(true);
             formats.add(format);
         }
         return formats;
     }
 
-    @Override
-    public void storeCustomExportFormats(List<TemplateExporter> exporters) {
+    private void storeCustomExportFormats(List<TemplateExporter> exporters) {
         if (exporters.isEmpty()) {
             purgeSeries(CUSTOM_EXPORT_FORMAT, 0);
         } else {
@@ -2324,19 +2336,11 @@ public PreviewPreferences getPreviewPreferences() {
         this.previewPreferences = new PreviewPreferences(
                 layouts,
                 getPreviewCyclePosition(layouts),
-                new TextBasedPreviewLayout(style, getLayoutFormatterPreferences(Globals.journalAbbreviationRepository)),
+                new TextBasedPreviewLayout(style, getLayoutFormatterPreferences(), Globals.journalAbbreviationRepository),
                 (String) defaults.get(PREVIEW_STYLE),
                 getBoolean(PREVIEW_AS_TAB));
 
-        previewPreferences.getLayoutCycle().addListener((InvalidationListener) c ->
-                putStringList(CYCLE_PREVIEW, previewPreferences.getLayoutCycle().stream()
-                                                               .map(layout -> {
-                                                                   if (layout instanceof CitationStylePreviewLayout citationStyleLayout) {
-                                                                       return citationStyleLayout.getFilePath();
-                                                                   } else {
-                                                                       return layout.getDisplayName();
-                                                                   }
-                                                               }).collect(Collectors.toList())));
+        previewPreferences.getLayoutCycle().addListener((InvalidationListener) c -> storePreviewLayouts(previewPreferences.getLayoutCycle()));
         EasyBind.listen(previewPreferences.layoutCyclePositionProperty(), (obs, oldValue, newValue) -> putInt(CYCLE_PREVIEW_POS, newValue));
         EasyBind.listen(previewPreferences.customPreviewLayoutProperty(), (obs, oldValue, newValue) -> put(PREVIEW_STYLE, newValue.getText()));
         EasyBind.listen(previewPreferences.showPreviewAsExtraTabProperty(), (obs, oldValue, newValue) -> putBoolean(PREVIEW_AS_TAB, newValue));
@@ -2359,13 +2363,25 @@ private List<PreviewLayout> getPreviewLayouts(String style) {
                                                 .map(file -> (PreviewLayout) new CitationStylePreviewLayout(file, Globals.entryTypesManager))
                                                 .orElse(null);
                         } else {
-                            return new TextBasedPreviewLayout(style, getLayoutFormatterPreferences(Globals.journalAbbreviationRepository));
+                            return new TextBasedPreviewLayout(style, getLayoutFormatterPreferences(), Globals.journalAbbreviationRepository);
                         }
                     })
                     .filter(Objects::nonNull)
                     .collect(Collectors.toList());
     }
 
+    private void storePreviewLayouts(ObservableList<PreviewLayout> previewCycle) {
+        putStringList(CYCLE_PREVIEW, previewCycle.stream()
+                                                 .map(layout -> {
+                                                     if (layout instanceof CitationStylePreviewLayout citationStyleLayout) {
+                                                         return citationStyleLayout.getFilePath();
+                                                     } else {
+                                                         return layout.getDisplayName();
+                                                     }
+                                                 }).collect(Collectors.toList())
+        );
+    }
+
     private int getPreviewCyclePosition(List<PreviewLayout> layouts) {
         int storedCyclePos = getInt(CYCLE_PREVIEW_POS);
         if (storedCyclePos < layouts.size()) {
@@ -2518,6 +2534,7 @@ public GuiPreferences getGuiPreferences() {
                 getDouble(SIZE_X),
                 getDouble(SIZE_Y),
                 getBoolean(WINDOW_MAXIMISED),
+                getBoolean(WINDOW_FULLSCREEN),
                 getStringList(LAST_EDITED),
                 Path.of(get(LAST_FOCUSED)),
                 getFileHistory(),
@@ -2534,6 +2551,7 @@ public GuiPreferences getGuiPreferences() {
         EasyBind.listen(guiPreferences.sizeXProperty(), (obs, oldValue, newValue) -> putDouble(SIZE_X, newValue.doubleValue()));
         EasyBind.listen(guiPreferences.sizeYProperty(), (obs, oldValue, newValue) -> putDouble(SIZE_Y, newValue.doubleValue()));
         EasyBind.listen(guiPreferences.windowMaximisedProperty(), (obs, oldValue, newValue) -> putBoolean(WINDOW_MAXIMISED, newValue));
+        EasyBind.listen(guiPreferences.windowFullScreenProperty(), (obs, oldValue, newValue) -> putBoolean(WINDOW_FULLSCREEN, newValue));
         guiPreferences.getLastFilesOpened().addListener((ListChangeListener<String>) change -> {
             if (change.getList().isEmpty()) {
                 prefs.remove(LAST_EDITED);
@@ -2574,7 +2592,7 @@ private void storeFileHistory(FileHistory history) {
     }
 
     //*************************************************************************************************************
-    // Search preferences
+    // Misc preferences
     //*************************************************************************************************************
 
     @Override
@@ -2616,10 +2634,6 @@ public SearchPreferences getSearchPreferences() {
         return searchPreferences;
     }
 
-    //*************************************************************************************************************
-    // Misc preferences
-    //*************************************************************************************************************
-
     @Override
     public XmpPreferences getXmpPreferences() {
         if (Objects.nonNull(xmpPreferences)) {
@@ -2770,14 +2784,21 @@ public ImporterPreferences getImporterPreferences() {
         }
 
         importerPreferences = new ImporterPreferences(
+                getBoolean(IMPORTERS_ENABLED),
                 getBoolean(GENERATE_KEY_ON_IMPORT),
+                Path.of(get(IMPORT_WORKING_DIRECTORY)),
+                getBoolean(WARN_ABOUT_DUPLICATES_IN_INSPECTION),
                 getCustomImportFormats(),
-                getFetcherKeys()
-        );
+                getFetcherKeys(),
+                getBoolean(FETCHER_CUSTOM_KEY_PERSIST));
 
+        EasyBind.listen(importerPreferences.importerEnabledProperty(), (obs, oldValue, newValue) -> putBoolean(IMPORTERS_ENABLED, newValue));
         EasyBind.listen(importerPreferences.generateNewKeyOnImportProperty(), (obs, oldValue, newValue) -> putBoolean(GENERATE_KEY_ON_IMPORT, newValue));
+        EasyBind.listen(importerPreferences.importWorkingDirectoryProperty(), (obs, oldValue, newValue) -> put(IMPORT_WORKING_DIRECTORY, newValue.toString()));
+        EasyBind.listen(importerPreferences.warnAboutDuplicatesOnImportProperty(), (obs, oldValue, newValue) -> putBoolean(WARN_ABOUT_DUPLICATES_IN_INSPECTION, newValue));
+        EasyBind.listen(importerPreferences.persistCustomKeysProperty(), (obs, oldValue, newValue) -> putBoolean(FETCHER_CUSTOM_KEY_PERSIST, newValue));
         importerPreferences.getApiKeys().addListener((InvalidationListener) c -> storeFetcherKeys(importerPreferences.getApiKeys()));
-        importerPreferences.getCustomImportList().addListener((InvalidationListener) c -> storeCustomImportFormats(importerPreferences.getCustomImportList()));
+        importerPreferences.getCustomImporters().addListener((InvalidationListener) c -> storeCustomImportFormats(importerPreferences.getCustomImporters()));
 
         return importerPreferences;
     }
@@ -2803,7 +2824,7 @@ private Set<CustomImporter> getCustomImportFormats() {
         return importers;
     }
 
-    public void storeCustomImportFormats(Set<CustomImporter> importers) {
+    private 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++) {
@@ -2816,7 +2837,7 @@ private Set<FetcherApiKey> getFetcherKeys() {
 
         List<String> names = getStringList(FETCHER_CUSTOM_KEY_NAMES);
         List<String> uses = getStringList(FETCHER_CUSTOM_KEY_USES);
-        List<String> keys = getStringList(FETCHER_CUSTOM_KEYS);
+        List<String> keys = getFetcherKeysFromKeyring(names);
 
         for (int i = 0; i < names.size(); i++) {
             fetcherApiKeys.add(new FetcherApiKey(
@@ -2829,6 +2850,28 @@ private Set<FetcherApiKey> getFetcherKeys() {
         return fetcherApiKeys;
     }
 
+    private List<String> getFetcherKeysFromKeyring(List<String> names) {
+        List<String> keys = new ArrayList<>();
+
+        try (final Keyring keyring = Keyring.create()) {
+            for (String fetcher : names) {
+                try {
+                    keys.add(new Password(
+                            keyring.getPassword("org.jabref.customapikeys", fetcher),
+                            getInternalPreferences().getUserAndHost())
+                            .decrypt());
+                } catch (PasswordAccessException ex) {
+                    LOGGER.debug("No api key stored for {} fetcher", fetcher);
+                    keys.add("");
+                }
+            }
+        } catch (Exception ex) {
+            LOGGER.warn("JabRef could not open the key store");
+        }
+
+        return keys;
+    }
+
     private void storeFetcherKeys(Set<FetcherApiKey> fetcherApiKeys) {
         List<String> names = new ArrayList<>();
         List<String> uses = new ArrayList<>();
@@ -2842,7 +2885,44 @@ private void storeFetcherKeys(Set<FetcherApiKey> fetcherApiKeys) {
 
         putStringList(FETCHER_CUSTOM_KEY_NAMES, names);
         putStringList(FETCHER_CUSTOM_KEY_USES, uses);
-        putStringList(FETCHER_CUSTOM_KEYS, keys);
+
+        if (getBoolean(FETCHER_CUSTOM_KEY_PERSIST)) {
+            storeFetcherKeysToKeyring(names, keys);
+        } else {
+            clearCustomFetcherKeys();
+        }
+    }
+
+    private void storeFetcherKeysToKeyring(List<String> names, List<String> keys) {
+        try (final Keyring keyring = Keyring.create()) {
+            for (int i = 0; i < names.size(); i++) {
+                if (StringUtil.isNullOrEmpty(keys.get(i))) {
+                    try {
+                        keyring.deletePassword("org.jabref.customapikeys", names.get(i));
+                    } catch (PasswordAccessException ex) {
+                        // Already removed
+                    }
+                } else {
+                    keyring.setPassword("org.jabref.customapikeys", names.get(i), new Password(
+                            keys.get(i),
+                            getInternalPreferences().getUserAndHost())
+                            .encrypt());
+                }
+            }
+        } catch (Exception ex) {
+            LOGGER.error("Unable to open key store");
+        }
+    }
+
+    private void clearCustomFetcherKeys() {
+        List<String> names = getStringList(FETCHER_CUSTOM_KEY_NAMES);
+        try (final Keyring keyring = Keyring.create()) {
+            for (String name : names) {
+                keyring.deletePassword("org.jabref.customapikeys", name);
+            }
+        } catch (Exception ex) {
+            LOGGER.error("Unable to open key store");
+        }
     }
 
     @Override
@@ -2862,4 +2942,15 @@ public GrobidPreferences getGrobidPreferences() {
 
         return grobidPreferences;
     }
+
+    @Override
+    public ImportFormatPreferences getImportFormatPreferences() {
+        return new ImportFormatPreferences(
+                getBibEntryPreferences(),
+                getCitationKeyPatternPreferences(),
+                getFieldPreferences(),
+                getXmpPreferences(),
+                getDOIPreferences(),
+                getGrobidPreferences());
+    }
 }
diff --git a/src/main/java/org/jabref/preferences/LibraryPreferences.java b/src/main/java/org/jabref/preferences/LibraryPreferences.java
new file mode 100644
index 00000000000..6ccb51e6697
--- /dev/null
+++ b/src/main/java/org/jabref/preferences/LibraryPreferences.java
@@ -0,0 +1,59 @@
+package org.jabref.preferences;
+
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.SimpleObjectProperty;
+
+import org.jabref.model.database.BibDatabaseMode;
+
+public class LibraryPreferences {
+
+    private final ObjectProperty<BibDatabaseMode> defaultBibDatabaseMode;
+    private final BooleanProperty alwaysReformatOnSave;
+    private final BooleanProperty autoSave;
+
+    public LibraryPreferences(BibDatabaseMode defaultBibDatabaseMode,
+                              boolean alwaysReformatOnSave,
+                              boolean autoSave) {
+        this.defaultBibDatabaseMode = new SimpleObjectProperty<>(defaultBibDatabaseMode);
+        this.alwaysReformatOnSave = new SimpleBooleanProperty(alwaysReformatOnSave);
+        this.autoSave = new SimpleBooleanProperty(autoSave);
+    }
+
+    public BibDatabaseMode getDefaultBibDatabaseMode() {
+        return defaultBibDatabaseMode.get();
+    }
+
+    public ObjectProperty<BibDatabaseMode> defaultBibDatabaseModeProperty() {
+        return defaultBibDatabaseMode;
+    }
+
+    public void setDefaultBibDatabaseMode(BibDatabaseMode defaultBibDatabaseMode) {
+        this.defaultBibDatabaseMode.set(defaultBibDatabaseMode);
+    }
+
+    public boolean shouldAlwaysReformatOnSave() {
+        return alwaysReformatOnSave.get();
+    }
+
+    public BooleanProperty alwaysReformatOnSaveProperty() {
+        return alwaysReformatOnSave;
+    }
+
+    public void setAlwaysReformatOnSave(boolean alwaysReformatOnSave) {
+        this.alwaysReformatOnSave.set(alwaysReformatOnSave);
+    }
+
+    public boolean shouldAutoSave() {
+        return autoSave.get();
+    }
+
+    public BooleanProperty autoSaveProperty() {
+        return autoSave;
+    }
+
+    public void setAutoSave(boolean shouldAutoSave) {
+        this.autoSave.set(shouldAutoSave);
+    }
+}
diff --git a/src/main/java/org/jabref/preferences/PreferencesService.java b/src/main/java/org/jabref/preferences/PreferencesService.java
index ea255959a91..a03123740d6 100644
--- a/src/main/java/org/jabref/preferences/PreferencesService.java
+++ b/src/main/java/org/jabref/preferences/PreferencesService.java
@@ -1,9 +1,7 @@
 package org.jabref.preferences;
 
 import java.nio.file.Path;
-import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.prefs.BackingStoreException;
 
 import org.jabref.gui.autocompleter.AutoCompletePreferences;
@@ -15,16 +13,13 @@
 import org.jabref.gui.maintable.NameDisplayPreferences;
 import org.jabref.gui.specialfields.SpecialFieldsPreferences;
 import org.jabref.logic.JabRefException;
-import org.jabref.logic.bibtex.FieldContentFormatterPreferences;
-import org.jabref.logic.bibtex.FieldWriterPreferences;
+import org.jabref.logic.bibtex.FieldPreferences;
 import org.jabref.logic.citationkeypattern.CitationKeyPatternPreferences;
-import org.jabref.logic.exporter.SavePreferences;
-import org.jabref.logic.exporter.TemplateExporter;
+import org.jabref.logic.exporter.SelfContainedSaveConfiguration;
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.ImporterPreferences;
 import org.jabref.logic.importer.fetcher.GrobidPreferences;
 import org.jabref.logic.journals.JournalAbbreviationPreferences;
-import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.layout.LayoutFormatterPreferences;
 import org.jabref.logic.layout.format.NameFormatterPreferences;
 import org.jabref.logic.net.ProxyPreferences;
@@ -38,14 +33,22 @@
 import org.jabref.logic.util.io.AutoLinkPreferences;
 import org.jabref.logic.xmp.XmpPreferences;
 import org.jabref.model.entry.BibEntryTypesManager;
-import org.jabref.model.entry.field.Field;
-import org.jabref.model.metadata.SaveOrderConfig;
 
 import org.jvnet.hk2.annotations.Contract;
 
 @Contract
 public interface PreferencesService {
 
+    void clear() throws BackingStoreException;
+
+    void deleteKey(String key) throws IllegalArgumentException;
+
+    void flush();
+
+    void exportPreferences(Path file) throws JabRefException;
+
+    void importPreferences(Path file) throws JabRefException;
+
     InternalPreferences getInternalPreferences();
 
     BibEntryPreferences getBibEntryPreferences();
@@ -58,9 +61,7 @@ public interface PreferencesService {
 
     FilePreferences getFilePreferences();
 
-    FieldWriterPreferences getFieldWriterPreferences();
-
-    FieldContentFormatterPreferences getFieldContentParserPreferences();
+    FieldPreferences getFieldPreferences();
 
     OpenOfficePreferences getOpenOfficePreferences();
 
@@ -68,27 +69,14 @@ public interface PreferencesService {
 
     Map<String, Object> getDefaults();
 
-    void exportPreferences(Path file) throws JabRefException;
-
-    void importPreferences(Path file) throws JabRefException;
-
-    LayoutFormatterPreferences getLayoutFormatterPreferences(JournalAbbreviationRepository repository);
+    LayoutFormatterPreferences getLayoutFormatterPreferences();
 
     ImportFormatPreferences getImportFormatPreferences();
 
-    SavePreferences getSavePreferencesForExport();
-
-    SavePreferences getSavePreferences();
-
-    SaveOrderConfig getExportSaveOrder();
-
-    void storeExportSaveOrder(SaveOrderConfig config);
-
-    void clear() throws BackingStoreException;
-
-    void deleteKey(String key) throws IllegalArgumentException;
-
-    void flush();
+    /**
+     * Returns the export configuration. The contained SaveConfiguration is a {@link org.jabref.model.metadata.SelfContainedSaveOrder}
+     */
+    SelfContainedSaveConfiguration getSelfContainedExportConfiguration();
 
     BibEntryTypesManager getCustomEntryTypesRepository();
 
@@ -98,11 +86,7 @@ public interface PreferencesService {
 
     CleanupPreferences getDefaultCleanupPreset();
 
-    //*************************************************************************************************************
-    // GeneralPreferences
-    //*************************************************************************************************************
-
-    GeneralPreferences getGeneralPreferences();
+    LibraryPreferences getLibraryPreferences();
 
     TelemetryPreferences getTelemetryPreferences();
 
@@ -112,110 +96,46 @@ public interface PreferencesService {
 
     TimestampPreferences getTimestampPreferences();
 
-    //*************************************************************************************************************
-    // GroupsPreferences
-    //*************************************************************************************************************
-
     GroupsPreferences getGroupsPreferences();
 
-    //*************************************************************************************************************
-    // EntryEditorPreferences
-    //*************************************************************************************************************
-
-    Map<String, Set<Field>> getDefaultTabNamesAndFields();
-
-    List<Field> getAllDefaultTabFieldNames();
-
     EntryEditorPreferences getEntryEditorPreferences();
 
-    //*************************************************************************************************************
-    // Network preferences
-    //*************************************************************************************************************
-
     RemotePreferences getRemotePreferences();
 
     ProxyPreferences getProxyPreferences();
 
     SSLPreferences getSSLPreferences();
 
-    //*************************************************************************************************************
-    // CitationKeyPatternPreferences
-    //*************************************************************************************************************
-
     CitationKeyPatternPreferences getCitationKeyPatternPreferences();
 
-    //*************************************************************************************************************
-    // ExternalApplicationsPreferences
-    //*************************************************************************************************************
-
     PushToApplicationPreferences getPushToApplicationPreferences();
 
     ExternalApplicationsPreferences getExternalApplicationsPreferences();
 
-    //*************************************************************************************************************
-    // MainTablePreferences
-    //*************************************************************************************************************
-
     ColumnPreferences getMainTableColumnPreferences();
 
     MainTablePreferences getMainTablePreferences();
 
     NameDisplayPreferences getNameDisplayPreferences();
 
-    //*************************************************************************************************************
-    // SearchDialogColumnPreferences
-    //*************************************************************************************************************
-
     ColumnPreferences getSearchDialogColumnPreferences();
 
-    //*************************************************************************************************************
-    // AppearancePreferences
-    //*************************************************************************************************************
-
-    AppearancePreferences getAppearancePreferences();
-
-    //*************************************************************************************************************
-    // File preferences
-    //*************************************************************************************************************
+    WorkspacePreferences getWorkspacePreferences();
 
     AutoLinkPreferences getAutoLinkPreferences();
 
-    //*************************************************************************************************************
-    // Import/Export preferences
-    //*************************************************************************************************************
-
-    ImportExportPreferences getImportExportPreferences();
-
-    List<TemplateExporter> getCustomExportFormats(JournalAbbreviationRepository repository);
-
-    void storeCustomExportFormats(List<TemplateExporter> exporters);
+    ExportPreferences getExportPreferences();
 
     ImporterPreferences getImporterPreferences();
 
     GrobidPreferences getGrobidPreferences();
 
-    //*************************************************************************************************************
-    // Preview preferences
-    //*************************************************************************************************************
-
     PreviewPreferences getPreviewPreferences();
 
-    //*************************************************************************************************************
-    // SidePanePreferences
-    //*************************************************************************************************************
-
     SidePanePreferences getSidePanePreferences();
 
-    //*************************************************************************************************************
-    // GuiPreferences
-    //*************************************************************************************************************
-
     GuiPreferences getGuiPreferences();
 
-    //*************************************************************************************************************
-    // Misc preferences
-    //*************************************************************************************************************
-
     XmpPreferences getXmpPreferences();
 
     NameFormatterPreferences getNameFormatterPreferences();
diff --git a/src/main/java/org/jabref/preferences/WorkspacePreferences.java b/src/main/java/org/jabref/preferences/WorkspacePreferences.java
new file mode 100644
index 00000000000..bde96a61704
--- /dev/null
+++ b/src/main/java/org/jabref/preferences/WorkspacePreferences.java
@@ -0,0 +1,143 @@
+package org.jabref.preferences;
+
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.IntegerProperty;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.SimpleIntegerProperty;
+import javafx.beans.property.SimpleObjectProperty;
+
+import org.jabref.gui.theme.Theme;
+import org.jabref.logic.l10n.Language;
+
+public class WorkspacePreferences {
+    private final ObjectProperty<Language> language;
+    private final BooleanProperty shouldOverrideDefaultFontSize;
+    private final IntegerProperty mainFontSize;
+    private final IntegerProperty defaultFontSize;
+    private final ObjectProperty<Theme> theme;
+    private final BooleanProperty shouldOpenLastEdited;
+    private final BooleanProperty showAdvancedHints;
+    private final BooleanProperty warnAboutDuplicatesInInspection;
+    private final BooleanProperty confirmDelete;
+
+    public WorkspacePreferences(Language language,
+                                boolean shouldOverrideDefaultFontSize,
+                                int mainFontSize,
+                                int defaultFontSize,
+                                Theme theme,
+                                boolean shouldOpenLastEdited,
+                                boolean showAdvancedHints,
+                                boolean warnAboutDuplicatesInInspection,
+                                boolean confirmDelete) {
+        this.language = new SimpleObjectProperty<>(language);
+        this.shouldOverrideDefaultFontSize = new SimpleBooleanProperty(shouldOverrideDefaultFontSize);
+        this.mainFontSize = new SimpleIntegerProperty(mainFontSize);
+        this.defaultFontSize = new SimpleIntegerProperty(defaultFontSize);
+        this.theme = new SimpleObjectProperty<>(theme);
+        this.shouldOpenLastEdited = new SimpleBooleanProperty(shouldOpenLastEdited);
+        this.showAdvancedHints = new SimpleBooleanProperty(showAdvancedHints);
+        this.warnAboutDuplicatesInInspection = new SimpleBooleanProperty(warnAboutDuplicatesInInspection);
+        this.confirmDelete = new SimpleBooleanProperty(confirmDelete);
+    }
+
+    public Language getLanguage() {
+        return language.get();
+    }
+
+    public ObjectProperty<Language> languageProperty() {
+        return language;
+    }
+
+    public void setLanguage(Language language) {
+        this.language.set(language);
+    }
+
+    public boolean shouldOverrideDefaultFontSize() {
+        return shouldOverrideDefaultFontSize.get();
+    }
+
+    public void setShouldOverrideDefaultFontSize(boolean newValue) {
+        shouldOverrideDefaultFontSize.set(newValue);
+    }
+
+    public BooleanProperty shouldOverrideDefaultFontSizeProperty() {
+        return shouldOverrideDefaultFontSize;
+    }
+
+    public int getMainFontSize() {
+        return mainFontSize.get();
+    }
+
+    public int getDefaultFontSize() {
+        return defaultFontSize.get();
+    }
+
+    public void setMainFontSize(int mainFontSize) {
+        this.mainFontSize.set(mainFontSize);
+    }
+
+    public IntegerProperty mainFontSizeProperty() {
+        return mainFontSize;
+    }
+
+    public Theme getTheme() {
+        return theme.get();
+    }
+
+    public void setTheme(Theme theme) {
+        this.theme.set(theme);
+    }
+
+    public ObjectProperty<Theme> themeProperty() {
+        return theme;
+    }
+
+    public boolean shouldOpenLastEdited() {
+        return shouldOpenLastEdited.get();
+    }
+
+    public BooleanProperty openLastEditedProperty() {
+        return shouldOpenLastEdited;
+    }
+
+    public void setOpenLastEdited(boolean shouldOpenLastEdited) {
+        this.shouldOpenLastEdited.set(shouldOpenLastEdited);
+    }
+
+    public boolean shouldShowAdvancedHints() {
+        return showAdvancedHints.get();
+    }
+
+    public BooleanProperty showAdvancedHintsProperty() {
+        return showAdvancedHints;
+    }
+
+    public void setShowAdvancedHints(boolean showAdvancedHints) {
+        this.showAdvancedHints.set(showAdvancedHints);
+    }
+
+    public boolean shouldWarnAboutDuplicatesInInspection() {
+        return warnAboutDuplicatesInInspection.get();
+    }
+
+    public BooleanProperty warnAboutDuplicatesInInspectionProperty() {
+        return warnAboutDuplicatesInInspection;
+    }
+
+    public void setWarnAboutDuplicatesInInspection(boolean warnAboutDuplicatesInInspection) {
+        this.warnAboutDuplicatesInInspection.set(warnAboutDuplicatesInInspection);
+    }
+
+    public boolean shouldConfirmDelete() {
+        return confirmDelete.get();
+    }
+
+    public BooleanProperty confirmDeleteProperty() {
+        return confirmDelete;
+    }
+
+    public void setConfirmDelete(boolean confirmDelete) {
+        this.confirmDelete.set(confirmDelete);
+    }
+}
diff --git a/src/main/resources/csl-styles/apa.csl b/src/main/resources/csl-styles/apa.csl
index e8cd9ae64f2..772c25e3345 100644
--- a/src/main/resources/csl-styles/apa.csl
+++ b/src/main/resources/csl-styles/apa.csl
@@ -14,7 +14,7 @@
     <category citation-format="author-date"/>
     <category field="psychology"/>
     <category field="generic-base"/>
-    <updated>2022-01-31T14:30:00+00:00</updated>
+    <updated>2022-10-02T20:08:41+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <locale xml:lang="en">
@@ -35,298 +35,88 @@
       <term name="circa" form="short">ca.</term>
       <term name="bc"> B.C.E.</term>
       <term name="ad"> C.E.</term>
-      <term name="letter">personal communication</term>
-      <term name="letter" form="short">letter</term>
       <term name="issue" form="long">
         <single>issue</single>
         <multiple>issues</multiple>
       </term>
-    </terms>
-  </locale>
-  <locale xml:lang="af">
-    <terms>
-      <term name="letter">persoonlike kommunikasie</term>
-      <term name="letter" form="short">brief</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ar">
-    <terms>
-      <term name="letter">اتصال شخصي</term>
-      <term name="letter" form="short">خطاب</term>
-    </terms>
-  </locale>
-  <locale xml:lang="bg">
-    <terms>
-      <term name="letter">лична комуникация</term>
-      <term name="letter" form="short">писмо</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ca">
-    <terms>
-      <term name="letter">comunicació personal</term>
-      <term name="letter" form="short">carta</term>
-    </terms>
-  </locale>
-  <locale xml:lang="cs">
-    <terms>
-      <term name="letter">osobní komunikace</term>
-      <term name="letter" form="short">dopis</term>
-    </terms>
-  </locale>
-  <locale xml:lang="cy">
-    <terms>
-      <term name="letter">cyfathrebu personol</term>
-      <term name="letter" form="short">llythyr</term>
+      <term name="software">computer software</term>
     </terms>
   </locale>
   <locale xml:lang="da">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikation</term>
-      <term name="letter" form="short">brev</term>
     </terms>
   </locale>
   <locale xml:lang="de">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">persönliche Kommunikation</term>
-      <term name="letter" form="short">Brief</term>
-    </terms>
-  </locale>
-  <locale xml:lang="el">
-    <terms>
-      <term name="letter">προσωπική επικοινωνία</term>
-      <term name="letter" form="short">επιστολή</term>
     </terms>
   </locale>
   <locale xml:lang="es">
     <terms>
       <term name="from">de</term>
-      <term name="letter">comunicación personal</term>
-      <term name="letter" form="short">carta</term>
-    </terms>
-  </locale>
-  <locale xml:lang="et">
-    <terms>
-      <term name="letter">isiklik suhtlus</term>
-      <term name="letter" form="short">kiri</term>
-    </terms>
-  </locale>
-  <locale xml:lang="eu">
-    <terms>
-      <term name="letter">komunikazio pertsonala</term>
-      <term name="letter" form="short">gutuna</term>
-    </terms>
-  </locale>
-  <locale xml:lang="fa">
-    <terms>
-      <term name="letter">ارتباط شخصی</term>
-      <term name="letter" form="short">نامه</term>
-    </terms>
-  </locale>
-  <locale xml:lang="fi">
-    <terms>
-      <term name="letter">henkilökohtainen viestintä</term>
-      <term name="letter" form="short">kirje</term>
     </terms>
   </locale>
   <locale xml:lang="fr">
     <terms>
-      <term name="letter">communication personnelle</term>
-      <term name="letter" form="short">lettre</term>
       <term name="editor" form="short">
         <single>éd.</single>
         <multiple>éds.</multiple>
       </term>
     </terms>
   </locale>
-  <locale xml:lang="he">
-    <terms>
-      <term name="letter">תקשורת אישית</term>
-      <term name="letter" form="short">מכתב</term>
-    </terms>
-  </locale>
-  <locale xml:lang="hr">
-    <terms>
-      <term name="letter">osobna komunikacija</term>
-      <term name="letter" form="short">pismo</term>
-    </terms>
-  </locale>
-  <locale xml:lang="hu">
-    <terms>
-      <term name="letter">személyes kommunikáció</term>
-      <term name="letter" form="short">levél</term>
-    </terms>
-  </locale>
-  <locale xml:lang="id">
-    <terms>
-      <term name="letter">komunikasi pribadi</term>
-      <term name="letter" form="short">surat</term>
-    </terms>
-  </locale>
-  <locale xml:lang="is">
-    <terms>
-      <term name="letter">persónuleg samskipti</term>
-      <term name="letter" form="short">bréf</term>
-    </terms>
-  </locale>
-  <locale xml:lang="it">
-    <terms>
-      <term name="letter">comunicazione personale</term>
-      <term name="letter" form="short">lettera</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ja">
-    <terms>
-      <term name="letter">個人的なやり取り</term>
-      <term name="letter" form="short">手紙</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ko">
-    <terms>
-      <term name="letter">개인 서신</term>
-      <term name="letter" form="short">편지</term>
-    </terms>
-  </locale>
-  <locale xml:lang="la">
-    <terms>
-      <term name="letter"/>
-      <term name="letter" form="short">epistula</term>
-    </terms>
-  </locale>
-  <locale xml:lang="lt">
-    <terms>
-      <term name="letter">communicationis personalis</term>
-      <term name="letter" form="short"/>
-    </terms>
-  </locale>
-  <locale xml:lang="lv">
-    <terms>
-      <term name="letter">personīga komunikācija</term>
-      <term name="letter" form="short">vēstule</term>
-    </terms>
-  </locale>
-  <locale xml:lang="mn">
-    <terms>
-      <term name="letter">хувийн харилцаа холбоо</term>
-      <term name="letter" form="short">захиа</term>
-    </terms>
-  </locale>
   <locale xml:lang="nb">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikasjon</term>
-      <term name="letter" form="short">brev</term>
     </terms>
   </locale>
   <locale xml:lang="nl">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">persoonlijke communicatie</term>
-      <term name="letter" form="short">brief</term>
     </terms>
   </locale>
   <locale xml:lang="nn">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikasjon</term>
-      <term name="letter" form="short">brev</term>
-    </terms>
-  </locale>
-  <locale xml:lang="pl">
-    <terms>
-      <term name="letter">osobista komunikacja</term>
-      <term name="letter" form="short">list</term>
-    </terms>
-  </locale>
-  <locale xml:lang="pt">
-    <terms>
-      <term name="letter">comunicação pessoal</term>
-      <term name="letter" form="short">carta</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ro">
-    <terms>
-      <term name="letter">comunicare personală</term>
-      <term name="letter" form="short">scrisoare</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ru">
-    <terms>
-      <term name="letter">личная переписка</term>
-      <term name="letter" form="short">письмо</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sk">
-    <terms>
-      <term name="letter">osobná komunikácia</term>
-      <term name="letter" form="short">list</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sl">
-    <terms>
-      <term name="letter">osebna komunikacija</term>
-      <term name="letter" form="short">pismo</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sr">
-    <terms>
-      <term name="letter">лична комуникација</term>
-      <term name="letter" form="short">писмо</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sv">
-    <terms>
-      <term name="letter">personlig kommunikation</term>
-      <term name="letter" form="short">brev</term>
-    </terms>
-  </locale>
-  <locale xml:lang="th">
-    <terms>
-      <term name="letter">การสื่อสารส่วนบุคคล</term>
-      <term name="letter" form="short">จดหมาย</term>
-    </terms>
-  </locale>
-  <locale xml:lang="tr">
-    <terms>
-      <term name="letter">kişisel iletişim</term>
-      <term name="letter" form="short">mektup</term>
-    </terms>
-  </locale>
-  <locale xml:lang="uk">
-    <terms>
-      <term name="letter">особисте спілкування</term>
-      <term name="letter" form="short">лист</term>
-    </terms>
-  </locale>
-  <locale xml:lang="vi">
-    <terms>
-      <term name="letter">giao tiếp cá nhân</term>
-      <term name="letter" form="short">thư</term>
-    </terms>
-  </locale>
-  <locale xml:lang="zh-CN">
-    <terms>
-      <term name="letter">的私人交流</term>
-      <term name="letter" form="short">信函</term>
-    </terms>
-  </locale>
-  <locale xml:lang="zh-TW">
-    <terms>
-      <term name="letter">私人通訊</term>
-      <term name="letter" form="short">信函</term>
     </terms>
   </locale>
+  <!-- TODO: New types: classic collection document event hearing performance periodical regulation -software- standard -->
+  <!-- TODO: New creator roles: chair compiler contributor curator executive-producer guest host narrator organizer performer producer script-writer series-creator -->
+  <!-- TODO: New variables:
+         available-date submitted
+         part-number printing-number supplement-number
+         part-title volume-title
+         archive_collection
+         division jurisdiction
+         event-title
+         language
+         license
+         reviewed-genre
+  -->
+  <!-- TODO: New terms:
+         advance-online-publication
+         album on audio-recording
+         original-work-published
+         personal-communication
+         preprint
+         review-of
+         item types
+  -->
+  <!-- TODO: Check Indigeneous Knowledge format -->
   <!-- General categories of item types:
        Periodical: article-journal article-magazine article-newspaper post-weblog review review-book
        Periodical or Booklike: paper-conference
-       Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure
+       Booklike: article book broadcast chapter classic collection dataset document
+                 entry entry-dictionary entry-encyclopedia event figure
                  graphic interview manuscript map motion_picture musical_score pamphlet patent
-                 personal_communication report song speech thesis post webpage
-       Legal: bill legal_case legislation treaty
+                 performance periodical personal_communication post report
+                 software song speech standard thesis webpage
+       Legal: bill hearing legal_case legislation regulation treaty
   -->
   <!-- APA references contain four parts: author, date, title, source -->
   <macro name="author-bib">
+    <!-- TODO: New creator roles (media, contributor) -->
+    <!-- TODO: Add new item types -->
     <names variable="composer" delimiter=", ">
       <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
       <substitute>
@@ -355,7 +145,7 @@
             </choose>
           </if>
         </choose>
-        <!-- Test for editortranslator and put that first as that becomes available -->
+        <!-- TODO: Test for editortranslator and put that first as that becomes available -->
         <names variable="editor" delimiter=", ">
           <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
           <label form="short" prefix=" (" suffix=")" text-case="title"/>
@@ -383,6 +173,8 @@
     </names>
   </macro>
   <macro name="author-intext">
+    <!-- TODO: New creator roles -->
+    <!-- TODO: Add new item types -->
     <choose>
       <if type="bill legal_case legislation treaty" match="any">
         <text macro="title-intext"/>
@@ -399,8 +191,7 @@
                   <text macro="title-intext"/>
                 </substitute>
               </names>
-              <!-- Replace with term="personal-communication" if that becomes available -->
-              <text term="letter"/>
+              <text term="personal-communication"/>
             </group>
           </if>
           <else>
@@ -438,6 +229,7 @@
     </choose>
   </macro>
   <macro name="date-bib">
+    <!-- TODO: Add new item types -->
     <group delimiter=" " prefix="(" suffix=")">
       <choose>
         <if is-uncertain-date="issued">
@@ -476,6 +268,7 @@
           </if>
           <else-if variable="status">
             <group>
+              <!-- TODO: Should I print status as-is, or should I print the in-press term? -->
               <text variable="status" text-case="lowercase"/>
               <text variable="year-suffix" prefix="-"/>
             </group>
@@ -502,10 +295,8 @@
       </else>
     </choose>
   </macro>
-  <macro name="date-sort-date">
-    <date variable="issued" form="numeric"/>
-  </macro>
   <macro name="date-intext">
+    <!-- TODO: Add new item types -->
     <choose>
       <if variable="issued">
         <group delimiter="/">
@@ -553,6 +344,7 @@
         </group>
       </if>
       <else-if variable="status">
+        <!-- TODO: Should I print status as-is, or should I print the in-press term? -->
         <text variable="status" text-case="lowercase"/>
         <text variable="year-suffix" prefix="-"/>
       </else-if>
@@ -582,6 +374,7 @@
     </choose>
   </macro>
   <macro name="title">
+    <!-- TODO: Add new item types -->
     <choose>
       <if type="post webpage" match="any">
         <!-- Webpages are always italicized -->
@@ -603,7 +396,7 @@
               <if variable="collection-editor editor editorial-director" match="any">
                 <group delimiter=": " font-style="italic">
                   <text variable="title"/>
-                  <!-- Replace with volume-title as that becomes available -->
+                  <!-- TODO: Replace with volume-title -->
                   <choose>
                     <if is-numeric="volume" match="none">
                       <group delimiter=" ">
@@ -622,7 +415,7 @@
           <else>
             <group delimiter=": " font-style="italic">
               <text variable="title"/>
-              <!-- Replace with volume-title as that becomes available -->
+              <!-- TODO: Replace with volume-title -->
               <choose>
                 <if is-numeric="volume" match="none">
                   <group delimiter=" ">
@@ -638,27 +431,28 @@
     </choose>
   </macro>
   <macro name="title-intext">
+    <!-- TODO: Add new item types -->
     <choose>
       <if variable="title" match="none">
         <text macro="bracketed-intext" prefix="[" suffix="]"/>
       </if>
+      <else-if type="hearing">
+        <!-- Hearings are italicized -->
+        <text variable="title" form="short" font-style="italic" text-case="title"/>
+      </else-if>
       <else-if type="bill">
-        <!-- If a bill has no number or container-title, assume it is a hearing; italic -->
+        <!-- Bills are not italicized and substitute bill number if no title. -->
         <choose>
-          <if variable="number container-title" match="none">
-            <text variable="title" form="short" font-style="italic" text-case="title"/>
-          </if>
-          <else-if variable="title">
+          <if variable="title">
             <text variable="title" form="short" text-case="title"/>
-          </else-if>
+          </if>
           <else>
             <group delimiter=" ">
               <text variable="genre"/>
               <group delimiter=" ">
                 <choose>
                   <if variable="chapter-number container-title" match="none">
-                    <!-- Replace with label variable="number" as that becomes available -->
-                    <text term="issue" form="short"/>
+                    <label variable="number" form="short"/>
                   </if>
                 </choose>
                 <text variable="number"/>
@@ -689,6 +483,7 @@
     </choose>
   </macro>
   <macro name="parenthetical">
+    <!-- TODO: Add new item types -->
     <!-- (Secondary contributors; Database location; Genre no. 123; Report Series 123, Version, Edition, Volume, Page) -->
     <group prefix="(" suffix=")">
       <choose>
@@ -701,13 +496,11 @@
                 <text variable="genre" text-case="capitalize-first"/>
               </if>
               <else>
-                <!-- This should be localized -->
-                <text value="patent" text-case="capitalize-first"/>
+                <text term="patent" text-case="capitalize-first"/>
               </else>
             </choose>
             <group delimiter=" ">
-              <!-- Replace with label variable="number" if that becomes available -->
-              <text term="issue" form="short" text-case="capitalize-first"/>
+              <label variable="number" form="short" text-case="capitalize-first"/>
               <text variable="number"/>
             </group>
           </group>
@@ -744,6 +537,7 @@
     </group>
   </macro>
   <macro name="parenthetical-container">
+    <!-- TODO: Add new item types -->
     <choose>
       <if variable="container-title" match="any">
         <group prefix="(" suffix=")">
@@ -762,6 +556,7 @@
     </choose>
   </macro>
   <macro name="bracketed">
+    <!-- TODO: Add new item types -->
     <!-- [Descriptive information] -->
     <!-- If there is a number, genre is already printed in macro="number" -->
     <group prefix="[" suffix="]">
@@ -782,7 +577,9 @@
                         <text variable="medium" text-case="capitalize-first"/>
                       </else-if>
                       <else>
-                        <!-- Replace with term="review" as that becomes available -->
+                        <!-- TODO: Replace with term="review" -->
+                        <!-- TODO: Handle review vs review-of depending on presence of reviewed-title -->
+                        <!-- TODO: Add reviewed-genre -->
                         <text value="Review of"/>
                       </else>
                     </choose>
@@ -793,7 +590,9 @@
                         <text variable="medium" text-case="capitalize-first"/>
                       </if>
                       <else>
-                        <!-- Replace with term="review" as that becomes available -->
+                        <!-- TODO: Replace with term="review" -->
+                        <!-- TODO: Handle review vs review-of depending on presence of reviewed-title -->
+                        <!-- TODO: Add reviewed-genre -->
                         <text value="Review of"/>
                       </else>
                     </choose>
@@ -885,7 +684,7 @@
                           <text variable="medium" text-case="capitalize-first"/>
                         </else-if>
                         <else>
-                          <text term="letter" form="short" text-case="capitalize-first"/>
+                          <text term="letter" text-case="capitalize-first"/>
                         </else>
                       </choose>
                     </if>
@@ -895,7 +694,7 @@
                           <text variable="medium" text-case="capitalize-first"/>
                         </if>
                         <else>
-                          <text term="letter" form="short" text-case="capitalize-first"/>
+                          <text term="letter" text-case="capitalize-first"/>
                         </else>
                       </choose>
                     </else>
@@ -930,20 +729,20 @@
                   <choose>
                     <if variable="genre">
                       <text variable="genre" text-case="capitalize-first"/>
-                      <!-- Replace prefix with performer label as that becomes available -->
+                      <!-- TODO: Replace prefix with performer label -->
                       <names variable="author" prefix="recorded by ">
                         <name and="symbol" initialize-with=". " delimiter=", "/>
                       </names>
                     </if>
                     <else-if variable="medium">
                       <text variable="medium" text-case="capitalize-first"/>
-                      <!-- Replace prefix with performer label as that becomes available -->
+                      <!-- TODO: Replace prefix with performer label -->
                       <names variable="author" prefix="recorded by ">
                         <name and="symbol" initialize-with=". " delimiter=", "/>
                       </names>
                     </else-if>
                     <else>
-                      <!-- Replace prefix with performer label as that becomes available -->
+                      <!-- TODO: Replace prefix with performer label -->
                       <names variable="author" prefix="Recorded by ">
                         <name and="symbol" initialize-with=". " delimiter=", "/>
                       </names>
@@ -956,13 +755,13 @@
                   <choose>
                     <if variable="medium">
                       <text variable="medium" text-case="capitalize-first"/>
-                      <!-- Replace prefix with performer label as that becomes available -->
+                      <!-- TODO: Replace prefix with performer label -->
                       <names variable="author" prefix="recorded by ">
                         <name and="symbol" initialize-with=". " delimiter=", "/>
                       </names>
                     </if>
                     <else>
-                      <!-- Replace prefix with performer label as that becomes available -->
+                      <!-- TODO: Replace prefix with performer label -->
                       <names variable="author" prefix="Recorded by ">
                         <name and="symbol" initialize-with=". " delimiter=", "/>
                       </names>
@@ -996,14 +795,7 @@
                 </if>
               </choose>
             </if>
-            <else-if type="book">
-              <choose>
-                <if variable="version" match="none">
-                  <text macro="format"/>
-                </if>
-              </choose>
-            </else-if>
-            <else-if type="report" match="none">
+            <else-if type="report software" match="none">
               <text macro="format"/>
             </else-if>
           </choose>
@@ -1012,11 +804,14 @@
     </group>
   </macro>
   <macro name="bracketed-intext">
+    <!-- TODO: Add new item types -->
     <group prefix="[" suffix="]">
       <choose>
         <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
-          <!-- This should be localized -->
-          <text macro="reviewed-title-intext" prefix="Review of "/>
+          <group delimiter=" ">
+            <text term="review-of" text-case="capitalize-first"/>
+            <text macro="reviewed-title-intext"/>
+          </group>
         </if>
         <else-if variable="interviewer" type="interview" match="any">
           <names variable="interviewer">
@@ -1037,7 +832,7 @@
                     <text variable="genre" text-case="capitalize-first"/>
                   </if>
                   <else>
-                    <text term="letter" form="short" text-case="capitalize-first"/>
+                    <text term="letter" text-case="capitalize-first"/>
                   </else>
                 </choose>
                 <names variable="recipient" delimiter=", ">
@@ -1058,6 +853,7 @@
     </group>
   </macro>
   <macro name="bracketed-container">
+    <!-- TODO: Add new item types -->
     <group prefix="[" suffix="]">
       <choose>
         <if type="paper-conference speech" match="any">
@@ -1068,7 +864,7 @@
             </if>
           </choose>
         </if>
-        <else-if type="book" variable="version" match="all">
+        <else-if type="software" match="all">
           <!-- For entries in mobile app reference works, place bracketed after the container-title -->
           <text macro="format"/>
         </else-if>
@@ -1080,6 +876,8 @@
     </group>
   </macro>
   <macro name="secondary-contributors">
+    <!-- TODO: Add new item types -->
+    <!-- TODO: Add new creator roles -->
     <choose>
       <if type="article-journal article-magazine article-newspaper post-weblog review review-book" match="any">
         <text macro="secondary-contributors-periodical"/>
@@ -1116,6 +914,7 @@
     </group>
   </macro>
   <macro name="secondary-contributors-booklike">
+    <!-- TODO: Add new item types -->
     <group delimiter="; ">
       <choose>
         <if variable="title">
@@ -1125,7 +924,7 @@
           </names>
         </if>
       </choose>
-      <!-- When editortranslator becomes available, add a test: variable="editortranslator" match="none"; then print translator -->
+      <!-- TODO: When editortranslator becomes available, add a test: variable="editortranslator" match="none"; then print translator -->
       <choose>
         <if type="post webpage" match="none">
           <!-- Webpages treat container-title like publisher -->
@@ -1163,12 +962,13 @@
     <choose>
       <if variable="archive-place" match="none">
         <!-- With `archive-place`: physical archives. Without: online archives. -->
-        <!-- Add archive_collection as that becomes available -->
+        <!-- TODO: Add archive_collection -->
         <text variable="archive_location"/>
       </if>
     </choose>
   </macro>
   <macro name="number">
+    <!-- TODO: Add new item types -->
     <choose>
       <if variable="number">
         <group delimiter=", ">
@@ -1176,8 +976,7 @@
             <text variable="genre" text-case="title"/>
             <choose>
               <if is-numeric="number">
-                <!-- Replace with label variable="number" if that becomes available -->
-                <text term="issue" form="short" text-case="capitalize-first"/>
+                <label variable="number" form="short" text-case="capitalize-first"/>
                 <text variable="number"/>
               </if>
               <else>
@@ -1200,6 +999,7 @@
     </choose>
   </macro>
   <macro name="locators-booklike">
+    <!-- TODO: Add new item types -->
     <choose>
       <if type="article-journal article-magazine article-newspaper broadcast interview patent post post-weblog review review-book speech webpage" match="any"/>
       <else-if type="paper-conference">
@@ -1226,8 +1026,7 @@
     <choose>
       <if is-numeric="version">
         <group delimiter=" ">
-          <!-- replace with label variable="version" if that becomes available -->
-          <text term="version" text-case="capitalize-first"/>
+          <label variable="version" text-case="capitalize-first"/>
           <text variable="version"/>
         </group>
       </if>
@@ -1250,6 +1049,7 @@
     </choose>
   </macro>
   <macro name="volume-booklike">
+    <!-- TODO: Add new item types -->
     <group delimiter=", ">
       <!-- Report series [ex. 52] -->
       <choose>
@@ -1262,6 +1062,7 @@
       </choose>
       <choose>
         <if variable="volume" match="any">
+          <!-- TODO: Update using volume-title -->
           <choose>
             <!-- Non-numeric volumes are already printed as part of the book title -->
             <if is-numeric="volume" match="none"/>
@@ -1275,8 +1076,7 @@
         </if>
         <else>
           <group>
-            <!-- Replace with label variable="number-of-volumes" if that becomes available -->
-            <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+            <label variable="number-of-volumes" form="short" text-case="capitalize-first" suffix=" "/>
             <text term="page-range-delimiter" prefix="1"/>
             <number variable="number-of-volumes" form="numeric"/>
           </group>
@@ -1318,6 +1118,7 @@
     </choose>
   </macro>
   <macro name="format">
+    <!-- TODO: Add new item types -->
     <choose>
       <if variable="genre medium" match="any">
         <group delimiter="; ">
@@ -1330,18 +1131,17 @@
         </group>
       </if>
       <!-- Generic labels for specific types -->
-      <!-- These should be localized when possible -->
+      <!-- TODO: Add terms for other types? -->
       <else-if type="dataset">
-        <text value="Data set"/>
+        <text term="dataset"/>
       </else-if>
-      <else-if type="book" variable="version" match="all">
-        <!-- Replace with type="software" and term="software" as that becomes available -->
-        <text value="Computer software"/>
+      <else-if type="software">
+        <text term="software" text-case="capitalize-first"/>
       </else-if>
       <else-if type="interview personal_communication" match="any">
         <choose>
           <if variable="archive container-title DOI publisher URL" match="none">
-            <text term="letter" text-case="capitalize-first"/>
+            <text term="personal-communication" text-case="capitalize-first"/>
           </if>
           <else-if type="interview">
             <text term="interview" text-case="capitalize-first"/>
@@ -1349,11 +1149,12 @@
         </choose>
       </else-if>
       <else-if type="map">
-        <text value="Map"/>
+        <text term="map" text-case="capitalize-first"/>
       </else-if>
     </choose>
   </macro>
   <macro name="format-intext">
+    <!-- TODO: Add new item types -->
     <choose>
       <if variable="genre" match="any">
         <text variable="genre" text-case="capitalize-first"/>
@@ -1362,18 +1163,17 @@
         <text variable="medium" text-case="capitalize-first"/>
       </else-if>
       <!-- Generic labels for specific types -->
-      <!-- These should be localized when possible -->
+      <!-- TODO: Add terms for other types? -->
       <else-if type="dataset">
-        <text value="Data set"/>
+        <text term="dataset"/>
       </else-if>
-      <else-if type="book" variable="version" match="all">
-        <!-- Replace with type="software" and term="software" as that becomes available -->
-        <text value="Computer software"/>
+      <else-if type="software">
+        <text term="software" text-case="capitalize-first"/>
       </else-if>
       <else-if type="interview personal_communication" match="any">
         <choose>
           <if variable="archive container-title DOI publisher URL" match="none">
-            <text term="letter" text-case="capitalize-first"/>
+            <text term="personal-communication" text-case="capitalize-first"/>
           </if>
           <else-if type="interview">
             <text term="interview" text-case="capitalize-first"/>
@@ -1381,13 +1181,14 @@
         </choose>
       </else-if>
       <else-if type="map">
-        <text value="Map"/>
+        <text term="map"/>
       </else-if>
     </choose>
   </macro>
   <!-- APA 'source' element contains four parts:
        container, event, publisher, access -->
   <macro name="container">
+    <!-- TODO: Add new item types -->
     <choose>
       <if type="article-journal article-magazine article-newspaper post-weblog review review-book" match="any">
         <!-- Periodical items -->
@@ -1443,6 +1244,7 @@
         <if variable="issued">
           <choose>
             <if variable="issue page volume" match="none">
+              <!-- TODO: Should I print status as-is, or should I print the in-press term? -->
               <text variable="status" text-case="capitalize-first"/>
             </if>
           </choose>
@@ -1451,13 +1253,14 @@
     </group>
   </macro>
   <macro name="container-booklike">
+    <!-- TODO: Add new item types -->
     <choose>
       <if variable="container-title" match="any">
         <group delimiter=" ">
           <text term="in" text-case="capitalize-first"/>
           <group delimiter=", ">
             <names variable="editor translator" delimiter=", &amp; ">
-              <!-- Change to editortranslator and move editor to substitute as that becomes available -->
+              <!-- TODO: Change to editortranslator and move editor to substitute -->
               <name and="symbol" initialize-with=". " delimiter=", "/>
               <label form="short" text-case="title" prefix=" (" suffix=")"/>
               <substitute>
@@ -1468,7 +1271,7 @@
             </names>
             <group delimiter=": " font-style="italic">
               <text variable="container-title"/>
-              <!-- Replace with volume-title as that becomes available -->
+              <!-- TODO: Replace with volume-title -->
               <choose>
                 <if is-numeric="volume" match="none">
                   <group delimiter=" ">
@@ -1486,6 +1289,7 @@
     </choose>
   </macro>
   <macro name="publisher">
+    <!-- TODO: Add new item types -->
     <group delimiter="; ">
       <choose>
         <if type="thesis">
@@ -1520,7 +1324,7 @@
             <!-- With `archive-place`: physical archives. Without: online archives. -->
             <!-- For physical archives, print the location before the archive name.
                 For electronic archives, these are printed in macro="description". -->
-            <!-- Split "archive_location" into "archive_collection" and "archive_location" as that becomes available -->
+            <!-- TODO: Split "archive_location" into "archive_collection" and "archive_location" -->
             <!-- Must test for archive_collection:
                 With collection: archive_collection (archive_location), archive, archive-place
                 No collection: archive (archive_location), archive-place
@@ -1555,6 +1359,7 @@
     </choose>
   </macro>
   <macro name="event">
+    <!-- TODO: Add new item types (e.g., event, collection, performance) -->
     <choose>
       <if variable="event event-title" match="any">
         <!-- To prevent Zotero from printing event-place due to its double-mapping of all 'place' to
@@ -1587,6 +1392,7 @@
   </macro>
   <!-- After 'source', APA also prints publication history (original publication, reprint info, retraction info) -->
   <macro name="publication-history">
+    <!-- TODO: Add new item types -->
     <choose>
       <if type="patent" match="none">
         <group prefix="(" suffix=")">
@@ -1598,8 +1404,9 @@
               <text variable="references"/>
             </if>
             <else>
+              <!-- TODO: Replace these with terms -->
               <group delimiter=" ">
-                <text value="Original work published"/>
+                <text term="original-work-published" text-case="capitalize-first"/>
                 <choose>
                   <if is-uncertain-date="original-date">
                     <text term="circa" form="short"/>
@@ -1620,86 +1427,60 @@
   </macro>
   <!-- Legal citations have their own rules -->
   <macro name="legal-cites">
+    <!-- TODO: Add new item types -->
     <choose>
-      <if type="legal_case">
-        <group delimiter=". ">
-          <group delimiter=", ">
-            <text variable="title"/>
-            <group delimiter=" ">
-              <text macro="container-legal"/>
-              <text macro="date-legal"/>
-            </group>
-            <text variable="references"/>
-          </group>
+      <if type="treaty">
+        <!-- APA generally defers to Bluebook for legal citations, but diverges without
+             explanation for treaty items. The Bluebook format that was used in APA 6th
+             ed. is used here. -->
+        <group delimiter=", ">
+          <text variable="title" text-case="title"/>
+          <names variable="author">
+            <name initialize-with="." form="short" delimiter="-"/>
+          </names>
+          <text macro="date-legal"/>
+          <text macro="container-legal"/>
           <text macro="access"/>
         </group>
       </if>
-      <else-if type="bill">
-        <!-- Currently designed to handle bills, resolutions, hearings, rederal reports. -->
+      <else>
+        <!-- For `bill`: currently designed to handle bills, resolutions, federal reports. -->
+        <!-- For `legislation`: currently designed to handle statutes, codified regulations, executive orders. -->
         <group delimiter=". ">
           <group delimiter=", ">
             <choose>
-              <if variable="number container-title" match="none">
-                <!-- If no number or container-title, then assume it is a hearing -->
-                <text variable="title" font-style="italic"/>
-              </if>
-              <else>
+              <if type="bill legal_case legislation" match="any">
                 <text variable="title"/>
-              </else>
+              </if>
+              <else-if type="hearing">
+                <text variable="title" font-style="italic"/>
+              </else-if>
             </choose>
             <group delimiter=" ">
               <text macro="container-legal"/>
               <text macro="date-legal"/>
               <choose>
-                <if variable="number container-title" match="none">
-                  <!-- If no number or container-title, then assume it is a hearing -->
+                <if type="hearing">
                   <names variable="author" prefix="(testimony of " suffix=")">
+                    <!-- TODO: Localize this with the hearing term. -->
                     <name and="symbol" delimiter=", "/>
                   </names>
                 </if>
-                <else>
+                <else-if type="bill legislation" match="any">
+                  <!-- `legislation`: For uncodified regulations, assume future code section is in status. -->
                   <text variable="status" prefix="(" suffix=")"/>
-                </else>
+                </else-if>
               </choose>
             </group>
             <text variable="references"/>
           </group>
           <text macro="access"/>
         </group>
-      </else-if>
-      <else-if type="legislation">
-        <!-- Currently designed to handle statutes, codified regulations, executive orders.
-             For uncodified regulations, assume future code section is in status. -->
-        <group delimiter=". ">
-          <group delimiter=", ">
-            <text variable="title"/>
-            <group delimiter=" ">
-              <text macro="container-legal"/>
-              <text macro="date-legal"/>
-              <text variable="status" prefix="(" suffix=")"/>
-            </group>
-            <text variable="references"/>
-          </group>
-          <text macro="access"/>
-        </group>
-      </else-if>
-      <else-if type="treaty">
-        <!-- APA generally defers to Bluebook for legal citations, but diverges without
-             explanation for treaty items. The Bluebook format that was used in APA 6th
-             ed. is used here. -->
-        <group delimiter=", ">
-          <text variable="title" text-case="title"/>
-          <names variable="author">
-            <name initialize-with="." form="short" delimiter="-"/>
-          </names>
-          <text macro="date-legal"/>
-          <text macro="container-legal"/>
-          <text macro="access"/>
-        </group>
-      </else-if>
+      </else>
     </choose>
   </macro>
   <macro name="date-legal">
+    <!-- TODO: Add new item types -->
     <choose>
       <if type="legal_case">
         <group prefix="(" suffix=")" delimiter=" ">
@@ -1715,7 +1496,7 @@
           </choose>
         </group>
       </if>
-      <else-if type="bill legislation" match="any">
+      <else-if type="bill legislation hearing" match="any">
         <group prefix="(" suffix=")" delimiter=" ">
           <group delimiter=" ">
             <date variable="original-date">
@@ -1734,6 +1515,7 @@
     </choose>
   </macro>
   <macro name="container-legal">
+    <!-- TODO: Add new item types -->
     <!-- Expect legal item container-titles to be stored in short form -->
     <choose>
       <if type="legal_case">
@@ -1744,8 +1526,7 @@
                 <text variable="volume"/>
                 <text variable="container-title"/>
                 <group delimiter=" ">
-                  <!-- Change to label variable="section" as that becomes available -->
-                  <text term="section" form="symbol"/>
+                  <label variable="section" form="symbol"/>
                   <text variable="section"/>
                 </group>
                 <choose>
@@ -1762,8 +1543,7 @@
               <group delimiter=" ">
                 <choose>
                   <if is-numeric="number">
-                    <!-- Replace with label variable="number" if that becomes available -->
-                    <text term="issue" form="short" text-case="capitalize-first"/>
+                    <label variable="number" form="short" text-case="capitalize-first"/>
                   </if>
                 </choose>
                 <text variable="number"/>
@@ -1779,8 +1559,7 @@
             <group delimiter=" ">
               <choose>
                 <if variable="chapter-number container-title" match="none">
-                  <!-- Replace with label variable="number" as that becomes available -->
-                  <text term="issue" form="short"/>
+                  <label variable="number" form="short"/>
                 </if>
               </choose>
               <text variable="number"/>
@@ -1815,7 +1594,7 @@
               <choose>
                 <if variable="section">
                   <group delimiter=" ">
-                    <!-- Change to label variable="section" as that becomes available -->
+                    <!-- TODO: Change to label variable="section" -->
                     <text term="section" form="symbol"/>
                     <text variable="section"/>
                   </group>
@@ -1838,8 +1617,7 @@
             </if>
             <else>
               <group delimiter=" ">
-                <!-- Replace with label variable="number" if that becomes available -->
-                <text term="issue" form="short" text-case="capitalize-first"/>
+                <label variable="number" form="short" text-case="capitalize-first"/>
                 <text variable="number"/>
               </group>
             </else>
@@ -1849,6 +1627,7 @@
     </choose>
   </macro>
   <macro name="citation-locator">
+    <!-- TODO: Add new locator types? -->
     <group delimiter=" ">
       <choose>
         <if locator="chapter">
@@ -1865,7 +1644,7 @@
     <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 macro="date-bib" sort="ascending"/>
       <key variable="status"/>
     </sort>
     <layout prefix="(" suffix=")" delimiter="; ">
@@ -1880,12 +1659,13 @@
     <sort>
       <key macro="author-bib"/>
       <key macro="date-sort-group"/>
-      <key macro="date-sort-date" sort="ascending"/>
+      <key macro="date-bib" sort="ascending"/>
       <key variable="status"/>
       <key macro="title"/>
     </sort>
     <layout>
       <choose>
+        <!-- TODO: Add new item types -->
         <if type="bill legal_case legislation treaty" match="any">
           <!-- Legal items have different orders and delimiters -->
           <choose>
diff --git a/src/main/resources/csl-styles/ieee.csl b/src/main/resources/csl-styles/ieee.csl
index 19081952c37..04c375f09b7 100644
--- a/src/main/resources/csl-styles/ieee.csl
+++ b/src/main/resources/csl-styles/ieee.csl
@@ -45,7 +45,7 @@
     <category field="engineering"/>
     <category field="generic-base"/>
     <summary>IEEE style as per the 2021 guidelines, V 01.29.2021.</summary>
-    <updated>2022-10-11T00:52:46+10:00</updated>
+    <updated>2023-04-18T00:52:46+10:00</updated>
     <rights 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">
@@ -174,25 +174,20 @@
   </macro>
   <macro name="event">
     <choose>
+      <!-- Published Conference Paper -->
       <if type="paper-conference speech" match="any">
         <choose>
-          <!-- Published Conference Paper -->
           <if variable="container-title" match="any">
-            <group delimiter=", ">
-              <group delimiter=" ">
-                <text term="in"/>
-                <text variable="container-title" font-style="italic"/>
-              </group>
+            <group delimiter=" ">
+              <text term="in"/>
+              <text variable="container-title" font-style="italic"/>
             </group>
           </if>
           <!-- Unpublished Conference Paper -->
           <else>
-            <group delimiter=", ">
-              <group delimiter=" ">
-                <text term="presented at"/>
-                <text variable="event"/>
-              </group>
-              <text variable="event-place"/>
+            <group delimiter=" ">
+              <text term="presented at"/>
+              <text variable="event"/>
             </group>
           </else>
         </choose>
diff --git a/src/main/resources/fonts/JabRefMaterialDesign.ttf b/src/main/resources/fonts/JabRefMaterialDesign.ttf
index f10dbdcd736..769fc1fe9e5 100644
Binary files a/src/main/resources/fonts/JabRefMaterialDesign.ttf and b/src/main/resources/fonts/JabRefMaterialDesign.ttf differ
diff --git a/src/main/resources/images/Icons.properties b/src/main/resources/images/Icons.properties
index 3618d8fb943..8caa86aa6ad 100644
--- a/src/main/resources/images/Icons.properties
+++ b/src/main/resources/images/Icons.properties
@@ -6,19 +6,3 @@ jabrefIcon40=JabRef-icon-40.png
 jabrefIcon48=JabRef-icon-48.png
 jabrefIcon64=JabRef-icon-64.png
 jabrefIcon128=JabRef-icon-128.png
-
-
-
-#external apps
-texmaker=texmaker.png
-texstudio=texstudio.png
-winedt=winedt.png
-vim=vim.png
-lyx=lyx2.png
-openoffice=openoffice.png
-citeseer=wwwciteseer.png
-arxiv=arxiv_32.png
-emacs=emacs.png
-mdl=mdl-icon.png
-mdlloading=mdlloading.gif
-mdlListIcon=mdlListIcon.png
diff --git a/src/main/resources/images/external/arxiv_32.png b/src/main/resources/images/external/arxiv_32.png
deleted file mode 100644
index d813cc665a3..00000000000
Binary files a/src/main/resources/images/external/arxiv_32.png and /dev/null differ
diff --git a/src/main/resources/images/external/emacs.png b/src/main/resources/images/external/emacs.png
deleted file mode 100644
index c86092f50ea..00000000000
Binary files a/src/main/resources/images/external/emacs.png and /dev/null differ
diff --git a/src/main/resources/images/external/lyx2.png b/src/main/resources/images/external/lyx2.png
deleted file mode 100644
index 4162b77745f..00000000000
Binary files a/src/main/resources/images/external/lyx2.png and /dev/null differ
diff --git a/src/main/resources/images/external/mdl-icon.png b/src/main/resources/images/external/mdl-icon.png
deleted file mode 100644
index 751e550c9e3..00000000000
Binary files a/src/main/resources/images/external/mdl-icon.png and /dev/null differ
diff --git a/src/main/resources/images/external/mdlListIcon.png b/src/main/resources/images/external/mdlListIcon.png
deleted file mode 100644
index fe876672aef..00000000000
Binary files a/src/main/resources/images/external/mdlListIcon.png and /dev/null differ
diff --git a/src/main/resources/images/external/mdlloading.gif b/src/main/resources/images/external/mdlloading.gif
deleted file mode 100644
index eea2948e08d..00000000000
Binary files a/src/main/resources/images/external/mdlloading.gif and /dev/null differ
diff --git a/src/main/resources/images/external/openoffice.png b/src/main/resources/images/external/openoffice.png
deleted file mode 100644
index d9cd9003da0..00000000000
Binary files a/src/main/resources/images/external/openoffice.png and /dev/null differ
diff --git a/src/main/resources/images/external/texmaker.png b/src/main/resources/images/external/texmaker.png
deleted file mode 100644
index 6c87386e8c2..00000000000
Binary files a/src/main/resources/images/external/texmaker.png and /dev/null differ
diff --git a/src/main/resources/images/external/texstudio.png b/src/main/resources/images/external/texstudio.png
deleted file mode 100644
index a010bee75da..00000000000
Binary files a/src/main/resources/images/external/texstudio.png and /dev/null differ
diff --git a/src/main/resources/images/external/vim.png b/src/main/resources/images/external/vim.png
deleted file mode 100644
index 0368ee4c24d..00000000000
Binary files a/src/main/resources/images/external/vim.png and /dev/null differ
diff --git a/src/main/resources/images/external/winedt.png b/src/main/resources/images/external/winedt.png
deleted file mode 100644
index 320320b4912..00000000000
Binary files a/src/main/resources/images/external/winedt.png and /dev/null differ
diff --git a/src/main/resources/images/external/wwwciteseer.png b/src/main/resources/images/external/wwwciteseer.png
deleted file mode 100644
index 82c8038f1b8..00000000000
Binary files a/src/main/resources/images/external/wwwciteseer.png and /dev/null differ
diff --git a/src/main/resources/journals/journal-list.mv b/src/main/resources/journals/journal-list.mv
index aa7d89f38d4..7d72924eac6 100644
Binary files a/src/main/resources/journals/journal-list.mv and b/src/main/resources/journals/journal-list.mv differ
diff --git a/src/main/resources/journals/journalList.mv b/src/main/resources/journals/journalList.mv
deleted file mode 100644
index 44af8b6a0cf..00000000000
Binary files a/src/main/resources/journals/journalList.mv and /dev/null differ
diff --git a/src/main/resources/l10n/JabRef_ar.properties b/src/main/resources/l10n/JabRef_ar.properties
index 40020a430f6..4767e591146 100644
--- a/src/main/resources/l10n/JabRef_ar.properties
+++ b/src/main/resources/l10n/JabRef_ar.properties
@@ -1,13 +1,5 @@
-Could\ not\ delete\ empty\ entries.=لا يمكن حذف المراجع الفارغة.
-
-Delete\ empty\ entries=احذف المراجع الفارغة
-
-Empty\ entries=مراجع فارغة
-
-Keep\ empty\ entries=الاحتفاظ بالمراجع الفارغة
-
-Library\ '%0'\ has\ empty\ entries.\ Do\ you\ want\ to\ delete\ them?=المكتبة '%0' تحتوي على مراجع فارغة. هل تريد حذفها؟
 
+Unable\ to\ monitor\ file\ changes.\ Please\ close\ files\ and\ processes\ and\ restart.\ You\ may\ encounter\ errors\ if\ you\ continue\ with\ this\ session.=غير قادر على رصد التغييرات في الملفات. المرجو إغلاق الملفات و البرنامج وإعادة تشغيله. قد تواجه بعض الأخطاء و المشاكل إذا واصلت هذه الجلسة.
 
 
 
@@ -16,15 +8,25 @@ Library\ '%0'\ has\ empty\ entries.\ Do\ you\ want\ to\ delete\ them?=المكت
 
 Export\ operation\ finished\ successfully.=انتهاء عملية التصدير بنجاح.
 
+Reveal\ in\ File\ Explorer=فتح في متصفح الملفات
 
 
 
+Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (DEFAULT\ abbreviation)=اختصر أسماء المجلات المختارة (الإختصار الإفتراضي)
+Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (DOTLESS\ abbreviation)=اختصر أسماء المجلات المختارة (اختصار بدون نقط)
+Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (SHORTEST\ UNIQUE\ abbreviation)=اختصر أسماء المجلات المختارة (أقصر اختصار فريد و غير متكرر)
 
+Abbreviate\ names=إختصر الأسماء
+Abbreviated\ %0\ journal\ names.=تم اختصار %0 من أسماء المجلة.
 
 Abbreviation=اختصار
 Abbreviations=الاختصارات
 
+Unabbreviate\ journal\ names\ of\ the\ selected\ entries=ألغ اختصار أسماء المجلات للمدخلات المختارة
+Unabbreviated\ %0\ journal\ names.=تم إلغاء اختصار %0 من أسماء المجلة.
 
+dotless=بدون نقط
+shortest\ unique=أقصر غير متكرر
 
 About\ JabRef=حول JabRef
 
@@ -32,6 +34,7 @@ Abstract=الملخص
 
 Accept=قبول
 
+Accept\ recommendations\ from\ Mr.\ DLib=قبول التوصيات المقدمة من السيد DLib
 
 
 Add=إضافة
@@ -174,6 +177,7 @@ Display\ all\ error\ messages=عرض جميع رسائل الأخطاء
 
 
 
+
 Donate\ to\ JabRef=تبرع لJabRef
 
 Download\ file=تحميل الملف
@@ -182,6 +186,7 @@ Download\ file=تحميل الملف
 
 
 
+
 Duplicates\ found=تم العثور على مراجع مكررة
 
 
@@ -217,15 +222,12 @@ Exporting=جار التصدير
 
 
 
-
 Field=الحقل
-
 field=حقل
 
 Field\ name=اسم الحقل
 
 
-
 File=الملف
 
 file=ملف
@@ -357,7 +359,6 @@ Open\ library=فتح المكتبة
 
 
 
-
 
 
 Preferences=الإعدادات
@@ -405,7 +406,6 @@ Previous\ entry=المرجع السابق
 
 
 
-
 
 
 Save\ library=حفظ المكتبة
@@ -434,6 +434,9 @@ Please\ enter\ a\ field\ name\ to\ search\ for\ a\ keyword.=الرجاء إدخ
 
 
 
+
+
+
 Show\ optional\ fields=إظهار الحقول الاختيارية
 
 Show\ required\ fields=إظهار الحقول المطلوبة
@@ -490,6 +493,7 @@ the\ field\ <b>%0</b>=الحقل <b>%0</b>
 
 
 
+
 
 
 Rename\ field=إعادة تسمية الحقل
@@ -546,6 +550,8 @@ Enable\ special\ fields=تفعيل الحقول الخاصة
 Original\ entry=المرجع الأصلي
 Return\ to\ library=العودة إلى المكتبة
 
+
+
 Library\ '%0'\ has\ changed.=المكتبة '%0' تغيرت.
 
 
@@ -585,6 +591,9 @@ Other\ fields=حقول أخرى
 
 
 
+
+
+
 
 
 
@@ -702,6 +711,7 @@ Add\ to\ current\ library=إضافة إلى المكتبة الحالية
 
 
 
+
 
 
 Edit\ content=تعديل المحتوى
@@ -720,3 +730,9 @@ Copy\ or\ move\ the\ content\ of\ one\ field\ to\ another=نسخ أو نقل م
 
 
 
+
+
+
+
+
+
diff --git a/src/main/resources/l10n/JabRef_da.properties b/src/main/resources/l10n/JabRef_da.properties
index 95dad8dea64..9619ad12c2a 100644
--- a/src/main/resources/l10n/JabRef_da.properties
+++ b/src/main/resources/l10n/JabRef_da.properties
@@ -1,8 +1,4 @@
 
-
-
-
-
 %0\ contains\ the\ regular\ expression\ <b>%1</b>=%0 indeholder regulærudtrykket <b>%1</b>
 
 %0\ contains\ the\ term\ <b>%1</b>=%0 indeholder udtrykket <b>%1</b>
@@ -214,7 +210,7 @@ Do\ not\ abbreviate\ names=Forkort ikke navn
 
 Do\ not\ open\ any\ files\ at\ startup=Åbn ingen filer ved opstart
 
-Do\ not\ wrap\ the\ following\ fields\ when\ saving=Introducer ikke linjeskift i følgende felter ved gemning
+
 
 Donate\ to\ JabRef=Doner til JabRef
 
@@ -224,6 +220,7 @@ Download\ file=Download fil
 duplicate\ removal=fjernelse af dubletter
 
 
+
 Duplicate\ string\ name=Ikke-unikt navn på streng
 
 Duplicates\ found=Dubletter fundet
@@ -271,18 +268,14 @@ Exporting=Eksporterer
 Extension=Efternavn
 
 
-External\ file\ links=Eksterne links
-
 External\ programs=Eksterne programmer
 
 
 Field=Felt
-
 field=felt
 
 Field\ name=Feltnavn
 
-
 Field\ to\ group\ by=Grupperingsfelt
 
 File=Fil
@@ -378,6 +371,8 @@ JabRef\ preferences=JabRef-indstillinger
 
 Journal\ abbreviations=Tidsskriftsforkortelser
 
+
+
 Keep\ both=Behold begge
 
 
@@ -398,19 +393,14 @@ Language=Sprog
 Last\ modified=Sidst ændret
 
 Listen\ for\ remote\ operation\ on\ port=Lyt efter fjernoperationer på port
-Load\ and\ Save\ preferences\ from/to\ jabref.xml\ on\ start-up\ (memory\ stick\ mode)=Hent og gem indstillinger fra/til jabref.xml ved opstart (memory stick-tilstand)
 
 
-Main\ file\ directory=Hovedbibliotek
-
 Manage\ custom\ exports=Opsæt eksterne eksportfiltre
 
 Manage\ custom\ imports=Opsæt eksterne importfiltre
 
 Mark\ new\ entries\ with\ owner\ name=Mærk nye poster med navn på ejer
 
-Memory\ stick\ mode=Memory Stick-tilstand
-
 Merged\ external\ changes=Inkorporerede eksterne ændringer
 
 Modified\ group\ "%0".=ændrede gruppen "%0".
@@ -477,7 +467,6 @@ Open\ editor\ when\ a\ new\ entry\ is\ created=Start redigering når en ny post
 
 Open\ file=Åbn fil
 
-Open\ last\ edited\ libraries\ at\ startup=Åbn sidst viste libraryr ved opstart
 
 
 Open\ terminal\ here=Åben terminal her
@@ -490,8 +479,6 @@ Operation\ canceled.=Operationen afbrudt.
 
 Optional\ fields=Valgfri felter
 
-Options=Valg
-
 or=eller
 
 Override\ default\ file\ directories=Tilsidesæt standard fil-biblioteker
@@ -593,7 +580,6 @@ resolved=løst
 Review=Kommentarer
 Review\ changes=Gennemse ændringer
 
-
 Save=Gem
 Save\ all\ finished.=Alle libraryr gemt
 Save\ all\ open\ libraries=Gem alle åbne libraryr
@@ -645,6 +631,9 @@ Show\ BibTeX\ source\ by\ default=Vis BibTeX-kode som standard
 
 Show\ confirmation\ dialog\ when\ deleting\ entries=Vis dialog for at bekræfte sletning af poster
 
+
+
+
 Show\ last\ names\ only=Vis kun efternavn
 
 Show\ names\ unchanged=Vis navn uændret
@@ -716,6 +705,7 @@ Value\ cleared\ externally=Værdi slettet eksternt
 View=Vis
 Vim\ server\ name=Navn på Vim-server
 
+
 Warn\ about\ unresolved\ duplicates\ when\ closing\ inspection\ window=Advar om dubletter som ikke er blevet håndteret, når inspektionsvinduet lukkes
 
 Warn\ before\ overwriting\ existing\ keys=Advar før eksisterende nøgler overskrives
@@ -786,7 +776,6 @@ User-specific\ file\ directory=Brugerspecifikt filbibliotek
 Autocomplete\ names\ in\ 'Firstname\ Lastname'\ format\ only=Autofuldfør kun navne i formatet 'Fornavn Efternavn'
 Autocomplete\ names\ in\ 'Lastname,\ Firstname'\ format\ only=Autofuldfør kun navne i formatet 'Efternavn, Fornavn'
 Autocomplete\ names\ in\ both\ formats=Autofuldfør navne i begge formater
-Send\ as\ email=Send som email
 References=Referencer
 Sending\ of\ emails=Afsendelse af emails
 Subject\ for\ sending\ an\ email\ with\ references=Emne for afsendelse af en email med referencer
@@ -845,7 +834,6 @@ Please\ choose\ which\ one\ to\ connect\ to\:=Vælg venligst hvilken der skal ti
 Choose\ OpenOffice/LibreOffice\ executable=Vælg OpenOffice/LibreOffice-programfil
 Select\ document=Vælg dokument
 HTML\ list=HTML-liste
-If\ possible,\ normalize\ this\ list\ of\ names\ to\ conform\ to\ standard\ BibTeX\ name\ formatting=Om muligt, normaliser denne navneliste til standard BibTeX-navneformatering
 Could\ not\ open\ %0=Kunne ikke åbne %0
 Unknown\ import\ format=Ukendt importformat
 Style\ selection=Valg af stil
@@ -889,9 +877,11 @@ Save\ selected\ as\ plain\ BibTeX...=Gem det markerede som rå BibTeX...
 Path\ to\ %0=Sti til %0
 
 
+
 Could\ not\ connect\ to\ %0=Kunne ikke forbinde til %0
 
 
+
 Invalid\ DOI\:\ '%0'.=Ugyldig DOI\: '%0'.
 
 
@@ -909,6 +899,10 @@ Unabbreviate\ journal\ names=Ekspander tidsskriftsnavn
 
 
 
+Main\ file\ directory=Hovedbibliotek
+
+
+
 
 
 
@@ -1055,6 +1049,13 @@ Default\ pattern=Standardmønster
 
 
 
+
+
+
+
+
+
+
 
 
 
diff --git a/src/main/resources/l10n/JabRef_de.properties b/src/main/resources/l10n/JabRef_de.properties
index 9438a0a5937..88f637b4a13 100644
--- a/src/main/resources/l10n/JabRef_de.properties
+++ b/src/main/resources/l10n/JabRef_de.properties
@@ -1,12 +1,4 @@
-Could\ not\ delete\ empty\ entries.=Leere Einträge konnten nicht gelöscht werden.
-
-Delete\ empty\ entries=Leere Einträge löschen
-
-Empty\ entries=Leere Einträge
-
-Keep\ empty\ entries=Leere Einträge behalten
-
-Library\ '%0'\ has\ empty\ entries.\ Do\ you\ want\ to\ delete\ them?=Bibliothek '%0' hat leere Einträge. Möchten Sie sie löschen?
+Proxy\ requires\ password=Proxy benötigt ein Passwort
 
 Unable\ to\ monitor\ file\ changes.\ Please\ close\ files\ and\ processes\ and\ restart.\ You\ may\ encounter\ errors\ if\ you\ continue\ with\ this\ session.=Dateiänderungen können nicht überwacht werden. Bitte schließen Sie Dateien und Prozesse und starten Sie neu. Es kann zu Fehlern kommen, wenn Sie diese Sitzung fortsetzen.
 %0\ contains\ the\ regular\ expression\ <b>%1</b>=%0 enthält den regulären Ausdruck <b>%1</b>
@@ -269,7 +261,8 @@ Do\ not\ abbreviate\ names=Namen nicht abkürzen
 
 Do\ not\ open\ any\ files\ at\ startup=Keine Dateien beim Start öffnen
 
-Do\ not\ wrap\ the\ following\ fields\ when\ saving=Beim Speichern keinen Zeilenumbruch in den folgenden Feldern einfügen
+Do\ not\ wrap\ when\ saving=Beim Speichern nicht umbrechen
+
 Do\ not\ write\ the\ following\ fields\ to\ XMP\ Metadata=Folgende Felder nicht in die XMP-Metadaten schreiben
 
 Donate\ to\ JabRef=An JabRef spenden
@@ -282,6 +275,8 @@ duplicate\ removal=Duplikate entfernen
 
 Duplicate\ fields=Doppelte Felder
 
+Unable\ to\ change\ field\ name.\ "%0"\ already\ in\ use.=Feldname kann nicht geändert werden. "%0" wird bereits verwendet.
+
 Duplicate\ string\ name=Doppelter String-Name
 
 Duplicates\ found=Doppelte Einträge gefunden
@@ -337,19 +332,23 @@ Extension=Erweiterung
 
 External\ Changes\ Resolver=Externer Änderungsauflöser
 
-External\ file\ links=Links zu externen Dateien
-
 External\ programs=Externe Programme
 
 Failed\ to\ import\ by\ ID=Import per ID fehlgeschlagen
 
 Field=Feld
-
 field=Feld
 
 Field\ name=Feldname
-
+Field\ names=Feldnamen
 Field\ names\ are\ not\ allowed\ to\ contain\ white\ spaces\ or\ certain\ characters\ (%0).=Feldnamen dürfen keine Leerzeichen oder die folgenden Zeichen enthalten (%0).
+New\ field\ name=Neuer Feldname
+Add\ new\ field\ name=Neuen Feldnamen hinzufügen
+Field\ name\ "%0"\ already\ exists=Feldname "%0" existiert bereits
+No\ field\ name\ selected\!=Kein Feldname ausgewählt\!
+Remove\ field\ name=Feldname entfernen
+Are\ you\ sure\ you\ want\ to\ remove\ field\ name\:\ "%0"?=Sind Sie sicher, dass Sie den Feldnamen "%0" entfernen möchten?
+Manage\ field\ names\ &\ content=Feldnamen & Inhalt verwalten
 
 Field\ to\ group\ by=Sortierfeld
 
@@ -477,6 +476,28 @@ Journal\ abbreviations=Abkürzung der Zeitschriftentitel
 Journal\ lists\:=Journal-Listen\:
 Remove\ journal\ '%0'=Journal '%0' entfernen
 
+Journal\ Information=Zeitschrifteninformationen
+Year=Jahr
+ISSN\ or\ journal\ name\ required\ for\ fetching\ journal\ information=ISSN oder Journalname erforderlich für das Abrufen von Journalinformationen
+Fetch\ journal\ information\ online\ to\ show=Journalinformationen online abrufen um sie anzuzeigen
+Allow\ sending\ ISSN\ to\ a\ JabRef\ online\ service\ (SCimago)\ for\ fetching\ journal\ information=Erlaube das Senden der ISSN an einen JabRef Online-Dienst (SCimago) zum Abrufen von Journalinformationen
+Please\ enable\ journal\ information\ fetching\ in\ %0\ >\ %1=Bitte aktivieren Sie das Abrufen von Zeitschrifteninformationen in %0 > %1
+Categories=Kategorien
+ISSN=ISSN
+Publisher=Herausgeber
+h-index=h-Index
+Error\ while\ fetching\ journal\ information\:\ %0=Fehler beim Abrufen der Zeitschrifteninformationen\: %0
+ISSN\ and/or\ journal\ name\ not\ found\ in\ catalog=ISSN und/oder Zeitschriftenname im Katalog nicht gefunden
+Citable\ Docs\ (Previous\ 3\ Years)=Zitierfähige Dokumente (Vorherige 3 Jahre)
+Cites\ Incoming\ by\ Recently\ Published=Zitate eingehend sortiert nach kürzlich veröffentlicht
+Cites\ Outgoing=Ausgehende Zitate
+Cites\ Outgoing\ per\ Document=Ausgehende Zitate pro Dokument
+Docs\ (This\ Year)=Dokumente (Dieses Jahr)
+Incorrect\ ISSN\ format=Ungültiges ISSN-Format
+Error\ accessing\ catalog=Fehler beim Katalogzugriff
+
+Check\ for\ latest\ version\ online=Prüfe online auf die neueste Version
+
 Keep\ both=Beide behalten
 
 Keep\ subgroups=Untergruppen behalten
@@ -503,12 +524,10 @@ LaTeX\ AUX\ file\:=LaTeX AUX-Datei\:
 
 Link=Link
 Listen\ for\ remote\ operation\ on\ port=Port nach externem Zugriff abhören
-Load\ and\ Save\ preferences\ from/to\ jabref.xml\ on\ start-up\ (memory\ stick\ mode)=Einstellungen beim Start laden von/speichern in jabref.xml (Memory Stick-Modus)
+Memory\ stick\ mode\ -\ Store\ preferences\ in\ 'jabref.xml'\ in\ the\ app\ folder.=Speicherstick-Modus - Speichere Einstellungen in 'jabref.xml' im App-Ordner.
 
 Show\ advanced\ hints\ (i.e.\ helpful\ tooltips,\ suggestions\ and\ explanation)=Erweiterte Hinweise anzeigen (z.B. hilfreiche Tooltips, Vorschläge und Erklärungen)
 
-Main\ file\ directory=Standard-Verzeichnis für Dateien
-
 Manage\ custom\ exports=Verwalte externe Exportfilter
 
 Manage\ custom\ imports=Verwalte externe Importfilter
@@ -516,8 +535,6 @@ External\ file\ types=Externe Dateitypen
 
 Mark\ new\ entries\ with\ owner\ name=Neue Einträge mit Namen des Besitzers versehen
 
-Memory\ stick\ mode=Memory Stick-Modus
-
 Merged\ external\ changes=Externe Änderungen eingefügt
 Merge\ fields=Felder zusammenführen
 
@@ -593,7 +610,7 @@ Open\ editor\ when\ a\ new\ entry\ is\ created=Eintragseditor öffnen, wenn ein
 
 Open\ file=Datei öffnen
 
-Open\ last\ edited\ libraries\ at\ startup=Beim Starten von JabRef die letzten bearbeiteten Bibliotheken öffnen
+Open\ last\ edited\ libraries\ on\ startup=Zuletzt bearbeitete Bibliotheken beim Start öffnen
 
 Connect\ to\ shared\ database=Geteilte Bibliothek öffnen
 
@@ -608,8 +625,6 @@ Operating\ System\ (Provides\ for\ better\ recommendations\ by\ giving\ an\ indi
 
 Optional\ fields=Optionale Felder
 
-Options=Optionen
-
 or=oder
 
 Override\ default\ file\ directories=Standard-Verzeichnisse überschreiben
@@ -744,8 +759,7 @@ 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
+Resolve\ BibTeX\ strings=BibTeX-Zeichenketten auflösen
 
 resolved=davon aufgelöst
 
@@ -759,8 +773,6 @@ 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
 Save\ all\ open\ libraries=Alle geöffneten Bibliotheken speichern
@@ -784,7 +796,7 @@ Refuse\ to\ save\ the\ library\ before\ external\ changes\ have\ been\ reviewed.
 Library\ protection=Bibliotheksschutz
 Unable\ to\ save\ library=Speichern der Bibliothek nicht möglich
 
-Always\ reformat\ BIB\ file\ on\ save\ and\ export=Formatiere BIB Datei immer neu beim Exportieren
+Always\ reformat\ library\ on\ save\ and\ export=Bibliothek beim Speichern und Exportieren immer neu formatieren
 Character\ encoding\ '%0'\ is\ not\ supported.=Die Zeichenkodierung '%0' wird nicht unterstützt.
 
 Search=Suchen
@@ -850,6 +862,12 @@ Show\ BibTeX\ source\ by\ default=Quelltextpanel standardmäßig anzeigen
 
 Show\ confirmation\ dialog\ when\ deleting\ entries=Dialog zum Löschen von Einträgen anzeigen
 
+Persist\ password\ between\ sessions=Kennwort zwischen Sitzungen beibehalten
+
+Persist\ api\ keys\ between\ sessions=API-Schlüssel zwischen Sitzungen beibehalten
+
+Credential\ store\ not\ available.=Anmeldedatenspeicher nicht verfügbar.
+
 Show\ last\ names\ only=Zeige nur Nachnamen
 
 Show\ names\ unchanged=Namen unverändert anzeigen
@@ -931,6 +949,7 @@ Upgrade\ external\ PDF/PS\ links\ to\ use\ the\ '%0'\ field.=Externe PDF/PS-Link
 usage=Benutzung
 Use\ autocompletion=Autovervollständigung verwenden
 
+User\ interface=Benutzeroberfläche
 
 Username=Benutzername
 
@@ -943,6 +962,8 @@ Verify\ that\ LyX\ is\ running\ and\ that\ the\ lyxpipe\ is\ valid.=Überprüfen
 View=Ansicht
 Vim\ server\ name=Vim Server-Name
 
+View\ journal\ info=Zeige Zeitschrifteninformation
+
 Warn\ about\ unresolved\ duplicates\ when\ closing\ inspection\ window=Warnung zu ungeklärten Duplikaten ausgeben, wenn das Kontrollfenster geschlossen wird
 
 Warn\ before\ overwriting\ existing\ keys=Vor dem Überschreiben von existierenden Keys warnen
@@ -1043,7 +1064,11 @@ You\ must\ enter\ an\ integer\ value\ in\ the\ interval\ 1025-65535=Sie müssen
 Autocomplete\ names\ in\ 'Firstname\ Lastname'\ format\ only=Automatische Vervollständigung von Namen nur im Format 'Vorname Nachname'
 Autocomplete\ names\ in\ 'Lastname,\ Firstname'\ format\ only=Automatische Vervollständigung von Namen nur im Format 'Nachname, Vorname'
 Autocomplete\ names\ in\ both\ formats=Automatische Vervollständigung von Namen in beiden Formaten
-Send\ as\ email=Als E-Mail senden
+Send=Senden
+As\ Email=Als E-Mail
+To\ Kindle=Zu Kindle
+Send\ to\ Kindle=An Kindle senden
+Email\ address\ for\ sending\ to\ Kindle=E-Mail-Adresse zum Senden an Kindle
 References=Literaturverweise
 Sending\ of\ emails=Senden der E-Mails
 Subject\ for\ sending\ an\ email\ with\ references=Betreff zum Senden einer E-Mail mit Literaturverweisen
@@ -1121,7 +1146,6 @@ Please\ choose\ which\ one\ to\ connect\ to\:=Bitte wählen Sie, zu welchem die
 Choose\ OpenOffice/LibreOffice\ executable=OpenOffice/LibreOffice-Programm wählen
 Select\ document=Datei wählen
 HTML\ list=HTML-Liste
-If\ possible,\ normalize\ this\ list\ of\ names\ to\ conform\ to\ standard\ BibTeX\ name\ formatting=Diese Namensliste soll nach Möglichkeit so normalisiert werden, dass sie sich nach der üblichen BibTeX-Namensformatierung richtet
 Could\ not\ open\ %0=%0 konnte nicht geöffnet werden
 Unknown\ import\ format=Unbekanntes Import-Format
 Style\ selection=Stil-Auswahl
@@ -1148,6 +1172,7 @@ Cleanup\ entries=Einträge bereinigen
 Automatically\ assign\ new\ entry\ to\ selected\ groups=Neuen Eintrag automatisch den ausgewählten Gruppen zuordnen
 %0\ mode=%0-Modus
 Move\ DOIs\ from\ note\ and\ URL\ field\ to\ DOI\ field\ and\ remove\ http\ prefix=DOIs von den Feldern note und URL ins DOI-Feld verschieben und das http-Präfix löschen
+Move\ URL\ in\ note\ field\ to\ url\ field=URL im Feld 'note' in Feld 'url' verschieben
 Make\ paths\ of\ linked\ files\ relative\ (if\ possible)=Pfade verlinkter Dateien zu relativen Pfaden ändern (falls möglich)
 Rename\ PDFs\ to\ given\ filename\ format\ pattern=PDFs entsprechend dem vorgegebenen Namensformat umbenennen
 Rename\ only\ PDFs\ having\ a\ relative\ path=Nur PDFs mit einem relativen Pfad umbenennen
@@ -1158,6 +1183,7 @@ One\ entry\ needed\ a\ clean\ up=Aufräumen bei einem Eintrag nötig
 
 Group\ tree\ could\ not\ be\ parsed.\ If\ you\ save\ the\ BibTeX\ library,\ all\ groups\ will\ be\ lost.=Der Gruppenbaum konnte nicht geparsed werden. Wenn Sie die BibTeX-Bibliothek speichern, gehen alle Gruppen verloren.
 Attach\ file=Datei anhängen
+Attach\ file\ from\ URL=Datei auf Basis von URL anhängen
 Setting\ all\ preferences\ to\ default\ values.=Setze alle Einstellungen auf die Standardwerte.
 Resetting\ preference\ key\ '%0'=Setze Einstellung '0%' zurück
 Unable\ to\ clear\ preferences.=Einstellungen konnten nicht zurückgesetzt werden.
@@ -1191,7 +1217,6 @@ Four\ stars=Vier Sterne
 Five\ stars=Fünf Sterne
 Help\ on\ special\ fields=Hilfe zu speziellen Feldern
 Keywords\ of\ selected\ entries=Stichworte der ausgewählten Einträge
-Manage\ content\ selectors=Inhaltsauswahl verwalten
 Content\ selectors=Inhaltsauswahl
 Manage\ keywords=Stichworte verwalten
 No\ priority\ information=Keine Informationen zur Priorität
@@ -1222,7 +1247,6 @@ Error\ message\:=Fehlermeldung\:
 If\ a\ pasted\ or\ imported\ entry\ already\ has\ the\ field\ set,\ overwrite.=Falls bei einem eingefügten oder importierten Eintrag das Feld bereits belegt ist, überschreiben.
 Not\ connected\ to\ any\ Writer\ document.\ Please\ make\ sure\ a\ document\ is\ open,\ and\ use\ the\ 'Select\ Writer\ document'\ button\ to\ connect\ to\ it.=Keine Verbindung zu einem Writer-Dokument. Bitte vergewissern Sie sich, dass ein Dokument geöffnet ist, und benutzen Sie die Schaltfläche 'Writer-Dokument wählen', um eine Verbindung herzustellen.
 Removed\ all\ subgroups\ of\ group\ "%0".=Alle Untergruppen der Gruppe "%0" wurden entfernt.
-To\ disable\ the\ memory\ stick\ mode\ rename\ or\ remove\ the\ jabref.xml\ file\ in\ the\ same\ folder\ as\ JabRef.=Um den USB-Stick-Modus zu deaktivieren, benennen Sie die Datei jabref.xml in demselben Ordner als JabRef oder löschen Sie sie.
 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.
@@ -1257,7 +1281,6 @@ Please\ specify\ a\ password=Bitte geben Sie ein Passwort an
 Proxy\ configuration=Proxy Einstellungen
 Use\ custom\ proxy\ configuration=Benutzerdefinierte Proxy-Konfiguration verwenden
 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
@@ -1274,7 +1297,7 @@ Open\ folder=Ordner öffnen
 Export\ sort\ order=Sortierreihenfolge exportieren
 Save\ sort\ order=Sortierung speichern
 
-Keep\ original\ order=Originale Sortierung beibehalten
+Keep\ original\ order\ and\ add\ new\ entries\ at\ the\ end=Originalreihenfolge beibehalten und neue Einträge am Ende hinzufügen
 Use\ current\ table\ sort\ order=Aktuelle Tabellensortierreihenfolge verwenden
 Use\ specified\ order=Angegebenen Sortierung benutzen
 Show\ extra\ columns=Extraspalten anzeigen
@@ -1310,7 +1333,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.
+Could\ not\ detect\ terminal\ automatically\ using\ '%0'.\ Please\ define\ a\ custom\ terminal\ in\ the\ preferences.=Terminal konnte nicht automatisch über '%0' ermittelt 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.
@@ -1340,7 +1363,7 @@ Removed\ all\ groups=Alle Gruppen entfernt
 %0.\ Accepting\ the\ change\ replaces\ the\ complete\ groups\ tree\ with\ the\ externally\ modified\ groups\ tree.=%0. Das Akzeptieren der Änderung ersetzt den kompletten Gruppenbaum durch den extern modifizierten Gruppenbaum.
 Select\ export\ format=Export-Format wählen
 Return\ to\ library=Zurück zur Bibliothek
-On\ JabRef=In JabRef
+
 Could\ not\ connect\ to\ %0=Verbindung zu %0 fehlgeschlagen
 Warning\:\ %0\ out\ of\ %1\ entries\ have\ undefined\ title.=Warnung\: %0 von %1 Einträgen haben keinen Titel.
 Warning\:\ %0\ out\ of\ %1\ entries\ have\ undefined\ citation\ key.=Warnung\: %0 von %1 Einträgen haben nicht definierte Zitationsschlüssel.
@@ -1348,6 +1371,10 @@ Warning\:\ %0\ out\ of\ %1\ entries\ have\ undefined\ DOIs.=Warnung\: %0 von %1
 Really\ delete\ the\ selected\ entry?=Ausgewählten Eintrag wirklich löschen?
 Really\ delete\ the\ %0\ selected\ entries?=Wirklich alle %0 ausgewählten Einträge löschen?
 
+On\ disk=auf der Festplatte
+In\ JabRef=In JabRef
+Entry\ Preview=Eintragsvorschau
+
 Keep\ left=Links beibehalten
 Keep\ right=Rechts beibehalten
 Old\ entry=Alter Eintrag
@@ -1381,6 +1408,7 @@ Entry\ editor,\ previous\ panel\ 2=Eintragseditor, vorheriges Panel 2
 File\ list\ editor,\ move\ entry\ down=Dateilisteneditor, verschiebe Eintrag nach unten
 File\ list\ editor,\ move\ entry\ up=Dateilisteneditor, verschiebe Eintrag nach oben
 Focus\ entry\ table=Fokus auf Tabelle setzen
+Focus\ group\ list=Fokus auf Gruppenliste
 Import\ into\ current\ library=Importieren in aktuelle Bibliothek
 Import\ into\ new\ library=Importieren in neue Bibliothek
 New\ article=Neuer Artikel
@@ -1391,7 +1419,6 @@ New\ mastersthesis=Neue Abschlussarbeit
 New\ phdthesis=Neue Dissertation
 New\ proceedings=Neuer Konferenzbericht
 New\ unpublished=Neu unveröffentlicht
-Preamble\ editor,\ store\ changes=Präambeleditor, speichere Änderungen
 Push\ to\ application=In Applikation einfügen
 Refresh\ OpenOffice/LibreOffice=Aktualisiere OpenOffice/LibreOffice
 Resolve\ duplicate\ citation\ keys=Markiere doppelte Zitationsschlüssel
@@ -1462,7 +1489,7 @@ Capitalize=Großschreiben
 Capitalize\ all\ Words,\ but\ Converts\ Articles,\ Prepositions,\ and\ Conjunctions\ to\ Lower\ Case.=Schreibt alle Wörter groß, wandelt jedoch Artikel, Präpositionen und Konjunktionen in Kleinbuchstaben um.
 Capitalize\ the\ first\ word,\ changes\ other\ words\ to\ lower\ case.=Schreibt das erste Wort groß, schreibt alle anderen Wörter klein.
 changes\ all\ letters\ to\ lower\ case.=ändert alle Buchstaben in Kleinbuchstaben.
-CHANGES\ ALL\ LETTER\ TO\ UPPER\ CASE.=ÄNDERT ALLE BUCHSTABEN IN GROSSBUCHSTABEN.
+CHANGES\ ALL\ LETTERS\ TO\ UPPER\ CASE.=ÄNDERT ALLE BUCHSTABEN IN GROSSBUCHSTABEN.
 Changes\ The\ First\ Letter\ Of\ All\ Words\ To\ Capital\ Case\ And\ The\ Remaining\ Letters\ To\ Lower\ Case.=Schreibt den ersten Buchstaben eines jeden Wortes groß und schreibt alle anderen Wörter klein.
 Cleans\ up\ LaTeX\ code.=Räumt LaTeX-Code auf.
 Converts\ HTML\ code\ to\ LaTeX\ code.=Konvertiere HTML-Code in LaTeX-Code.
@@ -1506,7 +1533,11 @@ Does\ nothing.=Macht nichts.
 Identity=Identität
 Clears\ the\ field\ completely.=Löscht das Feld komplett
 Directory\ not\ found=Verzeichnis nicht gefunden
-Main\ file\ directory\ not\ set.\ Check\ the\ preferences\ (linked\ files)\ or\ the\ library\ properties.=Hauptverzeichnis nicht gesetzt. Überprüfen Sie die Einstellungen (verknüpfte Dateien) oder die Bibliothekseigenschaften.
+
+Main\ file\ directory=Standard-Verzeichnis für Dateien
+Main\ file\ directory\ not\ set.\ Check\ the\ preferences\ ("Linked\ files")\ or\ modify\ the\ library\ properties\ ("Override\ default\ file\ directories").=Hauptdateiverzeichnis nicht gesetzt. Überprüfen Sie die Einstellungen ("Verknüpfte Dateien") oder ändern Sie die Bibliothekseigenschaften ("Standard-Dateiverzeichnisse überschreiben").
+Main\ file\ directory\ '%0'\ not\ found.\nCheck\ the\ tab\ "Linked\ files".=Hauptdateiverzeichnis '%0' nicht gefunden.\nPrüfen Sie die Registerkarte "Verknüpfte Dateien".
+
 This\ operation\ requires\ exactly\ one\ item\ to\ be\ selected.=Für diesen Vorgang muss genau ein Eintrag ausgewählt sein
 Opening\ large\ number\ of\ files=Öffnen einer großen Anzahl von Dateien
 You\ are\ about\ to\ open\ %0\ files.\ Continue?=Sie sind dabei, %0 Dateien zu öffnen. Fortfahren?
@@ -1561,7 +1592,7 @@ Verse=Vers
 change\ entries\ of\ group=Ändere Einträge der Gruppe
 odd\ number\ of\ unescaped\ '\#'=Ungerade Anzahl an '\#' Maskierungszeichen
 
-Found\ %0\ unescaped\ '\&'=%0 unmaskierte(s) '&' gefunden
+Found\ %0\ unescaped\ '&'=%0 unmaskierte '&' gefunden
 
 Show\ diff=Zeige Änderungen
 Copy\ Version=Kopiere Version
@@ -1582,7 +1613,7 @@ Message=Nachricht
 
 
 MathSciNet\ Review=MathSciNet Review
-Reset\ Bindings=Tastenkürzel zurücksetzen
+Reset\ all=Alles zurücksetzen
 
 Decryption\ not\ supported.=Entschlüsselung wird nicht unterstützt.
 
@@ -1629,7 +1660,7 @@ Found\ overlapping\ ranges=Überlappende Bereiche gefunden
 Found\ touching\ ranges=Sich berührende Bereiche gefunden
 
 Note\:\ Use\ the\ placeholder\ %DIR%\ for\ the\ location\ of\ the\ opened\ library\ file.=Hinweis\: %DIR% als Platzhalter für den Speicherort der Bibliothek benutzen.
-Error\ occured\ while\ executing\ the\ command\ "%0".=Während der Ausführung des Befehls "%0" ist ein Fehler aufgetreten.
+Error\ occurred\ while\ executing\ the\ command\ "%0".=Während der Ausführung des Befehls "%0" ist ein Fehler aufgetreten.
 Reformat\ ISSN=Formatiere ISSN
 
 Countries\ and\ territories\ in\ English=Länder und Territorien in Englisch
@@ -1644,6 +1675,7 @@ Are\ you\ sure\ you\ want\ to\ remove\ the\ protected\ terms\ file?=Sind Sie sic
 Remove\ protected\ terms\ file=Lösche geschützte Begriffsdatei
 Add\ selected\ text\ to\ list=Markierten Text zur Liste hinzufügen
 Add\ {}\ around\ selected\ text={} um markierten Text einfügen
+Remove\ all\ {}\ in\ selected\ text=Alle {} im ausgewählten Text entfernen
 Format\ field=Formatfeld
 New\ protected\ terms\ file=Neue geschützte Begriffsdatei
 change\ field\ %0\ of\ entry\ %1\ from\ %2\ to\ %3=Ändere Feld %0 von Eintrag %1 von %2 auf %3
@@ -1695,6 +1727,7 @@ Check\ the\ event\ log\ to\ see\ all\ notifications=Überprüfe das Ereignisprot
 Host=Host
 Port=Port
 Library=Bibliothek
+Libraries=Bibliotheken
 User=Benutzer
 Connect=Verbinden
 Connection\ error=Verbindungsfehler
@@ -1723,6 +1756,7 @@ Cannot\ cite\ entries\ without\ citation\ keys.\ Generate\ keys\ now?=Einträge
 New\ technical\ report=Neuer technischer Bericht
 
 %0\ file=%0-Datei
+%0\ file\ (%1)=%0 Datei (%1)
 Custom\ layout\ file=Benutzerdefinierte Layoutdatei
 Protected\ terms\ file=Geschützte Begriffsdatei
 Style\ file=Stildatei
@@ -1793,6 +1827,7 @@ DOI\ %0\ is\ invalid=DOI %0 ist ungültig
 
 Select\ all\ customized\ types\ to\ be\ stored\ in\ local\ preferences\:=Wählen Sie alle angepassten Eintragstypen, die in den lokalen Einstellungen gespeichert werden sollen\:
 Different\ customization,\ current\ settings\ will\ be\ overwritten=Abweichende Anpassung eines Typs, bestehende Anpassungen werden überschrieben
+%0\ (from\ file)\n%1\ (current\ setting)=%0 (aus Datei)\n%1 (aktuelle Einstellung)
 
 Entry\ type\ %0\ is\ only\ defined\ for\ Biblatex\ but\ not\ for\ BibTeX=Eintragstyp %0 ist nur für Biblatex, nicht aber für BibTeX definiert
 
@@ -1921,6 +1956,7 @@ New\ sublibrary\ based\ on\ AUX\ file=Neue Unterbibliothek basierend auf AUX Dat
 Push\ entries\ to\ external\ application\ (%0)=Einträge in externe Anwendung einfügen (%0)
 Quit=Beenden
 Recent\ libraries=Zuletzt geöffnete Bibliotheken
+Clear\ recent\ libraries=Zuletzt geöffnete Bibliotheken leeren
 Set\ up\ general\ fields=Allgemeine Felder festlegen
 View\ change\ log=Changelog öffnen
 View\ event\ log=Ereignisprotokoll anzeigen
@@ -1962,12 +1998,6 @@ Select\ the\ entries\ to\ be\ imported\:=Wählen Sie die zu importierenden Eintr
 Add\ new\ String=Neuen BibTeX-String hinzufügen
 Must\ not\ be\ empty\!=Darf nicht leer sein\!
 Open\ Help\ page=Hilfeseite öffnen
-Add\ new\ field\ name=Neuen Feldnamen hinzufügen
-Field\ name\:=Feldname\:
-Field\ name\ "%0"\ already\ exists=Feldname "%0" existiert bereits
-No\ field\ name\ selected\!=Kein Feldname ausgewählt\!
-Remove\ field\ name=Feldname entfernen
-Are\ you\ sure\ you\ want\ to\ remove\ field\ name\:\ "%0"?=Sind Sie sicher, dass Sie den Feldnamen "%0" entfernen möchten?
 Add\ new\ keyword=Schlagwort hinzufügen
 Keyword\:=Schlagwort\:
 Keyword\ "%0"\ already\ exists=Schlagwort "%0" existiert bereits
@@ -1978,7 +2008,6 @@ Reset\ to\ default=Auf Standard zurücksetzen
 String\ constants=String-Konstanten
 Export\ all\ entries=Alle Einträge exportieren
 Generate\ citation\ keys=Zitationsschlüssel generieren
-Manage\ field\ names\ &\ content=Feldnamen & Inhalt verwalten
 New\ library=Neue Bibliothek
 OpenOffice/LibreOffice=OpenOffice/LibreOffice
 Open\ document\ viewer=Zeige Dokumentenbetrachter
@@ -2050,16 +2079,15 @@ Add\ formatter\ to\ list=Formatierer zur Liste hinzufügen
 Filter\ List=Filterliste
 Open\ files...=Dateien öffnen...
 
-Affected\ fields\:=Betroffene Felder\:
+Affected\ fields=Betroffene Felder
 Show\ preview\ as\ a\ tab\ in\ entry\ editor=Vorschau als Tab im Eintragseditor anzeigen
-Font=Schriftart
 Visual\ theme=Visuelles Theme
-Light\ theme=Helles Theme
-Dark\ theme=Dunkles Theme
-Custom\ theme=Benutzerdefinierte Design
 Overwrite\ existing\ keys=Existierende Keys überschreiben
 Key\ patterns=BibTeX-Key-Muster
 Font\ settings=Schrifteinstellungen
+Custom...=Benutzerdefiniert...
+Dark=Dunkel
+Light=Hell
 Please\ specify\ a\ css\ theme\ file.=Bitte geben Sie eine CSS-Design-Datei an.
 You\ must\ enter\ an\ integer\ value\ higher\ than\ 8.=Sie müssen einen Ganzzahlwert größer als 8 eingeben.
 Letters\ after\ duplicate\ generated\ keys=Buchstaben nach doppelten generierten Schlüsseln
@@ -2075,7 +2103,6 @@ Reset\ All=Alle zurücksetzen
 Linked\ identifiers=Verknüpfte Bezeichner
 
 insert\ entries=Einträge einfügen
-On\ disk=auf der Festplatte
 
 Independent=Unabhängig
 Intersection=Schnittmenge
@@ -2285,7 +2312,6 @@ Display\ count\ of\ items\ in\ group=Anzahl der Elemente in der Gruppe anzeigen
 Remove\ the\ following\ characters\:=Folgende Zeichen entfernen\:
 Truncate=Kürzen
 Truncates\ a\ string\ after\ a\ given\ index.=Verkürzt einee Zeichenkette nach einem gegebenen Index.
-Close=Schließen
 Close\ all=Alle schließen
 Close\ all\ libraries=Alle Bibliotheken schließen
 Close\ other\ libraries=Andere Bibliotheken schließen
@@ -2300,13 +2326,13 @@ Custom\ import\ formats=Benutzerdefinierte Importformate
 
 No\ list\ enabled=Keine Liste aktiviert
 Protect\ selection=Auswahl schützen
+Unprotect\ selection=Auswahl nicht mehr schützen
 
 Customized\ preview\ style=Angepasster Vorschaustil
 Next\ preview\ style=Nächster Vorschau-Stil
 Previous\ preview\ style=Vorheriger Vorschau-Stil
 
 (\ Note\:\ Press\ return\ to\ commit\ changes\ in\ the\ table\!\ )=( Hinweis\: Drücke die Enter-Taste, um Änderungen in der Tabelle zu übertragen\!)
-Reset=Zurücksetzen
 New\ inproceedings=Neue inproceedings
 Reset\ entry\ types\ and\ fields\ to\ defaults=Eintragstypen und Felder auf Standardwerte zurücksetzen
 This\ will\ reset\ all\ entry\ types\ to\ their\ default\ values\ and\ remove\ all\ custom\ entry\ types=Dies wird alle Eintragstypen auf ihre Standardwerte zurücksetzen und alle benutzerdefinierten Eintragstypen entfernen
@@ -2341,7 +2367,7 @@ Unprotect\ terms=Terme nicht mehr schützen
 
 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
 
@@ -2349,7 +2375,7 @@ 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.
+I\ cannot\ insert\ to\ the\ cursor's\ 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.
 
@@ -2389,13 +2415,13 @@ File\ '%1'\ is\ a\ duplicate\ of\ '%0'.\ Keeping\ both\ due\ to\ deletion\ error
 Enable\ field\ formatters=Feldformatierer aktivieren
 Entry\ Type=Eintragstyp
 Entry\ types=Eintragstypen
-Field\ names=Feldnamen
 Others=Andere
 Recommended=Empfohlen
 
 Authors\ and\ Title=Autoren und Titel
-Database=Datenbank
-Databases=Datenbanken
+Catalog=Katalog
+Catalogs=Kataloge
+Select\ Catalogs\:=Kataloge auswählen\:
 Add\ Author\:=Autor hinzufügen\:
 Add\ Query\:=Abfrage hinzufügen\:
 Add\ Research\ Question\:=Forschungsfrage hinzufügen\:
@@ -2406,7 +2432,6 @@ Start\ new\ systematic\ literature\ review=Neue systematische Literaturübersich
 Manage\ study\ definition=Studiendefinition verwalten
 Update\ study\ search\ results=Studiensuchergebnisse aktualisieren
 Study\ repository\ could\ not\ be\ created=Studienrepository konnte nicht angelegt werden
-Select\ Databases\:=Datenbanken auswählen\:
 
 All\ query\ terms\ are\ joined\ using\ the\ logical\ AND,\ and\ OR\ operators=Alle Suchbegriffe werden mit den logischen Operatoren AND und OR verknüpft
 Finalize=Fertigstellen
@@ -2478,7 +2503,6 @@ 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
@@ -2495,6 +2519,7 @@ Split\ View=Geteilte Ansicht
 Plain\ Text=Einfacher Text
 Show\ Diff=Zeige Änderungen
 Merged\ Entry=Zusammengeführter Eintrag
+Only\ show\ changed\ fields=Nur geänderte Felder anzeigen
 
 Edit\ file\ link=Datei-Verknüpfung bearbeiten
 
@@ -2502,7 +2527,7 @@ Edit\ file\ link=Datei-Verknüpfung bearbeiten
 Assign=Zuweisen
 Do\ not\ assign=Nicht zuweisen
 
-Error\ occured\ %0=Fehler %0 aufgetreten
+Error\ occurred\ %0=Fehler %0 aufgetreten
 Left\ Entry=Linker Eintrag
 Merge\ %0=%0 zusammenführen
 Right\ Entry=Rechter Eintrag
@@ -2526,4 +2551,26 @@ Use\ the\ field\ FJournal\ to\ store\ the\ full\ journal\ name\ for\ (un)abbrevi
 
 Library\ to\ import\ into=Bibliothek für Import
 
+Enable\ web\ search=Web-Suche aktivieren
+Web\ search\ disabled=Web-Suche deaktiviert
+
 Multiline=Mehrzeilig
+
+Unable\ to\ open\ linked\ eprint.\ Please\ set\ the\ eprinttype\ field=Nicht in der Lage, die verknüpfte elektronische Version zu öffnen. Bitte setzen Sie das eprinttype-Feld
+Unable\ to\ open\ linked\ eprint.\ Please\ verify\ that\ the\ eprint\ field\ has\ a\ valid\ '%0'\ id=Konnte die verknüpfte elektronische Version nicht öffnen. Bitte überprüfen Sie, ob das eprint-Feld eine gültige '%0' id hat
+
+Search\ from\ history...=Aus Verlauf suchen...
+your\ search\ history\ is\ empty=Ihr Suchverlauf ist leer
+Clear\ history=Verlauf leeren
+
+Delete\ %0\ files=%0 Dateien löschen
+Delete\ %0\ files\ permanently\ from\ disk,\ or\ just\ remove\ the\ files\ from\ the\ entry?\ Pressing\ Delete\ will\ delete\ the\ files\ permanently\ from\ disk.=Sollen %0 Dateien unwiderruflich vom Datenträger gelöscht oder sollen sie nur aus dem Eintrag entfernt werden? Durch Drücken von "Löschen" werden die Dateien unwiderruflich vom Datenträger gelöscht.
+Error\ accessing\ file\ '%0'.=Fehler beim Zugriff auf die Datei '%0'.
+This\ operation\ requires\ selected\ linked\ files.=Dieser Vorgang erfordert ausgewählte verknüpfte Dateien.
+
+Create\ backup=Sicherung erstellen
+Automatically\ search\ and\ show\ unlinked\ files\ in\ the\ entry\ editor=Automatische Suche und Anzeige von nicht verknüpften Dateien im Eintragseditor
+
+File\ "%0"\ cannot\ be\ added\!=Datei "%0" kann nicht hinzugefügt werden\!
+Illegal\ characters\ in\ the\ file\ name\ detected.\nFile\ will\ be\ renamed\ to\ "%0"\ and\ added.=Ungültige Zeichen im Dateinamen erkannt.\nDatei wird in "%0" umbenannt und hinzugefügt.
+Rename\ and\ add=Umbenennen und hinzufügen
diff --git a/src/main/resources/l10n/JabRef_el.properties b/src/main/resources/l10n/JabRef_el.properties
index ea181c182cb..3a8b8a66390 100644
--- a/src/main/resources/l10n/JabRef_el.properties
+++ b/src/main/resources/l10n/JabRef_el.properties
@@ -1,8 +1,6 @@
+Proxy\ requires\ password=Ο διακομιστής μεσολάβησης απαιτεί κωδικό πρόσβασης
 
-
-
-
-
+Unable\ to\ monitor\ file\ changes.\ Please\ close\ files\ and\ processes\ and\ restart.\ You\ may\ encounter\ errors\ if\ you\ continue\ with\ this\ session.=Δεν είναι δυνατή η παρακολούθηση αλλαγών των αρχείων. Παρακαλούμε κλείστε τα αρχεία και τις διεργασίες και κάντε επανεκκίνηση. Ενδέχεται να αντιμετωπίσετε σφάλματα εάν συνεχίσετε με την τρέχουσα συνεδρία.
 %0\ contains\ the\ regular\ expression\ <b>%1</b>=%0 περιέχει την συνήθη έκφραση <b>%1</b>
 
 %0\ contains\ the\ term\ <b>%1</b>=%0 περιέχει τον όρο <b>%1</b>
@@ -11,13 +9,19 @@
 
 %0\ doesn't\ contain\ the\ term\ <b>%1</b>=%0 δεν περιέχει τον όρο <b>%1</b>
 
+%0/%1\ entries=%0/%1 καταχωρήσεις
 
+Export\ operation\ finished\ successfully.=Η διαδικασία εξαγωγής ολοκληρώθηκε με επιτυχία.
 
+Reveal\ in\ File\ Explorer=Εμφάνιση στον Εξερευνητή Αρχείων
 
 %0\ matches\ the\ regular\ expression\ <b>%1</b>=%0 ταιριάζει την συνήθη έκφραση <b>%1</b>
 
 %0\ matches\ the\ term\ <b>%1</b>=%0 ταιριάζει τον όρο <b>%1</b>
 
+Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (DEFAULT\ abbreviation)=Σύντμηση ονομάτων περιοδικών για τις επιλεγμένες καταχωρήσεις (ΠΡΟΕΠΙΛΕΓΜΕΝΗ σύντμηση)
+Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (DOTLESS\ abbreviation)=Σύντμηση ονομάτων περιοδικών για τις επιλεγμένες καταχωρήσεις (σύντμηση ΧΩΡΙΣ ΤΕΛΕΙΕΣ)
+Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (SHORTEST\ UNIQUE\ abbreviation)=Σύντμηση ονομάτων περιοδικών για τις επιλεγμένες καταχωρήσεις (ΣΥΝΟΜΟΤΕΡΗ ΜΟΝΑΔΙΚΗ συντομογραφία)
 
 Abbreviate\ names=Ονόματα συντομογραφιών
 Abbreviated\ %0\ journal\ names.=Ονόματα συντομογραφιών %0 περιοδικών.
@@ -28,6 +32,8 @@ Abbreviations=Συντομογραφίες
 Unabbreviate\ journal\ names\ of\ the\ selected\ entries=Αποσυμπτύξτε τα ονόματα περιοδικών των επιλεγμένων καταχωρήσεων
 Unabbreviated\ %0\ journal\ names.=Αποσυμπτυγμένα %0 ονόματα περιοδικών.
 
+dotless=χωρίς τελείες
+shortest\ unique=συντομότερη μοναδική
 
 About\ JabRef=Σχετικά JabRef
 
@@ -46,6 +52,7 @@ The\ path\ need\ not\ be\ on\ the\ classpath\ of\ JabRef.=Η διαδρομή δ
 
 Add\ a\ regular\ expression\ for\ the\ key\ pattern.=Προσθέσετε μια κανονική έκφραση (regular expression) για το βασικό μοτίβο (key pattern).
 
+Add\ entry\ manually=Προσθήκη καταχώρησης χειροκίνητα
 
 Add\ selected\ entries\ to\ this\ group=Προσθήκη των επιλεγμένων καταχωρήσεων σε αυτήν την ομάδα
 
@@ -53,10 +60,12 @@ Add\ subgroup=Προσθήκη υποομάδας
 
 Added\ group\ "%0".=Προστέθηκε στην ομάδα "%0".
 
+Added\ string\:\ '%0'=Προστέθηκε συμβολοσειρά\: '%0'
 Added\ string=Προστέθηκε string
 
 All\ entries=Όλες entries
 
+Also\ remove\ subgroups=Αφαιρέστε επίσης τις υποομάδες
 
 and=και
 
@@ -66,6 +75,7 @@ Appearance=Εμφάνιση
 
 Application=Εφαρμογή
 
+Application\ to\ push\ entries\ to=Εφαρμογή που θα προωθηθούν οι καταχωρήσεις
 
 Apply=Εφαρμόστε
 
@@ -77,8 +87,11 @@ Assigned\ %0\ entries\ to\ group\ "%1".=Ανατέθηκαν %0 καταχωρή
 
 Assigned\ 1\ entry\ to\ group\ "%0".=Ανατέθηκε 1 καταχώρηση στην ομάδα "%0".
 
+Autogenerate\ citation\ keys=Αυτόματη δημιουργία κλειδιών αναφοράς
 
+Autolink\ files\ with\ names\ starting\ with\ the\ citation\ key=Αυτόματη σύνδεση αρχείων με ονόματα που αρχίζουν με το κλειδί αναφοράς
 
+Autolink\ only\ files\ that\ match\ the\ citation\ key=Αυτόματη σύνδεση μόνο των αρχείων που ταιριάζουν με το κλειδί αναφοράς
 
 Automatically\ create\ groups=Αυτόματη δημιουργία ομάδων
 
@@ -92,8 +105,11 @@ Available\ import\ formats=Διαθέσιμες μορφές εισαγωγής
 
 %0\ source=Πηγή %0
 
+Background\ Tasks=Εργασίες στο παρασκήνιο
 
+Background\ Tasks\ are\ running=Εκτελούνται εργασίες στο παρασκήνιο
 
+Background\ Tasks\ are\ done=Οι εργασίες στο παρασκήνιο ολοκληρώθηκαν
 
 Browse=Περιήγηση
 
@@ -101,8 +117,11 @@ by=από
 The\ conflicting\ fields\ of\ these\ entries\ will\ be\ merged\ into\ the\ 'Comment'\ field.=Τα αντικρουόμενα πεδία αυτών των καταχωρήσεων θα συγχωνευθούν στο πεδίο 'Σχόλιο'.
 
 Cancel=Ακύρωση
+Cannot\ create\ group=Δεν είναι δυνατή η δημιουργία ομάδας
 
+Cannot\ create\ group.\ Please\ create\ a\ library\ first.=Δεν είναι δυνατή η δημιουργία ομάδας. Παρακαλούμε δημιουργήστε βιβλιοθήκη πρώτα.
 
+Cannot\ open\ folder\ as\ the\ file\ is\ an\ online\ link.=Δεν είναι δυνατό το άνοιγμα του φακέλου, καθώς το αρχείο είναι ένας διαδικτυακός σύνδεσμος.
 
 case\ insensitive=χωρίς διάκριση πεζών - κεφαλαίων
 
@@ -121,6 +140,7 @@ Change\ of\ Grouping\ Method=Αλλαγή Μεθόδου Ομαδοποίηση
 
 change\ preamble=αλλαγή εισαγωγής
 
+Changed\ language=Αλλαγή γλώσσας σε
 
 Changed\ preamble=Η εισαγωγή άλλαξε
 
@@ -128,6 +148,7 @@ Cite\ command=Εντολή αναφοράς
 
 Clear=Καθαρισμός
 
+Open\ /\ close\ entry\ editor=Ανοίξτε / κλείστε το πρόγραμμα διαχείρισης καταχωρήσεων
 
 Close\ dialog=Κλείσμο διαλόγου
 
@@ -147,6 +168,12 @@ Copied=Αντιγράφηκε
 Copy=Αντιγραφή
 
 Copy\ title=Αντιγραφή τίτλου
+Copy\ \\cite{citation\ key}=Αντιγραφή \\cite{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=Αντιγραφή στο πρόχειρο
 
@@ -167,10 +194,13 @@ Could\ not\ print\ preview=Αδυναμία προεπισκόπηση εκτύ
 
 Could\ not\ run\ the\ 'vim'\ program.=Το πρόγραμμα 'vim' δεν μπόρεσε να τρέξει.
 
+Create\ custom\ fields\ for\ each\ BibTeX\ entry=Δημιουργία ειδικών πεδίων για κάθε καταχώρηση BibTeX
 
 crossreferenced\ entries\ included=περιλαμβάνονται καταχωρήσεις παραπομπών που συμπίπτουν
 
+Current\ content\:\ %0=Τρέχων περιεχόμενο\: %0
 
+Current\ value\:\ %0=Τρέχουσα τιμή\: %0
 
 Custom\ entry\ types=Προσαρμοσμένοι τύποι καταχωρήσεων
 
@@ -184,16 +214,22 @@ Cut=Αποκοπή
 
 cut\ entries=αποκοπή entries
 
+cut\ entry\ %0=αποκοπή καταχώρησης %0
 
 Library\ encoding=Κωδικοποίηση βιβλιοθήκης
 
 Library\ properties=Ιδιότητες βιβλιοθήκης
+%0\ -\ Library\ properties=%0 - Χαρακτηριστικά βιβλιοθήκης
 
 Default=Προεπιλογή
 
+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=Γίνεται Λήψη
 
+Execute\ default\ action\ in\ dialog=Εκτέλεση προεπιλεγμένης ενέργειας στο παράθυρο διαλόγου
 
 Delete=Διαγραφή
 
@@ -209,12 +245,15 @@ Descending=Φθίνουσα
 
 Description=Περιγραφή
 
+Do\ not\ ask\ again=Να μην ερωτηθώ ξανά
 
+Display\ all\ entries\ belonging\ to\ one\ or\ more\ of\ the\ selected\ groups=Εμφάνιση όλων των καταχωρήσεων που ανήκουν σε μία ή περισσότερες από τις επιλεγμένες ομάδες
 
 Display\ all\ error\ messages=Εμφάνιση όλων των μηνυμάτων σφάλματος
 
 Display\ help\ on\ command\ line\ options=Εμφάνιση βοήθειας στις επιλογές της γραμμής εντολών
 
+Display\ only\ entries\ belonging\ to\ all\ selected\ groups=Εμφάνιση μόνο των καταχωρήσεων που ανήκουν σε όλες τις επιλεγμένες ομάδες
 Display\ version=Εμφάνιση έκδοσης
 
 Do\ not\ abbreviate\ names=Να μη γίνει σύντμηση των ονομάτων
@@ -222,15 +261,19 @@ Do\ not\ abbreviate\ names=Να μη γίνει σύντμηση των ονομ
 
 Do\ not\ open\ any\ files\ at\ startup=Να μην ανοίγεται κανένα αρχείο κατά την εκκίνηση
 
-Do\ not\ wrap\ the\ following\ fields\ when\ saving=Να μην αναδιπλώνονται τα ακόλουθα πεδία κατά την αποθήκευση
+
+Do\ not\ write\ the\ following\ fields\ to\ XMP\ Metadata=Να μην εγγραφούν τα ακόλουθα πεδία στα μεταδεδομένα XMP
 
 Donate\ to\ JabRef=Δωρεά στο JabRef
 
 Download\ file=Κατέβασμα αρχείου
 
+Downloaded\ website\ as\ an\ HTML\ file.=Ολοκληρώθηκε η λήψη της ιστοσελίδας υπό τη μορφή HTML αρχείου.
 
 duplicate\ removal=διαγραφή διπλότυπων
 
+Duplicate\ fields=Διπλότυπα πεδία
+
 
 Duplicate\ string\ name=Διπλότυπο όνομα συμβολοσειράς
 
@@ -240,6 +283,7 @@ Dynamically\ group\ entries\ by\ a\ free-form\ search\ expression=Δυναμικ
 
 Dynamically\ group\ entries\ by\ searching\ a\ field\ for\ a\ keyword=Δυναμική ομαδοποίηση καταχωρήσεων κατά την αναζήτηση ενός πεδίου ή λέξης-κλειδιού
 
+Each\ line\ must\ be\ of\ the\ following\ form\:\ 'tab\:field1;field2;...;fieldN'.=Κάθε γραμμή πρέπει να έχει την ακόλουθη μορφή\: 'tab\:field1;field2;...;fieldN'.
 
 Edit=Επεξεργασία
 
@@ -250,6 +294,7 @@ Edit\ group=Επεξεργασία ομάδας
 Edit\ strings=Επεξεργασία συμβολοσειρών
 
 empty\ library=κενή βιβλιοθήκη
+Autocompletion=Αυτόματη συμπλήρωση
 
 Enter\ URL\ to\ download=Εισάγετε URL για κατέβασμα
 
@@ -261,6 +306,7 @@ entry=καταχώρηση
 
 Entry\ editor=Επεξεργαστής κειμένου καταχώρησης
 
+Entry\ owner=Δικαιούχος καταχώρησης
 
 Entry\ preview=Προεπισκόπηση καταχώρησης
 
@@ -271,6 +317,8 @@ Error=Σφάλμα
 Error\ occurred\ when\ parsing\ entry=Παρουσιάστηκε σφάλμα κατά την ανάλυση της καταχώρησης
 Error\ opening\ file=Σφάλμα κατά το άνοιγμα αρχείου
 Error\ while\ writing=Σφάλμα κατά την διαδικασία εγγραφής
+Error\ during\ persistence\ of\ crawling\ results.=Σφάλμα κατά τη διατήρηση των αποτελεσμάτων της ανίχνευσης.
+Error\ during\ reading\ of\ study\ definition\ file.=Σφάλμα κατά την ανάγνωση του αρχείου ορισμού μελέτης.
 '%0'\ exists.\ Overwrite\ file?=Το '%0' υπάρχει ήδη. Αντικατάσταση αρχείου;
 Export=Εξαγωγή
 Export\ preferences=Εξαγωγή προτιμήσεων
@@ -280,18 +328,17 @@ Export\ to\ text\ file.=Εξαγωγή σε αρχείο κειμένου.
 Exporting=Πραγματοποιείται εξαγωγή
 Extension=Επέκταση αρχείου
 
-
-External\ file\ links=Εξωτερικοί σύνδεσμοι αρχείων
+External\ Changes\ Resolver=Επιλυτής Εξωτερικών Αλλαγών
 
 External\ programs=Εξωτερικά προγράμματα
 
+Failed\ to\ import\ by\ ID=Αποτυχία κατά την εισαγωγή με αναγνωριστικό ID
 
 Field=Πεδίο
-
 field=πεδίο
 
 Field\ name=Όνομα πεδίου
-
+Field\ names\ are\ not\ allowed\ to\ contain\ white\ spaces\ or\ certain\ characters\ (%0).=Τα ονόματα των πεδίων δεν επιτρέπεται να περιέχουν κενά διαστήματα ή ορισμένους χαρακτήρες (%0).
 
 Field\ to\ group\ by=Ομαδοποίηση με το πεδίο
 
@@ -306,13 +353,19 @@ File\ not\ found=Το αρχείο δε βρέθηκε
 
 Filter=Φίλτρο
 
+Filter\ groups=Φιλτράρισμα ομάδων
 
+Success\!\ Finished\ writing\ metadata.=Επιτυχία\! Η εγγραφή των μεταδεδομένων ολοκληρώθηκε.
+Finished\ writing\ metadata\ for\ %0\ file\ (%1\ skipped,\ %2\ errors).=Ολοκλήρωση εγγραφής μεταδεδομένων για το αρχείο %0 (%1 παραλείφθηκε, %2 σφάλματα).
+Error\ while\ writing\ metadata.\ See\ the\ error\ log\ for\ details.=Σφάλμα κατά την καταγραφή μεταδεδομένων. Ανατρέξτε στο ιστορικό σφαλμάτων για λεπτομέρειες.
+Failed\ to\ write\ metadata,\ file\ %1\ not\ found.=Αποτυχία εγγραφής μεταδεδομένων, το αρχείο %1 δε βρέθηκε.
 
 First\ select\ the\ entries\ you\ want\ keys\ to\ be\ generated\ for.=Πρώτα επιλέξτε τις καταχωρήσεις για τις οποίες θέλετε να δημιουργηθούν κλειδιά.
 
 Fit\ table\ horizontally\ on\ screen=Προσαρμόστε τον πίνακα οριζόντια στην οθόνη
 
 Float=Float
+Format\:\ Tab\:field;field;...\ (e.g.\ General\:url;pdf;note...)=Μορφή\: Καρτέλα\:πεδίο;πεδίο;... (π.χ. General\:url;pdf;note...)
 
 Format\ of\ author\ and\ editor\ names=Μορφή ονόματος συγγραφέα και εκδότη
 Format\ string=Μορφοποίηση συμβολοσειράς
@@ -322,6 +375,7 @@ Formatter\ name=Όνομα μορφοποιητή
 
 found\ in\ AUX\ file=βρέθηκε στο αρχείο AUX
 
+Fulltext\ for=Πλήρες κείμενο για
 
 Further\ information\ about\ Mr.\ DLib\ for\ JabRef\ users.=Περαιτέρω πληροφορίες σχετικά με τον Mr. DLib για χρήστες JabRef.
 
@@ -329,12 +383,15 @@ General=Γενικά
 
 Generate=Δημιουργία
 
+Generate\ citation\ key=Παραγωγή κλειδιού αναφοράς
 
 Generate\ keys=Δημιουργία κλειδιών
 
 Generate\ keys\ before\ saving\ (for\ entries\ without\ a\ key)=Δημιουργία κλειδιών πριν την αποθήκευση (για καταχωρήσεις χωρίς κλειδί)
 
+Generated\ citation\ key\ for=Παραγόμενο κλειδί αναφοράς για
 
+Generating\ citation\ key\ for=Παραγωγή κλειδιού αναφοράς για
 Get\ fulltext=Αποκτήστε το πλήρες κείμενο
 
 Gray\ out\ non-hits=Γκριζάρισμα των καταχωρήσεων που δεν αντιστοιχούν
@@ -388,19 +445,32 @@ Importing\ in\ unknown\ format=Εισαγωγή σε άγνωστη μορφή
 Include\ subgroups\:\ When\ selected,\ view\ entries\ contained\ in\ this\ group\ or\ its\ subgroups=Να περιλαμβάνονται υπο-ομάδες\: Όταν επιλεχθεί αυτό, προβάλλονται οι καταχωρήσεις που περιλαμβάνονται σε αυτή την ομάδα ή τις υπο-ομάδες της
 
 Independent\ group\:\ When\ selected,\ view\ only\ this\ group's\ entries=Ανεξάρτητη ομάδα\: Όταν επιλεχθεί αυτό, προβάλλονται οι καταχωρήσεις μόνο αυτής της ομάδας
+I\ Agree=Συμφωνώ
 
+Indexing\ pdf\ files=Ευρετήριο αρχείων PDF
+Indexing\ for\ %0=Ευρετήριο για %0
+%0\ of\ %1\ linked\ files\ added\ to\ the\ index=%0 από %1 συνδεδεμένα αρχεία προστέθηκαν στο ευρετήριο
 
+Invalid\ citation\ key=Μη έγκυρο κλειδί αναφοράς
 
 Invalid\ URL=Μη έγκυρη διεύθυνση URL
 
 Online\ help=Online βοήθεια
+JabRef\ Language\ (Provides\ for\ better\ recommendations\ by\ giving\ an\ indication\ of\ user's\ preferred\ language.)=Η Γλώσσα JabRef (Παρέχει καλύτερες συστάσεις δίνοντας μια ένδειξη για την προτιμώμενη γλώσσα του χρήστη.)
 
 JabRef\ preferences=Προτιμήσεις JabRef
+JabRef\ requests\ recommendations\ from\ Mr.\ DLib,\ which\ is\ an\ external\ service.\ To\ enable\ Mr.\ DLib\ to\ calculate\ recommendations,\ some\ of\ your\ data\ must\ be\ shared\ with\ Mr.\ DLib.\ Generally,\ the\ more\ data\ is\ shared\ the\ better\ recommendations\ can\ be\ calculated.\ However,\ we\ understand\ that\ some\ of\ your\ data\ in\ JabRef\ is\ sensitive,\ and\ you\ may\ not\ want\ to\ share\ it.\ Therefore,\ Mr.\ DLib\ offers\ a\ choice\ of\ which\ data\ you\ would\ like\ to\ share.=Το JabRef ζητά συστάσεις από τον Mr. DLib, ο οποίος είναι μια εξωτερική υπηρεσία. Για να μπορέσει ο Mr. DLib να διαμορφώσει τις συστάσεις, ορισμένα από τα δεδομένα σας πρέπει να κοινοποιηθούν στον Mr. DLib. Γενικά, όσα περισσότερα δεδομένα μοιράζονται τόσο καλύτερα μπορούν να διαμορφωθούν οι συστάσεις. Ωστόσο, καταλαβαίνουμε ότι ορισμένα από τα δεδομένα σας στο JabRef είναι ευαίσθητα και μπορεί να μην θέλετε να τα μοιραστείτε. Ως εκ τούτου, ο Mr. DLib προσφέρει τη δυνατότητα επιλογής των δεδομένων που θα θέλατε να μοιραστείτε.
+JabRef\ Version\ (Required\ to\ ensure\ backwards\ compatibility\ with\ Mr.\ DLib's\ Web\ Service)=Έκδοση JabRef (Απαιτείται για να εξασφαλιστεί η συμβατότητα προς τα πίσω με την υπηρεσία διαδικτύου του Mr. DLib)
 
 Journal\ abbreviations=Συντομογραφίες περιοδικών
+Journal\ lists\:=Λίστες περιοδικών\:
+Remove\ journal\ '%0'=Αφαίρεση περιοδικού '%0'
+
+
 
 Keep\ both=Κρατήστε και τα δύο
 
+Keep\ subgroups=Διατήρηση υποομάδων
 
 Key\ bindings=Συντομεύσεις πληκτρολογίου
 
@@ -412,27 +482,28 @@ keys\ in\ library=κλειδιά στη βιβλιοθήκη
 
 Keyword=λέξη-κλειδί
 
+Keywords=Λέξεις-κλειδιά
 
 Label=Ετικέτα
+Label\:\ %0=Ετικέτα\: %0
+Content\:\ %0=Περιεχόμενο\: %0
 Language=Γλώσσα
 
 Last\ modified=Τελευταία τροποποίηση
+LaTeX\ AUX\ file\:=Αρχείο LaTeX AUX\:
 
 Link=Σύνδεση
 Listen\ for\ remote\ operation\ on\ port=Αναμονή για απομακρυσμένη λειτουργία στη θύρα
-Load\ and\ Save\ preferences\ from/to\ jabref.xml\ on\ start-up\ (memory\ stick\ mode)=Φόρτωση και Αποθήκευση από/σε jabref.xml κατά την εκκίνηση (λειτουργία memory stick)
 
-
-Main\ file\ directory=Φάκελος κύριου αρχείου
+Show\ advanced\ hints\ (i.e.\ helpful\ tooltips,\ suggestions\ and\ explanation)=Εμφάνιση προηγμένων υποδείξεων (π.χ. χρήσιμες συμβουλές, προτάσεις και επεξήγηση)
 
 Manage\ custom\ exports=Διαχείριση προσαρμοσμένων εξαγωγών
 
 Manage\ custom\ imports=Διαχείριση προσαρμοσμένων εισαγωγών
+External\ file\ types=Εξωτερικοί τύποι αρχείων
 
 Mark\ new\ entries\ with\ owner\ name=Μαρκάρετε τις νέες καταχωρήσεις με το όνομα ιδιοκτήτη
 
-Memory\ stick\ mode=Λειτουργία memory stick
-
 Merged\ external\ changes=Συγχωνευμένες εξωτερικές αλλαγές
 Merge\ fields=Συγχώνευση πεδίων
 
@@ -441,6 +512,7 @@ Modified\ group\ "%0".=Η ομάδα "%0" έχει τροποποιηθεί.
 Modified\ groups=Τροποποιημένες ομάδες
 
 Modified\ string=Τροποποιημένη συμβολοσειρά
+Modified\ string\:\ '%0' =Τροποποιημένη συμβολοσειρά\: '%0'
 
 Modify=Τροποποίηση
 
@@ -448,10 +520,15 @@ move\ group=μετακίνηση ομάδας
 
 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.
 
 Name=Όνομα
 
@@ -475,6 +552,7 @@ no\ library\ generated=δεν δημιουργήθηκε βιβλιοθήκη
 No\ entries\ found.\ Please\ make\ sure\ you\ are\ using\ the\ correct\ import\ filter.=Δεν βρέθηκαν καταχωρήσεις. Παρακαλώ βεβαιωθείτε πως χρησιμοποιείτε το σωστό φίλτρο εισαγωγής.
 No\ files\ found.=Δεν βρέθηκαν αρχεία.
 
+No\ GUI.\ Only\ process\ command\ line\ options=Δεν υπάρχει γραφικό περιβάλλον χρήστη. Μόνο επεξεργασία των επιλογών της γραμμής εντολών
 
 No\ journal\ names\ could\ be\ abbreviated.=Δεν ήταν δυνατή η σύντμηση ονομάτων περιοδικών.
 
@@ -501,7 +579,6 @@ Open\ editor\ when\ a\ new\ entry\ is\ created=Άνοιγμα επεξεργασ
 
 Open\ file=Άνοιγμα αρχείου
 
-Open\ last\ edited\ libraries\ at\ startup=Άνοιγμα των βιβλιοθηκών που τροποποιήθηκαν πρόσφατα κατά την εκκίνηση
 
 Connect\ to\ shared\ database=Σύνδεση σε κοινόχρηστη Βάση Δεδομένων
 
@@ -512,11 +589,10 @@ Open\ URL\ or\ DOI=Άνοιγμα διεύθυνσης URL ή DOI
 Opening=Άνοιγμα
 
 Operation\ canceled.=Η ενέργεια έχει ακυρωθεί.
+Operating\ System\ (Provides\ for\ better\ recommendations\ by\ giving\ an\ indication\ of\ user's\ system\ set-up.)=Λειτουργικό Σύστημα (Παρέχονται καλύτερες συστάσεις δίνοντας μια ένδειξη της διαμόρφωσης του συστήματος του χρήστη.)
 
 Optional\ fields=Προαιρετικά πεδία
 
-Options=Επιλογές
-
 or=ή
 
 Override\ default\ file\ directories=Παράκαμψη των προεπιλεγμένων φακέλων αρχείου
@@ -531,6 +607,7 @@ Paste=Επικόλληση
 
 paste\ entries=επικόλληση καταχωρήσεων
 
+paste\ entry\ %0=επικόλληση καταχώρησης %0
 
 Path\ to\ %0\ not\ defined=Δεν έχει οριστεί διαδρομή για το %0
 
@@ -542,6 +619,7 @@ Please\ enter\ a\ name\ for\ the\ group.=Παρακαλώ πληκτρολογή
 
 Please\ enter\ the\ string's\ label=Παρακαλούμε εισάγετε την ετικέτα της συμβολοσειράς
 
+Please\ restart\ JabRef\ for\ preferences\ to\ take\ effect.=Παρακαλώ επανεκκινήστε το JabRef για να τεθούν σε ισχύ οι προτιμήσεις.
 
 Possible\ duplicate\ entries=Πιθανώς διπλότυπες καταχωρήσεις
 
@@ -560,16 +638,23 @@ Error\ while\ generating\ citation\ style=Σφάλμα κατά τη δημιο
 Preview\ style\ changed\ to\:\ %0=Το στυλ προεπισκόπησης άλλαξε σε\: %0
 Next\ preview\ layout=Επόμενη διάταξη προεπισκόπησης
 Previous\ preview\ layout=Προηγούμενη διάταξη προεπισκόπησης
+Available=Διαθέσιμο
+Selected=Επιλεγμένο
+Selected\ Layouts\ can\ not\ be\ empty=Οι επιλεγμένες διατάξεις δεν μπορούν να είναι κενές
+Reset\ default\ preview\ style=Επαναφορά προεπιλεγμένου στυλ προεπισκόπησης
 Previous\ entry=Προηγούμενη καταχώρηση
 Problem\ with\ parsing\ entry=Πρόβλημα με την ανάλυση της καταχώρησης
 Processing\ %0=%0 υπό επεξεργασία
 Pull\ changes\ from\ shared\ database=Τραβήξτε αλλαγές από κοινόχρηστη βάση δεδομένων
+Problem\ finding\ files.\ See\ error\ log\ for\ details.=Πρόβλημα εύρεσης αρχείων. Δείτε το ιστορικό σφαλμάτων για λεπτομέρειες.
 
 Pushed\ citations\ to\ %0=Οι αναφορές μεταφέρθηκαν στο %0
 
+Push\ applications=Εφαρμογές προώθησης
 
 Quit\ JabRef=Έξοδος από το JabRef
 
+Read\ only=Μόνο για ανάγνωση
 
 Redo=Ακύρωση αναίρεσης
 
@@ -593,29 +678,48 @@ Remove\ group=Αφαίρεση ομάδας
 
 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" και των υπο-ομάδων της;
 
 Removed\ group\ "%0"\ and\ its\ subgroups.=Η ομάδα "%0" και οι υπο-ομάδες της έχουν αφαιρεθεί.
 
+Remove\ all\ selected\ groups\ and\ their\ subgroups?=Να αφαιρεθούν όλες οι επιλεγμένες ομάδες και να διατηρηθούν οι υποομάδες τους;
 
+Removed\ all\ selected\ groups\ and\ their\ subgroups.=Αφαιρέθηκαν όλες οι επιλεγμένες ομάδες και οι υποομάδες τους.
 
+Remove\ group\ "%0"?=Αφαίρεση ομάδας "%0";
 
 Remove\ link=Αφαίρεση συνδέσμου
 
+Remove\ string\ %0=Αφαίρεση συμβολοσειράς %0
 
 Removed\ group\ "%0".=Η ομάδα "%0" έχει αφαιρεθεί.
 
+Deleted\ string=Διαγραμμένη συμβολοσειρά
+Deleted\ string\:\ '%0'=Διαγράφηκε η συμβολοσειρά\: '%0'
 
+Renamed\ string\:\ '%0'=Μετονομάστηκε η συμβολοσειρά\: '%0'
 
 Replace=Αντικατάσταση
+Replace\ With\:=Αντικατάσταση Με\:
+Limit\ to\ Selected\ Entries=Περιορισμός σε Επιλεγμένες Καταχωρήσεις
+Limit\ to\ Fields=Περιορισμός Πεδίων
+All\ Field\ Replace=Αντικατάσταση Όλων Των Πεδίων
+Find\:=Εύρεση\:
+Find\ and\ Replace=Εύρεση και Αντικατάσταση
 
 Replace\ (regular\ expression)=Αντικατάσταση (κανονική έκφραση)
 
+Replace\ String=Αντικατάσταση Συμβολοσειράς
 Replace\ string=Αντικατάσταση συμβολοσειράς
 
 Replace\ Unicode\ ligatures=Αντικατάσταση Συνδέσμων Unicode
@@ -626,14 +730,16 @@ Required\ fields=Απαιτούμενα πεδία
 
 resolved=έχει επιλυθεί
 
+Restart=Επανεκκίνηση
 
+Restart\ required=Απαιτείται επανεκκίνηση
 
+Return\ to\ dialog=Επιστροφή στο παράθυρο διαλόγου
 
 Review=Κριτική
 Review\ changes=Αλλαγές κριτικών
 Review\ Field\ Migration=Μετακίνηση Πεδίων Κριτικής
 
-
 Save=Αποθήκευση
 Save\ all\ finished.=Η αποθήκευση όλων ολοκληρώθηκε.
 Save\ all\ open\ libraries=Αποθήκευση όλων των ανοιχτών βιβλιοθηκών
@@ -643,6 +749,7 @@ Save\ library\ as...=Αποθήκευση βιβλιοθήκης ως...
 Saving=Πραγματοποιείται αποθήκευση
 Saving\ all\ libraries...=Πραγματοποιείται αποθήκευση όλων των βιβλιοθηκών...
 Saving\ library=Πραγματοποιείται αποθήκευση βιβλιοθήκης
+Library\ saved=Η βιβλιοθήκη αποθηκεύτηκε
 Could\ not\ save\ file.=Αδυναμία αποθήκευσης του αρχείου.
 Could\ not\ save,\ file\ locked\ by\ another\ JabRef\ instance.=Αδυναμία αποθήκευσης, το αρχείο είναι κλειδωμένο από ένα άλλο παράθυρο JabRef.
 Saved\ selected\ to\ '%0'.=Το επιλεγμένο έχει αποθηκευτεί στο '%0'.
@@ -650,37 +757,58 @@ Autosave\ local\ libraries=Αυτόματη αποθήκευση τοπικών
 Automatically\ save\ the\ library\ to=Αποθηκεύστε αυτόματα τη βιβλιοθήκη στο
 Please\ enter\ a\ valid\ file\ path.=Παρακαλώ εισάγετε μια έγκυρη διαδρομή αρχείου.
 Overwrite\ file=Αντικατάσταση αρχείου
+Unable\ to\ write\ to\ %0.=Δεν είναι δυνατή η εγγραφή στο %0.
 
 Refuse\ to\ save\ the\ library\ before\ external\ changes\ have\ been\ reviewed.=Άρνηση αποθήκευσης της βιβλιοθήκης μέχρι να αναθεωρηθούν εξωτερικές αλλαγές.
 Library\ protection=Προστασία βιβλιοθήκης
 Unable\ to\ save\ library=Αδυναμία αποθήκευσης βιβλιοθήκης
 
-Always\ reformat\ BIB\ file\ on\ save\ and\ export=Πάντα να διαμορφώνεται εκ νέου το BIB αρχείο κατά την αποθήκευση και εξαγωγή
 Character\ encoding\ '%0'\ is\ not\ supported.=Η κωδικοποίηση χαρακτήρων '%0' δεν υποστηρίζεται.
 
 Search=Αναζήτηση
 Searching...=Πραγματοποιείται αναζήτηση...
+Finished\ Searching=Ολοκλήρωση Αναζήτησης
 Search\ expression=Αναζήτηση έκφρασης
+Fulltext\ search=Αναζήτηση πλήρους κειμένου
 Help\ on\ regular\ expression\ search=Βοήθεια για την αναζήτηση κανονικών εκφράσεων
 Searching\ for\ duplicates...=Αναζήτηση για διπλότυπα...
 Searching\ for\ files=Αναζήτηση για αρχεία
+The\ search\ is\ case-insensitive.=Η αναζήτηση δε διαχωρίζει τα πεζά από τα κεφαλαία γράμματα.
+The\ search\ is\ case-sensitive.=Η αναζήτηση διαχωρίζει τα πεζά από τα κεφαλαία γράμματα.
 Use\ regular\ expression\ search=Χρήση αναζήτησης κανονικής έκφρασης
 search\ expression=έκφραση αναζήτησης
+Free\ search\ expression=Ελεύθερη αναζήτηση έκφρασης
 Search\ failed\:\ illegal\ search\ expression=Αποτυχία αναζήτησης\: εσφαλμένη έκφραση αναζήτησης
 No\ search\ matches.=Δε βρέθηκαν αποτελέσματα αναζήτησης.
 Web\ search=Διαδικτυακή αναζήτηση
+Search\ results=Αποτελέσματα αναζήτησης
 Please\ enter\ a\ search\ string=Παρακαλώ εισάγετε μια συμβολοσειρά αναζήτησης
 Please\ open\ or\ start\ a\ new\ library\ before\ searching=Παρακαλώ ανοίξτε ή ξεκινήστε μια νέα βιβλιοθήκη πριν την αναζήτηση
+Please\ enter\ a\ field\ name\ to\ search\ for\ a\ keyword.=Παρακαλούμε εισάγετε ένα όνομα πεδίου για να αναζητήσετε μια λέξη-κλειδί.
 No\ results\ found.=Δε βρέθηκαν αποτελέσματα.
 Found\ %0\ results.=Βρέθηκαν %0 αποτελέσματα.
+Invalid\ regular\ expression=Μη έγκυρη κανονική έκφραση
 This\ search\ contains\ entries\ in\ which\ any\ field\ contains\ the\ regular\ expression\ <b>%0</b>=Αυτή η αναζήτηση περιέχει καταχωρήσεις στις οποίες οποιοδήποτε πεδίο θα περιέχει την κανονική έκφραση <b>%0</b>
 This\ search\ contains\ entries\ in\ which\ any\ field\ contains\ the\ term\ <b>%0</b>=Αυτή η αναζήτηση περιέχει καταχωρήσεις στις οποίες οποιοδήποτε πεδίο θα περιέχει τον όρο <b>%0</b>
 This\ search\ contains\ entries\ in\ which=Αυτή η αναζήτηση περιέχει καταχωρήσεις στις οποίες
 Empty\ search\ ID=Κενό ID αναζήτησης
 The\ given\ search\ ID\ was\ empty.=Το δεδομένο ID αναζήτησης ήταν κενό.
-
+Clear\ search=Εκκαθάριση αναζήτησης
+Search\ document\ identifier\ online=Αναζήτηση αναγνωριστικού του εγγράφου διαδικτυακά
+Search\ for\ unlinked\ local\ files=Αναζήτηση για μη συνδεδεμένα τοπικά αρχεία
+Search\ full\ text\ documents\ online=Αναζήτηση εγγράφων πλήρους κειμένου διαδικτυακά
+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\nΓια την αναζήτηση όλων των πεδίων για <b>Smith</b>, πληκτρολογήστε\:\n<tt>smith</tt>\n\nΓια την αναζήτηση του πεδίου <b>author</b> για <b>Smith</b> και το πεδίο <b>title</b> για <b>electrical</b>, πληκτρολογήστε\:\n<tt>author\=Smith and title\=electrical</tt>
+Search\ term\ is\ empty.=Ο όρος αναζήτησης είναι κενός.
+Invalid\ regular\ expression.=Μη έγκυρη κανονική έκφραση.
+Searching\ for\ a\ keyword=Αναζήτηση λέξης-κλειδιού σε εξέλιξη
+
+Search\ across\ libraries\ in\ a\ new\ window=Αναζήτηση σε όλες τις βιβλιοθήκες σε νέο παράθυρο
+Keep\ search\ string\ across\ libraries=Διατήρηση συμβολοσειράς αναζήτησης για όλες τις βιβλιοθήκες
+Keep\ dialog\ always\ on\ top=Διατήρηση του παράθυρου διαλόγου πάντα σε πρώτο πλάνο
+Search\ results\ from\ open\ libraries=Αποτελέσματα Αναζήτησης από ανοιχτές βιβλιοθήκες
 
 Select\ all=Επιλογή όλων
+Select\ new\ encoding=Επιλογή νέας κωδικοποίησης
 
 Select\ entry\ type=Επιλογή τύπου καταχώρησης
 
@@ -700,6 +828,9 @@ Show\ BibTeX\ source\ by\ default=Εμφάνιση πηγής BibTeX από πρ
 
 Show\ confirmation\ dialog\ when\ deleting\ entries=Εμφάνιση παραθύρου διαλόγου επιβεβαίωσης κατά τη διαγραφή καταχωρήσεων
 
+
+
+
 Show\ last\ names\ only=Εμφάνιση μόνο επωνύμων
 
 Show\ names\ unchanged=Εμφάνιση ονομάτων χωρίς αλλαγές
@@ -718,7 +849,14 @@ Size=Μέγεθος
 Skipped\ -\ No\ PDF\ linked=Παραβλέφθηκε - Δεν έχει συνδεθεί PDF
 Skipped\ -\ PDF\ does\ not\ exist=Παραβλέφθηκε - Δεν υπάρχει PDF
 
+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\ A-Z=Ταξινόμηση υποομάδων A-Z
 
 source\ edit=επεξεργασία πηγής
 Special\ name\ formatters=Ειδικοί μορφοποιητές ονόματος
@@ -727,6 +865,7 @@ Statically\ group\ entries\ by\ manual\ assignment=Ομαδοποίηση στα
 
 Status=Κατάσταση
 
+Sublibrary\ from\ AUX\ to\ BibTeX=Υπο-βιβλιοθήκη από AUX σε BibTeX
 
 Switches\ between\ full\ and\ abbreviated\ journal\ name\ if\ the\ journal\ name\ is\ known.=Εναλλαγή από πλήρες ή συντετμημένο όνομα περιοδικού, εάν το όνομα του περιοδικού είναι άγνωστο.
 
@@ -741,18 +880,26 @@ The\ label\ of\ the\ string\ cannot\ contain\ the\ '\#'\ character.=Η ετικ
 
 The\ output\ option\ depends\ on\ a\ valid\ import\ option.=Η επιλογή εξόδου εξαρτάται από μια έγκυρη επιλογή εισαγωγής.
 
+There\ are\ possible\ duplicates\ that\ haven't\ been\ resolved.\ Continue?=Υπάρχουν πιθανά διπλότυπα που δεν έχουν επιλυθεί. Συνέχεια;
 
+This\ operation\ requires\ all\ selected\ entries\ to\ have\ citation\ keys\ defined.=Αυτή η λειτουργία προαπαιτεί όλες οι επιλεγμένες καταχωρήσεις να έχουν ορισμένα κλειδιά αναφοράς.
 
 This\ operation\ requires\ one\ or\ more\ entries\ to\ be\ selected.=Αυτή η ενέργεια απαιτεί να έχουν επιλεχθεί μία ή περισσότερες καταχωρήσεις.
 
+This\ setting\ may\ be\ changed\ in\ preferences\ at\ any\ time.=Αυτή η ρύθμιση μπορεί να αλλάξει στις προτιμήσεις ανά πάσα στιγμή.
+Timezone\ (Provides\ for\ better\ recommendations\ by\ indicating\ the\ time\ of\ day\ the\ request\ is\ being\ made.)=Ζώνη Ώρας (Παρέχει καλύτερες συστάσεις υποδεικνύοντας το διάστημα της ημέρας κατά το οποίο υποβάλλεται το αίτημα.)
+Time\ stamp=Χρονοσήμανση
 Toggle\ groups\ interface=Εναλλαγή διεπαφής ομάδων
 
+Trim\ all\ whitespace\ characters\ in\ the\ field\ content.=Αποκοπή όλων των κενών χαρακτήρων στο περιεχόμενο του πεδίου.
 
+Trim\ whitespace\ characters=Αποκοπή κενών χαρακτήρων
 
 Try\ different\ encoding=Δοκιμάστε διαφορετική κωδικοποίηση
 
 Undo=Αναίρεση
 
+Unknown\ BibTeX\ entries\:=Άγνωστες καταχωρήσεις BibTeX\:
 
 unknown\ edit=άγνωστη τροποποίηση
 
@@ -763,17 +910,21 @@ untitled=χωρίς τίτλο
 Upgrade\ external\ PDF/PS\ links\ to\ use\ the\ '%0'\ field.=Αναβαθμίστε τους εξωτερικούς συνδέσμους PDF/PS για να χρησιμοποιήσετε το πεδίο '%0'.
 
 usage=χρήση
+Use\ autocompletion=Χρήση αυτόματης συμπλήρωσης
 
 
 Username=Όνομα χρήστη
 
 Value\ cleared\ externally=Η τιμή έχει εκκαθαριστεί εξωτερικά
 
+Value\ set\ externally\:\ %0=Η τιμή ορίστηκε εξωτερικά\: %0
 
+Verify\ that\ LyX\ is\ running\ and\ that\ the\ lyxpipe\ is\ valid.=Βεβαιωθείτε ότι το LyX εκτελείται και ότι το lyxpipe είναι έγκυρο.
 
 View=Προβολή
 Vim\ server\ name=Όνομα διακομιστή Vim
 
+
 Warn\ about\ unresolved\ duplicates\ when\ closing\ inspection\ window=Προειδοποίηση για διπλότυπα που δεν έχουν επιλυθεί κατά το κλείσιμο του παραθύρου επιθεώρησης
 
 Warn\ before\ overwriting\ existing\ keys=Προειδοποίηση πριν την αντικατάσταση υπαρχόντων κλειδιών
@@ -782,36 +933,57 @@ Warning=Προειδοποίηση
 
 Warnings=Προειδοποιήσεις
 
+Warning\:\ You\ added\ field\ "%0"\ twice.\ Only\ one\ will\ be\ kept.=Προειδοποίηση\: Προσθέσατε το πεδίο "%0" δύο φορές. Θα διατηρηθεί μόνο ένα.
 
 web\ link=ηλεκτρονικός σύνδεσμος
 
 What\ do\ you\ want\ to\ do?=Τι θέλετε να κάνετε;
+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.=Οποιαδήποτε επιλογή και αν κάνετε, ο Mr. DLib ενδεχομένως θα μοιραστεί τα δεδομένα του με ερευνητικούς συνεργάτες για την περαιτέρω βελτίωση της ποιότητας των συστάσεων ως μέρος ενός "ζωντανού εργαστηρίου". Ο Mr. DLib ίσως δημοσιεύσει δημόσια σύνολα δεδομένων που μπορεί να περιέχουν ανώνυμες πληροφορίες σχετικά με εσάς και τις συστάσεις (ευαίσθητες πληροφορίες όπως τα μεταδεδομένα των άρθρων σας θα ανωνυμοποιηθούν μέσω π.χ. πρακτικών κατακερματισμού). Οι ερευνητικοί συνεργάτες υποχρεούνται να τηρούν την ίδια αυστηρή πολιτική προστασίας δεδομένων με τον κ. DLib.
 
+Will\ write\ metadata\ to\ the\ PDFs\ linked\ from\ selected\ entries.=Θα εγγράψει μεταδεδομένα στα αρχεία PDF που συνδέονται με τις επιλεγμένες καταχωρήσεις.
 
+Write\ BibTeXEntry\ as\ metadata\ to\ PDF.=Εγγραφή BibTeXEntry ως μεταδεδομένα σε PDF.
+Write\ metadata\ for\ all\ PDFs\ in\ current\ library?=Να γίνει εγγραφή μεταδεδομένων για όλα τα αρχεία PDF στην τρέχουσα βιβλιοθήκη;
+Writing\ metadata\ for\ selected\ entries...=Εγγραφή μεταδεδομένων για τις επιλεγμένες καταχωρήσεις...
+Writing\ metadata...=Εγγραφή μεταδεδομένων...
 
+Embed\ BibTeXEntry\ in\ PDF.=Ενσωμάτωση BibTeXEntry στο PDF.
+File\ '%0'\ is\ write\ protected.=Δεν είναι δυνατή η εγγραφή στο αρχείο '%0'.
+Write\ BibTeXEntry\ as\ XMP\ metadata\ to\ PDF.=Εγγραφή BibTeXEntry ως μεταδεδομένα XMP στο PDF.
+Write\ BibTeXEntry\ metadata\ to\ PDF.=Εγγραφή BibTeXEntry ως μεταδεδομένα στο PDF.
+Write\ metadata\ to\ PDF\ files=Εγγραφή μεταδεδομένων στα αρχεία PDF
 
 XMP-annotated\ PDF=Αρχείο PDF με σχόλια XMP
 XMP\ export\ privacy\ settings=Ρυθμίσεις ιδιωτικότητας εξαγωγής XMP
-You\ must\ restart\ JabRef\ for\ this\ to\ come\ into\ effect.=Πρέπει να επανεκκινήσετε το JabRef για να τεθεί σε λειτουργία αυτό.
+XMP\ metadata=Μεταδεδομένα XMP
+You\ must\ restart\ JabRef\ for\ this\ to\ come\ into\ effect.=Χρειάζεται να επανεκκινήσετε το JabRef προκειμένου να τεθεί σε ισχύ η αλλαγή.
 
 The\ following\ fetchers\ are\ available\:=Οι παρακάτω ανακτητές είναι διαθέσιμοι\:
 Could\ not\ find\ fetcher\ '%0'=Αδυναμία εύρεσης ανακτητή '%0'
 Running\ query\ '%0'\ with\ fetcher\ '%1'.=Το αίτημα '%0' με ανακτητή '%1' τρέχει.
+Invalid\ query.\ Check\ position\ %0.=Μη έγκυρο αίτημα. Ελέγξτε τη θέση %0.
+Invalid\ query\ element\ '%0'\ at\ position\ %1=Μη έγκυρη παράμετρος αιτήματος '%0' στη θέση %1
 
 Move\ file=Μετακίνηση αρχείου
 Rename\ file=Μετονομασία αρχείου
 
+Move\ file\ to\ file\ directory\ and\ rename\ file=Μετακίνηση αρχείου στο φάκελο αρχείων και μετονομασία του
 
 Could\ not\ move\ file\ '%0'.=Αδυναμία μετακίνησης αρχείου '%0'.
 Could\ not\ find\ file\ '%0'.=Αδυναμία εύρεσης αρχείου '%0'.
 Number\ of\ entries\ successfully\ imported=Έγινε εισαγωγή του αριθμού των καταχωρήσεων με επιτυχία
 Error\ while\ fetching\ from\ %0=Σφάλμα κατά την ανάκτηση από %0
 
+Citation\ key\ generator=Δημιουργός κλειδιού αναφοράς
 Unable\ to\ open\ link.=Αδυναμία ανοίγματος συνδέσμου.
 MIME\ type=Τύπος MIME
 
 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.=Το χαρακτηριστικό αυτό επιτρέπει το άνοιγμα ή την εισαγωγή νέων αρχείων σε ένα ήδη τρέχον παράθυρο JabRef αντί να ανοίγει νέο παράθυρο. Για παράδειγμα, αυτό είναι χρήσιμο όταν ανοίγετε ένα αρχείο JabRef από τον περιηγητή ιστού. Σημειώστε πως αυτό θα σας εμποδίσει από το να τρέξετε περισσότερα από ένα παράθυρα JabRef ταυτόχρονα.
+Run\ fetcher=Εκτέλεση ανακτήσεων
 
+Line\ %0\:\ Found\ corrupted\ citation\ key\ %1.=Γραμμή %0\: Βρέθηκε κατεστραμμένο κλειδί αναφοράς %1.
+Line\ %0\:\ Found\ corrupted\ citation\ key\ %1\ (contains\ whitespaces).=Γραμμή %0\: Βρέθηκε κατεστραμμένο κλειδί αναφοράς %1 (εμπεριέχονται κενά).
+Line\ %0\:\ Found\ corrupted\ citation\ key\ %1\ (comma\ missing).=Γραμμή %0\: Βρέθηκε κατεστραμμένο κλειδί αναφοράς %1 (λείπει κόμμα).
 No\ full\ text\ document\ found=Δεν βρέθηκε αρχείο πλήρους κειμένου
 Download\ from\ URL=Κατέβασμα από σύνδεσμο URL
 Rename\ field=Μετονομασία πεδίου
@@ -825,6 +997,7 @@ Error\ opening\ file\ '%0'.=Σφάλμα κατά το άνοιγμα αρχεί
 Formatter\ not\ found\:\ %0=Δεν βρέθηκε μορφοποιητής\: %0
 
 Metadata\ change=Αλλαγή μεταδεδομένων
+The\ following\ metadata\ changed\:=Τα ακόλουθα μεταδεδομένα τροποποιήθηκαν\:
 
 Unable\ to\ create\ backup=Αδυναμία δημιουργίας αντιγράφου ασφαλείας
 Move\ file\ to\ file\ directory=Μετακίνηση αρχείου στο φάκελο αρχείου
@@ -837,26 +1010,36 @@ contains=περιέχει
 
 Optional\ fields\ 2=Προαιρετικά πεδία 2
 Waiting\ for\ save\ operation\ to\ finish=Αναμονή για ολοκλήρωση της λειτουργίας αποθήκευσης
+Waiting\ for\ background\ tasks\ to\ finish.\ Quit\ anyway?=Εν αναμονή ολοκλήρωσης των εργασιών παρασκηνίου. Έξοδος οπωσδήποτε;
 
+Find\ and\ remove\ duplicate\ citation\ keys=Εύρεση και αφαίρεση διπλότυπων κλειδιών αναφοράς
 Expected\ syntax\ for\ --fetch\='<name\ of\ fetcher>\:<query>'=Αναμενόμενη σύνταξη για --fetch\='<όνομα ανακτητή>\:<αίτημα>'
+Duplicate\ citation\ key=Διπλότυπο κλειδί αναφοράς
 
 
 General\ file\ directory=Γενικός φάκελος αρχείου
 User-specific\ file\ directory=Φάκελος αρχείου καθορισμένος από τον χρήστη
+LaTeX\ file\ directory=Κατάλογος αρχείου LaTeX
 
+You\ must\ enter\ an\ integer\ value\ in\ the\ interval\ 1025-65535=Πρέπει να εισάγετε μια ακέραια τιμή στο διάστημα 1025-65535
 Autocomplete\ names\ in\ 'Firstname\ Lastname'\ format\ only=Αυτόματη συμπλήρωση ονομάτων μόνο με τη μορφή 'Όνομα Επώνυμο'
 Autocomplete\ names\ in\ 'Lastname,\ Firstname'\ format\ only=Αυτόματη συμπλήρωση ονομάτων μόνο με τη μορφή 'Επώνυμο, Όνομα'
 Autocomplete\ names\ in\ both\ formats=Αυτόματη συμπλήρωση ονομάτων και με τις δύο μορφές
-Send\ as\ email=Αποστολή ως email
 References=Παραπομπές
 Sending\ of\ emails=Πραγματοποιείται αποστολή των email
 Subject\ for\ sending\ an\ email\ with\ references=Θέμα αποστολής ενός email με παραπομπές
 Automatically\ open\ folders\ of\ attached\ files=Αυτόματο άνοιγμα φακέλων των συνημμένων αρχείων
 Error\ creating\ email=Σφάλμα κατά τη δημιουργία email
 Entries\ added\ to\ an\ email=Οι καταχωρήσεις προστέθηκαν σε ένα email
+Custom\ applications=Εξατομικευμένες εφαρμογές
+Please\ specify\ a\ file\ browser.=Παρακαλούμε προσδιορίστε ένα πρόγραμμα περιήγησης αρχείων.
+Please\ specify\ a\ terminal\ application.=Παρακαλούμε προσδιορίστε μια εφαρμογή τερματικού.
+Use\ custom\ file\ browser=Χρήση εξατομικευμένου περιηγητή αρχείων
+Use\ custom\ terminal\ emulator=Χρήση εξατομικευμένου προσομοιωτή τερματικού
 exportFormat=μορφήεξαγωγής
 Output\ file\ missing=Λείπει το αρχείο εξόδου
 The\ output\ option\ depends\ on\ a\ valid\ input\ option.=Η επιλογή εξόδου εξαρτάται από μια έγκυρη επιλογή εισόδου.
+Linked\ file\ name\ conventions=Συμβάσεις ονομάτων συνδεδεμένων αρχείων
 Filename\ format\ pattern=Μορφή μοτίβου ονόματος αρχείου
 Additional\ parameters=Επιπρόσθετες παράμετροι
 Cite\ selected\ entries\ between\ parenthesis=Αναφορά επιλεγμένων καταχωρήσεων μέσα σε παρενθέσεις
@@ -865,6 +1048,7 @@ Cite\ special=Αναφορά ιδιαίτερων
 Extra\ information\ (e.g.\ page\ number)=Περισσότερες πληροφορίες (π.χ. αριθμός σελίδας)
 Manage\ citations=Διαχείριση αναφορών
 Problem\ modifying\ citation=Πρόβλημα κατά την τροποποίηση της αναφοράς
+Problem\ collecting\ citations=Πρόβλημα κατά τη συλλογή αναφορών
 Citation=Αναφορά
 Connecting...=Πραγματοποιείται σύνδεση...
 Select\ style=Επιλογή στυλ
@@ -879,13 +1063,17 @@ Sync\ OpenOffice/LibreOffice\ bibliography=Συγχρονισμός βιβλιο
 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.=Δεν ήταν δυνατή η σύνδεση σε κανένα έγγραφο Writer. Παρακαλoύμε βεβαιωθείτε ότι ένα έγγραφο είναι ανοιχτό πριν επιλέξετε 'Επιλογή εγγράφου 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 παραπέμπει στο κλειδί αναφοράς BibTeX key '%0', το οποίο δεν μπόρεσε να βρεθεί στην τρέχουσα βιβλιοθήκη σας.
 
+This\ operation\ requires\ a\ bibliography\ database.=Αυτή η λειτουργία απαιτεί μια βάση δεδομένων βιβλιογραφίας.
 
 
 
@@ -895,6 +1083,7 @@ Autodetection\ failed=Αποτυχία αυτόματης εύρεσης
 Please\ wait...=Παρακαλώ περιμένετε...
 Connection\ lost=Απώλεια σύνδεσης
 
+Could\ not\ update\ bibliography=Δεν ήταν δυνατή η ενημέρωση της βιβλιογραφίας
 
 
 Automatically\ sync\ bibliography\ when\ inserting\ citations=Αυτόματος συγχρονισμός βιβλιογραφίας κατά την προσθήκη αναφορών
@@ -907,12 +1096,12 @@ Please\ choose\ which\ one\ to\ connect\ to\:=Παρακαλώ επιλέξτε
 Choose\ OpenOffice/LibreOffice\ executable=Επιλογή εκτελέσιμου αρχείου OpenOffice/LibreOffice
 Select\ document=Επιλογή εγγράφου
 HTML\ list=Λίστα HTML
-If\ possible,\ normalize\ this\ list\ of\ names\ to\ conform\ to\ standard\ BibTeX\ name\ formatting=Εάν είναι δυνατόν, εναρμονίστε αυτή τη λίστα ονομάτων ώστε να ακολουθεί τη βασική μορφοποίηση ονομάτων του BibTeX
 Could\ not\ open\ %0=Αδυναμία ανοίγματος %0
 Unknown\ import\ format=Άγνωστη μορφή εισαγωγής
 Style\ selection=Επιλογή στυλ
 No\ valid\ style\ file\ defined=Δεν έχει οριστεί έγκυρο αρχείο στυλ
 Choose\ pattern=Επιλογή μοτίβου
+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.=Πρέπει να επιλέξετε ένα έγκυρο αρχείο στυλ, ή να χρησιμοποιήσετε ένα από τα προεπιλεγμένα αρχεία στυλ.
 
@@ -926,6 +1115,8 @@ Auto-generating\ PDF-Names\ does\ not\ support\ undo.\ Continue?=Η Αυτόμα
 Use\ full\ firstname\ whenever\ possible=Χρήση πλήρους ονόματος όποτε είναι δυνατόν
 Use\ abbreviated\ firstname\ whenever\ possible=Χρήση συμπτυγμένου ονόματος όποτε είναι δυνατόν
 Use\ abbreviated\ and\ full\ firstname=Χρήση συμπτυγμένου και πλήρους ονόματος
+Name\ format=Μορφοποίηση ονόματος
+First\ names=Ονόματα
 Cleanup\ entries=Καθαρισμός καταχωρήσεων
 Automatically\ assign\ new\ entry\ to\ selected\ groups=Αυτόματη ανάθεση νέας καταχώρησης στις επιλεγμένες ομάδες
 %0\ mode=λειτουργία %0
@@ -940,6 +1131,7 @@ One\ entry\ needed\ a\ clean\ up=Μία καταχώρηση χρειάστηκ
 
 Group\ tree\ could\ not\ be\ parsed.\ If\ you\ save\ the\ BibTeX\ library,\ all\ groups\ will\ be\ lost.=Αδυναμία ανάλυσης του δενδροδιαγράμματος ομάδων. Εάν αποθηκεύσετε τη βιβλιοθήκη BibTeX, όλες οι ομάδες θα χαθούν.
 Attach\ file=Επισύναψη αρχείου
+Attach\ file\ from\ URL=Επισύναψη αρχείου από τη διεύθυνση URL
 Setting\ all\ preferences\ to\ default\ values.=Ορισμός όλων των προτιμήσεων στις προεπιλεγμένες τιμές.
 Resetting\ preference\ key\ '%0'=Επαναφορά κλειδιού προτίμησης '%0'
 Unable\ to\ clear\ preferences.=Αδυναμία εκκαθάρισης προτιμήσεων.
@@ -949,7 +1141,20 @@ Expand\ all=Ανάπτυξη όλων
 Collapse\ all=Σύμπτυξη όλων
 Searches\ the\ selected\ directory\ for\ unlinked\ files.=Σαρώνει τον επιλεγμένο φάκελο για μη συνδεδεμένα αρχεία.
 Starts\ the\ import\ of\ BibTeX\ entries.=Εκκινεί την εισαγωγή καταχωρήσεων BibTeX.
+Last\ edited\:=Τελευταία τροποποίηση\:
+All\ time=Όλα
+last\ edited=τελευταία τροποποίηση
+Last\ day=Τελευταία ημέρα
+Last\ week=Τελευταία εβδομάδα
+Last\ month=Τελευταίος μήνας
+Last\ year=Τελευταίο έτος
+Sort\ by\:=Ταξινόμηση κατά\:
+Newest\ first=Πιο πρόσφατα πρώτα
+Oldest\ first=Παλαιότερα πρώτα
+Directory=Κατάλογος
+Import\ result=Αποτέλεσμα εισαγωγής
 Searching\ file\ system...=Πραγματοποιείται αναζήτηση στο σύστημα αρχείου...
+Citation\ key\ patterns=Πρότυπα κλειδιών αναφοράς
 Clear\ priority=Εκκαθάριση προτεραιότητας
 Clear\ rank=Εκκαθάριση ιεράρχησης
 Enable\ special\ fields=Ενεργοποίηση ειδικών πεδίων
@@ -960,7 +1165,6 @@ Four\ stars=Τέσσερα αστέρια
 Five\ stars=Πέντε αστέρια
 Help\ on\ special\ fields=Βοήθεια σε ειδικά πεδία
 Keywords\ of\ selected\ entries=Λέξεις-κλειδιά των επιλεγμένων καταχωρήσεων
-Manage\ content\ selectors=Διαχείριση των επιλογέων περιεχομένου
 Manage\ keywords=Διαχείριση λέξεων κλειδιών
 No\ priority\ information=Δεν υπάρχουν πληροφορίες προτεραιότητας
 No\ rank\ information=Δεν υπάρχουν πληροφορίες ιεράρχησης
@@ -989,7 +1193,6 @@ Error\ message\:=Μήνυμα σφάλματος\:
 If\ a\ pasted\ or\ imported\ entry\ already\ has\ the\ field\ set,\ overwrite.=Εάν μια επικολλημένη ή εισηγμένη καταχώρηση έχει ήδη ορισμένο το πεδίο, αντικαταστήστε την.
 Not\ connected\ to\ any\ Writer\ document.\ Please\ make\ sure\ a\ document\ is\ open,\ and\ use\ the\ 'Select\ Writer\ document'\ button\ to\ connect\ to\ it.=Δεν υπάρχει σύνδεση με κανένα έγγραφο Writer. Παρακαλώ βεβαιωθείτε πως το έγγραφο είναι ανοιχτό, και χρησιμοποιήστε το κουμπί 'Επιλογή εγγράφου Writer' για να συνδεθείτε με αυτό.
 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.
 
 Canceled\ merging\ entries=Ακύρωση συγχώνευσης καταχωρήσεων
@@ -1011,11 +1214,17 @@ Resetting\ all\ key\ bindings=Πραγματοποιείται επαναφορ
 Network=Δίκτυο
 Hostname=Όνομα κεντρικού διαμεσολαβητή
 
+Proxy\ configuration=Διαμόρφωση διακομιστή μεσολάβησης
 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 άλλαξε
 
 Open\ folder=Άνοιγμα φακέλου
 Export\ sort\ order=Εξαγωγή σειράς ταξινόμησης
@@ -1072,11 +1281,13 @@ Deleted\ entry=Η καταχώρηση διαγράφηκε
 Modified\ groups\ tree=Το δενδροδιάγραμμα ομάδων τροποποιήθηκε
 Removed\ all\ groups=Όλες οι ομάδες αφαιρέθηκαν
 Select\ export\ format=Επιλογή μορφής εξαγωγής
+
 Could\ not\ connect\ to\ %0=Αδυναμία σύνδεσης στη %0
 Warning\:\ %0\ out\ of\ %1\ entries\ have\ undefined\ title.=Προειδοποίηση\: %0 από %1 καταχωρήσεις δεν έχουν ορισμένο τίτλο.
 Really\ delete\ the\ selected\ entry?=Θέλετε όντως να διαγράψετε την επιλεγμένη καταχώρηση;
 Really\ delete\ the\ %0\ selected\ entries?=Θέλετε όντως να διαγράψετε τις %0 επιλεγμένες καταχωρήσεις;
 
+
 Keep\ left=Παραμονή αριστερά
 Keep\ right=Παραμονή δεξιά
 Old\ entry=Παλιά καταχώρηση
@@ -1118,7 +1329,6 @@ New\ mastersthesis=Νέα μεταπτυχιακή διατριβή
 New\ phdthesis=Νέα διδακτορική διατριβή
 New\ proceedings=Νέα πρακτικά
 New\ unpublished=Νέο αδημοσίευτο
-Preamble\ editor,\ store\ changes=Επεξεργαστής κειμένου εισαγωγής, αποθήκευση αλλαγών
 Push\ to\ application=Προώθηση προς εφαρμογή
 Refresh\ OpenOffice/LibreOffice=Ανανέωση OpenOffice/LibreOffice
 Save\ all=Αποθήκευση όλων
@@ -1131,6 +1341,7 @@ Copy\ preview=Αντιγραφή προεπισκόπησης
 Automatically\ setting\ file\ links=Αυτόματος ορισμός συνδέσμων αρχείου
 Regenerate\ all\ keys\ for\ the\ entries\ in\ a\ BibTeX\ file=Αναδημιουργία όλων των κλειδιών για τις καταχωρήσεις σε ένα αρχείο BibTeX
 Show\ debug\ level\ messages=Εμφάνιση μηνυμάτων επιπέδου αποσφαλμάτωσης
+Default\ library\ mode=Προεπιλεγμένος τύπος βιβλιοθήκης
 Show\ only\ preferences\ deviating\ from\ their\ default\ value=Εμφάνιση μόνο των προτιμήσεων που είναι διαφορετικές από την προεπιλεγμένη τους τιμή
 default=προεπιλογή
 key=κλειδί
@@ -1208,12 +1419,16 @@ Remove\ enclosing\ braces=Αφαίρεση εσωκλειόντων παρενθ
 Removes\ braces\ encapsulating\ the\ complete\ field\ content.=Αφαιρεί τις παρενθέσεις που περιέχουν το πλήρες περιεχόμενο πεδίου.
 Sentence\ case=Πεζοί-κεφαλαίοι χαρακτήρες πρότασης
 Shortens\ lists\ of\ persons\ if\ there\ are\ more\ than\ 2\ persons\ to\ "et\ al.".=Συντομεύει τη λίστα ατόμων σε "και συνεργάτες", εάν υπάρχουν περισσότερα από 2 άτομα.
+Title\ Case=Μορφή Τίτλου
 Unicode\ to\ LaTeX=Unicode σε LaTeX
 Units\ to\ LaTeX=Μονάδες σε LaTeX
 Does\ nothing.=Δεν εκτελεί καμία ενέργεια.
 Identity=Ταυτότητα
 Clears\ the\ field\ completely.=Εκκαθαρίζει πλήρως το πεδίο.
 Directory\ not\ found=Ο φάκελος δε βρέθηκε
+
+Main\ file\ directory=Φάκελος κύριου αρχείου
+
 This\ operation\ requires\ exactly\ one\ item\ to\ be\ selected.=Αυτή η ενέργεια απαιτεί την επιλογή ακριβώς ενός αντικειμένου.
 Importing\ in\ %0\ format=Πραγματοποιείται εισαγωγή σε μορφή %0
 Female\ name=Γυναικείο όνομα
@@ -1265,6 +1480,7 @@ Verse=Στίχος
 change\ entries\ of\ group=αλλαγή καταχωρήσεων της ομάδας
 odd\ number\ of\ unescaped\ '\#'=περιττός αριθμός '\#' που δεν έχει διαφύγει
 
+
 Show\ diff=Εμφάνιση διαφορών
 Copy\ Version=Αντιγραφή Έκδοσης
 License=Άδεια χρήσης
@@ -1280,7 +1496,6 @@ Message=Μήνυμα
 
 
 MathSciNet\ Review=Κριτική MathSciNet
-Reset\ Bindings=Επαναφορά Συντομεύσεων Πληκτρολογίου
 
 Decryption\ not\ supported.=Η αποκρυπτογράφηση δεν υποστηρίζεται.
 
@@ -1309,10 +1524,10 @@ Unable\ to\ generate\ new\ library=Αδυναμία δημιουργίας νέ
 
 
 
+Open\ one\ before\ citing.=Ανοίχτε μία πριν την καταχώρηση αναφορών.
 
 
 
-Error\ occured\ while\ executing\ the\ command\ "%0".=Προέκυψε σφάλμα κατά την εκτέλεση της εντολής "%0".
 Reformat\ ISSN=Αναδιαμόρφωση ISSN
 
 Countries\ and\ territories\ in\ English=Χώρες και περιοχές στα Αγγλικά
@@ -1347,6 +1562,7 @@ Updated\ entry\ with\ info\ from\ %0=Η καταχώρηση ενημερώθη
 Remove\ list=Αφαίρεση λίστας
 Full\ journal\ name=Πλήρες όνομα περιοδικού
 Abbreviation\ name=Όνομα συντομογραφίας
+Shortest\ unique\ abbreviation=Συντομότερη μοναδική σύντμηση
 
 No\ abbreviation\ files\ loaded=Δεν έγινε φόρτωση αρχείων συντομογραφίας
 
@@ -1478,6 +1694,7 @@ Show\ the\ document\ of\ the\ currently\ selected\ entry.=Εμφάνιση το
 Show\ this\ document\ until\ unlocked.=Εμφάνιση αυτού του εγγράφου μέχρι να ξεκλειδωθεί.
 Set\ current\ user\ name\ as\ owner.=Ορισμός του τρέχοντος ονόματος χρήστη ως ιδιοκτήτη.
 
+Collect\ and\ share\ telemetry\ data\ to\ help\ improve\ JabRef=Συλλογή και κοινή χρήση δεδομένων τηλεμετρίας για τη βελτίωση του JabRef
 Don't\ share=Να μη γίνει διαμοιρασμός
 Share\ anonymous\ statistics=Διαμοιραστείτε ανώνυμα στατιστικά
 Telemetry\:\ Help\ make\ JabRef\ better=Τηλεμετρία\: Βοηθήστε να βελτιώσουμε το JabRef
@@ -1587,6 +1804,8 @@ Always\ add\ letter\ (a,\ b,\ ...)\ to\ generated\ keys=Πάντα να προσ
 Default\ pattern=Προεπιλεγμένο μοτίβο
 
 
+Escape\ dollar\ sign=Αποφυγή συμβόλου δολαρίου
+
 
 
 
@@ -1604,6 +1823,7 @@ Default\ pattern=Προεπιλεγμένο μοτίβο
 
 
 
+(\ Note\:\ Press\ return\ to\ commit\ changes\ in\ the\ table\!\ )=( Σημείωση\: Πατήστε το πλήκτρο επιστροφής για να υποβάλλετε τις αλλαγές στον πίνακα\! )
 
 
 
@@ -1617,15 +1837,20 @@ Default\ pattern=Προεπιλεγμένο μοτίβο
 
 
 
+Please\ use\ the\ latter\ in\ the\ style\ file\ below\ to\ avoid\ localization\ problems.=Παρακαλούμε χρησιμοποιήστε το τελευταίο στο παρακάτω αρχείο μορφοποίησης για να αποφύγετε προβλήματα μετάφρασης.
 
+The\ %0\ character\ style\ '%1'\ is\ a\ display\ name\ for\ '%2'.=Το στυλ χαρακτήρων %0 '%1' είναι ένα όνομα εμφάνισης για το '%2'.
 
+The\ %0\ character\ style\ '%1'\ is\ missing\ from\ the\ document=Το στυλ χαρακτήρων %0 '%1' λείπει από το έγγραφο
 
 
 
 
+Cannot\ work\ with\ [Edit]/[Track\ Changes]/[Record]\ turned\ on.=Δεν είναι δυνατή η λειτουργία με το [Edit]/[Track Changes]/[Record] να είναι ενεργοποιημένο.
 
 
 
+Use\ [Edit]/[Track\ Changes]/[Manage]\ to\ resolve\ them\ first.=Χρησιμοποιήστε [Edit]/[Track Changes]/[Manage] για την επίλυση τους.
 
 
 
@@ -1642,8 +1867,12 @@ Default\ pattern=Προεπιλεγμένο μοτίβο
 
 
 
+Set=Ορισμός
+From=Από
+To=Στο
 
 
+(Note\:\ If\ original\ entries\ lack\ keywords\ to\ qualify\ for\ the\ new\ group\ configuration,\ confirming\ here\ will\ add\ them)=(Σημείωση\: Εάν από τις αρχικές καταχωρήσεις λείπουν λέξεις-κλειδιά που να πληρούν τις προϋποθέσεις για τη νέα διαμόρφωση της ομάδας, η επιβεβαίωση εδώ θα τις προσθέσει)
 
 plain\ text=απλό κείμενο
 
@@ -1653,5 +1882,12 @@ plain\ text=απλό κείμενο
 Do\ you\ want\ to\ recover\ the\ library\ from\ the\ backup\ file?=Θέλετε να επαναφέρετε τη βιβλιοθήκη από το αντίγραφο ασφαλείας;
 This\ could\ indicate\ that\ JabRef\ did\ not\ shut\ down\ cleanly\ last\ time\ the\ file\ was\ used.=Αυτό ίσως υποδεικνύει πως το JabRef δεν τερματίστηκε σωστά την τελευταία φορά που χρησιμοποιήθηκε το αρχείο.
 
+Use\ the\ field\ FJournal\ to\ store\ the\ full\ journal\ name\ for\ (un)abbreviations\ in\ the\ entry=Χρησιμοποιήστε το πεδίο FJournal για να αποθηκεύσετε το πλήρες όνομα του περιοδικού στην καταχώρηση, στην περίπτωση (μη) συντομογραφιών
+
+
+
+
+
+
 
 
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 188a114e8d4..653c4f08dbf 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -1,15 +1,5 @@
 Proxy\ requires\ password=Proxy requires password
 
-Could\ not\ delete\ empty\ entries.=Could not delete empty entries.
-
-Delete\ empty\ entries=Delete empty entries
-
-Empty\ entries=Empty entries
-
-Keep\ empty\ entries=Keep empty entries
-
-Library\ '%0'\ has\ empty\ entries.\ Do\ you\ want\ to\ delete\ them?=Library '%0' has empty entries. Do you want to delete them?
-
 Unable\ to\ monitor\ file\ changes.\ Please\ close\ files\ and\ processes\ and\ restart.\ You\ may\ encounter\ errors\ if\ you\ continue\ with\ this\ session.=Unable to monitor file changes. Please close files and processes and restart. You may encounter errors if you continue with this session.
 %0\ contains\ the\ regular\ expression\ <b>%1</b>=%0 contains the regular expression <b>%1</b>
 
@@ -271,7 +261,8 @@ Do\ not\ abbreviate\ names=Do not abbreviate names
 
 Do\ not\ open\ any\ files\ at\ startup=Do not open any files at startup
 
-Do\ not\ wrap\ the\ following\ fields\ when\ saving=Do not wrap the following fields when saving
+Do\ not\ wrap\ when\ saving=Do not wrap when saving
+
 Do\ not\ write\ the\ following\ fields\ to\ XMP\ Metadata=Do not write the following fields to XMP Metadata
 
 Donate\ to\ JabRef=Donate to JabRef
@@ -284,6 +275,8 @@ duplicate\ removal=duplicate removal
 
 Duplicate\ fields=Duplicate fields
 
+Unable\ to\ change\ field\ name\.\ "%0"\ already\ in\ use.=Unable to change field name. "%0" already in use.
+
 Duplicate\ string\ name=Duplicate string name
 
 Duplicates\ found=Duplicates found
@@ -344,12 +337,18 @@ External\ programs=External programs
 Failed\ to\ import\ by\ ID=Failed to import by ID
 
 Field=Field
-
 field=field
 
 Field\ name=Field name
-
+Field\ names=Field names
 Field\ names\ are\ not\ allowed\ to\ contain\ white\ spaces\ or\ certain\ characters\ (%0).=Field names are not allowed to contain white spaces or certain characters (%0).
+New\ field\ name=New field name
+Add\ new\ field\ name=Add new field name
+Field\ name\ \"%0\"\ already\ exists=Field name "%0" already exists
+No\ field\ name\ selected\!=No field name selected!
+Remove\ field\ name=Remove field name
+Are\ you\ sure\ you\ want\ to\ remove\ field\ name\:\ \"%0\"?=Are you sure you want to remove field name: "%0"?
+Manage\ field\ names\ &\ content=Manage field names & content
 
 Field\ to\ group\ by=Field to group by
 
@@ -477,6 +476,29 @@ Journal\ abbreviations=Journal abbreviations
 Journal\ lists\:=Journal lists:
 Remove\ journal\ '%0'=Remove journal '%0'
 
+Journal\ Information=Journal Information
+Year=Year
+ISSN\ or\ journal\ name\ required\ for\ fetching\ journal\ information=ISSN or journal name required for fetching journal information
+Fetch\ journal\ information\ online\ to\ show=Fetch journal information online to show
+Allow\ sending\ ISSN\ to\ a\ JabRef\ online\ service\ (SCimago)\ for\ fetching\ journal\ information=Allow sending ISSN to a JabRef online service (SCimago) for fetching journal information
+Please\ enable\ journal\ information\ fetching\ in\ %0\ >\ %1=Please enable journal information fetching in %0 > %1
+Categories=Categories
+ISSN=ISSN
+Publisher=Publisher
+h-index=h-index
+Error\ while\ fetching\ journal\ information\:\ %0=Error while fetching journal information: %0
+ISSN\ and/or\ journal\ name\ not\ found\ in\ catalog=ISSN and/or journal name not found in catalog
+Citable\ Docs\ (Previous\ 3\ Years)=Citable Docs (Previous 3 Years)
+Cites\ Incoming\ by\ Recently\ Published=Cites Incoming by Recently Published
+Cites\ Outgoing=Cites Outgoing
+Cites\ Outgoing\ per\ Document=Cites Outgoing per Document
+Docs\ (This\ Year)=Docs (This Year)
+Incorrect\ ISSN\ format=Incorrect ISSN format
+Error\ accessing\ catalog=Error accessing catalog
+
+Check\ for\ latest\ version\ online=Check for latest version online
+Please\ use\ the\ latest\ version\ of\ JabRef\ if\ you\ run\ into\ a\ bug.\ If\ you\ encounter\ an\ issue\ or\ a\ bug,\ check\ the\ latest\ version,\ if\ the\ issue\ is\ still\ present.=Please use the latest version of JabRef if you run into a bug. If you encounter an issue or a bug, check the latest version, if the issue is still present.
+
 Keep\ both=Keep both
 
 Keep\ subgroups=Keep subgroups
@@ -503,12 +525,10 @@ LaTeX\ AUX\ file\:=LaTeX AUX file\:
 
 Link=Link
 Listen\ for\ remote\ operation\ on\ port=Listen for remote operation on port
-Load\ and\ Save\ preferences\ from/to\ jabref.xml\ on\ start-up\ (memory\ stick\ mode)=Load and Save preferences from/to jabref.xml on start-up (memory stick mode)
+Memory\ stick\ mode\ -\ Store\ preferences\ in\ 'jabref.xml'\ in\ the\ app\ folder.=Memory stick mode - Store preferences in 'jabref.xml' in the app folder.
 
 Show\ advanced\ hints\ (i.e.\ helpful\ tooltips,\ suggestions\ and\ explanation)=Show advanced hints (i.e. helpful tooltips, suggestions and explanation)
 
-Main\ file\ directory=Main file directory
-
 Manage\ custom\ exports=Manage custom exports
 
 Manage\ custom\ imports=Manage custom imports
@@ -516,8 +536,6 @@ External\ file\ types=External file types
 
 Mark\ new\ entries\ with\ owner\ name=Mark new entries with owner name
 
-Memory\ stick\ mode=Memory stick mode
-
 Merged\ external\ changes=Merged external changes
 Merge\ fields=Merge fields
 
@@ -593,7 +611,7 @@ Open\ editor\ when\ a\ new\ entry\ is\ created=Open editor when a new entry is c
 
 Open\ file=Open file
 
-Open\ last\ edited\ libraries\ at\ startup=Open last edited libraries at startup
+Open\ last\ edited\ libraries\ on\ startup=Open last edited libraries on startup
 
 Connect\ to\ shared\ database=Connect to shared database
 
@@ -742,8 +760,7 @@ Replaces\ Unicode\ ligatures\ with\ their\ expanded\ form=Replaces Unicode ligat
 
 Required\ fields=Required fields
 
-Do\ not\ resolve\ BibTeX\ strings=Do not resolve BibTeX strings
-Resolve\ BibTeX\ strings\ for\ the\ following\ fields=Resolve BibTeX strings for the following fields
+Resolve\ BibTeX\ strings=Resolve BibTeX strings
 
 resolved=resolved
 
@@ -757,8 +774,6 @@ Review=Review
 Review\ changes=Review changes
 Review\ Field\ Migration=Review Field Migration
 
-Loading=Loading
-
 Save=Save
 Save\ all\ finished.=Save all finished.
 Save\ all\ open\ libraries=Save all open libraries
@@ -782,7 +797,7 @@ Refuse\ to\ save\ the\ library\ before\ external\ changes\ have\ been\ reviewed.
 Library\ protection=Library protection
 Unable\ to\ save\ library=Unable to save library
 
-Always\ reformat\ BIB\ file\ on\ save\ and\ export=Always reformat BIB file on save and export
+Always\ reformat\ library\ on\ save\ and\ export=Always reformat library on save and export
 Character\ encoding\ '%0'\ is\ not\ supported.=Character encoding '%0' is not supported.
 
 Search=Search
@@ -848,6 +863,12 @@ Show\ BibTeX\ source\ by\ default=Show BibTeX source by default
 
 Show\ confirmation\ dialog\ when\ deleting\ entries=Show confirmation dialog when deleting entries
 
+Persist\ password\ between\ sessions=Persist password between sessions
+
+Persist\ api\ keys\ between\ sessions=Persist api keys between sessions
+
+Credential\ store\ not\ available.=Credential store not available.
+
 Show\ last\ names\ only=Show last names only
 
 Show\ names\ unchanged=Show names unchanged
@@ -929,6 +950,7 @@ Upgrade\ external\ PDF/PS\ links\ to\ use\ the\ '%0'\ field.=Upgrade external PD
 usage=usage
 Use\ autocompletion=Use autocompletion
 
+User\ interface=User interface
 
 Username=Username
 
@@ -941,6 +963,8 @@ Verify\ that\ LyX\ is\ running\ and\ that\ the\ lyxpipe\ is\ valid.=Verify that
 View=View
 Vim\ server\ name=Vim server name
 
+View\ journal\ info=View journal info
+
 Warn\ about\ unresolved\ duplicates\ when\ closing\ inspection\ window=Warn about unresolved duplicates when closing inspection window
 
 Warn\ before\ overwriting\ existing\ keys=Warn before overwriting existing keys
@@ -1041,7 +1065,11 @@ You\ must\ enter\ an\ integer\ value\ in\ the\ interval\ 1025-65535=You must ent
 Autocomplete\ names\ in\ 'Firstname\ Lastname'\ format\ only=Autocomplete names in 'Firstname Lastname' format only
 Autocomplete\ names\ in\ 'Lastname,\ Firstname'\ format\ only=Autocomplete names in 'Lastname, Firstname' format only
 Autocomplete\ names\ in\ both\ formats=Autocomplete names in both formats
-Send\ as\ email=Send as email
+Send=Send
+As\ Email=As Email
+To\ Kindle=To Kindle
+Send\ to\ Kindle=Send to Kindle
+Email\ address\ for\ sending\ to\ Kindle=Email address for sending to Kindle
 References=References
 Sending\ of\ emails=Sending of emails
 Subject\ for\ sending\ an\ email\ with\ references=Subject for sending an email with references
@@ -1119,7 +1147,6 @@ Please\ choose\ which\ one\ to\ connect\ to\:=Please choose which one to connect
 Choose\ OpenOffice/LibreOffice\ executable=Choose OpenOffice/LibreOffice executable
 Select\ document=Select document
 HTML\ list=HTML list
-If\ possible,\ normalize\ this\ list\ of\ names\ to\ conform\ to\ standard\ BibTeX\ name\ formatting=If possible, normalize this list of names to conform to standard BibTeX name formatting
 Could\ not\ open\ %0=Could not open %0
 Unknown\ import\ format=Unknown import format
 Style\ selection=Style selection
@@ -1146,6 +1173,7 @@ Cleanup\ entries=Cleanup entries
 Automatically\ assign\ new\ entry\ to\ selected\ groups=Automatically assign new entry to selected groups
 %0\ mode=%0 mode
 Move\ DOIs\ from\ note\ and\ URL\ field\ to\ DOI\ field\ and\ remove\ http\ prefix=Move DOIs from note and URL field to DOI field and remove http prefix
+Move\ URL\ in\ note\ field\ to\ url\ field=Move URL in note field to url field
 Make\ paths\ of\ linked\ files\ relative\ (if\ possible)=Make paths of linked files relative (if possible)
 Rename\ PDFs\ to\ given\ filename\ format\ pattern=Rename PDFs to given filename format pattern
 Rename\ only\ PDFs\ having\ a\ relative\ path=Rename only PDFs having a relative path
@@ -1220,7 +1248,6 @@ Error\ message\:=Error message:
 If\ a\ pasted\ or\ imported\ entry\ already\ has\ the\ field\ set,\ overwrite.=If a pasted or imported entry already has the field set, overwrite.
 Not\ connected\ to\ any\ Writer\ document.\ Please\ make\ sure\ a\ document\ is\ open,\ and\ use\ the\ 'Select\ Writer\ document'\ button\ to\ connect\ to\ it.=Not connected to any Writer document. Please make sure a document is open, and use the 'Select Writer document' button to connect to it.
 Removed\ all\ subgroups\ of\ group\ "%0".=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.=To disable the memory stick mode rename or remove the jabref.xml file in the same folder as 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.=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.
@@ -1255,7 +1282,6 @@ Please\ specify\ a\ password=Please specify a password
 Proxy\ configuration=Proxy configuration
 Use\ custom\ proxy\ configuration=Use custom proxy configuration
 Proxy\ requires\ authentication=Proxy requires authentication
-Password\ kept\ for\ this\ session\ only.=Password kept for this session only.
 Clear\ connection\ settings=Clear connection settings
 Check\ Proxy\ Setting=Check Proxy Setting
 Check\ connection=Check connection
@@ -1272,7 +1298,7 @@ Open\ folder=Open folder
 Export\ sort\ order=Export sort order
 Save\ sort\ order=Save sort order
 
-Keep\ original\ order=Keep original order
+Keep\ original\ order\ and\ add\ new\ entries\ at\ the\ end=Keep original order and add new entries at the end
 Use\ current\ table\ sort\ order=Use current table sort order
 Use\ specified\ order=Use specified order
 Show\ extra\ columns=Show extra columns
@@ -1308,7 +1334,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.
+Could\ not\ detect\ terminal\ automatically\ using\ '%0'.\ Please\ define\ a\ custom\ terminal\ in\ the\ preferences.=Could not detect terminal automatically using '%0'. Please define a custom terminal in the preferences.
 
 Cannot\ delete\ file=Cannot delete file
 File\ permission\ error=File permission error
@@ -1383,6 +1409,7 @@ Entry\ editor,\ previous\ panel\ 2=Entry editor, previous panel 2
 File\ list\ editor,\ move\ entry\ down=File list editor, move entry down
 File\ list\ editor,\ move\ entry\ up=File list editor, move entry up
 Focus\ entry\ table=Focus entry table
+Focus\ group\ list=Focus group list
 Import\ into\ current\ library=Import into current library
 Import\ into\ new\ library=Import into new library
 New\ article=New article
@@ -1393,7 +1420,6 @@ New\ mastersthesis=New mastersthesis
 New\ phdthesis=New phdthesis
 New\ proceedings=New proceedings
 New\ unpublished=New unpublished
-Preamble\ editor,\ store\ changes=Preamble editor, store changes
 Push\ to\ application=Push to application
 Refresh\ OpenOffice/LibreOffice=Refresh OpenOffice/LibreOffice
 Resolve\ duplicate\ citation\ keys=Resolve duplicate citation keys
@@ -1464,7 +1490,7 @@ Capitalize=Capitalize
 Capitalize\ all\ Words,\ but\ Converts\ Articles,\ Prepositions,\ and\ Conjunctions\ to\ Lower\ Case.=Capitalize all Words, but Converts Articles, Prepositions, and Conjunctions to Lower Case.
 Capitalize\ the\ first\ word,\ changes\ other\ words\ to\ lower\ case.=Capitalize the first word, changes other words to lower case.
 changes\ all\ letters\ to\ lower\ case.=changes all letters to lower case.
-CHANGES\ ALL\ LETTER\ TO\ UPPER\ CASE.=CHANGES ALL LETTER TO UPPER CASE.
+CHANGES\ ALL\ LETTERS\ TO\ UPPER\ CASE.=CHANGES ALL LETTERS TO UPPER CASE.
 Changes\ The\ First\ Letter\ Of\ All\ Words\ To\ Capital\ Case\ And\ The\ Remaining\ Letters\ To\ Lower\ Case.=Changes The First Letter Of All Words To Capital Case And The Remaining Letters To Lower Case.
 Cleans\ up\ LaTeX\ code.=Cleans up LaTeX code.
 Converts\ HTML\ code\ to\ LaTeX\ code.=Converts HTML code to LaTeX code.
@@ -1508,7 +1534,11 @@ Does\ nothing.=Does nothing.
 Identity=Identity
 Clears\ the\ field\ completely.=Clears the field completely.
 Directory\ not\ found=Directory not found
-Main\ file\ directory\ not\ set.\ Check\ the\ preferences\ (linked\ files)\ or\ the\ library\ properties.=Main file directory not set. Check the preferences (linked files) or the library properties.
+
+Main\ file\ directory=Main file directory
+Main\ file\ directory\ not\ set.\ Check\ the\ preferences\ ("Linked\ files")\ or\ modify\ the\ library\ properties\ ("Override\ default\ file\ directories").=Main file directory not set. Check the preferences ("Linked files") or modify the library properties ("Override default file directories").
+Main\ file\ directory\ '%0'\ not\ found.\nCheck\ the\ tab\ "Linked\ files".=Main file directory '%0' not found.\nCheck the tab "Linked files".
+
 This\ operation\ requires\ exactly\ one\ item\ to\ be\ selected.=This operation requires exactly one item to be selected.
 Opening\ large\ number\ of\ files=Opening large number of files
 You\ are\ about\ to\ open\ %0\ files.\ Continue?=You are about to open %0 files. Continue?
@@ -1584,7 +1614,7 @@ Message=Message
 
 
 MathSciNet\ Review=MathSciNet Review
-Reset\ Bindings=Reset Bindings
+Reset\ all=Reset all
 
 Decryption\ not\ supported.=Decryption not supported.
 
@@ -1631,9 +1661,10 @@ Found\ overlapping\ ranges=Found overlapping ranges
 Found\ touching\ ranges=Found touching ranges
 
 Note\:\ Use\ the\ placeholder\ %DIR%\ for\ the\ location\ of\ the\ opened\ library\ file.=Note: Use the placeholder %DIR% for the location of the opened library file.
-Error\ occured\ while\ executing\ the\ command\ \"%0\".=Error occured while executing the command \"%0\".
+Error\ occurred\ while\ executing\ the\ command\ \"%0\".=Error occurred while executing the command \"%0\".
 Reformat\ ISSN=Reformat ISSN
 
+Computer\ science=Computer science
 Countries\ and\ territories\ in\ English=Countries and territories in English
 Electrical\ engineering\ terms=Electrical engineering terms
 Enabled=Enabled
@@ -1646,6 +1677,7 @@ Are\ you\ sure\ you\ want\ to\ remove\ the\ protected\ terms\ file?=Are you sure
 Remove\ protected\ terms\ file=Remove protected terms file
 Add\ selected\ text\ to\ list=Add selected text to list
 Add\ {}\ around\ selected\ text=Add {} around selected text
+Remove\ all\ {}\ in\ selected\ text=Remove all {} in selected text
 Format\ field=Format field
 New\ protected\ terms\ file=New protected terms file
 change\ field\ %0\ of\ entry\ %1\ from\ %2\ to\ %3=change field %0 of entry %1 from %2 to %3
@@ -1697,6 +1729,7 @@ Check\ the\ event\ log\ to\ see\ all\ notifications=Check the event log to see a
 Host=Host
 Port=Port
 Library=Library
+Libraries=Libraries
 User=User
 Connect=Connect
 Connection\ error=Connection error
@@ -1725,6 +1758,7 @@ Cannot\ cite\ entries\ without\ citation\ keys.\ Generate\ keys\ now?=Cannot cit
 New\ technical\ report=New technical report
 
 %0\ file=%0 file
+%0\ file\ (%1)=%0 file (%1)
 Custom\ layout\ file=Custom layout file
 Protected\ terms\ file=Protected terms file
 Style\ file=Style file
@@ -1795,6 +1829,7 @@ DOI\ %0\ is\ invalid=DOI %0 is invalid
 
 Select\ all\ customized\ types\ to\ be\ stored\ in\ local\ preferences\:=Select all customized types to be stored in local preferences\:
 Different\ customization,\ current\ settings\ will\ be\ overwritten=Different customization, current settings will be overwritten
+%0\ (from\ file)\n%1\ (current\ setting)=%0 (from file)\n%1 (current setting)
 
 Entry\ type\ %0\ is\ only\ defined\ for\ Biblatex\ but\ not\ for\ BibTeX=Entry type %0 is only defined for Biblatex but not for BibTeX
 
@@ -1923,6 +1958,7 @@ 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
 Recent\ libraries=Recent libraries
+Clear\ recent\ libraries=Clear recent libraries
 Set\ up\ general\ fields=Set up general fields
 View\ change\ log=View change log
 View\ event\ log=View event log
@@ -1964,12 +2000,6 @@ Select\ the\ entries\ to\ be\ imported\:=Select the entries to be imported\:
 Add\ new\ String=Add new String
 Must\ not\ be\ empty\!=Must not be empty\!
 Open\ Help\ page=Open Help page
-Add\ new\ field\ name=Add new field name
-Field\ name\:=Field name:
-Field\ name\ \"%0\"\ already\ exists=Field name "%0" already exists
-No\ field\ name\ selected\!=No field name selected!
-Remove\ field\ name=Remove field name
-Are\ you\ sure\ you\ want\ to\ remove\ field\ name\:\ \"%0\"?=Are you sure you want to remove field name: "%0"?
 Add\ new\ keyword=Add new keyword
 Keyword\:=Keyword:
 Keyword\ \"%0\"\ already\ exists=Keyword "%0" already exists
@@ -1980,7 +2010,6 @@ Reset\ to\ default=Reset to default
 String\ constants=String constants
 Export\ all\ entries=Export all entries
 Generate\ citation\ keys=Generate citation keys
-Manage\ field\ names\ &\ content=Manage field names & content
 New\ library=New library
 OpenOffice/LibreOffice=OpenOffice/LibreOffice
 Open\ document\ viewer=Open document viewer
@@ -2052,16 +2081,15 @@ Add\ formatter\ to\ list=Add formatter to list
 Filter\ List=Filter List
 Open\ files...=Open files...
 
-Affected\ fields\:=Affected fields:
+Affected\ fields=Affected fields
 Show\ preview\ as\ a\ tab\ in\ entry\ editor=Show preview as a tab in entry editor
-Font=Font
 Visual\ theme=Visual theme
-Light\ theme=Light theme
-Dark\ theme=Dark theme
-Custom\ theme=Custom theme
 Overwrite\ existing\ keys=Overwrite existing keys
 Key\ patterns=Key patterns
 Font\ settings=Font settings
+Custom...=Custom...
+Dark=Dark
+Light=Light
 Please\ specify\ a\ css\ theme\ file.=Please specify a css theme file.
 You\ must\ enter\ an\ integer\ value\ higher\ than\ 8.=You must enter an integer value higher than 8.
 Letters\ after\ duplicate\ generated\ keys=Letters after duplicate generated keys
@@ -2286,7 +2314,6 @@ Display\ count\ of\ items\ in\ group=Display count of items in group
 Remove\ the\ following\ characters\:=Remove the following characters:
 Truncate=Truncate
 Truncates\ a\ string\ after\ a\ given\ index.=Truncates a string after a given index.
-Close=Close
 Close\ all=Close all
 Close\ all\ libraries=Close all libraries
 Close\ other\ libraries=Close other libraries
@@ -2301,6 +2328,7 @@ Custom\ import\ formats=Custom import formats
 
 No\ list\ enabled=No list enabled
 Protect\ selection=Protect selection
+Unprotect\ selection=Unprotect selection
 
 Customized\ preview\ style=Customized preview style
 Next\ preview\ style=Next preview style
@@ -2341,7 +2369,7 @@ Unprotect\ terms=Unprotect terms
 
 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
-Import\ and\ Export=Import and Export
+
 Custom\ DOI\ URI=Custom DOI URI
 Use\ custom\ DOI\ base\ URI\ for\ article\ access=Use custom DOI base URI for article access
 
@@ -2349,7 +2377,7 @@ 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.
+I\ cannot\ insert\ to\ the\ cursor's\ current\ location.=I\ cannot\ insert\ to\ the\ cursor's\ current\ location.
 
 Please\ move\ the\ cursor\ to\ the\ location\ for\ the\ new\ citation.=Please\ move\ the\ cursor\ to\ the\ location\ for\ the\ new\ citation.
 
@@ -2389,13 +2417,13 @@ File\ '%1'\ is\ a\ duplicate\ of\ '%0'.\ Keeping\ both\ due\ to\ deletion\ error
 Enable\ field\ formatters=Enable field formatters
 Entry\ Type=Entry Type
 Entry\ types=Entry types
-Field\ names=Field names
 Others=Others
 Recommended=Recommended
 
 Authors\ and\ Title=Authors and Title
-Database=Database
-Databases=Databases
+Catalog=Catalog
+Catalogs=Catalogs
+Select\ Catalogs\:=Select Catalogs:
 Add\ Author\:=Add Author\:
 Add\ Query\:=Add Query\:
 Add\ Research\ Question\:=Add Research Question\:
@@ -2406,7 +2434,6 @@ Start\ new\ systematic\ literature\ review=Start new systematic literature revie
 Manage\ study\ definition=Manage study definition
 Update\ study\ search\ results=Update study search results
 Study\ repository\ could\ not\ be\ created=Study repository could not be created
-Select\ Databases\:=Select Databases:
 
 All\ query\ terms\ are\ joined\ using\ the\ logical\ AND,\ and\ OR\ operators=All query terms are joined using the logical AND, and OR operators
 Finalize=Finalize
@@ -2478,7 +2505,6 @@ 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
@@ -2503,7 +2529,7 @@ Edit\ file\ link=Edit file link
 Assign=Assign
 Do\ not\ assign=Do not assign
 
-Error\ occured\ %0=Error occured %0
+Error\ occurred\ %0=Error occurred %0
 Left\ Entry=Left Entry
 Merge\ %0=Merge %0
 Right\ Entry=Right Entry
@@ -2527,18 +2553,33 @@ Use\ the\ field\ FJournal\ to\ store\ the\ full\ journal\ name\ for\ (un)abbrevi
 
 Library\ to\ import\ into=Library to import into
 
+Enable\ web\ search=Enable web search
+Web\ search\ disabled=Web search disabled
+
 Multiline=Multiline
 
 Unable\ to\ open\ linked\ eprint.\ Please\ set\ the\ eprinttype\ field=Unable to open linked eprint. Please set the eprinttype field
 Unable\ to\ open\ linked\ eprint.\ Please\ verify\ that\ the\ eprint\ field\ has\ a\ valid\ '%0'\ id=Unable to open linked eprint. Please verify that the eprint field has a valid '%0' id
-Main\ directory\ not\ found=Main directory not found
-Please\ select\ a\ valid\ main\ directory\ under=Please select a valid main directory under
 
 Search\ from\ history...=Search from history...
 your\ search\ history\ is\ empty=your search history is empty
-Clear\ history =Clear history
+Clear\ history=Clear history
 
 Delete\ %0\ files=Delete %0 files
 Delete\ %0\ files\ permanently\ from\ disk,\ or\ just\ remove\ the\ files\ from\ the\ entry?\ Pressing\ Delete\ will\ delete\ the\ files\ permanently\ from\ disk.=Delete %0 files permanently from disk, or just remove the files from the entry? Pressing Delete will delete the files permanently from disk.
 Error\ accessing\ file\ '%0'.=Error accessing file '%0'.
 This\ operation\ requires\ selected\ linked\ files.=This operation requires selected linked files.
+
+Create\ backup=Create backup
+Automatically\ search\ and\ show\ unlinked\ files\ in\ the\ entry\ editor=Automatically search and show unlinked files in the entry editor
+
+File\ "%0"\ cannot\ be\ added\!=File "%0" cannot be added!
+Illegal\ characters\ in\ the\ file\ name\ detected.\nFile\ will\ be\ renamed\ to\ "%0"\ and\ added.=Illegal characters in the file name detected.\nFile will be renamed to "%0" and added.
+Rename\ and\ add=Rename and add
+
+401\ Unauthorized\:\ Access\ Denied.\ You\ are\ not\ authorized\ to\ access\ this\ resource.\ Please\ check\ your\ credentials\ and\ try\ again.\ If\ you\ believe\ you\ should\ have\ access,\ please\ contact\ the\ administrator\ for\ assistance.\nURL\:\ %0\ \n\ %1=401 Unauthorized: Access Denied. You are not authorized to access this resource. Please check your credentials and try again. If you believe you should have access, please contact the administrator for assistance.\nURL: %0 \n %1
+403\ Forbidden\:\ Access\ Denied.\ You\ do\ not\ have\ permission\ to\ access\ this\ resource.\ Please\ contact\ the\ administrator\ for\ assistance\ or\ try\ a\ different\ action.\nURL\:\ %0\ \n\ %1=403 Forbidden: Access Denied. You do not have permission to access this resource. Please contact the administrator for assistance or try a different action.\nURL: %0 \n %1
+404\ Not\ Found\ Error\:\ The\ requested\ resource\ could\ not\ be\ found.\ It\ seems\ that\ the\ file\ you\ are\ trying\ to\ download\ is\ not\ available\ or\ has\ been\ moved.\ Please\ verify\ the\ URL\ and\ try\ again.\ If\ you\ believe\ this\ is\ an\ error,\ please\ contact\ the\ administrator\ for\ further\ assistance.\nURL\:\ %0\ \n\ %1=404 Not Found Error: The requested resource could not be found. It seems that the file you are trying to download is not available or has been moved. Please verify the URL and try again. If you believe this is an error, please contact the administrator for further assistance.\nURL: %0 \n %1
+Error\ downloading\ form\ URL.\ Cause\ is\ likely\ the\ server\ side.\ HTTP\ Error\ %0\ \n\ %1\ \nURL\:\ %2\ \nPlease\ try\ again\ later\ or\ contact\ the\ server\ administrator.=Error downloading form URL. Cause is likely the server side. HTTP Error %0 \n %1 \nURL: %2 \nPlease try again later or contact the server administrator.
+Error\ message\:\ %0\ \nURL\:\ %1\ \nPlease\ check\ the\ URL\ and\ try\ again.=Error message: %0 \nURL: %1 \nPlease check the URL and try again.
+Failed\ to\ download\ from\ URL=Failed to download from URL
diff --git a/src/main/resources/l10n/JabRef_es.properties b/src/main/resources/l10n/JabRef_es.properties
index 8de90af0baa..690ace61d0a 100644
--- a/src/main/resources/l10n/JabRef_es.properties
+++ b/src/main/resources/l10n/JabRef_es.properties
@@ -1,12 +1,4 @@
-Could\ not\ delete\ empty\ entries.=No se pudieron eliminar las 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. ¿Quiere eliminarlas?
+Proxy\ requires\ password=El «proxy» requiere contraseña
 
 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>
@@ -28,6 +20,7 @@ Reveal\ in\ File\ Explorer=Mostrar en Explorador de Archivos
 %0\ matches\ the\ term\ <b>%1</b>=%0 coincidencias con el término <b>%1</b>
 
 Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (DEFAULT\ abbreviation)=Abreviar nombres de revistas de las entradas seleccionadas (abreviatura DEFAULT)
+Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (DOTLESS\ abbreviation)=Abreviar nombres de revistas de las entradas seleccionadas (abreviatura DOTLESS)
 Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (SHORTEST\ UNIQUE\ abbreviation)=Abreviar nombres de revistas de las entradas seleccionadas (abreviatura SHORTEST UNIQUE)
 
 Abbreviate\ names=Abreviar nombres
@@ -39,6 +32,8 @@ Abbreviations=Abreviaciones
 Unabbreviate\ journal\ names\ of\ the\ selected\ entries=Desabreviar nombre de revista de las entradas seleccionadas
 Unabbreviated\ %0\ journal\ names.=%0 nombres de revista desabreviados
 
+dotless=sin punto
+shortest\ unique=único más corto
 
 About\ JabRef=Acerca de JabRef
 
@@ -266,7 +261,8 @@ Do\ not\ abbreviate\ names=No abreviar nombres
 
 Do\ not\ open\ any\ files\ at\ startup=No abrir ningún archivo al arrancar
 
-Do\ not\ wrap\ the\ following\ fields\ when\ saving=No envolver los siguientes campos al guardar
+Do\ not\ wrap\ when\ saving=No envolver al guardar
+
 Do\ not\ write\ the\ following\ fields\ to\ XMP\ Metadata=No escriba los siguientes datos en los metadatos XMP
 
 Donate\ to\ JabRef=Donar a JabRef
@@ -279,6 +275,8 @@ duplicate\ removal=eliminación de duplicados
 
 Duplicate\ fields=Campos duplicados
 
+Unable\ to\ change\ field\ name.\ "%0"\ already\ in\ use.=No se puede cambiar el nombre del campo. "%0" ya está en uso.
+
 Duplicate\ string\ name=Nombre de cadena duplicado
 
 Duplicates\ found=Se han encontrado duplicados
@@ -332,20 +330,25 @@ Export\ to\ text\ file.=Exportar a un archivo de texto.
 Exporting=Exportando
 Extension=Extensión
 
-
-External\ file\ links=Enlaces a archivos externos
+External\ Changes\ Resolver=Resolver cambios externos
 
 External\ programs=Programas externos
 
 Failed\ to\ import\ by\ ID=Error al importar por ID
 
 Field=Campo
-
 field=campo
 
 Field\ name=Nombre del campo
-
+Field\ names=Nombre del campo
 Field\ names\ are\ not\ allowed\ to\ contain\ white\ spaces\ or\ certain\ characters\ (%0).=No se permite que los nombres de los campos contengan espacios en blanco o ciertos caracteres (%0).
+New\ field\ name=Nuevo nombre de campo
+Add\ new\ field\ name=Agregar nuevo nombre de campo
+Field\ name\ "%0"\ already\ exists=El nombre de campo "%0" ya existe
+No\ field\ name\ selected\!=¡Ningún nombre de campo seleccionado\!
+Remove\ field\ name=Eliminar el nombre de campo
+Are\ you\ sure\ you\ want\ to\ remove\ field\ name\:\ "%0"?=¿Está seguro de que desea eliminar el nombre de campo\: "%0"?
+Manage\ field\ names\ &\ content=Gestionar nombres y contenido de los campos
 
 Field\ to\ group\ by=Agrupar a partir de campo
 
@@ -365,7 +368,7 @@ Filter\ groups=Filtros
 Success\!\ Finished\ writing\ metadata.=¡Éxito\! Se ha terminado de escribir metadatos.
 Finished\ writing\ metadata\ for\ %0\ file\ (%1\ skipped,\ %2\ errors).=Escritura de metadatos para el archivo %0 finalizada (%1 omitidos, %2 errores).
 Error\ while\ writing\ metadata.\ See\ the\ error\ log\ for\ details.=Error al escribir los metadatos. Vea el registro de errores para más detalles.
-Failed\ to\ write\ metadata,\ file\ %1\ not\ found.=Error al escribir metadatos, archivo %1 no encontrado.
+Failed\ to\ write\ metadata,\ file\ %1\ not\ found.=Error al escribir metadatos; no se encontró el archivo %1.
 
 First\ select\ the\ entries\ you\ want\ keys\ to\ be\ generated\ for.=En primer lugar, seleccione las entradas para las que desea generar claves
 
@@ -471,7 +474,27 @@ JabRef\ Version\ (Required\ to\ ensure\ backwards\ compatibility\ with\ Mr.\ DLi
 
 Journal\ abbreviations=Abreviaturas de publicaciones
 Journal\ lists\:=Listados de revistas\:
-Remove\ journal\ '%0'=Eliminar revista '%0'
+Remove\ journal\ '%0'=Eliminar revista «%0»
+
+Journal\ Information=Información de la revista
+Year=Año
+ISSN\ or\ journal\ name\ required\ for\ fetching\ journal\ information=Se requiere ISSN o nombre de la revista para obtener la información de la revista
+Allow\ sending\ ISSN\ to\ a\ JabRef\ online\ service\ (SCimago)\ for\ fetching\ journal\ information=Permitir el envío de ISSN al servicio online de JabRef (SCimago) para obtener la información de la revista
+Please\ enable\ journal\ information\ fetching\ in\ %0\ >\ %1=Por favor, habilite la obtención de información de revista en %0 > %1
+Categories=Categorías
+ISSN=ISSN
+Publisher=Editor
+h-index=índice
+Error\ while\ fetching\ journal\ information\:\ %0=Error al recuperar la información de la revista\: %0
+ISSN\ and/or\ journal\ name\ not\ found\ in\ catalog=ISSN y/o nombre de revista no encontrado en el catálogo
+Citable\ Docs\ (Previous\ 3\ Years)=Documentos citables (3 años anteriores)
+Cites\ Incoming\ by\ Recently\ Published=Citas entrantes según Publicado Recientemente
+Cites\ Outgoing=Citas salientes
+Cites\ Outgoing\ per\ Document=Citas salientes por documento
+Docs\ (This\ Year)=Documentos (Este Año)
+Incorrect\ ISSN\ format=Formato ISSN incorrecto
+Error\ accessing\ catalog=Error al acceder al catálogo
+
 
 Keep\ both=Mantener ambos
 
@@ -499,12 +522,10 @@ LaTeX\ AUX\ file\:=Archivo AUX de LaTeX\:
 
 Link=Enlace
 Listen\ for\ remote\ operation\ on\ port=Escuchar para operación remota en el puerto
-Load\ and\ Save\ preferences\ from/to\ jabref.xml\ on\ start-up\ (memory\ stick\ mode)=Cargar y guardar preferencias desde/a jabref.xml al arrancar (modo lápiz de memoria)
+Memory\ stick\ mode\ -\ Store\ preferences\ in\ 'jabref.xml'\ in\ the\ app\ folder.=Modo de tarjeta de memoria - Almacena las preferencias en 'jabref.xml' en la carpeta de aplicaciones.
 
 Show\ advanced\ hints\ (i.e.\ helpful\ tooltips,\ suggestions\ and\ explanation)=Mostrar consejos avanzados (es decir, consejos útiles, sugerencias y explicaciones)
 
-Main\ file\ directory=Carpeta del archivo principal
-
 Manage\ custom\ exports=Administrar exportaciones personalizadas
 
 Manage\ custom\ imports=Administrar importaciones personalizadas
@@ -512,8 +533,6 @@ External\ file\ types=Tipos de archivos externos
 
 Mark\ new\ entries\ with\ owner\ name=Marcar nuevas entradas con nombre de propietario
 
-Memory\ stick\ mode=Modo lápiz de memoria
-
 Merged\ external\ changes=Cambios externos incorporados
 Merge\ fields=Combinar campos
 
@@ -589,7 +608,7 @@ Open\ editor\ when\ a\ new\ entry\ is\ created=Abrir editor al crear nueva entra
 
 Open\ file=Abrir archivo
 
-Open\ last\ edited\ libraries\ at\ startup=Abrir las últimas bibliotecas editadas al arrancar
+Open\ last\ edited\ libraries\ on\ startup=Abrir últimas bibliotecas editadas al iniciar
 
 Connect\ to\ shared\ database=Conectar a biblioteca compartida
 
@@ -604,8 +623,6 @@ Operating\ System\ (Provides\ for\ better\ recommendations\ by\ giving\ an\ indi
 
 Optional\ fields=Campos opcionales
 
-Options=Opciones
-
 or=o
 
 Override\ default\ file\ directories=Ignorar carpetas de archivo por defecto
@@ -705,7 +722,7 @@ Remove\ group\ "%0"\ and\ its\ subgroups?=¿Eliminar el grupo "%0" y sus subgrup
 
 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?
+Remove\ all\ selected\ groups\ and\ their\ subgroups?=¿Quiere eliminar todos los grupos seleccionados y sus subgrupos?
 
 Removed\ all\ selected\ groups\ and\ their\ subgroups.=Eliminados todos los grupos seleccionados y sus subgrupos.
 
@@ -720,6 +737,7 @@ Removed\ group\ "%0".=el grupo "%0" se ha eliminado.
 Deleted\ string=Cadena eliminada
 Deleted\ string\:\ '%0'=Cadena eliminada\: «%0»
 
+Renamed\ string\:\ '%0'=Cadena renombrada\: '%0'
 
 Replace=Reemplazar
 Replace\ With\:=Reemplazar con\:
@@ -739,8 +757,7 @@ 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
+Resolve\ BibTeX\ strings=Resolver cadenas BibTeX
 
 resolved=resuelto
 
@@ -754,8 +771,6 @@ 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
 Save\ all\ open\ libraries=Guardar todas las bibliotecas abiertas
@@ -773,12 +788,13 @@ Autosave\ local\ libraries=Autoguardado de bibliotecas locales
 Automatically\ save\ the\ library\ to=Guardar la biblioteca automáticamente en
 Please\ enter\ a\ valid\ file\ path.=Por favor, introduzca una ruta de archivo válida
 Overwrite\ file=Sobrescribir archivo
+Unable\ to\ write\ to\ %0.=No se puede escribir en %0.
 
 Refuse\ to\ save\ the\ library\ before\ external\ changes\ have\ been\ reviewed.=Rechazar guadar la biblioteca antes qde que los cambios externos hayan sido revisado.
 Library\ protection=Proteccion de la biblioteca
 Unable\ to\ save\ library=No es posible guardar la biblioteca
 
-Always\ reformat\ BIB\ file\ on\ save\ and\ export=Siempre reformatear el fichero BIB al guardar y exportar
+Always\ reformat\ library\ on\ save\ and\ export=Siempre cambiar formato de la librería al guardar y exportar
 Character\ encoding\ '%0'\ is\ not\ supported.=La codificaciónd de caracteres '%0' no está soportada.
 
 Search=Buscar
@@ -844,6 +860,10 @@ Show\ BibTeX\ source\ by\ default=Mostrar fuente BibTeX por defecto
 
 Show\ confirmation\ dialog\ when\ deleting\ entries=Mostra diálogo de confirmación al borrar entradas
 
+Persist\ password\ between\ sessions=Mantener contraseña entre sesiones
+
+
+
 Show\ last\ names\ only=Mostrar sólo apellidos
 
 Show\ names\ unchanged=Mostrar nombres sin cambios
@@ -869,6 +889,7 @@ Please\ check\ your\ library\ file\ for\ wrong\ syntax.=Por favor, comprueba err
 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\ A-Z=Ordenar subgrupos A-Z
 
 source\ edit=editar fuente
 Special\ name\ formatters=Formateadores con nombre especial
@@ -924,6 +945,7 @@ Upgrade\ external\ PDF/PS\ links\ to\ use\ the\ '%0'\ field.=Actualizar enlaces
 usage=Uso
 Use\ autocompletion=Utilice la función de autocompletar
 
+User\ interface=Interfaz de usuario
 
 Username=Nombre de usuario
 
@@ -936,6 +958,8 @@ Verify\ that\ LyX\ is\ running\ and\ that\ the\ lyxpipe\ is\ valid.=Cerciórese
 View=Ver
 Vim\ server\ name=Nombre de servidor Vim
 
+View\ journal\ info=Ver información de la revista
+
 Warn\ about\ unresolved\ duplicates\ when\ closing\ inspection\ window=Advertir sobre duplicados sin resolver cuando al cerrar la ventana de inspección
 
 Warn\ before\ overwriting\ existing\ keys=Advertir antes de sobreescribir claves existentes
@@ -1036,7 +1060,11 @@ You\ must\ enter\ an\ integer\ value\ in\ the\ interval\ 1025-65535=Debe introdu
 Autocomplete\ names\ in\ 'Firstname\ Lastname'\ format\ only=Autocompletar nombres sólo en el formato 'Nombre Apellidos'
 Autocomplete\ names\ in\ 'Lastname,\ Firstname'\ format\ only=Autocompletar nombres sólo en el formato 'Apellidos, Nombre'
 Autocomplete\ names\ in\ both\ formats=Autocompletar nombres en ambos formatos
-Send\ as\ email=Enviar como email
+Send=Enviar
+As\ Email=Como email
+To\ Kindle=A Kindle
+Send\ to\ Kindle=Enviar a Kindle
+Email\ address\ for\ sending\ to\ Kindle=Dirección de correo electrónico para enviar a Kindle
 References=Referencias
 Sending\ of\ emails=Envío de emails
 Subject\ for\ sending\ an\ email\ with\ references=Asunto para enviar email con referencias\:
@@ -1114,7 +1142,6 @@ Please\ choose\ which\ one\ to\ connect\ to\:=Seleccione al que se desea conecta
 Choose\ OpenOffice/LibreOffice\ executable=Escoger ejecutable OpenOffice/LibreOffice
 Select\ document=Seleccionar documento
 HTML\ list=Listado HTML
-If\ possible,\ normalize\ this\ list\ of\ names\ to\ conform\ to\ standard\ BibTeX\ name\ formatting=Normalizar esta lista de nombres para cumplir con el formato de nombre BibTeX estándar
 Could\ not\ open\ %0=No se puede abrir %0
 Unknown\ import\ format=Formato de importación desconocido
 Style\ selection=Selección de estilo
@@ -1141,6 +1168,7 @@ Cleanup\ entries=Limpiar entradas
 Automatically\ assign\ new\ entry\ to\ selected\ groups=Asignar automáticamente nueva entrada a los grupos seleccionados
 %0\ mode=modo %0
 Move\ DOIs\ from\ note\ and\ URL\ field\ to\ DOI\ field\ and\ remove\ http\ prefix=Mover DOIs desde los campos nota y URL al campo DOI y eliminar el prefijo http
+Move\ URL\ in\ note\ field\ to\ url\ field=Mover URL en campo de nota al campo url
 Make\ paths\ of\ linked\ files\ relative\ (if\ possible)=Hacer rutas de los ficheros enlazados relativas (si es posible)
 Rename\ PDFs\ to\ given\ filename\ format\ pattern=Renombrar PDFs al patron de formato de nombre archivo proporcionado
 Rename\ only\ PDFs\ having\ a\ relative\ path=Renombrar sólo los PDF con ruta relativa
@@ -1151,6 +1179,7 @@ One\ entry\ needed\ a\ clean\ up=Sólo una entrada necesitó limpieza
 
 Group\ tree\ could\ not\ be\ parsed.\ If\ you\ save\ the\ BibTeX\ library,\ all\ groups\ will\ be\ lost.=El arbol de grupo no puede ser examinado. Si guarda la biblioteca BibTeX, todos los grupos se perderán.
 Attach\ file=Adjuntar archivo
+Attach\ file\ from\ URL=Adjuntar archivo a partir de un URL
 Setting\ all\ preferences\ to\ default\ values.=Estableciendo todas las preferencias a los valores por defecto.
 Resetting\ preference\ key\ '%0'=Reestableciendo la preferencia con clave '%0'
 Unable\ to\ clear\ preferences.=No es posible limpiar preferencias.
@@ -1184,7 +1213,6 @@ Four\ stars=Cuatro estrellas
 Five\ stars=Cinco estrellas
 Help\ on\ special\ fields=Ayuda sobre campos especiales
 Keywords\ of\ selected\ entries=Palabras clave de las entradas seleccionadas
-Manage\ content\ selectors=Gestionar selectores de contenido
 Content\ selectors=Selectores de contenido
 Manage\ keywords=Administrar palabras clave
 No\ priority\ information=Sin información de prioridad
@@ -1215,7 +1243,6 @@ Error\ message\:=Mensaje de error\:
 If\ a\ pasted\ or\ imported\ entry\ already\ has\ the\ field\ set,\ overwrite.=Si una entrada importada o pegada ya tiene el campo establecido, sobreescribir.
 Not\ connected\ to\ any\ Writer\ document.\ Please\ make\ sure\ a\ document\ is\ open,\ and\ use\ the\ 'Select\ Writer\ document'\ button\ to\ connect\ to\ it.=No conectado a ningún documento Writer. Asegúrese de que un documento está abierto y use el botón "Seleccionar documento Writer' para conectar con él.
 Removed\ all\ subgroups\ of\ group\ "%0".=Eliminados todos los subgrupos del grupo "%0".
-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)
 When\ downloading\ files,\ or\ moving\ linked\ files\ to\ the\ file\ directory,\ use\ the\ bib\ file\ location.=Cuando descargue archivos o mueva los archivos enlazados al directorio de archivos, utilice la ubicación del archivo bib.
@@ -1250,7 +1277,6 @@ Please\ specify\ a\ password=Por favor, especifique una contraseña
 Proxy\ configuration=Configuración del proxy
 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
@@ -1267,7 +1293,7 @@ Open\ folder=Abrir pasta
 Export\ sort\ order=Criterio de ordenación para exportación
 Save\ sort\ order=Guarda el orden de clasificación
 
-Keep\ original\ order=Conservar orden original
+Keep\ original\ order\ and\ add\ new\ entries\ at\ the\ end=Mantener el orden original y añadir nuevas entradas al final
 Use\ current\ table\ sort\ order=Utilizar criterio de ordenamiento de la tabla actual
 Use\ specified\ order=Utilizar orden específico
 Show\ extra\ columns=Mostrar columnas extra
@@ -1275,8 +1301,12 @@ Parsing\ error=Error analizando
 illegal\ backslash\ expression=Expresión de barra inclinada ilegal
 
 Clear\ read\ status=Borrar status de lectura
+Convert\ to\ biblatex\ format\ (e.g.,\ store\ publication\ date\ in\ date\ field)=Convertir a formato biblatex (por ejemplo, guardar fecha de publicación en campo de fecha)
+Convert\ to\ BibTeX\ format\ (e.g.,\ store\ publication\ date\ in\ year\ and\ month\ fields)=Convertir a formato BibTeX (por ejemplo, guardar fecha de publicación en los campos año y mes)
 
 Deprecated\ fields=Campos obsoletos
+Shows\ fields\ having\ a\ successor\ in\ biblatex.=Muestra los campos que tienen un sucesor en biblatex.
+Shows\ fields\ having\ a\ successor\ in\ biblatex.\nFor\ instance,\ the\ publication\ month\ should\ be\ part\ of\ the\ date\ field.\nUse\ the\ Cleanup\ Entries\ functionality\ to\ convert\ the\ entry\ to\ biblatex.=Muestra campos que tienen un sucesor biblatex.\nPor ejemplo, el mes de publicación debe ser parte del campo fecha.\nUtilice la función Limpiar Entradas para convertir las entradas a biblatex.
 
 
 No\ read\ status\ information=No hay información sobre status de lectura
@@ -1299,7 +1329,7 @@ Please\ open\ %0\ manually.=Por favor, abra %0 manualmente
 The\ link\ has\ been\ copied\ to\ the\ clipboard.=El enlace se ha copiado al portapapeles
 
 Open\ %0\ file=Abrir archivo %0
-Could\ not\ detect\ terminal\ automatically.\ Please\ define\ a\ custom\ terminal\ in\ the\ preferences.=No se pudo detectar el terminal automáticamente. Por favor, defina un terminal personalizado en las preferencias.
+Could\ not\ detect\ terminal\ automatically\ using\ '%0'.\ Please\ define\ a\ custom\ terminal\ in\ the\ preferences.=No se pudo detectar el terminal automáticamente usando '%0'. Por favor, defina un terminal personalizado en las preferencias.
 
 Cannot\ delete\ file=No se puede borrar el archivo
 File\ permission\ error=Error de permisos de archivo
@@ -1326,8 +1356,10 @@ Deleted\ entry\ '%0'=Se eliminó la entrada «%0»
 Deleted\ entry=Entrada eliminada
 Modified\ groups\ tree=Árbol de grupos modificado
 Removed\ all\ groups=Se eliminaron todos los grupos
+%0.\ Accepting\ the\ change\ replaces\ the\ complete\ groups\ tree\ with\ the\ externally\ modified\ groups\ tree.=%0. Aceptar el cambio reemplaza el árbol de grupos completo por el árbol de grupos modificados externamente.
 Select\ export\ format=Seleccionar formato para exportar
 Return\ to\ library=Volver a la biblioteca
+
 Could\ not\ connect\ to\ %0=No se puede conectar a %0
 Warning\:\ %0\ out\ of\ %1\ entries\ have\ undefined\ title.=Atención\: %0 de %1 entradas tienen el título sin definir
 Warning\:\ %0\ out\ of\ %1\ entries\ have\ undefined\ citation\ key.=Atención\: %0 de un total de %1 entradas no tienen definida la clave de cita.
@@ -1335,6 +1367,10 @@ Warning\:\ %0\ out\ of\ %1\ entries\ have\ undefined\ DOIs.=Advertencia\: %0 de
 Really\ delete\ the\ selected\ entry?=¿Borrar realmente la entrada seleccionada?
 Really\ delete\ the\ %0\ selected\ entries?=¿Realmente desea eliminar %0 entradas?
 
+On\ disk=En disco
+In\ JabRef=En JabRef
+Entry\ Preview=Previsualización de entrada
+
 Keep\ left=mantener izquierdo
 Keep\ right=Mantener derecho
 Old\ entry=Entrada antigua
@@ -1368,6 +1404,7 @@ Entry\ editor,\ previous\ panel\ 2=Editor de entradas, panel previo 2
 File\ list\ editor,\ move\ entry\ down=Editor de lista de archivos, mover entrada hacia abajo
 File\ list\ editor,\ move\ entry\ up=Editor de lista de archivos, mover entrada hacia arriba
 Focus\ entry\ table=Foco sobre tabla de entradas
+Focus\ group\ list=Lista de focus group
 Import\ into\ current\ library=Importar a la biblioteca actual
 Import\ into\ new\ library=Importar a una nueva biblioteca
 New\ article=Nuevo artículo
@@ -1378,7 +1415,6 @@ New\ mastersthesis=Nueva tesis de máster
 New\ phdthesis=Nueva tesis doctoral
 New\ proceedings=Nuevo proceedings
 New\ unpublished=Nuevo sin publicar
-Preamble\ editor,\ store\ changes=Editor de preámbulos, guardar cambios
 Push\ to\ application=Enviar a aplicación
 Refresh\ OpenOffice/LibreOffice=REfrescar OpenOffice/LibreOffice
 Resolve\ duplicate\ citation\ keys=Resolver claves de cita duplicadas
@@ -1449,7 +1485,8 @@ Capitalize=Capitalizar
 Capitalize\ all\ Words,\ but\ Converts\ Articles,\ Prepositions,\ and\ Conjunctions\ to\ Lower\ Case.=Inicia Todas las Palabras con Mayúscula pero Deja los Artículos, las Preposiciones y las Conjunciones en Minúsculas (usanza del inglés, no válida en español).
 Capitalize\ the\ first\ word,\ changes\ other\ words\ to\ lower\ case.=Capitaliza la primera palabra, cambiando las otras a minúscula
 changes\ all\ letters\ to\ lower\ case.=cambia todas las letras a minúsculas.
-CHANGES\ ALL\ LETTER\ TO\ UPPER\ CASE.=CAMBIA TODAS LAS LETRAS A MAYÚSCULAS.
+CHANGES\ ALL\ LETTERS\ TO\ UPPER\ CASE.=CAMBIA TODAS LAS LETRAS A MAYÚSCULAS.
+Changes\ The\ First\ Letter\ Of\ All\ Words\ To\ Capital\ Case\ And\ The\ Remaining\ Letters\ To\ Lower\ Case.=Cambia la primera letra de todas las palabras a mayúscula y el resto a minúscula.
 Cleans\ up\ LaTeX\ code.=Limpia el código LaTeX
 Converts\ HTML\ code\ to\ LaTeX\ code.=Convierte código HTML a código LaTeX
 HTML\ to\ Unicode=HTML a Unicode
@@ -1492,7 +1529,10 @@ Does\ nothing.=No hace nada
 Identity=Identidad
 Clears\ the\ field\ completely.=Limpia el campo completamente.
 Directory\ not\ found=Directorio no encontrado
-Main\ file\ directory\ not\ set.\ Check\ the\ preferences\ (linked\ files)\ or\ the\ library\ properties.=Directorio de archivo principal no establecido. Compruebe las preferencias (archivos enlazados) o las propiedades de la biblioteca.
+
+Main\ file\ directory=Carpeta del archivo principal
+Main\ file\ directory\ not\ set.\ Check\ the\ preferences\ ("Linked\ files")\ or\ modify\ the\ library\ properties\ ("Override\ default\ file\ directories").=Directorio de archivo principal no establecido. Compruebe las preferencias ("Archivos enlazados") o modifique las propiedades de la biblioteca ("Anular los directorios de archivos predeterminados").
+
 This\ operation\ requires\ exactly\ one\ item\ to\ be\ selected.=Esta operación requiere seleccionar exactamente un elemento.
 Opening\ large\ number\ of\ files=A punto de abrir un número elevado de archivos
 You\ are\ about\ to\ open\ %0\ files.\ Continue?=Está por abrir %0 archivos. ¿Quiere continuar?
@@ -1547,6 +1587,8 @@ Verse=Verso
 change\ entries\ of\ group=cambiar entradas del grupo
 odd\ number\ of\ unescaped\ '\#'=número impar de '\#' sin escapar
 
+Found\ %0\ unescaped\ '&'=Se encontraron %0 «&» sin secuencia de escape
+
 Show\ diff=Mostrar diff
 Copy\ Version=Copiar versión
 Maintainers=Responsables
@@ -1566,7 +1608,6 @@ Message=Mensaje
 
 
 MathSciNet\ Review=Revisión MathSciNet
-Reset\ Bindings=Reiniciar combinaciones
 
 Decryption\ not\ supported.=Desencriptación no soportada
 
@@ -1613,7 +1654,6 @@ Found\ overlapping\ ranges=Encontrados rangos superpuestos
 Found\ touching\ ranges=Se encontraron intervalos colindantes
 
 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
 
 Countries\ and\ territories\ in\ English=Países y territorios en inglés.
@@ -1943,12 +1983,6 @@ Select\ the\ entries\ to\ be\ imported\:=Seleccionar las entradas a importar\:
 Add\ new\ String=Añadir una nueva cadena de caracteres
 Must\ not\ be\ empty\!=¡No puede estar vacío\!
 Open\ Help\ page=Abrir la página de ayuda
-Add\ new\ field\ name=Agregar nuevo nombre de campo
-Field\ name\:=Nombre del campo\:
-Field\ name\ "%0"\ already\ exists=El nombre de campo "%0" ya existe
-No\ field\ name\ selected\!=¡Ningún nombre de campo seleccionado\!
-Remove\ field\ name=Eliminar el nombre de campo
-Are\ you\ sure\ you\ want\ to\ remove\ field\ name\:\ "%0"?=¿Está seguro de que desea eliminar el nombre de campo\: "%0"?
 Add\ new\ keyword=Añadir nueva palabra clave
 Keyword\:=Palabra clave\:
 Keyword\ "%0"\ already\ exists=La palabra clave "%0" ya existe
@@ -1959,7 +1993,6 @@ 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
 New\ library=Nueva biblioteca
 OpenOffice/LibreOffice=OpenOffice/LibreOffice
 Open\ document\ viewer=Abrir el visor de documentos
@@ -2031,13 +2064,8 @@ Add\ formatter\ to\ list=Añadir formateador a la lista
 Filter\ List=Lista de filtros
 Open\ files...=Abrir archivos...
 
-Affected\ fields\:=Campos Afectados\:
 Show\ preview\ as\ a\ tab\ in\ entry\ editor=Mostrar la vista previa como una pestaña en el editor de entradas
-Font=Fuente
 Visual\ theme=Tema visual
-Light\ theme=Tema claro
-Dark\ theme=Tema oscuro
-Custom\ theme=Tema personalizado
 Overwrite\ existing\ keys=Sobrescribir las claves existentes
 Key\ patterns=Patrones clave
 Font\ settings=La configuración de la fuente
@@ -2056,7 +2084,6 @@ Reset\ All=Reiniciar todo
 Linked\ identifiers=Identificadores vinculados
 
 insert\ entries=insertar entradas
-On\ disk=En disco
 
 Independent=Independiente
 Intersection=Intersección
@@ -2266,7 +2293,6 @@ Display\ count\ of\ items\ in\ group=Mostrar el recuento de los elementos de cad
 Remove\ the\ following\ characters\:=Eliminar los siguientes caracteres\:
 Truncate=Truncar
 Truncates\ a\ string\ after\ a\ given\ index.=Trunca una cadena después de un índice dado.
-Close=Cerrar
 Close\ all=Cerrar todo
 Close\ all\ libraries=Cerrar todas las bibliotecas
 Close\ other\ libraries=Cerrar las otras bibliotecas
@@ -2287,7 +2313,6 @@ Next\ preview\ style=Estilo de previsualización siguiente
 Previous\ preview\ style=Estilo de previsualización anterior
 
 (\ Note\:\ Press\ return\ to\ commit\ changes\ in\ the\ table\!\ )=(Nota\: oprima Intro para confirmar los cambios en la tabla.)
-Reset=Restablecer
 New\ inproceedings=«Inproceedings» nuevo
 Reset\ entry\ types\ and\ fields\ to\ defaults=Restablecer tipos de entradas y campos a los valores predeterminados
 This\ will\ reset\ all\ entry\ types\ to\ their\ default\ values\ and\ remove\ all\ custom\ entry\ types=Esto restablecerá todos los tipos de entradas a sus valores predeterminados y quitará todos los tipos de entrada personalizados
@@ -2318,13 +2343,12 @@ Unprotect\ terms=Desproteger términos
 
 Generate\ a\ new\ key\ for\ imported\ entries\ (overwriting\ their\ default)=Generar una nueva clave para las entradas importadas (sobreescribiendo su valor predeterminado)
 Warn\ about\ duplicates\ on\ import=Avisar sobre duplicados al importar
-Import\ and\ Export=Importar y exportar
+
 Custom\ DOI\ URI=URI personalizado de DOI
 
 Cited\ on\ pages=Citado en páginas
 Please\ move\ the\ cursor\ into\ the\ document\ text.=Por favor, mueva el cursor al texto del documento.
 
-I\ cannot\ insert\ to\ the\ cursors\ current\ location.=No puedo insertar en la ubicación actual de los cursores.
 
 Please\ move\ the\ cursor\ to\ the\ location\ for\ the\ new\ citation.=Por favor, mueva el cursor a la ubicación de la nueva cita.
 
@@ -2344,17 +2368,16 @@ Download\ operation\ canceled.=Operación de descarga cancelada.
 
 New\ entry\ by\ type=Entrada nueva por tipo
 
+File\ '%1'\ is\ a\ duplicate\ of\ '%0'.\ Keeping\ '%0'=El archivo «%1» es un duplicado de «%0». Se conserva «%0»
+File\ '%1'\ is\ a\ duplicate\ of\ '%0'.\ Keeping\ both\ due\ to\ deletion\ error=El archivo «%1» es un duplicado de «%0». Se conservan ambos a causa de un error de eliminación
 
 Enable\ field\ formatters=Habilitar formateadores de campos
 Entry\ Type=Tipo de entrada
 Entry\ types=Tipos de entrada
-Field\ names=Nombre del campo
 Others=Otros
 Recommended=Recomendado
 
 Authors\ and\ Title=Autoría y título
-Database=Base de datos
-Databases=Bases de datos
 Add\ Author\:=Añadir autor\:
 Add\ Query\:=Añadir consulta\:
 Add\ Research\ Question\:=Añadir pregunta de investigación\:
@@ -2375,9 +2398,12 @@ Query=Consulta
 Question=Pregunta
 Select\ directory=Seleccionar directorio
 
+Fulltext\ Index=Índice de texto completo
+Automatically\ index\ all\ linked\ files\ for\ fulltext\ search=Indizar automáticamente todos los archivos enlazados para la búsqueda de texto completo
 On\ page\ %0=En la página %0
 
 Remote\ services=Servicios remotos
+Allow\ sending\ PDF\ files\ and\ raw\ citation\ strings\ to\ a\ JabRef\ online\ service\ (Grobid)\ to\ determine\ Metadata.\ This\ produces\ better\ results.=Permitir enviar archivos PDF y cadenas de cita en bruto a un servicio en línea de JabRef (Grobid) para determinar los metadatos. Esto produce mejores resultados.
 
 
 Character\ by\ character=Carácter por carácter
@@ -2400,6 +2426,8 @@ Version=Versión
 
 Error\ downloading=Error al descargar
 
+No\ data\ was\ found\ for\ the\ identifier=No se encontró ningún dato correspondiente al identificador
+Server\ not\ available=Servidor no disponible
 Identifier\ not\ found=Identificador no encontrado
 
 Custom\ API\ key=Clave API personalizada
@@ -2414,7 +2442,6 @@ Clear\ field\ content=Limpiar contenido de campo
 Set\ or\ append\ content=Establecer o añadir contenido
 Edit\ field\ content\ for\ selected\ entries=Editar el contenido del campo para las entradas seleccionadas
 Rename=Renombrar
-New\ field\ name=Nuevo nombre de campo
 Copy\ content=Copiar contenido
 Move\ content=Mover contenido
 Swap\ content=Intercambiar contenido
@@ -2431,6 +2458,7 @@ Split\ View=Vista dividida
 Plain\ Text=Texto sin formato
 Show\ Diff=Mostrar diferencias
 Merged\ Entry=Entrada combinada
+Only\ show\ changed\ fields=Mostrar solo campos modificados
 
 Edit\ file\ link=Editar enlace de archivo
 
@@ -2438,6 +2466,10 @@ Edit\ file\ link=Editar enlace de archivo
 Assign=Asignar
 Do\ not\ assign=No asignar
 
+Left\ Entry=Entrada izquierda
+Merge\ %0=Combinar %0
+Right\ Entry=Entrada derecha
+Unmerge\ %0=Descombinar %0
 plain\ text=texto plano
 
 
@@ -2450,3 +2482,16 @@ This\ could\ indicate\ that\ JabRef\ did\ not\ shut\ down\ cleanly\ last\ time\
 
 
 
+
+
+
+Search\ from\ history...=Buscar del historial…
+your\ search\ history\ is\ empty=el historial de búsquedas está vacío
+Clear\ history=Vaciar historial
+
+Delete\ %0\ files=Eliminar %0 archivos
+Delete\ %0\ files\ permanently\ from\ disk,\ or\ just\ remove\ the\ files\ from\ the\ entry?\ Pressing\ Delete\ will\ delete\ the\ files\ permanently\ from\ disk.=¿Quiere eliminar %0 archivos permanentemente del disco o solamente quitarlos de la entrada? Si presiona Supr, los archivos se eliminarán del disco permanentemente.
+Error\ accessing\ file\ '%0'.=Error al acceder al archivo «%0».
+This\ operation\ requires\ selected\ linked\ files.=Esta operación requiere determinados archivos enlazados.
+
+
diff --git a/src/main/resources/l10n/JabRef_fa.properties b/src/main/resources/l10n/JabRef_fa.properties
index 868a7e7dc8b..d279790ed50 100644
--- a/src/main/resources/l10n/JabRef_fa.properties
+++ b/src/main/resources/l10n/JabRef_fa.properties
@@ -1,8 +1,4 @@
 
-
-
-
-
 Unable\ to\ monitor\ file\ changes.\ Please\ close\ files\ and\ processes\ and\ restart.\ You\ may\ encounter\ errors\ if\ you\ continue\ with\ this\ session.=قادر به نمايش تغيير پرونده نمی باشد. لطفا پرونده ها و فرايند ها را بسته و شروع دوباره كنيد. در صورت ادامه ممكن است با خطاهایی مواجه شويد.
 
 %0\ contains\ the\ term\ <b>%1</b>=%0 شامل اين واژه <b>%1</b>
@@ -159,6 +155,7 @@ Delete\ entry=حذف مدخل
 
 
 
+
 Donate\ to\ JabRef=هدیه دادن به JabRef
 
 Download\ file=بارگیری پرونده
@@ -171,6 +168,7 @@ Download\ file=بارگیری پرونده
 
 
 
+
 Edit=ویرایش
 
 
@@ -290,9 +288,6 @@ Entry\ editor=ویرایشگر ورودی
 
 
 
-
-
-
 
 
 
@@ -363,8 +358,6 @@ Open\ terminal\ here=در اینجا پایانه را باز کن
 
 
 
-
-
 
 
 
@@ -427,6 +420,10 @@ Search\ results\ from\ open\ libraries=جستجوی نتایج از کتابخا
 
 
 
+
+
+
+
 
 
 
@@ -499,6 +496,8 @@ Save\ selected\ as\ plain\ BibTeX...=.\=منتخب‌شده را به صورت 
 
 
 
+
+
 Focus\ entry\ table=تمرکز بر جدول ورودی
 Import\ into\ current\ library=وارد کردن به پایگاه داده‌ی فعلی
 Import\ into\ new\ library=وارد کردن به پایگاه داده‌ی جدید
@@ -568,6 +567,9 @@ Unabbreviate\ journal\ names=برداشتن مخفف نام ژورنال‌ها
 
 
 
+
+
+
 
 
 
@@ -653,6 +655,13 @@ Auto\ complete\ enabled.=تکمیل خودکار غیرفعال شد.
 
 
 
+
+
+
+
+
+
+
 
 
 
diff --git a/src/main/resources/l10n/JabRef_fi.properties b/src/main/resources/l10n/JabRef_fi.properties
new file mode 100644
index 00000000000..52c6f5be4ba
--- /dev/null
+++ b/src/main/resources/l10n/JabRef_fi.properties
@@ -0,0 +1,611 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+About\ JabRef=Tietoja JabRef
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/resources/l10n/JabRef_fr.properties b/src/main/resources/l10n/JabRef_fr.properties
index 9ee16d9dfdc..986f6a19a86 100644
--- a/src/main/resources/l10n/JabRef_fr.properties
+++ b/src/main/resources/l10n/JabRef_fr.properties
@@ -1,12 +1,4 @@
-Could\ not\ delete\ empty\ entries.=Échec de la suppression des entrées vides.
-
-Delete\ empty\ entries=Supprimer les entrées vides
-
-Empty\ entries=Entrées vides
-
-Keep\ empty\ entries=Conserver les entrées vides
-
-Library\ '%0'\ has\ empty\ entries.\ Do\ you\ want\ to\ delete\ them?=Le fichier '%0' a des entrées vides. Voulez-vous les supprimer ?
+Proxy\ requires\ password=Le proxy nécessite un mot de passe
 
 Unable\ to\ monitor\ file\ changes.\ Please\ close\ files\ and\ processes\ and\ restart.\ You\ may\ encounter\ errors\ if\ you\ continue\ with\ this\ session.=Impossible de surveiller les changements de fichiers. Veuillez fermer les fichiers et les traitements puis redémarrer. Vous pourriez rencontrer des erreurs si vous continuez avec cette session.
 %0\ contains\ the\ regular\ expression\ <b>%1</b>=%0 contient l'expression régulière <b>%1</b>
@@ -269,7 +261,8 @@ Do\ not\ abbreviate\ names=Ne pas abréger les noms
 
 Do\ not\ open\ any\ files\ at\ startup=N'ouvrir aucun fichier au démarrage
 
-Do\ not\ wrap\ the\ following\ fields\ when\ saving=Ne pas renvoyer à la ligne les champs suivants lors de l'enregistrement
+Do\ not\ wrap\ when\ saving=Ne pas forcer le retour à la ligne lors de l'enregistrement
+
 Do\ not\ write\ the\ following\ fields\ to\ XMP\ Metadata=Ne pas écrire les champs suivants dans les métadonnées XMP
 
 Donate\ to\ JabRef=Faire un don à JabRef
@@ -282,6 +275,8 @@ duplicate\ removal=Suppression des doublons
 
 Duplicate\ fields=Champs dupliqués
 
+Unable\ to\ change\ field\ name.\ "%0"\ already\ in\ use.=Impossible de changer le nom du champ. "%0" est déjà utilisé.
+
 Duplicate\ string\ name=Dupliquer le nom de chaîne
 
 Duplicates\ found=Trouver les doublons
@@ -337,19 +332,23 @@ Extension=Extension
 
 External\ Changes\ Resolver=Résolveur de modifications externes
 
-External\ file\ links=Liens vers les fichiers externes
-
 External\ programs=Programmes externes
 
 Failed\ to\ import\ by\ ID=Échec de l'importation par ID
 
 Field=Champ
-
 field=Champ
 
 Field\ name=Nom du champ
-
+Field\ names=Noms de champs
 Field\ names\ are\ not\ allowed\ to\ contain\ white\ spaces\ or\ certain\ characters\ (%0).=Les noms de champs ne peuvent contenir ni espace, ni certains caractères (%0).
+New\ field\ name=Nouveau nom de champ
+Add\ new\ field\ name=Ajouter un nouveau nom de champ
+Field\ name\ "%0"\ already\ exists=Le nom de champ « %0 » existe déjà
+No\ field\ name\ selected\!=Aucun nom de champ sélectionné \!
+Remove\ field\ name=Supprimer le nom de champ
+Are\ you\ sure\ you\ want\ to\ remove\ field\ name\:\ "%0"?=Êtes-vous sûr de vouloir supprimer le nom de champ "%0" ?
+Manage\ field\ names\ &\ content=Gérer les noms de champs et leur contenu
 
 Field\ to\ group\ by=Champ à grouper par
 
@@ -477,6 +476,29 @@ Journal\ abbreviations=Abréviations de journaux
 Journal\ lists\:=Listes de journaux \:
 Remove\ journal\ '%0'=Supprimer le journal '%0'
 
+Journal\ Information=Informations sur le journal
+Year=Année
+ISSN\ or\ journal\ name\ required\ for\ fetching\ journal\ information=L'ISSN ou le nom du journal est requis pour la collecte des informations du journal
+Fetch\ journal\ information\ online\ to\ show=Récupérer en ligne les informations du journal à afficher
+Allow\ sending\ ISSN\ to\ a\ JabRef\ online\ service\ (SCimago)\ for\ fetching\ journal\ information=Autoriser l'envoi de l'ISSN à un service en ligne de JabRef (SCimago) pour collecter les informations sur le journal
+Please\ enable\ journal\ information\ fetching\ in\ %0\ >\ %1=Veuillez activer la collecte des informations sur le journal dans %0 > %1
+Categories=Catégories
+ISSN=ISSN
+Publisher=Maison d'édition
+h-index=h-index
+Error\ while\ fetching\ journal\ information\:\ %0=Erreur lors de la collecte des informations sur le journal \: %0
+ISSN\ and/or\ journal\ name\ not\ found\ in\ catalog=L'ISSN et/ou le nom du journal sont introuvables dans le catalogue
+Citable\ Docs\ (Previous\ 3\ Years)=Documents citables (3 années précédentes)
+Cites\ Incoming\ by\ Recently\ Published=Citations entrantes par récemment publié
+Cites\ Outgoing=Citations sortantes
+Cites\ Outgoing\ per\ Document=Citations sortantes par document
+Docs\ (This\ Year)=Documents (cette année)
+Incorrect\ ISSN\ format=Format ISSN incorrect
+Error\ accessing\ catalog=Erreur d'accès au catalogue
+
+Check\ for\ latest\ version\ online=Vérifier en ligne la dernière version
+Please\ use\ the\ latest\ version\ of\ JabRef\ if\ you\ run\ into\ a\ bug.\ If\ you\ encounter\ an\ issue\ or\ a\ bug,\ check\ the\ latest\ version,\ if\ the\ issue\ is\ still\ present.=Veuillez utiliser la dernière version de JabRef si vous rencontrez un bug. Si vous rencontrez un problème ou un bug, vérifiez si le problème est toujours présent dans la dernière version.
+
 Keep\ both=Conserver les deux
 
 Keep\ subgroups=Conserver les sous-groupes
@@ -503,12 +525,10 @@ LaTeX\ AUX\ file\:=Fichier AUX de LaTeX \:
 
 Link=Lien
 Listen\ for\ remote\ operation\ on\ port=Écouter le port pour des opérations à distance
-Load\ and\ Save\ preferences\ from/to\ jabref.xml\ on\ start-up\ (memory\ stick\ mode)=Charger et enregistrer les préférences de/vers jabref.xml au démarrage (mode Clef-mémoire)
+Memory\ stick\ mode\ -\ Store\ preferences\ in\ 'jabref.xml'\ in\ the\ app\ folder.=Mode clef USB - Stocke les préférences dans le dossier de l'application (fichier 'jabref.xml').
 
 Show\ advanced\ hints\ (i.e.\ helpful\ tooltips,\ suggestions\ and\ explanation)=Afficher les astuces avancées (c'est-à-dire les astuces utiles, les suggestions et l'explication)
 
-Main\ file\ directory=Répertoire de fichiers principal
-
 Manage\ custom\ exports=Gérer les exportations personnalisées
 
 Manage\ custom\ imports=Gérer les importations personnalisées
@@ -516,8 +536,6 @@ External\ file\ types=Types de fichiers externes
 
 Mark\ new\ entries\ with\ owner\ name=Nouvelles entrées attribuées au propriétaire
 
-Memory\ stick\ mode=Mode Clef-mémoire
-
 Merged\ external\ changes=Fusionner les modifications externes
 Merge\ fields=Fusionner les champs
 
@@ -542,7 +560,7 @@ We\ need\ a\ database\ to\ export\ from.\ Open\ one.=Il faut une base de donnée
 
 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.
+Error\ while\ fetching\ recommendations\ from\ Mr.DLib.=Erreur lors de la collecte des recommandations de Mr. DLib.
 
 Name=Nom
 
@@ -593,7 +611,7 @@ Open\ editor\ when\ a\ new\ entry\ is\ created=Ouvrir l'éditeur quand une nouve
 
 Open\ file=Ouvrir un fichier
 
-Open\ last\ edited\ libraries\ at\ startup=Ouvrir les fichiers de la dernière session au démarrage
+Open\ last\ edited\ libraries\ on\ startup=Ouvrir les derniers fichiers modifiés au démarrage
 
 Connect\ to\ shared\ database=Se connecter à une base de données partagée
 
@@ -608,8 +626,6 @@ Operating\ System\ (Provides\ for\ better\ recommendations\ by\ giving\ an\ indi
 
 Optional\ fields=Champs optionnels
 
-Options=Options
-
 or=ou
 
 Override\ default\ file\ directories=Remplacer les répertoires de fichier par défaut
@@ -649,7 +665,7 @@ Preferences\ recorded.=Préférences enregistrées.
 Preview=Aperçu
 Citation\ Style=Style de citation
 Current\ Preview=Aperçu actuel
-Cannot\ generate\ preview\ based\ on\ selected\ citation\ style.=La prévisualisation ne peut pas être générée à partir du style de citation sélectionné.
+Cannot\ generate\ preview\ based\ on\ selected\ citation\ style.=L'aperçu ne peut pas être généré à partir du style de citation sélectionné.
 Bad\ character\ inside\ entry=Caractère erroné dans l'entrée
 Error\ while\ generating\ citation\ style=Erreur lors de la génération du style de citation
 Preview\ style\ changed\ to\:\ %0=Style d'aperçu modifié en \: %0
@@ -744,8 +760,7 @@ Replaces\ Unicode\ ligatures\ with\ their\ expanded\ form=Remplace les ligatures
 
 Required\ fields=Champs requis
 
-Do\ not\ resolve\ BibTeX\ strings=Ne pas traiter les chaînes BibTeX
-Resolve\ BibTeX\ strings\ for\ the\ following\ fields=Traiter les chaînes BibTeX pour les champs suivants
+Resolve\ BibTeX\ strings=Traiter les chaînes BibTeX
 
 resolved=résolu
 
@@ -759,17 +774,15 @@ Review=Remarques
 Review\ changes=Revoir les changements
 Review\ Field\ Migration=Migration des champs « Review »
 
-Loading=Chargement en cours
-
 Save=Enregistrer
 Save\ all\ finished.=Enregistrement de tout terminé.
 Save\ all\ open\ libraries=Enregistrer tous les fichiers ouverts
 Save\ before\ closing=Enregistrer avant fermeture
 Save\ library=Enregistrer le fichier
 Save\ library\ as...=Enregistrer le fichier sous...
-Saving=Enregistrement en cours
+Saving=Enregistrement
 Saving\ all\ libraries...=Enregistrement de tous les fichiers...
-Saving\ library=Enregistrement du fichier en cours
+Saving\ library=Enregistrement du fichier
 Library\ saved=Fichier enregistré
 Could\ not\ save\ file.=Le fichier n'a pas pu être enregistré.
 Could\ not\ save,\ file\ locked\ by\ another\ JabRef\ instance.=Échec de l'enregistrement, le fichier est verrouillé par une autre instance de JabRef.
@@ -784,7 +797,7 @@ Refuse\ to\ save\ the\ library\ before\ external\ changes\ have\ been\ reviewed.
 Library\ protection=Protection du fichier
 Unable\ to\ save\ library=Impossible d'enregistrer le fichier
 
-Always\ reformat\ BIB\ file\ on\ save\ and\ export=Toujours reformater les fichiers BIB lors de l'enregistrement et de l'exportation
+Always\ reformat\ library\ on\ save\ and\ export=Toujours reformater le fichier lors de l'enregistrement et de l'exportation
 Character\ encoding\ '%0'\ is\ not\ supported.=L'encodage de caractères '%0' n'est pas pris en charge.
 
 Search=Recherche
@@ -850,6 +863,12 @@ Show\ BibTeX\ source\ by\ default=Par défaut, afficher l'onglet Source BibTeX
 
 Show\ confirmation\ dialog\ when\ deleting\ entries=Demander une confirmation lors de la suppression d'entrées
 
+Persist\ password\ between\ sessions=Conserver le mot de passe entre les sessions
+
+Persist\ api\ keys\ between\ sessions=Conserver les clés api entre les sessions
+
+Credential\ store\ not\ available.=Enregistrement des identifiants indisponible.
+
 Show\ last\ names\ only=Afficher uniquement les noms propres
 
 Show\ names\ unchanged=Ordre des noms inchangé
@@ -931,6 +950,7 @@ Upgrade\ external\ PDF/PS\ links\ to\ use\ the\ '%0'\ field.=Mettre à jour les
 usage=utilisation
 Use\ autocompletion=Activer l'auto-complétion
 
+User\ interface=Interface utilisateur
 
 Username=Nom d'utilisateur
 
@@ -943,6 +963,8 @@ Verify\ that\ LyX\ is\ running\ and\ that\ the\ lyxpipe\ is\ valid.=Vérifiez qu
 View=Affichage
 Vim\ server\ name=Nom du serveur Vim
 
+View\ journal\ info=Afficher les informations sur le journal
+
 Warn\ about\ unresolved\ duplicates\ when\ closing\ inspection\ window=Avertir des doublons non résolus lors de la fermeture de la fenêtre d'inspection
 
 Warn\ before\ overwriting\ existing\ keys=Avertir avant d'écraser des clefs existantes
@@ -976,9 +998,9 @@ XMP\ export\ privacy\ settings=Paramètres de confidentialité pour l'exportatio
 XMP\ metadata=Métadonnées XMP
 You\ must\ restart\ JabRef\ for\ this\ to\ come\ into\ effect.=Vous devez redémarrer JabRef pour que ce changement prenne effet.
 
-The\ following\ fetchers\ are\ available\:=Les outils de recherche suivants sont disponible \:
-Could\ not\ find\ fetcher\ '%0'=L'outil de recherche « %0 » n'a pas pu être trouvé
-Running\ query\ '%0'\ with\ fetcher\ '%1'.=Exécution de la requête « %0 » avec l'outil de recherche « %1 ».
+The\ following\ fetchers\ are\ available\:=Les outils de collecte suivants sont disponibles \:
+Could\ not\ find\ fetcher\ '%0'=L'outil de collecte « %0 » n'a pas pu être trouvé
+Running\ query\ '%0'\ with\ fetcher\ '%1'.=Exécution de la requête « %0 » avec l'outil de collecte « %1 ».
 Invalid\ query.\ Check\ position\ %0.=Requête non valide. Vérifiez la position %0.
 Invalid\ query\ element\ '%0'\ at\ position\ %1=Élément de requête '%0' invalide à la position %1
 
@@ -990,14 +1012,14 @@ Move\ file\ to\ file\ directory\ and\ rename\ file=Déplacer le fichier vers le
 Could\ not\ move\ file\ '%0'.=Le fichier « %0 » n'a pas pu être déplacé.
 Could\ not\ find\ file\ '%0'.=Le fichier « %0 » n'a pas pu être trouvé.
 Number\ of\ entries\ successfully\ imported=Nombre d'entrées importées avec succès
-Error\ while\ fetching\ from\ %0=Erreur au cours de la recherche %0
+Error\ while\ fetching\ from\ %0=Erreur au cours de la collecte %0
 
 Citation\ key\ generator=Générateur de clefs de citation
 Unable\ to\ open\ link.=Impossible d'ouvrir le lien.
 MIME\ type=Type MIME
 
 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.=Cette fonction permet aux nouveaux fichiers d'être ouverts ou importés dans une fenêtre JabRef déjà active au lieu d'ouvrir une nouvelle fenêtre. Par exemple, c'est utile quand vous ouvrez un fichier dans JabRef à partir de notre navigateur internet. Notez que cela vous empêchera de lancer plus d'une fenêtre JabRef à la fois.
-Run\ fetcher=Lancer l'outil de recherche
+Run\ fetcher=Lancer l'outil de collecte
 
 Line\ %0\:\ Found\ corrupted\ citation\ key\ %1.=Ligne %0 \: clef de citation corrompue %1.
 Line\ %0\:\ Found\ corrupted\ citation\ key\ %1\ (contains\ whitespaces).=Ligne %0 \: clef de citation corrompue %1 (contient des espaces).
@@ -1043,7 +1065,11 @@ You\ must\ enter\ an\ integer\ value\ in\ the\ interval\ 1025-65535=Vous devez s
 Autocomplete\ names\ in\ 'Firstname\ Lastname'\ format\ only=Complétion automatique des noms uniquement dans le format 'Prénom Nom'
 Autocomplete\ names\ in\ 'Lastname,\ Firstname'\ format\ only=Complétion automatique des noms uniquement dans le format 'Nom, Prénom'
 Autocomplete\ names\ in\ both\ formats=Complétion automatique des noms dans les 2 formats
-Send\ as\ email=Expédier par courriel
+Send=Envoyer
+As\ Email=En tant qu'e-mail
+To\ Kindle=Vers Kindle
+Send\ to\ Kindle=Envoyer vers Kindle
+Email\ address\ for\ sending\ to\ Kindle=Adresse e-mail pour l'envoi vers Kindle
 References=Références
 Sending\ of\ emails=Envoi des courriels
 Subject\ for\ sending\ an\ email\ with\ references=Sujet des courriels envoyant des références
@@ -1059,7 +1085,7 @@ exportFormat=Format d'exportation
 Output\ file\ missing=Fichier de sortie manquant
 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=Format du 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
@@ -1121,7 +1147,6 @@ Please\ choose\ which\ one\ to\ connect\ to\:=Veuillez choisir celui auquel il f
 Choose\ OpenOffice/LibreOffice\ executable=Choisir l'exécutable OpenOffice/LibreOffice
 Select\ document=Sélectionner un document
 HTML\ list=Liste HTML
-If\ possible,\ normalize\ this\ list\ of\ names\ to\ conform\ to\ standard\ BibTeX\ name\ formatting=Si possible, harmonise cette liste de noms afin de correspondre au formatage des noms au standard BibTeX
 Could\ not\ open\ %0=%0 n'a pas pu être ouvert
 Unknown\ import\ format=Format d'importation inconnu
 Style\ selection=Sélection du style
@@ -1148,8 +1173,9 @@ 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éplacer les DOIs des champs note et URL vers le champ DOI, et supprimer le prefix http
+Move\ URL\ in\ note\ field\ to\ url\ field=Déplacer l'URL du champ Note vers le champ URL
 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\ PDFs\ to\ given\ filename\ format\ pattern=Renommer les PDF selon le format de nom de fichier défini
 Rename\ only\ PDFs\ having\ a\ relative\ path=Renommer uniquement les PDF ayant un chemin relatif
 Doing\ a\ cleanup\ for\ %0\ entries...=Nettoyage en cours pour %0 entrées...
 No\ entry\ needed\ a\ clean\ up=Aucune entrée ne nécessitait un nettoyage
@@ -1158,6 +1184,7 @@ One\ entry\ needed\ a\ clean\ up=Une entrée nécessitait un nettoyage
 
 Group\ tree\ could\ not\ be\ parsed.\ If\ you\ save\ the\ BibTeX\ library,\ all\ groups\ will\ be\ lost.=L'arbre des groupes n'a pas pu être analysé. Si vous enregistrez le fichier BibTeX, tous les groupes seront perdus.
 Attach\ file=Joindre un fichier
+Attach\ file\ from\ URL=Joindre un fichier à partir d'une URL
 Setting\ all\ preferences\ to\ default\ values.=Initialiser la configuration aux valeurs par défaut.
 Resetting\ preference\ key\ '%0'=Réinitialiser la clef de configuration « %0 »
 Unable\ to\ clear\ preferences.=Impossible d'initialiser la configuration.
@@ -1191,7 +1218,6 @@ Four\ stars=Quatre étoiles
 Five\ stars=Cinq étoiles
 Help\ on\ special\ fields=Aide sur les champs spéciaux
 Keywords\ of\ selected\ entries=Mots-clefs des entrées sélectionnés
-Manage\ content\ selectors=Gérer les sélecteurs de contenu
 Content\ selectors=Sélecteurs de contenu
 Manage\ keywords=Gérer les mots-clefs
 No\ priority\ information=Pas d'information sur la priorité
@@ -1222,7 +1248,6 @@ Error\ message\:=Message d'erreur \:
 If\ a\ pasted\ or\ imported\ entry\ already\ has\ the\ field\ set,\ overwrite.=Si une entrée collée ou importée a ce champ déjà paramétré, l'écraser.
 Not\ connected\ to\ any\ Writer\ document.\ Please\ make\ sure\ a\ document\ is\ open,\ and\ use\ the\ 'Select\ Writer\ document'\ button\ to\ connect\ to\ it.=Pas de connexion à un document Writer. Assurez-vous qu'un document est ouvert et utilisez le bouton « Sélectionner un document Writer » pour vous y connecter.
 Removed\ all\ subgroups\ of\ group\ "%0".=Tous les sous-groupes du groupe « %0 » ont été supprimés.
-To\ disable\ the\ memory\ stick\ mode\ rename\ or\ remove\ the\ jabref.xml\ file\ in\ the\ same\ folder\ as\ JabRef.=Pour désactiver le mode Clef-mémoire, renommer ou supprimer le fichier jabref.xml dans le même répertoire 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.=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.
@@ -1257,7 +1282,6 @@ Please\ specify\ a\ password=Veuillez spécifier un mot de passe
 Proxy\ configuration=Configuration du Proxy
 Use\ custom\ proxy\ configuration=Utiliser une configuration de proxy personnalisée
 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
@@ -1274,7 +1298,7 @@ Open\ folder=Ouvrir le répertoire
 Export\ sort\ order=Exporter l'ordre de tri
 Save\ sort\ order=Enregistrer l'ordre de tri
 
-Keep\ original\ order=Conserver l'ordre original
+Keep\ original\ order\ and\ add\ new\ entries\ at\ the\ end=Garder l'ordre d'origine et ajouter les nouvelles entrées à la fin
 Use\ current\ table\ sort\ order=Utiliser l'ordre de tri actuel de la table
 Use\ specified\ order=Utiliser l'ordre spécifié
 Show\ extra\ columns=Montrer les colonnes supplémentaires
@@ -1310,7 +1334,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.
+Could\ not\ detect\ terminal\ automatically\ using\ '%0'.\ Please\ define\ a\ custom\ terminal\ in\ the\ preferences.=Impossible de détecter automatiquement le terminal en utilisant '%0'. 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
@@ -1340,7 +1364,7 @@ Removed\ all\ groups=Supprimer tous les groupes
 %0.\ Accepting\ the\ change\ replaces\ the\ complete\ groups\ tree\ with\ the\ externally\ modified\ groups\ tree.=%0. L'acceptation de la modification remplacera toute l'arborescence des groupes par l'arborescence des groupes modifiée en externe.
 Select\ export\ format=Sélectionner un format d'exportation
 Return\ to\ library=Retourner au fichier
-On\ JabRef=À propos de JabRef
+
 Could\ not\ connect\ to\ %0=La connexion à %0 n'a pas pu être établie
 Warning\:\ %0\ out\ of\ %1\ entries\ have\ undefined\ title.=Attention \: %0 des %1 entrées n'ont pas de titre.
 Warning\:\ %0\ out\ of\ %1\ entries\ have\ undefined\ citation\ key.=Attention \: %0 des %1 entrées n'ont pas de clef de citation.
@@ -1348,6 +1372,10 @@ Warning\:\ %0\ out\ of\ %1\ entries\ have\ undefined\ DOIs.=Attention \: %0 des
 Really\ delete\ the\ selected\ entry?=Voulez-vous vraiment supprimer l'entrée sélectionnée ?
 Really\ delete\ the\ %0\ selected\ entries?=Voulez-vous vraiment supprimer les %0 entrées sélectionnées ?
 
+On\ disk=Sur le disque
+In\ JabRef=Dans JabRef
+Entry\ Preview=Aperçu de l'entrée
+
 Keep\ left=Conserver le gauche
 Keep\ right=Conserver le droit
 Old\ entry=Ancienne entrée
@@ -1357,7 +1385,7 @@ No\ problems\ found.=Aucun problème rencontré
 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
+Print\ entry\ preview=Imprimer l'aperçu de l'entrée
 
 Invalid\ DOI\:\ '%0'.=DOI invalide \: « %0 ».
 Same\ DOI\ used\ in\ multiple\ entries=Un DOI identique est présent dans plusieurs entrées
@@ -1381,6 +1409,7 @@ Entry\ editor,\ previous\ panel\ 2=Éditeur d'entrée, onglet précédent 2
 File\ list\ editor,\ move\ entry\ down=Éditeur de liste de fichiers, déplacer l'entrée vers le haut
 File\ list\ editor,\ move\ entry\ up=Éditeur de liste de fichiers, déplacer l'entrée vers le bas
 Focus\ entry\ table=Curseur dans la table des entrées
+Focus\ group\ list=Curseur dans la liste des groupes
 Import\ into\ current\ library=Importer dans le fichier courant
 Import\ into\ new\ library=Importer dans un nouveau fichier
 New\ article=Nouvel article
@@ -1391,7 +1420,6 @@ New\ mastersthesis=Nouveau Mastersthesis
 New\ phdthesis=Nouveau Phdthesis
 New\ proceedings=Nouveau Proceedings
 New\ unpublished=Nouveau Unpublished
-Preamble\ editor,\ store\ changes=Éditeur de préambule, enregistrer les changements
 Push\ to\ application=Envoyer vers le logiciel
 Refresh\ OpenOffice/LibreOffice=Rafraîchir OpenOffice/LibreOffice
 Resolve\ duplicate\ citation\ keys=Traiter les clefs de citation dupliquées
@@ -1401,7 +1429,7 @@ String\ dialog,\ remove\ string=Chaîne de dialogue, supprimer une chaîne
 Synchronize\ files=Synchroniser les fichiers
 Unabbreviate=Développer
 should\ contain\ a\ protocol=doit contenir un protocole
-Copy\ preview=Copier la prévisualisation
+Copy\ preview=Copier l'aperçu
 Copy\ selection=Copier la sélection
 Automatically\ setting\ file\ links=Définition automatique des liens de fichier
 Regenerating\ citation\ keys\ according\ to\ metadata=Re-génère les clefs de citation en fonction des métadonnées
@@ -1427,7 +1455,7 @@ Abbreviation\ '%0'\ for\ journal\ '%1'\ already\ defined.=L'abréviation '%0' po
 Abbreviation\ cannot\ be\ empty=L'abréviation ne peut pas être vide
 Duplicated\ Journal\ Abbreviation=Abréviation de journal dupliquée
 Duplicated\ Journal\ File=Fichier de journaux dupliqué
-Error\ Occurred=Une erreur s'est produite
+Error\ Occurred=Une erreur est survenue
 Journal\ file\ %s\ already\ added=Le fichier de journaux %s a déjà été ajouté
 Name\ cannot\ be\ empty=Le nom ne peut pas être vide
 
@@ -1462,7 +1490,7 @@ Capitalize=Mettre Des Majuscules
 Capitalize\ all\ Words,\ but\ Converts\ Articles,\ Prepositions,\ and\ Conjunctions\ to\ Lower\ Case.=Met une Majuscule à tous les Mots sauf aux Articles, Prépositions et Conjonctions.
 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\ LETTER\ TO\ UPPER\ CASE.=MET TOUT EN CAPITALES.
+CHANGES\ ALL\ LETTERS\ TO\ UPPER\ CASE.=MET TOUT EN CAPITALES.
 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.=Convertit le code HTML en code LaTeX.
@@ -1506,7 +1534,11 @@ Does\ nothing.=Ne fait rien.
 Identity=Identité
 Clears\ the\ field\ completely.=Vide entièrement le champ.
 Directory\ not\ found=Répertoire non trouvé
-Main\ file\ directory\ not\ set.\ Check\ the\ preferences\ (linked\ files)\ or\ the\ library\ properties.=Répertoire de fichiers principal non défini. Vérifiez les préférences (fichiers liés) ou les propriétés du fichier.
+
+Main\ file\ directory=Répertoire de fichiers principal
+Main\ file\ directory\ not\ set.\ Check\ the\ preferences\ ("Linked\ files")\ or\ modify\ the\ library\ properties\ ("Override\ default\ file\ directories").=Le répertoire de fichiers principal n'est pas défini. Vérifiez les préférences ("Fichiers liés") ou modifiez les propriétés du fichier ("Remplacer les répertoires de fichiers par défaut").
+Main\ file\ directory\ '%0'\ not\ found.\nCheck\ the\ tab\ "Linked\ files".=Le répertoire de fichiers principal '%0' n'a pas été trouvé. Vérifiez l'onglet "Fichiers liés".
+
 This\ operation\ requires\ exactly\ one\ item\ to\ be\ selected.=Cette opération nécessite qu'un unique élément soit sélectionné.
 Opening\ large\ number\ of\ files=Ouverture d'un grand nombre de fichiers
 You\ are\ about\ to\ open\ %0\ files.\ Continue?=Vous êtes sur le point d'ouvrir %0 fichiers. Continuer ?
@@ -1561,6 +1593,8 @@ Verse=Verset
 change\ entries\ of\ group=Changer des entrées du groupe
 odd\ number\ of\ unescaped\ '\#'=Nombre impair de '\#' non échappé
 
+Found\ %0\ unescaped\ '&'=%0 '&' non échappé trouvé
+
 Show\ diff=Montrer les différences
 Copy\ Version=Copier la version
 Maintainers=Mainteneurs
@@ -1580,7 +1614,7 @@ Message=Message
 
 
 MathSciNet\ Review=Review MathSciNet
-Reset\ Bindings=Réinitialiser les associations
+Reset\ all=Tout réinitialiser
 
 Decryption\ not\ supported.=Déchiffrement non pris en charge.
 
@@ -1627,7 +1661,7 @@ Found\ overlapping\ ranges=Plages se chevauchant trouvées
 Found\ touching\ ranges=Plages contiguës trouvées
 
 Note\:\ Use\ the\ placeholder\ %DIR%\ for\ the\ location\ of\ the\ opened\ library\ file.=Note \: Utiliser le paramètre %DIR% pour le répertoire du fichier ouvert.
-Error\ occured\ while\ executing\ the\ command\ "%0".=Une erreur est survenue lors de l'exécution de la commande « %0 ».
+Error\ occurred\ while\ executing\ the\ command\ "%0".=Une erreur est survenue lors de l'exécution de la commande "%0".
 Reformat\ ISSN=Reformater l'ISSN
 
 Countries\ and\ territories\ in\ English=Pays et territoires en anglais
@@ -1642,6 +1676,7 @@ Are\ you\ sure\ you\ want\ to\ remove\ the\ protected\ terms\ file?=Êtes-vous s
 Remove\ protected\ terms\ file=Supprimer le fichier des termes protégés
 Add\ selected\ text\ to\ list=Ajouter le texte sélectionné à la liste
 Add\ {}\ around\ selected\ text=Ajouter {} autour du texte sélectionné
+Remove\ all\ {}\ in\ selected\ text=Supprimer toutes les {} du texte sélectionné
 Format\ field=Formater le champ
 New\ protected\ terms\ file=Nouveau fichier de termes protégés
 change\ field\ %0\ of\ entry\ %1\ from\ %2\ to\ %3=modifier le champ %0 de l'entrée %1 de %2 en %3
@@ -1693,6 +1728,7 @@ Check\ the\ event\ log\ to\ see\ all\ notifications=Consultez le journal des év
 Host=Hôte
 Port=Port
 Library=Contenu
+Libraries=Fichiers
 User=Utilisateur
 Connect=Connexion automatique
 Connection\ error=Erreur de connexion
@@ -1721,6 +1757,7 @@ Cannot\ cite\ entries\ without\ citation\ keys.\ Generate\ keys\ now?=Impossible
 New\ technical\ report=Nouveau rapport technique
 
 %0\ file=%0 fichier
+%0\ file\ (%1)=%0 fichier (%1)
 Custom\ layout\ file=Fichier de mise en page personnalisée
 Protected\ terms\ file=Fichier des termes protégés
 Style\ file=Fichier de style
@@ -1760,7 +1797,7 @@ Existing\ file=Fichier existant
 
 ID=Identifiant
 ID\ type=Type d'identifiant
-Fetcher\ '%0'\ did\ not\ find\ an\ entry\ for\ id\ '%1'.=L'outil de recherche « %0 » n'a pas trouvé d'entrée pour l'identifiant « %1 ».
+Fetcher\ '%0'\ did\ not\ find\ an\ entry\ for\ id\ '%1'.=L'outil de collecte « %0 » n'a pas trouvé d'entrée pour l'identifiant « %1 ».
 
 Select\ first\ entry=Sélectionner la première entrée
 Select\ last\ entry=Sélectionner la dernière entrée
@@ -1771,7 +1808,7 @@ should\ be\ normalized=Devrait être une abréviation standard
 
 biblatex\ field\ only=Champ biblatex uniquement
 
-Error\ while\ generating\ fetch\ URL=Erreur lors de la création de l'URL de recherche
+Error\ while\ generating\ fetch\ URL=Erreur lors de la création de l'URL de collecte
 Error\ while\ parsing\ ID\ list=Erreur lors du traitement de la liste des identifiants
 Unable\ to\ get\ PubMed\ IDs=Impossible d'obtenir les identifiants PubMed
 Backup\ found=Sauvegarde trouvée
@@ -1782,7 +1819,7 @@ This\ might\ be\ caused\ by\ reaching\ the\ traffic\ limitation\ of\ Google\ Sch
 Could\ not\ open\ website.=Le site internet n'a pas pu être ouvert.
 Problem\ downloading\ from\ %1=Problème de téléchargement à partir de %1
 
-File\ directory\ pattern=Modèle de répertoire de fichiers
+File\ directory\ pattern=Format du nom de répertoire
 Update\ with\ bibliographic\ information\ from\ the\ web=Mettre à jour avec les informations bibliographiques trouvées sur le web
 
 Could\ not\ find\ any\ bibliographic\ information.=Aucune information bibliographique n'a été trouvée.
@@ -1791,6 +1828,7 @@ DOI\ %0\ is\ invalid=Le DOI %0 est invalide
 
 Select\ all\ customized\ types\ to\ be\ stored\ in\ local\ preferences\:=Sélectionnez tous les types personnalisés à stocker dans les préférences locales \:
 Different\ customization,\ current\ settings\ will\ be\ overwritten=Personnalisation différente, les paramètres actuels seront écrasés
+%0\ (from\ file)\n%1\ (current\ setting)=%0 (à partir du fichier)\n%1 (paramètre actuel)
 
 Entry\ type\ %0\ is\ only\ defined\ for\ Biblatex\ but\ not\ for\ BibTeX=Le type d'entrée %0 est uniquement défini pour biblatex et pas pour BibTeX
 
@@ -1919,6 +1957,7 @@ New\ sublibrary\ based\ on\ AUX\ file=Nouveau sous-fichier à partir du fichier
 Push\ entries\ to\ external\ application\ (%0)=Envoyer l'entrée vers le logiciel externe (%0)
 Quit=Quitter
 Recent\ libraries=Fichiers récents
+Clear\ recent\ libraries=Vider les fichiers récents
 Set\ up\ general\ fields=Définir les champs généraux
 View\ change\ log=Afficher le fichier des changements
 View\ event\ log=Afficher le journal des évènements
@@ -1960,12 +1999,6 @@ Select\ the\ entries\ to\ be\ imported\:=Sélectionnez les entrées à importer
 Add\ new\ String=Ajouter une nouvelle chaîne
 Must\ not\ be\ empty\!=Ne doit pas être vide \!
 Open\ Help\ page=Ouvrir la page d'aide
-Add\ new\ field\ name=Ajouter un nouveau nom de champ
-Field\ name\:=Nom de champ \:
-Field\ name\ "%0"\ already\ exists=Le nom de champ « %0 » existe déjà
-No\ field\ name\ selected\!=Aucun nom de champ sélectionné \!
-Remove\ field\ name=Supprimer le nom de champ
-Are\ you\ sure\ you\ want\ to\ remove\ field\ name\:\ "%0"?=Êtes-vous sûr de vouloir supprimer le nom de champ "%0" ?
 Add\ new\ keyword=Ajouter un nouveau mot-clef
 Keyword\:=Mot-clef \:
 Keyword\ "%0"\ already\ exists=Le mot-clef « %0 » existe déjà
@@ -1976,7 +2009,6 @@ Reset\ to\ default=Restaurer les valeurs par défaut
 String\ constants=Constantes de chaîne
 Export\ all\ entries=Exporter toutes les entrées
 Generate\ citation\ keys=Générer les clefs de citation
-Manage\ field\ names\ &\ content=Gérer les noms de champs et leur contenu
 New\ library=Nouveau fichier
 OpenOffice/LibreOffice=OpenOffice/LibreOffice
 Open\ document\ viewer=Ouvrir l'afficheur de document
@@ -2000,7 +2032,7 @@ Executing\ command\ "%0"...=Exécution de la commande « %0 »...
 
 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
+Rename\ file\ to\ defined\ pattern=Renommer le fichier selon le format prédéfini
 
 Application\ settings=Paramètres du logiciel
 
@@ -2048,16 +2080,15 @@ Add\ formatter\ to\ list=Ajouter un formateur à la liste
 Filter\ List=Liste de filtres
 Open\ files...=Ouvrir des fichiers...
 
-Affected\ fields\:=Champs concernés \:
+Affected\ fields=Champs concernés
 Show\ preview\ as\ a\ tab\ in\ entry\ editor=Afficher l'aperçu dans un onglet de l'éditeur d'entrée
-Font=Police
 Visual\ theme=Thème visuel
-Light\ theme=Thème clair
-Dark\ theme=Thème sombre
-Custom\ theme=Thème personnalisé
 Overwrite\ existing\ keys=Écraser les clefs existantes
 Key\ patterns=Paramétrages des clefs
 Font\ settings=Paramètres de police
+Custom...=Personnaliser...
+Dark=Sombre
+Light=Clair
 Please\ specify\ a\ css\ theme\ file.=Veuillez spécifier le fichier CSS du thème.
 You\ must\ enter\ an\ integer\ value\ higher\ than\ 8.=Vous devez entrer un entier supérieur à 8.
 Letters\ after\ duplicate\ generated\ keys=Lettres après les clefs générées en double
@@ -2073,7 +2104,6 @@ Reset\ All=Tout réinitialiser
 Linked\ identifiers=Identifiants liés
 
 insert\ entries=insérer des entrées
-On\ disk=Sur le disque
 
 Independent=Indépendant
 Intersection=Intersection
@@ -2283,7 +2313,6 @@ Display\ count\ of\ items\ in\ group=Afficher le nombre d'éléments de chaque g
 Remove\ the\ following\ characters\:=Supprimer les caractères suivants \:
 Truncate=Tronquer
 Truncates\ a\ string\ after\ a\ given\ index.=Tronque une chaîne après un index donné.
-Close=Fermer
 Close\ all=Fermer tout
 Close\ all\ libraries=Fermer tous les fichiers
 Close\ other\ libraries=Fermer les autres fichiers
@@ -2298,13 +2327,13 @@ Custom\ import\ formats=Formats d'importation personnalisés
 
 No\ list\ enabled=Aucune liste activée
 Protect\ selection=Protéger la sélection
+Unprotect\ selection=Déprotéger la sélection
 
 Customized\ preview\ style=Style d'aperçu personnalisé
 Next\ preview\ style=Style d'aperçu suivant
 Previous\ preview\ style=Style d'aperçu précédent
 
 (\ Note\:\ Press\ return\ to\ commit\ changes\ in\ the\ table\!\ )=(Remarque \: Appuyez sur Entrée pour valider les modifications dans le tableau \!)
-Reset=Restaurer
 New\ inproceedings=Nouveau inproceedings
 Reset\ entry\ types\ and\ fields\ to\ defaults=Réinitialiser les types d'entrées et les champs par défaut
 This\ will\ reset\ all\ entry\ types\ to\ their\ default\ values\ and\ remove\ all\ custom\ entry\ types=Cela réinitialisera tous les types d'entrée à leurs valeurs par défaut et supprimera tous les types d'entrée personnalisés
@@ -2339,7 +2368,7 @@ Unprotect\ terms=Déprotéger les termes
 
 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
 
@@ -2347,7 +2376,7 @@ 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.
+I\ cannot\ insert\ to\ the\ cursor's\ 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.
 
@@ -2387,13 +2416,13 @@ File\ '%1'\ is\ a\ duplicate\ of\ '%0'.\ Keeping\ both\ due\ to\ deletion\ error
 Enable\ field\ formatters=Activer les formateurs de champs
 Entry\ Type=Type d’entrée
 Entry\ types=Types d'entrée
-Field\ names=Noms de champs
 Others=Autres
 Recommended=Usuels
 
 Authors\ and\ Title=Auteurs et titre
-Database=Base de données
-Databases=Bases de données
+Catalog=Base de données
+Catalogs=Bases de données
+Select\ Catalogs\:=Sélectionner les bases de données \:
 Add\ Author\:=Ajouter un auteur \:
 Add\ Query\:=Ajouter une requête \:
 Add\ Research\ Question\:=Ajouter une question de recherche \:
@@ -2404,7 +2433,6 @@ Start\ new\ systematic\ literature\ review=Lancer une nouvelle revue systématiq
 Manage\ study\ definition=Gérer la définition de la revue
 Update\ study\ search\ results=Mettre à jour les résultats de recherche de la revue
 Study\ repository\ could\ not\ be\ created=Le dépôt de la revue n'a pas pu être créé
-Select\ Databases\:=Sélectionnez les bases de données \:
 
 All\ query\ terms\ are\ joined\ using\ the\ logical\ AND,\ and\ OR\ operators=Tous les termes de la requête sont joints en utilisant les opérateurs logiques AND et OR
 Finalize=Finaliser
@@ -2431,8 +2459,8 @@ 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 \!
+Fetcher\ cannot\ be\ tested\!=L'outil de collecte ne peut pas être testé \!
+Fetcher\ unknown\!=Outil de collecte inconnu \!
 
 Character\ by\ character=Caractère par caractère
 Embedded=Intégré
@@ -2457,7 +2485,7 @@ Error\ downloading=Erreur de téléchargement
 
 No\ data\ was\ found\ for\ the\ identifier=Aucune donnée n'a été trouvée pour l'identifiant
 Server\ not\ available=Serveur indisponible
-Fetching\ information\ using\ %0=Récupération des informations en utilisant %0
+Fetching\ information\ using\ %0=Collecte des informations en utilisant %0
 Look\ up\ identifier=Recherche d'indentifiant
 Bibliographic\ data\ not\ found.\ Cause\ is\ likely\ the\ client\ side.\ Please\ check\ connection\ and\ identifier\ for\ correctness.=Données bibliographiques non trouvées. La cause est probablement du client. Veuillez vérifier la connexion et l'exactitude de l'identifiant.
 Bibliographic\ data\ not\ found.\ Cause\ is\ likely\ the\ server\ side.\ Please\ try\ again\ later.=Données bibliographiques non trouvées. La cause vient probablement du serveur. Veuillez réessayer plus tard.
@@ -2476,7 +2504,6 @@ Clear\ field\ content=Effacer le contenu du champ
 Set\ or\ append\ content=Nouveau 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
@@ -2488,11 +2515,12 @@ To=Vers
 Open\ Link=Ouvrir le lien
 Highlight\ words=Surligner les mots
 Highlight\ characters=Surligner les caractères
-Unified\ View=Vue unifiée
-Split\ View=Vue fractionnée
+Unified\ View=Affichage unifié
+Split\ View=Affichage fractionné
 Plain\ Text=Texte brut
 Show\ Diff=Afficher les différences
 Merged\ Entry=Entrée fusionnée
+Only\ show\ changed\ fields=Afficher uniquement les champs modifiés
 
 Edit\ file\ link=Éditer le lien de fichier
 
@@ -2500,7 +2528,7 @@ Edit\ file\ link=Éditer le lien de fichier
 Assign=Assigner
 Do\ not\ assign=Ne pas assigner
 
-Error\ occured\ %0=Une erreur est survenue %0
+Error\ occurred\ %0=Une erreur est survenue %0
 Left\ Entry=Entrée de gauche
 Merge\ %0=Fusionner %0
 Right\ Entry=Entrée de droite
@@ -2524,4 +2552,26 @@ Use\ the\ field\ FJournal\ to\ store\ the\ full\ journal\ name\ for\ (un)abbrevi
 
 Library\ to\ import\ into=Fichier à importer dans
 
+Enable\ web\ search=Activer la recherche Web
+Web\ search\ disabled=Recherche Web désactivée
+
 Multiline=Multiligne
+
+Unable\ to\ open\ linked\ eprint.\ Please\ set\ the\ eprinttype\ field=Impossible d'ouvrir l'eprint lié. Veuillez définir le champ eprinttype
+Unable\ to\ open\ linked\ eprint.\ Please\ verify\ that\ the\ eprint\ field\ has\ a\ valid\ '%0'\ id=Impossible d'ouvrir l'eprint lié. Veuillez vérifier que le champ eprint a un id '%0' valide
+
+Search\ from\ history...=Rechercher dans l'historique...
+your\ search\ history\ is\ empty=Votre historique de recherche est vide
+Clear\ history=Effacer l'historique
+
+Delete\ %0\ files=Supprimer %0 fichiers
+Delete\ %0\ files\ permanently\ from\ disk,\ or\ just\ remove\ the\ files\ from\ the\ entry?\ Pressing\ Delete\ will\ delete\ the\ files\ permanently\ from\ disk.=Supprimer définitivement %0 fichiers du disque, ou simplement supprimer les fichiers de l'entrée ? Appuyer sur Supprimer supprimera définitivement les fichiers du disque.
+Error\ accessing\ file\ '%0'.=Erreur lors de l'accès au fichier '%0'.
+This\ operation\ requires\ selected\ linked\ files.=Cette opération nécessite la sélection de fichiers liés.
+
+Create\ backup=Créer une sauvegarde
+Automatically\ search\ and\ show\ unlinked\ files\ in\ the\ entry\ editor=Rechercher et afficher automatiquement les fichiers non liés dans l'éditeur d'entrée
+
+File\ "%0"\ cannot\ be\ added\!=Le fichier "%" ne peut pas être ajouté \!
+Illegal\ characters\ in\ the\ file\ name\ detected.\nFile\ will\ be\ renamed\ to\ "%0"\ and\ added.=Caractères illégaux détectés dans le nom du fichier.\nLe fichier sera renommé en "%0" et ajouté.
+Rename\ and\ add=Renommer et ajouter
diff --git a/src/main/resources/l10n/JabRef_id.properties b/src/main/resources/l10n/JabRef_id.properties
index ef44ebe33ce..1ec340228f1 100644
--- a/src/main/resources/l10n/JabRef_id.properties
+++ b/src/main/resources/l10n/JabRef_id.properties
@@ -1,7 +1,4 @@
-
-
-
-
+Proxy\ requires\ password=Proxy membutuhkan password
 
 %0\ contains\ the\ regular\ expression\ <b>%1</b>=%0 mengandung Ekspresi Reguler <b>%1</b>
 
@@ -91,7 +88,9 @@ Available\ import\ formats=Format impor yang dikenal
 %0\ source=Sumber %0
 
 
+Background\ Tasks\ are\ running=Tugas latarbelakang sedang berjalan
 
+Background\ Tasks\ are\ done=Tugas Latarbelakang telah selesai
 
 Browse=Jelajah
 
@@ -143,6 +142,7 @@ Copied=Disalin
 Copy=Salin
 
 Copy\ title=Kopi judul
+Copy\ citation\ (html)=Salin kutipan (html)
 
 Copy\ to\ clipboard=Salin ke papan klip
 
@@ -218,7 +218,7 @@ Do\ not\ abbreviate\ names=Jangan singkat nama
 
 Do\ not\ open\ any\ files\ at\ startup=Jangan buka berkas saat menjalankan
 
-Do\ not\ wrap\ the\ following\ fields\ when\ saving=Jangan lipat bidang berikut ketika menyimpan
+
 
 Donate\ to\ JabRef=Sumbang ke JabRef
 
@@ -228,6 +228,7 @@ Download\ file=Muaturun berkas
 duplicate\ removal=penghapus yang sama
 
 
+
 Duplicate\ string\ name=Nama string sama
 
 Duplicates\ found=Ditemukan ada yang sama
@@ -275,18 +276,14 @@ Exporting=Proses mengekspor
 Extension=Ekstensi
 
 
-External\ file\ links=Tautan berkas eksternal
-
 External\ programs=Program eksternal
 
 
 Field=Bidang
-
 field=bidang
 
 Field\ name=Nama bidang
 
-
 Field\ to\ group\ by=Bidang ke grup berdasar
 
 File=Berkas
@@ -391,6 +388,9 @@ Online\ help=Bantuan online
 JabRef\ preferences=Preferensi JabRef
 
 Journal\ abbreviations=Singkatan nama Jurnal
+Remove\ journal\ '%0'=Hapus jurnal '%0'
+
+
 
 Keep\ both=Tetap keduanya
 
@@ -410,22 +410,18 @@ Label=Label
 Language=Bahasa
 
 Last\ modified=Terakhir diubah
+LaTeX\ AUX\ file\:=File LaTeX AUX\:
 
 Link=Tautan
 Listen\ for\ remote\ operation\ on\ port=Menggunakan operasi jarak jauh pada port
-Load\ and\ Save\ preferences\ from/to\ jabref.xml\ on\ start-up\ (memory\ stick\ mode)=Muat dan Simpan preferensi dari/ke jabref.xml ketika memulai (mode pena simpan)
 
 
-Main\ file\ directory=Lokasi berkas utama
-
 Manage\ custom\ exports=Mengatur ekspor atursendiri
 
 Manage\ custom\ imports=Mengatur impor atursendiri
 
 Mark\ new\ entries\ with\ owner\ name=Tandai entri baru dengan nama pemilik
 
-Memory\ stick\ mode=Mode Pena Simpan
-
 Merged\ external\ changes=Menggabung perubahan eksternal
 
 Modified\ group\ "%0".=Grup dimodifikasi "%0".
@@ -441,7 +437,9 @@ move\ group=pindah grup
 Moved\ group\ "%0".=Grup dipindah "%0".
 
 
+No\ database\ is\ open=Tidak ada database yang dibuka
 
+We\ need\ a\ database\ to\ export\ from.\ Open\ one.=Kami membutuhkan database untuk diexport. Bukalah satu.
 
 
 
@@ -493,7 +491,6 @@ Open\ editor\ when\ a\ new\ entry\ is\ created=Buka penyunting ketika entri baru
 
 Open\ file=Buka berkas
 
-Open\ last\ edited\ libraries\ at\ startup=Buka basisdata terakhir ketika memulai
 
 Connect\ to\ shared\ database=Hubungkan ke database bersama
 
@@ -507,8 +504,6 @@ Operation\ canceled.=Operasi dibatalkan.
 
 Optional\ fields=Bidang tambahan
 
-Options=Pilihan
-
 or=atau
 
 Override\ default\ file\ directories=Ganti direktori berkas bawaan
@@ -552,6 +547,7 @@ Error\ while\ generating\ citation\ style=Kesalahan saat menghasilkan gaya kutip
 Preview\ style\ changed\ to\:\ %0=Pratinjau gaya berubah menjadi\: %0
 Next\ preview\ layout=Berikutnya tata letak Tinjauan
 Previous\ preview\ layout=Sebelumnya tata letak Tinjauan
+Selected=Terpilih
 Previous\ entry=Entri sebelumnya
 Problem\ with\ parsing\ entry=Permasalahan dengan penguraian entri
 Processing\ %0=Memroses %0
@@ -599,6 +595,7 @@ Removed\ group\ "%0"\ and\ its\ subgroups.=Hapus grup "%0" dan sub-grup nya.
 
 Remove\ link=Hapus tautan
 
+Remove\ string\ %0=Hapus string %0
 
 Removed\ group\ "%0".=Hapus grup "%0".
 
@@ -622,7 +619,6 @@ resolved=sudah diselesaikan
 Review=Periksa ulang
 Review\ changes=Periksa ulang perubahan
 
-
 Save=Simpan
 Save\ all\ finished.=Simpan semua selesai.
 Save\ all\ open\ libraries=Simpan semua basisdata yang dibuka
@@ -643,11 +639,11 @@ Refuse\ to\ save\ the\ library\ before\ external\ changes\ have\ been\ reviewed.
 Library\ protection=Perlindungan basisdata
 Unable\ to\ save\ library=Tidak bisa menyimpan basisdata
 
-Always\ reformat\ BIB\ file\ on\ save\ and\ export=Selalu memformat BIB file pada menyimpan dan ekspor
 Character\ encoding\ '%0'\ is\ not\ supported.=Enkoding karakter '%0' tidak didukung.
 
 Search=Cari
 Searching...=Sedang mencari...
+Finished\ Searching=Pencarian Selesai
 Search\ expression=Ekspresi pencarian
 Help\ on\ regular\ expression\ search=Bantuan untuk Pencarian Ekspresi Reguler
 Searching\ for\ duplicates...=pencarian hal yang sama...
@@ -688,6 +684,9 @@ Show\ BibTeX\ source\ by\ default=Tampilkan sumber BibTeX sebagai bawaan
 
 Show\ confirmation\ dialog\ when\ deleting\ entries=Tampilkan dialog konfirmasi jika menghapus entri
 
+
+
+
 Show\ last\ names\ only=Tampil hanya nama belakang
 
 Show\ names\ unchanged=Nama apa adanya
@@ -760,6 +759,7 @@ Value\ cleared\ externally=Isi dihapus dari luar
 View=Tampilkan
 Vim\ server\ name=Nama Server Vim
 
+
 Warn\ about\ unresolved\ duplicates\ when\ closing\ inspection\ window=Peringatkan jika masih ada duplikasi ketika menutup dialog
 
 Warn\ before\ overwriting\ existing\ keys=Peringatan sebelum menindih kunci
@@ -832,7 +832,6 @@ User-specific\ file\ directory=Direktori berkas khusus pengguna
 Autocomplete\ names\ in\ 'Firstname\ Lastname'\ format\ only=Nama isian otomatis hanya untuk format 'Namadepan Namaakhir'
 Autocomplete\ names\ in\ 'Lastname,\ Firstname'\ format\ only=Nama isian otomatis hanya untuk format 'Namaakhir, Namadepan'
 Autocomplete\ names\ in\ both\ formats=Nama isian otomatis untuk kedua format
-Send\ as\ email=Kirim sebagai email
 References=Referensi
 Sending\ of\ emails=Sedang Mengirim email
 Subject\ for\ sending\ an\ email\ with\ references=Subyek untuk mengirim email dengan referensi
@@ -892,7 +891,6 @@ Please\ choose\ which\ one\ to\ connect\ to\:=Pilih salah satu yang akan disambu
 Choose\ OpenOffice/LibreOffice\ executable=Pilih program OpenOffice/LibreOffice
 Select\ document=Pilih dokumen
 HTML\ list=Daftar HTML
-If\ possible,\ normalize\ this\ list\ of\ names\ to\ conform\ to\ standard\ BibTeX\ name\ formatting=Jika memungkinkan, sesuaikan daftar nama untuk mengikuti format penamaan BibTeX
 Could\ not\ open\ %0=Tidak bisa membuka %0
 Unknown\ import\ format=Format impor tidak dikenal
 Style\ selection=Pilihan gaya
@@ -945,7 +943,6 @@ Four\ stars=Empat bintang
 Five\ stars=Lima bintang
 Help\ on\ special\ fields=Bantuan bidang khusus
 Keywords\ of\ selected\ entries=Katakunci entri pilihan
-Manage\ content\ selectors=Atur kata pemilih isi
 Manage\ keywords=Atur katakunci
 No\ priority\ information=Tidak ada informasi prioritas
 No\ rank\ information=Tidak ada informasi pangkat
@@ -974,7 +971,6 @@ Error\ message\:=Pesan kesalahan\:
 If\ a\ pasted\ or\ imported\ entry\ already\ has\ the\ field\ set,\ overwrite.=Jika disisipkan atau impor masuk sudah memiliki bidang yang ditetapkan, menimpa.
 Not\ connected\ to\ any\ Writer\ document.\ Please\ make\ sure\ a\ document\ is\ open,\ and\ use\ the\ 'Select\ Writer\ document'\ button\ to\ connect\ to\ it.=Tidak tersambung dengan dokumen Writer. Pastikan salah satu dokumen terbuka dan gunakan tombol 'Select Writer document' untuk menyambung dengan dokumen itu.
 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.
 
 Canceled\ merging\ entries=Penggabungan entri dibatalkan
@@ -998,7 +994,6 @@ Hostname=Nama host
 
 Use\ custom\ proxy\ configuration=Gunakan konfigurasi proxy suaian
 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
 
 
@@ -1056,11 +1051,13 @@ Deleted\ entry=Entri dihapus
 Modified\ groups\ tree=Pohon Grup yang dimodifikasi
 Removed\ all\ groups=Semua kelompok dihapus
 Select\ export\ format=Pilih format ekspor
+
 Could\ not\ connect\ to\ %0=Tidak bisa menghubungi %0
 Warning\:\ %0\ out\ of\ %1\ entries\ have\ undefined\ title.=Peringatan\: %0 dari %1 entri memiliki judul yang tidak terdefinisi.
 Really\ delete\ the\ selected\ entry?=Apa benar-benar mau menghapus entri pilihan?
 Really\ delete\ the\ %0\ selected\ entries?=Apa benar-benar mau menghapus %0 entri yang dipilih?
 
+
 Keep\ left=Tetap di kiri
 Keep\ right=Tetap di kanan
 Old\ entry=Entri yang tua
@@ -1102,7 +1099,6 @@ New\ mastersthesis=Tesis master baru
 New\ phdthesis=Phdthesis baru
 New\ proceedings=Proses baru
 New\ unpublished=Baru tidak diterbitkan
-Preamble\ editor,\ store\ changes=Pembukaan editor, menyimpan perubahan
 Push\ to\ application=Aplikasi dorong
 Save\ all=Simpan semua
 String\ dialog,\ add\ string=Dialog string, tambah string
@@ -1188,10 +1184,14 @@ Sentence\ case=Kasus kalimat
 Shortens\ lists\ of\ persons\ if\ there\ are\ more\ than\ 2\ persons\ to\ "et\ al.".=Mempersingkat daftar orang jika ada lebih dari 2 orang untuk "et al.".
 Unicode\ to\ LaTeX=Unicode untuk LaTeX
 Units\ to\ LaTeX=Unit ke LaTeX
+UPPER\ CASE=HURUF KAPITAL
 Does\ nothing.=Tidak melakukan apa-apa.
 Identity=Identitas
 Clears\ the\ field\ completely.=Membersihkan lapangan sepenuhnya.
 Directory\ not\ found=Direktori tidak ditemukan
+
+Main\ file\ directory=Lokasi berkas utama
+
 This\ operation\ requires\ exactly\ one\ item\ to\ be\ selected.=Operasi ini membutuhkan tepat satu item untuk dipilih.
 Importing\ in\ %0\ format=Mengimpor dalam format %0
 Female\ name=Nama perempuan
@@ -1243,6 +1243,7 @@ Verse=Ayat
 change\ entries\ of\ group=ubah entri grup
 odd\ number\ of\ unescaped\ '\#'=jumlah ganjil unescaped '\#'
 
+
 Show\ diff=Tampilkan diff
 Copy\ Version=Versi Salin
 License=Lisensi
@@ -1258,7 +1259,6 @@ Message=Pesan
 
 
 MathSciNet\ Review=MathSciNet Review
-Reset\ Bindings=Reset Bindings
 
 Decryption\ not\ supported.=Dekripsi tidak didukung.
 
@@ -1290,7 +1290,6 @@ 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
 
 Countries\ and\ territories\ in\ English=Negara dan wilayah dalam bahasa Inggris
@@ -1496,6 +1495,7 @@ Invalid\ identifier\:\ '%0'.=Pengenal tidak valid\: ' % 0 '.
 
 
 
+Linked\ files=File terhubung
 Jump\ to\ entry=Langsung masuk
 The\ group\ name\ contains\ the\ keyword\ separator\ "%0"\ and\ thus\ probably\ does\ not\ work\ as\ expected.=Nama grup berisi pemisah kata kunci " % 0 " dan mungkin tidak sesuai harapan.
 Blog=Blog
@@ -1523,6 +1523,7 @@ Executing\ command\ "%0"...=Perintah pelaksana "%0"...
 
 
 
+Group\ color=Warna kelompok
 
 
 
@@ -1536,6 +1537,8 @@ Default\ pattern=Pola bawaan
 
 
 
+Delete\ text=Hapus teks
+
 
 
 
@@ -1599,3 +1602,9 @@ This\ could\ indicate\ that\ JabRef\ did\ not\ shut\ down\ cleanly\ last\ time\
 
 
 
+
+
+
+
+
+
diff --git a/src/main/resources/l10n/JabRef_it.properties b/src/main/resources/l10n/JabRef_it.properties
index f9474ebfed6..1ddd6d3f7e1 100644
--- a/src/main/resources/l10n/JabRef_it.properties
+++ b/src/main/resources/l10n/JabRef_it.properties
@@ -1,12 +1,4 @@
-Could\ not\ delete\ empty\ entries.=Impossibile eliminare voci vuote.
-
-Delete\ empty\ entries=Elimina voci vuote
-
-Empty\ entries=Voci vuote
-
-Keep\ empty\ entries=Mantieni le voci vuote
-
-Library\ '%0'\ has\ empty\ entries.\ Do\ you\ want\ to\ delete\ them?=La libreria '%0' ha voci vuote. Vuoi eliminarle?
+Proxy\ requires\ password=Il proxy richiede password
 
 Unable\ to\ monitor\ file\ changes.\ Please\ close\ files\ and\ processes\ and\ restart.\ You\ may\ encounter\ errors\ if\ you\ continue\ with\ this\ session.=Impossibile monitorare le modifiche ai file. Si prega di chiudere i file e i processi e riavviare. Si possono riscontrare errori continuando con questa sessione.
 %0\ contains\ the\ regular\ expression\ <b>%1</b>=%0 contiene l'espressione regolare <b>%1</b>
@@ -269,7 +261,8 @@ Do\ not\ abbreviate\ names=Non abbreviare i nomi
 
 Do\ not\ open\ any\ files\ at\ startup=Non aprire nessun file all'avvio
 
-Do\ not\ wrap\ the\ following\ fields\ when\ saving=Non mandare a capo i campi seguenti salvando il file
+Do\ not\ wrap\ when\ saving=Non avvolgere durante il salvataggio
+
 Do\ not\ write\ the\ following\ fields\ to\ XMP\ Metadata=Non scrivere i seguenti campi nei metadati XMP
 
 Donate\ to\ JabRef=Fai una donazione a JabRef
@@ -282,6 +275,8 @@ duplicate\ removal=rimozione di doppioni
 
 Duplicate\ fields=Campi duplicati
 
+Unable\ to\ change\ field\ name.\ "%0"\ already\ in\ use.=Impossibile cambiare il nome del campo. "%0" già in uso.
+
 Duplicate\ string\ name=Nome di stringa duplicato
 
 Duplicates\ found=Trovati doppioni
@@ -337,19 +332,23 @@ Extension=Estensione
 
 External\ Changes\ Resolver=Risolutore Modifiche Esterne
 
-External\ file\ links=Collegamenti a file esterni
-
 External\ programs=Programmi esterni
 
 Failed\ to\ import\ by\ ID=Importazione tramite ID non riuscita
 
 Field=Campo
-
 field=campo
 
 Field\ name=Nome del campo
-
+Field\ names=Nome del campo
 Field\ names\ are\ not\ allowed\ to\ contain\ white\ spaces\ or\ certain\ characters\ (%0).=I nomi dei campi non possono contenere spazi bianchi o alcuni caratteri (%0).
+New\ field\ name=Nuovo nome del campo
+Add\ new\ field\ name=Aggiungi un nuovo nome campo
+Field\ name\ "%0"\ already\ exists=Il nome del campo "%0" esiste già
+No\ field\ name\ selected\!=Nessun nome di campo selezionato\!
+Remove\ field\ name=Rimuovi nome campo
+Are\ you\ sure\ you\ want\ to\ remove\ field\ name\:\ "%0"?=Sei sicuro di voler rimuovere il nome del campo\: "%0"?
+Manage\ field\ names\ &\ content=Gestione nomi di campi e contenuto
 
 Field\ to\ group\ by=Campo di raggruppamento
 
@@ -477,6 +476,29 @@ Journal\ abbreviations=Abbreviazioni riviste
 Journal\ lists\:=Elenco della riviste\:
 Remove\ journal\ '%0'=Rimuovi rivista '%0'
 
+Journal\ Information=Informazioni sulla rivista
+Year=Anno
+ISSN\ or\ journal\ name\ required\ for\ fetching\ journal\ information=ISSN o nome della rivista richiesto per il recupero delle informazioni sulla rivista
+Fetch\ journal\ information\ online\ to\ show=Recupera informazioni sulla rivista online da mostrare
+Allow\ sending\ ISSN\ to\ a\ JabRef\ online\ service\ (SCimago)\ for\ fetching\ journal\ information=Consenti l'invio di ISSN a un servizio online JabRef (SCimago) per il recupero delle informazioni sulla rivista
+Please\ enable\ journal\ information\ fetching\ in\ %0\ >\ %1=Si prega di abilitare il recupero informazioni sulla rivista in %0 > %1
+Categories=Categorie
+ISSN=ISSN
+Publisher=Editore
+h-index=h-index
+Error\ while\ fetching\ journal\ information\:\ %0=Errore durante il recupero delle informazioni sulla rivista\: %0
+ISSN\ and/or\ journal\ name\ not\ found\ in\ catalog=ISSN e/o nome della rivista non trovato nel catalogo
+Citable\ Docs\ (Previous\ 3\ Years)=Documenti citabili (Precedenti 3 Anni)
+Cites\ Incoming\ by\ Recently\ Published=Citazioni in arrivo per pubblicazione recente
+Cites\ Outgoing=Citazioni In Uscita
+Cites\ Outgoing\ per\ Document=Citazioni in uscita per documento
+Docs\ (This\ Year)=Documenti (questo anno)
+Incorrect\ ISSN\ format=Formato ISSN non corretto
+Error\ accessing\ catalog=Errore nell'accedere al catalogo
+
+Check\ for\ latest\ version\ online=Controlla l'ultima versione online
+Please\ use\ the\ latest\ version\ of\ JabRef\ if\ you\ run\ into\ a\ bug.\ If\ you\ encounter\ an\ issue\ or\ a\ bug,\ check\ the\ latest\ version,\ if\ the\ issue\ is\ still\ present.=Si prega di utilizzare l'ultima versione di JabRef se si incontra un bug. Se si verifica un problema o un bug, controlla l'ultima versione, se il problema è ancora presente.
+
 Keep\ both=Mantieni entrambi
 
 Keep\ subgroups=Mantieni sottogruppi
@@ -503,12 +525,10 @@ LaTeX\ AUX\ file\:=File AUX LaTeX\:
 
 Link=Collegamento
 Listen\ for\ remote\ operation\ on\ port=Porta in ascolto per operazioni remote
-Load\ and\ Save\ preferences\ from/to\ jabref.xml\ on\ start-up\ (memory\ stick\ mode)=Carica e salva le preferenze da/in jabref.xml all'avvio (modalità chiavetta di memoria)
+Memory\ stick\ mode\ -\ Store\ preferences\ in\ 'jabref.xml'\ in\ the\ app\ folder.=Modalità Memory stick - Memorizza le preferenze in 'jabref.xml' nella cartella app.
 
 Show\ advanced\ hints\ (i.e.\ helpful\ tooltips,\ suggestions\ and\ explanation)=Mostra suggerimenti avanzati (aiuto contestuale, suggerimenti e spiegazioni)
 
-Main\ file\ directory=Cartella dei file principale
-
 Manage\ custom\ exports=Gestione delle esportazioni personalizzate
 
 Manage\ custom\ imports=Gestione delle importazioni personalizzate
@@ -516,8 +536,6 @@ External\ file\ types=Tipi di file esterni
 
 Mark\ new\ entries\ with\ owner\ name=Contrassegna le nuove voci con il nome del proprietario
 
-Memory\ stick\ mode=Modalità chiavetta di memoria
-
 Merged\ external\ changes=Modifiche esterne incorporate
 Merge\ fields=Unisci campi
 
@@ -593,7 +611,7 @@ Open\ editor\ when\ a\ new\ entry\ is\ created=Apri per modifiche quando una nuo
 
 Open\ file=Apri file
 
-Open\ last\ edited\ libraries\ at\ startup=All'avvio apri le librerie aperte nella sessione precedente
+Open\ last\ edited\ libraries\ on\ startup=Apri le ultime librerie modificate all'avvio
 
 Connect\ to\ shared\ database=Connetti al database condiviso
 
@@ -608,8 +626,6 @@ Operating\ System\ (Provides\ for\ better\ recommendations\ by\ giving\ an\ indi
 
 Optional\ fields=Campi opzionali
 
-Options=Opzioni
-
 or=o
 
 Override\ default\ file\ directories=Alternative alle cartelle di file predefinite
@@ -744,8 +760,7 @@ Replaces\ Unicode\ ligatures\ with\ their\ expanded\ form=Sostituisce le legatur
 
 Required\ fields=Campo obbligatorio
 
-Do\ not\ resolve\ BibTeX\ strings=Non risolvere le stringhe BibTeX
-Resolve\ BibTeX\ strings\ for\ the\ following\ fields=Risolvi le stringhe BibTeX per i seguenti campi
+Resolve\ BibTeX\ strings=Risolvi le stringhe BibTeX
 
 resolved=risolto
 
@@ -759,8 +774,6 @@ Review=Rivedi
 Review\ changes=Rivedi le modifiche
 Review\ Field\ Migration=Revisione Migrazione Campo
 
-Loading=Caricamento
-
 Save=Salva
 Save\ all\ finished.=Terminato il salvataggio globale.
 Save\ all\ open\ libraries=Salva tutte le librerie aperte
@@ -784,7 +797,7 @@ Refuse\ to\ save\ the\ library\ before\ external\ changes\ have\ been\ reviewed.
 Library\ protection=Protezione della libreria
 Unable\ to\ save\ library=Impossibile salvare la libreria
 
-Always\ reformat\ BIB\ file\ on\ save\ and\ export=Riformatta sempre il file BIB quando salvi o esporti
+Always\ reformat\ library\ on\ save\ and\ export=Riformatta sempre la libreria quando salva ed esporta
 Character\ encoding\ '%0'\ is\ not\ supported.=La codifica dei caratteri '%0' non è supportata.
 
 Search=Ricerca
@@ -850,6 +863,12 @@ Show\ BibTeX\ source\ by\ default=Mostra il codice sorgente BibTeX per impostazi
 
 Show\ confirmation\ dialog\ when\ deleting\ entries=Chiedere conferma della cancellazione di una voce
 
+Persist\ password\ between\ sessions=Mantieni la password tra le sessioni
+
+Persist\ api\ keys\ between\ sessions=Mantieni la chiavi API tra le sessioni
+
+Credential\ store\ not\ available.=Archivio credenziali non disponibile.
+
 Show\ last\ names\ only=Mostra solo i cognomi
 
 Show\ names\ unchanged=Mostra i nomi immodificati
@@ -931,6 +950,7 @@ Upgrade\ external\ PDF/PS\ links\ to\ use\ the\ '%0'\ field.=Aggiornare i colleg
 usage=uso
 Use\ autocompletion=Usa autocompletamento
 
+User\ interface=Interfaccia utente
 
 Username=Nome utente
 
@@ -943,6 +963,8 @@ Verify\ that\ LyX\ is\ running\ and\ that\ the\ lyxpipe\ is\ valid.=Verificare c
 View=Visualizza
 Vim\ server\ name=Nome del server Vim
 
+View\ journal\ info=Visualizza informazioni sulla rivista
+
 Warn\ about\ unresolved\ duplicates\ when\ closing\ inspection\ window=Avverti della presenza di doppioni non risolti alla chiusura della finestra di ispezione
 
 Warn\ before\ overwriting\ existing\ keys=Avverti prima di sovrascrivere chiavi esistenti
@@ -1043,7 +1065,11 @@ You\ must\ enter\ an\ integer\ value\ in\ the\ interval\ 1025-65535=È necessari
 Autocomplete\ names\ in\ 'Firstname\ Lastname'\ format\ only=Autocompletamento dei nomi solo nel formato 'Firstname Lastname'
 Autocomplete\ names\ in\ 'Lastname,\ Firstname'\ format\ only=Autocompletamento dei nomi solo nel formato 'Lastname, Firstname'
 Autocomplete\ names\ in\ both\ formats=Autocompletamento dei nomi in entrambi i formati
-Send\ as\ email=Invia come email
+Send=Invia
+As\ Email=Come Email
+To\ Kindle=A Kindle
+Send\ to\ Kindle=Invia a Kindle
+Email\ address\ for\ sending\ to\ Kindle=Indirizzo e-mail per l'invio a Kindle
 References=Riferimenti
 Sending\ of\ emails=Invio di email
 Subject\ for\ sending\ an\ email\ with\ references=Oggetto per l'invio di email con riferimenti
@@ -1121,7 +1147,6 @@ Please\ choose\ which\ one\ to\ connect\ to\:=Selezionare quello al quale connet
 Choose\ OpenOffice/LibreOffice\ executable=Scegliere file eseguibile OpenOffice/LibreOffice
 Select\ document=Selezionare il documento
 HTML\ list=Lista HTML
-If\ possible,\ normalize\ this\ list\ of\ names\ to\ conform\ to\ standard\ BibTeX\ name\ formatting=Se possiblile, normalizzare questa lista di nomi in accordo con lo standard di formattazione dei nomi BibTeX
 Could\ not\ open\ %0=Impossiblie aprire %0
 Unknown\ import\ format=Formato di importazione sconosciuto
 Style\ selection=Selezione dello stile
@@ -1148,6 +1173,7 @@ Cleanup\ entries=Pulizia voci
 Automatically\ assign\ new\ entry\ to\ selected\ groups=Assegna automaticamente la nuova voce ai gruppi selezionati
 %0\ mode=modalità %0
 Move\ DOIs\ from\ note\ and\ URL\ field\ to\ DOI\ field\ and\ remove\ http\ prefix=Sposta i DOI dai campi note e URL al campo DOI e rimuovi il prefisso 'http'
+Move\ URL\ in\ note\ field\ to\ url\ field=Sposta l'URL nel campo nota nel campo url
 Make\ paths\ of\ linked\ files\ relative\ (if\ possible)=Rendi relativi i percorsi dei file collegati (se possibile)
 Rename\ PDFs\ to\ given\ filename\ format\ pattern=Rinomina i file PDF secondo il modello di nome dei file
 Rename\ only\ PDFs\ having\ a\ relative\ path=Rinomina solo i file PDF con un percorso relativo
@@ -1158,6 +1184,7 @@ One\ entry\ needed\ a\ clean\ up=Una voce necessita ripulitura
 
 Group\ tree\ could\ not\ be\ parsed.\ If\ you\ save\ the\ BibTeX\ library,\ all\ groups\ will\ be\ lost.=Impossibile analizzare l'albero dei gruppi. Salvando la libreria BibTeX i gruppi saranno persi.
 Attach\ file=Allega file
+Attach\ file\ from\ URL=Aggiungi file da URL
 Setting\ all\ preferences\ to\ default\ values.=Imposta tutte le preferenze ai valori predefiniti.
 Resetting\ preference\ key\ '%0'=Reimposta la chiave delle preferenze '%0'
 Unable\ to\ clear\ preferences.=Impossibile reimpostatare le preferenze.
@@ -1191,7 +1218,6 @@ Four\ stars=Quattro stelle
 Five\ stars=Cinque stelle
 Help\ on\ special\ fields=Aiuto sui campi speciali
 Keywords\ of\ selected\ entries=Parole chiave delle voci selezionate
-Manage\ content\ selectors=Gestione dei selettori dei contenuti
 Content\ selectors=Selettore dei contenuti
 Manage\ keywords=Gestione delle parole chiave
 No\ priority\ information=Nessuna informazione di priorità
@@ -1222,7 +1248,6 @@ Error\ message\:=Messaggio di errore\:
 If\ a\ pasted\ or\ imported\ entry\ already\ has\ the\ field\ set,\ overwrite.=Se la voce incollata o importata ha il campo già impostato, sovrascrivere.
 Not\ connected\ to\ any\ Writer\ document.\ Please\ make\ sure\ a\ document\ is\ open,\ and\ use\ the\ 'Select\ Writer\ document'\ button\ to\ connect\ to\ it.=Non connesso ad alcun documento Writer. Assicurarsi che un documento sia aperto e connetterlo con il bottone "Selezionare il documento Writer".
 Removed\ all\ subgroups\ of\ group\ "%0".=Eliminati tutti i sottogruppi del gruppo "%0".
-To\ disable\ the\ memory\ stick\ mode\ rename\ or\ remove\ the\ jabref.xml\ file\ in\ the\ same\ folder\ as\ JabRef.=Per disabilitare la modalità chiavetta di memoria rinominare o cancellare il file "jabref.xml" che si trova nella cartella di installazione di 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.=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.
@@ -1257,7 +1282,6 @@ Please\ specify\ a\ password=Inserisci una password
 Proxy\ configuration=Configurazione proxy
 Use\ custom\ proxy\ configuration=Utilizza una configurazione del proxy personalizzata.
 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
@@ -1274,7 +1298,7 @@ Open\ folder=Apri cartella
 Export\ sort\ order=Esporta il modo di ordinamento
 Save\ sort\ order=Salva ordine
 
-Keep\ original\ order=Mantieni l'ordine originale
+Keep\ original\ order\ and\ add\ new\ entries\ at\ the\ end=Mantieni l'ordine originale e aggiungi nuove voci alla fine
 Use\ current\ table\ sort\ order=Usa l'ordine corrente della tabella
 Use\ specified\ order=Usa l'ordine specificato
 Show\ extra\ columns=Mostra le colonne supplementari
@@ -1310,7 +1334,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.
+Could\ not\ detect\ terminal\ automatically\ using\ '%0'.\ Please\ define\ a\ custom\ terminal\ in\ the\ preferences.=Impossibile rilevare il terminale automaticamente usando '%0'. 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
@@ -1340,7 +1364,7 @@ Removed\ all\ groups=Cancellati tutti i gruppi
 %0.\ Accepting\ the\ change\ replaces\ the\ complete\ groups\ tree\ with\ the\ externally\ modified\ groups\ tree.=%0. Accettare il cambiamento sostituisce l'albero gruppi completo con l'albero gruppi modificato esternamente.
 Select\ export\ format=Selezionare il formato di esportazione
 Return\ to\ library=Ritorna alla libreria
-On\ JabRef=Su JabRef
+
 Could\ not\ connect\ to\ %0=Impossibile la connessione a %0
 Warning\:\ %0\ out\ of\ %1\ entries\ have\ undefined\ title.=Attenzione\: %0 di %1 voci non hanno un titolo definito.
 Warning\:\ %0\ out\ of\ %1\ entries\ have\ undefined\ citation\ key.=Attenzione\: %0 di %1 voci hanno chiavi BibTeX non definite.
@@ -1348,6 +1372,10 @@ Warning\:\ %0\ out\ of\ %1\ entries\ have\ undefined\ DOIs.=Attenzione\: %0 su %
 Really\ delete\ the\ selected\ entry?=Cancellare veramente la voce selezionata?
 Really\ delete\ the\ %0\ selected\ entries?=Cancellare veramente le %0 voci selezionate?
 
+On\ disk=Sul disco
+In\ JabRef=In JabRef
+Entry\ Preview=Anteprima della voce
+
 Keep\ left=Tieni quelli di sinistra
 Keep\ right=Tieni quelli di destra
 Old\ entry=Voce vecchia
@@ -1381,6 +1409,7 @@ Entry\ editor,\ previous\ panel\ 2=Editor della voce, pannello precedente 2
 File\ list\ editor,\ move\ entry\ down=Editor di liste di file, sposta la voce in giù
 File\ list\ editor,\ move\ entry\ up=Editor di liste di file, sposta la voce in su
 Focus\ entry\ table=Cursore nella tavola delle voci
+Focus\ group\ list=Cursore nell'elenco dei gruppi
 Import\ into\ current\ library=Importa nella libreria corrente
 Import\ into\ new\ library=Importa in una nuova libreria
 New\ article=Nuovo articolo
@@ -1391,7 +1420,6 @@ New\ mastersthesis=Nuova tesi di master
 New\ phdthesis=Nuova tesi di dottorato
 New\ proceedings=Nuovi atti di congresso
 New\ unpublished=Nuovo non pubblicato
-Preamble\ editor,\ store\ changes=Editor di preambolo
 Push\ to\ application=Manda all'applicazione
 Refresh\ OpenOffice/LibreOffice=Ricarica OpenOffice/LibreOffice
 Resolve\ duplicate\ citation\ keys=Risolvi le chiavi BibTeX duplicate
@@ -1462,7 +1490,7 @@ Capitalize=Metti in maiuscolo la prima lettera
 Capitalize\ all\ Words,\ but\ Converts\ Articles,\ Prepositions,\ and\ Conjunctions\ to\ Lower\ Case.=Metti in Maiuscolo Tutte le Parole, ma Converti Articoli, Preposizioni e Congiunzioni in Minuscolo.
 Capitalize\ the\ first\ word,\ changes\ other\ words\ to\ lower\ case.=Metti in maiuscolo la prima lettera della prima parola, metti in minuscolo tutte le altre parole.
 changes\ all\ letters\ to\ lower\ case.=cambia tutte le lettere in minuscolo.
-CHANGES\ ALL\ LETTER\ TO\ UPPER\ CASE.=CAMBIA TUTTE LE LETTERE IN MAIUSCOLO.
+CHANGES\ ALL\ LETTERS\ TO\ UPPER\ CASE.=CAMBIA TUTTE LE LETTERE IN MAIUSCOLO.
 Changes\ The\ First\ Letter\ Of\ All\ Words\ To\ Capital\ Case\ And\ The\ Remaining\ Letters\ To\ Lower\ Case.=Cambia La Prima Lettera Di Tutte Le Parole Al Maiuscolo e Le Lettere Rimanenti Al Minuscolo.
 Cleans\ up\ LaTeX\ code.=Pulisci il codice LaTeX.
 Converts\ HTML\ code\ to\ LaTeX\ code.=Converti il codice HTML in LaTeX.
@@ -1506,7 +1534,11 @@ Does\ nothing.=Non fa niente.
 Identity=Identità
 Clears\ the\ field\ completely.=Azzera completamente il campo.
 Directory\ not\ found=Cartella non trovata
-Main\ file\ directory\ not\ set.\ Check\ the\ preferences\ (linked\ files)\ or\ the\ library\ properties.=Directory file principale non impostata. Controlla le preferenze (file collegati) o le proprietà della libreria.
+
+Main\ file\ directory=Cartella dei file principale
+Main\ file\ directory\ not\ set.\ Check\ the\ preferences\ ("Linked\ files")\ or\ modify\ the\ library\ properties\ ("Override\ default\ file\ directories").=Directory principale del file non impostata. Controlla le preferenze ("File collegati") o modifica le proprietà della libreria ("Sovrascrivi directory di file predefinite").
+Main\ file\ directory\ '%0'\ not\ found.\nCheck\ the\ tab\ "Linked\ files".=Directory file principale '%0' non trovata.\nControlla la scheda "File collegati".
+
 This\ operation\ requires\ exactly\ one\ item\ to\ be\ selected.=Per questa operazione devi selezionare esattamente un elemento.
 Opening\ large\ number\ of\ files=Apertura di un gran numero di file
 You\ are\ about\ to\ open\ %0\ files.\ Continue?=Stai per aprire i file %0. Continuare?
@@ -1561,6 +1593,8 @@ Verse=Verso
 change\ entries\ of\ group=modifica le voci del gruppo
 odd\ number\ of\ unescaped\ '\#'=numero dispari di '\#' non marcati
 
+Found\ %0\ unescaped\ '&'=Trovato %0 non sfuggito '&'
+
 Show\ diff=Mostra differenze
 Copy\ Version=Copia la versione
 Maintainers=Manutentori
@@ -1580,7 +1614,7 @@ Message=Messaggio
 
 
 MathSciNet\ Review=Recensione MathSciNet
-Reset\ Bindings=Annulla scorciatoie
+Reset\ all=Reimposta tutto
 
 Decryption\ not\ supported.=Decrittografazione non supportata.
 
@@ -1627,7 +1661,7 @@ Found\ overlapping\ ranges=Trovati intervalli di sovrapposizione
 Found\ touching\ ranges=Trovati intervalli di contatto
 
 Note\:\ Use\ the\ placeholder\ %DIR%\ for\ the\ location\ of\ the\ opened\ library\ file.=Nota\: Usa il segnaposto %DIR% per la posizione del file libreria aperto.
-Error\ occured\ while\ executing\ the\ command\ "%0".=È avvenuto un errore eseguendo il comando "%0".
+Error\ occurred\ while\ executing\ the\ command\ "%0".=Si è verificato un errore durante l'esecuzione del comando "%0".
 Reformat\ ISSN=Riformatta ISSN
 
 Countries\ and\ territories\ in\ English=Paesi e territori in inglese
@@ -1642,6 +1676,7 @@ Are\ you\ sure\ you\ want\ to\ remove\ the\ protected\ terms\ file?=Sei sicuro d
 Remove\ protected\ terms\ file=Rimuovi il file di termini protetti
 Add\ selected\ text\ to\ list=Aggiungi il testo selezionato alla lista
 Add\ {}\ around\ selected\ text=Aggiungi {} intorno al testo selezionato
+Remove\ all\ {}\ in\ selected\ text=Rimuovi tutti {} nel testo selezionato
 Format\ field=Campo di formattazione
 New\ protected\ terms\ file=Nuovo file di termini protetti
 change\ field\ %0\ of\ entry\ %1\ from\ %2\ to\ %3=modifica il campo %0 della voce %1 da %2 a %3
@@ -1693,6 +1728,7 @@ Check\ the\ event\ log\ to\ see\ all\ notifications=Controlla il registro eventi
 Host=Host
 Port=Porta
 Library=Libreria
+Libraries=Librerie
 User=Utente
 Connect=Connetto
 Connection\ error=Errore di connessione
@@ -1721,6 +1757,7 @@ Cannot\ cite\ entries\ without\ citation\ keys.\ Generate\ keys\ now?=Non posso
 New\ technical\ report=Nuovo rapporto tecnico
 
 %0\ file=file %0
+%0\ file\ (%1)=%0 file (%1)
 Custom\ layout\ file=File di layout apposito
 Protected\ terms\ file=File di termini protetti
 Style\ file=File stile
@@ -1791,6 +1828,7 @@ DOI\ %0\ is\ invalid=DOI %0 non valido
 
 Select\ all\ customized\ types\ to\ be\ stored\ in\ local\ preferences\:=Seleziona tutti i tipi personalizzati da memorizzare nelle preferenze locali\:
 Different\ customization,\ current\ settings\ will\ be\ overwritten=Personalizzazione differente, i parametri correnti saranno sovrascritti
+%0\ (from\ file)\n%1\ (current\ setting)=%0 (da file)\n%1 (impostazione corrente)
 
 Entry\ type\ %0\ is\ only\ defined\ for\ Biblatex\ but\ not\ for\ BibTeX=Il tipo di voce %0 è definita per Biblatex ma non per BibTeX
 
@@ -1919,6 +1957,7 @@ 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
 Recent\ libraries=Librerie recenti
+Clear\ recent\ libraries=Cancella librerie recenti
 Set\ up\ general\ fields=Imposta i campi generali
 View\ change\ log=Visualizza la lista delle modifiche
 View\ event\ log=Visualizza il log degli eventi
@@ -1960,12 +1999,6 @@ Select\ the\ entries\ to\ be\ imported\:=Seleziona le voci da importare\:
 Add\ new\ String=Aggiungi nuova stringa
 Must\ not\ be\ empty\!=Non deve essere vuoto\!
 Open\ Help\ page=Apri pagina di aiuto
-Add\ new\ field\ name=Aggiungi un nuovo nome campo
-Field\ name\:=Nome campo\:
-Field\ name\ "%0"\ already\ exists=Il nome del campo "%0" esiste già
-No\ field\ name\ selected\!=Nessun nome di campo selezionato\!
-Remove\ field\ name=Rimuovi nome campo
-Are\ you\ sure\ you\ want\ to\ remove\ field\ name\:\ "%0"?=Sei sicuro di voler rimuovere il nome del campo\: "%0"?
 Add\ new\ keyword=Aggiungi nuova parola chiave
 Keyword\:=Parola chiave\:
 Keyword\ "%0"\ already\ exists=La parola chiave "%0" esiste già
@@ -1976,7 +2009,6 @@ Reset\ to\ default=Ripristina impostazioni predefinite
 String\ constants=Costanti stringa
 Export\ all\ entries=Esporta tutte le voci
 Generate\ citation\ keys=Genera le chiavi BibTeX
-Manage\ field\ names\ &\ content=Gestione nomi di campi e contenuto
 New\ library=Nuova libreria
 OpenOffice/LibreOffice=OpenOffice/LibreOffice
 Open\ document\ viewer=Apri visualizzatore documento
@@ -2048,16 +2080,15 @@ Add\ formatter\ to\ list=Aggiungi formattatore alla lista
 Filter\ List=Elenco filtri
 Open\ files...=Apri file...
 
-Affected\ fields\:=Campi interessati\:
+Affected\ fields=Campi interessati
 Show\ preview\ as\ a\ tab\ in\ entry\ editor=Visualizza l'anteprima come scheda nell'editor della voce
-Font=Tipo di carattere
 Visual\ theme=Tema visivo
-Light\ theme=Tema chiaro
-Dark\ theme=Tema scuro
-Custom\ theme=Tema personalizzato
 Overwrite\ existing\ keys=Sovrascrivi chiavi esistenti
 Key\ patterns=Modello delle chiavi
 Font\ settings=Impostazioni carattere
+Custom...=Personalizzato...
+Dark=Scuro
+Light=Chiaro
 Please\ specify\ a\ css\ theme\ file.=Specifica un file di tema css.
 You\ must\ enter\ an\ integer\ value\ higher\ than\ 8.=Devi inserire un valore intero superiore a 8.
 Letters\ after\ duplicate\ generated\ keys=Lettere dopo le chiavi generate duplicate
@@ -2073,7 +2104,6 @@ Reset\ All=Ripristina tutto
 Linked\ identifiers=Identificatori collegati
 
 insert\ entries=inserisci voci
-On\ disk=Sul disco
 
 Independent=Indipendente
 Intersection=Intersezione
@@ -2283,7 +2313,6 @@ Display\ count\ of\ items\ in\ group=Visualizza il conteggio degli elementi nel
 Remove\ the\ following\ characters\:=Rimuovi i seguenti caratteri\:
 Truncate=Tronca
 Truncates\ a\ string\ after\ a\ given\ index.=Tronca una stringa dopo un dato indice.
-Close=Chiudi
 Close\ all=Chiudi tutti
 Close\ all\ libraries=Chiudi tutte le Librerie
 Close\ other\ libraries=Chiudi le altre librerie
@@ -2298,13 +2327,13 @@ Custom\ import\ formats=Formati di importazione personalizzati
 
 No\ list\ enabled=Nessun elenco abilitato
 Protect\ selection=Proteggi la selezione
+Unprotect\ selection=Non proteggere la selezione
 
 Customized\ preview\ style=Stile anteprima personalizzato
 Next\ preview\ style=Stile anteprima successiva
 Previous\ preview\ style=Stile anteprima precedente
 
 (\ Note\:\ Press\ return\ to\ commit\ changes\ in\ the\ table\!\ )=( Nota\: Premi invio per effettuare il commit delle modifiche nella tabella\! )
-Reset=Ripristina
 New\ inproceedings=Nuovi inproceedings
 Reset\ entry\ types\ and\ fields\ to\ defaults=Reimposta i tipi di voci e i campi ai valori predefiniti
 This\ will\ reset\ all\ entry\ types\ to\ their\ default\ values\ and\ remove\ all\ custom\ entry\ types=Questo reimposterà tutti i tipi di voci ai loro valori predefiniti e rimuoverà tutti i tipi di voci personalizzate
@@ -2339,7 +2368,7 @@ Unprotect\ terms=Termini non protetti
 
 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
 
@@ -2347,7 +2376,7 @@ Cited\ on\ pages=Citato sulle pagine
 Please\ move\ the\ cursor\ into\ the\ document\ text.=Spostare il cursore nel testo del documento.
 To\ get\ the\ visual\ positions\ of\ your\ citations\ I\ need\ to\ move\ the\ cursor\ around,\ but\ could\ not\ get\ it.=Per ottenere le posizioni visive delle vostre citazioni ho bisogno di spostare il cursore intorno, ma non poteva ottenerlo.
 
-I\ cannot\ insert\ to\ the\ cursors\ current\ location.=Non posso inserire nella posizione corrente del cursore.
+I\ cannot\ insert\ to\ the\ cursor's\ current\ location.=Non posso inserire nella posizione corrente del cursore.
 
 Please\ move\ the\ cursor\ to\ the\ location\ for\ the\ new\ citation.=Si prega di spostare il cursore nella posizione per la nuova citazione.
 
@@ -2387,13 +2416,13 @@ File\ '%1'\ is\ a\ duplicate\ of\ '%0'.\ Keeping\ both\ due\ to\ deletion\ error
 Enable\ field\ formatters=Abilita formatori di campo
 Entry\ Type=Tipo di voce
 Entry\ types=Tipi di voce
-Field\ names=Nome del campo
 Others=Altri
 Recommended=Consigliato
 
 Authors\ and\ Title=Autori e Titolo
-Database=Database
-Databases=Banche dati
+Catalog=Catalogo
+Catalogs=Cataloghi
+Select\ Catalogs\:=Seleziona i Cataoghi\:
 Add\ Author\:=Aggiungi Autore\:
 Add\ Query\:=Aggiungi Query\:
 Add\ Research\ Question\:=Aggiungi Domanda Di Ricerca\:
@@ -2404,7 +2433,6 @@ Start\ new\ systematic\ literature\ review=Inizia una nuova revisione sistematic
 Manage\ study\ definition=Gestisci definizione di studio
 Update\ study\ search\ results=Aggiorna i risultati della ricerca
 Study\ repository\ could\ not\ be\ created=Impossibile creare il repository dello studio
-Select\ Databases\:=Seleziona i Database\:
 
 All\ query\ terms\ are\ joined\ using\ the\ logical\ AND,\ and\ OR\ operators=Tutti i termini di query sono uniti utilizzando gli operatori logici AND e OR
 Finalize=Concludere
@@ -2476,7 +2504,6 @@ 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
@@ -2493,6 +2520,7 @@ Split\ View=Visualizzazione separata
 Plain\ Text=Testo semplice
 Show\ Diff=Mostra differenze
 Merged\ Entry=Voce Fusa
+Only\ show\ changed\ fields=Mostra solo i campi modificati
 
 Edit\ file\ link=Modifica collegamento file
 
@@ -2500,7 +2528,7 @@ Edit\ file\ link=Modifica collegamento file
 Assign=Assegna
 Do\ not\ assign=Non assegnare
 
-Error\ occured\ %0=Errore verificatosi %0
+Error\ occurred\ %0=Errore verificato %0
 Left\ Entry=Voce Sinistra
 Merge\ %0=Unisci %0
 Right\ Entry=Voce Destra
@@ -2524,4 +2552,26 @@ Use\ the\ field\ FJournal\ to\ store\ the\ full\ journal\ name\ for\ (un)abbrevi
 
 Library\ to\ import\ into=Libreria in cui importare
 
+Enable\ web\ search=Abilita ricerca web
+Web\ search\ disabled=Ricerca Web disabilitata
+
 Multiline=Multilinea
+
+Unable\ to\ open\ linked\ eprint.\ Please\ set\ the\ eprinttype\ field=Impossibile aprire eprint collegato. Impostare il campo eprinttype
+Unable\ to\ open\ linked\ eprint.\ Please\ verify\ that\ the\ eprint\ field\ has\ a\ valid\ '%0'\ id=Impossibile aprire eprint collegato. Si prega di verificare che il campo eprint abbia un id valido '%0'
+
+Search\ from\ history...=Cerca dalla cronologia...
+your\ search\ history\ is\ empty=la cronologia di ricerca è vuota
+Clear\ history=Cancella cronologia
+
+Delete\ %0\ files=Elimina %0 file
+Delete\ %0\ files\ permanently\ from\ disk,\ or\ just\ remove\ the\ files\ from\ the\ entry?\ Pressing\ Delete\ will\ delete\ the\ files\ permanently\ from\ disk.=Eliminare definitivamente %0 file dal disco o semplicemente rimuovere i file dalla voce? Premendo Eliminare eliminerà i file in modo permanente dal disco.
+Error\ accessing\ file\ '%0'.=Errore nell'accedere al file '%0'.
+This\ operation\ requires\ selected\ linked\ files.=Questa operazione richiede i file collegati selezionati.
+
+Create\ backup=Crea backup
+Automatically\ search\ and\ show\ unlinked\ files\ in\ the\ entry\ editor=Cerca e mostra automaticamente i file non collegati nell'editor delle voci
+
+File\ "%0"\ cannot\ be\ added\!=File "%0" non può essere aggiunto\!
+Illegal\ characters\ in\ the\ file\ name\ detected.\nFile\ will\ be\ renamed\ to\ "%0"\ and\ added.=Caratteri illegali nel nome del file rilevato. Il file\nsarà rinominato in "%0" e aggiunto.
+Rename\ and\ add=Rinomina e aggiungi
diff --git a/src/main/resources/l10n/JabRef_ja.properties b/src/main/resources/l10n/JabRef_ja.properties
index 939e172f860..bed3222eb41 100644
--- a/src/main/resources/l10n/JabRef_ja.properties
+++ b/src/main/resources/l10n/JabRef_ja.properties
@@ -1,12 +1,3 @@
-Could\ not\ delete\ empty\ entries.=空の項目を削除できませんでした．
-
-Delete\ empty\ entries=空の項目を削除
-
-Empty\ entries=空の項目
-
-Keep\ empty\ entries=空の項目を保持
-
-Library\ '%0'\ has\ empty\ entries.\ Do\ you\ want\ to\ delete\ them?=ライブラリ「%0」には空の項目があります．削除しますか？
 
 Unable\ to\ monitor\ file\ changes.\ Please\ close\ files\ and\ processes\ and\ restart.\ You\ may\ encounter\ errors\ if\ you\ continue\ with\ this\ session.=ファイルの変更を監視できません。ファイルとプロセスを閉じて、再起動してください。このセッションのまま続行すると、エラーが発生する恐れがあります。
 %0\ contains\ the\ regular\ expression\ <b>%1</b>=%0には，正規表現<b>%1</b>が含まれています
@@ -28,6 +19,7 @@ Reveal\ in\ File\ Explorer=ファイルエクスプローラーで表示
 %0\ matches\ the\ term\ <b>%1</b>=%0は項目<b>%1</b>に一致します
 
 Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (DEFAULT\ abbreviation)=選択項目の学術誌名を短縮形にします（既定の短縮形）
+Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (DOTLESS\ abbreviation)=選択項目の学術誌名を短縮形にします（ピリオドなし短縮形）
 Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (SHORTEST\ UNIQUE\ abbreviation)=選択項目の学術誌名を短縮形にします（重複のない最も簡素な短縮形）
 
 Abbreviate\ names=名前を短縮形に
@@ -39,6 +31,8 @@ Abbreviations=略語
 Unabbreviate\ journal\ names\ of\ the\ selected\ entries=選択した項目の誌名を非短縮形にする
 Unabbreviated\ %0\ journal\ names.=%0個の誌名を非短縮形にしました
 
+dotless=ピリオドなし
+shortest\ unique=重複なし最短
 
 About\ JabRef=JabRefについて
 
@@ -65,6 +59,7 @@ Add\ subgroup=下層グループを追加
 
 Added\ group\ "%0".=グループ「%0」を追加しました．
 
+Added\ string\:\ '%0'=追加した文字列：'%0'
 Added\ string=文字列を追加しました
 
 All\ entries=全項目
@@ -202,7 +197,9 @@ Create\ custom\ fields\ for\ each\ BibTeX\ entry=各BibTeX項目用にユーザ
 
 crossreferenced\ entries\ included=相互参照している項目を取り込みました
 
+Current\ content\:\ %0=現在の内容：%0
 
+Current\ value\:\ %0=現在の値：%0
 
 Custom\ entry\ types=ユーザー項目型
 
@@ -263,7 +260,7 @@ Do\ not\ abbreviate\ names=名前を略さない
 
 Do\ not\ open\ any\ files\ at\ startup=起動時にファイルを開かない
 
-Do\ not\ wrap\ the\ following\ fields\ when\ saving=以下のフィールドは保存時に改行しない
+
 Do\ not\ write\ the\ following\ fields\ to\ XMP\ Metadata=以下のフィールドはXMPメタデータに書き込まない
 
 Donate\ to\ JabRef=JabRefに寄付
@@ -276,6 +273,7 @@ duplicate\ removal=重複を削除
 
 Duplicate\ fields=フィールドの重複
 
+
 Duplicate\ string\ name=重複した文字列名
 
 Duplicates\ found=重複が見つかりました
@@ -330,19 +328,23 @@ Exporting=書き出し中
 Extension=拡張子
 
 
-External\ file\ links=外部ファイルリンク
-
 External\ programs=外部プログラム
 
 Failed\ to\ import\ by\ ID=IDによる読み込みに失敗しました
 
 Field=フィールド
-
 field=フィールド
 
 Field\ name=フィールド名
-
+Field\ names=フィールド名
 Field\ names\ are\ not\ allowed\ to\ contain\ white\ spaces\ or\ certain\ characters\ (%0).=フィールド名には，スペースや特定の文字(%0)を使うことはできません．
+New\ field\ name=新規フィールド名
+Add\ new\ field\ name=新規フィールド名を追加
+Field\ name\ "%0"\ already\ exists=フィールド名「%0」はすでに存在します
+No\ field\ name\ selected\!=フィールド名が選択されていません！
+Remove\ field\ name=フィールド名を削除
+Are\ you\ sure\ you\ want\ to\ remove\ field\ name\:\ "%0"?=本当にフィールド名「%0」を削除しますか？
+Manage\ field\ names\ &\ content=フィールド名・フィールド値の管理
 
 Field\ to\ group\ by=グループ化するフィールド
 
@@ -470,6 +472,8 @@ Journal\ abbreviations=誌名短縮形
 Journal\ lists\:=学術誌一覧：
 Remove\ journal\ '%0'=学術誌「%0」を削除
 
+
+
 Keep\ both=両側を維持
 
 Keep\ subgroups=下層グループを保持
@@ -487,6 +491,8 @@ Keyword=キーワード
 Keywords=キーワード
 
 Label=ラベル
+Label\:\ %0=ラベル：%0
+Content\:\ %0=内容：%0
 Language=言語
 
 Last\ modified=最終修正日時
@@ -494,12 +500,9 @@ LaTeX\ AUX\ file\:=LaTeX AUXファイル：
 
 Link=リンク
 Listen\ for\ remote\ operation\ on\ port=以下のポートでリモート操作を待ち受ける
-Load\ and\ Save\ preferences\ from/to\ jabref.xml\ on\ start-up\ (memory\ stick\ mode)=起動時にjabref.xmlの読み込みと保存を行う（メモリースティックモード）
 
 Show\ advanced\ hints\ (i.e.\ helpful\ tooltips,\ suggestions\ and\ explanation)=詳細なヒントを表示する (詳しいツールチップやおすすめ，説明など)
 
-Main\ file\ directory=基本ファイルディレクトリ
-
 Manage\ custom\ exports=ユーザー書出の管理
 
 Manage\ custom\ imports=ユーザー読込の管理
@@ -507,8 +510,6 @@ External\ file\ types=外部ファイル形式
 
 Mark\ new\ entries\ with\ owner\ name=新規項目にオーナー名を記載
 
-Memory\ stick\ mode=メモリースティックモード
-
 Merged\ external\ changes=外部からの変更を統合しました
 Merge\ fields=フィールドをマージ
 
@@ -583,7 +584,6 @@ Open\ editor\ when\ a\ new\ entry\ is\ created=新規項目を生成した際に
 
 Open\ file=ファイルを開く
 
-Open\ last\ edited\ libraries\ at\ startup=起動時に最後に編集していたデータベースを開く
 
 Connect\ to\ shared\ database=共有データベースを開く
 
@@ -598,8 +598,6 @@ Operating\ System\ (Provides\ for\ better\ recommendations\ by\ giving\ an\ indi
 
 Optional\ fields=任意フィールド
 
-Options=オプション
-
 or=または
 
 Override\ default\ file\ directories=ファイルディレクトリ既定値の上書き
@@ -730,8 +728,6 @@ Replaces\ Unicode\ ligatures\ with\ their\ expanded\ form=Unicode合字を分離
 
 Required\ fields=必須フィールド
 
-Do\ not\ resolve\ BibTeX\ strings=BibTeX文字列を展開しない
-Resolve\ BibTeX\ strings\ for\ the\ following\ fields=次のフィールドのBibTeX文字列は展開する
 
 resolved=解消しました
 
@@ -745,8 +741,6 @@ Review=論評
 Review\ changes=変更を検査する
 Review\ Field\ Migration=Reviewフィールドの取り込み
 
-Loading=読み込み中
-
 Save=保存
 Save\ all\ finished.=保存がすべて終わりました．
 Save\ all\ open\ libraries=すべての開かれているデータベースを保存
@@ -769,7 +763,6 @@ Refuse\ to\ save\ the\ library\ before\ external\ changes\ have\ been\ reviewed.
 Library\ protection=ライブラリ保護
 Unable\ to\ save\ library=ライブラリを保存することができませんでした
 
-Always\ reformat\ BIB\ file\ on\ save\ and\ export=保存・書出の際，つねにBIBファイルを再整形する
 Character\ encoding\ '%0'\ is\ not\ supported.=．文字エンコーディング「%0」はサポートされていません．
 
 Search=検索
@@ -832,6 +825,9 @@ Show\ BibTeX\ source\ by\ default=既定でBibTeXソースを表示
 
 Show\ confirmation\ dialog\ when\ deleting\ entries=項目を削除する際に確認ダイアログを表示する
 
+
+
+
 Show\ last\ names\ only=姓のみを表示する
 
 Show\ names\ unchanged=氏名をそのまま表示
@@ -922,6 +918,7 @@ Value\ cleared\ externally=外部から値が消去されました
 View=表示
 Vim\ server\ name=Vimサーバー名
 
+
 Warn\ about\ unresolved\ duplicates\ when\ closing\ inspection\ window=精査ウィンドウを閉じる際に解消されていない重複項目に対して警告する
 
 Warn\ before\ overwriting\ existing\ keys=既存キーを上書きする前に警告する
@@ -1022,7 +1019,6 @@ You\ must\ enter\ an\ integer\ value\ in\ the\ interval\ 1025-65535=1025〜65535
 Autocomplete\ names\ in\ 'Firstname\ Lastname'\ format\ only=「名 姓」形式の名前のみ自動補完
 Autocomplete\ names\ in\ 'Lastname,\ Firstname'\ format\ only=「姓, 名」形式の名前のみ自動補完
 Autocomplete\ names\ in\ both\ formats=両方の形式とも自動補完
-Send\ as\ email=電子メールとして送る
 References=書誌情報
 Sending\ of\ emails=電子メールの送付
 Subject\ for\ sending\ an\ email\ with\ references=書誌情報を添付した電子メールの件名
@@ -1100,7 +1096,6 @@ Please\ choose\ which\ one\ to\ connect\ to\:=どれに接続するか選んで
 Choose\ OpenOffice/LibreOffice\ executable=OpenOffice/LibreOffice実行ファイルを選択
 Select\ document=文書を選択
 HTML\ list=HTML一覧
-If\ possible,\ normalize\ this\ list\ of\ names\ to\ conform\ to\ standard\ BibTeX\ name\ formatting=可能ならば，名称一覧を標準的なBibTeX名書式に合致するように標準化する
 Could\ not\ open\ %0=%0を開くことができませんでした
 Unknown\ import\ format=未知の読み込み型です
 Style\ selection=様式の選択
@@ -1170,7 +1165,6 @@ Four\ stars=四つ星
 Five\ stars=五つ星
 Help\ on\ special\ fields=特殊フィールドのヘルプ
 Keywords\ of\ selected\ entries=選択した項目のキーワード
-Manage\ content\ selectors=選択肢メニューを管理
 Content\ selectors=コンテンツセレクター
 Manage\ keywords=キーワードを管理
 No\ priority\ information=優先度の情報がありません
@@ -1201,7 +1195,6 @@ Error\ message\:=エラーメッセージは以下の通り：
 If\ a\ pasted\ or\ imported\ entry\ already\ has\ the\ field\ set,\ overwrite.=貼り付けたり，取り込んだ項目ですでにフィールドが設定されている場合には上書きします．
 Not\ connected\ to\ any\ Writer\ document.\ Please\ make\ sure\ a\ document\ is\ open,\ and\ use\ the\ 'Select\ Writer\ document'\ button\ to\ connect\ to\ it.=どのWriter文書にも接続されていません．文書が開かれているか確認して，「Writer文書を選択」ボタンを押して接続してください．
 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.=メモリースティックモードを無効にするには，JabRefと同じフォルダにあるjabref.xmlファイルを改名するか削除してください
 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ファイルの場所を使用します．
@@ -1236,7 +1229,6 @@ Please\ specify\ a\ password=パスワードを入力してください
 Proxy\ configuration=プロキシ設定
 Use\ custom\ proxy\ configuration=ユーザー定義のプロキシ設定を用いる
 Proxy\ requires\ authentication=プロキシには認証が必要
-Attention\:\ Password\ is\ stored\ in\ plain\ text\!=警告：パスワードは平文で保管されます！
 Clear\ connection\ settings=接続設定を消去する
 Check\ Proxy\ Setting=プロキシ設定を確認
 Check\ connection=接続を確認
@@ -1253,7 +1245,6 @@ Open\ folder=フォルダを開く
 Export\ sort\ order=書き出し整序順
 Save\ sort\ order=整序順を保存
 
-Keep\ original\ order=元の順序を保持
 Use\ current\ table\ sort\ order=現在の表での整序順を使用
 Use\ specified\ order=指定された順序を使用
 Show\ extra\ columns=追加列を表示
@@ -1285,7 +1276,6 @@ 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=ファイルアクセス権のエラー
@@ -1310,6 +1300,7 @@ Deleted\ entry=項目を削除
 Modified\ groups\ tree=グループツリーを修正しました
 Removed\ all\ groups=全グループを削除しました
 Select\ export\ format=書き出し形式を選んでください
+
 Could\ not\ connect\ to\ %0=%0に接続することができませんでした
 Warning\:\ %0\ out\ of\ %1\ entries\ have\ undefined\ title.=警告；%1項目中%0項目に定義されていないタイトルがあります．
 Warning\:\ %0\ out\ of\ %1\ entries\ have\ undefined\ citation\ key.=警告：%0項目のうち%1項目に未定義の文献キーがあります．
@@ -1317,6 +1308,8 @@ Warning\:\ %0\ out\ of\ %1\ entries\ have\ undefined\ DOIs.=警告：%1項目の
 Really\ delete\ the\ selected\ entry?=選択した項目を本当に削除しますか？
 Really\ delete\ the\ %0\ selected\ entries?=選択した%0項目を本当に削除しますか？
 
+On\ disk=ディスク上
+
 Keep\ left=左側を維持
 Keep\ right=右側を維持
 Old\ entry=旧項目
@@ -1360,7 +1353,6 @@ New\ mastersthesis=新規masterthesis
 New\ phdthesis=新規phdthesis
 New\ proceedings=新規proceedings
 New\ unpublished=新規unpublished
-Preamble\ editor,\ store\ changes=プリアンブルエディタ・変更を保存
 Push\ to\ application=アプリケーションにプッシュ
 Refresh\ OpenOffice/LibreOffice=OpenOffice/LibreOfficeを更新
 Resolve\ duplicate\ citation\ keys=重複した文献キーを解消する
@@ -1468,7 +1460,9 @@ Does\ nothing.=何もしません．
 Identity=同一
 Clears\ the\ field\ completely.=フィールドを完全に消去します．
 Directory\ not\ found=ディレクトリが検出されませんでした
-Main\ file\ directory\ not\ set.\ Check\ the\ preferences\ (linked\ files)\ or\ the\ library\ properties.=基本ファイルディレクトリが設定されていません．設定 (リンクファイル) またはライブラリ特性を確認してください．
+
+Main\ file\ directory=基本ファイルディレクトリ
+
 This\ operation\ requires\ exactly\ one\ item\ to\ be\ selected.=この操作では，1項目のみ選択されている必要があります．
 Opening\ large\ number\ of\ files=大量のファイルを開きます
 You\ are\ about\ to\ open\ %0\ files.\ Continue?=あなたは %0 個のファイルを開こうとしています。続けていいですか？
@@ -1523,6 +1517,7 @@ Verse=詩句
 change\ entries\ of\ group=グループ項目を変更
 odd\ number\ of\ unescaped\ '\#'=エスケープしていない「\#」の奇数
 
+
 Show\ diff=差異を表示
 Copy\ Version=バージョンをコピー
 Maintainers=メンテナー
@@ -1542,7 +1537,6 @@ Message=メッセージ
 
 
 MathSciNet\ Review=MathSciNetレビュー
-Reset\ Bindings=割当をリセット
 
 Decryption\ not\ supported.=サポートされていない復号化です．
 
@@ -1589,7 +1583,6 @@ Found\ overlapping\ ranges=範囲が重複しています
 Found\ touching\ ranges=範囲が接触しています
 
 Note\:\ Use\ the\ placeholder\ %DIR%\ for\ the\ location\ of\ the\ opened\ library\ file.=【註】開かれたライブラリファイルの場所を表すプレイスホルダーに%DIR%を使用します．
-Error\ occured\ while\ executing\ the\ command\ "%0".=コマンド「%0」を実行中にエラーが発生しました
 Reformat\ ISSN=ISSNを再構成
 
 Countries\ and\ territories\ in\ English=英語での国名・地域名
@@ -1919,12 +1912,6 @@ Select\ the\ entries\ to\ be\ imported\:=読み込む項目を選択：
 Add\ new\ String=新規文字列を追加
 Must\ not\ be\ empty\!=空であってはいけません！
 Open\ Help\ page=ヘルプページを開く
-Add\ new\ field\ name=新規フィールド名を追加
-Field\ name\:=フィールド名\:
-Field\ name\ "%0"\ already\ exists=フィールド名「%0」はすでに存在します
-No\ field\ name\ selected\!=フィールド名が選択されていません！
-Remove\ field\ name=フィールド名を削除
-Are\ you\ sure\ you\ want\ to\ remove\ field\ name\:\ "%0"?=本当にフィールド名「%0」を削除しますか？
 Add\ new\ keyword=新規キーワードを追加
 Keyword\:=キーワード：
 Keyword\ "%0"\ already\ exists=キーワード「%0」はすでに存在します
@@ -1935,7 +1922,6 @@ Reset\ to\ default=既定値に戻す
 String\ constants=文字列定数
 Export\ all\ entries=全項目を書き出す
 Generate\ citation\ keys=文献キーを生成
-Manage\ field\ names\ &\ content=フィールド名・フィールド値の管理
 New\ library=新規ライブラリ
 OpenOffice/LibreOffice=OpenOffice/LibreOffice
 Open\ document\ viewer=文書ビューアを表示
@@ -2007,13 +1993,8 @@ Add\ formatter\ to\ list=整形定義をリストに追加
 Filter\ List=フィルター一覧
 Open\ files...=ファイルを開く...
 
-Affected\ fields\:=対象となるフィールド\:
 Show\ preview\ as\ a\ tab\ in\ entry\ editor=プレビューを項目エディタのタブとして表示する
-Font=フォント
 Visual\ theme=ビジュアルテーマ
-Light\ theme=ライトテーマ
-Dark\ theme=ダークテーマ
-Custom\ theme=ユーザー設定テーマ
 Overwrite\ existing\ keys=既存のキーを上書きする
 Key\ patterns=キー パターン
 Font\ settings=フォント設定
@@ -2032,7 +2013,6 @@ Reset\ All=すべてリセット
 Linked\ identifiers=リンク済み識別子
 
 insert\ entries=項目を挿入する
-On\ disk=ディスク上
 
 Independent=独立
 Intersection=論理積
@@ -2242,7 +2222,6 @@ Display\ count\ of\ items\ in\ group=グループ内の項目数を表示
 Remove\ the\ following\ characters\:=右記の文字を削除します：
 Truncate=切り詰め
 Truncates\ a\ string\ after\ a\ given\ index.=指定されたインデックスの後の文字列を切り捨てます．
-Close=閉じる
 Close\ all=すべて閉じる
 Close\ all\ libraries=すべてのライブラリを閉じる
 Close\ other\ libraries=他のライブラリを閉じる
@@ -2263,7 +2242,6 @@ Next\ preview\ style=次のプレビュー様式
 Previous\ preview\ style=前のプレビュー様式
 
 (\ Note\:\ Press\ return\ to\ commit\ changes\ in\ the\ table\!\ )=（註：表中の変更点を確定するにはリターンを押してください！）
-Reset=リセット
 New\ inproceedings=新規inproceedings
 Reset\ entry\ types\ and\ fields\ to\ defaults=項目型とフィールドを既定値にリセット
 This\ will\ reset\ all\ entry\ types\ to\ their\ default\ values\ and\ remove\ all\ custom\ entry\ types=これは，全ての項目型を既定値にリセットし，ユーザー定義の項目型を全て削除します．
@@ -2294,7 +2272,7 @@ Unprotect\ terms=用語の保護を解除
 
 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=論文アクセスにユーザー設定DOIのベースURIを使用する
 
@@ -2302,7 +2280,6 @@ 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.=新しい引用箇所にカーソルを移動してください．
 
@@ -2342,13 +2319,10 @@ File\ '%1'\ is\ a\ duplicate\ of\ '%0'.\ Keeping\ both\ due\ to\ deletion\ error
 Enable\ field\ formatters=フィールド整形の定義を有効にする
 Entry\ Type=項目型
 Entry\ types=項目型
-Field\ names=フィールド名
 Others=その他
 Recommended=推奨
 
 Authors\ and\ Title=著者とタイトル
-Database=データベース
-Databases=データベース
 Add\ Author\:=著者を追加\:
 Add\ Query\:=クエリを追加：
 Add\ Research\ Question\:=研究課題を追加
@@ -2420,7 +2394,6 @@ Clear\ field\ content=フィールドの内容を消去
 Set\ or\ append\ content=内容を設定もしくは追記
 Edit\ field\ content\ for\ selected\ entries=選択項目のフィールド内容の編集
 Rename=名前を変更
-New\ field\ name=新規フィールド名
 Copy\ content=内容をコピー
 Move\ content=内容を移動
 Swap\ content=内容を交換
@@ -2445,3 +2418,9 @@ This\ could\ indicate\ that\ JabRef\ did\ not\ shut\ down\ cleanly\ last\ time\
 
 
 
+
+
+
+
+
+
diff --git a/src/main/resources/l10n/JabRef_ko.properties b/src/main/resources/l10n/JabRef_ko.properties
index e6378f85465..e3e7af01801 100644
--- a/src/main/resources/l10n/JabRef_ko.properties
+++ b/src/main/resources/l10n/JabRef_ko.properties
@@ -1,12 +1,3 @@
-Could\ not\ delete\ empty\ entries.=빈 항목을 삭제할 수 없습니다.
-
-Delete\ empty\ entries=빈 항목 삭제
-
-Empty\ entries=빈 항목
-
-Keep\ empty\ entries=빈 항목 유지
-
-Library\ '%0'\ has\ empty\ entries.\ Do\ you\ want\ to\ delete\ them?=라이브러리 '%0'에 항목이 없습니다. 삭제하시겠습니까?
 
 Unable\ to\ monitor\ file\ changes.\ Please\ close\ files\ and\ processes\ and\ restart.\ You\ may\ encounter\ errors\ if\ you\ continue\ with\ this\ session.=파일 변경을 모니터링할 수 없습니다. 파일 및 프로세스를 닫고 다시 시작하십시오. 이 세션을 계속 진행하면 오류가 발생할 수 있습니다.
 %0\ contains\ the\ regular\ expression\ <b>%1</b>=%0 정규식을 포함합니다 <b>%1</b>
@@ -256,7 +247,7 @@ Do\ not\ abbreviate\ names=이름을 줄이지 마십시오
 
 Do\ not\ open\ any\ files\ at\ startup=시작 시 파일을 열지 마십시오.
 
-Do\ not\ wrap\ the\ following\ fields\ when\ saving=저장할 때 다음 필드를 줄 바꿈하지 마십시오.
+
 Do\ not\ write\ the\ following\ fields\ to\ XMP\ Metadata=XMP 메타데이터에 다음 필드를 쓰지 마십시오.
 
 Donate\ to\ JabRef=JabRef에 기부하기
@@ -268,6 +259,7 @@ Downloaded\ website\ as\ an\ HTML\ file.=웹사이트를 HTML 파일로 다운
 duplicate\ removal=중복 제거
 
 
+
 Duplicate\ string\ name=문자열 이름 중복
 
 Duplicates\ found=중복 발견
@@ -322,19 +314,22 @@ Exporting=내보내는 중
 Extension=확장 프로그램
 
 
-External\ file\ links=외부 파일 링크
-
 External\ programs=외부 프로그램
 
 Failed\ to\ import\ by\ ID=아이디로 가져오지 못했습니다.
 
 Field=필드
-
 field=필드
 
 Field\ name=필드명
-
+Field\ names=필드 이름
 Field\ names\ are\ not\ allowed\ to\ contain\ white\ spaces\ or\ certain\ characters\ (%0).=필드 이름에는 공백이나 특정 문자를 사용할 수 없습니다 (%0)
+Add\ new\ field\ name=새 필드 이름 추가
+Field\ name\ "%0"\ already\ exists=필드 이름 "%0"이 이미 존재합니다
+No\ field\ name\ selected\!=필드 이름을 선택하지 않았습니다
+Remove\ field\ name=필드 이름 제거
+Are\ you\ sure\ you\ want\ to\ remove\ field\ name\:\ "%0"?=필드 "%0"을 제거하시겠습니까?
+Manage\ field\ names\ &\ content=필드 이름 및 콘텐츠 관리
 
 Field\ to\ group\ by=필드를 그룹화 하다
 
@@ -459,6 +454,8 @@ Journal\ abbreviations=저널 약어
 Journal\ lists\:=저널 목록\:
 Remove\ journal\ '%0'=저널 '%0' 제거
 
+
+
 Keep\ both=둘 다 유지
 
 Keep\ subgroups=하위 그룹 유지
@@ -483,20 +480,15 @@ LaTeX\ AUX\ file\:=LaTeX AUX 파일\:
 
 Link=링크
 Listen\ for\ remote\ operation\ on\ port=포트에서 원격 작업 수신
-Load\ and\ Save\ preferences\ from/to\ jabref.xml\ on\ start-up\ (memory\ stick\ mode)=시작 시 jabref.xml에서 환경 설정 로드 및 저장(메모리 스틱 모드)
 
 Show\ advanced\ hints\ (i.e.\ helpful\ tooltips,\ suggestions\ and\ explanation)=상급 힌트 표시(예\: 유용한 툴팁, 제안 및 설명)
 
-Main\ file\ directory=기본 파일 디렉토리
-
 Manage\ custom\ exports=사용자 지정 내보내기 관리
 
 Manage\ custom\ imports=사용자 지정 가져오기 관리
 
 Mark\ new\ entries\ with\ owner\ name=소유자 이름으로 새 항목 표시
 
-Memory\ stick\ mode=메모리 스틱 모드
-
 Merged\ external\ changes=병합된 외부 변경 사항
 Merge\ fields=필드 병합
 
@@ -569,7 +561,6 @@ Open\ editor\ when\ a\ new\ entry\ is\ created=새 항목이 생성되면 편집
 
 Open\ file=파일 열기
 
-Open\ last\ edited\ libraries\ at\ startup=시작 시 마지막으로 편집한 라이브러리 열기
 
 Connect\ to\ shared\ database=공유 데이터베이스와 연결
 
@@ -584,8 +575,6 @@ Operating\ System\ (Provides\ for\ better\ recommendations\ by\ giving\ an\ indi
 
 Optional\ fields=부가적 항목
 
-Options=옵션
-
 or=또는
 
 Override\ default\ file\ directories=기본 파일 디렉토리 재정의
@@ -722,7 +711,6 @@ Review=검토
 Review\ changes=변경 사항 검토
 Review\ Field\ Migration=필드 마이그레이션 검토
 
-
 Save=저장
 Save\ all\ finished.=모든 라이브러리 저장 완료
 Save\ all\ open\ libraries=열려 있는 모든 라이브러리 저장
@@ -744,7 +732,6 @@ Refuse\ to\ save\ the\ library\ before\ external\ changes\ have\ been\ reviewed.
 Library\ protection=라이브러리 보호
 Unable\ to\ save\ library=라이브러리를 저장할 수 없습니다
 
-Always\ reformat\ BIB\ file\ on\ save\ and\ export=저장 및 내보낼 때 항상 BIB 파일 다시 포맷
 Character\ encoding\ '%0'\ is\ not\ supported.=문자 인코딩 '%0'은 지원되지 않습니다.
 
 Search=검색
@@ -806,6 +793,9 @@ Show\ BibTeX\ source\ by\ default=기본적으로 BibTeX 소스 표시
 
 Show\ confirmation\ dialog\ when\ deleting\ entries=항목을 삭제할 때 확인 대화 상자 표시
 
+
+
+
 Show\ last\ names\ only=성만 표시
 
 Show\ names\ unchanged=변경되지 않은 이름 표시
@@ -890,6 +880,7 @@ Value\ cleared\ externally=외부에서 값이 지워짐
 View=보기
 Vim\ server\ name=Vim 서버 이름
 
+
 Warn\ about\ unresolved\ duplicates\ when\ closing\ inspection\ window=검사 창을 닫을 때 해결되지 않은 중복에 대해 경고
 
 Warn\ before\ overwriting\ existing\ keys=기존 키를 덮어쓰기 전에 경고 띄우기
@@ -987,7 +978,6 @@ You\ must\ enter\ an\ integer\ value\ in\ the\ interval\ 1025-65535=1025-65535 
 Autocomplete\ names\ in\ 'Firstname\ Lastname'\ format\ only='이름 성' 형식의 이름만 자동 완성
 Autocomplete\ names\ in\ 'Lastname,\ Firstname'\ format\ only='성, 이름' 형식의 이름만 자동 완성
 Autocomplete\ names\ in\ both\ formats=두 형식의 이름 자동 완성
-Send\ as\ email=이메일로 보내기
 References=레퍼런스
 Sending\ of\ emails=이메일 전송
 Subject\ for\ sending\ an\ email\ with\ references=참조를 포함한 이메일 전송 대상
@@ -1054,7 +1044,6 @@ Please\ choose\ which\ one\ to\ connect\ to\:=연결할 것을 선택하십시
 Choose\ OpenOffice/LibreOffice\ executable=OpenOffice/LibreOffice 실행 파일 선택
 Select\ document=문서 선택
 HTML\ list=HTML 목록
-If\ possible,\ normalize\ this\ list\ of\ names\ to\ conform\ to\ standard\ BibTeX\ name\ formatting=가능한 경우 표준 BibTeX 이름 형식을 준수하도록 이 이름 목록을 정규화하십시오.
 Could\ not\ open\ %0=%0을 열 수 없습니다
 Unknown\ import\ format=알 수 없는 가져오기 형식
 Style\ selection=스타일 선택
@@ -1124,7 +1113,6 @@ Four\ stars=별 4개
 Five\ stars=별 5개
 Help\ on\ special\ fields=특수 분야에 대한 도움말
 Keywords\ of\ selected\ entries=선택한 항목의 키워드
-Manage\ content\ selectors=콘텐츠 선택기 관리
 Content\ selectors=콘텐츠 선택기
 Manage\ keywords=키워드 관리
 No\ priority\ information=우선순위에 대한 정보가 없습니다
@@ -1154,7 +1142,6 @@ Error\ message\:=오류 메시지\:
 If\ a\ pasted\ or\ imported\ entry\ already\ has\ the\ field\ set,\ overwrite.=붙여넣거나 가져온 항목에 이미 필드 세트가 있는 경우 덮어씁니다.
 Not\ connected\ to\ any\ Writer\ document.\ Please\ make\ sure\ a\ document\ is\ open,\ and\ use\ the\ 'Select\ Writer\ document'\ button\ to\ connect\ to\ it.=Writer 문서에 연결되어 있지 않습니다. 문서가 열려 있는지 확인하고 '작성자 문서 선택' 버튼을 사용하여 문서에 연결하십시오.
 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.=메모리 스틱 모드를 비활성화하려면 JabRef와 동일한 폴더에서 jabref.xml 파일의 이름을 바꾸거나 제거하십시오.
 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 파일 위치를 사용하십시오.
@@ -1189,7 +1176,6 @@ Please\ specify\ a\ password=비밀번호를 지정해주세요
 Proxy\ configuration=프록시 구성
 Use\ custom\ proxy\ configuration=사용자 지정 프록시 구성 사용
 Proxy\ requires\ authentication=프록시에 인증이 필요합니다.
-Attention\:\ Password\ is\ stored\ in\ plain\ text\!=주의\: 비밀번호는 일반 텍스트로 저장됩니다\!
 Clear\ connection\ settings=연결 설정 지우기
 Check\ Proxy\ Setting=프록시 설정 확인
 Check\ connection=연결 확인
@@ -1201,7 +1187,6 @@ Open\ folder=폴더 열기
 Export\ sort\ order=정렬 순서 내보내기
 Save\ sort\ order=정렬 순서 저장
 
-Keep\ original\ order=원래 순서 유지
 Use\ current\ table\ sort\ order=현재 테이블 정렬 순서 사용
 Use\ specified\ order=지정된 순서 사용
 Show\ extra\ columns=추가 열 표시
@@ -1257,6 +1242,7 @@ Deleted\ entry=엔트리 삭제됨
 Modified\ groups\ tree=수정된 그룹
 Removed\ all\ groups=모든 그룹을 제거했습니다.
 Select\ export\ format=내보내기 형식 선택
+
 Could\ not\ connect\ to\ %0=%0에 연결할 수 없습니다
 Warning\:\ %0\ out\ of\ %1\ entries\ have\ undefined\ title.=경고\: %1 목록에 있는 %0가 정의되지 않은 제목을 가지고 있음
 Warning\:\ %0\ out\ of\ %1\ entries\ have\ undefined\ citation\ key.=경고\: %1 목록에 있는 %0가 정의되지 않은 인용 키를 가지고 있음
@@ -1264,6 +1250,8 @@ Warning\:\ %0\ out\ of\ %1\ entries\ have\ undefined\ DOIs.=경고\: %1 목록
 Really\ delete\ the\ selected\ entry?=선택한 항목을 제거하시겠습니까?
 Really\ delete\ the\ %0\ selected\ entries?=선택한 항목 %0을 제거하시겠습니까?
 
+On\ disk=디스크에
+
 Keep\ left=왼쪽 항목 유지
 Keep\ right=오른쪽 항목 유지
 Old\ entry=이전 항목
@@ -1307,7 +1295,6 @@ New\ mastersthesis=새 석사 논문
 New\ phdthesis=새 박사 논문
 New\ proceedings=새로운 절차
 New\ unpublished=게시되지 않은 새 항목
-Preamble\ editor,\ store\ changes=서문 편집기, 변경 사항 저장
 Push\ to\ application=애플리케이션에 푸시
 Refresh\ OpenOffice/LibreOffice=OpenOffice/LibreOffice 새로 고침
 Resolve\ duplicate\ citation\ keys=중복 인용 키 해결
@@ -1415,7 +1402,9 @@ Does\ nothing.=아무것도 안합니다.
 Identity=아이덴티티
 Clears\ the\ field\ completely.=필드를 완전히 지웁니다.
 Directory\ not\ found=디렉토리 찾지 못함.
-Main\ file\ directory\ not\ set.\ Check\ the\ preferences\ (linked\ files)\ or\ the\ library\ properties.=기본 파일 디렉토리가 설정되지 않았습니다. 환경 설정(링크된 파일) 또는 라이브러리 속성을 확인하십시오.
+
+Main\ file\ directory=기본 파일 디렉토리
+
 This\ operation\ requires\ exactly\ one\ item\ to\ be\ selected.=이 작업을 수행하려면 정확히 하나의 항목을 선택해야 합니다.
 Opening\ large\ number\ of\ files=많은 양의 파일 열기
 You\ are\ about\ to\ open\ %0\ files.\ Continue?=%0개의 파일을 열려고 합니다. 계속하시겠습니까?
@@ -1470,6 +1459,7 @@ Verse=절
 change\ entries\ of\ group=그룹 항목 변경
 odd\ number\ of\ unescaped\ '\#'=이스케이프 처리되지 않은 '\#'의 홀수
 
+
 Show\ diff=차이점 표시
 Copy\ Version=버전 복사
 Maintainers=관리자
@@ -1489,7 +1479,6 @@ Message=메시지
 
 
 MathSciNet\ Review=MathSciNet 리뷰
-Reset\ Bindings=바인딩 재설정
 
 Decryption\ not\ supported.=암호 해독이 지원되지 않습니다.
 
@@ -1525,7 +1514,6 @@ Found\ overlapping\ ranges=겹치는 범위를 찾았습니다.
 Found\ touching\ ranges=접촉 범위를 찾았습니다.
 
 Note\:\ Use\ the\ placeholder\ %DIR%\ for\ the\ location\ of\ the\ opened\ library\ file.=참고\: 열린 라이브러리 파일의 위치에 플레이스홀더 %DIR%를 사용하십시오.
-Error\ occured\ while\ executing\ the\ command\ "%0".="%0" 명령 실행 중 에러 발생
 Reformat\ ISSN=ISSN 다시 포맷
 
 Countries\ and\ territories\ in\ English=영어로 된 국가 및 지역
@@ -1851,12 +1839,6 @@ Select\ the\ entries\ to\ be\ imported\:=가져온 목록 선택
 Add\ new\ String=문자열 추가
 Must\ not\ be\ empty\!=비워둘 수 없습니다\!
 Open\ Help\ page=도움말 열기
-Add\ new\ field\ name=새 필드 이름 추가
-Field\ name\:=필드 이름\: 
-Field\ name\ "%0"\ already\ exists=필드 이름 "%0"이 이미 존재합니다
-No\ field\ name\ selected\!=필드 이름을 선택하지 않았습니다
-Remove\ field\ name=필드 이름 제거
-Are\ you\ sure\ you\ want\ to\ remove\ field\ name\:\ "%0"?=필드 "%0"을 제거하시겠습니까?
 Add\ new\ keyword=새 키워드 추가
 Keyword\:=키워드\:
 Keyword\ "%0"\ already\ exists=키워드 "%0"이 이미 존재합니다
@@ -1866,7 +1848,6 @@ Are\ you\ sure\ you\ want\ to\ remove\ keyword\:\ "%0"?=키워드 "%0"을 제거
 Reset\ to\ default=기본값으로 되돌리기
 Export\ all\ entries=모든 항목 내보내기
 Generate\ citation\ keys=인용 키 생성
-Manage\ field\ names\ &\ content=필드 이름 및 콘텐츠 관리
 New\ library=새 라이브러리
 OpenOffice/LibreOffice=OpenOffice/LibreOffice
 Open\ document\ viewer=문서 뷰어 열기
@@ -1938,13 +1919,8 @@ Add\ formatter\ to\ list=목록에 포맷터 추가
 Filter\ List=필터 목록
 Open\ files...=파일 열기...
 
-Affected\ fields\:=영향을 받는 필드\:
 Show\ preview\ as\ a\ tab\ in\ entry\ editor=항목 편집기에서 탭으로 미리보기 표시
-Font=글자 크기
 Visual\ theme=테마
-Light\ theme=밝은 테마
-Dark\ theme=어두운 테마
-Custom\ theme=사용자 지정 테마
 Overwrite\ existing\ keys=기존 키 덮어쓰기
 Key\ patterns=키 패턴
 Font\ settings=글자 크기 설정
@@ -1963,7 +1939,6 @@ Reset\ All=전체 초기화
 Linked\ identifiers=연결된 식별자
 
 insert\ entries=항목 삽입
-On\ disk=디스크에
 
 Independent=무소속
 Intersection=교차로
@@ -2172,7 +2147,6 @@ Display\ count\ of\ items\ in\ group=그룹의 항목 수 표시
 Remove\ the\ following\ characters\:=다음 문자를 제거합니다.
 Truncate=생략
 Truncates\ a\ string\ after\ a\ given\ index.=주어진 인덱스 뒤에 있는 문자열을 생략합니다.
-Close=닫기
 Close\ all=모두 닫기
 Close\ all\ libraries=모든 라이브러리 닫기
 Close\ other\ libraries=다른 라이브러리 닫기
@@ -2193,7 +2167,6 @@ Next\ preview\ style=다음 미리보기 스타일
 Previous\ preview\ style=이전 미리보기 스타일
 
 (\ Note\:\ Press\ return\ to\ commit\ changes\ in\ the\ table\!\ )=( 참고\: 테이블의 변경 사항을 커밋하려면 return 키를 누르십시오\! )
-Reset=초기화
 New\ inproceedings=새로운 절차
 Reset\ entry\ types\ and\ fields\ to\ defaults=항목 유형 및 필드를 기본값으로 재설정
 This\ will\ reset\ all\ entry\ types\ to\ their\ default\ values\ and\ remove\ all\ custom\ entry\ types=이렇게 하면 모든 항목 유형이 기본값으로 재설정되고 모든 사용자 정의 항목 유형이 제거됩니다.
@@ -2223,7 +2196,7 @@ Separate\ citations=별도 인용문
 Unprotect\ terms=약관 보호 해제
 
 Generate\ a\ new\ key\ for\ imported\ entries\ (overwriting\ their\ default)=가져온 항목에 대한 새 키 생성(기본값 덮어쓰기)
-Import\ and\ Export=가져오기 및 내보내기
+
 Custom\ DOI\ URI=사용자 지정 DOI URI
 Use\ custom\ DOI\ base\ URI\ for\ article\ access=기사 접근을 위해 사용자 정의 DOI 기본 URI 사용
 
@@ -2256,13 +2229,10 @@ File\ '%1'\ is\ a\ duplicate\ of\ '%0'.\ Keeping\ both\ due\ to\ deletion\ error
 Enable\ field\ formatters=필드 포맷터 활성화
 Entry\ Type=목록 유형
 Entry\ types=목록 유형들
-Field\ names=필드 이름
 Others=기타
 Recommended=권장
 
 Authors\ and\ Title=작가와 제목
-Database=데이터베이스
-Databases=데이터베이스
 Add\ Author\:=작가 추가\:
 Add\ Query\:=쿼리 추가하기
 Add\ Research\ Question\:=연구 질문 추가\:
@@ -2324,3 +2294,9 @@ This\ could\ indicate\ that\ JabRef\ did\ not\ shut\ down\ cleanly\ last\ time\
 
 
 
+
+
+
+
+
+
diff --git a/src/main/resources/l10n/JabRef_nl.properties b/src/main/resources/l10n/JabRef_nl.properties
index 38cc8bd8756..baa0926494d 100644
--- a/src/main/resources/l10n/JabRef_nl.properties
+++ b/src/main/resources/l10n/JabRef_nl.properties
@@ -1,34 +1,39 @@
-Could\ not\ delete\ empty\ entries.=Kan lege invoer niet verwijderen.
+Proxy\ requires\ password=Proxy vereist wachtwoord
 
-
-
-
-
-%0\ contains\ the\ regular\ expression\ <b>%1</b>=%0 bevat de standaard-uitdruk <b>%1</b>
+Unable\ to\ monitor\ file\ changes.\ Please\ close\ files\ and\ processes\ and\ restart.\ You\ may\ encounter\ errors\ if\ you\ continue\ with\ this\ session.=Kan bestandswijzigingen niet bijhouden. Sluit bestanden en processen en start opnieuw. U kan fouten tegenkomen als u verder gaat met deze sessie.
+%0\ contains\ the\ regular\ expression\ <b>%1</b>=%0 bevat de reguliere expressie <b>%1</b>
 
 %0\ contains\ the\ term\ <b>%1</b>=%0 bevat de term <b>%1</b>
 
-%0\ doesn't\ contain\ the\ regular\ expression\ <b>%1</b>=%0 bevat de standaard-uitdruk <b>%1</b> niet
+%0\ doesn't\ contain\ the\ regular\ expression\ <b>%1</b>=%0 bevat de reguliere espressie <b>%1</b> niet
 
 %0\ doesn't\ contain\ the\ term\ <b>%1</b>=%0 bevat de term <b>%1</b> niet
 
+%0/%1\ entries=%0/%1 items
 
+Export\ operation\ finished\ successfully.=Export actie succesvol afgerond.
 
+Reveal\ in\ File\ Explorer=Toon in Verkenner
 
 %0\ matches\ the\ regular\ expression\ <b>%1</b>=%0 komt overeen met de standaard-uitdruk <b>%1</b>
 
 %0\ matches\ the\ term\ <b>%1</b>=%0 komt overeen met de term <b>%1</b>
 
+Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (DEFAULT\ abbreviation)=Kort tijdschriftnamen van de geselecteerde items af (DEFAULT afkorting)
+Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (DOTLESS\ abbreviation)=Kort tijdschriftnamen van de geselecteerde items af (DOTLESS afkorting)
+Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (SHORTEST\ UNIQUE\ abbreviation)=Kort tijdschriftnamen van de geselecteerde items af (SHORTEST UNIQUE afkorting)
 
 Abbreviate\ names=Namen afkorten
-Abbreviated\ %0\ journal\ names.=Afgekorte %0 logboek namen.
+Abbreviated\ %0\ journal\ names.=Afgekorte %0 tijdschrift namen.
 
 Abbreviation=Afkorting
 Abbreviations=Afkortingen
 
 Unabbreviate\ journal\ names\ of\ the\ selected\ entries=Maak afkortingen van tijdschriftnamen van geselecteerde entries ongedaan
-Unabbreviated\ %0\ journal\ names.=Onverkorte %0 logboek namen.
+Unabbreviated\ %0\ journal\ names.=Niet-afgekorte %0 tijdschrift namen.
 
+dotless=zonder punt
+shortest\ unique=kortste unieke
 
 About\ JabRef=Over JabRef
 
@@ -47,17 +52,20 @@ The\ path\ need\ not\ be\ on\ the\ classpath\ of\ JabRef.=Het pad moet niet in h
 
 Add\ a\ regular\ expression\ for\ the\ key\ pattern.=Een reguliere expressie voor het belangrijkste patroon toevoegen.
 
+Add\ entry\ manually=Invoer handmatig toevoegen
 
-Add\ selected\ entries\ to\ this\ group=De geselecteerde invoergegevens toevoegen aan deze groep
+Add\ selected\ entries\ to\ this\ group=Geselecteerde items toevoegen aan deze groep
 
 Add\ subgroup=Voeg subgroep toe
 
 Added\ group\ "%0".=Toegevoegde groep "%0".
 
+Added\ string\:\ '%0'=Tekenreeks toegevoegd\: '%0'
 Added\ string=Toegevoegde tekenreeks
 
-All\ entries=Alle invoergegevens
+All\ entries=Alle items
 
+Also\ remove\ subgroups=Ook subgroepen verwijderen
 
 and=en
 
@@ -79,8 +87,11 @@ Assigned\ %0\ entries\ to\ group\ "%1".=%0 invoergegevens aan groep "%1" toegewe
 
 Assigned\ 1\ entry\ to\ group\ "%0".=1 invoer aan groep "%0" toegewezen.
 
+Autogenerate\ citation\ keys=Genereer automatisch citaat sleutels
 
+Autolink\ files\ with\ names\ starting\ with\ the\ citation\ key=Bestanden automatisch koppelen met namen beginnend met de citaatsleutel
 
+Autolink\ only\ files\ that\ match\ the\ citation\ key=Alleen bestanden automatisch koppelen die overeenkomen met de citaatsleutel
 
 Automatically\ create\ groups=Groepen automatisch aanmaken
 
@@ -129,6 +140,7 @@ Change\ of\ Grouping\ Method=Wijzig groepering methode
 
 change\ preamble=wijzig inleiding
 
+Changed\ language=Gewijzigde taal
 
 Changed\ preamble=Gewijzigde inleiding
 
@@ -136,6 +148,7 @@ Cite\ command=Citeer opdracht
 
 Clear=Wissen
 
+Open\ /\ close\ entry\ editor=Editor openen / sluiten
 
 Close\ dialog=Sluit dialoog
 
@@ -155,7 +168,12 @@ Copied=Gekopieerd
 Copy=Kopiëren
 
 Copy\ title=Titel kopiëren
+Copy\ \\cite{citation\ key}=Kopieer \\cite{citation key}
+Copy\ citation\ (html)=Kopieer citaat (html)
+Copy\ citation\ (text)=Kopieer citaat (tekst)
 Copy\ citation\ key=Kopiëer citatiesleutel
+Copy\ citation\ key\ and\ link=Kopieer citaat sleutel en link
+Copy\ citation\ key\ and\ title=Kopieer citaat sleutel en titel
 
 Copy\ to\ clipboard=Kopiëren naar klembord
 
@@ -180,7 +198,9 @@ Create\ custom\ fields\ for\ each\ BibTeX\ entry=Maak aangepaste velden voor elk
 
 crossreferenced\ entries\ included=inclusief kruisgerefereerde invoergegevens
 
+Current\ content\:\ %0=Huidige inhoud\: %0
 
+Current\ value\:\ %0=Huidige waarde\: %0
 
 Custom\ entry\ types=Aangepaste invoertypes
 
@@ -194,17 +214,22 @@ Cut=Knippen
 
 cut\ entries=invoergegevens knippen
 
+cut\ entry\ %0=invoer knippen %0
 
 Library\ encoding=Bibliotheek codering
 
 Library\ properties=Bibliotheek eigenschappen
+%0\ -\ Library\ properties=%0 - Eigenschappen bibliotheek
 
 Default=Standaard
 
+Character\ encoding\ UTF-8\ is\ not\ supported.=Tekencodering UTF-8 wordt niet ondersteund.
+UTF-8\ could\ not\ be\ used\ to\ encode\ the\ following\ characters\:\ %0=UTF-8 kon niet worden gebruikt om de volgende tekens te coderen\: %0
 The\ chosen\ encoding\ '%0'\ could\ not\ encode\ the\ following\ characters\:=De gekozen codering '%0' kan de volgende tekens niet coderen\:
 
 Downloading=Downloaden
 
+Execute\ default\ action\ in\ dialog=Standaardactie uitvoeren in dialoogvenster
 
 Delete=Verwijderen
 
@@ -220,12 +245,15 @@ Descending=Afdalend
 
 Description=Beschrijving
 
+Do\ not\ ask\ again=Niet meer vragen
 
+Display\ all\ entries\ belonging\ to\ one\ or\ more\ of\ the\ selected\ groups=Toon alle items die tot een of meer van de geselecteerde groepen behoren
 
 Display\ all\ error\ messages=Toon alle foutmeldingen
 
 Display\ help\ on\ command\ line\ options=Toon help over commandline opties
 
+Display\ only\ entries\ belonging\ to\ all\ selected\ groups=Toon alleen items die tot alle geselecteerde groepen behoren
 Display\ version=Display versie
 
 Do\ not\ abbreviate\ names=Namen niet afkorten
@@ -233,25 +261,31 @@ Do\ not\ abbreviate\ names=Namen niet afkorten
 
 Do\ not\ open\ any\ files\ at\ startup=Geen bestanden openen bij het opstarten
 
-Do\ not\ wrap\ the\ following\ fields\ when\ saving=De volgende velden niet bij het opslaan afbreken
+Do\ not\ wrap\ when\ saving=Bij het opslaan niet inpakken
+
+Do\ not\ write\ the\ following\ fields\ to\ XMP\ Metadata=Schrijf de volgende velden niet naar XMP Metadata
 
 Donate\ to\ JabRef=Doneer aan JabRef
 
 Download\ file=Download bestand
 
+Downloaded\ website\ as\ an\ HTML\ file.=Gedownloade website als een HTML-bestand.
 
 duplicate\ removal=duplicaten verwijderen
 
+Duplicate\ fields=Dupliceer velden
+
+Unable\ to\ change\ field\ name.\ "%0"\ already\ in\ use.=Kan veldnaam niet wijzigen. "%0" is al in gebruik.
 
 Duplicate\ string\ name=Dubbele tekenreeksnaam
 
 Duplicates\ found=Duplicaten gevonden
 
-Dynamically\ group\ entries\ by\ a\ free-form\ search\ expression=Dynamisch invoergegevens groeperen door een "vrije vorm" zoek expressie
+Dynamically\ group\ entries\ by\ a\ free-form\ search\ expression=Dynamisch items groeperen door een "free-form" zoekexpressie
 
-Dynamically\ group\ entries\ by\ searching\ a\ field\ for\ a\ keyword=Dynamisch invoergegevens groeperen door een veld te zoeken via een sleutelwoord
+Dynamically\ group\ entries\ by\ searching\ a\ field\ for\ a\ keyword=Dynamisch items groeperen door een veld te zoeken via een sleutelwoord
 
-Each\ line\ must\ be\ of\ the\ following\ form\:\ 'tab\:field1;field2;...;fieldN'.=Elke regel moet zo geformuleerd zijn\: 'tab\:veld1;veld2;...;veldN'.
+Each\ line\ must\ be\ of\ the\ following\ form\:\ 'tab\:field1;field2;...;fieldN'.=Elke regel moet van het volgende formaat zijn\: 'tab\:veld1;veld2;...;veldN'.
 
 Edit=Bewerken
 
@@ -268,43 +302,53 @@ Enter\ URL\ to\ download=Geef URL om te downloaden in
 
 entries=invoergegevens
 
-Entries\ exported\ to\ clipboard=Invoergegevens geëxporteerd naar het klembord
+Entries\ exported\ to\ clipboard=Items geëxporteerd naar het klembord
 
 entry=invoer
 
 Entry\ editor=Invoerbewerker
 
+Entry\ owner=Item eigenaar
 
 Entry\ preview=Invoervoorbeeld
 
 Entry\ table=Entry tabel
 Entry\ table\ columns=Invoertabel kolommen
+Entry\ Title\ (Required\ to\ deliver\ recommendations.)=Item titel (Vereist om aanbevelingen af te leveren.)
 Error=Foutmelding
 Error\ occurred\ when\ parsing\ entry=Foutmelding bij het ontleden van de invoer
 Error\ opening\ file=Foutmelding bij het openen van het bestand
 Error\ while\ writing=Foutmelding bij het schrijven
+Error\ during\ persistence\ of\ crawling\ results.=Fout tijdens persistentie van crawl-resultaten.
+Error\ during\ reading\ of\ study\ definition\ file.=Fout tijdens het lezen van het studiedefinitiebestand.
 '%0'\ exists.\ Overwrite\ file?='%0' bestaat reeds. Bestand overschrijven?
 Export=Exporteren
 Export\ preferences=Voorkeuren exporteren
-Export\ preferences\ to\ file=Voorkeuren exporteren naar bestand
+Export\ preferences\ to\ file=Instellingen exporteren naar bestand
 Export\ to\ clipboard=Exporteer naar klembord
 Export\ to\ text\ file.=Exporteer naar tekstbestand.
 Exporting=Exporteren...
 Extension=Extensie
 
-
-External\ file\ links=Externe bestand links
+External\ Changes\ Resolver=Externe Wijzigingen Oplossen
 
 External\ programs=Externe programma's
 
+Failed\ to\ import\ by\ ID=Importeren via ID mislukt
 
 Field=Veld
-
 field=veld
 
 Field\ name=Veldnaam
-
+Field\ names=Veld namen
 Field\ names\ are\ not\ allowed\ to\ contain\ white\ spaces\ or\ certain\ characters\ (%0).=Veldnamen mogen geen spaties of speciale tekens bevatten (%0).
+New\ field\ name=Nieuwe veldnaam
+Add\ new\ field\ name=Voeg nieuwe veldnaam toe
+Field\ name\ "%0"\ already\ exists=Veldnaam "%0" bestaat al
+No\ field\ name\ selected\!=Geen veldnaam geselecteerd\!
+Remove\ field\ name=Verwijder veldnaam
+Are\ you\ sure\ you\ want\ to\ remove\ field\ name\:\ "%0"?=Weet u zeker dat u de veldnaam wilt verwijderen\: "%0"?
+Manage\ field\ names\ &\ content=Beheer veldnamen & inhoud
 
 Field\ to\ group\ by=Veld te groeperen op
 
@@ -321,6 +365,10 @@ Filter=Filteren
 
 Filter\ groups=Filter groepen
 
+Success\!\ Finished\ writing\ metadata.=Gelukt\! Metagegevens schrijven voltooid.
+Finished\ writing\ metadata\ for\ %0\ file\ (%1\ skipped,\ %2\ errors).=Klaar met het schrijven van metadata voor %0 bestand (%1 overgeslagen, %2 fouten).
+Error\ while\ writing\ metadata.\ See\ the\ error\ log\ for\ details.=Fout tijdens het schrijven van metadata. Bekijk het foutenlogboek voor meer informatie.
+Failed\ to\ write\ metadata,\ file\ %1\ not\ found.=Kon metagegevens niet schrijven, bestand %1 niet gevonden.
 
 First\ select\ the\ entries\ you\ want\ keys\ to\ be\ generated\ for.=Selecteer eerst de invoergegevens waarvoor u sleutels wilt genereren.
 
@@ -333,12 +381,13 @@ Format\ of\ author\ and\ editor\ names=Formaat van de auteur- en editornamen
 Format\ string=Tekenreeks opmaak
 
 Format\ used=Formaat gebruikt
-Formatter\ name=Naam van de opmaak
+Formatter\ name=Naam van de formatteerder
 
 found\ in\ AUX\ file=gevonden in AUX bestand
 
 Fulltext\ for=Volledige tekst voor
 
+Further\ information\ about\ Mr.\ DLib\ for\ JabRef\ users.=Meer informatie over Mr DLib. voor JabRef gebruikers.
 
 General=Algemeen
 
@@ -408,19 +457,51 @@ Include\ subgroups\:\ When\ selected,\ view\ entries\ contained\ in\ this\ group
 Independent\ group\:\ When\ selected,\ view\ only\ this\ group's\ entries=Onafhankelijke groep\: Wanneer geselecteerd, toon enkel de invoergegevens van deze groep
 I\ Agree=Ik ga akkoord
 
+Indexing\ pdf\ files=Pdf bestanden indexeren
+Indexing\ for\ %0=Indexeren voor %0
+%0\ of\ %1\ linked\ files\ added\ to\ the\ index=%0 van %1 gelinkte bestanden toegevoegd aan de index
 
 Invalid\ citation\ key=Ongeldige citatiesleutel
 
 Invalid\ URL=Ongeldige URL
 
 Online\ help=Online hulp
+JabRef\ Language\ (Provides\ for\ better\ recommendations\ by\ giving\ an\ indication\ of\ user's\ preferred\ language.)=JabRef taal (biedt betere aanbevelingen door een indicatie te geven van de voorkeurstaal van de gebruiker.)
 
 JabRef\ preferences=JabRef voorkeuren
-
-Journal\ abbreviations=Logboek afkortingen
+JabRef\ requests\ recommendations\ from\ Mr.\ DLib,\ which\ is\ an\ external\ service.\ To\ enable\ Mr.\ DLib\ to\ calculate\ recommendations,\ some\ of\ your\ data\ must\ be\ shared\ with\ Mr.\ DLib.\ Generally,\ the\ more\ data\ is\ shared\ the\ better\ recommendations\ can\ be\ calculated.\ However,\ we\ understand\ that\ some\ of\ your\ data\ in\ JabRef\ is\ sensitive,\ and\ you\ may\ not\ want\ to\ share\ it.\ Therefore,\ Mr.\ DLib\ offers\ a\ choice\ of\ which\ data\ you\ would\ like\ to\ share.=JabRef vraagt aanbevelingen van Mr. DLib, een externe dienst. Om Mr. DLib in te schakelen voor het berekenen van aanbevelingen, moeten sommige van uw gegevens worden gedeeld met Mr. DLib. Over het algemeen, als meer gegevens worden gedeeld worden betere aanbevelingen berekend. We begrijpen echter dat sommige van uw gegevens in JabRef gevoelig zijn, en misschien wilt u ze niet delen. Daarom biedt Mr. DLib een keuze aan welke gegevens u wilt delen.
+JabRef\ Version\ (Required\ to\ ensure\ backwards\ compatibility\ with\ Mr.\ DLib's\ Web\ Service)=JabRef Versie (Vereist om achterwaarts compatibiliteit met de Mr. DLib's Web Service te garanderen)
+
+Journal\ abbreviations=Tijdschrift afkortingen
+Journal\ lists\:=Tijdschrift lijsten\:
+Remove\ journal\ '%0'=Verwijder tijdschrift '%0'
+
+Journal\ Information=Tijdschrift informatie
+Year=Jaar
+ISSN\ or\ journal\ name\ required\ for\ fetching\ journal\ information=ISSN of tijdschriftnaam vereist voor het ophalen van tijdschrift informatie
+Fetch\ journal\ information\ online\ to\ show=Tijdschriftinformatie online ophalen om te tonen
+Allow\ sending\ ISSN\ to\ a\ JabRef\ online\ service\ (SCimago)\ for\ fetching\ journal\ information=Sta het verzenden van ISSN naar een online JabRef dienst (SCimago) toe voor het ophalen van tijdschrift informatie
+Please\ enable\ journal\ information\ fetching\ in\ %0\ >\ %1=Schakel tijdschrift informatie ophalen in %0 > %1
+Categories=Categorieën
+ISSN=ISSN
+Publisher=Uitgever
+h-index=h-index
+Error\ while\ fetching\ journal\ information\:\ %0=Fout bij het ophalen van tijdschrift informatie\: %0
+ISSN\ and/or\ journal\ name\ not\ found\ in\ catalog=ISSN en/of tijdschrift naam niet gevonden in catalogus
+Citable\ Docs\ (Previous\ 3\ Years)=Citeerbare Docs (3 Voorgaande Jaren)
+Cites\ Incoming\ by\ Recently\ Published=Binnenkomende Citaties door Recent Gepubliceerde
+Cites\ Outgoing=Uitgaande Citaties
+Cites\ Outgoing\ per\ Document=Uitgaande Citaties per Document
+Docs\ (This\ Year)=Documentatie (Dit Jaar)
+Incorrect\ ISSN\ format=Onjuist ISSN-formaat
+Error\ accessing\ catalog=Fout bij toegang tot catalogus
+
+Check\ for\ latest\ version\ online=Controleer op de nieuwste online versie
+Please\ use\ the\ latest\ version\ of\ JabRef\ if\ you\ run\ into\ a\ bug.\ If\ you\ encounter\ an\ issue\ or\ a\ bug,\ check\ the\ latest\ version,\ if\ the\ issue\ is\ still\ present.=Gebruik de nieuwste versie van JabRef als je een bug tegenkomt. Als u een probleem of een bug tegenkomt, controleer dan de nieuwste versie, of het probleem nog steeds aanwezig is.
 
 Keep\ both=Beide behouden
 
+Keep\ subgroups=Behoud subgroepen
 
 Key\ bindings=Sleutel koppelingen
 
@@ -435,26 +516,26 @@ Keyword=Sleutelwoord
 Keywords=Trefwoorden
 
 Label=Label
+Label\:\ %0=Label\: %0
+Content\:\ %0=Inhoud\: %0
 Language=Taal
 
 Last\ modified=Laatst gewijzigd
+LaTeX\ AUX\ file\:=LaTeX AUX bestand\:
 
 Link=Link
 Listen\ for\ remote\ operation\ on\ port=Luister naar operatie vanop afstand op poort
-Load\ and\ Save\ preferences\ from/to\ jabref.xml\ on\ start-up\ (memory\ stick\ mode)=Laden en opstaan voorkeuren van/naar jabref.xml bij het opstarten (geheugenstick-modus)
+Memory\ stick\ mode\ -\ Store\ preferences\ in\ 'jabref.xml'\ in\ the\ app\ folder.=Geheugen stick modus - Sla voorkeuren op in 'jabref.xml' in de app map.
 
 Show\ advanced\ hints\ (i.e.\ helpful\ tooltips,\ suggestions\ and\ explanation)=Toon geavanceerde hints (bijv. nuttige tooltips, suggesties en uitleg)
 
-Main\ file\ directory=Hoofdbestand map
-
 Manage\ custom\ exports=Beheer externe exportfilters
 
 Manage\ custom\ imports=Beheer externe importfilters
+External\ file\ types=Externe bestandstypen
 
 Mark\ new\ entries\ with\ owner\ name=Markeer nieuwe entries met naam van eigenaar
 
-Memory\ stick\ mode=Geheugenstick-modus
-
 Merged\ external\ changes=Voeg externe veranderingen samen
 Merge\ fields=Velden samenvoegen
 
@@ -463,6 +544,7 @@ Modified\ group\ "%0".=Gewijzigde groep "%0".
 Modified\ groups=Gewijzigde groepen
 
 Modified\ string=Gewijzigde tekenreeks
+Modified\ string\:\ '%0' =Gewijzigde tekenreeks\: '%0'
 
 Modify=Wijzigen
 
@@ -470,14 +552,19 @@ move\ group=verplaats groep
 
 Moved\ group\ "%0".=Verplaatste Groep "%0".
 
+Mr.\ DLib\ Privacy\ settings=Mr. DLib privacy-instellingen
 
+No\ database\ is\ open=Er is geen database geopend
 
+We\ need\ a\ database\ to\ export\ from.\ Open\ one.=We hebben een database nodig om vanaf te exporteren. Open er een.
 
+No\ recommendations\ received\ from\ Mr.\ DLib\ for\ this\ entry.=Geen aanbevelingen ontvangen van Mr. DLib voor deze invoer.
 
+Error\ while\ fetching\ recommendations\ from\ Mr.DLib.=Fout bij het ophalen van aanbevelingen van Mr.DLib.
 
 Name=Naam
 
-Name\ formatter=Naam formateerder
+Name\ formatter=Naam formatteerder
 
 Natbib\ style=Natbib stijl
 
@@ -497,8 +584,9 @@ no\ library\ generated=geen bibliotheek gegenereerd
 No\ entries\ found.\ Please\ make\ sure\ you\ are\ using\ the\ correct\ import\ filter.=Geen invoergegevens gevonden. Zorg er a.u.b. voor dat u het juiste importfilter gebruikt.
 No\ files\ found.=Geen bestanden gevonden.
 
+No\ GUI.\ Only\ process\ command\ line\ options=Geen GUI. Alleen proces commandoregel opties
 
-No\ journal\ names\ could\ be\ abbreviated.=Er konden geen logboeknamen worden afgekort.
+No\ journal\ names\ could\ be\ abbreviated.=Er konden geen tijdschrift namen afgekort worden.
 
 No\ journal\ names\ could\ be\ unabbreviated.=Geen logboeknamen konden niet worden afgekort.
 
@@ -523,7 +611,7 @@ Open\ editor\ when\ a\ new\ entry\ is\ created=Open editor wanneer een nieuwe en
 
 Open\ file=Open bestand
 
-Open\ last\ edited\ libraries\ at\ startup=Laatst bewerkte bibliotheken openen bij het opstarten
+Open\ last\ edited\ libraries\ on\ startup=Open laatst bewerkte bibliotheken bij het opstarten
 
 Connect\ to\ shared\ database=Verbinding maken met de gedeelde database
 
@@ -534,11 +622,10 @@ Open\ URL\ or\ DOI=Open URL of DOI
 Opening=Aan het openen
 
 Operation\ canceled.=Operatie geannuleerd.
+Operating\ System\ (Provides\ for\ better\ recommendations\ by\ giving\ an\ indication\ of\ user's\ system\ set-up.)=Besturingssysteem (Voorziet betere aanbevelingen door een indicatie te geven van het systeem van de gebruiker.)
 
 Optional\ fields=Optionele velden
 
-Options=Opties
-
 or=of
 
 Override\ default\ file\ directories=Wijzig standaard bestandsmappen
@@ -553,7 +640,7 @@ Paste=Plakken
 
 paste\ entries=plak entries
 
-paste\ entry\ %0=plak entry %0
+paste\ entry\ %0=plak item %0
 
 Path\ to\ %0\ not\ defined=Pad naar %0 niet gedefinieerd
 
@@ -586,13 +673,17 @@ Next\ preview\ layout=Volgend lay-out voorbeeld
 Previous\ preview\ layout=Vorig lay-out voorbeeld
 Available=Beschikbaar
 Selected=Geselecteerd
+Selected\ Layouts\ can\ not\ be\ empty=Geselecteerde Layouts kunnen niet leeg zijn
+Reset\ default\ preview\ style=Reset standaard preview stijl
 Previous\ entry=Vorige invoer
 Problem\ with\ parsing\ entry=Probleem met ontleding invoer
 Processing\ %0=Verwerken %0
 Pull\ changes\ from\ shared\ database=Trek wijzigingen van de gedeelde database
+Problem\ finding\ files.\ See\ error\ log\ for\ details.=Probleem bij het vinden van bestanden. Zie foutenlogboek voor details.
 
 Pushed\ citations\ to\ %0=Citaten verplaatst naar %0
 
+Push\ applications=Verplaatsen naar applicaties
 
 Quit\ JabRef=JabRef afsluiten
 
@@ -620,24 +711,36 @@ Remove\ group=Verwijder groep
 
 Remove\ group\ and\ subgroups=Verwijder groep en subgroepen
 
+Remove\ groups\ and\ subgroups=Verwijder groepen en subgroepen
 
+Remove\ all\ selected\ groups\ and\ keep\ their\ subgroups?=Alle geselecteerde groepen verwijderen en hun subgroepen behouden?
 
+Remove\ group\ "%0"\ and\ keep\ its\ subgroups?=Verwijder groep "%0" en bewaar zijn subgroepen?
 
+Remove\ groups=Groepen verwijderen
 
+Removed\ all\ selected\ groups.=Alle geselecteerde groepen verwijderd.
 
 Remove\ group\ "%0"\ and\ its\ subgroups?=Verwijder groep "%0" en zijn subgroepen?
 
 Removed\ group\ "%0"\ and\ its\ subgroups.=Groep "%0" en zijn subgroepen verwijderd.
 
+Remove\ all\ selected\ groups\ and\ their\ subgroups?=Alle geselecteerde groepen en hun subgroepen verwijderen?
 
+Removed\ all\ selected\ groups\ and\ their\ subgroups.=Alle geselecteerde groepen en hun subgroepen zijn verwijderd.
 
+Remove\ group\ "%0"?=Groep verwijderen "%0"?
 
 Remove\ link=Verwijder link
 
+Remove\ string\ %0=Verwijder tekenreeks %0
 
 Removed\ group\ "%0".=Groep "%0" verwijderd.
 
+Deleted\ string=Tekenreeks verwijderd
+Deleted\ string\:\ '%0'=Tekenreeks verwijderd\: '%0'
 
+Renamed\ string\:\ '%0'=Tekenreeks hernoemd\: '%0'
 
 Replace=Vervangen
 Replace\ With\:=Vervangen Door\:
@@ -657,6 +760,7 @@ Replaces\ Unicode\ ligatures\ with\ their\ expanded\ form=Vervangt Unicode ligat
 
 Required\ fields=Vereiste velden
 
+Resolve\ BibTeX\ strings=BibTeX-tekenreeksen oplossen
 
 resolved=opgelost
 
@@ -664,12 +768,12 @@ Restart=Herstarten
 
 Restart\ required=Herstart vereist
 
+Return\ to\ dialog=Terug naar dialoogvenster
 
 Review=Herzien
 Review\ changes=Wijzigingen herzien
 Review\ Field\ Migration=Veldmigratie controleren
 
-
 Save=Opslaan
 Save\ all\ finished.=Opslaan en afsluiten.
 Save\ all\ open\ libraries=Sla alle geopende bibliotheken op
@@ -679,6 +783,7 @@ Save\ library\ as...=Bibliotheek opslaan als...
 Saving=Aan het opslaan
 Saving\ all\ libraries...=Alle bibliotheken opslaan...
 Saving\ library=Bibliotheek wordt opgeslagen
+Library\ saved=Bibliotheek opgeslagen
 Could\ not\ save\ file.=Kon het bestand niet opslaan.
 Could\ not\ save,\ file\ locked\ by\ another\ JabRef\ instance.=Kon niet opslaan, bestand vergrendeld door een ander JabRef exemplaar.
 Saved\ selected\ to\ '%0'.=Selectie opgeslagen naar '%0'.
@@ -686,36 +791,56 @@ Autosave\ local\ libraries=Automatisch opslaan lokale bibliotheken
 Automatically\ save\ the\ library\ to=Bibliotheek automatisch opslaan naar
 Please\ enter\ a\ valid\ file\ path.=Voer een geldig bestandspad in.
 Overwrite\ file=Bestand overschrijven
+Unable\ to\ write\ to\ %0.=Kan niet schrijven naar %0.
 
 Refuse\ to\ save\ the\ library\ before\ external\ changes\ have\ been\ reviewed.=Weigeren om de bibliotheek op te slaan voordaat externe wijzigingen zijn onderzocht.
 Library\ protection=Bibliotheek bescherming
 Unable\ to\ save\ library=Kan bibliotheek niet opslaan
 
-Always\ reformat\ BIB\ file\ on\ save\ and\ export=Formatteer BIB bestanden altijd op opslaan en exporteren
+Always\ reformat\ library\ on\ save\ and\ export=Hervorm bibliotheek altijd bij opslaan en exporteren
 Character\ encoding\ '%0'\ is\ not\ supported.=Tekencodering '%0' wordt niet ondersteund.
 
 Search=Zoeken
 Searching...=Zoeken...
+Finished\ Searching=Zoeken voltooid
 Search\ expression=Zoek expressie
+Fulltext\ search=Zoeken in de volledige tekst
 Help\ on\ regular\ expression\ search=Hulp bij het zoeken naar reguliere expsressies
 Searching\ for\ duplicates...=Aan het zoeken naar duplicaten...
 Searching\ for\ files=Zoeken naar bestanden
+The\ search\ is\ case-insensitive.=De zoekopdracht is hoofdletterongevoelig.
+The\ search\ is\ case-sensitive.=De zoekopdracht is hoofdlettergevoelig.
 Use\ regular\ expression\ search=Gebruik Regular Expression Zoekopdracht
 search\ expression=zoek expressie
+Free\ search\ expression=Vrije zoekexpressie
 Search\ failed\:\ illegal\ search\ expression=Zoeken mislukt\: verboden zoekformule
 No\ search\ matches.=Geen zoekovereenkomsten.
 Web\ search=Zoeken op het web
+Search\ results=Zoekresultaten
 Please\ enter\ a\ search\ string=Voer een zoekterm in
 Please\ open\ or\ start\ a\ new\ library\ before\ searching=Open of begin een nieuwe bibliotheek voordat u start met zoeken
+Please\ enter\ a\ field\ name\ to\ search\ for\ a\ keyword.=Voer een veldnaam in om te zoeken naar een trefwoord.
 No\ results\ found.=Geen resultaten gevonden.
 Found\ %0\ results.=%0 resultaten gevonden.
+Invalid\ regular\ expression=Ongeldige reguliere expressie
 This\ search\ contains\ entries\ in\ which\ any\ field\ contains\ the\ regular\ expression\ <b>%0</b>=Deze zoekopdracht bevat invoergegevens waarin elk veld de reguliere expressie <b>%0</b> bevat
 This\ search\ contains\ entries\ in\ which\ any\ field\ contains\ the\ term\ <b>%0</b>=Deze zoekopdracht bevat invoergegevens waarin elk veld de term <b>%0</b> bevat
 This\ search\ contains\ entries\ in\ which=Deze zoekopdracht bevat invoergegevens waarin
 Empty\ search\ ID=Leeg zoek ID
 The\ given\ search\ ID\ was\ empty.=Het opgegeven zoek ID was leeg.
 Clear\ search=Wis zoekopdracht
-
+Search\ document\ identifier\ online=Online document-id zoeken
+Search\ for\ unlinked\ local\ files=Zoeken naar niet-gekoppelde lokale bestanden
+Search\ full\ text\ documents\ online=Zoek volledige tekstdocumenten online
+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\nOm alle velden te doorzoeken voor <b>Smith</b>, voer in\:\n<tt>smith</tt>\n\nOm het veld <b>author</b> voor <b>Smith</b> en het veld <b>title</b> voor <b>electrical</b> te zoeken, voer in\:\n<tt>author\=Smith and title\=electrical</tt>
+Search\ term\ is\ empty.=Zoekterm is leeg.
+Invalid\ regular\ expression.=Ongeldige reguliere expressie.
+Searching\ for\ a\ keyword=Zoeken naar een trefwoord
+
+Search\ across\ libraries\ in\ a\ new\ window=Zoeken in bibliotheken in een nieuw venster
+Keep\ search\ string\ across\ libraries=Behoud de zoekreeks over bibliotheken
+Keep\ dialog\ always\ on\ top=Houd dialoogvenster altijd op de voorgrond
+Search\ results\ from\ open\ libraries=Zoekresultaten van geopende bibliotheken
 
 Select\ all=Alles selecteren
 Select\ new\ encoding=Selecteer nieuwe codering
@@ -738,6 +863,12 @@ Show\ BibTeX\ source\ by\ default=Toon standaard BibTeX-broncode
 
 Show\ confirmation\ dialog\ when\ deleting\ entries=Toon bevestigingsdialoog bij verwijderen van invoergegevens
 
+Persist\ password\ between\ sessions=Wachtwoord aanhouden tussen sessies
+
+Persist\ api\ keys\ between\ sessions=Behoud api sleutels tussen sessies
+
+Credential\ store\ not\ available.=Geen certificaatopslag beschikbaar.
+
 Show\ last\ names\ only=Enkel achternamen tonen
 
 Show\ names\ unchanged=Toon namen onveranderd
@@ -756,15 +887,23 @@ Size=Grootte
 Skipped\ -\ No\ PDF\ linked=Overgeslagen - Geen PDF gelinkt
 Skipped\ -\ PDF\ does\ not\ exist=Overgeslagen - PDF bestaat niet
 
+JabRef\ skipped\ the\ entry.=JabRef heeft het item overgeslagen.
+Import\ error=Fout bij importeren
+Open\ library\ error=Open bibliotheek fout
+Please\ check\ your\ library\ file\ for\ wrong\ syntax.=Controleer uw bibliotheekbestand voor verkeerde syntaxis.
+SourceTab\ error=BronTabblad fout
+User\ input\ via\ entry-editor\ in\ `{}bibtex\ source`\ tab\ led\ to\ failure.=De invoer van de gebruiker via entry-editor in `{}bibtex source` is mislukt.
 
+Sort\ subgroups\ A-Z=Sorteer subgroepen A-Z
 
 source\ edit=broncode aanpassen
-Special\ name\ formatters=Speciale naam formatteurs
+Special\ name\ formatters=Speciale naam formatteerders
 
-Statically\ group\ entries\ by\ manual\ assignment=Groepeer invoergegevens staties door handmatige toewijzing
+Statically\ group\ entries\ by\ manual\ assignment=Groepeer items statisch door manuele toekenning
 
 Status=Status
 
+Sublibrary\ from\ AUX\ to\ BibTeX=Sub-bibliotheek van AUX naar BibTeX
 
 Switches\ between\ full\ and\ abbreviated\ journal\ name\ if\ the\ journal\ name\ is\ known.=Schakelt tussen volledige en afgekorte logboeknaam als het logboek bekend is.
 
@@ -779,11 +918,15 @@ The\ label\ of\ the\ string\ cannot\ contain\ the\ '\#'\ character.=Het label va
 
 The\ output\ option\ depends\ on\ a\ valid\ import\ option.=De uitvoeroptie is afhankelijk van een geldige importeeroptie.
 
+There\ are\ possible\ duplicates\ that\ haven't\ been\ resolved.\ Continue?=Er zijn mogelijk duplicaten die nog niet zijn opgelost. Doorgaan?
 
+This\ operation\ requires\ all\ selected\ entries\ to\ have\ citation\ keys\ defined.=Deze bewerking vereist dat alle geselecteerde items citaatsleutels gedefinieerd hebben.
 
 This\ operation\ requires\ one\ or\ more\ entries\ to\ be\ selected.=Deze operatie vereist dat een of meerdere invoergegevens geselecteerd zijn.
 
 This\ setting\ may\ be\ changed\ in\ preferences\ at\ any\ time.=Deze instelling kan op elk moment worden gewijzigd in voorkeuren.
+Timezone\ (Provides\ for\ better\ recommendations\ by\ indicating\ the\ time\ of\ day\ the\ request\ is\ being\ made.)=Tijdzone (biedt betere aanbevelingen door het tijdstip van de dag aan te geven waarop het verzoek wordt gedaan.)
+Time\ stamp=Tijdstempel
 Toggle\ groups\ interface=Groepenvenster in-/uitschakelen
 
 Trim\ all\ whitespace\ characters\ in\ the\ field\ content.=Trim alle witruimte tekens in de veldinhoud.
@@ -794,6 +937,7 @@ Try\ different\ encoding=Probeer een andere encodering
 
 Undo=Ongedaan maken
 
+Unknown\ BibTeX\ entries\:=Onbekende BibTeX vermeldingen\:
 
 unknown\ edit=onbekende aanpassing
 
@@ -804,17 +948,23 @@ untitled=naamloos
 Upgrade\ external\ PDF/PS\ links\ to\ use\ the\ '%0'\ field.=Upgrade externe PDF/PS links om het veld '%0' te gebruiken.
 
 usage=gebruik
+Use\ autocompletion=Gebruik automatisch aanvullen
 
+User\ interface=Gebruikersinterface
 
 Username=Gebruikersnaam
 
 Value\ cleared\ externally=Waarde extern gewist
 
+Value\ set\ externally\:\ %0=Waarde extern ingesteld\: %0
 
+Verify\ that\ LyX\ is\ running\ and\ that\ the\ lyxpipe\ is\ valid.=Controleer of LyX draait en of de lyxpipe geldig is.
 
 View=Weergave
 Vim\ server\ name=Vim servernaam
 
+View\ journal\ info=Geef tijdschrift informatie weer
+
 Warn\ about\ unresolved\ duplicates\ when\ closing\ inspection\ window=Waarschuw voor onopgeloste duplicaten bij het sluiten van het inspectievenster
 
 Warn\ before\ overwriting\ existing\ keys=Waarschuw voordat bestaande sleutels worden overschreven
@@ -823,21 +973,36 @@ Warning=Waarschuwing
 
 Warnings=Waarschuwingen
 
+Warning\:\ You\ added\ field\ "%0"\ twice.\ Only\ one\ will\ be\ kept.=Waarschuwing\: U heeft veld "%0" twee keer toegevoegd. Slechts één veld zal worden bewaard.
 
 web\ link=web-link
 
 What\ do\ you\ want\ to\ do?=Wat wilt u doen?
+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.=Welke optie u ook kiest, Mr. DLib kan zijn gegevens delen met onderzoekspartners om de aanbevelingskwaliteit als onderdeel van een 'levend lab' verder te verbeteren. Mr. DLib kan ook openbare datasets vrijgeven die geanonimiseerde informatie over u kunnen bevatten en de aanbevelingen (gevoelige informatie zoals metadata van uw artikelen worden geanonimiseerd door bijvoorbeele hashing). Onderzoekspartners zijn verplicht om hetzelfde strenge beleid inzake gegevensbescherming na te leven als Mr. DLib.
 
+Will\ write\ metadata\ to\ the\ PDFs\ linked\ from\ selected\ entries.=Zal metadata schrijven naar de PDF's gelinkt van geselecteerde invoer.
 
+Write\ BibTeXEntry\ as\ metadata\ to\ PDF.=Schrijf BibTeXEntry als metadata naar PDF.
+Write\ metadata\ for\ all\ PDFs\ in\ current\ library?=Schrijf metadata voor alle PDF's in de huidige bibliotheek?
+Writing\ metadata\ for\ selected\ entries...=Metadata schrijven voor geselecteerde invoer...
+Writing\ metadata...=Metagegevens schrijven...
 
+Embed\ BibTeXEntry\ in\ PDF.=BibTeXEntry insluiten in PDF.
+File\ '%0'\ is\ write\ protected.=Bestand '%0' is beveiligd tegen schrijven.
+Write\ BibTeXEntry\ as\ XMP\ metadata\ to\ PDF.=Schrijf BibTeXEntry als XMP metadata naar PDF.
+Write\ BibTeXEntry\ metadata\ to\ PDF.=Schrijf BibTeXEntry metadata naar PDF.
+Write\ metadata\ to\ PDF\ files=Schrijf metadata naar PDF-bestanden
 
 XMP-annotated\ PDF=XMP geannoteerde PDF
 XMP\ export\ privacy\ settings=XMP privacy-instellingen exporteren
+XMP\ metadata=XMP metagegevens
 You\ must\ restart\ JabRef\ for\ this\ to\ come\ into\ effect.=U moet JabRef herstarten om dit toe te passen.
 
 The\ following\ fetchers\ are\ available\:=De volgende fetchers zijn beschikbaar\:
 Could\ not\ find\ fetcher\ '%0'=Kon fetcher '%0' niet vinden
 Running\ query\ '%0'\ with\ fetcher\ '%1'.=Query '%0' uitvoeren met '%1' fetcher.
+Invalid\ query.\ Check\ position\ %0.=Ongeldige zoekopdracht. Controleer positie %0.
+Invalid\ query\ element\ '%0'\ at\ position\ %1=Ongeldige query element '%0' op positie %1
 
 Move\ file=Bestand verplaatsen
 Rename\ file=Bestand hernoemen
@@ -849,10 +1014,16 @@ Could\ not\ find\ file\ '%0'.=Kon bestand '%0' niet vinden.
 Number\ of\ entries\ successfully\ imported=Aantal invoergegevens succesvol geïmporteerd
 Error\ while\ fetching\ from\ %0=Fout tijdens het ophalen van %0
 
+Citation\ key\ generator=Citatiesleutel generator
 Unable\ to\ open\ link.=Link openen niet mogelijk.
 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.=Met deze functie kunnen nieuwe bestanden worden geopend of geïmporteerd in een reeds actieve instantie van JabRef in plaats van een nieuwe instantie te openen. Dit is bijvoorbeeld handig wanneer je een bestand in JabRef opent vanuit je webbrowser. Merk op dat dit u ervan weerhoudt meer dan één exemplaar van JabRef tegelijk te draaien.
+Run\ fetcher=Start fetcher
 
+Line\ %0\:\ Found\ corrupted\ citation\ key\ %1.=Lijn %0\: corrupte citatiesleutel %1 gevonden.
+Line\ %0\:\ Found\ corrupted\ citation\ key\ %1\ (contains\ whitespaces).=Regel %0\: corrupte citatiesleutel %1 gevonden (bevat spaties).
+Line\ %0\:\ Found\ corrupted\ citation\ key\ %1\ (comma\ missing).=Regel %0\: corrupte citatiesleutel %1 gevonden (komma ontbreekt).
 No\ full\ text\ document\ found=Geen volledig tekstdocument gevonden
 Download\ from\ URL=Download vanaf URL
 Rename\ field=Veld hernoemen
@@ -863,9 +1034,10 @@ Looking\ for\ full\ text\ document...=Op zoek naar volledig tekstdocument...
 A\ local\ copy\ will\ be\ opened.=Een lokale kopie zal worden geopend.
 Error\ opening\ file\ '%0'.=Fout bij openen van bestand '%0'.
 
-Formatter\ not\ found\:\ %0=Formateerder niet gevonden\: %0
+Formatter\ not\ found\:\ %0=Formatteerder niet gevonden\: %0
 
 Metadata\ change=Wijziging metagegevens
+The\ following\ metadata\ changed\:=De volgende metagegevens zijn gewijzigd\:
 
 Unable\ to\ create\ backup=Back-up maken niet mogelijk
 Move\ file\ to\ file\ directory=Verplaats bestand naar map
@@ -878,26 +1050,41 @@ contains=bevat
 
 Optional\ fields\ 2=Optionele velden 2
 Waiting\ for\ save\ operation\ to\ finish=Aan het wachten tot de operatie geslaagd is
+Waiting\ for\ background\ tasks\ to\ finish.\ Quit\ anyway?=Wachten tot achtergrondtaken zijn voltooid. Toch afsluiten?
 
+Find\ and\ remove\ duplicate\ citation\ keys=Zoek en verwijder dubbele citatiesleutels
 Expected\ syntax\ for\ --fetch\='<name\ of\ fetcher>\:<query>'=Verwachte syntax voor --fetch\='<name of fetcher>\:<query>'
+Duplicate\ citation\ key=Citaatsleutel dupliceren
 
 
 General\ file\ directory=Algemene bestandsmap
 User-specific\ file\ directory=Gebruiker-specifieke map
+LaTeX\ file\ directory=LaTeX bestandsmap
 
+You\ must\ enter\ an\ integer\ value\ in\ the\ interval\ 1025-65535=U moet een integerwaarde invoeren in het interval 1025-65535
 Autocomplete\ names\ in\ 'Firstname\ Lastname'\ format\ only=Vul namen in de vorm 'Voornaam Achternaam' formaat automatisch in
 Autocomplete\ names\ in\ 'Lastname,\ Firstname'\ format\ only=Vul namen in de vorm 'Achternaam, Voornaam' formaat automatisch in
 Autocomplete\ names\ in\ both\ formats=Namen in beide formaten automatisch aanvullen
-Send\ as\ email=Verstuur als e-mail
+Send=Verzenden
+As\ Email=Als e-mail
+To\ Kindle=Naar Kindle
+Send\ to\ Kindle=Stuur naar Kindle
+Email\ address\ for\ sending\ to\ Kindle=E-mailadres voor verzenden naar Kindle
 References=Referenties
 Sending\ of\ emails=E-mails verzenden
 Subject\ for\ sending\ an\ email\ with\ references=Onderwerp voor versturen van een e-mail met referenties
 Automatically\ open\ folders\ of\ attached\ files=Mappen van bijgevoegde bestanden automatisch openen
 Error\ creating\ email=Fout tijdens het maken van e-mail
 Entries\ added\ to\ an\ email=Invoergegevens die zijn toegevoegd aan een e-mail
+Custom\ applications=Aangepaste toepassingen
+Please\ specify\ a\ file\ browser.=Geef een bestandsbrowser op.
+Please\ specify\ a\ terminal\ application.=Geef een terminal applicatie op.
+Use\ custom\ file\ browser=Gebruik aangepaste bestandsbrowser
+Use\ custom\ terminal\ emulator=Gebruik aangepaste terminalemulator
 exportFormat=exportFormaat
 Output\ file\ missing=Ontbrekende bestandsuitvoer
 The\ output\ option\ depends\ on\ a\ valid\ input\ option.=De uitvoeroptie is afhankelijk van een geldige invoeroptie.
+Linked\ file\ name\ conventions=Gekoppelde bestandsnaam conventies
 Filename\ format\ pattern=Bestandsformaat-patroon
 Additional\ parameters=Aanvullende parameters
 Cite\ selected\ entries\ between\ parenthesis=Citeer geselecteerde invoergegevens tussen haakjes
@@ -906,10 +1093,11 @@ Cite\ special=Citeren speciaal
 Extra\ information\ (e.g.\ page\ number)=Extra informatie (bv. paginanummer)
 Manage\ citations=Citaten beheren
 Problem\ modifying\ citation=Probleem met citaat wijzigen
+Problem\ collecting\ citations=Probleem bij het verzamelen van citaten
 Citation=Citaat
 Connecting...=Verbinden...
 Select\ style=Selecteer stijl
-Journals=Logboeken
+Journals=Dagboeken
 Cite=Citeren
 Cite\ in-text=Citeer in de tekst
 Insert\ empty\ citation=Voeg leeg citaat toe
@@ -920,15 +1108,21 @@ Sync\ OpenOffice/LibreOffice\ bibliography=Synchroniseren OpenOffice/LibreOffice
 Select\ which\ open\ Writer\ document\ to\ work\ on=Selecteer aan welk open Writer document u wilt werken
 Connected\ to\ document=Verbonden met 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.=Kan geen verbinding maken met een Writer document. Zorg ervoor dat een document open is voordat u de 'Selecteer Writer document' knop gebruikt om er verbinding mee te maken.
 
+No\ Writer\ documents\ found=Geen Writer documenten gevonden
 
 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
 
+Your\ OpenOffice/LibreOffice\ document\ references\ the\ citation\ key\ '%0',\ which\ could\ not\ be\ found\ in\ your\ current\ library.=Uw OpenOffice/LibreOffice document verwijst naar de referentiesleutel '%0', die niet kon worden gevonden in uw huidige bibliotheek.
 
+This\ operation\ requires\ a\ bibliography\ database.=Deze bewerking vereist een bibliografie 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.=Uw OpenOffice/LibreOffice document verwijst ten minste naar %0 citaatsleutels die niet konden worden gevonden in uw huidige bibliotheek. Sommige van deze zijn %1.
 
+Your\ OpenOffice/LibreOffice\ document\ references\ no\ citation\ keys\ which\ could\ also\ be\ found\ in\ your\ current\ library.=Uw OpenOffice/LibreOffice document verwijst naar geen citaatsleutels die ook in uw huidige bibliotheek konden worden gevonden.
 
 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
@@ -936,7 +1130,12 @@ Autodetection\ failed=Autodetectie mislukt
 Please\ wait...=Even geduld...
 Connection\ lost=Verbinding verbroken
 
+Could\ not\ update\ bibliography=Kan bibliografie niet bijwerken
+Not\ connected\ to\ document=Niet verbonden met document
+Problem\ combining\ cite\ markers=Probleem bij het combineren van citatiemarkeringen
+Unable\ to\ reload\ style\ file=Kan stijlbestand niet herladen
 
+Problem\ during\ separating\ cite\ markers=Probleem tijdens het scheiden van citatiemarkeringen
 
 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
@@ -948,12 +1147,13 @@ Please\ choose\ which\ one\ to\ connect\ to\:=Kies met welke u verbinding wenst
 Choose\ OpenOffice/LibreOffice\ executable=Kies OpenOffice/LibreOffice uitvoerbaar
 Select\ document=Selecteer document
 HTML\ list=HTML-lijst
-If\ possible,\ normalize\ this\ list\ of\ names\ to\ conform\ to\ standard\ BibTeX\ name\ formatting=Indien mogelijk, deze lijst met namen normaliseren om te voldoen aan de standaard BibTeX naamopmaak
 Could\ not\ open\ %0=%0 kan niet worden geopend
 Unknown\ import\ format=Onbekende importformaat
 Style\ selection=Stijl-selectie
 No\ valid\ style\ file\ defined=Geen geldige stijl gedefinieerd
 Choose\ pattern=Kies patroon
+Search\ and\ store\ files\ relative\ to\ library\ file\ location=Zoeken en opslaan van bestanden ten opzichte van de locatie van het bibliotheekbestand
+File\ directory=Bestandsmap
 Could\ not\ run\ the\ gnuclient/emacsclient\ program.\ Make\ sure\ you\ have\ the\ emacsclient/gnuclient\ program\ installed\ and\ available\ in\ the\ PATH.=Kon het gnuclient/emacsclient-programma niet uitvoeren. Zorg ervoor dat het emacsclient/gnuclient-programma is geïnstalleerd en beschikbaar is in het PAD.
 You\ must\ select\ either\ a\ valid\ style\ file,\ or\ use\ one\ of\ the\ default\ styles.=U moet een geldige bestandsstijl selecteren, of gebruikmaken van een van de standaardstijlen.
 
@@ -967,11 +1167,13 @@ Auto-generating\ PDF-Names\ does\ not\ support\ undo.\ Continue?=Ongedaan maken
 Use\ full\ firstname\ whenever\ possible=Gebruik volledige voornaam indien mogelijk
 Use\ abbreviated\ firstname\ whenever\ possible=Gebruik afgekorte voornaam indien mogelijk
 Use\ abbreviated\ and\ full\ firstname=Gebruik afgekorte en volledige voornaam
+Name\ format=Naam formaat
 First\ names=Voornamen
 Cleanup\ entries=Invoergevens opschonen
 Automatically\ assign\ new\ entry\ to\ selected\ groups=Nieuwe invoer automatisch toewijzen aan geselecteerde groepen
 %0\ mode=%0 modus
 Move\ DOIs\ from\ note\ and\ URL\ field\ to\ DOI\ field\ and\ remove\ http\ prefix=Verplaats DOI's van notitie- en URL-veld naar DOI-veld en verwijder het http-voorvoegsel
+Move\ URL\ in\ note\ field\ to\ url\ field=Verplaats URL in notitieveld naar url veld
 Make\ paths\ of\ linked\ files\ relative\ (if\ possible)=Paden van gekoppelde bestanden relatief maken (indien mogelijk)
 Rename\ PDFs\ to\ given\ filename\ format\ pattern=Wijzig de naam van PDF's in gegeven bestandsformaat-patroon
 Rename\ only\ PDFs\ having\ a\ relative\ path=Alleen PDF's met een relatief pad wijzigen
@@ -982,6 +1184,7 @@ One\ entry\ needed\ a\ clean\ up=Eén invoer had opschoning nodig
 
 Group\ tree\ could\ not\ be\ parsed.\ If\ you\ save\ the\ BibTeX\ library,\ all\ groups\ will\ be\ lost.=Groepsboom kon niet worden geparseerd. Als u de BibTeX-blibliotheek opslaat, zullen alle groepen verloren gaan.
 Attach\ file=Bestand toevoegen
+Attach\ file\ from\ URL=Voeg bestand toe via URL
 Setting\ all\ preferences\ to\ default\ values.=Alle voorkeuren op standaardwaarden instellen.
 Resetting\ preference\ key\ '%0'=Voorkeur-sleutel '%0' resetten
 Unable\ to\ clear\ preferences.=Niet in staat om voorkeuren te wissen.
@@ -991,7 +1194,20 @@ Expand\ all=Alles uitvouwen
 Collapse\ all=Alles inklappen
 Searches\ the\ selected\ directory\ for\ unlinked\ files.=Zoekt in de geselecteerde map voor niet-gelinkte bestanden.
 Starts\ the\ import\ of\ BibTeX\ entries.=Start de importering van BibTeX invoergegevens.
+Last\ edited\:=Laatst gewijzigd\:
+All\ time=Gehele tijd
+last\ edited=laatst bewerkt
+Last\ day=Afgelopen dag
+Last\ week=Vorige week
+Last\ month=Vorige maand
+Last\ year=Vorig jaar
+Sort\ by\:=Sorteren op\:
+Newest\ first=Nieuwste eerst
+Oldest\ first=Oudste eerst
+Directory=Map
+Import\ result=Importeer resultaat
 Searching\ file\ system...=Zoeken in bestandssysteem...
+Citation\ key\ patterns=Citaatsleutel patronen
 Clear\ priority=Prioriteit wissen
 Clear\ rank=Rang wissen
 Enable\ special\ fields=Speciale velden inschakelen
@@ -1002,10 +1218,10 @@ Four\ stars=Vier sterren
 Five\ stars=Vijf sterren
 Help\ on\ special\ fields=Hulp op speciale gebieden
 Keywords\ of\ selected\ entries=Trefwoorden van geselecteerde invoeren
-Manage\ content\ selectors=Beheer inhoudselectoren
+Content\ selectors=Inhoud kiezers
 Manage\ keywords=Sleutelwoorden beheren
 No\ priority\ information=Geen prioriteitsinformatie
-No\ rank\ information=Geen ranggegevens
+No\ rank\ information=Geen rang gegevens
 Priority=Prioriteit
 Priority\ high=Prioriteit hoog
 Priority\ low=Prioriteit laag
@@ -1020,6 +1236,7 @@ Toggle\ relevance=Relevantie in-/uitschakelen
 Toggle\ quality\ assured=Kwaliteit in-/uitschakelen
 Toggle\ print\ status=Printstatus in-/uitschakelen
 Update\ keywords=Sleutelwoorden bijwerken
+Problem\ connecting=Probleem met verbinden
 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.
@@ -1031,54 +1248,80 @@ Error\ message\:=Foutmelding\:
 If\ a\ pasted\ or\ imported\ entry\ already\ has\ the\ field\ set,\ overwrite.=Als een geplakte of geïmporteerde invoer al bestaat in de veldenset, overschrijven.
 Not\ connected\ to\ any\ Writer\ document.\ Please\ make\ sure\ a\ document\ is\ open,\ and\ use\ the\ 'Select\ Writer\ document'\ button\ to\ connect\ to\ it.=Met geen enkel Writer document verbonden. Zorg dat er een document is geopend, en gebruik de 'Selecteer Writer document' knop om te verbinden.
 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.
+Delimiter(s)=Scheidingsteken(s)
+When\ downloading\ files,\ or\ moving\ linked\ files\ to\ the\ file\ directory,\ use\ the\ bib\ file\ location.=Bij het downloaden van bestanden, of bij het verplaatsen van gekoppelde bestanden naar de bestandsmap, gebruik de locatie van het bib bestand.
 
 Canceled\ merging\ entries=Samengevoegde invoergegevens annuleren
 
 Merge\ entries=Invoergegevens samenvoegen
+Merged\ entry=Samengevoegde invoer
 Merged\ entries=Samengevoegde invoergegevens
 None=Geen
 Parse=Verwerk
 Result=Resultaat
 You\ have\ to\ choose\ exactly\ two\ entries\ to\ merge.=U dient exact twee invoergegevens kiezen om samen te voegen.
 
+Add\ timestamp\ to\ modified\ entries\ (field\ "modificationdate")=Voeg tijdstempel toe aan gewijzigde invoergegevens (veld "modificationdate")
+Add\ timestamp\ to\ new\ entries\ (field\ "creationdate")=Voeg tijdstempel toe aan nieuwe items (veld "creationdate")
 All\ key\ bindings\ will\ be\ reset\ to\ their\ defaults.=Alle sleutelbindingen worden teruggezet naar hun standaardwaarden.
 
 Automatically\ set\ file\ links=Bestandslinks automatisch instellen
 Finished\ automatically\ setting\ external\ links.=Automatisch instellen van de externe links voltooid.
+Changed\ %0\ entries.=%0 invoergegevens gewijzigd.
 
 Resetting\ all\ key\ bindings=Sleutelbindingen allemaal resetten
 
 Network=Netwerk
 Hostname=Hostnaam
+Please\ specify\ a\ hostname=Geef een hostnaam op
+Please\ specify\ a\ port=Geef een poort op
+Please\ specify\ a\ username=Geef een gebruikersnaam op
+Please\ specify\ a\ password=Geef een wachtwoord op
 
+Proxy\ configuration=Proxy configuratie
 Use\ custom\ proxy\ configuration=Gebruikt aangepaste proxyconfiguratie
 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
+Check\ Proxy\ Setting=Proxy instellingen controleren
+Check\ connection=Verbinding controleren
+Connection\ failed\!=Verbinding mislukt\!
+Connection\ successful\!=Verbinding succesvol\!
 
+SSL\ Configuration=SSL Configuratie
+SSL\ configuration\ changed=SSL-configuratie gewijzigd
+SSL\ certificate\ file=SSL certificaatbestand
+Duplicate\ Certificates=Certificaten dupliceren
+You\ already\ added\ this\ certificate=Je hebt dit certificaat al toegevoegd
 
 Open\ folder=Map openen
 Export\ sort\ order=Sorteervolgorde exporteren
+Save\ sort\ order=Sorteervolgorde opslaan
 
+Keep\ original\ order\ and\ add\ new\ entries\ at\ the\ end=Behoud originele volgorde en voeg nieuwe items aan het einde toe
+Use\ current\ table\ sort\ order=Huidige sorteervolgorde voor tabel gebruiken
+Use\ specified\ order=Gebruik opgegeven volgorde
 Show\ extra\ columns=Extra kolommen tonen
 Parsing\ error=Parseerfout
 illegal\ backslash\ expression=illegale backslash-expressie
 
-Clear\ read\ status=Status lezen wissen
+Clear\ read\ status=Lees-status wissen
+Convert\ to\ biblatex\ format\ (e.g.,\ store\ publication\ date\ in\ date\ field)=Converteer naar biblatex formaat (bijv. sla publicatiedatum in datumveld op)
+Convert\ to\ BibTeX\ format\ (e.g.,\ store\ publication\ date\ in\ year\ and\ month\ fields)=Converteer naar BibTeX formaat (bijv. sla publicatiedatum in jaar en maand velden op)
 
 Deprecated\ fields=Afgekeurde velden
+Shows\ fields\ having\ a\ successor\ in\ biblatex.=Toont velden met een opvolger in biblatex.
+Shows\ fields\ having\ a\ successor\ in\ biblatex.\nFor\ instance,\ the\ publication\ month\ should\ be\ part\ of\ the\ date\ field.\nUse\ the\ Cleanup\ Entries\ functionality\ to\ convert\ the\ entry\ to\ biblatex.=Toont velden met een opvolger in biblatex.\nBijvoorbeeld, de publicatie maand moet deel uitmaken van het datumveld.\nGebruik de functie Cleanup Entries om de invoer te converteren naar biblatex.
 
 
 No\ read\ status\ information=Geen leesstatus informatie
 Printed=Afgedrukt
 Read\ status=Lees status
 Read\ status\ read=Lees-status lezen
-Read\ status\ skimmed=Lees-status afgeroomd
+Read\ status\ skimmed=Lees-status "geskimd"
 Save\ selected\ as\ plain\ BibTeX...=Sla selectie op als platte BibTex...
-Set\ read\ status\ to\ read=Lees-status instellen naar lezen
-Set\ read\ status\ to\ skimmed=Lees-status instellen naar afgeroomd
+Set\ read\ status\ to\ read=Lees-status instellen op "gelezen"
+Set\ read\ status\ to\ skimmed=Lees-status instellen op "geskimd"
 
 Opens\ JabRef's\ GitHub\ page=Opent JabRef's GitHub-pagina
 Opens\ JabRef's\ Twitter\ page=Opent JabRef's Twitter-pagina
@@ -1091,9 +1334,11 @@ Please\ open\ %0\ manually.=Aub handmatig %0 openen.
 The\ link\ has\ been\ copied\ to\ the\ clipboard.=De link is gekopieerd naar het klembord.
 
 Open\ %0\ file=%0 bestand openen
+Could\ not\ detect\ terminal\ automatically\ using\ '%0'.\ Please\ define\ a\ custom\ terminal\ in\ the\ preferences.=Kan de terminal niet automatisch detecteren met '%0'. Stel een aangepaste terminal in de Voorkeuren.
 
 Cannot\ delete\ file=Kan het bestand niet verwijderen
 File\ permission\ error=Fout bij bestandsrechten
+JabRef\ does\ not\ have\ permission\ to\ access\ %s=JabRef heeft geen toestemming voor toegang %s
 Path\ to\ %0=Pad naar %0
 Convert=Converteren
 Normalize\ to\ BibTeX\ name\ format=Normaliseren tot BibTeX naamnotatie
@@ -1108,21 +1353,34 @@ OpenDocument\ text=OpenDocument tekst
 OpenDocument\ spreadsheet=OpenDocument spreadsheet
 OpenDocument\ presentation=OpenDocument presentatie
 %0\ image=%0 afbeelding
+Added\ entry\ '%0'=Toegevoegd invoer '%0'
 Added\ entry=Toegevoegde invoer
+Modified\ entry\ '%0'=Gewijzigd invoer '%0'
 Modified\ entry=Gewijzigde invoer
+Deleted\ entry\ '%0'=Invoer '%0 ' verwijderd
 Deleted\ entry=Verwijderde invoer
 Modified\ groups\ tree=Groepsstructuur gewijzigd
 Removed\ all\ groups=Alle groepen verwijderd
+%0.\ Accepting\ the\ change\ replaces\ the\ complete\ groups\ tree\ with\ the\ externally\ modified\ groups\ tree.=%0. Door de wijziging te accepteren, wordt de volledige groepenboom vervangen door de extern gewijzigde groepenboom.
 Select\ export\ format=Selecteer exportindeling
+Return\ to\ library=Terug naar bibliotheek
+
 Could\ not\ connect\ to\ %0=Kon niet verbinden met%0
 Warning\:\ %0\ out\ of\ %1\ entries\ have\ undefined\ title.=Waarschuwing\: %0 van de %1 invoergegevens hebben een ongedefinieerde titel.
+Warning\:\ %0\ out\ of\ %1\ entries\ have\ undefined\ citation\ key.=Waarschuwing\: %0 van %1 invoergegevens hebben ongedefinieerde citaatsleutel.
+Warning\:\ %0\ out\ of\ %1\ entries\ have\ undefined\ DOIs.=Waarschuwing\: %0 van %1 invoergegevens bevatten ongedefinieerde DOI's.
 Really\ delete\ the\ selected\ entry?=Geselecteerde invoer echt verwijderen?
 Really\ delete\ the\ %0\ selected\ entries?=Weet u zeker dat u de %0 geselecteerde invoeren wenst te verwijderen?
 
+On\ disk=Op schijf
+In\ JabRef=In JabRef
+Entry\ Preview=Invoer voorbeeld
+
 Keep\ left=Links aanhouden
 Keep\ right=Rechts aanhouden
 Old\ entry=Oude invoer
 From\ import=Van de import
+From\ DOI=Van DOI
 No\ problems\ found.=Geen problemen gevonden.
 Save\ changes=Wijzigingen opslaan
 Discard\ changes=Verwerp wijzigingen
@@ -1130,6 +1388,7 @@ Library\ '%0'\ has\ changed.=Bibliotheek '%0' is veranderd.
 Print\ entry\ preview=Afdrukvoorbeeld printen
 
 Invalid\ DOI\:\ '%0'.=Ongeldig DOI\: '%0'.
+Same\ DOI\ used\ in\ multiple\ entries=Hetzelfde DOI gebruikt in meerdere invoergegevens
 should\ start\ with\ a\ name=moet beginnen met een naam
 should\ end\ with\ a\ name=moet eindigen met een naam
 unexpected\ closing\ curly\ bracket=onverwachte accolade sluiten
@@ -1150,6 +1409,7 @@ Entry\ editor,\ previous\ panel\ 2=Invoer editor, vorig paneel 2
 File\ list\ editor,\ move\ entry\ down=Bestandslijst editor, invoer omlaag verplaatsen
 File\ list\ editor,\ move\ entry\ up=Bestandslijst editor, invoer omhoog verplaatsen
 Focus\ entry\ table=Focus op invoertabel
+Focus\ group\ list=Toon groeplijst
 Import\ into\ current\ library=Importeren in de huidige bibliotheek
 Import\ into\ new\ library=Importeer in nieuwe bibliotheek
 New\ article=Nieuw artikel
@@ -1160,9 +1420,9 @@ New\ mastersthesis=Nieuwe masterthesis
 New\ phdthesis=Nieuwe phdthesis
 New\ proceedings=Nieuwe handelingen
 New\ unpublished=Nieuw ongepubliceerd
-Preamble\ editor,\ store\ changes=Preambule-editor, winkelwijzigingen
 Push\ to\ application=Verplaatsen naar applicatie
 Refresh\ OpenOffice/LibreOffice=OpenOffice/LibreOffice vernieuwen
+Resolve\ duplicate\ citation\ keys=Dubbele citaatsleutels oplossen
 Save\ all=Bewaar alles
 String\ dialog,\ add\ string=Tekenreeks dialoog, voeg reeks toe
 String\ dialog,\ remove\ string=Tekenreeks dialoog, verwijder reeks
@@ -1170,9 +1430,12 @@ Synchronize\ files=Bestanden synchroniseren
 Unabbreviate=Niet afkorten
 should\ contain\ a\ protocol=zou een protocol moeten bevatten
 Copy\ preview=Kopie voorbeeld
+Copy\ selection=Selectie kopiëren
 Automatically\ setting\ file\ links=Bestandslinks automatisch instellen
+Regenerating\ citation\ keys\ according\ to\ metadata=Hergenereren van citaatsleutels volgens metagegevens
 Regenerate\ all\ keys\ for\ the\ entries\ in\ a\ BibTeX\ file=Alle sleutels voor de invoergegevens in een BibTeX-bestand opnieuw genereren
 Show\ debug\ level\ messages=Foutopsporingsberichten tonen
+Default\ library\ mode=Standaard bibliotheek modus
 Show\ only\ preferences\ deviating\ from\ their\ default\ value=Toon enkel voorkeuren die afwijken van hun standaardwaarde
 default=standaard
 key=sleutel
@@ -1188,6 +1451,7 @@ abbreviation\ detected=afkorting gevonden
 wrong\ entry\ type\ as\ proceedings\ has\ page\ numbers=verkeerde invoergegevens omdat de procedure paginanummers heeft
 Abbreviate\ journal\ names=Logboek namen afkorten
 Abbreviating...=Afkorten...
+Abbreviation\ '%0'\ for\ journal\ '%1'\ already\ defined.=Afkorting '%0' voor tijdschrift '%1' al gedefinieerd.
 Abbreviation\ cannot\ be\ empty=Afkorting mag niet leeg zijn
 Duplicated\ Journal\ Abbreviation=Gedupliceerde afkorting logboek
 Duplicated\ Journal\ File=Gedupliceerd logboekbestand
@@ -1198,6 +1462,8 @@ Name\ cannot\ be\ empty=Naam mag niet leeg zijn
 Display\ keywords\ appearing\ in\ ALL\ entries=Trefwoorden die voorkomen in ALLE invoergegevens weergeven
 Display\ keywords\ appearing\ in\ ANY\ entry=Trefwoorden die voorkomen in ELKE invoer weergeven
 None\ of\ the\ selected\ entries\ have\ titles.=Geen van de geselecteerde invoergegevens hebben bevatten titels.
+None\ of\ the\ selected\ entries\ have\ citation\ keys.=Geen van de geselecteerde invoergegevens hebben citaatsleutels.
+None\ of\ the\ selected\ entries\ have\ DOIs.=Geen van de geselecteerde invoergegevens hebben DOI's.
 Unabbreviate\ journal\ names=Maak afkorting van logboeknamen ongedaan
 Unabbreviating...=Niet afkorten...
 Usage=Gebruik
@@ -1215,11 +1481,17 @@ Internal\ style=Interne stijl
 Add\ style\ file=Bestandsstijl toevoegen
 Current\ style\ is\ '%0'=Huidige stijl is '%0'
 Remove\ style=Stijl verwijderen
+You\ must\ select\ a\ valid\ style\ file.\ Your\ style\ is\ probably\ missing\ a\ line\ for\ the\ type\ "default".=U moet een geldig stijlbestand selecteren. Uw stijl mist waarschijnlijk een regel voor het type "standaard".
+Invalid\ style\ selected=Ongeldige stijl geselecteerd
 
 Reload=Vernieuwen
 
 Capitalize=Kapitaliseren
+Capitalize\ all\ Words,\ but\ Converts\ Articles,\ Prepositions,\ and\ Conjunctions\ to\ Lower\ Case.=Kapitaliseert alle woorden, maar converteert artikelen, voorzetsels en voegwoorden naar kleine letters.
 Capitalize\ the\ first\ word,\ changes\ other\ words\ to\ lower\ case.=Gebruik hoofdletter bij het eerste woord, andere woorden omzetten naar kleine letters.
+changes\ all\ letters\ to\ lower\ case.=verandert alle letters in kleine letters.
+CHANGES\ ALL\ LETTERS\ TO\ UPPER\ CASE.=VERANDERT ALLE TEKENS NAAR HOOFDLETTERS.
+Changes\ The\ First\ Letter\ Of\ All\ Words\ To\ Capital\ Case\ And\ The\ Remaining\ Letters\ To\ Lower\ Case.=Verandert de eerste letter van alle woorden naar hoofdletters en de resterende letters naar kleine letters.
 Cleans\ up\ LaTeX\ code.=Schoont LaTeX-code op.
 Converts\ HTML\ code\ to\ LaTeX\ code.=Converteert HTML-code naar LeTeX-code.
 HTML\ to\ Unicode=HTML naar Unicode
@@ -1231,6 +1503,7 @@ Converts\ units\ to\ LaTeX\ formatting.=Converteert eenheden naar LaTeX opmaak.
 HTML\ to\ LaTeX=HTML naar LaTeX
 LaTeX\ cleanup=LaTeX opschoning
 LaTeX\ to\ Unicode=LaTeX naar Unicode
+lower\ case=kleine letters
 Minify\ list\ of\ person\ names=Verklein lijst met persoonsnamen
 Normalize\ date=Datum normaliseren
 Normalize\ en\ dashes=Normaliseren en streepjes
@@ -1243,21 +1516,33 @@ Normalizes\ lists\ of\ persons\ to\ the\ BibTeX\ standard.=Normaliseert lijsten
 Normalizes\ the\ date\ to\ ISO\ date\ format.=Normaliseert de datum naar ISO datumnotatie.
 Normalizes\ the\ en\ dashes.=Normaliseren de en-streepjes.
 Ordinals\ to\ LaTeX\ superscript=Rangtelwoorden naar LaTeX superscript
-Protect\ terms=Voorwaarden beschermen
+Protect\ terms=Termen beschermen
 Add\ enclosing\ braces=Accolades toevoegen
 Add\ braces\ encapsulating\ the\ complete\ field\ content.=Voeg accolades toe die de volledige veldinhoud inkapselen.
 Remove\ enclosing\ braces=Accolades verwijderen
 Removes\ braces\ encapsulating\ the\ complete\ field\ content.=Verwijdert accolades die de volledige veldinhoud inkapselen.
+Removes\ all\ balanced\ {}\ braces\ around\ words.=Verwijdert alle gebalanceerde {} haakjes rond woorden.
 Shorten\ DOI=Verkort DOI
+Shortens\ DOI\ to\ more\ human\ readable\ form.=Verkort DOI tot meer menselijke leesbare vorm.
 Sentence\ case=Hoofdletterinstellingen van de zin
 Shortens\ lists\ of\ persons\ if\ there\ are\ more\ than\ 2\ persons\ to\ "et\ al.".=Verkort de lijst van mensen naar 'et al.' wanneer er meer dan twee mensen zijn.
+Title\ Case=Titel geval
 Unicode\ to\ LaTeX=Unicode naar LaTeX
 Units\ to\ LaTeX=Units naar LaTeX
+UPPER\ CASE=HOOFDLETTER
 Does\ nothing.=Doet niets.
 Identity=Identiteit
 Clears\ the\ field\ completely.=Wist het veld volledig.
 Directory\ not\ found=Directory niet gevonden
+
+Main\ file\ directory=Hoofdbestand map
+Main\ file\ directory\ not\ set.\ Check\ the\ preferences\ ("Linked\ files")\ or\ modify\ the\ library\ properties\ ("Override\ default\ file\ directories").=Hoofdbestandsmap niet ingesteld. Controleer de voorkeuren ("Gekoppelde bestanden") of wijzig de bibliotheekeigenschappen ("De standaard bestandsmappen overschrijven").
+Main\ file\ directory\ '%0'\ not\ found.\nCheck\ the\ tab\ "Linked\ files".=Hoofdbestandsmap '%0' niet gevonden.\nControleer het tabblad "Gekoppelde bestanden".
+
 This\ operation\ requires\ exactly\ one\ item\ to\ be\ selected.=Deze bewerking vereist dat precies één item wordt geselecteerd.
+Opening\ large\ number\ of\ files=Groot aantal bestanden openen
+You\ are\ about\ to\ open\ %0\ files.\ Continue?=U staat op het punt %0 bestanden te openen. Doorgaan?
+Continue=Doorgaan
 Importing\ in\ %0\ format=Importeren in %0 indeling
 Female\ name=Vrouwelijke naam
 Female\ names=Vrouwelijke namen
@@ -1308,9 +1593,14 @@ Verse=Vers
 change\ entries\ of\ group=invoergegevens van groep veranderen
 odd\ number\ of\ unescaped\ '\#'=oneven aantal unescaped '\#'
 
+Found\ %0\ unescaped\ '&'=%0 '&' tekens gevonden zonder backslash voorafgaand
+
 Show\ diff=Diff weergeven
 Copy\ Version=Versie kopiëren
+Maintainers=Onderhouders
+Contributors=Bijdragers
 License=Licentie
+JabRef\ would\ not\ have\ been\ possible\ without\ the\ help\ of\ our\ contributors.=JabRef zou niet mogelijk zijn geweest zonder de hulp van onze bijdragers.
 
 HTML\ encoded\ character\ found=HTML gecodeerd teken gevonden
 booktitle\ ends\ with\ 'conference\ on'=boektitel eindigt met 'conferentie over'
@@ -1319,11 +1609,12 @@ incorrect\ control\ digit=onjuist controlegetal
 incorrect\ format=onjuiste format
 Copied\ version\ to\ clipboard=Versie gekopieerd naar klembord
 
+Citation\ key=Citaatsleutel
 Message=Bericht
 
 
 MathSciNet\ Review=MathSciNet Review
-Reset\ Bindings=Reset bindingen
+Reset\ all=Alles resetten
 
 Decryption\ not\ supported.=Decodering niet ondersteund.
 
@@ -1346,31 +1637,48 @@ Latest\ version=Laatste versie
 Online\ help\ forum=Online hulp forum
 Custom=Aangepast
 
-Export\ cited=Citatie exporteren
+Export\ cited=Geciteerde exporteren
 Unable\ to\ generate\ new\ library=Niet mogelijk om een nieuwe bibliotheek te genereren
 
+The\ cursor\ is\ in\ a\ protected\ area.=De cursor is in een beschermd gebied.
+JabRefException=JabRefException
+No\ bibliography\ database\ is\ open\ for\ citation.=Geen bibliografie database is open voor citaat.
 
+No\ database\ is\ open\ for\ updating\ citation\ markers\ after\ citing.=Er is geen database geopend voor het bijwerken van citaatmarkers na het citeren.
 
+No\ bibliography\ entries\ are\ selected\ for\ citation.=Geen bibliografie items zijn geselecteerd voor citaat.
+No\ bibliography\ style\ is\ selected\ for\ citation.=Geen bibliografie stijl is geselecteerd voor citaat.
+No\ database=Geen databank
 
+No\ entries\ selected\ for\ citation=Geen items geselecteerd voor citatie
+Open\ one\ before\ citing.=Open er een voordat u citeert.
 
+Select\ one\ before\ citing.=Selecteer er een voordat u citeert.
+Select\ some\ before\ citing.=Selecteer er enkele voordat u citeert.
 
+Found\ identical\ ranges=Gelijke bereiken gevonden
+Found\ overlapping\ ranges=Overlappende bereiken gevonden
+Found\ touching\ ranges=Aangrenzende bereiken gevonden
 
-Error\ occured\ while\ executing\ the\ command\ "%0".=Er is een fout opgetreden tijdens het uitvoeren van commando "%0".
+Note\:\ Use\ the\ placeholder\ %DIR%\ for\ the\ location\ of\ the\ opened\ library\ file.=Opmerking\: Gebruik de placeholder %DIR% voor de locatie van het geopende bibliotheekbestand.
+Error\ occurred\ while\ executing\ the\ command\ "%0".=Fout opgetreden tijdens het uitvoeren van de opdracht "%0".
 Reformat\ ISSN=ISSN formatteren
 
 Countries\ and\ territories\ in\ English=Landen en gebieden in het Engels
 Electrical\ engineering\ terms=Elektrotechnische termen
 Enabled=Ingeschakeld
 Internal\ list=Interne lijst
+Protected\ terms\ files=Beschermd termenbestand
 Months\ and\ weekdays\ in\ English=Maanden en weekdagen in het Engels
 The\ text\ after\ the\ last\ line\ starting\ with\ \#\ will\ be\ used=De tekst na de laatste zin startend met een \# zal worden gebruikt
-Add\ protected\ terms\ file=Voeg beschermde voorwaardenbestand toe
-Are\ you\ sure\ you\ want\ to\ remove\ the\ protected\ terms\ file?=Weet u zeker dat u het beschermde voorwaardenbestand wilt verwijderen?
-Remove\ protected\ terms\ file=Verwijder beschermde voorwaardenbestand
+Add\ protected\ terms\ file=Voeg beschermd termenbestand toe
+Are\ you\ sure\ you\ want\ to\ remove\ the\ protected\ terms\ file?=Weet u zeker dat u het beschermde termenbestand wilt verwijderen?
+Remove\ protected\ terms\ file=Verwijder beschermde termenbestand
 Add\ selected\ text\ to\ list=Geselecteerde tekst toevoegen aan de lijst
 Add\ {}\ around\ selected\ text=Voeg {} toe om de geselecteerde tekst
+Remove\ all\ {}\ in\ selected\ text=Verwijder alle {} in de geselecteerde tekst
 Format\ field=Veld format
-New\ protected\ terms\ file=Nieuw beschermde voorwaarden bestand
+New\ protected\ terms\ file=Nieuw beschermde termenbestand
 change\ field\ %0\ of\ entry\ %1\ from\ %2\ to\ %3=verander veld %0 van invoer %1 van %2 naar %3
 change\ key\ from\ %0\ to\ %1=verander sleutel van %0 naar %1
 change\ string\ content\ %0\ to\ %1=verander tekenreeksinhoud %0 naar %1
@@ -1378,18 +1686,24 @@ change\ string\ name\ %0\ to\ %1=verander tekenreeks naam %0 naar %1
 change\ type\ of\ entry\ %0\ from\ %1\ to\ %2=verander type van invoer %0 van %1 naar %2
 insert\ entry\ %0=invoer invoegen %0
 insert\ string\ %0=tekenreeks invoegen %0
+remove\ entries=verwijder items
 remove\ entry\ %0=verwijderen invoer %0
 remove\ string\ %0=verwijder tekenreeks %0
 undefined=niet gedefinieerd
 Cannot\ get\ info\ based\ on\ given\ %0\:\ %1=Kan geen info verkrijgen gebaseerd op %0\: %1
+Get\ bibliographic\ data\ from\ %0=Bibliografische gegevens ophalen van %0
 No\ %0\ found=Geen %0 gevonden
 Entry\ from\ %0=Invoer van %0
 Merge\ entry\ with\ %0\ information=Voeg invoer samen met %0 informatie
 Updated\ entry\ with\ info\ from\ %0=Invoer bijgewerkt met info van %0
 
+Add\ new\ list=Nieuwe lijst toevoegen
+Open\ existing\ list=Bestaande lijst openen
 Remove\ list=Lijst verwijderen
+Add\ abbreviation=Afkorting toevoegen
 Full\ journal\ name=Volledige naam logboek
 Abbreviation\ name=Afkorting naam
+Shortest\ unique\ abbreviation=Kortste unieke afkorting
 
 No\ abbreviation\ files\ loaded=Geen afgekortingen bestanden geladen
 
@@ -1408,14 +1722,18 @@ Issue\ report\ successful=Probleem melden geslaagd
 Your\ issue\ was\ reported\ in\ your\ browser.=Uw probleem is gerapporteerd in uw browser.
 The\ log\ and\ exception\ information\ was\ copied\ to\ your\ clipboard.=De log- en uitzonderingsinformatie is gekopieerd naar uw klembord.
 Please\ paste\ this\ information\ (with\ Ctrl+V)\ in\ the\ issue\ description.=Plak deze informatie (met Ctrl + V) in de probleemomschrijving.
+Last\ notification=Laatste melding
+Check\ the\ event\ log\ to\ see\ all\ notifications=Controleer het gebeurtenislogboek om alle notificaties te zien
 
 Host=Host
 Port=Poort
 Library=Bibliotheek
+Libraries=Bibliotheken
 User=Gebruiker
 Connect=Verbinden
 Connection\ error=Verbindingsfout
 Connection\ to\ %0\ server\ established.=Verbinding met %0 server gemaakt.
+There\ are\ connection\ issues\ with\ a\ JabRef\ server.\ Detailed\ information\:\ %0=Er zijn verbindingsproblemen met een JabRef server. Gedetailleerde informatie\: %0
 Required\ field\ "%0"\ is\ empty.=Vereist veld "%0" is leeg.
 %0\ driver\ not\ available.=%0 driver niet beschikbaar.
 The\ connection\ to\ the\ server\ has\ been\ terminated.=De verbinding met de server is beëindigd.
@@ -1428,20 +1746,25 @@ Update\ could\ not\ be\ performed\ due\ to\ existing\ change\ conflicts.=Update
 You\ are\ not\ working\ on\ the\ newest\ version\ of\ BibEntry.=U werkt niet aan de nieuwste versie van BibEntry.
 Local\ version\:\ %0=Lokale versie\: %0
 Shared\ version\:\ %0=Gedeelde versie\: %0
+Press\ "Merge\ entries"\ to\ merge\ the\ changes\ and\ resolve\ this\ problem.=Druk op "Items samenvoegen" om de wijzigingen samen te voegen en dit probleem op te lossen.
+Canceling\ this\ operation\ will\ leave\ your\ changes\ unsynchronized.=Als u deze handeling annuleert, zullen uw wijzigingen niet gesynchroniseerd worden.
 Shared\ entry\ is\ no\ longer\ present=Gedeelde invoer is niet langer aanwezig
 The\ entry\ you\ currently\ work\ on\ has\ been\ deleted\ on\ the\ shared\ side.=De invoer waar u momenteel aan werkt is aan de gedeelde kant verwijderd.
 You\ can\ restore\ the\ entry\ using\ the\ "Undo"\ operation.=U kunt de invoer herstellen met de bewerking "Ongedaan maken".
 You\ are\ already\ connected\ to\ a\ database\ using\ entered\ connection\ details.=U bent al verbonden met een database via ingevoerde verbindingsdetails.
 
+Cannot\ cite\ entries\ without\ citation\ keys.\ Generate\ keys\ now?=Kan invoergegevens zonder citaatsleutels niet citeren. Sleutels nu genereren?
 New\ technical\ report=Nieuw technisch verslag
 
 %0\ file=%0 bestand
+%0\ file\ (%1)=%0 bestand (%1)
 Custom\ layout\ file=Aangepast lay-out bestand
-Protected\ terms\ file=Beschermde voorwaarden bestand
+Protected\ terms\ file=Beschermde termenbestand
 Style\ file=Bestandsstijl
 
 Open\ OpenOffice/LibreOffice\ connection=OpenOffice/LibreOffice verbinding openen
 Non-ASCII\ encoded\ character\ found=Niet-ASCII gecodeerd teken gevonden
+Non-UTF-8\ encoded\ field\ found=Niet-UTF-8 gecodeerd veld gevonden
 Toggle\ web\ search\ interface=Web zoek interface in-/uitschakelen
 
 Migration\ help\ information=Migratie help informatie
@@ -1449,6 +1772,10 @@ Entered\ database\ has\ obsolete\ structure\ and\ is\ no\ longer\ supported.=Ing
 However,\ a\ new\ database\ was\ created\ alongside\ the\ pre-3.6\ one.=Er is echter een nieuwe database gemaakt naast de pre-3.6.
 Opens\ a\ link\ where\ the\ current\ development\ version\ can\ be\ downloaded=Opent een link waar de huidige ontwikkelingsversie kan worden gedownload
 See\ what\ has\ been\ changed\ in\ the\ JabRef\ versions=Zie wat er is veranderd in de JabRef versies
+Referenced\ citation\ key\ does\ not\ exist=Referentiesleutel voor verwijzing bestaat niet
+Full\ text\ document\ for\ entry\ %0\ already\ linked.=Volledig tekstdocument voor invoer %0 al gekoppeld.
+Download\ full\ text\ documents=Download volledige tekstdocumenten
+You\ are\ about\ to\ download\ full\ text\ documents\ for\ %0\ entries.=U staat op het punt volledige tekstdocumenten voor %0 invoergegevens te downloaden.
 last\ four\ nonpunctuation\ characters\ should\ be\ numerals=de laatste vier niet-leestekens zouden cijfers moeten zijn
 
 Author=Auteur
@@ -1458,6 +1785,8 @@ Show\ file\ annotations=Toon bestandsaantekeningen
 shared=gedeeld
 should\ contain\ an\ integer\ or\ a\ literal=moet een heel getal of een letterlijke waarde bevatten
 should\ have\ the\ first\ letter\ capitalized=moet de eerste letter gekapitaliseerd hebben
+edition\ of\ book\ reported\ as\ just\ 1=editie van het boek gerapporteerd als 1
+no\ integer\ as\ values\ for\ edition\ allowed=geen geheel getal als waarden voor editie toegestaan
 Tools=Hulpmiddelen
 What's\ new\ in\ this\ version?=Wat is er nieuw in deze versie?
 Want\ to\ help?=Wilt u helpen?
@@ -1494,9 +1823,12 @@ File\ directory\ pattern=Bestandsmap patroon
 Update\ with\ bibliographic\ information\ from\ the\ web=Met bibliografische informatie van het web bijwerken
 
 Could\ not\ find\ any\ bibliographic\ information.=Geen bibliografische informatie gevonden.
+Citation\ key\ deviates\ from\ generated\ key=Citaatsleutel wijkt af van gegenereerde sleutel
 DOI\ %0\ is\ invalid=DOI %0 is ongeldig
 
+Select\ all\ customized\ types\ to\ be\ stored\ in\ local\ preferences\:=Selecteer alle aangepaste types die moeten worden opgeslagen in lokale voorkeuren\:
 Different\ customization,\ current\ settings\ will\ be\ overwritten=Verschillende aanpassingen, de huidige instellingen worden overschreven
+%0\ (from\ file)\n%1\ (current\ setting)=%0 (uit bestand)\n%1 (huidige instelling)
 
 Entry\ type\ %0\ is\ only\ defined\ for\ Biblatex\ but\ not\ for\ BibTeX=Invoertype %0 is alleen gedefinieerd voor Biblatex maar niet voor BibTeX
 
@@ -1522,6 +1854,7 @@ Show\ the\ document\ of\ the\ currently\ selected\ entry.=Het document van de hu
 Show\ this\ document\ until\ unlocked.=Dit document tonen tot het ontgrendeld is.
 Set\ current\ user\ name\ as\ owner.=Huidige gebruikersnaam als eigenaar instellen.
 
+Collect\ and\ share\ telemetry\ data\ to\ help\ improve\ JabRef=Telemetrie gegevens verzamelen en delen om JabRef te helpen verbeteren
 Don't\ share=Niet delen
 Share\ anonymous\ statistics=Statistieken anoniem delen
 Telemetry\:\ Help\ make\ JabRef\ better=Telemetrie\: help JabRef te verbeteren
@@ -1529,11 +1862,18 @@ To\ improve\ the\ user\ experience,\ we\ would\ like\ to\ collect\ anonymous\ st
 This\ file\ was\ found\ automatically.\ Do\ you\ want\ to\ link\ it\ to\ this\ entry?=Dit bestand werd automatisch gevonden. Wilt u het koppelen aan deze invoer?
 Names\ are\ not\ in\ the\ standard\ %0\ format.=Namen zijn niet in de standaard %0 indeling.
 
+Delete\ '%0'\ permanently\ from\ disk,\ or\ just\ remove\ the\ file\ from\ the\ entry?\ Pressing\ Delete\ will\ delete\ the\ file\ permanently\ from\ disk.=Verwijder '%0' permanent van de schijf, of verwijder gewoon het bestand uit de invoer? Klik op Verwijderen zal het bestand permanent van de schijf verwijderen.
 Delete\ '%0'=Verwijder '%0'
 Delete\ from\ disk=Van schijf verwijderen
 Remove\ from\ entry=Invoer wissen
 There\ exists\ already\ a\ group\ with\ the\ same\ name.=Er bestaat al een groep met dezelfde naam.
+If\ you\ use\ it,\ it\ will\ inherit\ all\ entries\ from\ this\ other\ group.=Als je het gebruikt, erft het alle items van deze andere groep.
 
+Copy\ linked\ file=Gekoppeld bestand kopiëren
+Copy\ linked\ file\ to\ folder...=Gekoppeld bestand naar map kopiëren...
+Could\ not\ copy\ file\ to\ %0,\ maybe\ the\ file\ is\ already\ existing?=Kon het bestand niet kopiëren naar %0, misschien bestaat het bestand al?
+Successfully\ copied\ file\ to\ %0.=Bestand met succes gekopieerd naar %0.
+Could\ not\ resolve\ the\ file\ %0=Kon het bestand %0 niet oplossen
 
 Copy\ linked\ files\ to\ folder...=Gelinkte bestanden kopiëren naar map...
 Copied\ file\ successfully=Bestand succesvol gekopieerd
@@ -1541,8 +1881,10 @@ Copying\ files...=Bestanden kopiëren...
 Copying\ file\ %0\ of\ entry\ %1=Kopieer bestand %0 van invoer %1
 Finished\ copying=Kopiëren voltooid
 Could\ not\ copy\ file=Kan het bestand niet kopiëren
+Copied\ %0\ files\ of\ %1\ successfully\ to\ %2=%0 bestanden van %1 succesvol gekopieerd naar %2
 Rename\ failed=Hernoemen mislukt
 JabRef\ cannot\ access\ the\ file\ because\ it\ is\ being\ used\ by\ another\ process.=JabRef kan geen toegang krijgen tot dit bestand omdat het door een ander proces wordt gebruikt.
+Show\ console\ output\ (only\ when\ the\ launcher\ is\ used)=Toon console-uitvoer (alleen wanneer de launcher wordt gebruikt)
 
 Remove\ line\ breaks=Verwijder regeleinden
 Removes\ all\ line\ breaks\ in\ the\ field\ content.=Verwijder alle regeleinden in de veldinhoud.
@@ -1554,8 +1896,9 @@ 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'.
+empty\ citation\ key=lege citaatsleutel
 Aux\ file=Aux bestand
-Group\ containing\ entries\ cited\ in\ a\ given\ TeX\ file=Groep bevat invoergegevens aangehaald in een bepaald TeX-bestand
+Group\ containing\ entries\ cited\ in\ a\ given\ TeX\ file=Groep bevat items geciteerd in een bepaald TeX-bestand
 
 Any\ file=Elk bestand
 
@@ -1565,6 +1908,7 @@ No\ full\ text\ document\ found\ for\ entry\ %0.=Geen volledig tekstdocument gev
 
 Next\ library=Volgende bibliotheek
 Previous\ library=Vorige bibliotheek
+Add\ group=Groep toevoegen
 Entry\ is\ contained\ in\ the\ following\ groups\:=Invoer is opgenomen in de volgende groepen\:
 Delete\ entries=Verwijder invoergegevens
 Keep\ entries=Invoergegevens behouden
@@ -1578,6 +1922,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').=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
 
+Preamble=Inleiding
 Markings=Markeringen
 Use\ selected\ instance=Gebruik geselecteerd exemplaar
 
@@ -1585,30 +1930,34 @@ Hide\ panel=Verberg paneel
 Move\ panel\ up=Beweeg paneel opwaarts
 Move\ panel\ down=Beweeg paneel neerwaarts
 Linked\ files=Gekoppelde bestanden
-Group\ view\ mode\ set\ to\ intersection=Groepsweergavemodus ingesteld als kruispunt
-Group\ view\ mode\ set\ to\ union=Groepsweergavemodus ingesteld als eenheid
+Group\ view\ mode\ set\ to\ intersection=Groep weergavemodus ingesteld als doorsnede
+Group\ view\ mode\ set\ to\ union=Groep weergavemodus ingesteld als unie
 Open\ file\ %0=Open bestand %0
-Toggle\ intersection=Kruispunt in-/uitschakelen
-Toggle\ union=Eenheid in-/uitschakelen
+Toggle\ intersection=Doorsnede inschakelen
+Toggle\ union=Unie inschakelen
 Jump\ to\ entry=Ga naar invoer
 The\ group\ name\ contains\ the\ keyword\ separator\ "%0"\ and\ thus\ probably\ does\ not\ work\ as\ expected.=De naam van de groep bevat het sleutelwoord scheidingsteken "%0" en zal daardoor waarschijnlijk niet werken als verwacht.
 Blog=Blog
 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=Kopieer DOI
 Copy\ DOI\ url=DOI url kopiëren
 Development\ version=Onwikkelingsversie
-Export\ selected\ entries=Exporteer geseleteerde records
-Export\ selected\ entries\ to\ clipboard=Exporteer geselecteerde invoergegevens naar het klembord
+Export\ selected\ entries=Exporteer geselecteerde items
+Export\ selected\ entries\ to\ clipboard=Exporteer geselecteerde items naar het klembord
 Find\ duplicates=Vind duplicaten
 JabRef\ resources=JabRef middelen
 Manage\ journal\ abbreviations=Beheer logboek afkortingen
-Manage\ protected\ terms=Beheer beschermde voorwaarden
+Manage\ protected\ terms=Beheer beschermde termen
 New\ entry\ from\ plain\ text=Nieuwe invoer van onopgemaakte tekst
+Import\ by\ ID=Importeren via ID
+Enter\ a\ valid\ ID=Voer een geldig ID in
 New\ sublibrary\ based\ on\ AUX\ file=Nieuwe sub-bibliotheek gebaseerd op AUX bestand
 Push\ entries\ to\ external\ application\ (%0)=Stuur entries naar externe applicatie
 Quit=Sluiten
 Recent\ libraries=Recente bibliotheken
+Clear\ recent\ libraries=Recente bibliotheken wissen
 Set\ up\ general\ fields=Algemene velden instellen
 View\ change\ log=Verandering logboek weergeven
 View\ event\ log=Afspraken logboek weergeven
@@ -1624,92 +1973,605 @@ User\:=Gebruiker\:
 Keystore\ password\:=Keystore wachtwoord\:
 Keystore\:=Keystore\:
 Password\:=Wachtwoord\:
+Server\ Timezone\:=Server tijdzone\:
 Remember\ Password=Wachtwoord Onthouden
 Use\ SSL=SSL gebruiken
+Move\ preprint\ information\ from\ 'URL'\ and\ 'journal'\ field\ to\ the\ 'eprint'\ field=Verplaats preprint informatie van 'URL' en 'journal' veld naar het 'eprint' veld
+Customize\ Export\ Formats=Export formaten aanpassen
 Export\ name=Naam exporteren
+Main\ layout\ file\:=Hoofd lay-out bestand\:
 Main\ layout\ file=Hoofd layoutbestand
-
-
-
+Save\ exporter=Exporteur opslaan
+File\ extension\:=Bestandsextensie\:
+Export\ format\ name\:=Exporteer formaatnaam\:
+Cleared\ connection\ settings=Verbindingsinstellingen gewist
+Error\ adding\ discovered\ CitationStyles=Fout bij toevoegen van ontdekte CitationStyles
+(more)=(meer)
+Cancel\ import=Importeren annuleren
+Continue\ with\ import=Doorgaan met importeren
+Import\ canceled=Importeren geannuleerd
+Select\ all\ new\ entries=Selecteer alle nieuwe items
+Select\ all\ entries=Selecteer alle items
+Total\ items\ found\:=Totaal aantal gevonden items\:
+Selected\ items\:=Geselecteerde items\:
+Download\ linked\ online\ files=Download gekoppelde online bestanden
+Select\ the\ entries\ to\ be\ imported\:=Selecteer de items om te importeren\:
+Add\ new\ String=Nieuwe tekenreeks toevoegen
+Must\ not\ be\ empty\!=Moet niet leeg zijn\!
+Open\ Help\ page=Open Help pagina
+Add\ new\ keyword=Voeg nieuw trefwoord toe
+Keyword\:=Trefwoord\:
+Keyword\ "%0"\ already\ exists=Trefwoord "%0" bestaat al
+Keyword\ separator=Trefwoord scheiding
+Remove\ keyword=Trefwoord verwijderen
+Are\ you\ sure\ you\ want\ to\ remove\ keyword\:\ "%0"?=Weet u zeker dat u het trefwoord wilt verwijderen\: "%0"?
+Reset\ to\ default=Standaardinstellingen herstellen
+String\ constants=Tekenreeks constanten
+Export\ all\ entries=Alle items exporteren
+Generate\ citation\ keys=Citaatsleutels genereren
+New\ library=Nieuwe bibliotheek
+OpenOffice/LibreOffice=OpenOffice/LibreOffice
+Open\ document\ viewer=Documentviewer openen
+Open\ entry\ editor=Open item-editor
+Find\ and\ replace=Zoek en vervang
+
+Found\ documents\:=Gevonden documenten\:
+Use\ selected\ document=Geselecteerd document gebruiken
+Dismiss\ changes=Wijzigingen verwerpen
+The\ library\ has\ been\ modified\ by\ another\ program.=De bibliotheek is gewijzigd door een ander programma.
+
+Set\ rank\ to\ one=Zet rang op één
+Set\ rank\ to\ two=Zet rang op twee
+Set\ rank\ to\ three=Zet rang op drie
+Set\ rank\ to\ four=Zet rang op vier
+Set\ rank\ to\ five=Zet rang op vijf
+
+A\ string\ with\ the\ label\ '%0'\ already\ exists.=Een tekenreeks met het label '%0' bestaat al.
 
 Executing\ command\ "%0"...=Commando "%0" uitvoeren...
 
-
-
-
-
-
-
-
+Rename\ file\ to\ a\ given\ name=Hernoem bestand naar een bepaalde naam
+New\ Filename=Nieuwe bestandsnaam
+Rename\ file\ to\ defined\ pattern=Hernoem bestand naar gedefinieerd patroon
+
+Application\ settings=Applicatie instellingen
+
+Export\ an\ input\ to\ a\ file=Exporteer een invoer naar een bestand
+Export\ preferences\ to\ a\ file=Instellingen exporteren naar een bestand
+Import\ BibTeX=BibTeX importeren
+Import\ preferences\ from\ a\ file=Importeer voorkeuren van een bestand
+Matching=Overeenkomend
+Same\ as\ --import,\ but\ will\ be\ imported\ to\ the\ opened\ tab=Hetzelfde als --import, maar zal worden geïmporteerd in het geopende tabblad
+Allow\ integers\ in\ 'edition'\ field\ in\ BibTeX\ mode=Sta gehele getallen in het 'edition' veld toe in BibTeX modus
+
+Search\ for\ citations\ in\ LaTeX\ files...=Zoek naar citaten in LaTeX bestanden...
+LaTeX\ Citations\ Search\ Results=LaTeX Citaten Zoekresultaten
+LaTeX\ files\ directory\:=LaTeX bestanden map\:
+LaTeX\ files\ found\:=LaTeX bestanden gevonden\:
+files=bestanden
+Show\ 'LaTeX\ Citations'\ tab=Toon 'LaTeX Citaten' tabblad
+LaTeX\ Citations=LaTeX Citaten
+Search\ citations\ for\ this\ entry\ in\ LaTeX\ files=Zoek citaten voor dit item in LaTeX bestanden
+No\ citations\ found=Geen citaten gevonden
+No\ LaTeX\ files\ containing\ this\ entry\ were\ found.=Er zijn geen LaTeX-bestanden gevonden die dit item bevatten.
+Selected\ entry\ does\ not\ have\ an\ associated\ citation\ key.=Het geselecteerde item heeft geen bijbehorende citaatsleutel.
+Current\ search\ directory\:=Huidige zoekmap\:
+Set\ LaTeX\ file\ directory=LaTeX bestandsmap instellen
+Import\ entries\ from\ LaTeX\ files=Importeer invoergegevens uit LaTeX bestanden
+Import\ new\ entries=Nieuwe items importeren
+Group\ color=Groep kleur
+
+Columns=Kolommen
+File\ type=Bestandstype
+IEEE=IEEE
+Internal=Intern
+Special=Speciaal
+Remove\ column=Kolom verwijderen
+Add\ custom\ column=Aangepaste kolom toevoegen
+Update\ to\ current\ column\ order=Bijwerken naar huidige kolomvolgorde
+Sort\ column\ one\ step\ upwards=Sorteer kolom 1 stap omhoog
+Sort\ column\ one\ step\ downwards=Sorteer kolom 1 stap naar beneden
+List\ must\ not\ be\ empty.=Lijst mag niet leeg zijn.
+
+Order=Volgorde
+
+Add\ field\ to\ filter\ list=Veld toevoegen aan filterlijst
+Add\ formatter\ to\ list=Voeg formatteerder toe aan lijst
+Filter\ List=Filter lijst
+Open\ files...=Open bestanden...
+
+Affected\ fields=Betrokken velden
+Show\ preview\ as\ a\ tab\ in\ entry\ editor=Voorbeeld weergeven als tabblad in entry editor
+Visual\ theme=Visuele thema
+Overwrite\ existing\ keys=Bestaande sleutels overschrijven
+Key\ patterns=Sleutelpatronen
+Font\ settings=Lettertype instellingen
+Custom...=Aangepast...
+Dark=Donker
+Light=Licht
+Please\ specify\ a\ css\ theme\ file.=Geef een Css-themabestand op.
+You\ must\ enter\ an\ integer\ value\ higher\ than\ 8.=U moet een integerwaarde invoeren die hoger is dan 8.
+Letters\ after\ duplicate\ generated\ keys=Letters na duplicaat gegenereerde sleutels
+Start\ on\ second\ duplicate\ key\ with\ letter\ A\ (a,\ b,\ ...)=Begin bij tweede dubbele sleutel met letter A (a, b, ...)
+Start\ on\ second\ duplicate\ key\ with\ letter\ B\ (b,\ c,\ ...)=Begin op tweede dubbele sleutel met letter B (b, c, ...)
 Always\ add\ letter\ (a,\ b,\ ...)\ to\ generated\ keys=Voeg altijd een letter (a, b, ...) toe aan gegenereerde sleutels
 Default\ pattern=Standaard patroon
+Reset\ %s\ to\ default\ value=%s terugzetten naar standaardwaarde
+Library\ mode=Bibliotheek modus
+Reset\ to\ recommended=Reset naar aanbevolen
+Remove\ all=Alles verwijderen
+Reset\ All=Reset Alles
+Linked\ identifiers=Gekoppelde Id's
+
+insert\ entries=invoer invoegen
+
+Independent=Onafhankelijk
+Intersection=Doorsnede
+Union=Unie
+Collect\ by=Verzameld door
+Explicit\ selection=Expliciete selectie
+Specified\ keywords=Opgegeven trefwoorden
+Cited\ entries=Geciteerde items
+Please\ provide\ a\ valid\ aux\ file.=Geef een geldig aux-bestand op.
+Keyword\ delimiter=Trefwoord scheidingsteken
+Hierarchical\ keyword\ delimiter=Scheidingsteken hiërarchisch sleutelwoord
+Escape\ ampersands=Backslash voor ampersands
+Escape\ dollar\ sign=Backslash voor dollar teken
+
+Copied\ '%0'\ to\ clipboard.=Gekopieerd '%0' naar klembord.
+This\ operation\ requires\ an\ open\ library.=Deze bewerking vereist een open bibliotheek.
+
+Plain\ References\ Parser=Onopgemaakte Referenties Parser
+Please\ enter\ the\ plain\ references\ to\ extract\ from\ separated\ by\ double\ empty\ lines.=Geef a. u. b. de onopgemaakte referenties voor extraheren op, gescheiden door dubbele lege regels.
+Add\ to\ current\ library=Toevoegen aan huidige bibliotheek
+%0\ entries\ were\ parsed\ from\ your\ query.=%0 invoergegevens werden verwerkt uit uw zoekopdracht.
+Starts\ the\ extraction\ and\ adds\ the\ resulting\ entries\ to\ the\ currently\ opened\ database=Start de uitpakking en voegt de bijbehorende items toe aan de momenteel geopende database
+Your\ text\ is\ being\ parsed...=Je tekst wordt verwerkt...
+
+Citation\ key\ filters=Citaatsleutel filters
+Field\ filters=Veld filters
+Message\ filters=Berichten filters
+Clear\ filters=Filters wissen
+
+Add\ new\ Field=Nieuw veld toevoegen
+Add\ new\ entry\ type=Nieuw item type toevoegen
+Required\ and\ optional\ fields=Verplichte en optionele velden
+Index=Indexeren
+Remove\ entry\ type=Invoertype verwijderen
+Remove\ field\ %0\ from\ currently\ selected\ entry\ type=Verwijder veld %0 van het huidige geselecteerde item type
+Optional=Optioneel
+Required=Vereist
+Entry\ type\ cannot\ be\ empty.\ Please\ enter\ a\ name.=Item type mag niet leeg zijn. Voer een naam in.
+Field\ cannot\ be\ empty.\ Please\ enter\ a\ name.=Veld mag niet leeg zijn. Voer een naam in.
+
+Capitalize\ current\ word=Huidige woord kapitaliseren
+Delete\ text=Tekst verwijderen
+Make\ current\ word\ lowercase=Huidige woord kleine letters maken
+Make\ current\ word\ uppercase=Huidige woord hoofdletters maken
+Move\ caret\ left=Beweeg cursor naar links
+Move\ caret\ right=Beweeg cursor naar rechts
+Move\ caret\ to\ previous\ word=Beweeg cursor naar vorig woord
+Move\ caret\ to\ next\ word=Beweeg cursor naar het volgende woord
+Move\ caret\ to\ beginning\ of\ line=Beweeg cursor naar het begin van de lijn
+Move\ caret\ to\ end\ of\ line=Beweeg cursor naar het einde van de lijn
+Move\ the\ caret\ down=Beweeg de cursor naar beneden
+Move\ the\ caret\ to\ the\ beginning\ of\ text=Verplaats de cursor naar het begin van de tekst
+Move\ the\ caret\ to\ the\ end\ of\ text=Verplaats de cursor naar het einde van de tekst
+Move\ the\ caret\ up=Beweeg de cursor omhoog
+Remove\ line\ after\ caret=Verwijder regel na cursor
+Remove\ characters\ until\ next\ word=Tekens verwijderen tot volgende woord
+Remove\ the\ current\ word\ backwards=Verwijder het huidige woord achterwaards
+
+Text\ editor=Tekstbewerker
+
+Search\ ShortScience=Zoek ShortScience
+Unable\ to\ open\ ShortScience.=Kan ShortScience niet openen.
+
+Shared\ database=Gedeelde database
+Lookup=Opzoeken
+
+Access\ date\ of\ the\ address\ specified\ in\ the\ url\ field.=Toegangsdatum van het adres opgegeven in het url veld.
+Additional\ information\ related\ to\ the\ resource\ indicated\ by\ the\ eprint\ field.=Aanvullende informatie gerelateerd aan de bron aangegeven door het eprint veld.
+Annex\ to\ the\ eventtitle\ field.=Bijlage bij het eventtitle veld.
+Author(s)\ of\ a\ commentary\ to\ the\ work.=Auteur(s) van een commentaar op het werk.
+Author(s)\ of\ an\ afterword\ to\ the\ work.=Auteur(s) van een nawoord van het werk.
+Author(s)\ of\ an\ introduction\ to\ the\ work.=Auteur(s) van een inleiding tot het werk.
+Author(s)\ of\ annotations\ to\ the\ work.=Auteur(s) van aantekeningen van het werk.
+Author(s)\ of\ the\ work.=Auteur(s) van het werk.
+Can\ be\ used\ for\ known\ event\ acronyms.=Kan worden gebruikt voor bekende gebeurtenisacroniemen.
+Chapter\ or\ section\ or\ any\ other\ unit\ of\ a\ work.=Hoofdstuk of sectie of elke andere eenheid van een werk.
+Date\ of\ a\ conference,\ a\ symposium,\ or\ some\ other\ event.=Datum van een conferentie, een symposium, of een andere gebeurtenis.
+Designation\ to\ be\ used\ by\ the\ citation\ style\ as\ a\ substitute\ for\ the\ regular\ label\ if\ any\ data\ required\ to\ generate\ the\ regular\ label\ is\ missing.=Aanwijzing voor gebruik door de citaatstijl als vervanging voor het reguliere label als er gegevens ontbreken die nodig zijn om het reguliere label te genereren.
+Digital\ Object\ Identifier\ of\ the\ work.=Digitale objectidentificator van het werk.
+Edition\ of\ a\ printed\ publication.=Editie van een gedrukte publicatie.
+Editor(s)\ of\ the\ work\ or\ the\ main\ publication,\ depending\ on\ the\ type\ of\ the\ entry.=Editor(s) van het werk of de belangrijkste publicatie, afhankelijk van het type van de invoer.
+Electronic\ identifier\ of\ a\ work.=Elektronische identificatie van een werk.
+Electronic\ identifier\ of\ an\ online\ publication.=Elektronische identificatie van een online publicatie.
+If\ the\ work\ is\ published\ as\ part\ of\ another\ one,\ such\ as\ an\ article\ in\ a\ journal\ or\ a\ collection,\ this\ field\ holds\ the\ relevant\ page\ range\ in\ that\ other\ work.\ It\ may\ also\ be\ used\ to\ limit\ the\ reference\ to\ a\ specific\ part\ of\ a\ work\ (a\ chapter\ in\ a\ book,\ for\ example).\ For\ papers\ in\ electronic\ journals\ with\ anon-classical\ pagination\ setup\ the\ eid\ field\ may\ be\ more\ suitable.=Als het werk wordt gepubliceerd als onderdeel van een andere, zoals een artikel in een tijdschrift of een collectie, bevat dit veld het relevante pagina-bereik in dat andere werk. Het kan ook worden gebruikt om de verwijzing te beperken tot een specifiek deel van een werk (bijvoorbeeld een hoofdstuk in een boek). Voor papers in elektronische journals met anon-classical pagineringsinstellingen kan het eid veld geschikter zijn.
+Information\ such\ as\ a\ library\ name\ and\ a\ call\ number.=Informatie zoals een bibliotheeknaam en een gespreksnummer.
+International\ Standard\ Book\ Number\ of\ a\ book.=Internationaal Standaard Boek Nummer van een boek.
+Issue\ of\ a\ journal.=Uitgave van een journal.
+Key\ by\ which\ the\ work\ may\ be\ cited.=Sleutel om het werk te citeren.
+Link(s)\ to\ a\ local\ PDF\ or\ other\ document\ of\ the\ work.=Koppeling(en) naar een lokaal PDF of ander document van het werk.
+Location\ of\ a\ conference,\ a\ symposium,\ or\ some\ other\ event.=Locatie van een conferentie, een symposium of een andere gebeurtenis.
+Main\ title\ of\ a\ multi-volume\ book,\ such\ as\ "Collected\ Works".=Hoofdtitel van een multivolume boek, zoals "Verzamelde werken".
+Miscellaneous\ bibliographic\ data\ usually\ printed\ at\ the\ end\ of\ the\ entry.=Diverse bibliografische gegevens meestal afgedrukt aan het einde van de invoer.
+Miscellaneous\ bibliographic\ data\ which\ does\ not\ fit\ into\ any\ other\ field.=Diverse bibliografische gegevens die niet passen in elk ander veld.
+Name(s)\ of\ the\ (manual)\ groups\ the\ entry\ belongs\ to.=Naam(Namen) van de (handmatige) groepen waartoe de invoer behoort.
+Name(s)\ of\ the\ publisher(s).=Naam(Namen) van de uitgeverij(en).
+Name\ of\ a\ journal,\ a\ newspaper,\ or\ some\ other\ periodical.=Naam van een tijdschrift, een krant, of een andere periodiek.
+Name\ of\ a\ publication\ series,\ such\ as\ "Studies\ in...",\ or\ the\ number\ of\ a\ journal\ series.=Naam van een publicatiereeks, zoals "Studies in...", of het nummer van een tijdschriftreeks.
+Name\ of\ a\ university\ or\ some\ other\ institution.=Naam van een universiteit of een andere instelling.
+Note\ that\ this\ field\ holds\ the\ plain\ title\ of\ the\ event.\ Things\ like\ "Proceedings\ of\ the\ Fifth\ XYZ\ Conference"\ go\ into\ the\ titleaddon\ or\ booktitleaddon\ field.=Merk op dat dit veld de eenvoudige titel bevat van het evenement. Dingen zoals "Proceedings of the Fifth XYZ Conference" gaan in het veld titleaddon of booktitleaddon.
+Note\ that\ this\ field\ is\ intended\ for\ commented\ editions\ which\ have\ a\ commentator\ in\ addition\ to\ the\ author.\ If\ the\ work\ is\ a\ stand-alone\ commentary,\ the\ commentator\ should\ be\ given\ in\ the\ author\ field.=Merk op dat dit veld bedoeld is voor edities met commentaar die een commentator naast de auteur hebben. Als het werk een zelfstandig commentaar is, moet de commentator gegeven worden in het auteursveld.
+Number\ of\ a\ journal\ or\ the\ volume/number\ of\ a\ book\ in\ a\ series.=Aantal van een tijdschrift of het volume/aantal van een boek in een serie.
+One\ or\ more\ page\ numbers\ or\ page\ ranges.=Een of meer paginanummers of pagina-bereik.
+Organization(s)\ that\ published\ a\ manual\ or\ an\ online\ resource,\ or\ sponsored\ a\ conference.=Organisatie(s) die een handleiding of een online bron publiceerden, of die een conferentie gesponsord hebben.
+Publication\ date\ of\ the\ work.=Publicatiedatum van het werk.
+Publication\ month.=Publicatie maand.
+Publication\ notice\ for\ unusual\ publications\ which\ do\ not\ fit\ into\ any\ of\ the\ common\ categories.=Publicatiekennisgeving voor ongebruikelijke publicaties die niet in een van de gemeenschappelijke categorieën passen.
+Publication\ state\ of\ the\ work,\ e.\ g.,\ "in\ press".=Publicatiestaat van het werk, b. v. "in pers".
+Revision\ number\ of\ a\ piece\ of\ software,\ a\ manual,\ etc.=Revisienummer van een stuk software, een handleiding, enz.
+Separated\ list\ of\ keywords.=Gescheiden lijst met trefwoorden.
+Subtitle\ of\ a\ specific\ issue\ of\ a\ journal\ or\ other\ periodical.=Ondertiteling van een specifieke uitgave van een tijdschrift of een andere periodiek.
+Subtitle\ of\ the\ work.=Ondertitel van het werk.
+Place(s)\ of\ publication,\ i.\ e.,\ the\ location\ of\ the\ publisher\ or\ institution,\ depending\ on\ the\ entry\ type.=Plaats(en) van publicatie, bv. de locatie van de uitgever of instelling, afhankelijk van het item type.
+This\ could\ be\ a\ section\ of\ an\ archive,\ a\ path\ indicating\ a\ service,\ a\ classification\ of\ some\ sort.=Dit zou een onderdeel van een archief kunnen zijn, een pad dat een dienst aangeeft, een soort classificatie.
+This\ field\ is\ intended\ for\ journals\ whose\ individual\ issues\ are\ identified\ by\ a\ designation\ such\ as\ "Spring"\ or\ "Summer"\ rather\ than\ the\ month\ or\ a\ number.\ Integer\ ranges\ and\ short\ designators\ are\ better\ written\ to\ the\ number\ field.=Dit veld is bedoeld voor tijdschriften waarvan de individuele uitgaven worden geïdentificeerd met een aanduiding zoals "Lente" of "Zomer" in plaats van de maand of een getal. Geheel getalbereik en korte aanduidingen zijn beter geschreven in het getalveld.
+This\ field\ may\ replace\ the\ pages\ field\ for\ journals\ deviating\ from\ the\ classic\ pagination\ scheme\ of\ printed\ journals\ by\ only\ enumerating\ articles\ or\ papers\ and\ not\ pages.=Dit veld kan het pages veld vervangen voor tijdschriften die afwijken van het klassieke paginatieschema van gedrukte tijdschriften door alleen artikelen of papers en geen pagina's op te sommen.
+This\ is\ roughly\ comparable\ to\ a\ DOI\ but\ specific\ to\ a\ certain\ archive,\ repository,\ service,\ or\ system.=Dit is grofweg vergelijkbaar met een DOI, maar specifiek voor een bepaald archief, repository, dienst of systeem.
+Title\ of\ a\ conference,\ a\ symposium,\ or\ some\ other\ event.=Titel van een conferentie, een symposium of een andere gebeurtenis.
+Title\ of\ a\ specific\ issue\ of\ a\ journal\ or\ other\ periodical.=Titel van een specifieke uitgave van een tijdschrift of een andere periodiek.
+Title\ of\ the\ main\ publication\ this\ work\ is\ part\ of.=Titel van de hoofdpublicatie waar dit werk deel van uitmaakt.
+Title\ of\ the\ work.=Titel van het werk.
+Total\ number\ of\ pages\ of\ the\ work.=Totaal aantal pagina's van het werk.
+Total\ number\ of\ volumes\ of\ a\ multi-volume\ work.=Totaal aantal volumes van multi-volume werk.
+Type\ of\ the\ eprint\ identifier,\ e.\ g.,\ the\ name\ of\ the\ archive,\ repository,\ service,\ or\ system\ the\ eprint\ field\ refers\ to.=Type van de eprint identifier, b. v. de naam van het archief, repository, dienst, of het systeem waar het eprint veld naar verwijst.
+URL\ of\ an\ online\ publication.=URL van een online publicatie.
+Volume\ of\ a\ multi-volume\ book\ or\ a\ periodical.=Volume van een multivolume boek of periodiek.
+Year\ of\ publication.=Jaar van publicatie.
+This\ field\ is\ intended\ for\ recording\ abstracts,\ to\ be\ printed\ by\ a\ special\ bibliography\ style.=Dit veld is bedoeld voor het opnemen van abstracts, af te drukken met een speciale bibliografiestijl.
+This\ field\ may\ be\ useful\ when\ implementing\ a\ style\ for\ annotated\ bibliographies.=Dit veld kan handig zijn bij het implementeren van een stijl voor geannoteerde bibliografieën.
+Subtitle\ related\ to\ the\ "Booktitle".=Ondertitel gerelateerd aan de "Booktitle".
+Annex\ to\ the\ "Booktitle",\ to\ be\ printed\ in\ a\ different\ font.=Bijlage bij de "Booktitle", die in een ander lettertype moet worden afgedrukt.
+Comment\ to\ this\ entry.=Commentaar op deze invoer.
+Secondary\ editor\ performing\ a\ different\ editorial\ role,\ such\ as\ compiling,\ redacting,\ etc.=Secundaire editor presteert een andere redactionele rol, zoals compileren, redacteren, enz.
+Another\ secondary\ editor\ performing\ a\ different\ role.=Een andere secundaire bewerker vervult een andere rol.
+Type\ of\ editorial\ role\ performed\ by\ the\ "Editor".=Type redactionele rol uitgevoerd door de "Editor".
+Type\ of\ editorial\ role\ performed\ by\ the\ "Editora".=Type redactionele rol uitgevoerd door de "Editora".
+Type\ of\ editorial\ role\ performed\ by\ the\ "Editorb".=Type redactionele rol uitgevoerd door de "Editorb".
+Type\ of\ editorial\ role\ performed\ by\ the\ "Editorc".=Type redactionele rol uitgevoerd door de "Editorc".
+Author(s)\ of\ a\ foreword\ to\ the\ work.=Auteur(s) van een voorwoord op het werk.
+International\ Standard\ Technical\ Report\ Number\ of\ a\ technical\ report.=Internationaal Standaard Technisch Rapportnummer van een technisch rapport.
+International\ Standard\ Serial\ Number\ of\ a\ periodical.=Internationaal Standaard Serienummer van een tijdschrift.
+Subtitle\ of\ a\ journal,\ a\ newspaper,\ or\ some\ other\ periodical.=Ondertitel van een tijdschrift, een krant of een ander tijdschrift.
+Language(s)\ of\ the\ work.\ Languages\ may\ be\ specified\ literally\ or\ as\ localisation\ keys.=Taal (talen) van het werk. Talen kunnen letterlijk of als lokalisatiesleutels worden opgegeven.
+Subtitle\ related\ to\ the\ "Maintitle".=Ondertitel gerelateerd aan de "Maintitle".
+Annex\ to\ the\ "Maintitle",\ to\ be\ printed\ in\ a\ different\ font.=Bijlage van de "Maintitle", die in een ander lettertype moet worden afgedrukt.
+Addon\ to\ be\ printed\ immediately\ after\ the\ author\ name\ in\ the\ bibliography.=Addon die onmiddellijk wordt afgedrukt na de auteursnaam in de bibliografie.
+If\ the\ work\ is\ a\ translation,\ a\ reprint,\ or\ something\ similar,\ the\ publication\ date\ of\ the\ original\ edition.=Als het werk een vertaling, een herdruk, of iets soortgelijks is, de publicatiedatum van de oorspronkelijke editie.
+If\ the\ work\ is\ a\ translation,\ the\ language(s)\ of\ the\ original\ work.=Als het werk een vertaling is, de taal(en) van het oorspronkelijke werk.
+Pagination\ of\ the\ work.\ The\ key\ should\ be\ given\ in\ the\ singular\ form.=Paginering van het werk. De sleutel moet worden gegeven in de unieke vorm.
+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.=Aantal van een gedeeltelijke volume. Dit veld geldt alleen voor boeken, niet voor tijdschriften. Het kan gebruikt worden wanneer een logisch volume uit twee of meer fysieke bestaat.
+Title\ in\ an\ abridged\ form.=Titel in een ingetrokken formulier.
+Annex\ to\ the\ "Title",\ to\ be\ printed\ in\ a\ different\ font.=Bijlage van de "Title", die in een ander lettertype moet worden afgedrukt.
+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.=Vertaler(s) van de "Title" of "Booktitle", afhankelijk van het item type. Als de vertaler identiek is aan de "Editor", zullen de standaardstijlen deze velden automatisch samenvoegen in de bibliografie.
+Type\ of\ a\ "Manual",\ "Patent",\ "Report",\ or\ "Thesis".=Type van een "Manual", "Patent", "Report" of "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.=Dit veld bevat een invoersleutel voor de kruisverwijzingsfunctie. Onderliggende items met een "Crossref" veld erven gegevens van het bovenliggende item gespecificeerd in het "Crossref" veld.
+Gender\ of\ the\ author\ or\ gender\ of\ the\ editor,\ if\ there\ is\ no\ author.=Geslacht van de auteur of geslacht van de editor, als er geen auteur is.
+Citation\ keys\ of\ other\ entries\ which\ have\ a\ relationship\ to\ this\ entry.=Citaatsleutels van andere items die een relatie hebben met dit item.
+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.=Dit veld is een alternatief kruisverwijzingsmechanisme. Het verschilt van "Crossref" in die zin dat het kind-item geen gegevens erft van het bovenliggende ouder-item gespecificeerd in het veld "Xref".
+Owner/creator\ of\ this\ entry.=Eigenaar/maker van dit item.
+Timestamp\ of\ this\ entry,\ when\ it\ has\ been\ created\ or\ last\ modified.=Tijdstempel van deze invoer, wanneer het is aangemaakt of laatst gewijzigd.
+User-specific\ printed\ flag,\ in\ case\ the\ entry\ has\ been\ printed.=Gebruikers-specifieke vlag, in het geval dat de vermelding is geprint.
+User-specific\ priority.=Gebruikersspecifieke prioriteit.
+User-specific\ quality\ flag,\ in\ case\ its\ quality\ is\ assured.=Gebruikersspecifieke kwaliteitsvlag voor het geval de kwaliteit ervan gewaarborgd is.
+User-specific\ ranking.=Gebruikersspecifieke rang.
+User-specific\ read\ status.=Gebruikersspecifieke leesstatus.
+User-specific\ relevance\ flag,\ in\ case\ the\ entry\ is\ relevant.=Gebruikersspecifieke relevante vlag, in het geval dat de vermelding relevant is.
+
+Auto\ complete\ disabled.=Automatisch aanvullen uitgeschakeld.
+Auto\ complete\ enabled.=Automatisch aanvullen ingeschakeld.
+
+Remove\ formatter\ for\ %0=Verwijder formatteerder voor %0
+Remove\ formatter\ '%0'=Verwijder formatteerder '%0'
+
+An\ article\ in\ a\ journal,\ magazine,\ newspaper,\ or\ other\ periodical\ which\ forms\ a\ self-contained\ unit\ with\ its\ own\ title.=Een artikel in een tijdschrift, magazine, krant of ander tijdschrift dat een zelfgedefinieerde eenheid met een eigen titel vormt.
+A\ single-volume\ book\ with\ one\ or\ more\ authors\ where\ the\ authors\ share\ credit\ for\ the\ work\ as\ a\ whole.=Een boek met één of meer auteurs waarin de auteurs hun werk als geheel delen.
+A\ book-like\ work\ without\ a\ formal\ publisher\ or\ sponsoring\ institution.=Een boek-achtig werk zonder een formele uitgever of sponsor instelling.
+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.=Een enkelvoudige verzameling met meerdere, op zichzelf staande bijdragen van verschillende auteurs met een eigen titel. Het werk als geheel heeft geen globale auteur maar meestal wel een editor.
+A\ legacy\ alias\ for\ "InProceedings".=Een oudere alias voor "InProceedings".
+A\ part\ of\ a\ book\ which\ forms\ a\ self-contained\ unit\ with\ its\ own\ title.=Een onderdeel van een boek dat een zelfgedefinieerde eenheid met een eigen titel vormt.
+A\ contribution\ to\ a\ collection\ which\ forms\ a\ self-contained\ unit\ with\ a\ distinct\ author\ and\ title.=Een bijdrage aan een collectie die een zelfgedefinieerde eenheid met een afzonderlijke auteur en titel vormt.
+An\ article\ in\ a\ conference\ proceedings.=Een artikel in een conferentieprocedure.
+Technical\ or\ other\ documentation,\ not\ necessarily\ in\ printed\ form.=Technische of andere documentatie, niet noodzakelijkerwijs in gedrukte vorm.
+A\ fallback\ type\ for\ entries\ which\ do\ not\ fit\ into\ any\ other\ category.=Een terugval-type voor items die niet in elke andere categorie passen.
+Similar\ to\ "Thesis"\ except\ that\ the\ type\ field\ is\ optional\ and\ defaults\ to\ the\ localised\ term\ \ Master's\ thesis.=Vergelijkbaar met "Thesis", behalve dat het type veld optioneel is en standaard het veld van de gelokaliseerde term Master's thesis.
+Similar\ to\ "Thesis"\ except\ that\ the\ type\ field\ is\ optional\ and\ defaults\ to\ the\ localised\ term\ PhD\ thesis.=Vergelijkbaar met "Thesis", behalve dat het type veld optioneel is en standaard de gelokaliseerde term PhD thesis is.
+A\ single-volume\ conference\ proceedings.\ This\ type\ is\ very\ similar\ to\ "Collection".=Een enkel-volume conferentie proceedings. Dit type lijkt erg op "Collection".
+Similar\ to\ "Report"\ except\ that\ the\ type\ field\ is\ optional\ and\ defaults\ to\ the\ localised\ term\ technical\ report.=Vergelijkbaar met "Thesis", behalve dat het type veld optioneel is en standaard het veld van de gelokaliseerde term technisch verslag.
+A\ work\ with\ an\ author\ and\ a\ title\ which\ has\ not\ been\ formally\ published,\ such\ as\ a\ manuscript\ or\ the\ script\ of\ a\ talk.=Een werk met een auteur en een titel die niet officieel is gepubliceerd, zoals een manuscript of het script van een gesprek.
+This\ type\ is\ similar\ to\ "InBook"\ but\ intended\ for\ works\ originally\ published\ as\ a\ stand-alone\ book.=Dit type lijkt op "InBook", maar bedoeld voor werken die oorspronkelijk zijn gepubliceerd als een zelfstandig boek.
+An\ article\ in\ a\ work\ of\ reference.\ This\ is\ a\ more\ specific\ variant\ of\ the\ generic\ "InCollection"\ entry\ type.=Een artikel in een werk van referentie. Dit is een meer specifieke variant van het algemene type "InCollection".
+A\ multi-volume\ "Book".=Een multi-volume "Book".
+A\ multi-volume\ "Collection".=Een multi-volume "Collection".
+A\ multi-volume\ "Proceedings"\ entry.=Een multi-volume "Proceedings" invoer.
+A\ multi-volume\ "Reference"\ entry.\ The\ standard\ styles\ will\ treat\ this\ entry\ type\ as\ an\ alias\ for\ "MvCollection".=Een multi-volume "Reference" invoer. De standaard stijlen behandelen dit invoertype als een alias voor "MvCollection".
+This\ entry\ type\ is\ intended\ for\ sources\ such\ as\ web\ sites\ which\ are\ intrinsically\ online\ resources.=Dit toegangstype is bedoeld voor bronnen zoals websites die intrinsiek online bronnen zijn.
+A\ single-volume\ work\ of\ reference\ such\ as\ an\ encyclopedia\ or\ a\ dictionary.=Een werk met een enkel volume van referentie zoals een encyclopedie of een woordenboek.
+A\ technical\ report,\ research\ report,\ or\ white\ paper\ published\ by\ a\ university\ or\ some\ other\ institution.=Een technisch verslag, een onderzoeksverslag, of witboek dat door een universiteit of een andere instelling is gepubliceerd.
+An\ entry\ set\ is\ a\ group\ of\ entries\ which\ are\ cited\ as\ a\ single\ reference\ and\ listed\ as\ a\ single\ item\ in\ the\ bibliography.=Een item set is een groep van items die worden geciteerd als een enkele referentie en worden weergegeven als één item in de bibliografie.
+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.=Aanvullend materiaal in een "Book". Dit type wordt verstrekt voor elementen zoals prefaces, introducties, voorwoorden, nawoorden, etc. die vaak alleen een algemene titel hebben.
+Supplemental\ material\ in\ a\ "Collection".=Aanvullend materiaal in een "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.=Aanvullend materiaal in een "Periodical". Dit type kan handig zijn bij het verwijzen naar items zoals reguliere kolommen, overlijdensberichten, brieven naar de editor, enz. die alleen een algemene titel hebben.
+A\ thesis\ written\ for\ an\ educational\ institution\ to\ satisfy\ the\ requirements\ for\ a\ degree.=Een thesis geschreven voor een onderwijsinstelling om aan de eisen te voldoen voor een graad.
+An\ alias\ for\ "Online",\ provided\ for\ jurabib\ compatibility.=Een alias voor "Online", voorzien voor jurabib compatibiliteit.
+Computer\ software.\ The\ standard\ styles\ will\ treat\ this\ entry\ type\ as\ an\ alias\ for\ "Misc".=Computersoftware. De standaard stijlen zullen dit item type behandelen als een alias voor "Misc".
+A\ data\ set\ or\ a\ similar\ collection\ of\ (mostly)\ raw\ data.=Een dataset of een vergelijkbare verzameling (meestal) ruwe gegevens.
+
+Display\ count\ of\ items\ in\ group=Aantal items in groep weergeven
+Remove\ the\ following\ characters\:=De volgende tekens verwijderen\:
+Truncate=Inkorten
+Truncates\ a\ string\ after\ a\ given\ index.=Kort een tekenreeks in na een bepaalde index.
+Close\ all=Alles sluiten
+Close\ all\ libraries=Sluit alle bibliotheken
+Close\ other\ libraries=Sluit andere bibliotheken
+Close\ others=Andere sluiten
+Reveal\ in\ file\ explorer=Onthullen in bestandsverkenner
+
+Autolink\ files=Bestanden automatisch koppelen
+
+Custom\ editor\ tabs=Aangepaste bewerker tabbladen
+Custom\ export\ formats=Aangepaste exportformaten
+Custom\ import\ formats=Aangepaste importformaten
+
+No\ list\ enabled=Geen lijst ingeschakeld
+Protect\ selection=Selectie beschermen
+Unprotect\ selection=Selectie beschermen ongedaan maken
+
+Customized\ preview\ style=Aangepaste voorbeeld stijl
+Next\ preview\ style=Volgende voorbeeld stijl
+Previous\ preview\ style=Vorige voorbeeld stijl
+
+(\ Note\:\ Press\ return\ to\ commit\ changes\ in\ the\ table\!\ )=(Let op\: Druk op terugkeren om wijzigingen door te voeren in de tabel\! )
+New\ inproceedings=Nieuwe inproceedings
+Reset\ entry\ types\ and\ fields\ to\ defaults=Herstel invoertypes en velden naar standaardwaarden
+This\ will\ reset\ all\ entry\ types\ to\ their\ default\ values\ and\ remove\ all\ custom\ entry\ types=Dit zal alle invoertypes herstellen naar hun standaardwaarden en alle aangepaste invoertypes verwijderen
+Replace\ tabs\ with\ space=Tabs vervangen door spatie
+Replace\ tabs\ with\ space\ in\ the\ field\ content.=Tabs vervangen door spatie in de inhoud van het veld.
+Remove\ redundant\ spaces=Verwijder overbodige spaties
+Replaces\ consecutive\ spaces\ with\ a\ single\ space\ in\ the\ field\ content.=Vervangt opeenvolgende spaties door één spatie in de inhoud van het veld.
+Remove\ digits=Verwijder cijfers
+Removes\ digits.=Verwijdert cijfers.
+
+Presets=Voorkeursinstellingen
+
+Generate\ groups\ from\ keywords\ in\ the\ following\ field=Genereer groepen van trefwoorden in het volgende veld
+Generate\ groups\ for\ author\ last\ names=Genereer groepen voor achternamen van auteurs
+Regular\ expression=Reguliere expressie
+
+Error\ importing.\ See\ the\ error\ log\ for\ details.=Fout bij importeren. Zie het foutenlogboek voor meer informatie.
+
+Error\ from\ import\:\ %0=Fout bij importeren\: %0
+Error\ reading\ PDF\ content\:\ %0=Fout bij lezen van PDF-inhoud\: %0
+Bib\ entry\ was\ successfully\ imported=Bib-invoer is succesvol geïmporteerd
+File\ was\ successfully\ imported\ as\ a\ new\ entry=Bestand is succesvol geïmporteerd als nieuwe invoer
+No\ BibTeX\ data\ was\ found.\ An\ empty\ entry\ was\ created\ with\ file\ link=Geen BibTeX-gegevens gevonden. Er is een lege invoer gemaakt met de bestandslink
+No\ metadata\ was\ found.\ An\ empty\ entry\ was\ created\ with\ file\ link=Geen metadata gevonden. Een lege invoer is gemaakt met de bestandslink
+Processing\ file\ %0=Bestand %0 wordt verwerkt
+Export\ selected=Geselecteerde exporteren
+
+Separate\ merged\ citations=Scheid samengevoegde citaten
+Separate\ citations=Scheid citaten
+
+Unprotect\ terms=Termen beschermen ongedaan maken
+
+Generate\ a\ new\ key\ for\ imported\ entries\ (overwriting\ their\ default)=Genereer een nieuwe sleutel voor geïmporteerde entries (overschrijf hun standaardwaarde)
+Warn\ about\ duplicates\ on\ import=Waarschuwen over duplicaten bij importeren
+
+Custom\ DOI\ URI=Aangepaste DOI URI
+Use\ custom\ DOI\ base\ URI\ for\ article\ access=Gebruik aangepaste DOI basis URI voor toegang tot artikelen
+
+Cited\ on\ pages=Geciteerd op pagina's
+Please\ move\ the\ cursor\ into\ the\ document\ text.=Verplaats de cursor naar de documenttekst.
+To\ get\ the\ visual\ positions\ of\ your\ citations\ I\ need\ to\ move\ the\ cursor\ around,\ but\ could\ not\ get\ it.=Om de visuele posities van uw citaten te krijgen, moet ik de cursor rond bewegen, maar kon het niet krijgen.
+
+I\ cannot\ insert\ to\ the\ cursor's\ current\ location.=Ik kan niet invoegen op de huidige locatie van de cursor.
+
+Please\ move\ the\ cursor\ to\ the\ location\ for\ the\ new\ citation.=Verplaats de cursor naar de locatie voor het nieuwe citaat.
+
+Please\ create\ it\ in\ the\ document\ or\ change\ in\ the\ file\:=Maak het aan in het document of wijzig het bestand\:
+
+Please\ use\ the\ latter\ in\ the\ style\ file\ below\ to\ avoid\ localization\ problems.=Gebruik laatstgenoemde in het onderstaande stijlbestand om lokalisatieproblemen te voorkomen.
+
+The\ %0\ character\ style\ '%1'\ is\ a\ display\ name\ for\ '%2'.=De %0 karakterstijl '%1' is een weergavenaam voor '%2'.
+
+The\ %0\ character\ style\ '%1'\ is\ missing\ from\ the\ document=De %0 karakterstijl '%1' ontbreekt in het document
+
+The\ %0\ paragraph\ style\ '%1'\ is\ a\ display\ name\ for\ '%2'.=De %0 paragraaf-stijl '%1' is een weergavenaam voor '%2'.
+
+The\ %0\ paragraph\ style\ '%1'\ is\ missing\ from\ the\ document=De %0 paragraaf-stijl '%1' ontbreekt in het document
+
+Error\ while\ checking\ if\ Writer\ is\ recording\ changes\ or\ has\ recorded\ changes.=Fout bij het controleren of Writer wijzigingen opneemt of wijzigingen heeft opgenomen.
+
+Cannot\ work\ with\ [Edit]/[Track\ Changes]/[Record]\ turned\ on.=Kan niet werken met [Edit]/[Track Changes]/[Record] ingeschakeld.
+
+Changes\ by\ JabRef\ could\ result\ in\ unexpected\ interactions\ with\ recorded\ changes.=Wijzigingen door JabRef kunnen resulteren in onverwachte interacties met opgeslagen wijzigingen.
+
+Recording\ and/or\ Recorded\ changes=Opname en/of opgenomen wijzigingen
+
+Use\ [Edit]/[Track\ Changes]/[Manage]\ to\ resolve\ them\ first.=Gebruik [Edit]/[Track Changes]/[Manage] om ze eerst op te lossen.
+
+Unable\ to\ find\ valid\ certification\ path\ to\ requested\ target(%0),\ download\ anyway?=Kan geen geldig certificeringspad vinden naar opgevraagde doel(%0), toch downloaden?
+Download\ operation\ canceled.=Download bewerking geannuleerd.
+
+Convert\ timestamp\ field\ to\ field\ 'creationdate'=Converteer tijdsstempel veld naar veld 'creationdate'
+Convert\ timestamp\ field\ to\ field\ 'modificationdate'=Converteer tijdsstempel veld naar veld 'modificationdate'
+
+New\ entry\ by\ type=Nieuwe invoer per type
+
+File\ '%1'\ is\ a\ duplicate\ of\ '%0'.\ Keeping\ '%0'=Bestand '%1' is een duplicaat van '%0'. Behoud '%0'
+File\ '%1'\ is\ a\ duplicate\ of\ '%0'.\ Keeping\ both\ due\ to\ deletion\ error=Bestand '%1' is een duplicaat van '%0'. Beide behouden omdat de fout bij het verwijderen is
+
+Enable\ field\ formatters=Veld formatteerder inschakelen
+Entry\ Type=Invoer Type
+Entry\ types=Invoer types
+Others=Anderen
+Recommended=Aanbevolen
+
+Authors\ and\ Title=Auteurs en Titel
+Catalog=Catalogus
+Catalogs=Catalogi
+Select\ Catalogs\:=Selecteer catalogi\:
+Add\ Author\:=Auteur toevoegen\:
+Add\ Query\:=Query toevoegen\:
+Add\ Research\ Question\:=Onderzoek vraag toevoegen\:
+Queries=Vragen
+Research\ Questions=Onderzoek Vragen
+Study\ Title\:=Studie Titel\:
+Start\ new\ systematic\ literature\ review=Start nieuwe systematische literatuur review
+Manage\ study\ definition=Studiedefinitie beheren
+Update\ study\ search\ results=Update studie zoekresultaten
+Study\ repository\ could\ not\ be\ created=Studie repository kan niet worden aangemaakt
+
+All\ query\ terms\ are\ joined\ using\ the\ logical\ AND,\ and\ OR\ operators=Alle query-temen worden verbonden met de logische AND, en OF operatoren
+Finalize=Afronden
+If\ the\ sequence\ of\ terms\ is\ relevant\ wrap\ them\ in\ double\ quotes =Als de reeks termen relevant is, omhul ze met dubbele aanhalingstekens
+Query\ terms\ are\ separated\ by\ spaces.=Query termen zijn gescheiden door spaties.
+Select\ the\ study\ directory\:=Selecteer de studie map\:
+An\ example\:=Een voorbeeld\:
+Start\ survey=Enquête starten
+Query=Zoekopdracht
+Question=Vraag
+Select\ directory=Map selecteren
+
+Fulltext\ Index=Volledige Tekst Index
+Automatically\ index\ all\ linked\ files\ for\ fulltext\ search=Indexeer automatisch alle gekoppelde bestanden voor fulltext zoeken
+Rebuild\ fulltext\ search\ index=Volledige tekst zoekindex opnieuw opbouwen
+Rebuild\ fulltext\ search\ index\ for\ current\ library?=Volledige tekst zoekindex opnieuw aanmaken voor huidige bibliotheek?
+Rebuilding\ fulltext\ search\ index...=Volledige tekst zoekindex opnieuw opbouwen...
+Failed\ to\ access\ fulltext\ search\ index=Toegang tot volledige zoekindex mislukt
+Found\ match\ in\ %0=Overeenkomst gevonden in %0
+On\ page\ %0=Op pagina %0
+Found\ matches\ in\ Annotations\:=Overeenkomsten gevonden in annotaties\:
+
+Grobid\ URL=Grobid URL
+Remote\ services=Externe services
+Allow\ sending\ PDF\ files\ and\ raw\ citation\ strings\ to\ a\ JabRef\ online\ service\ (Grobid)\ to\ determine\ Metadata.\ This\ produces\ better\ results.=Sta het verzenden van PDF-bestanden en ruwe citaattekenreeksen toe aan een JabRef online service (Grobid) om Metadata te bepalen. Dit levert betere resultaten op.
+
+Fetcher\ cannot\ be\ tested\!=Fetcher kan niet worden getest\!
+Fetcher\ unknown\!=Fetcher onbekend\!
+
+Character\ by\ character=Karakter per karakter
+Embedded=Ingesloten
+Entry=Item
+Parse\ Metadata\ from\ PDF.=Metadata importeren van PDF.
+Symmetric\ character\ by\ character=Symmetrisch karakter per karakter
+Symmetric\ word\ by\ word=Symmetrisch woord voor woord
+Verbatim=Woordelijk
+Word\ by\ word=Woord voor woord
+Could\ not\ extract\ Metadata\ from\:\ %0=Kon Metadata niet ophalen van\: %0
+Merge\ PDF\ metadata=PDF metadata samenvoegen
+
+Add\ certificate=Certificaat toevoegen
+Serial\ number=Serienummer
+Issuer=Uitgever
+Valid\ from=Geldig vanaf
+Valid\ to=Geldig tot
+Signature\ algorithm=Handtekeningalgoritme
+Version=Versie
+
+Error\ downloading=Fout bij downloaden
+
+No\ data\ was\ found\ for\ the\ identifier=Er zijn geen gegevens gevonden voor het identificatienummer
+Server\ not\ available=Server niet beschikbaar
+Fetching\ information\ using\ %0=Gegevens ophalen met %0
+Look\ up\ identifier=Identificatie opzoeken
+Bibliographic\ data\ not\ found.\ Cause\ is\ likely\ the\ client\ side.\ Please\ check\ connection\ and\ identifier\ for\ correctness.=Bibliografische gegevens niet gevonden. De oorzaak is waarschijnlijk de client-kant. Controleer de verbinding en identificatie op juistheid.
+Bibliographic\ data\ not\ found.\ Cause\ is\ likely\ the\ server\ side.\ Please\ try\ again\ later.=Bibliografische gegevens niet gevonden. De oorzaak is waarschijnlijk de server-kant. Probeer het later opnieuw.
+Error\ message\ %0=Foutmelding %0
+Identifier\ not\ found=Id niet gevonden
+
+Custom\ API\ key=Aangepaste API sleutel
+Check\ %0\ API\ Key\ Setting=Controleer %0 API Key Instelling
+
+Edit\ content=Inhoud bewerken
+Copy\ or\ Move\ content=Kopieer of Verplaats inhoud
+Overwrite\ field\ content=Veldinhoud overschrijven
+Set=Instellen
+Append=Toevoegen
+Clear\ field\ content=Veldinhoud leegmaken
+Set\ or\ append\ content=In- of toevoegen van inhoud
+Edit\ field\ content\ for\ selected\ entries=Bewerk veld-inhoud voor geselecteerde invoergegevens
+Rename=Hernoem
+Copy\ content=Kopieer inhoud
+Move\ content=Inhoud verplaatsen
+Swap\ content=Inhoud omwisselen
+Copy\ or\ move\ the\ content\ of\ one\ field\ to\ another=Kopieer of verplaats de inhoud van een veld naar een ander veld
+Automatic\ field\ editor=Automatische veld editor
+From=Van
+Keep\ Modifications=Wijzigingen bijhouden
+To=Naar
+Open\ Link=Koppeling openen
+Highlight\ words=Woorden markeren
+Highlight\ characters=Tekens markeren
+Unified\ View=Gecombineerde weergave
+Split\ View=Weergave splitsen
+Plain\ Text=Onopgemaakte tekst
+Show\ Diff=Verschil weergeven
+Merged\ Entry=Samengevoegde invoer
+Only\ show\ changed\ fields=Toon alleen gewijzigde velden
+
+Edit\ file\ link=Bestandslink bewerken
+
+(Note\:\ If\ original\ entries\ lack\ keywords\ to\ qualify\ for\ the\ new\ group\ configuration,\ confirming\ here\ will\ add\ them)=(Let op\: als sleutelwoorden ontbreken in originele invoergegevens om te kwalificeren voor de nieuwe groepsconfiguratie, zal bevestiging hier deze toevoegen)
+Assign=Toewijzen
+Do\ not\ assign=Niet toewijzen
+
+Error\ occurred\ %0=Fout opgetreden %0
+Left\ Entry=Linker Invoer
+Merge\ %0=Voeg %0 samen
+Right\ Entry=Rechter Invoer
+Unmerge\ %0=Samenvoegen ongedaan maken %0
+plain\ text=onopgemaakte tekst
 
+The\ %0s\ are\ the\ same.\ However,\ the\ order\ of\ field\ content\ differs=De %0s zijn hetzelfde. De volgorde van de veldinhoud verschilt echter
 
+Keep\ from\ import=Behoud van importeren
+Keep\ merged=Samengevoegd houden
+Keep\ old\ entry=Behoud oude invoer
 
+No\ entries\ corresponding\ to\ given\ query=Geen invoergegevens die overeenkomen met de gegeven zoekopdracht
 
+Review\ backup=Backup beoordelen
+A\ backup\ file\ for\ '%0'\ was\ found\ at\ [%1]=Een back-upbestand voor '%0' werd gevonden in [%1]
+Do\ you\ want\ to\ recover\ the\ library\ from\ the\ backup\ file?=Wilt u de bibliotheek herstellen van het backup bestand?
+This\ could\ indicate\ that\ JabRef\ did\ not\ shut\ down\ cleanly\ last\ time\ the\ file\ was\ used.=Dit kan erop duiden dat JabRef niet netjes werd afgesloten toen het bestand voor het laatst werd gebruikt.
 
+Use\ the\ field\ FJournal\ to\ store\ the\ full\ journal\ name\ for\ (un)abbreviations\ in\ the\ entry=Gebruik het veld FJournal om de volledige tijdschriftnaam voor (on)afkortingen in het item op te slaan
 
+Library\ to\ import\ into=Bibliotheek om naar te importeren
 
+Enable\ web\ search=Zoeken op web inschakelen
+Web\ search\ disabled=Zoeken op web uitgeschakeld
 
+Multiline=Meerlijnig
 
+Unable\ to\ open\ linked\ eprint.\ Please\ set\ the\ eprinttype\ field=Kan de gekoppelde eprint niet openen. Stel het eprinttype veld in
+Unable\ to\ open\ linked\ eprint.\ Please\ verify\ that\ the\ eprint\ field\ has\ a\ valid\ '%0'\ id=Kan de gekoppelde eprint niet openen. Controleer of het eprint veld een geldig '%0' id heeft
 
+Search\ from\ history...=Zoeken vanuit geschiedenis...
+your\ search\ history\ is\ empty=je zoekgeschiedenis is leeg
+Clear\ history=Geschiedenis verwijderen
 
+Delete\ %0\ files=%0 bestanden verwijderen
+Delete\ %0\ files\ permanently\ from\ disk,\ or\ just\ remove\ the\ files\ from\ the\ entry?\ Pressing\ Delete\ will\ delete\ the\ files\ permanently\ from\ disk.=%0 bestanden permanent van de schijf verwijderen of gewoon de bestanden van het item verwijderen? Als u op Verwijderen drukt, worden de bestanden permanent van de schijf verwijderd.
+Error\ accessing\ file\ '%0'.=Fout bij toegang tot bestand '%0'.
+This\ operation\ requires\ selected\ linked\ files.=Deze bewerking vereist geselecteerde gekoppelde bestanden.
 
+Create\ backup=Back-up maken
+Automatically\ search\ and\ show\ unlinked\ files\ in\ the\ entry\ editor=Automatisch zoeken en weergeven van niet-gekoppelde bestanden in de entry editor
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-plain\ text=onopgemaakte tekst
-
-
-
-
-Do\ you\ want\ to\ recover\ the\ library\ from\ the\ backup\ file?=Wilt u de bibliotheek herstellen van het backup bestand?
-This\ could\ indicate\ that\ JabRef\ did\ not\ shut\ down\ cleanly\ last\ time\ the\ file\ was\ used.=Dit kan erop duiden dat JabRef niet netjes werd afgesloten toen het bestand voor het laatst werd gebruikt.
-
-
-
+File\ "%0"\ cannot\ be\ added\!=Bestand "%0" kan niet worden toegevoegd\!
+Illegal\ characters\ in\ the\ file\ name\ detected.\nFile\ will\ be\ renamed\ to\ "%0"\ and\ added.=Ongeldige tekens in de bestandsnaam gedetecteerd.\nBestand wordt hernoemd naar "%0" en toegevoegd.
+Rename\ and\ add=Hernoemen en toevoegen
diff --git a/src/main/resources/l10n/JabRef_no.properties b/src/main/resources/l10n/JabRef_no.properties
index fc977aa4d6f..54905fd451a 100644
--- a/src/main/resources/l10n/JabRef_no.properties
+++ b/src/main/resources/l10n/JabRef_no.properties
@@ -1,8 +1,4 @@
 
-
-
-
-
 %0\ contains\ the\ regular\ expression\ <b>%1</b>=%0 inneholder regulæruttrykket <b>%1</b>
 
 %0\ contains\ the\ term\ <b>%1</b>=%0 inneholder uttrykket <b>%1</b>
@@ -221,7 +217,7 @@ Do\ not\ abbreviate\ names=Ikke forkort navn
 
 Do\ not\ open\ any\ files\ at\ startup=Åpne ingen filer ved oppstart
 
-Do\ not\ wrap\ the\ following\ fields\ when\ saving=Ikke introduser linjeskift i følgende felter ved lagring
+
 
 Donate\ to\ JabRef=Doner til JabRef
 
@@ -231,6 +227,7 @@ Download\ file=Last ned fil
 duplicate\ removal=fjerning av duplikater
 
 
+
 Duplicate\ string\ name=Ikke unikt navn på streng
 
 Duplicates\ found=Duplikater funnet
@@ -281,18 +278,14 @@ Exporting=Eksporterer
 Extension=Etternavn
 
 
-External\ file\ links=Eksterne linker
-
 External\ programs=Eksterne programmer
 
 
 Field=Felt
-
 field=felt
 
 Field\ name=Feltnavn
 
-
 Field\ to\ group\ by=Grupperingsfelt
 
 File=Fil
@@ -396,6 +389,8 @@ JabRef\ preferences=JabRef-oppsett
 
 Journal\ abbreviations=Journalforkortelser
 
+
+
 Keep\ both=Behold begge
 
 
@@ -417,19 +412,14 @@ Last\ modified=Sist endret
 
 Link=Lenke
 Listen\ for\ remote\ operation\ on\ port=Lytt etter fjernoperasjoner på port
-Load\ and\ Save\ preferences\ from/to\ jabref.xml\ on\ start-up\ (memory\ stick\ mode)=Hent og lagre innstillinger fra/til jabef.xml ved oppstart (minnepinne-modus)
 
 
-Main\ file\ directory=Hovedkatalog for filer
-
 Manage\ custom\ exports=Sett opp eksterne eksportfiltre
 
 Manage\ custom\ imports=Sett opp eksterne importfiltre
 
 Mark\ new\ entries\ with\ owner\ name=Merk nye oppføringer med navn på eier
 
-Memory\ stick\ mode=Minnepinne-modus
-
 Merged\ external\ changes=Inkorporerte eksterne endringer
 Merge\ fields=Slå sammen felter
 
@@ -499,7 +489,6 @@ Open\ editor\ when\ a\ new\ entry\ is\ created=Start redigering når en ny enhet
 
 Open\ file=Åpne fil
 
-Open\ last\ edited\ libraries\ at\ startup=Åpne sist viste biblioteker ved oppstart
 
 Connect\ to\ shared\ database=Åpne felles bibliotek
 
@@ -514,8 +503,6 @@ Operating\ System\ (Provides\ for\ better\ recommendations\ by\ giving\ an\ indi
 
 Optional\ fields=Valgfrie felter
 
-Options=Valg
-
 or=eller
 
 Override\ default\ file\ directories=Overstyr hovedkataloger for filer
@@ -631,7 +618,6 @@ Restart=Omstart
 Review=Kommentarer
 Review\ changes=Se over endringer
 
-
 Save=Lagre
 Save\ all\ finished.=Fullførte lagring av alle biblioteker
 Save\ all\ open\ libraries=Lagre alle åpne biblioteker
@@ -686,6 +672,9 @@ Show\ BibTeX\ source\ by\ default=Vis BibTeX-kode som standard
 
 Show\ confirmation\ dialog\ when\ deleting\ entries=Vis dialog for å bekrefte sletting av enheter
 
+
+
+
 Show\ last\ names\ only=Vis bare etternavn
 
 Show\ names\ unchanged=Vis navn uforandret
@@ -758,6 +747,7 @@ Value\ cleared\ externally=Verdien slettet eksternt
 View=Vis
 Vim\ server\ name=Navn på Vim-server
 
+
 Warn\ about\ unresolved\ duplicates\ when\ closing\ inspection\ window=Advar om duplikater som ikke er blitt håndtert når inspeksjonsvinduet lukkes
 
 Warn\ before\ overwriting\ existing\ keys=Gi advarsel før eksisterende nøkler skrives over
@@ -828,7 +818,6 @@ User-specific\ file\ directory=Brukerdefinert filkatalog
 Autocomplete\ names\ in\ 'Firstname\ Lastname'\ format\ only=Autokompletter navn i 'Fornavn Etternavn'-format
 Autocomplete\ names\ in\ 'Lastname,\ Firstname'\ format\ only=Autokompletter navn i 'Etternavn, Fornavn'-format
 Autocomplete\ names\ in\ both\ formats=Autokompletter navn i begge format
-Send\ as\ email=Send som e-post
 References=Referanser
 Sending\ of\ emails=Sending av e-post
 Subject\ for\ sending\ an\ email\ with\ references=Emne for sending av e-post med referanser
@@ -888,7 +877,6 @@ Please\ choose\ which\ one\ to\ connect\ to\:=Vennligst velg hvilken du vil kobl
 Choose\ OpenOffice/LibreOffice\ executable=Velg OpenOffice/LibreOffice-startfil
 Select\ document=Velg dokument
 HTML\ list=HTML-liste
-If\ possible,\ normalize\ this\ list\ of\ names\ to\ conform\ to\ standard\ BibTeX\ name\ formatting=Om mulig, normaliser denne navnelisten til standard BibTeX-navneformatering
 Could\ not\ open\ %0=Kunne ikke åpne %0
 Unknown\ import\ format=Ukjent importformat
 Style\ selection=Valg av stil
@@ -939,9 +927,11 @@ Save\ selected\ as\ plain\ BibTeX...=Lagre valgte som BibTeX
 Path\ to\ %0=Sti til %0
 
 
+
 Could\ not\ connect\ to\ %0=Kunne ikke koble til %0
 
 
+
 Invalid\ DOI\:\ '%0'.=Ugyldig DOI\: '%0'.
 
 
@@ -960,6 +950,10 @@ Unabbreviate\ journal\ names=Ekspander journalnavn
 
 
 
+Main\ file\ directory=Hovedkatalog for filer
+
+
+
 
 
 
@@ -1169,6 +1163,13 @@ Default\ pattern=Standardmønster
 
 
 
+
+
+
+
+
+
+
 
 
 
diff --git a/src/main/resources/l10n/JabRef_pl.properties b/src/main/resources/l10n/JabRef_pl.properties
index 6f53407479b..fd73f489351 100644
--- a/src/main/resources/l10n/JabRef_pl.properties
+++ b/src/main/resources/l10n/JabRef_pl.properties
@@ -1,22 +1,38 @@
+Proxy\ requires\ password=Proxy wymaga hasła
 
+Unable\ to\ monitor\ file\ changes.\ Please\ close\ files\ and\ processes\ and\ restart.\ You\ may\ encounter\ errors\ if\ you\ continue\ with\ this\ session.=Nie można monitorować zmian plików. Zamknij pliki i procesy i uruchom ponownie. Jeśli będziesz kontynuować sesję, możesz napotkać błędy.
+%0\ contains\ the\ regular\ expression\ <b>%1</b>=%0 zawiera wyrażenie regularne <b>%1</b>
 
+%0\ contains\ the\ term\ <b>%1</b>=%0 zawiera frazę <b>%1</b>
 
+%0\ doesn't\ contain\ the\ regular\ expression\ <b>%1</b>=%0 nie zawiera wyrażenia regularnego <b>%1</b>
 
+%0\ doesn't\ contain\ the\ term\ <b>%1</b>=%0 nie zawiera frazy <b>%1</b>
 
+%0/%1\ entries=%0/%1 wpisów
 
+Export\ operation\ finished\ successfully.=Operacja eksportu zakończona pomyślnie.
 
+Reveal\ in\ File\ Explorer=Pokaż w Eksploratorze plików
 
+%0\ matches\ the\ regular\ expression\ <b>%1</b>=%0 pasuje do wyrażenia regularnego <b>%1</b>
 
+%0\ matches\ the\ term\ <b>%1</b>=%0 pasuje do frazy <b>%1</b>
 
+Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (DEFAULT\ abbreviation)=Skróć nazwy czasopism dla wybranych wpisów (skrót DEFAULT)
+Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (DOTLESS\ abbreviation)=Skróć nazwy czasopism dla wybranych wpisów (skrót DOTLESS)
+Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (SHORTEST\ UNIQUE\ abbreviation)=Skróć nazwy czasopism dla wybranych wpisów (skrót SHORTEST UNIQUE)
 
-
-
-
-
+Abbreviate\ names=Skróć nazwy
+Abbreviated\ %0\ journal\ names.=Skrócone nazwy %0 czasopism.
 
 Abbreviation=Skrót
+Abbreviations=Skróty
 
+Unabbreviate\ journal\ names\ of\ the\ selected\ entries=Zamień na pełne nazwy czasopism w wybranych wpisach
+Unabbreviated\ %0\ journal\ names.=Zamienione na pełne nazwy %0 czasopism.
 
+shortest\ unique=najkrótsze unikalne
 
 About\ JabRef=O JabRef
 
@@ -24,6 +40,7 @@ Abstract=Abstrakt
 
 Accept=Akceptuj
 
+Accept\ recommendations\ from\ Mr.\ DLib=Zaakceptuj rekomendacje Mr. DLib
 
 Action=Akcja
 
@@ -31,46 +48,69 @@ Add=Dodaj
 
 
 
+Add\ entry\ manually=Dodaj wpis ręcznie
 
+Add\ selected\ entries\ to\ this\ group=Dodaj wybrane wpisy do tej grupy
 
 Add\ subgroup=Dodaj podgrupę
 
 Added\ group\ "%0".=Dodano grupę "%0".
 
+Added\ string\:\ '%0'=Dodano ciąg znaków\: '%0'
+Added\ string=Dodano ciąg znaków
 
 All\ entries=Wszystkie wpisy
 
+Also\ remove\ subgroups=Usuń również podgrupy
 
 and=i
 
+any\ field\ that\ matches\ the\ regular\ expression\ <b>%0</b>=dowolne pole pasujące do wyrażenia regularnego <b>%0</b>
 
 Appearance=Wygląd
 
 Application=Aplikacja
 
+Application\ to\ push\ entries\ to=Aplikacja, do której będą wysyłane wpisy
 
 Apply=Zastosuj
 
+Arguments\ passed\ on\ to\ running\ JabRef\ instance.\ Shutting\ down.=Argumenty przekazane do działającej instancji JabRef. Zamykanie aplikacji.
 
+Assign\ the\ original\ group's\ entries\ to\ this\ group?=Przypisać wpisy z pierwotnej grupy do tej grupy?
 
+Assigned\ %0\ entries\ to\ group\ "%1".=Przypisano %0 wpisów do grupy "%1".
 
+Assigned\ 1\ entry\ to\ group\ "%0".=Przypisano 1 wpis do grupy "%0".
 
+Autogenerate\ citation\ keys=Automatycznie generuj klucze cytowania
 
+Autolink\ files\ with\ names\ starting\ with\ the\ citation\ key=Automatycznie podpinaj pliki z nazwami zaczynającymi się od klucza cytowania
 
+Autolink\ only\ files\ that\ match\ the\ citation\ key=Automatycznie podpinaj tylko pliki, które pasują do klucza cytowania
 
+Automatically\ create\ groups=Automatycznie twórz grupy
 
+Automatically\ remove\ exact\ duplicates=Automatycznie usuwaj dokładne duplikaty
 
+AUX\ file\ import=Import pliku AUX
 
+Available\ export\ formats=Dostępne formaty eksportu
 
+Available\ import\ formats=Dostępne formaty importu
 
 %0\ source=%0 źródło
 
+Background\ Tasks=Zadania w tle
 
+Background\ Tasks\ are\ running=Zadania w tle są uruchomione
 
+Background\ Tasks\ are\ done=Zadania w tle zostały wykonane
 
 Browse=Przeglądaj
 
 by=autorstwa
+The\ conflicting\ fields\ of\ these\ entries\ will\ be\ merged\ into\ the\ 'Comment'\ field.=Konfliktowe pola tych wpisów zostaną scalone w polu "Komentarz".
 
 Cancel=Anuluj
 Cannot\ create\ group=Nie można utworzyć grupy
@@ -79,25 +119,36 @@ Cannot\ create\ group.\ Please\ create\ a\ library\ first.=Nie można utworzyć
 
 Cannot\ open\ folder\ as\ the\ file\ is\ an\ online\ link.=Nie można otworzyć folderu ponieważ plik jest zasobem online.
 
+case\ insensitive=ignoruj wielkość liter
 
+case\ sensitive=rozróżniaj wielkość liter
 
 Case\ sensitive=Rozróżniaj wielkość liter
 
+change\ assignment\ of\ entries=zmień przypisanie wpisów
 
+Change\ case=Zmiana wielkości liter
 
 Change\ entry\ type=Zmień typ wpisu
 
 
+Change\ of\ Grouping\ Method=Zmiana metody grupowania
 
+change\ preamble=zmień preambułę
 
+Changed\ language=Zmieniono język
 
+Changed\ preamble=Zmieniono preambułę
 
+Cite\ command=Polecenie cytowania
 
 Clear=Wyczyść
 
+Open\ /\ close\ entry\ editor=Otwórz / zamknij edytor wpisów
 
 Close\ dialog=Zamknij okno
 
+Close\ the\ current\ library=Zamknij bieżącą bibliotekę
 
 Close\ window=Zamknij okno
 
@@ -113,41 +164,68 @@ Copied=Skopiowano
 Copy=Kopiuj
 
 Copy\ title=Kopiuj tytuł
+Copy\ \\cite{citation\ key}=Kopiuj \\cite{citation key}
+Copy\ citation\ (html)=Kopiuj cytowanie (html)
+Copy\ citation\ (text)=Kopiuj cytowanie (tekst)
+Copy\ citation\ key=Kopiuj klucz cytowania
+Copy\ citation\ key\ and\ link=Skopiuj klucz cytowania i link
+Copy\ citation\ key\ and\ title=Kopiuj klucz cytowania i tytuł
 
 Copy\ to\ clipboard=Skopiuj do schowka
 
+Could\ not\ call\ executable=Nie można wywołać pliku wykonywalnego
 
 Could\ not\ export\ file=Nie udało się wyeksportować pliku
 
+Could\ not\ export\ preferences=Nie można wyeksportować ustawień
 
+Could\ not\ find\ a\ suitable\ import\ format.=Nie można znaleźć odpowiedniego formatu importu.
+Could\ not\ import\ preferences=Nie udało się zaimportować ustawień
 
+Could\ not\ instantiate\ %0=Nie można utworzyć instancji %0
+Could\ not\ instantiate\ %0\ %1=Nie można utworzyć instancji %0 %1
+Could\ not\ instantiate\ %0.\ Have\ you\ chosen\ the\ correct\ package\ path?=Nie można utworzyć instancji %0. Czy wybrałeś poprawną ścieżkę pakietu?
 
 Could\ not\ print\ preview=Nie można wydrukować podglądu
 
 Could\ not\ run\ the\ 'vim'\ program.=Nie można uruchomić programu 'vim'.
 
+Create\ custom\ fields\ for\ each\ BibTeX\ entry=Utwórz niestandardowe pola dla każdego wpisu BibTeX
 
+crossreferenced\ entries\ included=dodano wpisy krzyżowo powiązane
 
+Current\ content\:\ %0=Bieżąca zawartość\: %0
 
+Current\ value\:\ %0=Bieżąca wartość\: %0
 
+Custom\ entry\ types=Niestandardowe typy wpisów
 
+Custom\ entry\ types\ found\ in\ file=Znaleziono niestandardowe typy wpisów w pliku
 
+Customize\ entry\ types=Dostosuj typy wpisów
 
+Customize\ key\ bindings=Dostosuj skróty klawiszowe
 
 Cut=Wytnij
 
 cut\ entries=wytnij wpisy
 
+cut\ entry\ %0=wytnij wpis %0
 
 Library\ encoding=Kodowanie biblioteki
 
 Library\ properties=Właściwości biblioteki
+%0\ -\ Library\ properties=%0 - Właściwości biblioteki
 
 Default=Domyślne
 
+Character\ encoding\ UTF-8\ is\ not\ supported.=Kodowanie znaków UTF-8 nie jest obsługiwane.
+UTF-8\ could\ not\ be\ used\ to\ encode\ the\ following\ characters\:\ %0=Nie można użyć UTF-8 do zakodowania następujących znaków\: %0
+The\ chosen\ encoding\ '%0'\ could\ not\ encode\ the\ following\ characters\:=Wybrane kodowanie '%0' nie może zakodować następujących znaków\:
 
 Downloading=Pobieranie
 
+Execute\ default\ action\ in\ dialog=Wykonaj domyślną akcję w oknie dialogowym
 
 Delete=Usuń
 
@@ -157,35 +235,53 @@ Delete\ multiple\ entries=Usuń wiele wpisów
 
 Deleted=Usunięto
 
+Permanently\ delete\ local\ file=Trwale usuń plik lokalny
 
 Descending=Malejąco
 
 Description=Opis
 
+Do\ not\ ask\ again=Nie pytaj ponownie
 
+Display\ all\ entries\ belonging\ to\ one\ or\ more\ of\ the\ selected\ groups=Wyświetl wszystkie wpisy należące do jednej lub więcej wybranych grup
 
 Display\ all\ error\ messages=Wyświetl wszystkie komunikaty o błędach
 
+Display\ help\ on\ command\ line\ options=Wyświetl pomoc o opcjach wiersza poleceń
 
+Display\ only\ entries\ belonging\ to\ all\ selected\ groups=Wyświetl tylko wpisy należące do wszystkich wybranych grup
+Display\ version=Wyświetl wersję
 
+Do\ not\ abbreviate\ names=Nie skracaj nazw
 
 
 Do\ not\ open\ any\ files\ at\ startup=Nie otwieraj żadnych plików podczas uruchomienia
 
+Do\ not\ wrap\ when\ saving=Nie pakuj podczas zapisywania
+
+Do\ not\ write\ the\ following\ fields\ to\ XMP\ Metadata=Nie zapisuj następujących pól do metadanych XMP
 
 Donate\ to\ JabRef=Wspomóż JabRef
 
 Download\ file=Pobierz plik
 
+Downloaded\ website\ as\ an\ HTML\ file.=Pobrano stronę internetową jako plik HTML.
 
 duplicate\ removal=usuwanie duplikatów
 
+Duplicate\ fields=Duplikuj pola
+
+Unable\ to\ change\ field\ name.\ "%0"\ already\ in\ use.=Nie można zmienić nazwy pola. "%0" jest już w użyciu.
 
+Duplicate\ string\ name=Duplikuj nazwę ciągu znaków
 
 Duplicates\ found=Znaleziono duplikaty
 
+Dynamically\ group\ entries\ by\ a\ free-form\ search\ expression=Dynamiczne grupowanie wpisów za pomocą wyszukiwania wyrażenia
 
+Dynamically\ group\ entries\ by\ searching\ a\ field\ for\ a\ keyword=Dynamiczne grupowanie wpisów za pomocą wyszukiwania słowa kluczowego
 
+Each\ line\ must\ be\ of\ the\ following\ form\:\ 'tab\:field1;field2;...;fieldN'.=Każda linia musi mieć następującą formę\: 'tab\:field1;field2;...;fieldN'.
 
 Edit=Edytuj
 
@@ -193,13 +289,16 @@ Edit\ file\ type=Edytuj typ pliku
 
 Edit\ group=Edytuj grupę
 
+Edit\ strings=Edytuj ciągi znaków
 
 empty\ library=pusta biblioteka
 Autocompletion=Autouzupełnianie
 
+Enter\ URL\ to\ download=Wprowadź adres URL do pobrania
 
 entries=wpisy
 
+Entries\ exported\ to\ clipboard=Wpisy wyeksportowane do schowka
 
 entry=wpis
 
@@ -211,32 +310,48 @@ Entry\ preview=Podgląd wpisu
 
 Entry\ table=Tabela wpisów
 Entry\ table\ columns=Kolumny tabeli wpisów
+Entry\ Title\ (Required\ to\ deliver\ recommendations.)=Tytuł wpisu (Konieczny do przedstawienia propozycji.)
 Error=Błąd
 Error\ occurred\ when\ parsing\ entry=Wystąpił błąd podczas przetwarzania wpisu
 Error\ opening\ file=Błąd podczas otwierania pliku
 Error\ while\ writing=Błąd podczas zapisywania
+Error\ during\ persistence\ of\ crawling\ results.=Błąd podczas utrzymywania się wyników wyszukiwania.
+Error\ during\ reading\ of\ study\ definition\ file.=Błąd podczas odczytu pliku definicji badania.
+'%0'\ exists.\ Overwrite\ file?='%0' istnieje, nadpisać plik?
 Export=Eksportuj
+Export\ preferences=Eksportuj ustawienia
+Export\ preferences\ to\ file=Eksportuj ustawienia do pliku
 Export\ to\ clipboard=Eksportuj do schowka
 Export\ to\ text\ file.=Eksportuj do pliku tekstowego.
 Exporting=Eksportowanie
 Extension=Rozszerzenie
 
-
+External\ Changes\ Resolver=Resolwer zewnętrznych zmian
 
 External\ programs=Programy zewnętrzne
 
+Failed\ to\ import\ by\ ID=Nie udało się zaimportować poprzez identyfikator
 
 Field=Pole
-
 field=pole
 
 Field\ name=Nazwa pola
+Field\ names=Nazwy pól
+Field\ names\ are\ not\ allowed\ to\ contain\ white\ spaces\ or\ certain\ characters\ (%0).=Nazwy pól nie mogą zawierać białych spacji ani niektórych znaków (%0).
+New\ field\ name=Nowa nazwa pola
+Add\ new\ field\ name=Dodaj nową nazwę pola
+Field\ name\ "%0"\ already\ exists=Nazwa pola "%0" już istnieje
+No\ field\ name\ selected\!=Nie wybrano nazwy pola\!
+Remove\ field\ name=Usuń nazwę pola
+Are\ you\ sure\ you\ want\ to\ remove\ field\ name\:\ "%0"?=Czy na pewno chcesz usunąć nazwę pola\: "%0"?
+Manage\ field\ names\ &\ content=Zarządzaj nazwami pól i ich zawartością
 
-
+Field\ to\ group\ by=Pole do grupowania według
 
 File=Plik
 
 file=plik
+File\ directory\ is\ not\ set\ or\ does\ not\ exist\!=Katalog pliku nie jest ustawiony lub nie istnieje\!
 
 File\ exists=Plik istnieje
 
@@ -246,26 +361,41 @@ Filter=Filtruj
 
 Filter\ groups=Filtruj grupy
 
+Success\!\ Finished\ writing\ metadata.=Sukces\! Zakończono zapisywanie metadanych.
+Finished\ writing\ metadata\ for\ %0\ file\ (%1\ skipped,\ %2\ errors).=Zakończono zapisywanie metadanych dla pliku %0 (%1 pominiętych, %2 błędy).
+Error\ while\ writing\ metadata.\ See\ the\ error\ log\ for\ details.=Błąd podczas zapisywania metadanych. Aby uzyskać szczegółowe informacje, zobacz dziennik błędów.
+Failed\ to\ write\ metadata,\ file\ %1\ not\ found.=Nie udało się zapisać metadanych, nie znaleziono pliku %1.
 
+First\ select\ the\ entries\ you\ want\ keys\ to\ be\ generated\ for.=Najpierw wybierz wpisy, dla których chcesz wygenerować klucze.
 
+Fit\ table\ horizontally\ on\ screen=Dopasuj tabelę poziomo na ekranie
 
 
+Format\ of\ author\ and\ editor\ names=Format nazw autora i wydawcy
+Format\ string=Formatuj ciąg znaków
 
 Format\ used=Użyty format
+Formatter\ name=Nazwa formatera
 
+found\ in\ AUX\ file=znaleziono w pliku AUX
 
 Fulltext\ for=Pełny tekst dla
 
+Further\ information\ about\ Mr.\ DLib\ for\ JabRef\ users.=Więcej informacji o Mr. DLib dla użytkowników JabRef.
 
 General=Ogólne
 
 Generate=Generuj
 
+Generate\ citation\ key=Generuj klucz cytowania
 
 Generate\ keys=Wygeneruj klucze
 
+Generate\ keys\ before\ saving\ (for\ entries\ without\ a\ key)=Generuj klucze przed zapisaniem (dla wpisów bez klucza)
 
+Generated\ citation\ key\ for=Wygenerowano klucz cytowania dla
 
+Generating\ citation\ key\ for=Generowanie klucza cytowania dla
 Get\ fulltext=Pobierz pełen tekst
 
 
@@ -276,10 +406,12 @@ Help=Pomoc
 
 
 
+Hierarchical\ context=Kontekst hierarchiczny
 
 Highlight=Zaznaczanie
 Marking=Zaznaczenie
 Underline=Podkreśl
+Empty\ Highlight=Puste podświetlenie
 
 HTML\ table=Tabela HTML
 Icon=Ikona
@@ -299,52 +431,99 @@ Import\ preferences\ from\ file=Importuj ustawienia z pliku
 
 Imported\ entries=Zaimportowane wpisy
 
+Importer\ class=Klasa importera
 
 Importing=Importowanie
 
+Importing\ in\ unknown\ format=Importowanie w nieznanym formacie
 
 
 I\ Agree=Wyrażam zgodę
 
+Indexing\ pdf\ files=Indeksowanie plików pdf
+Indexing\ for\ %0=Indeksowanie dla %0
 
+Invalid\ citation\ key=Nieprawidłowy klucz cytowania
 
 Invalid\ URL=Nieprawidłowy URL
 
+Online\ help=Pomoc online
 
 JabRef\ preferences=Preferencje JabRef
 
 Journal\ abbreviations=Skróty czasopism
+Journal\ lists\:=Listy czasopism\:
+Remove\ journal\ '%0'=Usuń czasopismo '%0'
+
+Journal\ Information=Informacje o czasopiśmie
+Year=Rok
+ISSN\ or\ journal\ name\ required\ for\ fetching\ journal\ information=ISSN lub tytuł czasopisma wymagane do pobrania informacji o czasopiśmie
+Fetch\ journal\ information\ online\ to\ show=Pobierz z sieci i wyświetl informacje o czasopiśmie
+Allow\ sending\ ISSN\ to\ a\ JabRef\ online\ service\ (SCimago)\ for\ fetching\ journal\ information=Zezwalaj na wysyłanie ISSN do usługi online JabRef (SCimago) w celu pobierania informacji o czasopiśmie
+Please\ enable\ journal\ information\ fetching\ in\ %0\ >\ %1=Proszę włączyć pobieranie informacji o czasopiśmie w %0 > %1
+Categories=Kategorie
+ISSN=ISSN
+Publisher=Wydawca
+h-index=indeks h
+Error\ while\ fetching\ journal\ information\:\ %0=Błąd podczas pobierania informacji o czasopiśmie\: %0
+ISSN\ and/or\ journal\ name\ not\ found\ in\ catalog=Nie znaleziono w katalogu numeru ISSN i/lub nazwy czasopisma
+Citable\ Docs\ (Previous\ 3\ Years)=Cytowalne dokumenty (poprzednie 3 lata)
+Cites\ Incoming\ by\ Recently\ Published=Cytuje nadchodzące według czasu publikacji
+Cites\ Outgoing=Cytuje wychodzące
+Cites\ Outgoing\ per\ Document=Cytuje wychodzące dla każdego dokumentu
+Docs\ (This\ Year)=Dokumenty (bieżący rok)
+Incorrect\ ISSN\ format=Nieprawidłowy format ISSN
+Error\ accessing\ catalog=Błąd dostępu do katalogu
+
+Check\ for\ latest\ version\ online=Sprawdź najnowszą wersję online
+Please\ use\ the\ latest\ version\ of\ JabRef\ if\ you\ run\ into\ a\ bug.\ If\ you\ encounter\ an\ issue\ or\ a\ bug,\ check\ the\ latest\ version,\ if\ the\ issue\ is\ still\ present.=Proszę użyć najnowszej wersji JabRef, jeśli odnajdziesz błąd. Jeśli napotkasz problem lub błąd, sprawdź w najnowszej wersji, czy jest on nadal obecny.
 
 Keep\ both=Zachowaj oba
 
+Keep\ subgroups=Zachowaj podgrupy
 
+Key\ bindings=Skróty klawiszowe
 
+Key\ bindings\ changed=Zmieniono skróty klawiszowe
 
+Key\ pattern=Układ klawiszy
 
+keys\ in\ library=klucze w bibliotece
 
 Keyword=Słowo kluczowe
 
 Keywords=Słowa kluczowe
 
 Label=Etykieta
+Label\:\ %0=Etykieta\: %0
+Content\:\ %0=Zawartość\: %0
 Language=Język
 
 Last\ modified=Data Modyfikacji
+LaTeX\ AUX\ file\:=Plik LaTeX AUX\:
 
 Link=Odnośnik
+Listen\ for\ remote\ operation\ on\ port=Słuchaj zdalnych operacji na porcie
+Memory\ stick\ mode\ -\ Store\ preferences\ in\ 'jabref.xml'\ in\ the\ app\ folder.=Tryb przenośny - Przechowuj preferencje w pliku 'jabref.xml' w folderze aplikacji.
 
+Show\ advanced\ hints\ (i.e.\ helpful\ tooltips,\ suggestions\ and\ explanation)=Pokaż zaawansowane wskazówki (np. pomocne podpowiedzi, sugestie i wyjaśnienia)
 
+Manage\ custom\ exports=Zarządzaj niestandardowymi eksportami
 
+Manage\ custom\ imports=Zarządzaj niestandardowymi importami
+External\ file\ types=Zewnętrzne typy plików
 
+Mark\ new\ entries\ with\ owner\ name=Oznacz nowe wpisy nazwą właściciela
 
-
-
+Merged\ external\ changes=Scalone zmiany zewnętrzne
 Merge\ fields=Połącz pola
 
 Modified\ group\ "%0".=Zmodyfikowano grupę "%0".
 
 Modified\ groups=Zmodyfikowane grupy
 
+Modified\ string=Zmodyfikowany ciąg znaków
+Modified\ string\:\ '%0' =Zmodyfikowany ciąg znaków\: '%0'
 
 Modify=Modyfikuj
 
@@ -352,13 +531,19 @@ move\ group=przenieś grupę
 
 Moved\ group\ "%0".=Przeniesiono grupę "%0".
 
+Mr.\ DLib\ Privacy\ settings=Ustawienia prywatności Mr. DLib
 
+No\ database\ is\ open=Baza danych nie jest otwarta
 
+We\ need\ a\ database\ to\ export\ from.\ Open\ one.=Do eksportu potrzebna jest baza danych. Otwórz jakąś.
 
+No\ recommendations\ received\ from\ Mr.\ DLib\ for\ this\ entry.=Nie otrzymano żadnych propozycji od Mr. DLib dla tego wpisu.
 
+Error\ while\ fetching\ recommendations\ from\ Mr.DLib.=Błąd podczas pobierania propozycji od Mr. DLib.
 
 Name=Nazwa
 
+Name\ formatter=Formatowanie nazwy
 
 
 
@@ -378,7 +563,9 @@ not=nie
 
 not\ found=nie znaleziono
 
+Nothing\ to\ redo=Brak zmian do powtórki
 
+Nothing\ to\ undo=Brak zmian do cofnięcia
 
 OK=OK
 
@@ -388,13 +575,17 @@ Open=Otwórz
 
 Open\ library=Otwórz bibliotekę
 
+Open\ editor\ when\ a\ new\ entry\ is\ created=Otwórz edytor po utworzeniu nowego wpisu
 
 Open\ file=Otwórz plik
 
+Open\ last\ edited\ libraries\ on\ startup=Otwórz ostatnio edytowane biblioteki przy starcie
 
+Connect\ to\ shared\ database=Połącz ze współdzieloną bazą danych
 
 Open\ terminal\ here=Otwórz terminal
 
+Open\ URL\ or\ DOI=Otwórz adres URL lub DOI
 
 Opening=Otwieranie
 
@@ -402,12 +593,11 @@ Operation\ canceled.=Operacja anulowana.
 
 Optional\ fields=Opcjonalne pola
 
-Options=Opcje
-
 or=lub
 
 Overwrite=Zastąp
 
+Overwrite\ keys=Nadpisz klucze
 
 Password=Hasło
 
@@ -415,6 +605,7 @@ Paste=Wklej
 
 paste\ entries=wklej wpisy
 
+paste\ entry\ %0=wklej wpis %0
 
 
 
@@ -432,10 +623,17 @@ Citation\ Style=Styl cytatowania
 Current\ Preview=Bieżący podgląd
 Available=Dostępne
 Selected=Wybrane
+Selected\ Layouts\ can\ not\ be\ empty=Wybrane układy nie mogą być puste
+Reset\ default\ preview\ style=Resetuj domyślny styl podglądu
 Previous\ entry=Poprzedni wpis
 Problem\ with\ parsing\ entry=Problem z parsowaniem wpisu
+Processing\ %0=Przetwarzanie %0
+Pull\ changes\ from\ shared\ database=Pobierz zmiany ze współdzielonej bazy danych
+Problem\ finding\ files.\ See\ error\ log\ for\ details.=Problem ze znalezieniem plików. Aby uzyskać szczegółowe informacje, zobacz dziennik błędów.
 
+Pushed\ citations\ to\ %0=Wysłano cytowania do %0
 
+Push\ applications=Aplikacje do których wysyłane są cytowania
 
 Quit\ JabRef=Opuść JabRef
 
@@ -444,6 +642,7 @@ Read\ only=Tylko do odczytu
 Redo=Przywróć
 
 
+regular\ expression=wyrażenie regularne
 
 Related\ articles=Powiązane artykuły
 
@@ -453,38 +652,64 @@ Remove=Usuń
 
 Remove\ subgroups=Usuń podgrupy
 
+Remove\ all\ subgroups\ of\ "%0"?=Usunąć wszystkie podgrupy z "%0"?
 
+Remove\ selected\ entries\ from\ this\ group=Usuń wybrane wpisy z tej grupy
 
 Remove\ group=Usuń grupę
 
 Remove\ group\ and\ subgroups=Usuń grupę i podgrupy
 
+Remove\ groups\ and\ subgroups=Usuń grupy i podgrupy
 
+Remove\ all\ selected\ groups\ and\ keep\ their\ subgroups?=Usunąć wszystkie zaznaczone grupy i zachować ich podgrupy?
 
+Remove\ group\ "%0"\ and\ keep\ its\ subgroups?=Usunąć grupę "%0" i zachować jej podgrupy?
 
+Remove\ groups=Usuń grupy
 
+Removed\ all\ selected\ groups.=Usunięto wszystkie zaznaczone grupy.
 
+Remove\ group\ "%0"\ and\ its\ subgroups?=Usunąć grupę "%0" i jej podgrupy?
 
+Removed\ group\ "%0"\ and\ its\ subgroups.=Usunięto grupę "%0" i jej podgrupy.
 
+Remove\ all\ selected\ groups\ and\ their\ subgroups?=Usunąć wszystkie zaznaczone grupy i ich podgrupy?
 
+Removed\ all\ selected\ groups\ and\ their\ subgroups.=Usunięto wszystkie zaznaczone grupy i ich podgrupy.
 
+Remove\ group\ "%0"?=Usunąć grupę "%0"?
 
 Remove\ link=Usuń łącze
 
+Remove\ string\ %0=Usuń ciąg znaków %0
 
+Removed\ group\ "%0".=Usunięto grupę "%0".
 
+Deleted\ string=Usunięto ciąg znaków
+Deleted\ string\:\ '%0'=Usunięto ciąg znaków\: '%0'
 
+Renamed\ string\:\ '%0'=Zmieniono nazwę ciągu znaków\: '%0'
 
 Replace=Zamień
 Replace\ With\:=Zamień na\:
+Limit\ to\ Selected\ Entries=Ogranicz do wybranych wpisów
+Limit\ to\ Fields=Ogranicz do pól
+All\ Field\ Replace=Zastąp we wszystkich polach
 Find\:=Znajdź\:
 Find\ and\ Replace=Znajdź i zamień
 
+Replace\ (regular\ expression)=Zastąp (wyrażenie regularne)
 
+Replace\ String=Zastąp ciąg znaków
+Replace\ string=Zastąp ciąg znaków
 
+Replace\ Unicode\ ligatures=Zastąp ligatury Unicode
+Replaces\ Unicode\ ligatures\ with\ their\ expanded\ form=Zastąp ligatury Unicode ich rozszerzoną postacią
 
 Required\ fields=Pola wymagane
 
+Resolve\ BibTeX\ strings=Rozwiąż ciągi znaków BibTeX
 
 resolved=rozwiązano
 
@@ -492,32 +717,73 @@ Restart=Uruchom ponownie
 
 Restart\ required=Wymagane ponowne uruchomienie
 
+Return\ to\ dialog=Powrót do okna dialogowego
 
+Review=Przejrzyj
 Review\ changes=Przejrzyj zmiany
-
+Review\ Field\ Migration=Przejrzyj migrację pól
 
 Save=Zapisz
+Save\ all\ finished.=Zapisz wszystko zakończone.
+Save\ all\ open\ libraries=Zapisz wszystkie otwarte biblioteki
+Save\ before\ closing=Zapisz przed zamknięciem
 Save\ library=Zapisz bibliotekę
 Save\ library\ as...=Zapisz bibliotekę jako...
 Saving=Zapisywanie
 Saving\ all\ libraries...=Zapisywanie wszystkich biblioteki...
 Saving\ library=Zapisywanie biblioteki
+Library\ saved=Biblioteka zapisana
 Could\ not\ save\ file.=Nie można zapisać pliku.
 Could\ not\ save,\ file\ locked\ by\ another\ JabRef\ instance.=Nie można zapisać, plik zablokowany przez inną instancję JabRef.
+Saved\ selected\ to\ '%0'.=Zapisano w '%0'.
+Autosave\ local\ libraries=Autozapis lokalnych bibliotek
+Automatically\ save\ the\ library\ to=Automatycznie zapisz bibliotekę do
 Please\ enter\ a\ valid\ file\ path.=Wprowadź prawidłową ścieżkę do pliku.
 Overwrite\ file=Nadpisz plik
+Unable\ to\ write\ to\ %0.=Nie można zapisać do %0.
 
+Refuse\ to\ save\ the\ library\ before\ external\ changes\ have\ been\ reviewed.=Odmowa zapisania biblioteki przed przejrzeniem zmian zewnętrznych.
 Library\ protection=Ochrona biblioteki
+Unable\ to\ save\ library=Nie można zapisać biblioteki
 
+Always\ reformat\ library\ on\ save\ and\ export=Zawsze formatuj bibliotekę przy zapisywaniu i eksporcie
+Character\ encoding\ '%0'\ is\ not\ supported.=Kodowanie znaków '%0' nie jest obsługiwane.
 
 Search=Szukaj
 Searching...=Wyszukiwanie...
+Finished\ Searching=Wyszukiwanie zakończone
 Search\ expression=Szukaj wyrażenia
+Fulltext\ search=Wyszukiwanie pełnotekstowe
+Help\ on\ regular\ expression\ search=Pomoc przy wyszukiwaniu wyrażenia regularnego
+Searching\ for\ duplicates...=Wyszukiwanie duplikatów...
 Searching\ for\ files=Szukanie plików
+The\ search\ is\ case-insensitive.=Wyszukiwanie nie rozróżnia wielkość liter.
+The\ search\ is\ case-sensitive.=Wyszukiwanie rozróżnia wielkość liter.
+Use\ regular\ expression\ search=Użyj wyszukiwania wyrażenia regularnego
+search\ expression=szukaj wyrażenia
+Free\ search\ expression=Wyrażenie wyszukiwania
+Search\ failed\:\ illegal\ search\ expression=Wyszukiwanie nie powiodło się\: niedozwolone wyrażenie wyszukiwania
+No\ search\ matches.=Brak wpisów pasujących do wyszukiwania.
+Web\ search=Wyszukiwanie w Internecie
+Search\ results=Wyniki wyszukiwania
+Please\ enter\ a\ search\ string=Proszę wprowadzić ciąg znaków wyszukiwania
+Please\ open\ or\ start\ a\ new\ library\ before\ searching=Proszę otworzyć lub stworzyć nową bibliotekę przed wyszukiwaniem
+Please\ enter\ a\ field\ name\ to\ search\ for\ a\ keyword.=Wprowadź nazwę pola, aby wyszukać słowo kluczowe.
 No\ results\ found.=Nie znaleziono wyników.
+Found\ %0\ results.=Znaleziono %0 wyników.
+Invalid\ regular\ expression=Nieprawidłowe wyrażenie regularne
+This\ search\ contains\ entries\ in\ which\ any\ field\ contains\ the\ regular\ expression\ <b>%0</b>=To wyszukiwanie zawiera wpisy, w których każde pole zawiera wyrażenie regularne <b>%0</b>
+This\ search\ contains\ entries\ in\ which\ any\ field\ contains\ the\ term\ <b>%0</b>=To wyszukiwanie zawiera wpisy, w których dowolne pole zawiera wyrażenie <b>%0</b>
+This\ search\ contains\ entries\ in\ which=To wyszukiwanie zawiera wpisy, w których
+Empty\ search\ ID=Pusty identyfikator wyszukiwania
+The\ given\ search\ ID\ was\ empty.=Podany identyfikator wyszukiwania był pusty.
+Clear\ search=Wyczyść wyszukiwanie
+Search\ document\ identifier\ online=Szukaj identyfikatora dokumentu online
+Search\ term\ is\ empty.=Szukane wyrażenie jest puste.
 
 
 Select\ all=Wybierz wszystko
+Select\ new\ encoding=Wybierz nowe kodowanie
 
 Select\ entry\ type=Wybierz typ wpisu
 
@@ -527,16 +793,27 @@ Settings=Ustawienia
 Shortcut=Skrót
 
 
+Show\ 'Firstname\ Lastname'=Pokaż 'Imię Nazwisko'
+
+Show\ 'Lastname,\ Firstname'=Pokaż 'Nazwisko, imię'
+
+Show\ BibTeX\ source\ by\ default=Domyślnie pokaż źródło BibTeX
 
+Show\ confirmation\ dialog\ when\ deleting\ entries=Pokaż okno dialogowe potwierdzenia podczas usuwania wpisów
 
+Persist\ password\ between\ sessions=Zachowaj hasło między sesjami
 
 
 
+Show\ last\ names\ only=Pokaż tylko nazwiska
+
+Show\ names\ unchanged=Pokaż nazwy bez zmian
 
 Show\ optional\ fields=Pokaż pola opcjonalne
 
 Show\ required\ fields=Pokaż pola wymagane
 
+Show\ validation\ messages=Pokaż komunikaty walidacyjne
 
 Simple\ HTML=Uproszczony HTML
 
@@ -551,42 +828,66 @@ Status=Status
 
 
 
+the\ field\ <b>%0</b>=pole <b>%0</b>
+The\ group\ "%0"\ already\ contains\ the\ selection.=Grupa "%0" już zawiera ten wybór.
 
+The\ label\ of\ the\ string\ cannot\ be\ a\ number.=Etykieta ciągu znaków nie może być liczbą.
 
+The\ label\ of\ the\ string\ cannot\ contain\ spaces.=Etykieta ciągu znaków nie może zawierać spacji.
 
+The\ label\ of\ the\ string\ cannot\ contain\ the\ '\#'\ character.=Etykieta ciągu znaków nie może zawierać znaku '\#'.
 
+The\ output\ option\ depends\ on\ a\ valid\ import\ option.=Opcja wyjścia zależy od prawidłowej opcji importu.
 
+There\ are\ possible\ duplicates\ that\ haven't\ been\ resolved.\ Continue?=Istnieją możliwe duplikaty, które nie zostały rozwiązane. Czy chcesz kontynuować?
 
+This\ operation\ requires\ all\ selected\ entries\ to\ have\ citation\ keys\ defined.=Ta operacja wymaga, aby wszystkie zaznaczone wpisy miały zdefiniowane klucze cytowania.
 
+This\ operation\ requires\ one\ or\ more\ entries\ to\ be\ selected.=Ta operacja wymaga wyboru jednego lub kilku wpisów.
 
+This\ setting\ may\ be\ changed\ in\ preferences\ at\ any\ time.=To ustawienie może być zmienione w ustawieniach w dowolnym momencie.
 Time\ stamp=Znacznik czasu
+Toggle\ groups\ interface=Przełącz wyświetlanie grup
 
+Trim\ all\ whitespace\ characters\ in\ the\ field\ content.=Usuń wszystkie białe spacje z zawartości pola.
 
+Trim\ whitespace\ characters=Usuń białe spacje
 
 Try\ different\ encoding=Spróbuj innego kodowania
 
 Undo=Cofnij
 
+Unknown\ BibTeX\ entries\:=Nieznane wpisy BibTeX\:
 
+unknown\ edit=nieznana edycja
 
 Unknown\ export\ format=Nieznany format eksportu
 
 untitled=bez tytułu
 
+Upgrade\ external\ PDF/PS\ links\ to\ use\ the\ '%0'\ field.=Zmodyfikuj zewnętrzne pliki PDF/PS, aby używały pola '%0'.
 
 usage=użycie
 Use\ autocompletion=Włącz autouzupełnianie
 
+User\ interface=Interfejs użytkownika
 
 Username=Nazwa użytkownika
 
+Value\ cleared\ externally=Wartość wyczyszczona zewnętrznie
 
+Value\ set\ externally\:\ %0=Wartość ustawiona zewnętrznie\: %0
 
+Verify\ that\ LyX\ is\ running\ and\ that\ the\ lyxpipe\ is\ valid.=Sprawdź, czy LyX jest uruchomiony i czy lyxpipe jest poprawny.
 
 View=Widok
 Vim\ server\ name=Nazwa serwera Vim
 
+View\ journal\ info=Zobacz informacje o czasopiśmie
+
+Warn\ about\ unresolved\ duplicates\ when\ closing\ inspection\ window=Ostrzegaj przed nierozwiązanymi duplikatami podczas zamykania okna inspekcji
 
+Warn\ before\ overwriting\ existing\ keys=Ostrzegaj przed nadpisaniem istniejących kluczy
 
 Warning=Ostrzeżenie
 
@@ -597,6 +898,8 @@ Warnings=Ostrzeżenia
 What\ do\ you\ want\ to\ do?=Co chcesz zrobić?
 
 
+Writing\ metadata\ for\ selected\ entries...=Zapisywanie metadanych dla wybranych wpisów...
+Writing\ metadata...=Zapisywanie metadanych...
 
 
 
@@ -605,30 +908,70 @@ Move\ file=Przenieś plik
 Rename\ file=Zmień nazwę pliku
 
 
+Could\ not\ move\ file\ '%0'.=Nie można przenieść pliku '%0'.
+Could\ not\ find\ file\ '%0'.=Nie można znaleźć pliku '%0'.
+Error\ while\ fetching\ from\ %0=Błąd podczas pobierania z %0
 
+Citation\ key\ generator=Generator klucza cytowania
+Unable\ to\ open\ link.=Nie można otworzyć linku.
 MIME\ type=Typ MIME
 
+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.=Ta funkcja pozwala otwierać nowe pliki lub importować je do już uruchomionej instancji JabRef zamiast otwierać nową instancję. Na przykład jest to przydatne podczas otwierania pliku w JabRef z przeglądarki internetowej. Zauważ, że uniemożliwi to jednoczesne uruchomienie więcej niż jednej instancji JabRef.
+Run\ fetcher=Uruchom pobieranie
 
+Line\ %0\:\ Found\ corrupted\ citation\ key\ %1.=Wiersz %0\: Znaleziono uszkodzony klucz cytowania %1.
+Line\ %0\:\ Found\ corrupted\ citation\ key\ %1\ (contains\ whitespaces).=Linia %0\: Znaleziono uszkodzony klucz cytatu %1 (zawiera białe spacje).
+Line\ %0\:\ Found\ corrupted\ citation\ key\ %1\ (comma\ missing).=Linia %0\: Znaleziono uszkodzony klucz cytatu %1 (brak przecinka).
+No\ full\ text\ document\ found=Nie znaleziono dokumenty pełnotekstowego
 Download\ from\ URL=Pobierz z adresu URL
 Rename\ field=Zmień nazwę pola
 
 
+A\ local\ copy\ will\ be\ opened.=Kopia lokalna zostanie otwarta.
 Error\ opening\ file\ '%0'.=Błąd podczas otwierania pliku '%0'.
 
 
+Metadata\ change=Zmiana metadanych
+The\ following\ metadata\ changed\:=Zmieniono następujące metadane\:
 
 Unable\ to\ create\ backup=Nie można utworzyć kopii zapasowej
+Move\ file\ to\ file\ directory=Przenieś plik do katalogu plików
+<b>All\ Entries</b>\ (this\ group\ cannot\ be\ edited\ or\ removed)=<b>Wszystkie wpisy</b> (ta grupa nie może być edytowana ani usunięta)
 static\ group=grupa statyczna
 dynamic\ group=grupa dynamiczna
 contains=zawiera
 
+Optional\ fields\ 2=Opcjonalne pola 2
 Waiting\ for\ save\ operation\ to\ finish=Oczekiwanie na zakończenie operacji zapisu
+Waiting\ for\ background\ tasks\ to\ finish.\ Quit\ anyway?=Oczekiwanie na zakończenie zadań w tle. Czy chcesz zamknąć mimo to?
 
+Find\ and\ remove\ duplicate\ citation\ keys=Znajdź i usuń zduplikowane klucze cytowania
 
 
+General\ file\ directory=Główny katalog
+User-specific\ file\ directory=Katalog plików użytkownika
+LaTeX\ file\ directory=Katalog plików LaTeX
 
-Send\ as\ email=Wyślij jako e-mail
+Send=Wyślij
+As\ Email=Jako e-mail
+To\ Kindle=Do Kindle
+Send\ to\ Kindle=Wyślij do Kindle
+Email\ address\ for\ sending\ to\ Kindle=Adres e-mail do wysłania do Kindle
 References=Referencje
+Sending\ of\ emails=Wysyłanie wiadomości e-mail
+Subject\ for\ sending\ an\ email\ with\ references=Temat wysyłanych wiadomości e-mail z bibliografią
+Automatically\ open\ folders\ of\ attached\ files=Automatycznie otwieraj foldery załączonych plików
+Error\ creating\ email=Błąd podczas tworzenia wiadomości e-mail
+Entries\ added\ to\ an\ email=Wpisy dodane do wiadomości e-mail
+Custom\ applications=Niestandardowe aplikacje
+Please\ specify\ a\ file\ browser.=Proszę określić przeglądarkę plików.
+Please\ specify\ a\ terminal\ application.=Proszę określić aplikację terminala.
+Use\ custom\ file\ browser=Użyj niestandardowej przeglądarki plików
+Use\ custom\ terminal\ emulator=Użyj niestandardowego emulatora terminala
+exportFormat=format eksportu
+Output\ file\ missing=Brak pliku wyjściowego
+The\ output\ option\ depends\ on\ a\ valid\ input\ option.=Opcja wyjścia zależy od prawidłowej opcji wejściowej.
+Additional\ parameters=Dodatkowe parametry
 Citation=Cytowanie
 Connecting...=Łączenie...
 Select\ style=Wybierz styl
@@ -648,23 +991,62 @@ Connection\ lost=Utracono połączenie
 
 
 
+Autodetecting\ paths...=Automatyczne wykrywanie ścieżek ...
+Choose\ OpenOffice/LibreOffice\ executable=Wybierz plik wykonywalny OpenOffice/LibreOffice
 Select\ document=Wybierz dokument
 HTML\ list=Lista HTML
 Could\ not\ open\ %0=Nie można otworzyć %0
 Unknown\ import\ format=Nieznany format importu
 Style\ selection=Wybór stylu
+No\ valid\ style\ file\ defined=Nie zdefiniowano poprawnego pliku stylu
 Choose\ pattern=Wybierz wzór
+File\ directory=Katalog plików
 
 
 Cleanup\ entry=Wyczyść wpis
+Autogenerate\ PDF\ Names=Automatycznie generuj nazwy PDF
+Auto-generating\ PDF-Names\ does\ not\ support\ undo.\ Continue?=Automatyczne generowanie nazw plików PDF nie obsługuje cofania. Czy chcesz kontynuować?
 
+Use\ full\ firstname\ whenever\ possible=Używaj pełnego imienia, gdy to możliwe
+Use\ abbreviated\ firstname\ whenever\ possible=Użyj skróconego imienia, gdy to możliwe
+Use\ abbreviated\ and\ full\ firstname=Użyj skróconego i pełnego imienia
+Name\ format=Format nazwy
 First\ names=Pierwsze imiona
+Cleanup\ entries=Wyczyść wpisy
+Automatically\ assign\ new\ entry\ to\ selected\ groups=Automatycznie przypisz nowy wpis do wybranych grup
+%0\ mode=Tryb %0
+Move\ DOIs\ from\ note\ and\ URL\ field\ to\ DOI\ field\ and\ remove\ http\ prefix=Przenieś DOI z pola notatki i URL do pola DOI i usuń prefiks http
+Move\ URL\ in\ note\ field\ to\ url\ field=Przenieś adres URL w polu notatki do pola url
+One\ entry\ needed\ a\ clean\ up=Jeden wpis wymagał oczyszczenia
+%0\ entries\ needed\ a\ clean\ up=%0 wpisów wymagało oczyszczenia
 
 Attach\ file=Dodaj plik
+Attach\ file\ from\ URL=Dołącz plik z adresu URL
+Setting\ all\ preferences\ to\ default\ values.=Przywrócenie wartości domyślnych wszystkim ustawieniom.
+Resetting\ preference\ key\ '%0'=Resetowanie klucza ustawień '%0'
+Unable\ to\ clear\ preferences.=Nie można wyczyścić ustawień.
 
 Unselect\ all=Odznacz wszystko
 Expand\ all=Rozwiń wszystkie
 Collapse\ all=Zwiń wszystko
+Searches\ the\ selected\ directory\ for\ unlinked\ files.=Wyszukuje niepowiązane pliki w wybranym katalogu.
+Starts\ the\ import\ of\ BibTeX\ entries.=Rozpoczyna import wpisów BibTeX.
+Last\ edited\:=Ostatnio edytowane\:
+All\ time=Cały czas
+last\ edited=ostatnio edytowane
+Last\ day=Ostatni dzień
+Last\ week=Ostatni tydzień
+Last\ month=Ostatni miesiąc
+Last\ year=Ostatni rok
+Sort\ by\:=Sortuj według\:
+Newest\ first=Najpierw najnowsze
+Oldest\ first=Najpierw najstarsze
+Directory=Katalog
+Import\ result=Wynik importu
+Searching\ file\ system...=Wyszukiwanie systemu plików...
+Citation\ key\ patterns=Wzorce klucza cytowania
+Clear\ priority=Wyczyść priorytet
+Clear\ rank=Wyczyść rangę
 Enable\ special\ fields=Włącz pola specjalne
 One\ star=Jedna gwiazdka
 Two\ stars=Dwie gwiazdki
@@ -693,11 +1075,28 @@ Result=Rezultat
 
 Network=Sieć
 Hostname=Nazwa hosta
+Please\ specify\ a\ hostname=Proszę podać nazwę hosta
+Please\ specify\ a\ port=Proszę podać port
+Please\ specify\ a\ username=Proszę podać nazwę użytkownika
+Please\ specify\ a\ password=Proszę podać hasło
 
 Proxy\ configuration=Konfiguracja proxy
-
+Use\ custom\ proxy\ configuration=Użyj niestandardowej konfiguracji proxy
+Proxy\ requires\ authentication=Proxy wymaga uwierzytelniania
+Clear\ connection\ settings=Wyczyść ustawienia połączenia
+Check\ Proxy\ Setting=Sprawdź ustawienia proxy
+Check\ connection=Sprawdź połączenie
+Connection\ failed\!=Połączenie nie powiodło się\!
+Connection\ successful\!=Połączenie udane\!
+
+SSL\ Configuration=Konfiguracja SSL
+SSL\ configuration\ changed=Konfiguracja SSL została zmieniona
+SSL\ certificate\ file=Plik certyfikatu SSL
+Duplicate\ Certificates=Duplikuj certyfikaty
 
 Open\ folder=Otwórz folder
+Export\ sort\ order=Eksportuj kolejność sortowania
+Save\ sort\ order=Zapisz kolejność sortowania
 
 Parsing\ error=Błąd parsowania
 
@@ -714,6 +1113,7 @@ Opens\ JabRef's\ blog=Otwiera blog JabRef'a
 Opens\ JabRef's\ website=Otwiera stronę JabRef'a
 
 Could\ not\ open\ browser.=Nie można otworzyć przeglądarki.
+Please\ open\ %0\ manually.=Proszę otworzyć %0 ręcznie.
 
 Open\ %0\ file=Otwórz %0 plik
 
@@ -725,29 +1125,42 @@ Add\ new\ file\ type=Dodaj nowy typ pliku
 Original\ entry=Oryginalny wpis
 Added\ entry=Wpis dodany
 Modified\ entry=Wpis zmodyfikowany
+Deleted\ entry\ '%0'=Usunięto wpis '%0'
 Deleted\ entry=Wpis usunięty
 Removed\ all\ groups=Usunięto wszystkie grupy
+Return\ to\ library=Powrót do biblioteki
+
 Really\ delete\ the\ selected\ entry?=Na pewno usunąć wybrany wpis?
 Really\ delete\ the\ %0\ selected\ entries?=Na pewno chcesz usunąć %0 wybranych wpisów?
 
+In\ JabRef=W JabRef
+Entry\ Preview=Podgląd wpisu
+
 Keep\ left=Zachowaj lewy
 Keep\ right=Zachowaj prawy
 Old\ entry=Stary wpis
 From\ import=Z importu
+From\ DOI=Z DOI
 No\ problems\ found.=Nie znaleziono problemów.
 Save\ changes=Zapisz zmiany
 Discard\ changes=Odrzuć zmiany
+Library\ '%0'\ has\ changed.=Biblioteka '%0' uległa zmianie.
 Print\ entry\ preview=Drukuj podgląd wpisu
 
+Invalid\ DOI\:\ '%0'.=Nieprawidłowy DOI\: '%0'.
+Same\ DOI\ used\ in\ multiple\ entries=Ten sam DOI używany w wielu wpisach
 
 
 Close\ library=Zamknij bibliotekę
+Import\ into\ current\ library=Importuj do bieżącej biblioteki
+Import\ into\ new\ library=Importuj do nowej biblioteki
 New\ article=Nowy artykuł
 New\ book=Nowa książka
 New\ entry=Nowy wpis
 Save\ all=Zapisz wszystkie
 Synchronize\ files=Synchronizuj pliki
 Copy\ preview=Kopiuj podgląd
+Copy\ selection=Kopiuj zaznaczenie
 Default\ library\ mode=Domyślny tryb wyświetlania
 default=domyślne
 key=klucz
@@ -777,12 +1190,17 @@ Remove\ style=Usuń styl
 
 Reload=Odśwież
 
+CHANGES\ ALL\ LETTERS\ TO\ UPPER\ CASE.=ZMIEŃ WSZYSTKIE LITERY NA WIELKIE.
 HTML\ to\ Unicode=HTML do Unicode
 HTML\ to\ LaTeX=HTML do LaTeX
+lower\ case=małe litery
 Normalize\ date=Normalizuj datę
 Normalize\ month=Normalizuj miesiąc
 Does\ nothing.=Nie robi nic.
 Identity=Tożsamość
+
+
+Continue=Kontynuuj
 Female\ name=Żeńskie imię
 Female\ names=Żeńskie imiona
 Male\ name=Męskie imię
@@ -798,6 +1216,7 @@ Compiler=Kompilator
 Editor=Redaktor
 Founder=Założyciel
 Line=Linia
+Master's\ thesis=Praca magisterska
 Page=Strona
 Paragraph=Akapit
 Patent=Patent
@@ -806,6 +1225,7 @@ Section=Sekcja
 Software=Oprogramowanie
 
 
+
 Show\ diff=Pokaż różnice
 License=Licencja
 
@@ -814,6 +1234,7 @@ License=Licencja
 Message=Wiadomość
 
 
+Reset\ all=Zresetuj wszystko
 
 
 
@@ -824,19 +1245,25 @@ Installed\ version=Zainstalowana wersja
 Remind\ me\ later=Przypomnij później
 Ignore\ this\ update=Zignoruj tę aktualizację
 A\ new\ version\ of\ JabRef\ has\ been\ released.=Nowa wersja JabRef została wydana.
+JabRef\ is\ up-to-date.=JabRef jest aktualny.
 Latest\ version=Najnowsza wersja
 Custom=Niestandardowe
 
 
 
 
+No\ database=Brak bazy danych
 
 
 
 
 
 Enabled=Włączone
+Add\ {}\ around\ selected\ text=Dodaj {} wokół zaznaczonego tekstu
+Remove\ all\ {}\ in\ selected\ text=Usuń wszystkie w zaznaczonym tekście
 undefined=niezdefiniowano
+No\ %0\ found=Nie znaleziono %0
+Entry\ from\ %0=Wpis z %0
 
 Add\ new\ list=Dodaj nową listę
 Open\ existing\ list=Otwórz istniejącą listę
@@ -851,19 +1278,26 @@ Log\ copied\ to\ clipboard.=Log skopiowany do schowka.
 Copy\ Log=Kopiuj Log
 Clear\ Log=Wyczyść Log
 Report\ Issue=Zgłoś problem
+Last\ notification=Ostatnie powiadomienie
 
 Host=Host
 Port=Port
 Library=Biblioteka
+Libraries=Biblioteki
 User=Użytkownik
 Connect=Połącz
 Connection\ error=Błąd połączenia
+Connection\ to\ %0\ server\ established.=Ustanowiono połączenie z serwerem %0.
+Required\ field\ "%0"\ is\ empty.=Wymagane pole "%0" jest puste.
+%0\ driver\ not\ available.=Sterownik %0 niedostępny.
 Reconnect=Połącz ponownie
 Work\ offline=Działa w trybie offline
 Working\ offline.=Pracujesz offline.
 Update\ refused.=Aktualizuj odrzucone.
 
 
+%0\ file=%0 plik
+%0\ file\ (%1)=%0 plik (%1)
 
 
 Migration\ help\ information=Informacje o pomocy w migracji
@@ -886,12 +1320,15 @@ ID\ type=Rodzaj ID
 Select\ first\ entry=Wybierz pierwszy wpis
 Select\ last\ entry=Wybierz ostatni wpis
 
+Invalid\ ISBN\:\ '%0'.=Nieprawidłowy ISBN\: '%0'.
 
 
+Backup\ found=Znaleziono kopię zapasową
 
 
 
 
+DOI\ %0\ is\ invalid=DOI %0 jest nieprawidłowy
 
 
 
@@ -940,22 +1377,34 @@ Keep\ entry=Zachowaj wpis
 
 Open\ file\ %0=Otwórz plik %0
 Blog=Blog
+Copy\ DOI=Kopiuj DOI
+Find\ duplicates=Znajdź duplikaty
 Manage\ journal\ abbreviations=Zarządzaj skrótami czasopism
 Quit=Wyjdź
 
 
+Database\ Type\:=Typ bazy danych\:
+Database\:=Baza danych\:
 Host/Port\:=Host/Port\:
 User\:=Użytkownik\:
 Password\:=Hasło\:
+Remember\ Password=Zapamiętaj hasło
+Use\ SSL=Użyj SSL
+(more)=(więcej)
 Cancel\ import=Anuluj import
 Continue\ with\ import=Kontynuuj import
 Import\ canceled=Import anulowany
-Field\ name\:=Nazwa pola\:
-Remove\ field\ name=Usuń nazwę pola
+Select\ all\ new\ entries=Zaznacz wszystkie nowe wpisy
+Select\ all\ entries=Zaznacz wszystkie wpisy
+Open\ Help\ page=Otwórz stronę pomocy
 Add\ new\ keyword=Dodaj słowo kluczowe
 Export\ all\ entries=Eksportuj wszystkie wpisy
 New\ library=Nowa biblioteka
+Find\ and\ replace=Znajdź i zastąp
 
+Found\ documents\:=Znalezione dokumenty\:
+Use\ selected\ document=Użyj wybrany dokument
+Dismiss\ changes=Odrzuć zmiany
 
 Set\ rank\ to\ one=Ustaw rangę na jeden
 Set\ rank\ to\ two=Ustaw rangę na dwa
@@ -967,16 +1416,21 @@ Set\ rank\ to\ five=Ustaw rangę na pięć
 
 New\ Filename=Nowa nazwa pliku
 
+Application\ settings=Ustawienia aplikacji
 
+Import\ BibTeX=Importuj BibTeX
+Import\ preferences\ from\ a\ file=Importuj preferencje z pliku
 Matching=Pasujące
 
 files=pliki
 No\ citations\ found=Nie znaleziono cytatów
 Current\ search\ directory\:=Aktualny katalog wyszukiwania\:
+Import\ entries\ from\ LaTeX\ files=Importuj wpisy z plików LaTeX
 Import\ new\ entries=Importuj nowe wpisy
 
 Columns=Kolumny
 File\ type=Typ pliku
+IEEE=IEEE
 Special=Specjalne
 Remove\ column=Usuń kolumnę
 Add\ custom\ column=Dodaj niestandardową kolumnę
@@ -984,7 +1438,9 @@ Add\ custom\ column=Dodaj niestandardową kolumnę
 
 Open\ files...=Otwieranie plików...
 
-Affected\ fields\:=Dotyczy pól\:
+Font\ settings=Ustawienia czcionki
+Dark=Ciemny
+Light=Jasny
 Default\ pattern=Domyślny wzór
 Library\ mode=Tryb biblioteki
 Remove\ all=Usuń wszystkie
@@ -993,35 +1449,48 @@ Reset\ All=Resetuj wszystko
 
 
 
+Add\ to\ current\ library=Dodaj do bieżącej biblioteki
 
 
+Add\ new\ entry\ type=Dodaj nowy typ wpisu
+Required=Wymagane
 
 
+Text\ editor=Edytor tekstu
 
 
 
+Year\ of\ publication.=Rok publikacji.
+Owner/creator\ of\ this\ entry.=Właściciel/twórca tego wpisu.
 
 
 
 
-Close=Zamknij
 Close\ all=Zamknij wszystkie
+Close\ all\ libraries=Zamknij wszystkie biblioteki
+Close\ other\ libraries=Zamknij inne biblioteki
 Close\ others=Zamknij pozostałe
 
 
 
 
 
-Reset=Reset
 
 
+Regular\ expression=Wyrażenie regularne
+
 
+Error\ reading\ PDF\ content\:\ %0=Błąd odczytu zawartości PDF\: %0
+Bib\ entry\ was\ successfully\ imported=Wpis Bib został pomyślnie zaimportowany
+File\ was\ successfully\ imported\ as\ a\ new\ entry=Plik został pomyślnie zaimportowany jako nowy wpis
+Processing\ file\ %0=Przetwarzanie pliku %0
 
 
 
 
 
 
+I\ cannot\ insert\ to\ the\ cursor's\ current\ location.=Nie mogę wstawić w aktualnej pozycji kursora.
 
 
 
@@ -1035,29 +1504,59 @@ Reset=Reset
 
 
 
+Download\ operation\ canceled.=Operacja pobierania anulowana.
 
 
 
 
 
+Catalog=Katalog
+Catalogs=Katalogi
 
+Question=Pytanie
+Select\ directory=Wybierz katalog
 
 
 
 
+Entry=Wpis
 
 
 
+Identifier\ not\ found=Nie znaleziono identyfikatora
 
+Custom\ API\ key=Własny klucz API
 
+Edit\ content=Edytuj treść
+Copy\ or\ Move\ content=Kopiuj lub przenieś treść
+Rename=Zmień nazwę
+Copy\ content=Kopiuj treść
+Move\ content=Przenieś treść
+From=Od
+To=Do
 
 
+Assign=Przypisz
 
 plain\ text=czysty tekst
 
 
 
 
+Review\ backup=Przejrzyj kopię zapasową
+
+
+
+Enable\ web\ search=Włącz wyszukiwanie w sieci
+Web\ search\ disabled=Wyszukiwanie w sieci wyłączone
+
+
+
+Clear\ history=Wyczyść historię
 
 
+Create\ backup=Utwórz kopię zapasową
 
+File\ "%0"\ cannot\ be\ added\!=Plik "%0" nie może zostać dodany\!
+Illegal\ characters\ in\ the\ file\ name\ detected.\nFile\ will\ be\ renamed\ to\ "%0"\ and\ added.=Wykryto nieprawidłowe znaki w nazwie pliku.\nPlik zostanie dodany pod nazwę "%0".
+Rename\ and\ add=Zmień nazwę i dodaj
diff --git a/src/main/resources/l10n/JabRef_pt.properties b/src/main/resources/l10n/JabRef_pt.properties
index c2fa06917a2..29b7eaa49e8 100644
--- a/src/main/resources/l10n/JabRef_pt.properties
+++ b/src/main/resources/l10n/JabRef_pt.properties
@@ -1,8 +1,6 @@
+Proxy\ requires\ password=Proxy requer senha
 
-
-
-
-
+Unable\ to\ monitor\ file\ changes.\ Please\ close\ files\ and\ processes\ and\ restart.\ You\ may\ encounter\ errors\ if\ you\ continue\ with\ this\ session.=Não é possível monitorar as alterações de arquivos. Por favor feche os arquivos e processe e reinicie. Você pode encontrar erros se continuar com esta sessão.
 %0\ contains\ the\ regular\ expression\ <b>%1</b>=%0 contém a Expressão Regular <b>%1</b>
 
 %0\ contains\ the\ term\ <b>%1</b>=%0 contém o termo <b>%1</b>
@@ -11,22 +9,30 @@
 
 %0\ doesn't\ contain\ the\ term\ <b>%1</b>=%0 não contém o termo <b>%1</b>
 
+%0/%1\ entries=%0/%1 entradas
 
+Export\ operation\ finished\ successfully.=Operação de exportação concluída com sucesso.
 
+Reveal\ in\ File\ Explorer=Mostrar no Explorador de Arquivos
 
 %0\ matches\ the\ regular\ expression\ <b>%1</b>=%0 encontrada a expressão regular <b>%1</b>
 
 %0\ matches\ the\ term\ <b>%1</b>=%0 encontrado o termo <b>%1</b>
 
+Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (DEFAULT\ abbreviation)=Abreviar nomes de periódicos das entradas selecionadas (DEFAULT abreviação)
+Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (DOTLESS\ abbreviation)=Abreviar nomes de periódicos das referências selecionadas (abreviação DOTLESS)
+Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (SHORTEST\ UNIQUE\ abbreviation)=Abreviar nomes de periódicos das entradas selecionadas ( abreviação SHORTEST UNIQUE)
 
 Abbreviate\ names=Abreviar nomes
 Abbreviated\ %0\ journal\ names.=%0 nomes de periódicos foram abreviados.
 
 Abbreviation=Abreviação
+Abbreviations=Abreviações
 
 Unabbreviate\ journal\ names\ of\ the\ selected\ entries=Reverter abreviações dos nomes de periódicos das referências selecionadas
 Unabbreviated\ %0\ journal\ names.=Revertidas abreviações de %0 nomes de periódicos.
 
+shortest\ unique=mais curto único
 
 About\ JabRef=Sobre JabRef
 
@@ -45,6 +51,7 @@ The\ path\ need\ not\ be\ on\ the\ classpath\ of\ JabRef.=O caminho não precisa
 
 Add\ a\ regular\ expression\ for\ the\ key\ pattern.=Adicione uma expressão para a chave padrão.
 
+Add\ entry\ manually=Adicionar entrada manualmente
 
 Add\ selected\ entries\ to\ this\ group=Adicionar as entradas selecionadas a este grupo
 
@@ -52,10 +59,12 @@ Add\ subgroup=Adicionar subgrupo
 
 Added\ group\ "%0".=O grupo "%0" foi adicionado.
 
+Added\ string\:\ '%0'=Texto adicionado\: '%0'
 Added\ string=Adicionada string
 
 All\ entries=Todas as referências
 
+Also\ remove\ subgroups=Também remover subgrupos
 
 and=e
 
@@ -77,8 +86,11 @@ Assigned\ %0\ entries\ to\ group\ "%1".=%0 referências atribuídas ao grupo "%1
 
 Assigned\ 1\ entry\ to\ group\ "%0".=1 referência atribuído ao grupo "%0"
 
+Autogenerate\ citation\ keys=Gerar chaves de citação automaticamente
 
+Autolink\ files\ with\ names\ starting\ with\ the\ citation\ key=Link automático de arquivos com nomes começando com a chave de citação
 
+Autolink\ only\ files\ that\ match\ the\ citation\ key=Link automático apenas arquivos que correspondem à chave de citação
 
 Automatically\ create\ groups=Criar grupos automaticamente
 
@@ -92,8 +104,11 @@ Available\ import\ formats=Formatos de importação disponíveis
 
 %0\ source=Fonte %0
 
+Background\ Tasks=Tarefas em segundo plano
 
+Background\ Tasks\ are\ running=Tarefas em segundo plano estão a ser executadas
 
+Background\ Tasks\ are\ done=Tarefas em segundo plano concluídas
 
 Browse=Explorar
 
@@ -105,6 +120,7 @@ Cannot\ create\ group=Impossível criar o grupo
 
 Cannot\ create\ group.\ Please\ create\ a\ library\ first.=Impossível criar o grupo. Por favor crie antes uma biblioteca.
 
+Cannot\ open\ folder\ as\ the\ file\ is\ an\ online\ link.=Não é possível abrir a pasta, pois o arquivo é um link online.
 
 case\ insensitive=Insensível ao caso
 
@@ -123,6 +139,7 @@ Change\ of\ Grouping\ Method=Modificar método de agrupamento
 
 change\ preamble=modificar preâmbulo
 
+Changed\ language=Idioma alterado
 
 Changed\ preamble=Preâmbulo modificado
 
@@ -130,6 +147,7 @@ Cite\ command=Comando citar
 
 Clear=Limpar
 
+Open\ /\ close\ entry\ editor=Abrir / fechar o editor de referências
 
 Close\ dialog=Fechar janela de diálogo
 
@@ -149,6 +167,12 @@ 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
 
@@ -173,7 +197,9 @@ Create\ custom\ fields\ for\ each\ BibTeX\ entry=Criar campos personalizados par
 
 crossreferenced\ entries\ included=Registros com referências cruzadas incluídos
 
+Current\ content\:\ %0=Conteúdo atual\: %0
 
+Current\ value\:\ %0=Valor atual\: %0
 
 Custom\ entry\ types=Tipos de referências personalizados
 
@@ -187,15 +213,20 @@ Cut=Recortar
 
 cut\ entries=Recortar referências
 
+cut\ entry\ %0=cortar a entrada %0
 
 Library\ encoding=Codificação da base de dados
 
 Library\ properties=Propriedades da base de dados
+%0\ -\ Library\ properties=%0 - Propriedades de biblioteca
 
 Default=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=A transferir
 
 Execute\ default\ action\ in\ dialog=Executar a acão padrão na caixa de diálogo
 
@@ -213,12 +244,15 @@ Descending=Descendente
 
 Description=Descrição
 
+Do\ not\ ask\ again=Não pergunte novamente
 
+Display\ all\ entries\ belonging\ to\ one\ or\ more\ of\ the\ selected\ groups=Exibir todas as referências pertencentes a um ou mais grupos selecionados
 
 Display\ all\ error\ messages=Exibir todas as mensagens de erro
 
 Display\ help\ on\ command\ line\ options=Exibir ajuda para opções de linha de comando
 
+Display\ only\ entries\ belonging\ to\ all\ selected\ groups=Exibir apenas referências pertencentes a todos os grupos selecionados
 Display\ version=Exibir versão
 
 Do\ not\ abbreviate\ names=Não abreviar nomes
@@ -226,15 +260,20 @@ Do\ not\ abbreviate\ names=Não abreviar nomes
 
 Do\ not\ open\ any\ files\ at\ startup=Não abrir arquivos ao iniciar
 
-Do\ not\ wrap\ the\ following\ fields\ when\ saving=Não agregar os seguintes campos ao salvar
+
+Do\ not\ write\ the\ following\ fields\ to\ XMP\ Metadata=Não escreva os seguintes campos para Metadados XMP
 
 Donate\ to\ JabRef=Doar para JabRef
 
 Download\ file=Download do arquivo
 
+Downloaded\ website\ as\ an\ HTML\ file.=Site baixado como arquivo HTML.
 
 duplicate\ removal=remoção de duplicatas
 
+Duplicate\ fields=Campos duplicados
+
+Unable\ to\ change\ field\ name.\ "%0"\ already\ in\ use.=Não foi possível alterar o nome do campo. "%0" já em uso.
 
 Duplicate\ string\ name=Duplicar nome da string
 
@@ -244,6 +283,7 @@ Dynamically\ group\ entries\ by\ a\ free-form\ search\ expression=Agrupar refer
 
 Dynamically\ group\ entries\ by\ searching\ a\ field\ for\ a\ keyword=Agrupar referências dinamicamente selecionando um campo ou palavra-chave
 
+Each\ line\ must\ be\ of\ the\ following\ form\:\ 'tab\:field1;field2;...;fieldN'.=Cada linha deve ser do seguinte formulário\: 'tab\:field1;field2;...;fieldN'.
 
 Edit=Editar
 
@@ -254,6 +294,7 @@ Edit\ group=Editar grupo
 Edit\ strings=Editar strings
 
 empty\ library=base de dados vazio
+Autocompletion=Autocompletar
 
 Enter\ URL\ to\ download=Digite a URl para download
 
@@ -276,6 +317,7 @@ Error=Erro
 Error\ occurred\ when\ parsing\ entry=Ocorreu um erro ao analisar a referência
 Error\ opening\ file=Erro ao abrir o arquivo
 Error\ while\ writing=Erro durante a escrita
+Error\ during\ persistence\ of\ crawling\ results.=Erro durante a persistência de rastrear resultados.
 '%0'\ exists.\ Overwrite\ file?='%0' existe. Sobrescrever o arquivo?
 Export=Exportar
 Export\ preferences=Exportar preferências
@@ -286,17 +328,21 @@ Exporting=Exportando
 Extension=Extensão
 
 
-External\ file\ links=Links de arquivos externos
-
 External\ programs=Programas externos
 
+Failed\ to\ import\ by\ ID=Falha ao importar pelo ID
 
 Field=Campo
-
 field=campo
 
 Field\ name=Nome do campo
-
+Field\ names\ are\ not\ allowed\ to\ contain\ white\ spaces\ or\ certain\ characters\ (%0).=Nomes de campos não podem conter espaços em branco ou certos caracteres (%0).
+New\ field\ name=Novo nome do campo
+Add\ new\ field\ name=Adicionar novo nome do campo
+Field\ name\ "%0"\ already\ exists=Nome do campo "%0" já existe
+No\ field\ name\ selected\!=Nenhum campo selecionado\!
+Remove\ field\ name=Remover nome do campo
+Manage\ field\ names\ &\ content=Gerenciar nomes e conteúdo dos campos
 
 Field\ to\ group\ by=Campos como critério de agrupamento
 
@@ -311,7 +357,12 @@ File\ not\ found=Arquivo não encontrado
 
 Filter=Filtro
 
+Filter\ groups=Filtrar grupos
 
+Success\!\ Finished\ writing\ metadata.=Sucesso\! Escrita de metadados finalizada.
+Finished\ writing\ metadata\ for\ %0\ file\ (%1\ skipped,\ %2\ errors).=Terminou de escrever metadados para o arquivo %0 (%1 ignorado, %2 erros).
+Error\ while\ writing\ metadata.\ See\ the\ error\ log\ for\ details.=Erro ao escrever metadados. Consulte o log de erros para obter detalhes.
+Failed\ to\ write\ metadata,\ file\ %1\ not\ found.=Falha ao gravar metadados, arquivo %1 não encontrado.
 
 First\ select\ the\ entries\ you\ want\ keys\ to\ be\ generated\ for.=Primeiro selecione as referências para as quais você deseja ter chaves geradas.
 
@@ -328,18 +379,23 @@ Formatter\ name=Nome do formatador
 
 found\ in\ AUX\ file=encontrado em arquivo AUX
 
+Fulltext\ for=Texto completo para
 
+Further\ information\ about\ Mr.\ DLib\ for\ JabRef\ users.=Mais informações sobre o Sr. DLib para usuários do JabRef.
 
 General=Geral
 
 Generate=Gerar
 
+Generate\ citation\ key=Gerar chave de citação
 
 Generate\ keys=Gerar chaves
 
 Generate\ keys\ before\ saving\ (for\ entries\ without\ a\ key)=Gerar chaves antes de salvar
 
+Generated\ citation\ key\ for=Chave de citação gerada para
 
+Generating\ citation\ key\ for=Gerando chave de citação para
 Get\ fulltext=Obter texto completo
 
 Gray\ out\ non-hits=Esmaecer referências não encontradas
@@ -395,7 +451,11 @@ Include\ subgroups\:\ When\ selected,\ view\ entries\ contained\ in\ this\ group
 Independent\ group\:\ When\ selected,\ view\ only\ this\ group's\ entries=Grupo independente\: Quando selecionado, mostra apenas as referências deste grupo
 I\ Agree=Concordo
 
+Indexing\ pdf\ files=Indexando arquivos pdf
+Indexing\ for\ %0=Indexando para %0
+%0\ of\ %1\ linked\ files\ added\ to\ the\ index=%0 de %1 vinculados arquivos adicionados ao índice
 
+Invalid\ citation\ key=Chave de citação inválida
 
 Invalid\ URL=URL inválida
 
@@ -408,8 +468,11 @@ JabRef\ Version\ (Required\ to\ ensure\ backwards\ compatibility\ with\ Mr.\ DLi
 
 Journal\ abbreviations=Abreviações de periódico
 
+
+
 Keep\ both=Manter ambos
 
+Keep\ subgroups=Manter subgrupos
 
 Key\ bindings=Combinações de tecla
 
@@ -421,8 +484,11 @@ keys\ in\ library=chaves na base de dados
 
 Keyword=Palavra-chave
 
+Keywords=Palavras-chave
 
 Label=Rótulo
+Label\:\ %0=Etiqueta\: %0
+Content\:\ %0=Conteúdo\: %0
 Language=Idioma
 
 Last\ modified=Última modificação
@@ -430,20 +496,16 @@ LaTeX\ AUX\ file\:=Arquivo AUX LaTeX\:
 
 Link=Linkar
 Listen\ for\ remote\ operation\ on\ port=Escutar operações remotas na porta
-Load\ and\ Save\ preferences\ from/to\ jabref.xml\ on\ start-up\ (memory\ stick\ mode)=Carregar e salvar preferências a partir de/para jabref.xml ao iniciar (modo cartão de memória)
 
 Show\ advanced\ hints\ (i.e.\ helpful\ tooltips,\ suggestions\ and\ explanation)=Mostrar dicas avançadas (ou seja, dicas úteis, sugestões e explicações)
 
-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
 
-Memory\ stick\ mode=Modo cartão de memória
-
 Merged\ external\ changes=Mudanças externas mescladas
 Merge\ fields=Unir Campos
 
@@ -452,6 +514,7 @@ Modified\ group\ "%0".=Grupo "%0" modificado
 Modified\ groups=Grupos modificados
 
 Modified\ string=String modificada
+Modified\ string\:\ '%0' =String modificada\: '%0'
 
 Modify=Modificar
 
@@ -459,8 +522,11 @@ move\ group=mover grupo
 
 Moved\ group\ "%0".=Grupo "%0" movido
 
+Mr.\ DLib\ Privacy\ settings=Configurações de privacidade do Sr. 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 Sr. DLib para esta entrada.
 
@@ -515,7 +581,7 @@ Open\ editor\ when\ a\ new\ entry\ is\ created=Abrir o editor quando uma nova re
 
 Open\ file=Abrir arquivo
 
-Open\ last\ edited\ libraries\ at\ startup=Abrir as últimas base de dados editadas ao iniciar
+Open\ last\ edited\ libraries\ on\ startup=Abrir as últimas bibliotecas editadas na inicialização
 
 Connect\ to\ shared\ database=Conectar à base de dados partilhada
 
@@ -530,8 +596,6 @@ Operating\ System\ (Provides\ for\ better\ recommendations\ by\ giving\ an\ indi
 
 Optional\ fields=Campos opcionais
 
-Options=Opções
-
 or=ou
 
 Override\ default\ file\ directories=Substituir os diretórios de arquivo padrão
@@ -546,6 +610,7 @@ Paste=Colar
 
 paste\ entries=colar referências
 
+paste\ entry\ %0=colar entrada %0
 
 Path\ to\ %0\ not\ defined=Caminho para %0 não definido
 
@@ -583,12 +648,16 @@ Reset\ default\ preview\ style=Redefinir estilo de pré-visualização padrão
 Previous\ entry=Referência anterior
 Problem\ with\ parsing\ entry=Problema ao analisar a referência
 Processing\ %0=Processando %0
+Pull\ changes\ from\ shared\ database=Puxar alterações da base de dados compartilhada
+Problem\ finding\ files.\ See\ error\ log\ for\ details.=Problema ao encontrar arquivos. Veja o log de erros para mais detalhes.
 
 Pushed\ citations\ to\ %0=Citações enviadas para %0
 
+Push\ applications=Enviar para o aplicativo
 
 Quit\ JabRef=Sair do JabRef
 
+Read\ only=Somente leitura
 
 Redo=Refazer
 
@@ -596,6 +665,7 @@ Refine\ supergroup\:\ When\ selected,\ view\ entries\ contained\ in\ both\ this\
 
 regular\ expression=Expressão regular
 
+Related\ articles=Artigos relacionados
 
 Remote\ operation=Operação remota
 
@@ -605,48 +675,72 @@ Remove\ subgroups=Remover todos os subgrupos
 
 Remove\ all\ subgroups\ of\ "%0"?=Remover todos os subgrupos de "%0"?
 
+Remove\ selected\ entries\ from\ this\ group=Remover as entradas selecionadas deste grupo
 
 Remove\ group=Remover grupo
 
 Remove\ group\ and\ subgroups=Remover grupos e subgrupos
 
+Remove\ groups\ and\ subgroups=Remover grupos e subgrupos
 
+Remove\ all\ selected\ groups\ and\ keep\ their\ subgroups?=Remover todos os grupos selecionados e manter seus subgrupos?
 
+Remove\ group\ "%0"\ and\ keep\ its\ subgroups?=Remover grupo "%0" e manter seus subgrupos?
 
+Remove\ groups=Remover grupos
 
+Removed\ all\ selected\ groups.=Removido todos os grupos selecionados.
 
 Remove\ group\ "%0"\ and\ its\ subgroups?=Remover grupo "%0" e seus subgrupos?
 
 Removed\ group\ "%0"\ and\ its\ subgroups.=Grupo "%0" e seus subgrupos removidos.
 
+Remove\ all\ selected\ groups\ and\ their\ subgroups?=Remover todos os grupos selecionados e seus subgrupos?
 
+Removed\ all\ selected\ groups\ and\ their\ subgroups.=Removeu todos os grupos selecionados e seus subgrupos.
 
+Remove\ group\ "%0"?=Remover grupo "%0"?
 
 Remove\ link=Remover link
 
+Remove\ string\ %0=Remover string %0
 
 Removed\ group\ "%0".=Grupo "%0" removido.
 
+Deleted\ string=String excluída
+Deleted\ string\:\ '%0'=String excluída\: '%0'
 
+Renamed\ string\:\ '%0'=String renomeada\: '%0'
 
+Replace=Substituir
+Replace\ With\:=Substituir por\:
+Limit\ to\ Selected\ Entries=Limitar aos itens selecionados
+Limit\ to\ Fields=Limitar aos Campos
+All\ Field\ Replace=Substituir Todos os Campos
+Find\:=Procurar\:
+Find\ and\ Replace=Procurar e Substituir
 
 Replace\ (regular\ expression)=Substituir (expressão regular)
 
+Replace\ String=Substituir String
 Replace\ string=Substituir string
 
 
 Required\ fields=Campos obrigatórios
 
+Resolve\ BibTeX\ strings=Resolver strings BibTeX
 
 resolved=resolvido
 
+Restart=Reiniciar
 
+Restart\ required=É necessário reiniciar
 
+Return\ to\ dialog=Retornar à caixa de diálogo
 
 Review=Revisar
 Review\ changes=Revisar mudanças
 
-
 Save=Salvar
 Save\ all\ finished.=Salvar todos os concluídos.
 Save\ all\ open\ libraries=Salvar todas as preferências
@@ -656,39 +750,61 @@ 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
 Could\ not\ save\ file.=Não foi possível salvar o arquivo.
 Could\ not\ save,\ file\ locked\ by\ another\ JabRef\ instance.=Não foi possível salvar, o arquivo está bloqueado por outra instância JabRef.
 Saved\ selected\ to\ '%0'.=Seleção salva para '%0'.
 Autosave\ local\ libraries=Salvar biblioteca local automaticamente
 Automatically\ save\ the\ library\ to=Salvar a biblioteca local automaticamente em
 Please\ enter\ a\ valid\ file\ path.=Por favor entre um caminho válido
+Overwrite\ file=Sobrescrever arquivo
+Unable\ to\ write\ to\ %0.=Não é possível gravar em %0.
 
 Refuse\ to\ save\ the\ library\ before\ external\ changes\ have\ been\ reviewed.=Recusa em salvar a base de dados antes de mudanças externas serem revisadas.
 Library\ protection=Proteção da base de dados
 Unable\ to\ save\ library=Não foi possível salvar a base de dados
 
-Always\ reformat\ BIB\ file\ on\ save\ and\ export=Reformatar sempre o arquivo BIB durante o salvar ou exportar
 Character\ encoding\ '%0'\ is\ not\ supported.=A codificação de caracteres '%0' não é suportada.
 
 Search=Pesquisar
 Searching...=Buscando...
+Finished\ Searching=Pesquisa concluída
 Search\ expression=Pesquisar expressão
+Fulltext\ search=Pesquisa de texto completo
 Help\ on\ regular\ expression\ search=Ajuda sobre busca por expressão regular
 Searching\ for\ duplicates...=Procurando por duplicatas...
 Searching\ for\ files=Procurando por arquivos...
+The\ search\ is\ case-insensitive.=A busca não faz distinção entre maiúsculas e minúsculas.
+The\ search\ is\ case-sensitive.=A busca diferencia maiúsculas de minúsculas.
 Use\ regular\ expression\ search=Utilizar pesquisa por expressão regular
 search\ expression=expressão de pesquisa
+Free\ search\ expression=Expressão de busca livre
 Search\ failed\:\ illegal\ search\ expression=A pesquisa falhou\: expressão de pesquisa ilegal
 No\ search\ matches.=Sem correspondências.
 Web\ search=Pesquisa na Web
+Search\ results=Resultados da pesquisa
 Please\ enter\ a\ search\ string=Favor digitar uma string de busca
 Please\ open\ or\ start\ a\ new\ library\ before\ searching=Por favor, abra ou inicie uma base de dados antes de realizar a busca
+Please\ enter\ a\ field\ name\ to\ search\ for\ a\ keyword.=Por favor, digite um nome de campo para procurar uma palavra-chave.
 No\ results\ found.=Nenhum resultado encontrado.
 Found\ %0\ results.=Encontrados %0 resultados.
+Invalid\ regular\ expression=Expressão regular inválida
 This\ search\ contains\ entries\ in\ which\ any\ field\ contains\ the\ regular\ expression\ <b>%0</b>=Esta pesquisa contém entradas com a expressão regular <b>%0</b> em que qualquer campo
 This\ search\ contains\ entries\ in\ which\ any\ field\ contains\ the\ term\ <b>%0</b>=Esta pesquisa contém entradas com o termo <b>%0</b> em que qualquer campo
 This\ search\ contains\ entries\ in\ which=Esta pesquisa contém entradas cujo
-
+Empty\ search\ ID=ID de pesquisa vazia
+The\ given\ search\ ID\ was\ empty.=O ID de pesquisa fornecido estava vazio.
+Clear\ search=Limpar pesquisa
+Search\ document\ identifier\ online=Pesquisar identificador de documento online
+Search\ for\ unlinked\ local\ files=Procurar por arquivos locais desvinculados
+Search\ full\ text\ documents\ online=Pesquisar documentos de texto completo on-line
+Search\ term\ is\ empty.=O termo de pesquisa está vazio.
+Invalid\ regular\ expression.=Expressão regular inválida.
+Searching\ for\ a\ keyword=Procurando uma palavra-chave
+
+Search\ across\ libraries\ in\ a\ new\ window=Pesquisar entre bibliotecas em uma nova janela
+Keep\ search\ string\ across\ libraries=Manter busca de string entre bibliotecas
+Keep\ dialog\ always\ on\ top=Manter a caixa de diálogo sempre no topo
 
 Select\ all=Selecionar tudo
 
@@ -710,6 +826,9 @@ Show\ BibTeX\ source\ by\ default=Exibir o fonte BibTeX por padrão
 
 Show\ confirmation\ dialog\ when\ deleting\ entries=Exibir diálogo de confirmação ao remover referências
 
+
+
+
 Show\ last\ names\ only=Exibir apenas últimos nomes
 
 Show\ names\ unchanged=Exibir nomes não modificados
@@ -781,6 +900,7 @@ Value\ cleared\ externally=Valor apagado externamente
 View=Visualizar
 Vim\ server\ name=Nome do servidor Vim
 
+
 Warn\ about\ unresolved\ duplicates\ when\ closing\ inspection\ window=Alertar sobre duplicatas não resolvidas ao fechar a janela de inspeção
 
 Warn\ before\ overwriting\ existing\ keys=Alertar ao sobrescrever chaves existentes
@@ -851,7 +971,6 @@ User-specific\ file\ directory=Diretório de arquivo específico do usuário
 Autocomplete\ names\ in\ 'Firstname\ Lastname'\ format\ only=Autocompletar nome em um formato 'Nome, Sobrenome' apenas
 Autocomplete\ names\ in\ 'Lastname,\ Firstname'\ format\ only=Autocompletar nomes em um formato 'Sobrenome, Nome' apenas
 Autocomplete\ names\ in\ both\ formats=Autocompletar nomes em ambos os formatos
-Send\ as\ email=Enviar como email
 References=Referências
 Sending\ of\ emails=Envio de emails
 Subject\ for\ sending\ an\ email\ with\ references=Assunto para enviar um email com referências
@@ -909,7 +1028,6 @@ Please\ choose\ which\ one\ to\ connect\ to\:=Por favor, escolha um deles para c
 Choose\ OpenOffice/LibreOffice\ executable=Escolher um executável OpenOffice/LibreOffice
 Select\ document=Selecionar documento
 HTML\ list=Lista HTML
-If\ possible,\ normalize\ this\ list\ of\ names\ to\ conform\ to\ standard\ BibTeX\ name\ formatting=Se possível, normalize esta lista de nomes conforme à formação de nomes BibTeX padrão
 Could\ not\ open\ %0=Não foi possível abrir %0
 Unknown\ import\ format=Formato de importação desconhecido
 Style\ selection=Seleção de estilo
@@ -962,7 +1080,6 @@ Four\ stars=Quatro estrelas
 Five\ stars=Cinco estrelas
 Help\ on\ special\ fields=Ajuda com campos especiais
 Keywords\ of\ selected\ entries=Palavras-chave das entradas selecionadas
-Manage\ content\ selectors=Gerenciar seletores de conteúdo
 Manage\ keywords=Gerenciar palavras-chave
 No\ priority\ information=Sem informações de prioridade
 No\ rank\ information=Sem informações de classificação
@@ -990,7 +1107,6 @@ Error\ message\:=Mensagem de erro\:
 If\ a\ pasted\ or\ imported\ entry\ already\ has\ the\ field\ set,\ overwrite.=Se a referência colada ou importada já possuir o campo definido, sobrescrever.
 Not\ connected\ to\ any\ Writer\ document.\ Please\ make\ sure\ a\ document\ is\ open,\ and\ use\ the\ 'Select\ Writer\ document'\ button\ to\ connect\ to\ it.=Não conectado a nenhum documento do Writer. Por favor assegure-se de que um documento está aberto, e use o botão 'Selecionar documento do Writer' para conectar a ele.
 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.
 
 Canceled\ merging\ entries=União das referências cancelada
@@ -1012,7 +1128,6 @@ Network=Rede
 Hostname=Host
 
 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
 
 
@@ -1070,11 +1185,13 @@ Deleted\ entry=Referência removida
 Modified\ groups\ tree=Árvore de grupos alterada
 Removed\ all\ groups=Todos os grupos removidos
 Select\ export\ format=Selecione o formato de Exportação
+
 Could\ not\ connect\ to\ %0=Não foi possível conectar a %0
 Warning\:\ %0\ out\ of\ %1\ entries\ have\ undefined\ title.=Alerta\: %0 de %1 referências não tem título definido.
 Really\ delete\ the\ selected\ entry?=Você realmente deseja remover a referência selecionada?
 Really\ delete\ the\ %0\ selected\ entries?=Você realmente deseja remover as %0 referências selecionadas?
 
+
 Keep\ left=Manter a da direita
 Keep\ right=Manter a da esquerda
 Old\ entry=Referência antiga
@@ -1115,7 +1232,6 @@ New\ mastersthesis=Nova Tese de Mestrado
 New\ phdthesis=Nova Tese de Doutoramento
 New\ proceedings=Novo livro de actas
 New\ unpublished=Novo não publicado
-Preamble\ editor,\ store\ changes=Editor do preâmbulo, guardar as alterações
 Push\ to\ application=Enviar para o aplicativo
 Refresh\ OpenOffice/LibreOffice=Atualizar OpenOffice/LibreOffice
 Save\ all=Salvar tudo
@@ -1161,6 +1277,10 @@ Reset\ preferences=Redefinir preferências
 
 
 
+Main\ file\ directory=Diretório de arquivos principal
+
+
+
 
 
 
@@ -1312,6 +1432,7 @@ Default\ pattern=Ppadrão predefinido
 
 
 
+
 
 
 plain\ text=texto sem formatação
@@ -1322,3 +1443,9 @@ plain\ text=texto sem formatação
 
 
 
+
+
+
+
+
+
diff --git a/src/main/resources/l10n/JabRef_pt_BR.properties b/src/main/resources/l10n/JabRef_pt_BR.properties
index 1183be89d55..c6b2f434357 100644
--- a/src/main/resources/l10n/JabRef_pt_BR.properties
+++ b/src/main/resources/l10n/JabRef_pt_BR.properties
@@ -1,12 +1,4 @@
-Could\ not\ delete\ empty\ entries.=Não foi possível excluir as entradas vazias.
-
-Delete\ empty\ entries=Excluir entradas vazias
-
-Empty\ entries=Entradas vazias
-
-Keep\ empty\ entries=Manter entradas vazias
-
-Library\ '%0'\ has\ empty\ entries.\ Do\ you\ want\ to\ delete\ them?=A biblioteca '%0' tem entradas vazias. Você quer excluí-las?
+Proxy\ requires\ password=Proxy requisita senha
 
 Unable\ to\ monitor\ file\ changes.\ Please\ close\ files\ and\ processes\ and\ restart.\ You\ may\ encounter\ errors\ if\ you\ continue\ with\ this\ session.=Não é possível monitorar as alterações de arquivos. Por favor feche os arquivos e os processors e reinicie. Você pode encontrar erros se continuar com esta sessão.
 %0\ contains\ the\ regular\ expression\ <b>%1</b>=%0 contém a Expressão Regular <b>%1</b>
@@ -269,7 +261,8 @@ Do\ not\ abbreviate\ names=Não abreviar nomes
 
 Do\ not\ open\ any\ files\ at\ startup=Não abrir arquivos ao iniciar
 
-Do\ not\ wrap\ the\ following\ fields\ when\ saving=Não agregar os seguintes campos ao salvar
+Do\ not\ wrap\ when\ saving=Não realizar quebra de linha ao salvar
+
 Do\ not\ write\ the\ following\ fields\ to\ XMP\ Metadata=Não escrever os seguintes campos para metadados XMP
 
 Donate\ to\ JabRef=Doar para JabRef
@@ -282,6 +275,8 @@ duplicate\ removal=remoção de duplicatas
 
 Duplicate\ fields=Duplicar campos
 
+Unable\ to\ change\ field\ name.\ "%0"\ already\ in\ use.=Não é possível alterar o nome do campo. "%0" já está em uso.
+
 Duplicate\ string\ name=Duplicar nome da string
 
 Duplicates\ found=Duplicatas encontradas
@@ -337,19 +332,23 @@ Extension=Extensão
 
 External\ Changes\ Resolver=Solucionador de Alterações Externas
 
-External\ file\ links=Links de arquivos externos
-
 External\ programs=Programas externos
 
 Failed\ to\ import\ by\ ID=Falha ao importar pelo ID
 
 Field=Campo
-
 field=campo
 
 Field\ name=Nome do campo
-
+Field\ names=Nomes dos campos
 Field\ names\ are\ not\ allowed\ to\ contain\ white\ spaces\ or\ certain\ characters\ (%0).=Nomes de campo não devem conter espaços em branco, nem certos caracteres (%0).
+New\ field\ name=Novo nome do campo
+Add\ new\ field\ name=Adicionar novo nome do campo
+Field\ name\ "%0"\ already\ exists=Campo "%0" já existe
+No\ field\ name\ selected\!=Nenhum campo foi selecionado\!
+Remove\ field\ name=Remover nome do campo
+Are\ you\ sure\ you\ want\ to\ remove\ field\ name\:\ "%0"?=Tem certeza que deseja remover o campo\: "%0?
+Manage\ field\ names\ &\ content=Gerenciar nomes e conteúdo dos campos
 
 Field\ to\ group\ by=Campos como critério de agrupamento
 
@@ -477,6 +476,29 @@ Journal\ abbreviations=Abreviações de periódico
 Journal\ lists\:=Listas de periódicos\:
 Remove\ journal\ '%0'=Remover periódico '%0'
 
+Journal\ Information=Informações do periódico
+Year=Ano
+ISSN\ or\ journal\ name\ required\ for\ fetching\ journal\ information=ISSN ou nome do periódico necessário para buscar informações do periódico
+Fetch\ journal\ information\ online\ to\ show=Obter informações de periódicos online para exibir
+Allow\ sending\ ISSN\ to\ a\ JabRef\ online\ service\ (SCimago)\ for\ fetching\ journal\ information=Permitir o envio de ISSN para um serviço on-line JabRef (SCimago) para obter informações do periódico
+Please\ enable\ journal\ information\ fetching\ in\ %0\ >\ %1=Por favor, habilite as informações do periódico a buscar em %0 > %1
+Categories=Categorias
+ISSN=ISSN
+Publisher=Editora
+h-index=índice h
+Error\ while\ fetching\ journal\ information\:\ %0=Erro ao obter informações do periódico\: %0
+ISSN\ and/or\ journal\ name\ not\ found\ in\ catalog=Nome do ISSN e/ou do diário não encontrado no catálogo
+Citable\ Docs\ (Previous\ 3\ Years)=Documentos citáveis (3 anos passados)
+Cites\ Incoming\ by\ Recently\ Published=Cidades recebidas por publicações recentes
+Cites\ Outgoing=Citações Feitas
+Cites\ Outgoing\ per\ Document=Citações Feitas por Documento
+Docs\ (This\ Year)=Documentos (Neste Ano)
+Incorrect\ ISSN\ format=Formato de ISSN incorreto
+Error\ accessing\ catalog=Erro ao acessar catálogo
+
+Check\ for\ latest\ version\ online=Verificar a versão mais recente on-line
+Please\ use\ the\ latest\ version\ of\ JabRef\ if\ you\ run\ into\ a\ bug.\ If\ you\ encounter\ an\ issue\ or\ a\ bug,\ check\ the\ latest\ version,\ if\ the\ issue\ is\ still\ present.=Por favor, utilize a versão mais recente do JabRef se você encontrar um bug. Se você se deparar com um problema ou bug, verifique a versão mais recente para ver se o problema ainda está presente.
+
 Keep\ both=Manter ambos
 
 Keep\ subgroups=Manter subgrupos
@@ -503,12 +525,10 @@ LaTeX\ AUX\ file\:=Arquivo AUX LaTeX\:
 
 Link=Linkar
 Listen\ for\ remote\ operation\ on\ port=Escutar operações remotas na porta
-Load\ and\ Save\ preferences\ from/to\ jabref.xml\ on\ start-up\ (memory\ stick\ mode)=Carregar e salvar preferências a partir de/para jabref.xml ao iniciar (modo cartão de memória)
+Memory\ stick\ mode\ -\ Store\ preferences\ in\ 'jabref.xml'\ in\ the\ app\ folder.=Modo de Memória Usb - Armazene as preferências no arquivo 'jabref.xml' na pasta do aplicativo.
 
 Show\ advanced\ hints\ (i.e.\ helpful\ tooltips,\ suggestions\ and\ explanation)=Mostrar dicas avançadas (ou seja, dicas úteis, sugestões e explicações)
 
-Main\ file\ directory=Diretório de arquivos principal
-
 Manage\ custom\ exports=Gerenciar exportações personalizadas
 
 Manage\ custom\ imports=Gerenciar importações personalizadas
@@ -516,8 +536,6 @@ External\ file\ types=Tipos de arquivo externos
 
 Mark\ new\ entries\ with\ owner\ name=Marcar novas referências com o nome do usuário
 
-Memory\ stick\ mode=Modo cartão de memória
-
 Merged\ external\ changes=Mudanças externas mescladas
 Merge\ fields=Unir Campos
 
@@ -593,7 +611,7 @@ Open\ editor\ when\ a\ new\ entry\ is\ created=Abrir o editor quando uma nova re
 
 Open\ file=Abrir arquivo
 
-Open\ last\ edited\ libraries\ at\ startup=Abrir as últimas base de dados editadas ao iniciar
+Open\ last\ edited\ libraries\ on\ startup=Abrir as últimas bibliotecas editadas na inicialização
 
 Connect\ to\ shared\ database=Conectar à base de dados partilhada
 
@@ -608,8 +626,6 @@ Operating\ System\ (Provides\ for\ better\ recommendations\ by\ giving\ an\ indi
 
 Optional\ fields=Campos opcionais
 
-Options=Opções
-
 or=ou
 
 Override\ default\ file\ directories=Substituir os diretórios de arquivo padrão
@@ -744,8 +760,7 @@ 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
+Resolve\ BibTeX\ strings=Resolver textos BibTeX
 
 resolved=resolvido
 
@@ -759,8 +774,6 @@ 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.
 Save\ all\ open\ libraries=Salvar todas as preferências
@@ -784,7 +797,7 @@ Refuse\ to\ save\ the\ library\ before\ external\ changes\ have\ been\ reviewed.
 Library\ protection=Proteção da base de dados
 Unable\ to\ save\ library=Não foi possível salvar a base de dados
 
-Always\ reformat\ BIB\ file\ on\ save\ and\ export=Reformatar sempre o arquivo BIB durante o salvar ou exportar
+Always\ reformat\ library\ on\ save\ and\ export=Reformatar sempre a biblioteca ao salvar e exportar
 Character\ encoding\ '%0'\ is\ not\ supported.=A codificação de caracteres '%0' não é suportada.
 
 Search=Pesquisar
@@ -850,6 +863,12 @@ Show\ BibTeX\ source\ by\ default=Exibir o fonte BibTeX por padrão
 
 Show\ confirmation\ dialog\ when\ deleting\ entries=Exibir diálogo de confirmação ao remover referências
 
+Persist\ password\ between\ sessions=Persistir senha entre as sessões
+
+Persist\ api\ keys\ between\ sessions=Manter as chaves da Api entre sessões
+
+Credential\ store\ not\ available.=Armazenamento de credenciais não disponíveis.
+
 Show\ last\ names\ only=Exibir apenas últimos nomes
 
 Show\ names\ unchanged=Exibir nomes não modificados
@@ -931,6 +950,7 @@ Upgrade\ external\ PDF/PS\ links\ to\ use\ the\ '%0'\ field.=Atualizar links PDF
 usage=utilização
 Use\ autocompletion=Usar preenchimento automático
 
+User\ interface=Interface de Usuário
 
 Username=Nome de usuário
 
@@ -943,6 +963,8 @@ Verify\ that\ LyX\ is\ running\ and\ that\ the\ lyxpipe\ is\ valid.=Verifique se
 View=Visualizar
 Vim\ server\ name=Nome do servidor Vim
 
+View\ journal\ info=Ver informação do periódico
+
 Warn\ about\ unresolved\ duplicates\ when\ closing\ inspection\ window=Alertar sobre duplicatas não resolvidas ao fechar a janela de inspeção
 
 Warn\ before\ overwriting\ existing\ keys=Alertar ao sobrescrever chaves existentes
@@ -1043,7 +1065,11 @@ You\ must\ enter\ an\ integer\ value\ in\ the\ interval\ 1025-65535=Você deve d
 Autocomplete\ names\ in\ 'Firstname\ Lastname'\ format\ only=Autocompletar nome em um formato 'Nome, Sobrenome' apenas
 Autocomplete\ names\ in\ 'Lastname,\ Firstname'\ format\ only=Autocompletar nomes em um formato 'Sobrenome, Nome' apenas
 Autocomplete\ names\ in\ both\ formats=Autocompletar nomes em ambos os formatos
-Send\ as\ email=Enviar como email
+Send=Enviar
+As\ Email=Como E-mail
+To\ Kindle=Para o Kindle
+Send\ to\ Kindle=Enviar para o Kindle
+Email\ address\ for\ sending\ to\ Kindle=Endereço de e-mail para envio ao Kindle
 References=Referências
 Sending\ of\ emails=Envio de emails
 Subject\ for\ sending\ an\ email\ with\ references=Assunto para enviar um email com referências
@@ -1121,7 +1147,6 @@ Please\ choose\ which\ one\ to\ connect\ to\:=Por favor, escolha um deles para c
 Choose\ OpenOffice/LibreOffice\ executable=Escolher um executável OpenOffice/LibreOffice
 Select\ document=Selecionar documento
 HTML\ list=Lista HTML
-If\ possible,\ normalize\ this\ list\ of\ names\ to\ conform\ to\ standard\ BibTeX\ name\ formatting=Se possível, normalize esta lista de nomes conforme à formação de nomes BibTeX padrão
 Could\ not\ open\ %0=Não foi possível abrir %0
 Unknown\ import\ format=Formato de importação desconhecido
 Style\ selection=Seleção de estilo
@@ -1148,6 +1173,7 @@ Cleanup\ entries=Limpar entradas
 Automatically\ assign\ new\ entry\ to\ selected\ groups=Designar automaticamente novas referências para os grupos selecionados
 %0\ mode=Modo %0
 Move\ DOIs\ from\ note\ and\ URL\ field\ to\ DOI\ field\ and\ remove\ http\ prefix=Mover DOIs dos campos note e URL para o campo DOI e remover o prefixo http
+Move\ URL\ in\ note\ field\ to\ url\ field=Mover a URL do campo de notas para o campo de URL
 Make\ paths\ of\ linked\ files\ relative\ (if\ possible)=Tornar os caminhos dos arquivos relativos (se possível)
 Rename\ PDFs\ to\ given\ filename\ format\ pattern=Renomear PDFs para o padrão de nome definido
 Rename\ only\ PDFs\ having\ a\ relative\ path=Renomear apenas os PDFs que tem caminho relativo
@@ -1158,6 +1184,7 @@ One\ entry\ needed\ a\ clean\ up=Uma referência necessitou limpeza
 
 Group\ tree\ could\ not\ be\ parsed.\ If\ you\ save\ the\ BibTeX\ library,\ all\ groups\ will\ be\ lost.=Árvore de agrupamento não pode ser interpretada. Se você salvar sua base de dados BibTeX, todos os grupos serão perdidos
 Attach\ file=Anexar arquivo
+Attach\ file\ from\ URL=Anexar arquivo de URL
 Setting\ all\ preferences\ to\ default\ values.=Definindo todas as preferências para os valores padrão
 Resetting\ preference\ key\ '%0'=Redefinindo preferência '%0'
 Unable\ to\ clear\ preferences.=Não foi possível limpar as preferências
@@ -1191,7 +1218,6 @@ Four\ stars=Quatro estrelas
 Five\ stars=Cinco estrelas
 Help\ on\ special\ fields=Ajuda com campos especiais
 Keywords\ of\ selected\ entries=Palavras-chave das entradas selecionadas
-Manage\ content\ selectors=Gerenciar seletores de conteúdo
 Content\ selectors=Seletores de conteúdo
 Manage\ keywords=Gerenciar palavras-chave
 No\ priority\ information=Sem informações de prioridade
@@ -1222,7 +1248,6 @@ Error\ message\:=Mensagem de erro\:
 If\ a\ pasted\ or\ imported\ entry\ already\ has\ the\ field\ set,\ overwrite.=Se a referência colada ou importada já possuir o campo definido, sobrescrever.
 Not\ connected\ to\ any\ Writer\ document.\ Please\ make\ sure\ a\ document\ is\ open,\ and\ use\ the\ 'Select\ Writer\ document'\ button\ to\ connect\ to\ it.=Não conectado a nenhum documento do Writer. Por favor assegure-se de que um documento está aberto, e use o botão 'Selecionar documento do Writer' para conectar a ele.
 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.
 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.
@@ -1257,7 +1282,6 @@ Please\ specify\ a\ password=Por favor, especifique a sua senha
 Proxy\ configuration=Configuração de proxy
 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
@@ -1274,7 +1298,7 @@ Open\ folder=Abrir diretório
 Export\ sort\ order=Exportar ordenação
 Save\ sort\ order=Salvar ordenação
 
-Keep\ original\ order=Manter a classificação original
+Keep\ original\ order\ and\ add\ new\ entries\ at\ the\ end=Manter a ordem original e adicionar novas entradas no final
 Use\ current\ table\ sort\ order=Usar ordem de classificação de tabela atual
 Use\ specified\ order=Utilizar classificação especificada
 Show\ extra\ columns=Mostrar colunas extra
@@ -1310,7 +1334,7 @@ Please\ open\ %0\ manually.=Por favor abra %0 manualmente.
 The\ link\ has\ been\ copied\ to\ the\ clipboard.=O link foi copiado para a área de transferência
 
 Open\ %0\ file=Abrir %0 arquivo
-Could\ not\ detect\ terminal\ automatically.\ Please\ define\ a\ custom\ terminal\ in\ the\ preferences.=Não foi possível detectar o terminal automaticamente. Por favor, defina um terminal personalizado nas preferências.
+Could\ not\ detect\ terminal\ automatically\ using\ '%0'.\ Please\ define\ a\ custom\ terminal\ in\ the\ preferences.=Não foi possível detectar automaticamente o terminal usando '%0'. Por favor, defina um terminal personalizado nas preferências.
 
 Cannot\ delete\ file=Impossível remover arquivo
 File\ permission\ error=Erro de permissão de arquivo
@@ -1340,7 +1364,7 @@ Removed\ all\ groups=Todos os grupos removidos
 %0.\ Accepting\ the\ change\ replaces\ the\ complete\ groups\ tree\ with\ the\ externally\ modified\ groups\ tree.=%0. Aceitar a alteração substitui a árvore de grupos completa pela árvore de grupos modificada externamente.
 Select\ export\ format=Selecione o formato de Exportação
 Return\ to\ library=Voltar à biblioteca
-On\ JabRef=No JabRef
+
 Could\ not\ connect\ to\ %0=Não foi possível conectar a %0
 Warning\:\ %0\ out\ of\ %1\ entries\ have\ undefined\ title.=Alerta\: %0 de %1 referências não tem título definido.
 Warning\:\ %0\ out\ of\ %1\ entries\ have\ undefined\ citation\ key.=Aviso\: %0 de %1 entradas possuem uma chave de citação indefinida.
@@ -1348,6 +1372,10 @@ Warning\:\ %0\ out\ of\ %1\ entries\ have\ undefined\ DOIs.=Atenção\: %0 de %1
 Really\ delete\ the\ selected\ entry?=Você realmente deseja remover a referência selecionada?
 Really\ delete\ the\ %0\ selected\ entries?=Você realmente deseja remover as %0 referências selecionadas?
 
+On\ disk=No disco
+In\ JabRef=Em JabRef
+Entry\ Preview=Prévia da entrada
+
 Keep\ left=Manter a da direita
 Keep\ right=Manter a da esquerda
 Old\ entry=Referência antiga
@@ -1381,6 +1409,7 @@ Entry\ editor,\ previous\ panel\ 2=Editor de referências, painel anterior 2
 File\ list\ editor,\ move\ entry\ down=Editor de lista de arquivos, mover a entrada para baixo
 File\ list\ editor,\ move\ entry\ up=Editor de lista de arquivos, mover a entrada para cima
 Focus\ entry\ table=Foco na tabela de referências
+Focus\ group\ list=Lista de Grupos Focados
 Import\ into\ current\ library=Importar para base de dados atual
 Import\ into\ new\ library=Importar para nova base de dados
 New\ article=Novo artigo
@@ -1391,7 +1420,6 @@ New\ mastersthesis=Nova Tese de Mestrado
 New\ phdthesis=Nova Tese de Doutoramento
 New\ proceedings=Novo livro de actas
 New\ unpublished=Novo não publicado
-Preamble\ editor,\ store\ changes=Editor do preâmbulo, guardar as alterações
 Push\ to\ application=Enviar para o aplicativo
 Refresh\ OpenOffice/LibreOffice=Atualizar OpenOffice/LibreOffice
 Resolve\ duplicate\ citation\ keys=Resolver chaves de citação duplicadas
@@ -1462,7 +1490,7 @@ Capitalize=Primeira letra em maiúsculo
 Capitalize\ all\ Words,\ but\ Converts\ Articles,\ Prepositions,\ and\ Conjunctions\ to\ Lower\ Case.=Capitaliza todas as palavras, mas transforma Artigos, Preposições e Conjunções em letras minúsculas.
 Capitalize\ the\ first\ word,\ changes\ other\ words\ to\ lower\ case.=Iniciar apenas a primeira palavra com maiúscula (e tornar todas as outras palavras minúsculas).
 changes\ all\ letters\ to\ lower\ case.=muda todas as letras para minúsculas.
-CHANGES\ ALL\ LETTER\ TO\ UPPER\ CASE.=MUDA TODAS AS LETRAS PARA MAIÚSCULAS.
+CHANGES\ ALL\ LETTERS\ TO\ UPPER\ CASE.=MUDA TODAS AS LETRAS PARA MAIÚSCULAS.
 Changes\ The\ First\ Letter\ Of\ All\ Words\ To\ Capital\ Case\ And\ The\ Remaining\ Letters\ To\ Lower\ Case.=Altera a primeira letra de todas as palavras para maiúsculas e as letras restantes para minúsculas.
 Cleans\ up\ LaTeX\ code.=Limpa o código LaTeX.
 Converts\ HTML\ code\ to\ LaTeX\ code.=Converte o código HTML para código LaTeX.
@@ -1506,7 +1534,11 @@ 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.
+
+Main\ file\ directory=Diretório de arquivos principal
+Main\ file\ directory\ not\ set.\ Check\ the\ preferences\ ("Linked\ files")\ or\ modify\ the\ library\ properties\ ("Override\ default\ file\ directories").=Diretório principal do arquivo não definido. Verifique as preferências ("Arquivos vinculados") ou modifique as propriedades da biblioteca ("Sobrescrever diretórios padrão de arquivos").
+Main\ file\ directory\ '%0'\ not\ found.\nCheck\ the\ tab\ "Linked\ files".=Diretório principal do arquivo '%0' não encontrado.\nVerifique a guia "Arquivos vinculados".
+
 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?
@@ -1561,6 +1593,8 @@ Verse=Versículo
 change\ entries\ of\ group=alterar referências do grupo
 odd\ number\ of\ unescaped\ '\#'=número ímpar de '\#' sem "escape"
 
+Found\ %0\ unescaped\ '&'=Encontrado %0 sem escape '&'
+
 Show\ diff=Mostrar diff
 Copy\ Version=Copiar versão
 Maintainers=Mantenedores
@@ -1580,7 +1614,7 @@ Message=Mensagem
 
 
 MathSciNet\ Review=Revisão MathSciNet
-Reset\ Bindings=Redefinir Associações (Bindings)
+Reset\ all=Redefinir tudo
 
 Decryption\ not\ supported.=Descriptografia não suportada.
 
@@ -1627,7 +1661,7 @@ 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".
+Error\ occurred\ while\ executing\ the\ command\ "%0".=Ocorreu um erro ao executar o comando "%0".
 Reformat\ ISSN=Reformatar ISSN
 
 Countries\ and\ territories\ in\ English=Países e territórios em inglês
@@ -1642,6 +1676,7 @@ Are\ you\ sure\ you\ want\ to\ remove\ the\ protected\ terms\ file?=Tem certeza
 Remove\ protected\ terms\ file=Remover arquivo de termos protegidos
 Add\ selected\ text\ to\ list=Adicionar o texto selecionado à lista
 Add\ {}\ around\ selected\ text=Adicionar {} em torno do texto selecionado
+Remove\ all\ {}\ in\ selected\ text=Remover todas as {} no texto selecionado
 Format\ field=Formato do campo
 New\ protected\ terms\ file=Novo arquivo de termos protegidos
 change\ field\ %0\ of\ entry\ %1\ from\ %2\ to\ %3=alterar o campo %0 da referência %1 de %2 para %3
@@ -1693,6 +1728,7 @@ Check\ the\ event\ log\ to\ see\ all\ notifications=Verifique o log de eventos p
 Host=Servidor
 Port=Porta
 Library=Biblioteca
+Libraries=Bibliotecas
 User=Usuário
 Connect=Conectar
 Connection\ error=Erro de conexão
@@ -1721,6 +1757,7 @@ Cannot\ cite\ entries\ without\ citation\ keys.\ Generate\ keys\ now?=Não é po
 New\ technical\ report=Novo relatório técnico
 
 %0\ file=Arquivo %0
+%0\ file\ (%1)=%0 arquivo (%1)
 Custom\ layout\ file=Arquivo de layout personalizado
 Protected\ terms\ file=Arquivo de termos protegidos
 Style\ file=Arquivo de estilo
@@ -1791,6 +1828,7 @@ DOI\ %0\ is\ invalid=O DOI %0 é inválido
 
 Select\ all\ customized\ types\ to\ be\ stored\ in\ local\ preferences\:=Selecione todos os tipos personalizados que devem armazenados nas preferências locais\:
 Different\ customization,\ current\ settings\ will\ be\ overwritten=Personalização diferente, as configurações atuais serão substituídas
+%0\ (from\ file)\n%1\ (current\ setting)=%0 (do arquivo)\n%1 (configuração atual)
 
 Entry\ type\ %0\ is\ only\ defined\ for\ Biblatex\ but\ not\ for\ BibTeX=O tipo de referência %0 só foi definido para Biblatex mas não para BibTeX
 
@@ -1919,6 +1957,7 @@ New\ sublibrary\ based\ on\ AUX\ file=Nova subbiblioteca baseada em arquivo AUX
 Push\ entries\ to\ external\ application\ (%0)=Enviar referências para um aplicativo externo (%0)
 Quit=Sair
 Recent\ libraries=Bibliotecas recentes
+Clear\ recent\ libraries=Limpar bibliotecas recentes
 Set\ up\ general\ fields=Configurar campos gerais
 View\ change\ log=Ver changelog
 View\ event\ log=Ver log de eventos
@@ -1960,12 +1999,6 @@ Select\ the\ entries\ to\ be\ imported\:=Selecione as referências a serem impor
 Add\ new\ String=Adicionar nova String
 Must\ not\ be\ empty\!=Não pode estar vazio\!
 Open\ Help\ page=Abrir página de Ajuda
-Add\ new\ field\ name=Adicionar novo nome do campo
-Field\ name\:=Nome do campo\:
-Field\ name\ "%0"\ already\ exists=Campo "%0" já existe
-No\ field\ name\ selected\!=Nenhum campo foi selecionado\!
-Remove\ field\ name=Remover nome do campo
-Are\ you\ sure\ you\ want\ to\ remove\ field\ name\:\ "%0"?=Tem certeza que deseja remover o campo\: "%0?
 Add\ new\ keyword=Adicionar nova palavra-chave
 Keyword\:=Palavra-chave\:
 Keyword\ "%0"\ already\ exists=Palavra-chave "%0" já existe
@@ -1976,7 +2009,6 @@ 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
 New\ library=Nova biblioteca
 OpenOffice/LibreOffice=OpenOffice/LibreOffice
 Open\ document\ viewer=Abrir visualizador de documentos
@@ -2048,16 +2080,15 @@ Add\ formatter\ to\ list=Adicionar formatador à lista
 Filter\ List=Lista de filtros
 Open\ files...=Abrir arquivos...
 
-Affected\ fields\:=Campos afetados\:
+Affected\ fields=Campos afetados
 Show\ preview\ as\ a\ tab\ in\ entry\ editor=Mostrar preview em uma guia no editor de referências
-Font=Fonte
 Visual\ theme=Tema visual
-Light\ theme=Tema claro
-Dark\ theme=Tema escuro
-Custom\ theme=Tema personalizado
 Overwrite\ existing\ keys=Sobrescrever chaves existentes
 Key\ patterns=Padrões de chave
 Font\ settings=Configurações de fonte
+Custom...=Personalizar...
+Dark=Escuro
+Light=Claro
 Please\ specify\ a\ css\ theme\ file.=Por favor, especifique um arquivo de tema css.
 You\ must\ enter\ an\ integer\ value\ higher\ than\ 8.=Você deve digitar um valor inteiro maior que 8.
 Letters\ after\ duplicate\ generated\ keys=Inserir letras após chaves duplicadas
@@ -2073,7 +2104,6 @@ Reset\ All=Restaurar tudo
 Linked\ identifiers=Identificadores vinculados
 
 insert\ entries=inserir referências
-On\ disk=No disco
 
 Independent=Independente
 Intersection=Interseção
@@ -2283,7 +2313,6 @@ 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
 Close\ other\ libraries=Fechar outras bibliotecas
@@ -2298,13 +2327,13 @@ Custom\ import\ formats=Formatos de importação personalizados
 
 No\ list\ enabled=Nenhuma lista habilitada
 Protect\ selection=Proteger a seleção
+Unprotect\ selection=Desproteger 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
+(\ Note\:\ Press\ return\ to\ commit\ changes\ in\ the\ table\!\ )=( Nota\: Pressione enter para fazer comitê das alterações na tabela)
 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
@@ -2339,7 +2368,7 @@ 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
 
@@ -2347,7 +2376,7 @@ Cited\ on\ pages=Citado nas páginas
 Please\ move\ the\ cursor\ into\ the\ document\ text.=Por favor, mover o cursor para o texto do documento.
 To\ get\ the\ visual\ positions\ of\ your\ citations\ I\ need\ to\ move\ the\ cursor\ around,\ but\ could\ not\ get\ it.=Para obter as posições visuais de suas citações, preciso mover o cursor, mas não foi possível.
 
-I\ cannot\ insert\ to\ the\ cursors\ current\ location.=Não posso inserir na localização atual do curador.
+I\ cannot\ insert\ to\ the\ cursor's\ current\ location.=Não posso inserir na localização atual do cursor.
 
 Please\ move\ the\ cursor\ to\ the\ location\ for\ the\ new\ citation.=Mova o cursor para o local para a nova citação.
 
@@ -2387,13 +2416,13 @@ File\ '%1'\ is\ a\ duplicate\ of\ '%0'.\ Keeping\ both\ due\ to\ deletion\ error
 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
+Catalog=Catálogo
+Catalogs=Catálogos
+Select\ Catalogs\:=Selecionar Catálogos\:
 Add\ Author\:=Adicionar Autor\:
 Add\ Query\:=Adicionar Consulta\:
 Add\ Research\ Question\:=Adicionar Questões de Pesquisa\:
@@ -2404,7 +2433,6 @@ Start\ new\ systematic\ literature\ review=Iniciar nova revisão sistemática da
 Manage\ study\ definition=Gerenciar definição de estudo
 Update\ study\ search\ results=Atualizar resultados da busca de estudo
 Study\ repository\ could\ not\ be\ created=Não foi possível criar o repositório de estudo
-Select\ Databases\:=Selecionar Banco de Dados\:
 
 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
@@ -2476,7 +2504,6 @@ Clear\ field\ content=Limpar conteúdo do campo
 Set\ or\ append\ content=Definir ou acrescentar conteúdo
 Edit\ field\ content\ for\ selected\ entries=Editar o conteúdo do campo para as entradas selecionadas
 Rename=Renomear
-New\ field\ name=Novo nome do campo
 Copy\ content=Copiar conteúdo
 Move\ content=Mover conteúdo
 Swap\ content=Trocar conteúdo
@@ -2493,6 +2520,7 @@ Split\ View=Visão dividida
 Plain\ Text=Texto sem Formatação
 Show\ Diff=Mostrar diferenças
 Merged\ Entry=Entrada mesclada
+Only\ show\ changed\ fields=Exibir apenas campos alterados
 
 Edit\ file\ link=Editar link do arquivo
 
@@ -2500,7 +2528,7 @@ Edit\ file\ link=Editar link do arquivo
 Assign=Atribuir
 Do\ not\ assign=Não atribuir
 
-Error\ occured\ %0=Ocorreu um erro %0
+Error\ occurred\ %0=Ocorreu um erro %0
 Left\ Entry=Entrada esquerda
 Merge\ %0=Mesclar %0
 Right\ Entry=Entrada direita
@@ -2524,4 +2552,26 @@ Use\ the\ field\ FJournal\ to\ store\ the\ full\ journal\ name\ for\ (un)abbrevi
 
 Library\ to\ import\ into=Biblioteca para onde importar
 
+Enable\ web\ search=Ativar pesquisa na web
+Web\ search\ disabled=Pesquisa na web desativada
+
 Multiline=Multilinha
+
+Unable\ to\ open\ linked\ eprint.\ Please\ set\ the\ eprinttype\ field=Não foi possível abrir a eprint. Defina o campo eprinttype
+Unable\ to\ open\ linked\ eprint.\ Please\ verify\ that\ the\ eprint\ field\ has\ a\ valid\ '%0'\ id=Não é possível abrir a eprint vinculada. Por favor, verifique se o campo de eprint tem id '%0' válido
+
+Search\ from\ history...=Pesquisar do histórico...
+your\ search\ history\ is\ empty=seu histórico de pesquisa está vazio
+Clear\ history=Limpar Histórico
+
+Delete\ %0\ files=Excluir %0 arquivos
+Delete\ %0\ files\ permanently\ from\ disk,\ or\ just\ remove\ the\ files\ from\ the\ entry?\ Pressing\ Delete\ will\ delete\ the\ files\ permanently\ from\ disk.=Excluir %0 arquivos permanentemente do disco, ou apenas remover os arquivos da entrada? Pressionar Excluir irá deletar os arquivos permanentemente do disco.
+Error\ accessing\ file\ '%0'.=Erro ao acessar o arquivo '%0'.
+This\ operation\ requires\ selected\ linked\ files.=Esta operação requer arquivos vinculados selecionados.
+
+Create\ backup=Criar backup
+Automatically\ search\ and\ show\ unlinked\ files\ in\ the\ entry\ editor=Pesquisar automaticamente e exibir arquivos não vinculados no editor de entrada
+
+File\ "%0"\ cannot\ be\ added\!=O arquivo "%0" não pode ser adicionado\!
+Illegal\ characters\ in\ the\ file\ name\ detected.\nFile\ will\ be\ renamed\ to\ "%0"\ and\ added.=Caracteres ilegais no nome de arquivo detectado.\nArquivo será renomeado para "%0" e adicionado.
+Rename\ and\ add=Renomear e adicionar
diff --git a/src/main/resources/l10n/JabRef_ru.properties b/src/main/resources/l10n/JabRef_ru.properties
index a073de684c7..4489dca9e57 100644
--- a/src/main/resources/l10n/JabRef_ru.properties
+++ b/src/main/resources/l10n/JabRef_ru.properties
@@ -1,12 +1,3 @@
-Could\ not\ delete\ empty\ entries.=Не удалось удалить пустые записи.
-
-Delete\ empty\ entries=Удалить пустые записи
-
-Empty\ entries=Пустые записи
-
-Keep\ empty\ entries=Оставить пустые записи
-
-Library\ '%0'\ has\ empty\ entries.\ Do\ you\ want\ to\ delete\ them?=Библиотека '%0' содержит пустые записи. Вы хотите их удалить?
 
 Unable\ to\ monitor\ file\ changes.\ Please\ close\ files\ and\ processes\ and\ restart.\ You\ may\ encounter\ errors\ if\ you\ continue\ with\ this\ session.=Не удается отслеживать изменения файла. Закройте файлы и перезапустите программу. Вы можете столкнуться с ошибками, если продолжите текущую сессию.
 %0\ contains\ the\ regular\ expression\ <b>%1</b>=%0 содержит регулярное выражение <b>%1</b>
@@ -263,7 +254,7 @@ Do\ not\ abbreviate\ names=Не сокращать названия
 
 Do\ not\ open\ any\ files\ at\ startup=Не открывать файлы при запуске
 
-Do\ not\ wrap\ the\ following\ fields\ when\ saving=Не сворачивать следующие поля при сохранении
+
 Do\ not\ write\ the\ following\ fields\ to\ XMP\ Metadata=Не записывать указанные поля в метаданные XMP
 
 Donate\ to\ JabRef=Поддержать JabRef
@@ -276,6 +267,7 @@ duplicate\ removal=удаление дубликатов
 
 Duplicate\ fields=Дубликаты полей
 
+
 Duplicate\ string\ name=Дубликат имени строки
 
 Duplicates\ found=Найдены дубликаты
@@ -330,19 +322,23 @@ Exporting=Выполняется экспорт
 Extension=Расширение
 
 
-External\ file\ links=Ссылки на внешние файлы
-
 External\ programs=Внешние программы
 
 Failed\ to\ import\ by\ ID=Не удалось импортировать по ID
 
 Field=Поле
-
 field=поле
 
 Field\ name=Имя поля
-
+Field\ names=Названия полей
 Field\ names\ are\ not\ allowed\ to\ contain\ white\ spaces\ or\ certain\ characters\ (%0).=Имена полей не должны содержать пробелов или следующих знаков (%0).
+New\ field\ name=Новое имя поля
+Add\ new\ field\ name=Добавить новое название поля
+Field\ name\ "%0"\ already\ exists=Название "%0" уже существует
+No\ field\ name\ selected\!=Ни одно поле не выбрано\!
+Remove\ field\ name=Убрать имя файла
+Are\ you\ sure\ you\ want\ to\ remove\ field\ name\:\ "%0"?=Вы уверены, что вы хотите удалить название\: "%0"?
+Manage\ field\ names\ &\ content=Управлять названиями полей и контентом
 
 Field\ to\ group\ by=Поле для группировки
 
@@ -470,6 +466,8 @@ Journal\ abbreviations=Сокращения для журналов
 Journal\ lists\:=Список журналов\:
 Remove\ journal\ '%0'=Удалить журнал '%0'
 
+
+
 Keep\ both=Оставить оба
 
 Keep\ subgroups=Сохранить подгруппы
@@ -494,12 +492,9 @@ LaTeX\ AUX\ file\:=AUX-файл LaTeX\:
 
 Link=Ссылка
 Listen\ for\ remote\ operation\ on\ port=Прослушивать удаленные подключения для порта
-Load\ and\ Save\ preferences\ from/to\ jabref.xml\ on\ start-up\ (memory\ stick\ mode)=Загружать/сохранять настройки из/в файл jabref.xml при запуске (режим флеш-памяти)
 
 Show\ advanced\ hints\ (i.e.\ helpful\ tooltips,\ suggestions\ and\ explanation)=Отобразить расширенные подсказки (т.е. всплывающие подсказки, предположения и объяснения)
 
-Main\ file\ directory=Основной каталог файлов
-
 Manage\ custom\ exports=Управление пользовательским экспортом
 
 Manage\ custom\ imports=Управление пользовательским импортом
@@ -507,8 +502,6 @@ External\ file\ types=Типы внешних файлов
 
 Mark\ new\ entries\ with\ owner\ name=Метка имени владельца для новых записей
 
-Memory\ stick\ mode=Режим флеш-памяти
-
 Merged\ external\ changes=Внешние изменения с объединением
 Merge\ fields=Объединить поля
 
@@ -583,7 +576,6 @@ Open\ editor\ when\ a\ new\ entry\ is\ created=Открыть редактор 
 
 Open\ file=Открыть файл
 
-Open\ last\ edited\ libraries\ at\ startup=Открыть БД с последним временем редактирования при запуске
 
 Connect\ to\ shared\ database=Подключение к БД с общим доступом
 
@@ -598,8 +590,6 @@ Operating\ System\ (Provides\ for\ better\ recommendations\ by\ giving\ an\ indi
 
 Optional\ fields=Доп. поля
 
-Options=Параметры
-
 or=или
 
 Override\ default\ file\ directories=Переопределить каталоги файлов, заданные по умолчанию
@@ -730,8 +720,6 @@ Replaces\ Unicode\ ligatures\ with\ their\ expanded\ form=Заменяет ли
 
 Required\ fields=Обязательные поля
 
-Do\ not\ resolve\ BibTeX\ strings=Не разрешать строки BibTeX
-Resolve\ BibTeX\ strings\ for\ the\ following\ fields=Разрешить строки BibTeX для следующих полей
 
 resolved=разрешено
 
@@ -745,8 +733,6 @@ Review=Просмотр
 Review\ changes=Просмотр изменений
 Review\ Field\ Migration=Перемещение поля обзора
 
-Loading=Загрузка
-
 Save=Сохранить
 Save\ all\ finished.=Сохранить все завершенные.
 Save\ all\ open\ libraries=Сохранить все открытые БД
@@ -769,7 +755,6 @@ Refuse\ to\ save\ the\ library\ before\ external\ changes\ have\ been\ reviewed.
 Library\ protection=Защита БД
 Unable\ to\ save\ library=Не удалось сохранить БД
 
-Always\ reformat\ BIB\ file\ on\ save\ and\ export=Всегда преобразовывать формат файла BIB при сохранении и экспорте
 Character\ encoding\ '%0'\ is\ not\ supported.=Кодировка '%0' не поддерживается.
 
 Search=Поиск
@@ -832,6 +817,9 @@ Show\ BibTeX\ source\ by\ default=Показать источник BibTeX по
 
 Show\ confirmation\ dialog\ when\ deleting\ entries=Запрос подтверждения при удалении записей
 
+
+
+
 Show\ last\ names\ only=Показать только фамилии
 
 Show\ names\ unchanged=Показать имена без изменений
@@ -922,6 +910,7 @@ Value\ cleared\ externally=Значение создано внешними ср
 View=Вид
 Vim\ server\ name=Имя сервера Vim
 
+
 Warn\ about\ unresolved\ duplicates\ when\ closing\ inspection\ window=Выдать предупреждение о неразрешенных дубликатах при закрытии окна контроля
 
 Warn\ before\ overwriting\ existing\ keys=Выдать предупреждение при перезаписи текущих ключей
@@ -1022,7 +1011,6 @@ You\ must\ enter\ an\ integer\ value\ in\ the\ interval\ 1025-65535=Необхо
 Autocomplete\ names\ in\ 'Firstname\ Lastname'\ format\ only=Автозавершение имен только для формата 'Имя Фамилия'
 Autocomplete\ names\ in\ 'Lastname,\ Firstname'\ format\ only=Автозавершение имен только для формата 'Фамилия, Имя'
 Autocomplete\ names\ in\ both\ formats=Автозавершение имен в обоих форматах
-Send\ as\ email=Отправить по эл.почте
 References=Ссылки
 Sending\ of\ emails=Выполняется отправка эл.почты
 Subject\ for\ sending\ an\ email\ with\ references=Тема письма эл.почты со ссылками
@@ -1100,7 +1088,6 @@ Please\ choose\ which\ one\ to\ connect\ to\:=Укажите одно для п
 Choose\ OpenOffice/LibreOffice\ executable=Выбор приложения OpenOffice/LibreOffice
 Select\ document=Выбрать документ
 HTML\ list=Список HTML
-If\ possible,\ normalize\ this\ list\ of\ names\ to\ conform\ to\ standard\ BibTeX\ name\ formatting=Если возможно, приведите список имен в соответствие со стандартным форматированием имен BibTeX
 Could\ not\ open\ %0=Не удалось открыть %0
 Unknown\ import\ format=Неизвестный формат импорта
 Style\ selection=Выбор стиля
@@ -1170,7 +1157,6 @@ Four\ stars=Четыре звезды
 Five\ stars=Пять звезд
 Help\ on\ special\ fields=Справка для полей особых отметок
 Keywords\ of\ selected\ entries=Ключевые слова для выбранных записей
-Manage\ content\ selectors=Управление выбором содержимого
 Content\ selectors=Селектор контента
 Manage\ keywords=Управление ключевыми словами
 No\ priority\ information=Без данных о приоритете
@@ -1201,7 +1187,6 @@ Error\ message\:=Сообщение об ошибке\:
 If\ a\ pasted\ or\ imported\ entry\ already\ has\ the\ field\ set,\ overwrite.=Перезаписать, если поле для вставленной или импортированной записи уже задано.
 Not\ connected\ to\ any\ Writer\ document.\ Please\ make\ sure\ a\ document\ is\ open,\ and\ use\ the\ 'Select\ Writer\ document'\ button\ to\ connect\ to\ it.=Отсутствует подключение к документу Writer. Убедитесь, что документ открыт и нажмите кнопку 'Выбрать документ Writer' для подключения.
 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.=Для отключения режима флеш-памяти переименуйте или удалите файл 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)=Разделитель(и)
 When\ downloading\ files,\ or\ moving\ linked\ files\ to\ the\ file\ directory,\ use\ the\ bib\ file\ location.=При загрузке файлов или перемещении связанных файлов в каталог файлов используйте расположение файла bib.
@@ -1236,7 +1221,6 @@ Please\ specify\ a\ password=Пожалуйста укажите пароль
 Proxy\ configuration=Конфигурация прокси
 Use\ custom\ proxy\ configuration=Использовать пользовательские настройки прокси-сервера
 Proxy\ requires\ authentication=Для прокси-сервера требуется авторизация
-Attention\:\ Password\ is\ stored\ in\ plain\ text\!=Внимание. Пароль сохранен в виде простого текста.
 Clear\ connection\ settings=Удалить настройки подключения
 Check\ Proxy\ Setting=Проверить настройки прокси
 Check\ connection=Проверить подключение
@@ -1253,7 +1237,6 @@ Open\ folder=Открыть папку
 Export\ sort\ order=Экспорт в порядке сортировки
 Save\ sort\ order=Сохранить порядок сортировки
 
-Keep\ original\ order=Сохранить исходную сортировку
 Use\ current\ table\ sort\ order=Использовать текущую сортировку
 Use\ specified\ order=Использовать выбранную сортировку
 Show\ extra\ columns=Показывать столбцы доп.сведений
@@ -1285,7 +1268,6 @@ 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=Ошибка прав доступа для файла
@@ -1310,6 +1292,7 @@ Deleted\ entry=Удаленная запись
 Modified\ groups\ tree=Модифицированное дерево групп
 Removed\ all\ groups=Удаление всех групп
 Select\ export\ format=Выбрать формат экспорта
+
 Could\ not\ connect\ to\ %0=Не удалось подключиться к серверу %0
 Warning\:\ %0\ out\ of\ %1\ entries\ have\ undefined\ title.=Предупреждение\: в %0 из %1 записей нет заглавия.
 Warning\:\ %0\ out\ of\ %1\ entries\ have\ undefined\ citation\ key.=Предупреждение\: %0 из %1 записей не имеют определенного ключа цитирования.
@@ -1317,6 +1300,8 @@ Warning\:\ %0\ out\ of\ %1\ entries\ have\ undefined\ DOIs.=Предупрежд
 Really\ delete\ the\ selected\ entry?=Подтвердите удаление выбранной записи.
 Really\ delete\ the\ %0\ selected\ entries?=Подтвердите удаление выбранных %0 записей.
 
+On\ disk=На диске
+
 Keep\ left=Сохранить слева
 Keep\ right=Сохранить справа
 Old\ entry=Старая запись
@@ -1360,7 +1345,6 @@ New\ mastersthesis=Новая магистерская дисс.
 New\ phdthesis=Новая докторская дисс.
 New\ proceedings=Новые протоколы
 New\ unpublished=Новое неопубликованное
-Preamble\ editor,\ store\ changes=Редактор преамбул, сохранить изменения
 Push\ to\ application=Передать в приложение
 Refresh\ OpenOffice/LibreOffice=Обновить OpenOffice/LibreOffice
 Resolve\ duplicate\ citation\ keys=Разрешить дубликаты ключей цитат
@@ -1468,7 +1452,9 @@ Does\ nothing.=Не выполнять действий.
 Identity=Идентичность
 Clears\ the\ field\ completely.=Полная очистка поля.
 Directory\ not\ found=Каталог не найден
-Main\ file\ directory\ not\ set.\ Check\ the\ preferences\ (linked\ files)\ or\ the\ library\ properties.=Основной каталог файлов не установлен. Проверьте настройки (связанные файлы) или свойства библиотеки.
+
+Main\ file\ directory=Основной каталог файлов
+
 This\ operation\ requires\ exactly\ one\ item\ to\ be\ selected.=Для этой операции необходимо выбрать только одну запись.
 Opening\ large\ number\ of\ files=Открытие большого количества файлов
 You\ are\ about\ to\ open\ %0\ files.\ Continue?=Вы собираетесь открыть %0 файлов. Продолжить?
@@ -1523,6 +1509,7 @@ Verse=Стихотворение
 change\ entries\ of\ group=изменить записи в группе
 odd\ number\ of\ unescaped\ '\#'=нечетное число несброшенных '\#'
 
+
 Show\ diff=Показать разницу
 Copy\ Version=Копировать версию
 Maintainers=Мейнтейнеры
@@ -1542,7 +1529,6 @@ Message=Сообщение
 
 
 MathSciNet\ Review=Обзор MathSciNet
-Reset\ Bindings=Сбросить привязки
 
 Decryption\ not\ supported.=Дешифрование не поддерживается
 
@@ -1589,7 +1575,6 @@ Found\ overlapping\ ranges=Найдены пересекающиеся диап
 Found\ touching\ ranges=Найдены соприкасающиеся диапазоны
 
 Note\:\ Use\ the\ placeholder\ %DIR%\ for\ the\ location\ of\ the\ opened\ library\ file.=Примечание. Используйте подстановочный знак %DIR% для указания файла библиотеки.
-Error\ occured\ while\ executing\ the\ command\ "%0".=Ошибка при выполнении команды "%0".
 Reformat\ ISSN=Переформатировать ISSN
 
 Countries\ and\ territories\ in\ English=Страны и территории на английском
@@ -1919,12 +1904,6 @@ Select\ the\ entries\ to\ be\ imported\:=Выберите записи для и
 Add\ new\ String=Добавить новую строку
 Must\ not\ be\ empty\!=Не может быть пустым\!
 Open\ Help\ page=Открыть страницу справки
-Add\ new\ field\ name=Добавить новое название поля
-Field\ name\:=Имя поля\:
-Field\ name\ "%0"\ already\ exists=Название "%0" уже существует
-No\ field\ name\ selected\!=Ни одно поле не выбрано\!
-Remove\ field\ name=Убрать имя файла
-Are\ you\ sure\ you\ want\ to\ remove\ field\ name\:\ "%0"?=Вы уверены, что вы хотите удалить название\: "%0"?
 Add\ new\ keyword=Добавить новое слово
 Keyword\:=Слово\:
 Keyword\ "%0"\ already\ exists=Слово "%0" уже существует
@@ -1935,7 +1914,6 @@ Reset\ to\ default=Сбросить настройки
 String\ constants=Строковые постоянные
 Export\ all\ entries=Экспорт всех записей
 Generate\ citation\ keys=Генерировать ключи цитирования
-Manage\ field\ names\ &\ content=Управлять названиями полей и контентом
 New\ library=Новая БД
 OpenOffice/LibreOffice=OpenOffice/LibreOffice
 Open\ document\ viewer=Просмотреть документ
@@ -2007,13 +1985,8 @@ Add\ formatter\ to\ list=Добавить форматор в список
 Filter\ List=Фильтровать список
 Open\ files...=Открыть файлы...
 
-Affected\ fields\:=Затрагиваемые поля\:
 Show\ preview\ as\ a\ tab\ in\ entry\ editor=Показывать предварительный просмотр как вкладку в редакторе записей
-Font=Шрифт
 Visual\ theme=Визуальная тема
-Light\ theme=Светлая тема
-Dark\ theme=Тёмная тема
-Custom\ theme=Пользовательская тема
 Overwrite\ existing\ keys=Перезаписать существующие ключи
 Key\ patterns=Шаблоны ключей
 Font\ settings=Настройки шрифта
@@ -2032,7 +2005,6 @@ Reset\ All=Сбросить все
 Linked\ identifiers=Связанные идентификаторы
 
 insert\ entries=вставить записи
-On\ disk=На диске
 
 Independent=Независимый
 Intersection=Пересечение
@@ -2242,7 +2214,6 @@ Display\ count\ of\ items\ in\ group=Показывать количество 
 Remove\ the\ following\ characters\:=Удалить следующие символы\:
 Truncate=Усечение
 Truncates\ a\ string\ after\ a\ given\ index.=Усекать строку после указанного номера.
-Close=Закрыть
 Close\ all=Закрыть всё
 Close\ all\ libraries=Закрыть все библиотеки
 Close\ other\ libraries=Закрыть другие библиотеки
@@ -2263,7 +2234,6 @@ Next\ preview\ style=Следующий стиль предварительно
 Previous\ preview\ style=Предыдущий стиль предварительного просмотра
 
 (\ Note\:\ Press\ return\ to\ commit\ changes\ in\ the\ table\!\ )=( Примечание\: Нажмите "возврат", чтобы сохранить изменения в таблице\! )
-Reset=Сбросить
 New\ inproceedings=Новая запись типа inproceedings
 Reset\ entry\ types\ and\ fields\ to\ defaults=Сбросить типы записей и поля по умолчанию
 This\ will\ reset\ all\ entry\ types\ to\ their\ default\ values\ and\ remove\ all\ custom\ entry\ types=Это сбросит все типы записей к их значениям по умолчанию и удалит все пользовательские типы записей
@@ -2294,7 +2264,7 @@ Unprotect\ terms=Незащищенные термины
 
 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 для доступа к материалам
 
@@ -2302,7 +2272,6 @@ 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.=Пожалуйста, переместите курсор в положение нового цитирования.
 
@@ -2342,13 +2311,10 @@ File\ '%1'\ is\ a\ duplicate\ of\ '%0'.\ Keeping\ both\ due\ to\ deletion\ error
 Enable\ field\ formatters=Включить форматирование полей
 Entry\ Type=Тип записи
 Entry\ types=Типы записей
-Field\ names=Названия полей
 Others=Другие
 Recommended=Рекомендованный
 
 Authors\ and\ Title=Авторы и Заголовок
-Database=База данных
-Databases=Базы данных
 Add\ Author\:=Добавить автора\:
 Add\ Query\:=Добавить запрос\:
 Add\ Research\ Question\:=Добавить вопрос исследования\:
@@ -2414,7 +2380,6 @@ Check\ %0\ API\ Key\ Setting=Проверьте настройку ключа AP
 Set=Задать
 Append=Присоединить
 Rename=Переименовать
-New\ field\ name=Новое имя поля
 Automatic\ field\ editor=Автоматический редактор поля
 
 
@@ -2432,3 +2397,9 @@ This\ could\ indicate\ that\ JabRef\ did\ not\ shut\ down\ cleanly\ last\ time\
 
 
 
+
+
+
+
+
+
diff --git a/src/main/resources/l10n/JabRef_sv.properties b/src/main/resources/l10n/JabRef_sv.properties
index 2a4ca83af73..677fcc24ba2 100644
--- a/src/main/resources/l10n/JabRef_sv.properties
+++ b/src/main/resources/l10n/JabRef_sv.properties
@@ -1,12 +1,4 @@
-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?
+Proxy\ requires\ password=Proxyserver kräver lösenord
 
 %0\ contains\ the\ regular\ expression\ <b>%1</b>=%0 innehåller det reguljära uttrycket <b>%1</b>
 
@@ -131,6 +123,7 @@ Change\ entry\ type=Ändra posttyp
 
 change\ preamble=ändra preamble
 
+Changed\ language=Ändrat språk
 
 Changed\ preamble=Ändrad ingress
 
@@ -184,7 +177,9 @@ Create\ custom\ fields\ for\ each\ BibTeX\ entry=Skapa anpassade fält för varj
 
 crossreferenced\ entries\ included=korsrefererade poster inkluderade
 
+Current\ content\:\ %0=Nuvarande innehåll\: %0
 
+Current\ value\:\ %0=Nuvarande värde\: %0
 
 Custom\ entry\ types=Anpassade posttyper
 
@@ -198,13 +193,17 @@ Cut=Klipp
 
 cut\ entries=klipp ut poster
 
+cut\ entry\ %0=klipp ut post %0
 
 Library\ encoding=Teckenkodning för bibliotek
 
 Library\ properties=Bibliotekets egenskaper
+%0\ -\ Library\ properties=%0 - Bibliotekets egenskaper
 
 Default=Standard
 
+Character\ encoding\ UTF-8\ is\ not\ supported.=Teckenkodningen UTF-8 stöds inte.
+UTF-8\ could\ not\ be\ used\ to\ encode\ the\ following\ characters\:\ %0=UTF-8 kunde inte användas för att koda följande tecken\: %0
 The\ chosen\ encoding\ '%0'\ could\ not\ encode\ the\ following\ characters\:=Den valde teckenkodningen '%0' kan inte representera följande tecken
 
 Downloading=Laddar ner
@@ -224,6 +223,7 @@ Descending=Fallande
 
 Description=Beskrivning
 
+Do\ not\ ask\ again=Fråga inte igen
 
 Display\ all\ entries\ belonging\ to\ one\ or\ more\ of\ the\ selected\ groups=Visa alla poster som tillhör minst en av de markerade grupperna
 
@@ -239,15 +239,19 @@ Do\ not\ abbreviate\ names=Förkorta ej namn
 
 Do\ not\ open\ any\ files\ at\ startup=Öppna inga filer vid uppstart
 
-Do\ not\ wrap\ the\ following\ fields\ when\ saving=Radbryt inte följande fält vid sparning
+
 
 Donate\ to\ JabRef=Donera till JabRef
 
 Download\ file=Ladda ned fil
 
+Downloaded\ website\ as\ an\ HTML\ file.=Webbsida nedladdad som html-fil.
 
 duplicate\ removal=ta bort dubbletter
 
+Duplicate\ fields=Dubbletter av fält
+
+Unable\ to\ change\ field\ name.\ "%0"\ already\ in\ use.=Kunde inte ändra fältnamn. "%0" används redan.
 
 Duplicate\ string\ name=Dubblerat strängnamn
 
@@ -290,21 +294,28 @@ Export=Exportera
 Export\ preferences=Exportera inställningar
 Export\ preferences\ to\ file=Exportera inställningar till fil
 Export\ to\ clipboard=Exportera till utklipp
+Export\ to\ text\ file.=Exportera till textfil.
 Exporting=Exporterar
 Extension=Filändelse
 
 
-External\ file\ links=Externa fillänkar
-
 External\ programs=Externa program
 
+Failed\ to\ import\ by\ ID=Misslyckades att importera via ID
 
 Field=Fält
-
 field=fält
 
 Field\ name=Fältnamn
-
+Field\ names=Fältnamn
+Field\ names\ are\ not\ allowed\ to\ contain\ white\ spaces\ or\ certain\ characters\ (%0).=Fältnamn får inte innehålla mellanslag eller vissa tecken (%0).
+New\ field\ name=Nytt fältnamn
+Add\ new\ field\ name=Lägg till nytt fältnamn
+Field\ name\ "%0"\ already\ exists=Fältnamnet "%0" finns redan
+No\ field\ name\ selected\!=Inget fältnamn valt\!
+Remove\ field\ name=Ta bort fältnamn
+Are\ you\ sure\ you\ want\ to\ remove\ field\ name\:\ "%0"?=Är du säker på att du vill ta bort fältnamnet\: "%0"?
+Manage\ field\ names\ &\ content=Hantera fältnamn & innehåll
 
 Field\ to\ group\ by=Fält att använda för gruppering
 
@@ -408,6 +419,8 @@ JabRef\ preferences=Inställningar för JabRef
 
 Journal\ abbreviations=Tidskriftsförkortningar
 
+
+
 Keep\ both=Behåll bägge
 
 
@@ -429,20 +442,15 @@ LaTeX\ AUX\ file\:=LaTeX AUX-fil\:
 
 Link=Länk
 Listen\ for\ remote\ operation\ on\ port=Lyssna efter fjärrstyrning på port
-Load\ and\ Save\ preferences\ from/to\ jabref.xml\ on\ start-up\ (memory\ stick\ mode)=Ladda och spara inställningar från/till jabref.xml vid uppstart (minnessticksläge)
 
 Show\ advanced\ hints\ (i.e.\ helpful\ tooltips,\ suggestions\ and\ explanation)=Visa avancerade tips (dvs. hjälpsamma verktygstips, förslag och förklaringar)
 
-Main\ file\ directory=Huvudmapp för filer
-
 Manage\ custom\ exports=Hantera egna exporterare
 
 Manage\ custom\ imports=Hantera egna importerare
 
 Mark\ new\ entries\ with\ owner\ name=Märk nya poster med ägarnamn
 
-Memory\ stick\ mode=Minnessticksläge
-
 Merged\ external\ changes=Sammanfogade externa ändringar
 
 Modified\ group\ "%0".=Modifierade grupp "%0".
@@ -508,7 +516,6 @@ Open\ editor\ when\ a\ new\ entry\ is\ created=Öppna posteditorn när en ny pos
 
 Open\ file=Öppna fil
 
-Open\ last\ edited\ libraries\ at\ startup=Öppna senast använda libraryr vid uppstart
 
 Connect\ to\ shared\ database=Öppna delad databas
 
@@ -522,8 +529,6 @@ Operation\ canceled.=Operationen avbruten.
 
 Optional\ fields=Valfria fält
 
-Options=Alternativ
-
 or=eller
 
 Override\ default\ file\ directories=Ignorerar normala filmappar
@@ -565,6 +570,8 @@ Error\ while\ generating\ citation\ style=Fel vid generering av referensstil
 Preview\ style\ changed\ to\:\ %0=Förhandsgranskningsstil ändrad till\: %0
 Next\ preview\ layout=Nästa förhandsgranskningslayout
 Previous\ preview\ layout=Föregående förhandsgranskningslayout
+Available=Tillgänglig
+Selected=Vald
 Reset\ default\ preview\ style=Återställ standard förhandsgranskningsstil
 Previous\ entry=Föregående post
 Problem\ with\ parsing\ entry=Problem att tolka post
@@ -577,6 +584,7 @@ Push\ applications=Push-program
 
 Quit\ JabRef=Avsluta JabRef
 
+Read\ only=Skrivskyddad
 
 Redo=Gör igen
 
@@ -636,7 +644,6 @@ Restart\ required=Omstart krävs
 
 Review\ changes=Kontrollera ändringar
 
-
 Save=Spara
 Save\ all\ finished.=Alla har sparats.
 Save\ all\ open\ libraries=Spara alla öppna libraryr
@@ -655,7 +662,6 @@ Refuse\ to\ save\ the\ library\ before\ external\ changes\ have\ been\ reviewed.
 Library\ protection=Biblioteksskydd
 Unable\ to\ save\ library=Kunde inte spara bibliotek
 
-Always\ reformat\ BIB\ file\ on\ save\ and\ export=Formattera alltid om BIB-filen vid när den sparas eller exporteras
 Character\ encoding\ '%0'\ is\ not\ supported.=Teckenkodningen '%0' stöds inte.
 
 Search=Sök
@@ -698,6 +704,9 @@ Show\ BibTeX\ source\ by\ default=Visa BibTeX-källkod som standard
 
 Show\ confirmation\ dialog\ when\ deleting\ entries=Visa bekräftelseruta när poster raderas
 
+
+
+
 Show\ last\ names\ only=Visa bara efternamn
 
 Show\ names\ unchanged=Visa namnen som de är
@@ -769,6 +778,7 @@ View=Visa
 Vim\ server\ name=Vim-servernamn
 
 
+
 Warn\ before\ overwriting\ existing\ keys=Varna innan befintliga nycklar skrivs över
 
 Warning=Varning
@@ -838,7 +848,6 @@ User-specific\ file\ directory=Användarspecifik filmapp
 Autocomplete\ names\ in\ 'Firstname\ Lastname'\ format\ only=Komplettera enbart namn i 'Förnamn Efternamn'-format
 Autocomplete\ names\ in\ 'Lastname,\ Firstname'\ format\ only=Komplettera enbart namn i 'Efternamn, Förnamn'-format
 Autocomplete\ names\ in\ both\ formats=Komplettera namn automatiskt i bägge formaten
-Send\ as\ email=Skicka som epost
 References=Referenser
 Sending\ of\ emails=Skicka epost
 Subject\ for\ sending\ an\ email\ with\ references=Ämne för epost med referenser
@@ -945,7 +954,6 @@ Four\ stars=Fyra stjärnor
 Five\ stars=Fem stjärnor
 Help\ on\ special\ fields=Hjälp för specialfält
 Keywords\ of\ selected\ entries=Nyckelord för valda poster
-Manage\ content\ selectors=Hantera innehållsväljare
 Manage\ keywords=Hantera nyckelord
 No\ priority\ information=Ingen prioritetsinformation
 No\ rank\ information=Ingen rankinginformation
@@ -971,7 +979,6 @@ Make\ sure\ you\ have\ installed\ OpenOffice/LibreOffice\ with\ Java\ support.=K
 If\ connecting\ manually,\ please\ verify\ program\ and\ library\ paths.=Om du ansluter manuellt, kontrollera sökvägar till program och bibliotek.
 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.
 
 Canceled\ merging\ entries=Avbröt sammanslagning av poster
 
@@ -992,7 +999,6 @@ Hostname=Värd
 Proxy\ configuration=Proxyinställning
 Use\ custom\ proxy\ configuration=Använd egen proxykonfiguration
 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
 
 
@@ -1046,11 +1052,13 @@ Modified\ entry=Ändrad post
 Deleted\ entry=Raderade post
 Modified\ groups\ tree=Modifierade gruppträd
 Removed\ all\ groups=Tog bort alla grupper
+
 Could\ not\ connect\ to\ %0=Kunde inte ansluta till %0
 Warning\:\ %0\ out\ of\ %1\ entries\ have\ undefined\ citation\ key.=Varning\: %0 av %1 poster saknar referensnyckel.
 Really\ delete\ the\ selected\ entry?=Verkligen ta bort den valda posten?
 Really\ delete\ the\ %0\ selected\ entries?=Verkligen ta bort de %0 valda posterna?
 
+
 Keep\ left=Behåll vänstra
 Keep\ right=Behåll högra
 Old\ entry=Gammal post
@@ -1091,7 +1099,6 @@ New\ mastersthesis=Ny mastersthesis-post
 New\ phdthesis=Ny phdthesis-post
 New\ proceedings=Ny proceedings-post
 New\ unpublished=Ny unpublished-post
-Preamble\ editor,\ store\ changes=Preamble-editorn, spara ändringar
 Push\ to\ application=Infoga i program
 Refresh\ OpenOffice/LibreOffice=Uppdatera OpenOffice/LibreOffice
 Save\ all=Spara alla
@@ -1170,6 +1177,9 @@ Does\ nothing.=Gör ingenting.
 Identity=Identitet
 Clears\ the\ field\ completely.=Tömmer fältet helt.
 Directory\ not\ found=Kan ej hitta mapp
+
+Main\ file\ directory=Huvudmapp för filer
+
 This\ operation\ requires\ exactly\ one\ item\ to\ be\ selected.=Denna operationen kräver att exakt en post är vald.
 Importing\ in\ %0\ format=Importerar i %0-format
 Female\ name=Ett kvinnonamn
@@ -1213,6 +1223,7 @@ Verse=Vers
 change\ entries\ of\ group=ändra grupps poster
 odd\ number\ of\ unescaped\ '\#'=udda antal '\#'-tecken
 
+
 Show\ diff=Visa skillnad
 
 HTML\ encoded\ character\ found=HTML-kodade tecken hittades
@@ -1257,7 +1268,6 @@ 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
 
 Countries\ and\ territories\ in\ English=Länder och territorier på engelska
@@ -1409,7 +1419,6 @@ Main\ layout\ file=Huvudfil för layout
 Download\ linked\ online\ files=Ladda ner länkade online-filer
 Export\ all\ entries=Exportera alla poster
 Generate\ citation\ keys=Generera referensnycklar
-Manage\ field\ names\ &\ content=Hantera fältnamn & innehåll
 New\ library=Nytt bibliotek
 Find\ and\ replace=Sök och ersätt
 
@@ -1435,8 +1444,6 @@ Group\ color=Gruppfärg
 
 Show\ preview\ as\ a\ tab\ in\ entry\ editor=Visa förhandsgranskningen som en flik i postredigeraren
 Visual\ theme=Visuellt tema
-Light\ theme=Ljust tema
-Dark\ theme=Mörkt tema
 Overwrite\ existing\ keys=Skriv över befintliga nycklar
 Key\ patterns=Nyckelmönster
 Letters\ after\ duplicate\ generated\ keys=Bokstäver efter duplicerade genererade nycklar
@@ -1522,6 +1529,7 @@ Previous\ preview\ style=Föregående förhandsgranskningsstil
 
 
 
+
 
 
 plain\ text=klartext
@@ -1532,3 +1540,9 @@ plain\ text=klartext
 
 
 
+
+
+
+
+
+
diff --git a/src/main/resources/l10n/JabRef_tl.properties b/src/main/resources/l10n/JabRef_tl.properties
index ffcfc340c65..baac3468816 100644
--- a/src/main/resources/l10n/JabRef_tl.properties
+++ b/src/main/resources/l10n/JabRef_tl.properties
@@ -1,8 +1,4 @@
 
-
-
-
-
 %0\ contains\ the\ regular\ expression\ <b>%1</b>=%0 ay naglalaman ng regular na ekspresyon<b>%1</b>
 
 %0\ contains\ the\ term\ <b>%1</b>=%ay naglalaman ng mga term<b>%1</b>
@@ -219,7 +215,7 @@ Do\ not\ abbreviate\ names=Huwag paiiklin ang pangalan
 
 Do\ not\ open\ any\ files\ at\ startup=Huwag buksan ang anumang file sa startup
 
-Do\ not\ wrap\ the\ following\ fields\ when\ saving=Huwat balutin ang mga sumusunod na patlang habang nagse-save
+
 
 
 Download\ file=I-download ang file
@@ -228,6 +224,7 @@ Download\ file=I-download ang file
 duplicate\ removal=i-duplicate ang removal
 
 
+
 Duplicate\ string\ name=I-duplicate ang string na pangalan
 
 Duplicates\ found=Nakita ang duplicates
@@ -275,18 +272,14 @@ Exporting=Ang pagpapalabas
 Extension=Ekstenyon
 
 
-External\ file\ links=Mga labas na file links
-
 External\ programs=Panlabas na mga programa
 
 
 Field=Patlang
-
 field=patlang
 
 Field\ name=Pangalan ng patlang
 
-
 Field\ to\ group\ by=Patlang sa pamamagitan ng pag grupo
 
 File=File
@@ -391,6 +384,8 @@ JabRef\ preferences=Ang preferences ng JabRef
 
 Journal\ abbreviations=Mga journal ng pagpapa-ikli
 
+
+
 Keep\ both=Panatilihing pareho
 
 
@@ -412,19 +407,14 @@ Last\ modified=Ang huling nabago
 
 Link=Ang link
 Listen\ for\ remote\ operation\ on\ port=Makinig para sa remote na operasyon sa port
-Load\ and\ Save\ preferences\ from/to\ jabref.xml\ on\ start-up\ (memory\ stick\ mode)=Mag load at -isave ang preferenes mula/patungo sa jabref.xml sa start-up (memory stick mode)
 
 
-Main\ file\ directory=Pangunahing direktoryo ng file
-
 Manage\ custom\ exports=Pamahalaan ang kustom na pagpapalabas
 
 Manage\ custom\ imports=Pamahalaan ang kustom na pagpapasok
 
 Mark\ new\ entries\ with\ owner\ name=Markahan ang bagong entries na may pangalan ng may-ari
 
-Memory\ stick\ mode=Memory stick mode
-
 Merged\ external\ changes=Pagsamahin ang eksternal na pagbabago
 Merge\ fields=Pagsamahin ang patlang
 
@@ -492,7 +482,6 @@ Open\ library=Buksan ang library
 Open\ editor\ when\ a\ new\ entry\ is\ created=Buksan ang taga bago kung kailan may entry na nagawa
 
 
-Open\ last\ edited\ libraries\ at\ startup=Buksan ang huling na-edit na mga libraries sa startup
 
 
 
@@ -504,8 +493,6 @@ Operation\ canceled.=Nakansela ang operasyon.
 
 Optional\ fields=Opsyonal na mga patlang
 
-Options=Mga opsyon
-
 or=o
 
 Override\ default\ file\ directories=I-override ang mga file na naka-default sa direktoryo
@@ -621,7 +608,6 @@ Review=Mag balig-aral
 Review\ changes=Suriin ang mga pagbabago
 Review\ Field\ Migration=Suriin ang patlang ng paglipat
 
-
 Save=I-save
 Save\ all\ finished.=I-save lahat ng natapos.
 Save\ all\ open\ libraries=I-save lahat ang bukas na mga libraries
@@ -642,7 +628,6 @@ Refuse\ to\ save\ the\ library\ before\ external\ changes\ have\ been\ reviewed.
 Library\ protection=Proteksyon sa library
 Unable\ to\ save\ library=Hindi mai-save ang library
 
-Always\ reformat\ BIB\ file\ on\ save\ and\ export=Palaging mag reformat sa BIB file sa pag-save at sa pag-export
 Character\ encoding\ '%0'\ is\ not\ supported.=Pagkod ng mga Karakter '%0' ay hindi suportado.
 
 Search=Ang paghahanap
@@ -685,6 +670,9 @@ Show\ BibTeX\ source\ by\ default=Ipakita ang BibTeX na pinagmulan sa pamamagita
 
 Show\ confirmation\ dialog\ when\ deleting\ entries=Ipakita ang kumpirmasyon na dialog tuwing magtanggal ng entries
 
+
+
+
 Show\ last\ names\ only=Ipakita ang apelyedo lamang
 
 Show\ names\ unchanged=Ipakita ang pangalan na hindi nabago
@@ -759,6 +747,7 @@ Value\ cleared\ externally=Ang halaga ay malinaw sa panlabas
 View=Tanawin
 Vim\ server\ name=Pangalan ng serber sa Vim
 
+
 Warn\ about\ unresolved\ duplicates\ when\ closing\ inspection\ window=Balaan ang tungkol sa hindi pagkalutas ng kakopya kapag naisara ang inspeksyon na window
 
 Warn\ before\ overwriting\ existing\ keys=Balaan bago i-overwrite ang umiiral na mga susi
@@ -831,7 +820,6 @@ User-specific\ file\ directory=Direktoryo ng file tukoy sa gumagamit
 Autocomplete\ names\ in\ 'Firstname\ Lastname'\ format\ only=Awtomatikong isali ang mga pangalan sa format ng 'Firstname Lastname'
 Autocomplete\ names\ in\ 'Lastname,\ Firstname'\ format\ only=Awtomatikong isali ang mga pangalan sa format ng 'Firstname Lastname' lamang
 Autocomplete\ names\ in\ both\ formats=Mga pangalan ng autocomplete sa parehong mga format
-Send\ as\ email=Ipadala bilang email
 References=Mga reperensya
 Sending\ of\ emails=Pagpapadala ng mga email
 Subject\ for\ sending\ an\ email\ with\ references=Paksa para sa pagpapadala ng email na may mga sanggunian
@@ -890,7 +878,6 @@ Please\ choose\ which\ one\ to\ connect\ to\:=Mangyaring pumili kung alin ang ma
 Choose\ OpenOffice/LibreOffice\ executable=Piliin ang OpenOffice/LibreOffice na maipapatupad
 Select\ document=Pumili ng dokumento
 HTML\ list=Listahan ng HTML
-If\ possible,\ normalize\ this\ list\ of\ names\ to\ conform\ to\ standard\ BibTeX\ name\ formatting=Kung maari, i-normalize ang listahan ng apelyedo upang sumunod sa standard na formatting ng pangalan sa BibTeX
 Could\ not\ open\ %0=Hindi mabuksan %0
 Unknown\ import\ format=Hindi kilalang format ng pagpapasok
 Style\ selection=Estilo ng pagpipili
@@ -942,7 +929,6 @@ Four\ stars=Apat ng bituin
 Five\ stars=Limang bituin
 Help\ on\ special\ fields=Tulong sa mga espesyal na larangan
 Keywords\ of\ selected\ entries=Mga keyword ng napiling mga entry
-Manage\ content\ selectors=Pamahalaan ang mga tagapili ng nilalaman
 No\ priority\ information=Walang impormasyon sa priyoridad
 No\ rank\ information=Walang ranggo na impormasyon
 Priority=Prayoridad
@@ -970,7 +956,6 @@ Error\ message\:=Maling mensahe\:
 If\ a\ pasted\ or\ imported\ entry\ already\ has\ the\ field\ set,\ overwrite.=Kung na i-pasted o na-ipasok ang entry na naka-set sa patlang, i-overwrite.
 Not\ connected\ to\ any\ Writer\ document.\ Please\ make\ sure\ a\ document\ is\ open,\ and\ use\ the\ 'Select\ Writer\ document'\ button\ to\ connect\ to\ it.=Hindi konektado kahit sa anumang dokumento ng Writer. Pakiusap na siguraduhin na ang dokumento ay bukas, at gamitin ang 'Select Writer document' na button para kumonekto nito.
 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.
 
 Canceled\ merging\ entries=Ikansela ang pagsama-sama ng mga entries
@@ -993,7 +978,6 @@ Hostname=Pangalan ng host
 
 Use\ custom\ proxy\ configuration=Gumamit ng custom na proxy configuration
 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
 
 
@@ -1050,11 +1034,13 @@ Deleted\ entry=Ang na tanggal na entry
 Modified\ groups\ tree=Ang binagong grupo ng puno
 Removed\ all\ groups=Tanggalin lahat ng mga grupo
 Select\ export\ format=Pumili ng format na nagpapalabas
+
 Could\ not\ connect\ to\ %0=Hindi maka konekta sa %0
 Warning\:\ %0\ out\ of\ %1\ entries\ have\ undefined\ title.=Babala\: %0 mula sa %1 na entries ay hindi natukoy ang pamagat.
 Really\ delete\ the\ selected\ entry?=Talang tanggalin ang napiling entry?
 Really\ delete\ the\ %0\ selected\ entries?=Talagang tanggaling ang mga %0 napiling entries?
 
+
 Keep\ left=Panatilihing nasa kaliwa
 Keep\ right=Manatili sa kanan
 Old\ entry=Lumang entry
@@ -1093,7 +1079,6 @@ New\ mastersthesis=Bagong mastersthesis
 New\ phdthesis=Bagong phdthesis
 New\ proceedings=Bagong paglilitis
 New\ unpublished=Bagong unpublished
-Preamble\ editor,\ store\ changes=Ang preamble na editor, naimbak ang mga pagbabago
 Push\ to\ application=Ang tulak sa aplikasyon
 Refresh\ OpenOffice/LibreOffice=I-refresh ang OpenOffice/LibreOffice
 String\ dialog,\ add\ string=String dialog, idagdag ang string
@@ -1114,6 +1099,10 @@ Show\ debug\ level\ messages=Ipakita ang debug na antas ng mensahe
 
 
 
+Main\ file\ directory=Pangunahing direktoryo ng file
+
+
+
 
 
 
@@ -1316,6 +1305,7 @@ Default\ pattern=Default na pattern
 
 
 
+
 
 
 plain\ text=plain na teksto
@@ -1326,3 +1316,9 @@ plain\ text=plain na teksto
 
 
 
+
+
+
+
+
+
diff --git a/src/main/resources/l10n/JabRef_tr.properties b/src/main/resources/l10n/JabRef_tr.properties
index 08c5c63e77a..0f1c93943b8 100644
--- a/src/main/resources/l10n/JabRef_tr.properties
+++ b/src/main/resources/l10n/JabRef_tr.properties
@@ -1,12 +1,4 @@
-Could\ not\ delete\ empty\ entries.=Boş girdiler silinemedi.
-
-Delete\ empty\ entries=Boş girdileri sil
-
-Empty\ entries=Boş girdiler
-
-Keep\ empty\ entries=Boş girdileri tut
-
-Library\ '%0'\ has\ empty\ entries.\ Do\ you\ want\ to\ delete\ them?='%0' kütüphanesi boş girdiler içeriyor. Onları silmek ister misiniz?
+Proxy\ requires\ password=Vekil parola gerektirir
 
 Unable\ to\ monitor\ file\ changes.\ Please\ close\ files\ and\ processes\ and\ restart.\ You\ may\ encounter\ errors\ if\ you\ continue\ with\ this\ session.=Dosya değişiklikleri izlenemiyor. Lütfen dosyaları ve süreçleri kapatın ve yeniden başlatın. Bu seansa devam ederseniz hatalarla karşılaşabilirsiniz.
 %0\ contains\ the\ regular\ expression\ <b>%1</b>=%0 şu düzenli ifadeyi içeriyor <b>%1</b>
@@ -28,6 +20,7 @@ Reveal\ in\ File\ Explorer=Dosya Gezgini'nde Göster
 %0\ matches\ the\ term\ <b>%1</b>=%0 şu terimle eşleşiyor <b>%1</b>
 
 Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (DEFAULT\ abbreviation)=Seçili girdilerin dergi isimlerini kısalt (ÖN TANIMLI kısaltma)
+Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (DOTLESS\ abbreviation)=Seçilen girdilerin dergi isimlerini kısalt (NOKTASIZ kısaltması)
 Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (SHORTEST\ UNIQUE\ abbreviation)=Seçili girdilerin dergi isimlerini kısalt (EN KISA ÖZGÜN kısaltma)
 
 Abbreviate\ names=İsimleri kısalt
@@ -39,6 +32,8 @@ Abbreviations=Kısaltmalar
 Unabbreviate\ journal\ names\ of\ the\ selected\ entries=Seçili girdilerin dergi adlarını kısaltma
 Unabbreviated\ %0\ journal\ names.=%0 dergi adı kısaltması kaldırıldı.
 
+dotless=noktasız
+shortest\ unique=en kısa özgün
 
 About\ JabRef=JabRef Hakkında
 
@@ -266,7 +261,8 @@ Do\ not\ abbreviate\ names=İsimleri kısaltma
 
 Do\ not\ open\ any\ files\ at\ startup=Başlangıçta hiçbir dosyayı açma
 
-Do\ not\ wrap\ the\ following\ fields\ when\ saving=Kaydederken aşağıdaki alanları sarmalama
+Do\ not\ wrap\ when\ saving=Kaydederken sarmalama
+
 Do\ not\ write\ the\ following\ fields\ to\ XMP\ Metadata=Aşağıdaki alanları XMP Metadata'ya yazma
 
 Donate\ to\ JabRef=JabRef'e bağış yap
@@ -279,6 +275,8 @@ duplicate\ removal=çift nüsha silme
 
 Duplicate\ fields=Yinelenen Alan
 
+Unable\ to\ change\ field\ name.\ "%0"\ already\ in\ use.=Alan adı değiştirilemedi. "%0" halen kullanımda.
+
 Duplicate\ string\ name=Çift nüsha dizge adı
 
 Duplicates\ found=Çift nüshalar bulundu
@@ -334,19 +332,23 @@ Extension=Uzantı
 
 External\ Changes\ Resolver=Harici Değişiklikler Çözücüsü
 
-External\ file\ links=Harici dosya linkleri
-
 External\ programs=Harici programlar
 
 Failed\ to\ import\ by\ ID=ID ile içe aktarma başarısız
 
 Field=Alan
-
 field=alan
 
 Field\ name=Alan adı
-
+Field\ names=Alan adları
 Field\ names\ are\ not\ allowed\ to\ contain\ white\ spaces\ or\ certain\ characters\ (%0).=Alan adlarının boşluk ya da belli karakterleri içermesine izin verilmez (%0).
+New\ field\ name=Yeni alan adı
+Add\ new\ field\ name=Yeni alan adı ekle
+Field\ name\ "%0"\ already\ exists="%0" alan adı zaten var
+No\ field\ name\ selected\!=Alan adı seçilmedi\!
+Remove\ field\ name=Alan adını sil
+Are\ you\ sure\ you\ want\ to\ remove\ field\ name\:\ "%0"?=Alan adını silmek istediğinizden emin misiniz\: "%0"?
+Manage\ field\ names\ &\ content=Alan ad ve içeriklerini yönet
 
 Field\ to\ group\ by=Gruplanacak alan
 
@@ -474,6 +476,26 @@ Journal\ abbreviations=Dergi kısaltmaları
 Journal\ lists\:=Dergi listeleri\:
 Remove\ journal\ '%0'='%0' dergisini sil
 
+Journal\ Information=Dergi Bilgisi
+Year=Yıl
+ISSN\ or\ journal\ name\ required\ for\ fetching\ journal\ information=Dergi bilgisini getirmek için ISSN ya da dergi adı gerekiyor
+Allow\ sending\ ISSN\ to\ a\ JabRef\ online\ service\ (SCimago)\ for\ fetching\ journal\ information=Dergi bilgisini getirmek için ISSN'i bir JabRef çevrim içi servisine (SCimago) göndermeye izin ver
+Please\ enable\ journal\ information\ fetching\ in\ %0\ >\ %1=Lütfen %0 > %1 'de dergi bilgisini getirmeyi etkinleştirin
+Categories=Kategoriler
+ISSN=ISSN
+Publisher=Yayımcı
+h-index=h-dizini
+Error\ while\ fetching\ journal\ information\:\ %0=Dergi bilgisini getirmede hata\: %0
+ISSN\ and/or\ journal\ name\ not\ found\ in\ catalog=Katalogda ISSN ve/veya dergi adı bulunamadı
+Citable\ Docs\ (Previous\ 3\ Years)=Atfedilebilecek Belgeler (Önceki 3 Yıl)
+Cites\ Incoming\ by\ Recently\ Published=Yakın Zamanda Yayınlanmış Gelen Atıflar
+Cites\ Outgoing=Giden Atıflar
+Cites\ Outgoing\ per\ Document=Her belge için Giden Atıflar
+Docs\ (This\ Year)=Belgeler (Bu Yıl)
+Incorrect\ ISSN\ format=Yanlış ISSN biçemi
+Error\ accessing\ catalog=Kataloğa erişimde hata
+
+
 Keep\ both=İkisini de tut
 
 Keep\ subgroups=Alt grupları tut
@@ -500,12 +522,10 @@ LaTeX\ AUX\ file\:=LaTeX AUX dosyası\:
 
 Link=Bağlantı
 Listen\ for\ remote\ operation\ on\ port=Bağlantı noktasındaki uzak işlemi dinle
-Load\ and\ Save\ preferences\ from/to\ jabref.xml\ on\ start-up\ (memory\ stick\ mode)=Başlangıçta tercihleri jabref.xml'den yükle ya da buraya kaydet (bellek çubuğu kipi)
+Memory\ stick\ mode\ -\ Store\ preferences\ in\ 'jabref.xml'\ in\ the\ app\ folder.=Bellek çubuğu kipi - Tercihleri uygulama klasöründeki ''jabref.xml''''e kaydet.
 
 Show\ advanced\ hints\ (i.e.\ helpful\ tooltips,\ suggestions\ and\ explanation)=İleri düzey ipuçlarını göster (yardımsever araç ipuçları, öneriler ve açıklama)
 
-Main\ file\ directory=Ana dosya dizini
-
 Manage\ custom\ exports=Özel dışa aktarımları yönet
 
 Manage\ custom\ imports=Özel içe aktarımları yönet
@@ -513,8 +533,6 @@ External\ file\ types=Harici dosya türleri
 
 Mark\ new\ entries\ with\ owner\ name=Yeni girdileri sahip adıyla işaretle
 
-Memory\ stick\ mode=Bellek Çubuğu Kipi
-
 Merged\ external\ changes=Harici değişiklikler birleştirildi
 Merge\ fields=Alanları birleştir
 
@@ -590,7 +608,7 @@ Open\ editor\ when\ a\ new\ entry\ is\ created=Yeni bir girdi oluşturulduğunda
 
 Open\ file=Dosya aç
 
-Open\ last\ edited\ libraries\ at\ startup=Açılışta son düzenlenmiş veritabanlarını aç
+Open\ last\ edited\ libraries\ on\ startup=Açılışta son düzenlenmiş kütüphaneleri aç
 
 Connect\ to\ shared\ database=Paylaşılmış veritabanını aç
 
@@ -605,8 +623,6 @@ Operating\ System\ (Provides\ for\ better\ recommendations\ by\ giving\ an\ indi
 
 Optional\ fields=Tercihe bağlı alanlar
 
-Options=Seçenekler
-
 or=ya da
 
 Override\ default\ file\ directories=Öntanımlı dosya dizinlerini geçersiz kıl
@@ -741,8 +757,7 @@ 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
+Resolve\ BibTeX\ strings=BibTeX dizgelerini çözümle
 
 resolved=çözümlendi
 
@@ -756,8 +771,6 @@ 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.
 Save\ all\ open\ libraries=Tüm açık veritabanlarını kaydet
@@ -781,7 +794,7 @@ Refuse\ to\ save\ the\ library\ before\ external\ changes\ have\ been\ reviewed.
 Library\ protection=Veirtabanı koruması
 Unable\ to\ save\ library=Veritabanı kaydedilemedi
 
-Always\ reformat\ BIB\ file\ on\ save\ and\ export=Kaydetme ve dışa aktarmada BIB dosyasını her zaman yeniden biçemle
+Always\ reformat\ library\ on\ save\ and\ export=Kaydetme ve dışa aktarmada kütüphaneyi her zaman yeniden biçemle
 Character\ encoding\ '%0'\ is\ not\ supported.='%0' karakter kodlaması desteklenmiyor.
 
 Search=Ara
@@ -847,6 +860,10 @@ Show\ BibTeX\ source\ by\ default=Öntanımlı olarak BibTeX kaynağını göste
 
 Show\ confirmation\ dialog\ when\ deleting\ entries=Girdileri silerken onaylama iletişim penceresini göster
 
+Persist\ password\ between\ sessions=Oturumlar arasında parolayı sürdür
+
+
+
 Show\ last\ names\ only=Yalnızca soyadları göster
 
 Show\ names\ unchanged=Adları değiştirmeden göster
@@ -928,6 +945,7 @@ Upgrade\ external\ PDF/PS\ links\ to\ use\ the\ '%0'\ field.=Harici PDF/PS linkl
 usage=kullanım
 Use\ autocompletion=Otomatik tamamlama kullan
 
+User\ interface=Kullanıcı arayüzü
 
 Username=Kullanıcı adı
 
@@ -940,6 +958,8 @@ Verify\ that\ LyX\ is\ running\ and\ that\ the\ lyxpipe\ is\ valid.=LyX'in çal
 View=Görüntüle
 Vim\ server\ name=Vim Sunucu Adı
 
+View\ journal\ info=Dergi bilgisini göster
+
 Warn\ about\ unresolved\ duplicates\ when\ closing\ inspection\ window=İnceleme penceresi kapanırken çözülmemiş çift nüshalar hakkında uyar
 
 Warn\ before\ overwriting\ existing\ keys=Mevcut anahtarların üzerine yazmadan önce uyar
@@ -1040,7 +1060,11 @@ You\ must\ enter\ an\ integer\ value\ in\ the\ interval\ 1025-65535=1025-65535 a
 Autocomplete\ names\ in\ 'Firstname\ Lastname'\ format\ only=İsimleri yalnızca 'Ad Soyad' biçiminde otomatik tamamla
 Autocomplete\ names\ in\ 'Lastname,\ Firstname'\ format\ only=İsimleri yalnızca 'Soyad, Ad' biçiminde otomatik tamamla
 Autocomplete\ names\ in\ both\ formats=İsimleri her iki biçimde otomatik tamamla
-Send\ as\ email=Eposta olarak gönder
+Send=Gönder
+As\ Email=E-posta şeklinde
+To\ Kindle=Kindle'a
+Send\ to\ Kindle=Kindle'a gönder
+Email\ address\ for\ sending\ to\ Kindle=Kindle'a göndermek için e-posta adresi
 References=Kaynaklar
 Sending\ of\ emails=Epostalar gönderiliyor
 Subject\ for\ sending\ an\ email\ with\ references=Kaynaklarla gönderilecek bir eposta konusu
@@ -1118,7 +1142,6 @@ Please\ choose\ which\ one\ to\ connect\ to\:=Lütfen hangisine bağlanılacağ
 Choose\ OpenOffice/LibreOffice\ executable=OpenOffice/LibreOffice çalıştırma dosyasını seçin
 Select\ document=Belge seçin
 HTML\ list=HTML listesi
-If\ possible,\ normalize\ this\ list\ of\ names\ to\ conform\ to\ standard\ BibTeX\ name\ formatting=eğer mümkünse, bu isim listesini standart BibTeX isim biçimiyle uyumlu olacak şekilde normalleştir
 Could\ not\ open\ %0=%0 açılamıyor
 Unknown\ import\ format=Bilinmeyen içe aktarım biçimi
 Style\ selection=Stil seçimi
@@ -1145,6 +1168,7 @@ Cleanup\ entries=Girdileri temizle
 Automatically\ assign\ new\ entry\ to\ selected\ groups=Seçili gruplara otomatikman yeni girdi ata
 %0\ mode=%0 kipi
 Move\ DOIs\ from\ note\ and\ URL\ field\ to\ DOI\ field\ and\ remove\ http\ prefix=DOI'leri not ve URL alanlarından DOI alanına taşı ve http ön ekini kaldır
+Move\ URL\ in\ note\ field\ to\ url\ field=Not alanındaki URL'yi url alanına taşı
 Make\ paths\ of\ linked\ files\ relative\ (if\ possible)=(Mümkünse) bağlantılı dosya yollarını göreceli yapın
 Rename\ PDFs\ to\ given\ filename\ format\ pattern=PDF'leri belirlenmiş dosya ismi biçemi desenine göre yeniden adlandır
 Rename\ only\ PDFs\ having\ a\ relative\ path=Yalnızca göreceli yolu olan PDF'leri yeniden adlandır
@@ -1155,6 +1179,7 @@ One\ entry\ needed\ a\ clean\ up=Bir girdi temizlik gerektirdi
 
 Group\ tree\ could\ not\ be\ parsed.\ If\ you\ save\ the\ BibTeX\ library,\ all\ groups\ will\ be\ lost.=Grup ağacı çözümlenemedi. Eğer BibTeX veri tabanını kaydederseniz tüm gruplar yitecek.
 Attach\ file=Dosya ekle
+Attach\ file\ from\ URL=URL'den dosya ekle
 Setting\ all\ preferences\ to\ default\ values.=Tüm tercihler öntanımlı değerlere ayarlanıyor.
 Resetting\ preference\ key\ '%0'=Tercih anahtarı '%0' yeniden atanıyor
 Unable\ to\ clear\ preferences.=Tercihler silinemedi.
@@ -1188,7 +1213,6 @@ Four\ stars=Dört yıldız
 Five\ stars=Beş yıldız
 Help\ on\ special\ fields=Özle alanlar konusunda yardım
 Keywords\ of\ selected\ entries=Seçili girdilerin anahtar sözcükleri
-Manage\ content\ selectors=İçerik seçicileri yönet
 Content\ selectors=İçerik seçiciler
 Manage\ keywords=Anahtar sözcükleri yönet
 No\ priority\ information=Öncelik bilgisi yok
@@ -1219,7 +1243,6 @@ Error\ message\:=Hata mesajı\:
 If\ a\ pasted\ or\ imported\ entry\ already\ has\ the\ field\ set,\ overwrite.=Eğer yapıştırılmış ya da içe aktarılmış bir girdi alanı atadıysa üzerine yaz.
 Not\ connected\ to\ any\ Writer\ document.\ Please\ make\ sure\ a\ document\ is\ open,\ and\ use\ the\ 'Select\ Writer\ document'\ button\ to\ connect\ to\ it.=Herhangi bir Writer belgesine bağlanılmadı. Lütfen bir belgenin açık olduğuna emin olun ve ona bağlanmak için "Write belgesini seç" düğmesini kullanın.
 Removed\ all\ subgroups\ of\ group\ "%0".=Grup "%0"'ın bütün alt grupları silindi.
-To\ disable\ the\ memory\ stick\ mode\ rename\ or\ remove\ the\ jabref.xml\ file\ in\ the\ same\ folder\ as\ JabRef.=Taşınabilir hafıza kartı kipini etkisizleştirmek için JabRef'le aynı klasördeki jabref.xml dosyasını silin ya da adını değiştirin.
 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.
@@ -1254,7 +1277,6 @@ Please\ specify\ a\ password=Lütfen bir parola belirtin
 Proxy\ configuration=Vekil sunucu yapılandırması
 Use\ custom\ proxy\ configuration=Özelleştirilmiş vekil konfigürasyonu kullan
 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
@@ -1271,7 +1293,7 @@ Open\ folder=Klasörü aç
 Export\ sort\ order=Sıralama kriterlerini dışa aktar
 Save\ sort\ order=Sıralama kriterlerini kaydet
 
-Keep\ original\ order=Orjinal sırayı koru
+Keep\ original\ order\ and\ add\ new\ entries\ at\ the\ end=Orijinal sıralamayı koru ve yeni girdileri sona ekle
 Use\ current\ table\ sort\ order=Mevcut tablo sıralama kuralını kullan
 Use\ specified\ order=Belirtilmiş sırayı kullan
 Show\ extra\ columns=Ekstra sütunları göster
@@ -1307,7 +1329,7 @@ Please\ open\ %0\ manually.=Lütfen %0'i kendiniz açın.
 The\ link\ has\ been\ copied\ to\ the\ clipboard.=Bağlantı panoya kopyalandı.
 
 Open\ %0\ file=%0 dosyayı aç
-Could\ not\ detect\ terminal\ automatically.\ Please\ define\ a\ custom\ terminal\ in\ the\ preferences.=Terminal otomatik olarak belirlenemedi. Lütfen tercihlerde özel bir terminal tanımlayınız.
+Could\ not\ detect\ terminal\ automatically\ using\ '%0'.\ Please\ define\ a\ custom\ terminal\ in\ the\ preferences.='%0' kullanılarak terminal otomatik olarak belirlenemedi. Lütfen tercihlerde özel bir terminal tanımlayınız.
 
 Cannot\ delete\ file=Dosya silinemiyor
 File\ permission\ error=Dosya izin hatası
@@ -1337,7 +1359,7 @@ Removed\ all\ groups=Tüm gruplar silindi
 %0.\ Accepting\ the\ change\ replaces\ the\ complete\ groups\ tree\ with\ the\ externally\ modified\ groups\ tree.=%0. Değişikliği kabul etmek, harici olarak değiştirilmiş grup ağacını mevcut grup ağacının tamamının yerine koyar.
 Select\ export\ format=Dışa aktarma biçemini seç
 Return\ to\ library=Kütüphaneye dön
-On\ JabRef=JabRef'te
+
 Could\ not\ connect\ to\ %0=%0'e bağlanılamadı
 Warning\:\ %0\ out\ of\ %1\ entries\ have\ undefined\ title.=Uyarı\: %1 girdiden %0'inin tanımlanmamış başlığı var.
 Warning\:\ %0\ out\ of\ %1\ entries\ have\ undefined\ citation\ key.=Uyarı\:%1 girdiden %0'inde tanımlanmamış atıf anahtarı var.
@@ -1345,6 +1367,10 @@ Warning\:\ %0\ out\ of\ %1\ entries\ have\ undefined\ DOIs.=Uyarı\: %1 girdiden
 Really\ delete\ the\ selected\ entry?=Gerçekten seçili girdi silinsin mi?
 Really\ delete\ the\ %0\ selected\ entries?=Gerçekten seçili %0 girdi silinsin mi?
 
+On\ disk=Sürücüde
+In\ JabRef=JabRef'te
+Entry\ Preview=Girdi Ön İzlemesi
+
 Keep\ left=Solu tut
 Keep\ right=Sağı tut
 Old\ entry=Eski girdi
@@ -1378,6 +1404,7 @@ Entry\ editor,\ previous\ panel\ 2=Girdi düzenleyici, önceki panel 2
 File\ list\ editor,\ move\ entry\ down=Dosya listesi düzenleyici, girdiyi aşağıya taşı
 File\ list\ editor,\ move\ entry\ up=Dosya listesi düzenleyici, girdiyi yukarıya taşı
 Focus\ entry\ table=Girdi tablosuna odaklan
+Focus\ group\ list=Grup listesine odaklan
 Import\ into\ current\ library=Mevcut veritabanına aktar
 Import\ into\ new\ library=Yeni veritabanına aktar
 New\ article=Yeni makale
@@ -1388,7 +1415,6 @@ New\ mastersthesis=Yeni master tezi
 New\ phdthesis=Yeni doktora tezi
 New\ proceedings=Yeni tutanak
 New\ unpublished=Yeni yayınlanmamış
-Preamble\ editor,\ store\ changes=Giriş düzenleyici, dükkan değişiklikleri
 Push\ to\ application=Uygulamaya itele
 Refresh\ OpenOffice/LibreOffice=Tazele 00
 Resolve\ duplicate\ citation\ keys=Çifte atıf anahtarlarını çözümle
@@ -1459,7 +1485,7 @@ Capitalize=Büyük harfe dönüştür
 Capitalize\ all\ Words,\ but\ Converts\ Articles,\ Prepositions,\ and\ Conjunctions\ to\ Lower\ Case.=Tüm Sözcükleri Büyük Harfe Dönüştür ama Artikel, Edat ve Bağlaçları Küçük Harfe Dönüştür.
 Capitalize\ the\ first\ word,\ changes\ other\ words\ to\ lower\ case.=İlk sözcüğü büyük harfe, diğer tüm sözcükleri küçük harfe deönüştür.
 changes\ all\ letters\ to\ lower\ case.=tüm harfleri küçük harfe dönüştürür.
-CHANGES\ ALL\ LETTER\ TO\ UPPER\ CASE.=TÜM HARFLERİ BÜYÜK HARFE DÖNÜŞTÜRÜR.
+CHANGES\ ALL\ LETTERS\ TO\ UPPER\ CASE.=TÜM HARFLERİ BÜYÜK HARFE DÖNÜŞTÜRÜR.
 Changes\ The\ First\ Letter\ Of\ All\ Words\ To\ Capital\ Case\ And\ The\ Remaining\ Letters\ To\ Lower\ Case.=Tüm Sözcüklerin İlk Harfini Büyük Harfe, Diğer Tüm Harflerini Küçük Harfe Dönüştür.
 Cleans\ up\ LaTeX\ code.=LaTeX kodunu temizler.
 Converts\ HTML\ code\ to\ LaTeX\ code.=HTML kodunu LaTeX koduna dönüştürür.
@@ -1503,7 +1529,11 @@ Does\ nothing.=Hiçbir şey yapmaz.
 Identity=Kimlik
 Clears\ the\ field\ completely.=Alanı tamamen temizler.
 Directory\ not\ found=Dizin bulunamadı
-Main\ file\ directory\ not\ set.\ Check\ the\ preferences\ (linked\ files)\ or\ the\ library\ properties.=Ana dosya dizini seçilmemiş. Tercihleri (bağlantılı dosyalar) ya da kütüphane özelliklerini kontrol edin.
+
+Main\ file\ directory=Ana dosya dizini
+Main\ file\ directory\ not\ set.\ Check\ the\ preferences\ ("Linked\ files")\ or\ modify\ the\ library\ properties\ ("Override\ default\ file\ directories").=Ana dosya dizini belirlenmemiş. Tercihleri kontrol edin ("Bağlantılı dosyalar") ya da kütüphane özelliklerini değiştirin ("Ön tanımlı dosya dizinlerini geçersiz kıl").
+Main\ file\ directory\ '%0'\ not\ found.\nCheck\ the\ tab\ "Linked\ files".=Ana dosya dizini '%0' bulunamadı.\n"Bağlantılı dosyalar" sekmesini kontrol edin.
+
 This\ operation\ requires\ exactly\ one\ item\ to\ be\ selected.=Bu işlem tam olarak bir ögenin seçilmesini gerektirir.
 Opening\ large\ number\ of\ files=Çok sayıda dosya açılıyor
 You\ are\ about\ to\ open\ %0\ files.\ Continue?=%0 adet dosya açmak üzeresiniz. Devam edilsin mi?
@@ -1558,6 +1588,8 @@ Verse=Dize
 change\ entries\ of\ group=grubun girdilerini değiştir
 odd\ number\ of\ unescaped\ '\#'=tek sayılı öncelenmemiş '\#'
 
+Found\ %0\ unescaped\ '&'=%0 kaçırılmamış '&' bulundu
+
 Show\ diff=Diff göster
 Copy\ Version=Sürümü Kopyala
 Maintainers=İdame ediciler
@@ -1577,7 +1609,7 @@ Message=Mesaj
 
 
 MathSciNet\ Review=MathSciNet İncelemesi
-Reset\ Bindings=Bağlantıları Sıfırla
+Reset\ all=Tümünü sıfırla
 
 Decryption\ not\ supported.=Şifre çözme desteklenmiyor.
 
@@ -1624,7 +1656,7 @@ Found\ overlapping\ ranges=Örtüşen aralıklar bulundu
 Found\ touching\ ranges=Birbirine komşu aralıklar bulundu
 
 Note\:\ Use\ the\ placeholder\ %DIR%\ for\ the\ location\ of\ the\ opened\ library\ file.=Not\: Açık kütüphane dosyasının konumu için %DIR% yer tutucusunu kullan.
-Error\ occured\ while\ executing\ the\ command\ "%0".="%0" komutu çalıştırılırken hata oluştu.
+Error\ occurred\ while\ executing\ the\ command\ "%0".="%0" komutu çalıştırılırken hata oluştu.
 Reformat\ ISSN=ISSN'i yeniden biçimlendir
 
 Countries\ and\ territories\ in\ English=Ülke ve bölgeler İngilizce
@@ -1639,6 +1671,7 @@ Are\ you\ sure\ you\ want\ to\ remove\ the\ protected\ terms\ file?=Korunmuş te
 Remove\ protected\ terms\ file=Korunmuş terimler dosyasını sil
 Add\ selected\ text\ to\ list=Seçili metni listeye ekle
 Add\ {}\ around\ selected\ text=Seçili metnin çevresine {} ekle
+Remove\ all\ {}\ in\ selected\ text=Seçili metinden tüm {}'leri sil
 Format\ field=Alanı biçimle
 New\ protected\ terms\ file=Yeni korunmuş terimler dosyası
 change\ field\ %0\ of\ entry\ %1\ from\ %2\ to\ %3=%1 girdisinin %0 alanını %2'den %3'e değiştir
@@ -1690,6 +1723,7 @@ Check\ the\ event\ log\ to\ see\ all\ notifications=Tüm bildirimleri görmek i
 Host=Makine
 Port=Bağlantı noktası
 Library=Veritabanı
+Libraries=Kütüphaneler
 User=Kullanıcı
 Connect=Bağlan
 Connection\ error=Bağlantı hatası
@@ -1718,6 +1752,7 @@ Cannot\ cite\ entries\ without\ citation\ keys.\ Generate\ keys\ now?=Atıf anah
 New\ technical\ report=Yeni teknik rapor
 
 %0\ file=%0 dosyası
+%0\ file\ (%1)=%0 dosya (%1)
 Custom\ layout\ file=Özel düzen dosyası
 Protected\ terms\ file=Korunmuş terimler dosyası
 Style\ file=Stil dosyası
@@ -1788,6 +1823,7 @@ DOI\ %0\ is\ invalid=%0 DOI geçersiz
 
 Select\ all\ customized\ types\ to\ be\ stored\ in\ local\ preferences\:=Tüm özelleştirilmiş türleri yerel tercihlerde sakla\:
 Different\ customization,\ current\ settings\ will\ be\ overwritten=Farklı kişiselleştirme, güncel ayarların üzerine yazılacak
+%0\ (from\ file)\n%1\ (current\ setting)=%0 (dosyadan)\n%1 (mevcut ayar)
 
 Entry\ type\ %0\ is\ only\ defined\ for\ Biblatex\ but\ not\ for\ BibTeX=%0 girdi türü yalnızca Biblatex için tanımlanmış BibTeX için değil
 
@@ -1840,6 +1876,7 @@ Copying\ files...=Dosyalar kopyalanıyor...
 Copying\ file\ %0\ of\ entry\ %1=%1 girdisinin %0 dosyası kopyalanıyor
 Finished\ copying=Kopyalama tamamlandı
 Could\ not\ copy\ file=Dosya kopyalanamadı
+Copied\ %0\ files\ of\ %1\ successfully\ to\ %2=%1 dosyanın %0'i başarıyla %2'e kopyalandı
 Rename\ failed=Yeniden adlandırma başarısız oldu
 JabRef\ cannot\ access\ the\ file\ because\ it\ is\ being\ used\ by\ another\ process.=JabRef dosyaya erişemiyor çünkü dosya başka bir süreç tarafından kullanılıyor.
 Show\ console\ output\ (only\ when\ the\ launcher\ is\ used)=Konsol çıktısını göster (yalnızca başlatıcı kullanıldığında)
@@ -1915,6 +1952,7 @@ New\ sublibrary\ based\ on\ AUX\ file=AUX dosyasını temel alan yeni alt-kütü
 Push\ entries\ to\ external\ application\ (%0)=Girdileri harici uygulamaya itele (%0)
 Quit=Çıkış
 Recent\ libraries=Son kullanılan kütüphaneler
+Clear\ recent\ libraries=Yakın zamandaki kütüphaneleri temizle
 Set\ up\ general\ fields=Genel alanları ayarla
 View\ change\ log=Değişiklik kütüğünü göster
 View\ event\ log=Olay kayıt dosyasını göster
@@ -1956,12 +1994,6 @@ Select\ the\ entries\ to\ be\ imported\:=İçe aktarılacak girdileri seç\:
 Add\ new\ String=Yeni Dizge Ekle
 Must\ not\ be\ empty\!=Boş olmamalı\!
 Open\ Help\ page=Yardım sayfasını Aç
-Add\ new\ field\ name=Yeni alan adı ekle
-Field\ name\:=Alan adı\:
-Field\ name\ "%0"\ already\ exists="%0" alan adı zaten var
-No\ field\ name\ selected\!=Alan adı seçilmedi\!
-Remove\ field\ name=Alan adını sil
-Are\ you\ sure\ you\ want\ to\ remove\ field\ name\:\ "%0"?=Alan adını silmek istediğinizden emin misiniz\: "%0"?
 Add\ new\ keyword=Yeni anahtar sözcük ekle
 Keyword\:=Anahtar sözcük\:
 Keyword\ "%0"\ already\ exists=Anahtar kelime "%0" zaten var
@@ -1972,7 +2004,6 @@ Reset\ to\ default=Öntanımlıya sıfırla
 String\ constants=Dizge sabitleri
 Export\ all\ entries=Tüm girdileri dışa aktar
 Generate\ citation\ keys=Atıf anahtarlarını oluştur
-Manage\ field\ names\ &\ content=Alan ad ve içeriklerini yönet
 New\ library=Yeni kütüphane
 OpenOffice/LibreOffice=OpenOfis/LibreOfis
 Open\ document\ viewer=Belge görüntüleyiciyi aç
@@ -2044,16 +2075,15 @@ Add\ formatter\ to\ list=Biçimleyiciyi listeye ekle
 Filter\ List=Süzgeç listesi
 Open\ files...=Dosyaları aç...
 
-Affected\ fields\:=Etkilenmiş alanlar\:
+Affected\ fields=Etkilenmiş alanlar
 Show\ preview\ as\ a\ tab\ in\ entry\ editor=Ön izleyiciyi, girdi düzenleyicide bir sekme olarak göster
-Font=Yazı tipi
 Visual\ theme=Görsel tema
-Light\ theme=Aydınlık tema
-Dark\ theme=Karanlık tema
-Custom\ theme=Özel tema
 Overwrite\ existing\ keys=Mevcut anahtarların üzerine yaz
 Key\ patterns=Anahtar desenleri
 Font\ settings=Yazı tipi ayarları
+Custom...=Özel...
+Dark=Karanlık
+Light=Aydınlık
 Please\ specify\ a\ css\ theme\ file.=Lütfen bir css tema dosyası belirtin.
 You\ must\ enter\ an\ integer\ value\ higher\ than\ 8.=8'den yüksek bir tam sayı değeri girmelisiniz.
 Letters\ after\ duplicate\ generated\ keys=Mükerrer oluşturulmuş anahtarlardan sonraki harfler
@@ -2069,7 +2099,6 @@ Reset\ All=Tümünü Sıfırla
 Linked\ identifiers=Bağlantılı tanımlayıcılar
 
 insert\ entries=girdileri ekle
-On\ disk=Sürücüde
 
 Independent=Bağımsız
 Intersection=Kesişim
@@ -2279,7 +2308,6 @@ Display\ count\ of\ items\ in\ group=Gruptaki öğe sayısını göster
 Remove\ the\ following\ characters\:=Aşağıdaki karakterleri sil\:
 Truncate=Buda
 Truncates\ a\ string\ after\ a\ given\ index.=Bir dizgenin belirtilmiş bir dizinden sonraki kısmını budar.
-Close=Kapat
 Close\ all=Tümünü Kapat
 Close\ all\ libraries=Tüm kütüphaneleri kapat
 Close\ other\ libraries=Diğer kütüphaneleri kapat
@@ -2294,13 +2322,13 @@ Custom\ import\ formats=Özel içe aktama biçimleri
 
 No\ list\ enabled=Etkinleştirilen liste yok
 Protect\ selection=Seçimi koru
+Unprotect\ selection=Seçimin korumasını kaldır
 
 Customized\ preview\ style=Özelleştirilmiş ön izleme stili
 Next\ preview\ style=Sonraki ön izleme stili
 Previous\ preview\ style=Önceki ön izleme stili
 
 (\ Note\:\ Press\ return\ to\ commit\ changes\ in\ the\ table\!\ )=(Not\: Tablodaki değişiklikleri üstlenmek için 'Enter' tuşuna basın\!)
-Reset=Sıfırla
 New\ inproceedings=Yeni içtutanaklar
 Reset\ entry\ types\ and\ fields\ to\ defaults=Girdi türleri ve alanlarını öntanımlılara sıfırla
 This\ will\ reset\ all\ entry\ types\ to\ their\ default\ values\ and\ remove\ all\ custom\ entry\ types=Bu, tüm girdi türlerini öntanımlı değerlerine sıfırlayacak ve tüm özel girdi türlerini silecek
@@ -2335,7 +2363,7 @@ Unprotect\ terms=Terimlerin korumasını kaldır
 
 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
 
@@ -2343,7 +2371,7 @@ 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.
+I\ cannot\ insert\ to\ the\ cursor's\ 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.
 
@@ -2383,13 +2411,13 @@ File\ '%1'\ is\ a\ duplicate\ of\ '%0'.\ Keeping\ both\ due\ to\ deletion\ error
 Enable\ field\ formatters=Alan biçimlendiricilerini etkinleştir
 Entry\ Type=Girdi Türü
 Entry\ types=Girdi türleri
-Field\ names=Alan adları
 Others=Diğerleri
 Recommended=Önerilen
 
 Authors\ and\ Title=Yazarlar ve Başlık
-Database=Veri tabanı
-Databases=Veri tabanları
+Catalog=Katalog
+Catalogs=Kataloglar
+Select\ Catalogs\:=Katalogları Seçin\:
 Add\ Author\:=Yazar Ekle\:
 Add\ Query\:=Sorgu Ekle\:
 Add\ Research\ Question\:=Araştırma Sorusu Ekle\:
@@ -2400,7 +2428,6 @@ Start\ new\ systematic\ literature\ review=Yeni sistematik literatür derlemesin
 Manage\ study\ definition=Çalışma tanımını yönet
 Update\ study\ search\ results=Çalışma arama sonuçlarını güncelle
 Study\ repository\ could\ not\ be\ created=Çalışma veri havuzu oluşturulamadı
-Select\ Databases\:=Veri Tabanlarını Seçin\:
 
 All\ query\ terms\ are\ joined\ using\ the\ logical\ AND,\ and\ OR\ operators=Tüm sorgu terimleri mantıksal VE ve VEYA işlemcileriyle birleştirildi
 Finalize=Tamamla
@@ -2472,7 +2499,6 @@ Clear\ field\ content=Alan içeriğini temizle
 Set\ or\ append\ content=İçeriği ata ya da sonuna ekle
 Edit\ field\ content\ for\ selected\ entries=Seçili girdiler için alan içeriğini düzenle
 Rename=Yeniden adlandır
-New\ field\ name=Yeni alan adı
 Copy\ content=İçeriği kopyala
 Move\ content=İçeriği taşı
 Swap\ content=İçeriği takasla
@@ -2489,6 +2515,7 @@ Split\ View=Ayrık Görünüm
 Plain\ Text=Salt Metin
 Show\ Diff=Farkı Göster
 Merged\ Entry=Birleşik Girdi
+Only\ show\ changed\ fields=Yalnızca değişmiş alanları göster
 
 Edit\ file\ link=Dosya bağlantısını düzenle
 
@@ -2496,7 +2523,7 @@ Edit\ file\ link=Dosya bağlantısını düzenle
 Assign=Ata
 Do\ not\ assign=Atama
 
-Error\ occured\ %0=Hata oluştu %0
+Error\ occurred\ %0=Hata oluştu %0
 Left\ Entry=Sol Girdi
 Merge\ %0=Birleştir %0
 Right\ Entry=Sağ Girdi
@@ -2518,4 +2545,23 @@ This\ could\ indicate\ that\ JabRef\ did\ not\ shut\ down\ cleanly\ last\ time\
 
 Use\ the\ field\ FJournal\ to\ store\ the\ full\ journal\ name\ for\ (un)abbreviations\ in\ the\ entry=Dergi adını girdideki kısaltmalar için tamamıyla kaydetmek üzere FJournal alanını kullanın
 
+Library\ to\ import\ into=İçine aktarılacak kütüphane
+
+
+Multiline=Çoksatırlı
+
+Unable\ to\ open\ linked\ eprint.\ Please\ set\ the\ eprinttype\ field=Bağlantılı ebasım aöılamadı. Lütfen ebasımtürü alanını belirleyin
+Unable\ to\ open\ linked\ eprint.\ Please\ verify\ that\ the\ eprint\ field\ has\ a\ valid\ '%0'\ id=Bağlantılı ebasım açılamadı. Lütfen ebasım alanının geçerli bir '%0' numarası olduğunu teyit edin
+
+Search\ from\ history...=Geçmişten ara...
+your\ search\ history\ is\ empty=arama geçmişiniz boş
+Clear\ history=Geçmişi temizle
+
+Delete\ %0\ files=%0 dosyaları sil
+Delete\ %0\ files\ permanently\ from\ disk,\ or\ just\ remove\ the\ files\ from\ the\ entry?\ Pressing\ Delete\ will\ delete\ the\ files\ permanently\ from\ disk.='%0 dosyayı diskten kalıcı olarak sil, ya da sadece dosyayı girdiden kaldır? Sile basmak dosyayı diskten kalıcı olarak silecek.
+Error\ accessing\ file\ '%0'.='%0' dosyasına erişimde hata.
+This\ operation\ requires\ selected\ linked\ files.=Bu işlem seçili bağlantılı dosyaları gerektirir.
+
+Create\ backup=Yedek oluştur
+Automatically\ search\ and\ show\ unlinked\ files\ in\ the\ entry\ editor=Bağlantısı olmayan dosyaları otomatikman ara ve girdi düzenleyicisinde göster
 
diff --git a/src/main/resources/l10n/JabRef_uk.properties b/src/main/resources/l10n/JabRef_uk.properties
index 8aa514be4db..4c389cbf1e1 100644
--- a/src/main/resources/l10n/JabRef_uk.properties
+++ b/src/main/resources/l10n/JabRef_uk.properties
@@ -1,28 +1,81 @@
+Proxy\ requires\ password=Потрібен пароль проксі-сервера
 
+Unable\ to\ monitor\ file\ changes.\ Please\ close\ files\ and\ processes\ and\ restart.\ You\ may\ encounter\ errors\ if\ you\ continue\ with\ this\ session.=Неможливо контролювати зміни файлу. Будь ласка, закрийте файли та процеси і перезапустіть. Ви можете зіткнутися з помилками, якщо продовжите сесію.
+%0\ contains\ the\ regular\ expression\ <b>%1</b>=%0 містить регулярний вираз <b>%1</b>
 
+%0\ contains\ the\ term\ <b>%1</b>=%0 містить термін <b>%1</b>
 
+%0\ doesn't\ contain\ the\ regular\ expression\ <b>%1</b>=%0 не містить регулярний вираз <b>%1</b>
 
+%0\ doesn't\ contain\ the\ term\ <b>%1</b>=%0 не містить термін <b>%1</b>
 
+%0/%1\ entries=%1 Стаття
 
+Export\ operation\ finished\ successfully.=Експорт PAM операції завершено успішно.
 
+Reveal\ in\ File\ Explorer=Розкрити у файловому провіднику
 
+%0\ matches\ the\ regular\ expression\ <b>%1</b>=%0 відповідностей по регулярному виразу <b>%1</b>
 
+%0\ matches\ the\ term\ <b>%1</b>=%0 співпадань по терміну <b>%1</b>
 
+Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (DEFAULT\ abbreviation)=Скорочувати назви журналу для вибраних записів (абревіатура за замовчуванням)
+Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (DOTLESS\ abbreviation)=Скорочувати назви журналу для вибраних записів (абревіатура без крапки)
+Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (SHORTEST\ UNIQUE\ abbreviation)=Скорочувати назви журналу для вибраних записів (найкоротша унікальна абревіатура)
 
+Abbreviate\ names=Скорочена назва, абревіатура
+Abbreviated\ %0\ journal\ names.=Скорочені назви журналу %0.
 
+Abbreviation=Абревіатура
+Abbreviations=Абривіатура
 
+Unabbreviate\ journal\ names\ of\ the\ selected\ entries=Не скорочувати назви журналів вибраних записів
+Unabbreviated\ %0\ journal\ names.=Скорочені назви журналу %0.
 
+dotless=без крапочки %s
+shortest\ unique=найкоротший унікальний
 
+About\ JabRef=Про JabRef
 
+Abstract=Абстракція
 
+Accept=Прийняти
 
+Accept\ recommendations\ from\ Mr.\ DLib=Прийняти рекомендації з Mr. DLib
 
+Action=Дія
 
+Add=Додати
 
+Add\ a\ (compiled)\ custom\ Importer\ class\ from\ a\ class\ path.=Додати (скомпільований) користувацький клас з шляху класу.
+The\ path\ need\ not\ be\ on\ the\ classpath\ of\ JabRef.=Шлях не повинен бути на складі JabRef
 
+Add\ a\ regular\ expression\ for\ the\ key\ pattern.=Додайте регулярний вираз для ключового шаблону.
 
+Add\ entry\ manually=Додати запис вручну
 
+Add\ selected\ entries\ to\ this\ group=Додати вибрані записи до нової групи
 
+Add\ subgroup=Додати підгрупу
+
+Added\ group\ "%0".=Додана група
+
+Added\ string\:\ '%0'=Додано рядок
+Added\ string=Додано рядок
+
+All\ entries=Всі записи
+
+Also\ remove\ subgroups=Також видалити підгрупи
+
+and=та
+
+any\ field\ that\ matches\ the\ regular\ expression\ <b>%0</b>=%0 будь-яке поле яке відповідає регулярному виразу <b>%1</b>
+
+Appearance=Оформлення
+
+Application=Застосунок
+
+Application\ to\ push\ entries\ to=Заявка на push матеріалів
 
 
 
diff --git a/src/main/resources/l10n/JabRef_vi.properties b/src/main/resources/l10n/JabRef_vi.properties
index 8b203700619..2911a51a890 100644
--- a/src/main/resources/l10n/JabRef_vi.properties
+++ b/src/main/resources/l10n/JabRef_vi.properties
@@ -1,8 +1,4 @@
 
-
-
-
-
 %0\ contains\ the\ regular\ expression\ <b>%1</b>=%0 chứa biểu thức chính tắc <b>%1</b>
 
 %0\ contains\ the\ term\ <b>%1</b>=%0 chứa thuật ngữ <b>%1</b>
@@ -229,7 +225,7 @@ Do\ not\ abbreviate\ names=Không viết tắt tên
 
 Do\ not\ open\ any\ files\ at\ startup=Không mở tập tin nào lúc khởi động
 
-Do\ not\ wrap\ the\ following\ fields\ when\ saving=Không 'bọc' những dữ liệu dưới đây khi lưu
+
 Do\ not\ write\ the\ following\ fields\ to\ XMP\ Metadata=Không ghi những dữ liệu dưới đây vào đặc tả dữ liệu XMP
 
 Donate\ to\ JabRef=Hỗ trợ cho JabRef
@@ -240,6 +236,7 @@ Download\ file=Tải xuống tập tin
 duplicate\ removal=loại bỏ trùng
 
 
+
 Duplicate\ string\ name=Trùng tên chuỗi
 
 Duplicates\ found=Tìm thấy các mục trùng
@@ -288,18 +285,14 @@ Exporting=Đang xuất
 Extension=Đuôi mở rộng
 
 
-External\ file\ links=Các liên kết tập tin ngoài
-
 External\ programs=Các chương trình ngoài
 
 
 Field=Dữ liệu
-
 field=dữ liệu
 
 Field\ name=Tên dữ liệu
 
-
 Field\ to\ group\ by=Dữ liệu gộp nhóm theo
 
 File=Tập tin
@@ -403,6 +396,8 @@ JabRef\ preferences=Các tùy thích JabRef
 
 Journal\ abbreviations=Các viết tắt tên tạp chí
 
+
+
 Keep\ both=Giữ cả
 
 
@@ -424,19 +419,14 @@ Last\ modified=Thay đổi lần sau cùng
 
 Link=Liên kết
 Listen\ for\ remote\ operation\ on\ port=Lắng nghe lệnh chạy từ xa tại cổng
-Load\ and\ Save\ preferences\ from/to\ jabref.xml\ on\ start-up\ (memory\ stick\ mode)=Nạp và lưu các tùy thích từ/đến tập tin jabref.xml khi khởi động (chế độ thẻ nhớ)
 
 
-Main\ file\ directory=Thư mục tập tin chính
-
 Manage\ custom\ exports=Quản lý các phép xuất tùy chọn
 
 Manage\ custom\ imports=Quản lý các phép nhập tùy chọn
 
 Mark\ new\ entries\ with\ owner\ name=Đánh dấu các mục mới cùng với tên người sở hữu
 
-Memory\ stick\ mode=Chế độ thẻ nhớ
-
 Merged\ external\ changes=Các thay đổi ngoài được gộp lại
 
 Modified\ group\ "%0".=Nhóm "%0" được điều chỉnh.
@@ -504,7 +494,6 @@ Open\ editor\ when\ a\ new\ entry\ is\ created=Mở trình biên tập khi một
 
 Open\ file=Mở tập tin
 
-Open\ last\ edited\ libraries\ at\ startup=Mở CSDL chỉnh sửa lần cuối khi khởi động
 
 Connect\ to\ shared\ database=Mở CSDL chia sẻ
 
@@ -518,8 +507,6 @@ Operation\ canceled.=Lệnh bị hủy.
 
 Optional\ fields=Các dữ liệu tùy chọn
 
-Options=Tùy chọn
-
 or=hoặc
 
 Override\ default\ file\ directories=Ghi đè các thư mục tập tin mặc định
@@ -629,7 +616,6 @@ resolved=được giải
 Review=Xem xét lại
 Review\ changes=Xem xét lại các thay đổi
 
-
 Save=Lưu
 Save\ all\ finished.=Lưu tất cả đã hoàn tất.
 Save\ all\ open\ libraries=Lưu tất cả các CSDL đang mở
@@ -649,7 +635,6 @@ Refuse\ to\ save\ the\ library\ before\ external\ changes\ have\ been\ reviewed.
 Library\ protection=Bảo vệ CSDL
 Unable\ to\ save\ library=Không thể lưu CSDL
 
-Always\ reformat\ BIB\ file\ on\ save\ and\ export=Luôn luôn định dạng lại file BIB khi lưu và xuất
 Character\ encoding\ '%0'\ is\ not\ supported.=Mã hóa ký tự '%0' không được hỗ trợ.
 
 Search=Tìm
@@ -683,6 +668,9 @@ Show\ BibTeX\ source\ by\ default=Hiển thị nguồn BibTeX theo mặc định
 
 Show\ confirmation\ dialog\ when\ deleting\ entries=Hiển thị hộp thoại xác nhận khi xóa các mục
 
+
+
+
 Show\ last\ names\ only=Chỉ hiển thị Họ
 
 Show\ names\ unchanged=Hiển thị các tên không bị thay đổi
@@ -755,6 +743,7 @@ Value\ cleared\ externally=Giá trị bị xóa ngoài chương trình
 View=Xem
 Vim\ server\ name=Tên Server Vim
 
+
 Warn\ about\ unresolved\ duplicates\ when\ closing\ inspection\ window=Cảnh báo về các mục trùng chưa được giải quyết khi đóng cửa sổ kiểm tra
 
 Warn\ before\ overwriting\ existing\ keys=Cảnh báo trước khi ghi đè các khóa hiện có
@@ -824,7 +813,6 @@ Expected\ syntax\ for\ --fetch\='<name\ of\ fetcher>\:<query>'=Cú pháp mong đ
 General\ file\ directory=Tổng quát thư mục tập tin
 User-specific\ file\ directory=Thư mục tập tin của người sử dụng cụ thể
 
-Send\ as\ email=Gửi bằng email
 Connecting...=Đang kết nối...
 
 
@@ -876,9 +864,11 @@ Save\ selected\ as\ plain\ BibTeX...=Lưu phần chọn thành plain Bibtex...
 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'.
 
 
@@ -901,6 +891,9 @@ Unabbreviate\ journal\ names=Không viết tắt tên các tạp chí
 
 
 
+Main\ file\ directory=Thư mục tập tin chính
+
+
 
 Audio\ CD=Đĩa âm thanh
 British\ patent=Sáng chế của Anh
@@ -932,6 +925,7 @@ U.S.\ patent\ request=Yêu cầu sáng chế của Mỹ
 
 
 
+
 Check\ for\ updates=Kiểm tra cập nhật
 JabRef\ is\ up-to-date.=Phiên bản JabRef là mới nhất.
 Online\ help\ forum=Diễn đàn trợ giúp trực tuyến
@@ -1101,6 +1095,7 @@ Default\ pattern=Kiểu mặc định
 
 
 
+
 
 
 Do\ you\ want\ to\ recover\ the\ library\ from\ the\ backup\ file?=Bạn có muốn phục hồi cơ sở dữ liệu từ tập tin lưu dự phòng không?
@@ -1108,3 +1103,9 @@ This\ could\ indicate\ that\ JabRef\ did\ not\ shut\ down\ cleanly\ last\ time\
 
 
 
+
+
+
+
+
+
diff --git a/src/main/resources/l10n/JabRef_zh_CN.properties b/src/main/resources/l10n/JabRef_zh_CN.properties
index 0567cb1c1bf..1ffaabefb97 100644
--- a/src/main/resources/l10n/JabRef_zh_CN.properties
+++ b/src/main/resources/l10n/JabRef_zh_CN.properties
@@ -1,12 +1,4 @@
-Could\ not\ delete\ empty\ entries.=无法删除空条目。
-
-Delete\ empty\ entries=删除空条目
-
-Empty\ entries=空条目
-
-Keep\ empty\ entries=保留空条目
-
-Library\ '%0'\ has\ empty\ entries.\ Do\ you\ want\ to\ delete\ them?=文献库%0包含空条目，是否删除？
+Proxy\ requires\ password=代理服务器需要密码
 
 Unable\ to\ monitor\ file\ changes.\ Please\ close\ files\ and\ processes\ and\ restart.\ You\ may\ encounter\ errors\ if\ you\ continue\ with\ this\ session.=无法监视文件更改。请关闭文件和处理并重新启动。如果您继续本次会话，您可能会遇到错误。
 %0\ contains\ the\ regular\ expression\ <b>%1</b>=%0 包含正则表达式 <b>%1</b>
@@ -27,8 +19,9 @@ Reveal\ in\ File\ Explorer=在文件夹中显示
 
 %0\ matches\ the\ term\ <b>%1</b>=%0 匹配词组 <b>%1</b>
 
-Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (DEFAULT\ abbreviation)=缩写选中记录的期刊名 (默认格式缩写)
-Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (SHORTEST\ UNIQUE\ abbreviation)=缩写选中记录的期刊名 (最短唯一 (SHORTEST UNIQUE) 格式缩写)
+Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (DEFAULT\ abbreviation)=缩写选中条目的journal字段（默认缩写）
+Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (DOTLESS\ abbreviation)=缩写选定条目的journal字段（无点缩写）
+Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (SHORTEST\ UNIQUE\ abbreviation)=缩写选中记录的journal字段（最简缩写）
 
 Abbreviate\ names=缩写名（J. Smith）
 Abbreviated\ %0\ journal\ names.=缩写的 %0 期刊名称。
@@ -36,9 +29,11 @@ Abbreviated\ %0\ journal\ names.=缩写的 %0 期刊名称。
 Abbreviation=缩写
 Abbreviations=缩写
 
-Unabbreviate\ journal\ names\ of\ the\ selected\ entries=展开选中记录的缩写期刊名称
+Unabbreviate\ journal\ names\ of\ the\ selected\ entries=恢复选中条目的journal全称
 Unabbreviated\ %0\ journal\ names.=展开 %0 期刊名称。
 
+dotless=无点缩写
+shortest\ unique=最简缩写
 
 About\ JabRef=关于JabRef
 
@@ -266,7 +261,8 @@ Do\ not\ abbreviate\ names=不缩写名（John Smith）
 
 Do\ not\ open\ any\ files\ at\ startup=启动时不打开任何文件
 
-Do\ not\ wrap\ the\ following\ fields\ when\ saving=保存时不要对这些字段换行
+Do\ not\ wrap\ when\ saving=保存这些字段时不换行
+
 Do\ not\ write\ the\ following\ fields\ to\ XMP\ Metadata=不要将下列字段写入XMP元数据
 
 Donate\ to\ JabRef=Donate
@@ -279,6 +275,8 @@ duplicate\ removal=移除重复
 
 Duplicate\ fields=重复字段
 
+Unable\ to\ change\ field\ name.\ "%0"\ already\ in\ use.=无法更改字段名称："%0"已在使用中
+
 Duplicate\ string\ name=重复的简写字串名称
 
 Duplicates\ found=发现重复项
@@ -334,19 +332,23 @@ Extension=扩展名
 
 External\ Changes\ Resolver=External Changes Resolver
 
-External\ file\ links=外部文件链接
-
 External\ programs=外部程序
 
 Failed\ to\ import\ by\ ID=无法通过ID导入
 
 Field=字段
-
 field=字段
 
 Field\ name=字段名称
-
+Field\ names=字段名
 Field\ names\ are\ not\ allowed\ to\ contain\ white\ spaces\ or\ certain\ characters\ (%0).=字段名称不能包含空格或特定字符 (%0)。
+New\ field\ name=新的字段名
+Add\ new\ field\ name=Add new field name
+Field\ name\ "%0"\ already\ exists=字段名称 %0 已存在
+No\ field\ name\ selected\!=没有选择字段
+Remove\ field\ name=删除字段名称
+Are\ you\ sure\ you\ want\ to\ remove\ field\ name\:\ "%0"?=确定要删除字段"%0"吗？
+Manage\ field\ names\ &\ content=管理字段名称和内容
 
 Field\ to\ group\ by=用来分组的字段
 
@@ -395,7 +397,7 @@ Generate\ citation\ key=生成CitationKey
 
 Generate\ keys=生成键
 
-Generate\ keys\ before\ saving\ (for\ entries\ without\ a\ key)=在保存之前，为缺失键值的记录自动生成Citationkey
+Generate\ keys\ before\ saving\ (for\ entries\ without\ a\ key)=在保存之前，为缺失键值的记录自动生成 citationkey
 
 Generated\ citation\ key\ for=生成Citation key
 
@@ -474,6 +476,9 @@ Journal\ abbreviations=期刊缩写
 Journal\ lists\:=期刊列表：
 Remove\ journal\ '%0'=删除期刊“%0”
 
+ISSN=ISSN
+
+
 Keep\ both=保留全部
 
 Keep\ subgroups=保留子组
@@ -500,12 +505,10 @@ LaTeX\ AUX\ file\:=LaTeX AUX 文件\:
 
 Link=链接
 Listen\ for\ remote\ operation\ on\ port=监听端口
-Load\ and\ Save\ preferences\ from/to\ jabref.xml\ on\ start-up\ (memory\ stick\ mode)=启动时从 jabref.xml 加载设置
+Memory\ stick\ mode\ -\ Store\ preferences\ in\ 'jabref.xml'\ in\ the\ app\ folder.=记忆棒模式：将 jabref.xml 保存到程序所在目录
 
 Show\ advanced\ hints\ (i.e.\ helpful\ tooltips,\ suggestions\ and\ explanation)=显示高级建议（如浮动提示、建议、解释说明）
 
-Main\ file\ directory=文件主目录
-
 Manage\ custom\ exports=管理自定义导出器
 
 Manage\ custom\ imports=管理自定义导入器
@@ -513,8 +516,6 @@ External\ file\ types=外部文件类型
 
 Mark\ new\ entries\ with\ owner\ name=新建条目时标记所有者为
 
-Memory\ stick\ mode=记忆棒模式
-
 Merged\ external\ changes=合并外部修改
 Merge\ fields=合并字段
 
@@ -590,7 +591,7 @@ Open\ editor\ when\ a\ new\ entry\ is\ created=创建新记录时打开记录编
 
 Open\ file=打开文件
 
-Open\ last\ edited\ libraries\ at\ startup=启动时打开上次使用的数据库
+Open\ last\ edited\ libraries\ on\ startup=启动时打开上次使用的文献库
 
 Connect\ to\ shared\ database=连接到共享数据库
 
@@ -605,8 +606,6 @@ Operating\ System\ (Provides\ for\ better\ recommendations\ by\ giving\ an\ indi
 
 Optional\ fields=可选字段
 
-Options=选项
-
 or=或
 
 Override\ default\ file\ directories=覆盖默认文件目录
@@ -741,8 +740,7 @@ Replaces\ Unicode\ ligatures\ with\ their\ expanded\ form=将Unicode连字替换
 
 Required\ fields=必选字段
 
-Do\ not\ resolve\ BibTeX\ strings=不解析BibTeX字符串
-Resolve\ BibTeX\ strings\ for\ the\ following\ fields=解析下述字段的BibTeX字符串
+Resolve\ BibTeX\ strings=解析 BibTeX 字符串
 
 resolved=已解决
 
@@ -756,8 +754,6 @@ Review=评论
 Review\ changes=复查修改
 Review\ Field\ Migration=查看字段迁移
 
-Loading=启动
-
 Save=保存
 Save\ all\ finished.=完成保存全部。
 Save\ all\ open\ libraries=保存所有打开的数据库
@@ -781,7 +777,7 @@ Refuse\ to\ save\ the\ library\ before\ external\ changes\ have\ been\ reviewed.
 Library\ protection=文献库保护
 Unable\ to\ save\ library=无法保存文献库
 
-Always\ reformat\ BIB\ file\ on\ save\ and\ export=在保存和导出时整理 bib 文件格式
+Always\ reformat\ library\ on\ save\ and\ export=在保存和导出文献库时整理格式
 Character\ encoding\ '%0'\ is\ not\ supported.=，不支持编码 '%0'。
 
 Search=查找
@@ -847,6 +843,9 @@ Show\ BibTeX\ source\ by\ default=默认显示 BibTeX 源代码
 
 Show\ confirmation\ dialog\ when\ deleting\ entries=删除多个条目时提示
 
+
+
+
 Show\ last\ names\ only=仅显示姓（Smith）
 
 Show\ names\ unchanged=显示原始姓名字串
@@ -928,6 +927,7 @@ Upgrade\ external\ PDF/PS\ links\ to\ use\ the\ '%0'\ field.=升级外部PDF/PS
 usage=用法
 Use\ autocompletion=开启自动补全
 
+User\ interface=用户界面
 
 Username=用户名
 
@@ -940,6 +940,7 @@ Verify\ that\ LyX\ is\ running\ and\ that\ the\ lyxpipe\ is\ valid.=检查LyX是
 View=视图
 Vim\ server\ name=Vim server name
 
+
 Warn\ about\ unresolved\ duplicates\ when\ closing\ inspection\ window=关闭窗口时提示重复的条目
 
 Warn\ before\ overwriting\ existing\ keys=重写 citationkey 时提示
@@ -1040,7 +1041,6 @@ You\ must\ enter\ an\ integer\ value\ in\ the\ interval\ 1025-65535=请输入一
 Autocomplete\ names\ in\ 'Firstname\ Lastname'\ format\ only=仅自动补全形如 'Firstname Lastname' 格式的姓名
 Autocomplete\ names\ in\ 'Lastname,\ Firstname'\ format\ only=仅自动补全形如 'Lastname, Firstname' 格式的姓名
 Autocomplete\ names\ in\ both\ formats=自动补全两种格式的姓名
-Send\ as\ email=以邮件形式发送
 References=引用
 Sending\ of\ emails=邮件发送选项
 Subject\ for\ sending\ an\ email\ with\ references=发送参考文献邮件时的主题
@@ -1118,7 +1118,6 @@ Please\ choose\ which\ one\ to\ connect\ to\:=请选择连接到哪个：
 Choose\ OpenOffice/LibreOffice\ executable=选择 OpenOffice/LibreOffice 可执行文件
 Select\ document=选择文件
 HTML\ list=HTML 列表
-If\ possible,\ normalize\ this\ list\ of\ names\ to\ conform\ to\ standard\ BibTeX\ name\ formatting=尽可能使用标准 BibTeX 名字格式规范化此列表中的名字
 Could\ not\ open\ %0=无法打开 %0
 Unknown\ import\ format=未知的导入格式
 Style\ selection=引用样式选择
@@ -1145,6 +1144,7 @@ Cleanup\ entries=清理记录
 Automatically\ assign\ new\ entry\ to\ selected\ groups=新建条目时，自动分配到选中的分组
 %0\ mode=%0 模式
 Move\ DOIs\ from\ note\ and\ URL\ field\ to\ DOI\ field\ and\ remove\ http\ prefix=将备注和 URL 字段中的 DOIs 移动到 DOI 字段中，并且移除 http 前缀
+Move\ URL\ in\ note\ field\ to\ url\ field=将note字段中的超链接移动到url字段
 Make\ paths\ of\ linked\ files\ relative\ (if\ possible)=使链接文件的所有路径为相对的（如果可能）
 Rename\ PDFs\ to\ given\ filename\ format\ pattern=将 PDF 重命名为给定的文件名格式模式
 Rename\ only\ PDFs\ having\ a\ relative\ path=只重命名具有相对路径的 PDF
@@ -1155,6 +1155,7 @@ One\ entry\ needed\ a\ clean\ up=一个条目需要清理
 
 Group\ tree\ could\ not\ be\ parsed.\ If\ you\ save\ the\ BibTeX\ library,\ all\ groups\ will\ be\ lost.=无法解析组树。如果保存BibTeX库，所有组都会丢失。
 Attach\ file=附加文件
+Attach\ file\ from\ URL=从URL添加文件
 Setting\ all\ preferences\ to\ default\ values.=重置所有首选项到默认值.
 Resetting\ preference\ key\ '%0'=重置首选项 '%0'
 Unable\ to\ clear\ preferences.=无法清除所有选项。
@@ -1188,7 +1189,6 @@ Four\ stars=四星
 Five\ stars=五星
 Help\ on\ special\ fields=特殊字段帮助
 Keywords\ of\ selected\ entries=选中记录的关键词
-Manage\ content\ selectors=管理内容选择器
 Content\ selectors=Content selectors
 Manage\ keywords=管理关键词
 No\ priority\ information=没有优先级信息
@@ -1219,7 +1219,6 @@ Error\ message\:=错误信息\:
 If\ a\ pasted\ or\ imported\ entry\ already\ has\ the\ field\ set,\ overwrite.=如果粘贴或导入的条目已设置字段，则覆盖它。
 Not\ connected\ to\ any\ Writer\ document.\ Please\ make\ sure\ a\ document\ is\ open,\ and\ use\ the\ 'Select\ Writer\ document'\ button\ to\ connect\ to\ it.=未连接到任何编辑器文档。请确保文档已打开，并使用“选择编辑器文档”按钮连接到该文档。
 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.=要禁用记忆棒模式，请在与JabRef相同的文件夹中重命名或删除jabref.xml文件。
 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文件路径。
@@ -1254,7 +1253,6 @@ Please\ specify\ a\ password=请指定密码
 Proxy\ configuration=代理服务器设置
 Use\ custom\ proxy\ configuration=使用自定义 HTTP 代理
 Proxy\ requires\ authentication=代理服务器需要密码
-Attention\:\ Password\ is\ stored\ in\ plain\ text\!=注意\: 密码以明文形式保存\!
 Clear\ connection\ settings=清除连接设置
 Check\ Proxy\ Setting=检查代理设置
 Check\ connection=检查连接
@@ -1271,7 +1269,7 @@ Open\ folder=打开文件夹
 Export\ sort\ order=导出顺序
 Save\ sort\ order=保存时排序
 
-Keep\ original\ order=原顺序
+Keep\ original\ order\ and\ add\ new\ entries\ at\ the\ end=保持原始顺序，并将新条目添加到末尾
 Use\ current\ table\ sort\ order=当前顺序
 Use\ specified\ order=指定顺序
 Show\ extra\ columns=显示额外的列
@@ -1307,7 +1305,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.=无法自动检测终端。请在首选项中自定义一个终端。
+Could\ not\ detect\ terminal\ automatically\ using\ '%0'.\ Please\ define\ a\ custom\ terminal\ in\ the\ preferences.=无法使用 '%0' 检测到终端，请在首选项中自定义一个终端。
 
 Cannot\ delete\ file=无法删除文件
 File\ permission\ error=文件权限错误
@@ -1337,7 +1335,7 @@ Removed\ all\ groups=已移除所有分组
 %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=选择导出格式
 Return\ to\ library=返回文献库
-On\ JabRef=On JabRef
+
 Could\ not\ connect\ to\ %0=无法连接到 %0
 Warning\:\ %0\ out\ of\ %1\ entries\ have\ undefined\ title.=警告： %1 条记录中有 %0 条包含未定义的标题。
 Warning\:\ %0\ out\ of\ %1\ entries\ have\ undefined\ citation\ key.=Warning\: %0 out of %1 entries have undefined citation key.
@@ -1345,6 +1343,10 @@ Warning\:\ %0\ out\ of\ %1\ entries\ have\ undefined\ DOIs.=警告：%0/%1个条
 Really\ delete\ the\ selected\ entry?=确定删除选中的记录？
 Really\ delete\ the\ %0\ selected\ entries?=确定删除选中的 %0 条记录？
 
+On\ disk=On disk
+In\ JabRef=In JabRef
+Entry\ Preview=预览条目
+
 Keep\ left=保留左侧
 Keep\ right=保留右侧
 Old\ entry=旧条目
@@ -1388,7 +1390,6 @@ New\ mastersthesis=新建 mastersthesis
 New\ phdthesis=新建 phdthesis
 New\ proceedings=新建 proceedings
 New\ unpublished=新建 unpublished
-Preamble\ editor,\ store\ changes=导言编辑器，保存修改
 Push\ to\ application=推送到应用
 Refresh\ OpenOffice/LibreOffice=刷新 penOffice/LibreOffice
 Resolve\ duplicate\ citation\ keys=处理重复的 citationkey
@@ -1459,7 +1460,6 @@ Capitalize=Capitalize
 Capitalize\ all\ Words,\ but\ Converts\ Articles,\ Prepositions,\ and\ Conjunctions\ to\ Lower\ Case.=Capitalize all Words, but Converts Articles, Prepositions, and Conjunctions to Lower Case.
 Capitalize\ the\ first\ word,\ changes\ other\ words\ to\ lower\ case.=将每句话第一个字母大写, 其余单词改为小写。
 changes\ all\ letters\ to\ lower\ case.=changes all letters to lower case.
-CHANGES\ ALL\ LETTER\ TO\ UPPER\ CASE.=CHANGES ALL LETTER TO UPPER CASE.
 Changes\ The\ First\ Letter\ Of\ All\ Words\ To\ Capital\ Case\ And\ The\ Remaining\ Letters\ To\ Lower\ Case.=Changes The First Letter Of All Words To Capital Case And The Remaining Letters To Lower Case.
 Cleans\ up\ LaTeX\ code.=清理 LaTeX 代码
 Converts\ HTML\ code\ to\ LaTeX\ code.=将 HTML 代码转换为 LaTeX 代码。
@@ -1503,7 +1503,11 @@ Does\ nothing.=什么都没干。
 Identity=标识
 Clears\ the\ field\ completely.=完全清除这个字段。
 Directory\ not\ found=目录未找到
-Main\ file\ directory\ not\ set.\ Check\ the\ preferences\ (linked\ files)\ or\ the\ library\ properties.=未设置主文件目录。请检查首选项 (链接文件) 或库属性。
+
+Main\ file\ directory=文件主目录
+Main\ file\ directory\ not\ set.\ Check\ the\ preferences\ ("Linked\ files")\ or\ modify\ the\ library\ properties\ ("Override\ default\ file\ directories").=未设置主文件目录，请检查"链接文件"选项卡或修改文献库属性（"覆盖默认文件目录"）
+Main\ file\ directory\ '%0'\ not\ found.\nCheck\ the\ tab\ "Linked\ files".=找不到主文件目录'%0'，请检查"链接文件"选项卡
+
 This\ operation\ requires\ exactly\ one\ item\ to\ be\ selected.=这个操作仅限对选中的一条记录进行。
 Opening\ large\ number\ of\ files=打开大量文件
 You\ are\ about\ to\ open\ %0\ files.\ Continue?=即将打开 %0 个文件，是否继续？
@@ -1558,6 +1562,8 @@ Verse=节
 change\ entries\ of\ group=更改群组内条目
 odd\ number\ of\ unescaped\ '\#'=奇数个未转义 '\#'
 
+Found\ %0\ unescaped\ '&'=Found %0 unescaped '&'
+
 Show\ diff=显示差别
 Copy\ Version=复制版本
 Maintainers=维护人员
@@ -1577,7 +1583,7 @@ Message=消息
 
 
 MathSciNet\ Review=MathSciNet 评论
-Reset\ Bindings=重设键绑定
+Reset\ all=全部重置
 
 Decryption\ not\ supported.=不支持解码
 
@@ -1624,7 +1630,7 @@ Found\ overlapping\ ranges=Found overlapping ranges
 Found\ touching\ ranges=Found touching ranges
 
 Note\:\ Use\ the\ placeholder\ %DIR%\ for\ the\ location\ of\ the\ opened\ library\ file.=Note\: Use the placeholder %DIR% for the location of the opened library file.
-Error\ occured\ while\ executing\ the\ command\ "%0".=执行 "%0" 命令时出错。
+Error\ occurred\ while\ executing\ the\ command\ "%0".=执行 "%0" 命令时出错
 Reformat\ ISSN=重新格式化 ISSN
 
 Countries\ and\ territories\ in\ English=英语国家和区域
@@ -1639,6 +1645,7 @@ Are\ you\ sure\ you\ want\ to\ remove\ the\ protected\ terms\ file?=确实要删
 Remove\ protected\ terms\ file=删除受保护的术语文件
 Add\ selected\ text\ to\ list=添加选定文本到列表
 Add\ {}\ around\ selected\ text=给选定文本加上 {}
+Remove\ all\ {}\ in\ selected\ text=删除所选文本中的 {}
 Format\ field=格式化字段
 New\ protected\ terms\ file=保存为新的术语文件
 change\ field\ %0\ of\ entry\ %1\ from\ %2\ to\ %3=将 %1 条目中的字段 %0 从 %2 更改为 %3
@@ -1690,6 +1697,7 @@ Check\ the\ event\ log\ to\ see\ all\ notifications=在事件日志中查看所
 Host=主机
 Port=端口
 Library=库
+Libraries=库
 User=用户
 Connect=连接
 Connection\ error=连接错误
@@ -1718,6 +1726,7 @@ Cannot\ cite\ entries\ without\ citation\ keys.\ Generate\ keys\ now?=无法引
 New\ technical\ report=新的技术报告
 
 %0\ file=%0 文件
+%0\ file\ (%1)=%0 文件 (%1)
 Custom\ layout\ file=自定义布局文件
 Protected\ terms\ file=受保护的术语文件
 Style\ file=样式文件
@@ -1957,12 +1966,6 @@ Select\ the\ entries\ to\ be\ imported\:=选择要导入的条目：
 Add\ new\ String=添加新的字符串
 Must\ not\ be\ empty\!=不能为空！
 Open\ Help\ page=打开帮助页面​​​​​​​​
-Add\ new\ field\ name=Add new field name
-Field\ name\:=字段名称：
-Field\ name\ "%0"\ already\ exists=字段名称 %0 已存在
-No\ field\ name\ selected\!=没有选择字段
-Remove\ field\ name=删除字段名称
-Are\ you\ sure\ you\ want\ to\ remove\ field\ name\:\ "%0"?=确定要删除字段"%0"吗？
 Add\ new\ keyword=添加关键字
 Keyword\:=关键字\:
 Keyword\ "%0"\ already\ exists=关键词字“%0”已存在
@@ -1973,7 +1976,6 @@ Reset\ to\ default=重置为默认值
 String\ constants=字符串常量
 Export\ all\ entries=导出所有条目
 Generate\ citation\ keys=生成CitationKey
-Manage\ field\ names\ &\ content=管理字段名称和内容
 New\ library=新建库
 OpenOffice/LibreOffice=OpenOffice/LibreOffice
 Open\ document\ viewer=打开文档查看器
@@ -2045,16 +2047,15 @@ Add\ formatter\ to\ list=Add formatter to list
 Filter\ List=Filter List
 Open\ files...=打开文件...
 
-Affected\ fields\:=补全字段
+Affected\ fields=受影响的字段
 Show\ preview\ as\ a\ tab\ in\ entry\ editor=在条目编辑器中以标签形式显示预览
-Font=字体
 Visual\ theme=主题风格
-Light\ theme=明亮主题
-Dark\ theme=暗色主题
-Custom\ theme=自定义
 Overwrite\ existing\ keys=重写当前的 citationkey
 Key\ patterns=Citationkey样式
 Font\ settings=Font settings
+Custom...=自定义...
+Dark=深色
+Light=明亮
 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 添加字母后缀
@@ -2070,7 +2071,6 @@ Reset\ All=全部重置
 Linked\ identifiers=Linked identifiers
 
 insert\ entries=insert entries
-On\ disk=On disk
 
 Independent=独立
 Intersection=交集
@@ -2102,7 +2102,7 @@ Clear\ filters=Clear filters
 
 Add\ new\ Field=Add new Field
 Add\ new\ entry\ type=Add new entry type
-Required\ and\ optional\ fields=Required and optional fields
+Required\ and\ optional\ fields=必填和可选的字段
 Index=Index
 Remove\ entry\ type=移除空条目
 Remove\ field\ %0\ from\ currently\ selected\ entry\ type=从选中的条目类型中删除字段 %0
@@ -2280,7 +2280,6 @@ Display\ count\ of\ items\ in\ group=显示分组中的条目数量
 Remove\ the\ following\ characters\:=删除以下字符：
 Truncate=Truncate
 Truncates\ a\ string\ after\ a\ given\ index.=Truncates a string after a given index.
-Close=关闭
 Close\ all=关闭全部
 Close\ all\ libraries=关闭所有库
 Close\ other\ libraries=关闭其他库
@@ -2295,13 +2294,13 @@ Custom\ import\ formats=自定义导入格式
 
 No\ list\ enabled=未启用列表
 Protect\ selection=保护所选文本
+Unprotect\ selection=取消保护
 
 Customized\ preview\ style=自定义预览样式
 Next\ preview\ style=下一个预览样式
 Previous\ preview\ style=上一个预览样式
 
 (\ 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
 This\ will\ reset\ all\ entry\ types\ to\ their\ default\ values\ and\ remove\ all\ custom\ entry\ types=这将重置所有条目类型为默认值，并删除所有自定义条目类型。
@@ -2336,7 +2335,7 @@ Unprotect\ terms=未保护专有名词
 
 Generate\ a\ new\ key\ for\ imported\ entries\ (overwriting\ their\ default)=为导入条目生成新的 citationkey
 Warn\ about\ duplicates\ on\ import=导入条目重复时提示
-Import\ and\ Export=导入导出
+
 Custom\ DOI\ URI=自定义DOI网址
 Use\ custom\ DOI\ base\ URI\ for\ article\ access=使用DOI网址访问文章
 
@@ -2344,7 +2343,6 @@ 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.
 
@@ -2384,13 +2382,13 @@ File\ '%1'\ is\ a\ duplicate\ of\ '%0'.\ Keeping\ both\ due\ to\ deletion\ error
 Enable\ field\ formatters=启用字段格式化器
 Entry\ Type=条目类型
 Entry\ types=条目类型
-Field\ names=字段名
 Others=其他
 Recommended=推荐
 
 Authors\ and\ Title=作者和标题
-Database=数据库
-Databases=数据库
+Catalog=分类
+Catalogs=分类
+Select\ Catalogs\:=选择分类
 Add\ Author\:=添加作者：
 Add\ Query\:=添加查询：
 Add\ Research\ Question\:=添加研究问题：
@@ -2401,7 +2399,6 @@ Start\ new\ systematic\ literature\ review=Start new systematic literature revie
 Manage\ study\ definition=Manage study definition
 Update\ study\ search\ results=Update study search results
 Study\ repository\ could\ not\ be\ created=无法创建研究仓库
-Select\ Databases\:=选择数据库：
 
 All\ query\ terms\ are\ joined\ using\ the\ logical\ AND,\ and\ OR\ operators=所有查询条目都使用AND和OR运算符连接
 Finalize=完成
@@ -2473,7 +2470,6 @@ Clear\ field\ content=清除字段内容
 Set\ or\ append\ content=设定或附加内容
 Edit\ field\ content\ for\ selected\ entries=编辑选中条目的字段内容
 Rename=重命名
-New\ field\ name=新的字段名
 Copy\ content=复制内容
 Move\ content=移动内容
 Swap\ content=交换内容
@@ -2490,6 +2486,7 @@ Split\ View=Split View
 Plain\ Text=Plain Text
 Show\ Diff=Show Diff
 Merged\ Entry=Merged Entry
+Only\ show\ changed\ fields=仅显示已更改的字段
 
 Edit\ file\ link=Edit file link
 
@@ -2497,7 +2494,7 @@ Edit\ file\ link=Edit file link
 Assign=Assign
 Do\ not\ assign=Do not assign
 
-Error\ occured\ %0=Error occured %0
+Error\ occurred\ %0=出现错误 %0
 Left\ Entry=Left Entry
 Merge\ %0=Merge %0
 Right\ Entry=Right Entry
@@ -2519,4 +2516,23 @@ This\ could\ indicate\ that\ JabRef\ did\ not\ shut\ down\ cleanly\ last\ time\
 
 Use\ the\ field\ FJournal\ to\ store\ the\ full\ journal\ name\ for\ (un)abbreviations\ in\ the\ entry=使用FJournal字段记录Journal全称
 
+Library\ to\ import\ into=要导入的目标库
+
+
+Multiline=多行
+
+Unable\ to\ open\ linked\ eprint.\ Please\ set\ the\ eprinttype\ field=无法打开eprint链接，请设置eprint字段
+Unable\ to\ open\ linked\ eprint.\ Please\ verify\ that\ the\ eprint\ field\ has\ a\ valid\ '%0'\ id=无法打开eprint链接，请确认eprint字段存在有效的'%0'值
+
+Search\ from\ history...=从历史中搜索...
+your\ search\ history\ is\ empty=搜索历史记录为空
+Clear\ history=清除历史记录
+
+Delete\ %0\ files=Delete %0 files
+Delete\ %0\ files\ permanently\ from\ disk,\ or\ just\ remove\ the\ files\ from\ the\ entry?\ Pressing\ Delete\ will\ delete\ the\ files\ permanently\ from\ disk.=Delete %0 files permanently from disk, or just remove the files from the entry? Pressing Delete will delete the files permanently from disk.
+Error\ accessing\ file\ '%0'.=Error accessing file '%0'.
+This\ operation\ requires\ selected\ linked\ files.=这项操作需要选择链接的文件。
+
+Create\ backup=创建备份
+Automatically\ search\ and\ show\ unlinked\ files\ in\ the\ entry\ editor=自动查找并显示未链接的文件
 
diff --git a/src/main/resources/l10n/JabRef_zh_TW.properties b/src/main/resources/l10n/JabRef_zh_TW.properties
index becfadedc54..000f3989724 100644
--- a/src/main/resources/l10n/JabRef_zh_TW.properties
+++ b/src/main/resources/l10n/JabRef_zh_TW.properties
@@ -1,7 +1,4 @@
-
-
-
-
+Proxy\ requires\ password=代理伺服器需要密碼
 
 Unable\ to\ monitor\ file\ changes.\ Please\ close\ files\ and\ processes\ and\ restart.\ You\ may\ encounter\ errors\ if\ you\ continue\ with\ this\ session.=無法監控檔案變更。請關閉文件和程式並重新啟動。如果繼續進行當前操作，可能會發生錯誤。
 %0\ contains\ the\ regular\ expression\ <b>%1</b>=%0 包含正規表達式 <b>%1</b>
@@ -14,7 +11,9 @@ Unable\ to\ monitor\ file\ changes.\ Please\ close\ files\ and\ processes\ and\
 
 %0/%1\ entries=%0/%1 條目
 
+Export\ operation\ finished\ successfully.=匯出成功。
 
+Reveal\ in\ File\ Explorer=在檔案總管中顯示
 
 %0\ matches\ the\ regular\ expression\ <b>%1</b>=%0 符合正規表達式 <b>%1</b>
 
@@ -240,6 +239,7 @@ Display\ version=顯示版本
 
 
 
+
 Donate\ to\ JabRef=捐款支持
 
 Download\ file=下載檔案
@@ -248,6 +248,7 @@ Download\ file=下載檔案
 duplicate\ removal=移除重複
 
 
+
 Duplicate\ string\ name=重複的字串名稱
 
 Duplicates\ found=發現重複項目
@@ -290,17 +291,13 @@ Exporting=正在匯出…
 Extension=副檔名
 
 
-External\ file\ links=外部檔案連結
-
 External\ programs=外部程式
 
 
 Field=欄位
-
 field=欄位
 
 Field\ name=欄位名稱
-
 Field\ names\ are\ not\ allowed\ to\ contain\ white\ spaces\ or\ certain\ characters\ (%0).=欄位名稱不能包含空格或特定字元 (%0)。
 
 
@@ -403,6 +400,8 @@ JabRef\ Version\ (Required\ to\ ensure\ backwards\ compatibility\ with\ Mr.\ DLi
 
 Journal\ abbreviations=期刊縮寫
 
+
+
 Keep\ both=保留全部
 
 
@@ -424,14 +423,11 @@ LaTeX\ AUX\ file\:=LaTeX AUX 檔案：
 Link=連結
 
 
-Main\ file\ directory=主要文件目錄
-
 Manage\ custom\ exports=管理自定義匯出工具
 
 Manage\ custom\ imports=管理自定義匯入工具
 
 
-
 Merged\ external\ changes=合併外部修改
 Merge\ fields=合併欄位
 
@@ -485,7 +481,6 @@ Open\ editor\ when\ a\ new\ entry\ is\ created=在新增條目時，開啟條目
 
 Open\ file=開啟檔案
 
-Open\ last\ edited\ libraries\ at\ startup=在啟動時打開上次編輯的文獻倉庫
 
 Connect\ to\ shared\ database=連接到共享資料庫
 
@@ -498,8 +493,6 @@ Operation\ canceled.=操作已取消
 
 Optional\ fields=選填欄位
 
-Options=選項
-
 or=或
 
 Overwrite=覆寫
@@ -593,7 +586,6 @@ Restart=重新啟動
 
 
 
-
 Save=儲存
 Save\ library=儲存文獻倉庫
 Save\ library\ as...=另存文獻倉庫為...
@@ -606,7 +598,6 @@ Please\ enter\ a\ valid\ file\ path.=請輸入一個有效的路徑。
 
 Unable\ to\ save\ library=無法儲存文獻倉庫
 
-Always\ reformat\ BIB\ file\ on\ save\ and\ export=總是在儲存與匯出重新格式化 BIB 檔案
 Character\ encoding\ '%0'\ is\ not\ supported.=，不支援「%0」編碼。
 
 Search=搜尋
@@ -630,6 +621,9 @@ Show\ 'Lastname,\ Firstname'=顯示「姓（Lastname）, 名（Firstname） 」
 
 
 
+
+
+
 Show\ last\ names\ only=僅顯示「姓（Lastname）」
 
 
@@ -686,6 +680,7 @@ Vim\ server\ name=Vim 伺服器名稱
 
 
 
+
 Warning=警告
 
 Warnings=警告
@@ -726,7 +721,6 @@ LaTeX\ file\ directory=LaTeX 檔案目錄
 Autocomplete\ names\ in\ 'Firstname\ Lastname'\ format\ only=僅自動補全形如 'Firstname Lastname' 的姓名格式
 Autocomplete\ names\ in\ 'Lastname,\ Firstname'\ format\ only=僅自動補全形如 'Lastname, Firstname' 的姓名格式
 Autocomplete\ names\ in\ both\ formats=自動補全兩種姓名格式
-Send\ as\ email=發送電子郵件
 References=參考資料
 Sending\ of\ emails=電子郵件發送
 Custom\ applications=自訂程式
@@ -758,7 +752,6 @@ First\ names=名字 (First names)
 
 
 Clear\ rank=清空評分
-Manage\ content\ selectors=管理内容選擇器
 Manage\ keywords=管理關鍵詞
 No\ rank\ information=沒有評分資訊
 Quality=品質
@@ -780,7 +773,6 @@ Please\ specify\ a\ hostname=請指定主機位址
 Proxy\ configuration=代理伺服器設定
 Use\ custom\ proxy\ configuration=使用自訂代理伺服器
 Proxy\ requires\ authentication=代理伺服器需要認證
-Attention\:\ Password\ is\ stored\ in\ plain\ text\!=注意：密碼將以明文形式存放！
 Check\ Proxy\ Setting=檢查代理設定
 Check\ connection=檢查連接
 Connection\ failed\!=連線失敗！
@@ -817,6 +809,8 @@ Select\ export\ format=選擇匯出格式
 
 
 
+
+
 Push\ to\ application=推送到應用程式
 Save\ all=全部儲存
 Copy\ preview=複製預覽
@@ -833,6 +827,10 @@ Reset\ preferences=重置設定
 
 
 
+Main\ file\ directory=主要文件目錄
+
+
+
 
 
 
@@ -942,7 +940,6 @@ Host/Port\:=位址 / 端口
 User\:=使用者：
 Password\:=密碼：
 Customize\ Export\ Formats=匯出格式
-Field\ name\:=欄位名稱：
 Keyword\ separator=關鍵詞分隔符號
 Export\ all\ entries=匯出所有條目
 Generate\ citation\ keys=生成引用鍵值
@@ -967,13 +964,8 @@ Set\ rank\ to\ five=設定評分為 5 級
 Order=順序
 
 
-Affected\ fields\:=影響欄位\:
 Show\ preview\ as\ a\ tab\ in\ entry\ editor=在條目編輯器中以分頁形式顯示預覽
-Font=字型
 Visual\ theme=界面主題
-Light\ theme=亮色主題
-Dark\ theme=暗色主題
-Custom\ theme=自訂主題
 Font\ settings=字型設定
 Please\ specify\ a\ css\ theme\ file.=請指定一個 css 主題檔案。
 Reset\ All=重設全部
@@ -1011,7 +1003,6 @@ An\ alias\ for\ "Online",\ provided\ for\ jurabib\ compatibility.=「線上資
 
 Display\ count\ of\ items\ in\ group=顯示群組中的項目數量
 Remove\ the\ following\ characters\:=刪除以下字元：
-Close=關閉
 Close\ all=全部關閉
 Reveal\ in\ file\ explorer=在檔案總管中顯示
 
@@ -1026,7 +1017,6 @@ Next\ preview\ style=下一個預覽樣式
 Previous\ preview\ style=上一個預覽樣式
 
 (\ Note\:\ Press\ return\ to\ commit\ changes\ in\ the\ table\!\ )=( 注意：按返回键提交表格中的修改！ )
-Reset=重設
 Reset\ entry\ types\ and\ fields\ to\ defaults=將條目類型和欄位重置為預設值
 This\ will\ reset\ all\ entry\ types\ to\ their\ default\ values\ and\ remove\ all\ custom\ entry\ types=這將會把所有的條目類型重置為預設值，並且刪除所有自定義的條目類型。
 Replace\ tabs\ with\ space=將製表符（Tabs）取代為空格。
@@ -1045,6 +1035,7 @@ Error\ importing.\ See\ the\ error\ log\ for\ details.=匯入錯誤。詳細內
 
 
 
+
 Custom\ DOI\ URI=自訂 DOI 統一資源標識符 (URI)
 Use\ custom\ DOI\ base\ URI\ for\ article\ access=使用自訂的 DOI 基礎網址訪問文章
 
@@ -1084,6 +1075,12 @@ Select\ directory=選擇資料夾
 
 
 
+
+
+
+
+
+
 
 
 
diff --git a/src/main/resources/protectedterms/computer_science.terms b/src/main/resources/protectedterms/computer_science.terms
new file mode 100644
index 00000000000..936df3b7ebc
--- /dev/null
+++ b/src/main/resources/protectedterms/computer_science.terms
@@ -0,0 +1,6 @@
+BibTeX
+BPEL
+BPMN
+JabRef
+LaTeX
+OpenTOSCA
diff --git a/src/main/resources/tinylog.properties b/src/main/resources/tinylog.properties
index 5347cea4ca5..cf24494f6ba 100644
--- a/src/main/resources/tinylog.properties
+++ b/src/main/resources/tinylog.properties
@@ -7,5 +7,6 @@ writerAzure = application insights
 exception = strip: jdk.internal
 
 #level@org.jabref.model.entry.BibEntry = debug
+level@org.jabref.gui.maintable.PersistenceVisualStateTable = debug
 
 level@org.jabref.http.server.Server = debug
diff --git a/src/main/resources/xjc/endnote/endnote.xsd b/src/main/resources/xjc/endnote/endnote.xsd
deleted file mode 100644
index 1367fdf433d..00000000000
--- a/src/main/resources/xjc/endnote/endnote.xsd
+++ /dev/null
@@ -1,790 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-    <xs:element name="xml">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="records"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="records">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element maxOccurs="unbounded" ref="record"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="record">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="database"/>
-                <xs:element minOccurs="0" ref="source-app"/>
-                <xs:element minOccurs="0" ref="rec-number"/>
-                <xs:element minOccurs="0" ref="ref-type"/>
-                <xs:element minOccurs="0" ref="contributors"/>
-                <xs:element minOccurs="0" ref="auth-address"/>
-                <xs:element minOccurs="0" ref="auth-affiliaton"/>
-                <xs:element minOccurs="0" ref="titles"/>
-                <xs:element minOccurs="0" ref="periodical"/>
-                <xs:element minOccurs="0" ref="pages"/>
-                <xs:element minOccurs="0" ref="volume"/>
-                <xs:element minOccurs="0" ref="number"/>
-                <xs:element minOccurs="0" ref="issue"/>
-                <xs:element minOccurs="0" ref="secondary-volume"/>
-                <xs:element minOccurs="0" ref="secondary-issue"/>
-                <xs:element minOccurs="0" ref="num-vols"/>
-                <xs:element minOccurs="0" ref="edition"/>
-                <xs:element minOccurs="0" ref="section"/>
-                <xs:element minOccurs="0" ref="reprint-edition"/>
-                <xs:element minOccurs="0" ref="reprint-status"/>
-                <xs:element minOccurs="0" ref="keywords"/>
-                <xs:element minOccurs="0" ref="dates"/>
-                <xs:element minOccurs="0" ref="pub-location"/>
-                <xs:element minOccurs="0" ref="publisher"/>
-                <xs:element minOccurs="0" ref="orig-pub"/>
-                <xs:element minOccurs="0" ref="isbn"/>
-                <xs:element minOccurs="0" ref="accession-num"/>
-                <xs:element minOccurs="0" ref="call-num"/>
-                <xs:element minOccurs="0" ref="report-id"/>
-                <xs:element minOccurs="0" ref="coden"/>
-                <xs:element minOccurs="0" ref="electronic-resource-num"/>
-                <xs:element minOccurs="0" ref="abstract"/>
-                <xs:element minOccurs="0" ref="label"/>
-                <xs:element minOccurs="0" ref="image"/>
-                <xs:element minOccurs="0" ref="caption"/>
-                <xs:element minOccurs="0" ref="notes"/>
-                <xs:element minOccurs="0" ref="research-notes"/>
-                <xs:element minOccurs="0" ref="work-type"/>
-                <xs:element minOccurs="0" ref="reviewed-item"/>
-                <xs:element minOccurs="0" ref="availability"/>
-                <xs:element minOccurs="0" ref="remote-source"/>
-                <xs:element minOccurs="0" ref="meeting-place"/>
-                <xs:element minOccurs="0" ref="work-location"/>
-                <xs:element minOccurs="0" ref="work-extent"/>
-                <xs:element minOccurs="0" ref="pack-method"/>
-                <xs:element minOccurs="0" ref="size"/>
-                <xs:element minOccurs="0" ref="repro-ratio"/>
-                <xs:element minOccurs="0" ref="remote-database-name"/>
-                <xs:element minOccurs="0" ref="remote-database-provider"/>
-                <xs:element minOccurs="0" ref="language"/>
-                <xs:element minOccurs="0" ref="urls"/>
-                <xs:element minOccurs="0" ref="access-date"/>
-                <xs:element minOccurs="0" ref="modified-date"/>
-                <xs:element minOccurs="0" ref="custom1"/>
-                <xs:element minOccurs="0" ref="custom2"/>
-                <xs:element minOccurs="0" ref="custom3"/>
-                <xs:element minOccurs="0" ref="custom4"/>
-                <xs:element minOccurs="0" ref="custom5"/>
-                <xs:element minOccurs="0" ref="custom6"/>
-                <xs:element minOccurs="0" ref="custom7"/>
-                <xs:element minOccurs="0" ref="misc1"/>
-                <xs:element minOccurs="0" ref="misc2"/>
-                <xs:element minOccurs="0" ref="misc3"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="database">
-        <xs:complexType mixed="true">
-            <xs:attribute name="name"/>
-            <xs:attribute name="path"/>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="source-app">
-        <xs:complexType mixed="true">
-            <xs:attribute name="name"/>
-            <xs:attribute name="version"/>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="rec-number" type="xs:string"/>
-    <xs:element name="ref-type">
-        <xs:complexType mixed="true">
-            <xs:attribute name="name" use="required"/>
-        </xs:complexType>
-    </xs:element>
-    <!-- Author information -->
-    <xs:element name="contributors">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="authors"/>
-                <xs:element minOccurs="0" ref="secondary-authors"/>
-                <xs:element minOccurs="0" ref="tertiary-authors"/>
-                <xs:element minOccurs="0" ref="subsidiary-authors"/>
-                <xs:element minOccurs="0" ref="translated-authors"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="authors">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element maxOccurs="unbounded" ref="author"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="secondary-authors">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element maxOccurs="unbounded" ref="author"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="tertiary-authors">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element maxOccurs="unbounded" ref="author"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="subsidiary-authors">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element maxOccurs="unbounded" ref="author"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="translated-authors">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element maxOccurs="unbounded" ref="author"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="author">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-            <xs:attribute name="corp-name"/>
-            <xs:attribute name="first-name"/>
-            <xs:attribute name="initials"/>
-            <xs:attribute name="last-name"/>
-            <xs:attribute name="middle-initial"/>
-            <xs:attribute name="role"/>
-            <xs:attribute name="salutation"/>
-            <xs:attribute name="suffix"/>
-            <xs:attribute name="title"/>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="auth-address">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="auth-affiliaton">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <!-- Title information -->
-    <xs:element name="titles">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="title"/>
-                <xs:element minOccurs="0" ref="secondary-title"/>
-                <xs:element minOccurs="0" ref="tertiary-title"/>
-                <xs:element minOccurs="0" ref="alt-title"/>
-                <xs:element minOccurs="0" ref="short-title"/>
-                <xs:element minOccurs="0" ref="translated-title"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="title">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" maxOccurs="unbounded" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="secondary-title">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="tertiary-title">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="alt-title">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="short-title">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="translated-title">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <!-- Periodical information -->
-    <xs:element name="periodical">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="full-title"/>
-                <xs:element minOccurs="0" ref="abbr-1"/>
-                <xs:element minOccurs="0" ref="abbr-2"/>
-                <xs:element minOccurs="0" ref="abbr-3"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="full-title">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="abbr-1">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="abbr-2">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="abbr-3">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <!-- Page range information -->
-    <xs:element name="pages">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-            <xs:attribute name="end"/>
-            <xs:attribute name="start"/>
-        </xs:complexType>
-    </xs:element>
-    <!-- Volume, issue, and edition information -->
-    <xs:element name="volume">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="number">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="issue">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="secondary-volume">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="secondary-issue">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="num-vols">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="edition">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="section">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="reprint-edition">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="reprint-status">
-        <xs:complexType>
-            <xs:attribute name="date"/>
-            <xs:attribute name="status" use="required">
-                <xs:simpleType>
-                    <xs:restriction base="xs:token">
-                        <xs:enumeration value="in-file"/>
-                        <xs:enumeration value="no-file"/>
-                        <xs:enumeration value="on-request"/>
-                    </xs:restriction>
-                </xs:simpleType>
-            </xs:attribute>
-        </xs:complexType>
-    </xs:element>
-    <!-- Keywords -->
-    <xs:element name="keywords">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element maxOccurs="unbounded" ref="keyword"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="keyword">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <!-- Date information -->
-    <xs:element name="dates">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="year"/>
-                <xs:element minOccurs="0" ref="pub-dates"/>
-                <xs:element minOccurs="0" ref="copyright-dates"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="year">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-            <xs:attribute name="day"/>
-            <xs:attribute name="julian"/>
-            <xs:attribute name="month"/>
-            <xs:attribute name="year"/>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="pub-dates">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element maxOccurs="unbounded" ref="date"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="copyright-dates">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element maxOccurs="unbounded" ref="date"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="date">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-            <xs:attribute name="day"/>
-            <xs:attribute name="julian"/>
-            <xs:attribute name="month"/>
-            <xs:attribute name="year"/>
-        </xs:complexType>
-    </xs:element>
-    <!-- Publisher information -->
-    <xs:element name="pub-location">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="publisher">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="orig-pub">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <!-- Identifying numbers -->
-    <xs:element name="isbn">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="accession-num">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="call-num">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="report-id">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="coden">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="electronic-resource-num">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <!-- Abstract, notes, images, etc. -->
-    <xs:element name="abstract">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="label">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="image">
-        <xs:complexType mixed="true">
-            <xs:attribute name="file"/>
-            <xs:attribute name="name"/>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="caption">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="notes">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="research-notes">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <!-- Other detailed information on item -->
-    <xs:element name="work-type">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="reviewed-item">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="availability">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="remote-source">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="meeting-place">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="work-location">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="work-extent">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="pack-method">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="size">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="repro-ratio">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="remote-database-name">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="remote-database-provider">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="language">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <!-- URL information -->
-    <xs:element name="urls">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="web-urls"/>
-                <xs:element minOccurs="0" ref="pdf-urls"/>
-                <xs:element minOccurs="0" ref="text-urls"/>
-                <xs:element minOccurs="0" ref="related-urls"/>
-                <xs:element minOccurs="0" ref="image-urls"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="web-urls">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element maxOccurs="unbounded" ref="url"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="pdf-urls">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element maxOccurs="unbounded" ref="url"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="text-urls">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element maxOccurs="unbounded" ref="url"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="related-urls">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element maxOccurs="unbounded" ref="url"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="image-urls">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element maxOccurs="unbounded" ref="url"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="url">
-        <xs:complexType mixed="true">
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-            <xs:attribute name="has-ut">
-                <xs:simpleType>
-                    <xs:restriction base="xs:token">
-                        <xs:enumeration value="yes"/>
-                        <xs:enumeration value="no"/>
-                    </xs:restriction>
-                </xs:simpleType>
-            </xs:attribute>
-            <xs:attribute name="ppv-app"/>
-            <xs:attribute name="ppv-ref">
-                <xs:simpleType>
-                    <xs:restriction base="xs:token">
-                        <xs:enumeration value="yes"/>
-                        <xs:enumeration value="no"/>
-                    </xs:restriction>
-                </xs:simpleType>
-            </xs:attribute>
-            <xs:attribute name="ppv-ut"/>
-        </xs:complexType>
-    </xs:element>
-    <!-- Information about record -->
-    <xs:element name="access-date">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="modified-date">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <!-- Custom and miscellaneous fields -->
-    <xs:element name="custom1">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="custom2">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="custom3">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="custom4">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="custom5">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="custom6">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="custom7">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="misc1">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="misc2">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="misc3">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <!-- Styled text handling -->
-    <xs:element name="style">
-        <xs:complexType mixed="true">
-            <xs:attribute name="color"/>
-            <xs:attribute name="face" default="normal"/>
-            <xs:attribute name="font" default="default"/>
-            <xs:attribute name="size"/>
-        </xs:complexType>
-    </xs:element>
-</xs:schema>
diff --git a/src/main/resources/xjc/mods/mods-3-7.xsd b/src/main/resources/xjc/mods/mods-3-7.xsd
deleted file mode 100644
index 842cd27c626..00000000000
--- a/src/main/resources/xjc/mods/mods-3-7.xsd
+++ /dev/null
@@ -1,1486 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Editor:  Ray Denenberg, Library of Congress; rden@loc.gov -->
-<!-- -->
-<xs:schema xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://www.loc.gov/mods/v3" targetNamespace="http://www.loc.gov/mods/v3" elementFormDefault="qualified" attributeFormDefault="unqualified">
-	<!-- -->
-	<xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="xml.xsd"/>
-	<xs:import namespace="http://www.w3.org/1999/xlink" schemaLocation="xlink.xsd"/>
-	<!-- 
-MODS: Metadata Object Description Schema. See http://www.loc.gov/standards/mods/
-
-          ****************************************************************
-         *                                                                                
-         *                            MODS 3.7
-         *         
-         *                           January 4, 2018                 
-         *                    
-          *****************************************************************w
-
-***************************************************
-
-Changes in version 3.7
-1.	Capability added to supply an authority for a publisher. 
-2.	Controlled-list restriction removed from typeOfResource so that any value may be supplied. 
-3.	Capability added to supply  a calendar name for a date. 
-4.	Capability added to supply an alternative name for a name.
-
-***************************************************
-***************************************************
-
-
-
-     *************************************
-     Organization of this schema
-     *************************************
-
-The schema has three parts:
-
-1.   Structural declarations and definitions 
-2.    Elements (top level elements  and their subelements)
-3.   Auxiliary Definitions 
-
-         ***********************************************************************
-         ***********************************************************************
-         Part 1:    Structural Declarations and Definitions 
-         ***********************************************************************
-         ***********************************************************************
-- Definition of a single MODS record  and a MODS collection   
-- modsGroup, listing the top level MODS elements
-
-***********************************************************************
-**      Definition of a single MODS record                           **
-**********************************************************************
--->
-	<xs:element name="mods" type="modsDefinition"/>
-	<!--  -->
-	<xs:complexType name="modsDefinition">
-		<xs:group ref="modsGroup" maxOccurs="unbounded"/>
-		<xs:attribute name="ID" type="xs:ID"/>
-		<xs:attribute name="version">
-			<xs:simpleType>
-				<xs:restriction base="xs:string">
-					<xs:enumeration value="3.7"/>
-					<xs:enumeration value="3.6"/>
-					<xs:enumeration value="3.5"/>
-					<xs:enumeration value="3.4"/>
-					<xs:enumeration value="3.3"/>
-					<xs:enumeration value="3.2"/>
-					<xs:enumeration value="3.1"/>
-					<xs:enumeration value="3.0"/>
-				</xs:restriction>
-			</xs:simpleType>
-		</xs:attribute>
-	</xs:complexType>
-	<!-- 
-***********************************************************************
-**      Definition of a MODS collection                                **
-**********************************************************************
--->
-	<xs:element name="modsCollection" type="modsCollectionDefinition"/>
-	<!-- -->
-	<xs:complexType name="modsCollectionDefinition">
-		<xs:sequence>
-			<xs:element ref="mods" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--  
-
-************************************************
-**      Group Definition 
-***********************************************
-This forms the basis of the mods record definition, and also relatedItem. 
-The difference between a MODS record and a relatedItem 
-(as they pertain to their usage of the group definition) 
-is that mods requires at least one element and relatedItem does not. 
-The group definition is used by both, where relatedItem says 
-minOccurs="0" and for the mods record definition minOccurs="1" (default).
-
--->
-	<xs:group name="modsGroup">
-		<xs:choice>
-			<!-- 
-***********************************************************************
-**        These are the "top level" MODS elements               **
-**********************************************************************
--->
-			<xs:element ref="abstract"/>
-			<xs:element ref="accessCondition"/>
-			<xs:element ref="classification"/>
-			<xs:element ref="extension"/>
-			<xs:element ref="genre"/>
-			<xs:element ref="identifier"/>
-			<xs:element ref="language"/>
-			<xs:element ref="location"/>
-			<xs:element ref="name"/>
-			<xs:element ref="note"/>
-			<xs:element ref="originInfo"/>
-			<xs:element ref="part"/>
-			<xs:element ref="physicalDescription"/>
-			<xs:element ref="recordInfo"/>
-			<xs:element ref="relatedItem"/>
-			<xs:element ref="subject"/>
-			<xs:element ref="tableOfContents"/>
-			<xs:element ref="targetAudience"/>
-			<xs:element ref="titleInfo"/>
-			<xs:element ref="typeOfResource"/>
-			<!-- 
-End list of "top level" MODS elements 
--->
-		</xs:choice>
-	</xs:group>
-	<!--	
-        ***********************************************************************
-        ***********************************************************************
-       Part 2:   Elements (top level elements and their subelements)                               
-       ************************************************************************
-        ***********************************************************************                              
--->
-	<!--   
-*********************************************
-*   Top Level Element <abstract>       *
-*********************************************
- -->
-	<xs:element name="abstract" type="abstractDefinition"/>
-	<!-- -->
-	<xs:complexType name="abstractDefinition">
-		<xs:simpleContent>
-			<xs:extension base="stringPlusLanguage">
-				<xs:attribute name="displayLabel" type="xs:string"/>
-				<xs:attribute name="type" type="xs:string"/>
-				<xs:attributeGroup ref="xlink:simpleLink"/>
-				<xs:attribute name="shareable" fixed="no"/>
-				<xs:attribute name="altRepGroup" type="xs:string"/>
-				<xs:attributeGroup ref="altFormatAttributeGroup"/>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<!--
-
-****************************************************
-*   Top Level Element <accessCondition>       *
-*****************************************************
- -->
-	<xs:element name="accessCondition" type="accessConditionDefinition"/>
-	<!-- -->
-	<xs:complexType name="accessConditionDefinition" mixed="true">
-		<xs:complexContent mixed="true">
-			<xs:extension base="extensionDefinition">
-				<xs:attributeGroup ref="xlink:simpleLink"/>
-				<xs:attributeGroup ref="languageAttributeGroup"/>
-				<xs:attribute name="type" type="xs:string"/>
-				<xs:attribute name="altRepGroup" type="xs:string"/>
-				<xs:attributeGroup ref="altFormatAttributeGroup"/>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<!--
-****************************************************
-*   Top Level Element <classification>          *
-*****************************************************
--->
-	<xs:element name="classification" type="classificationDefinition"/>
-	<!-- -->
-	<xs:complexType name="classificationDefinition">
-		<xs:simpleContent>
-			<xs:extension base="stringPlusLanguagePlusAuthority">
-				<xs:attribute name="edition" type="xs:string"/>
-				<xs:attribute name="displayLabel" type="xs:string"/>
-				<xs:attribute name="altRepGroup" type="xs:string"/>
-				<xs:attribute name="usage" fixed="primary"/>
-				<xs:attribute name="generator" type="xs:string"/>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<!--
-****************************************************
-*   Top Level Element <extension>              *
-*****************************************************
- -->
-	<xs:element name="extension" type="extensionDefinition"/>
-	<!-- -->
-	<xs:complexType name="extensionDefinition" mixed="true">
-		<xs:sequence>
-			<xs:any processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:attribute name="displayLabel" type="xs:string"/>
-	</xs:complexType>
-	<!--  
-****************************************************
-*   Top Level Element <genre>                    *
-*****************************************************
--->
-	<xs:element name="genre" type="genreDefinition"/>
-	<!-- -->
-	<xs:complexType name="genreDefinition">
-		<xs:simpleContent>
-			<xs:extension base="stringPlusLanguagePlusAuthority">
-				<xs:attribute name="type" type="xs:string"/>
-				<xs:attribute name="displayLabel" type="xs:string"/>
-				<xs:attribute name="altRepGroup" type="xs:string"/>
-				<xs:attribute name="usage" fixed="primary"/>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<!--
-****************************************************
-*   Top Level Element <identifier>                  *
-*****************************************************
--->
-	<xs:element name="identifier" type="identifierDefinition"/>
-	<!-- -->
-	<xs:complexType name="identifierDefinition">
-		<xs:simpleContent>
-			<xs:extension base="stringPlusLanguage">
-				<xs:attribute name="displayLabel" type="xs:string"/>
-				<xs:attribute name="type" type="xs:string"/>
-				<xs:attribute name="typeURI" type="xs:anyURI"/>
-				<xs:attribute name="invalid" fixed="yes"/>
-				<xs:attribute name="altRepGroup" type="xs:string"/>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<!--  
-****************************************************
-*   Top Level Element <language>                *
-*****************************************************
--->
-	<xs:element name="language" type="languageDefinition"/>
-	<!-- -->
-	<xs:complexType name="languageDefinition">
-		<xs:sequence>
-			<xs:element ref="languageTerm" maxOccurs="unbounded"/>
-			<xs:element ref="scriptTerm" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:attribute name="objectPart" type="xs:string"/>
-		<xs:attributeGroup ref="languageAttributeGroup"/>
-		<xs:attribute name="displayLabel" type="xs:string"/>
-		<xs:attribute name="altRepGroup" type="xs:string"/>
-		<xs:attribute name="usage" fixed="primary"/>
-	</xs:complexType>
-	<!--
-
-********   Subordinate Elements for <language>                
- -->
-	<xs:element name="languageTerm" type="languageTermDefinition"/>
-	<!-- -->
-	<xs:complexType name="languageTermDefinition">
-		<xs:simpleContent>
-			<xs:extension base="stringPlusLanguage">
-				<xs:attribute name="authorityURI" type="xs:anyURI"/>
-				<xs:attribute name="valueURI" type="xs:anyURI"/>
-				<xs:attribute name="authority">
-					<xs:simpleType>
-						<xs:restriction base="xs:string">
-							<xs:enumeration value="rfc3066"/>
-							<xs:enumeration value="iso639-2b"/>
-							<xs:enumeration value="iso639-3"/>
-							<xs:enumeration value="rfc4646"/>
-							<xs:enumeration value="rfc5646"/>
-							<!-- -->
-						</xs:restriction>
-					</xs:simpleType>
-				</xs:attribute>
-				<xs:attribute name="type" type="codeOrText"/>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<!-- 
-*****************scriptTerm ************************
--->
-	<xs:element name="scriptTerm" type="scriptTermDefinition"/>
-	<!-- -->
-	<xs:complexType name="scriptTermDefinition">
-		<xs:simpleContent>
-			<xs:extension base="stringPlusLanguagePlusAuthority">
-				<xs:attribute name="type" type="codeOrText"/>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<!--
-
-****************************************************
-*   Top Level Element <location>                 *
-*****************************************************         
- -->
-	<xs:element name="location" type="locationDefinition"/>
-	<!-- -->
-	<xs:complexType name="locationDefinition">
-		<xs:sequence>
-			<xs:element ref="physicalLocation" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element ref="shelfLocator" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element ref="url" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element ref="holdingSimple" minOccurs="0"/>
-			<xs:element ref="holdingExternal" minOccurs="0"/>
-		</xs:sequence>
-		<xs:attributeGroup ref="languageAttributeGroup"/>
-		<xs:attribute name="displayLabel" type="xs:string"/>
-		<xs:attribute name="altRepGroup" type="xs:string"/>
-	</xs:complexType>
-	<!--
-
-********   Subordinate Elements for <location>                
- -->
-	<!--	  
-********** physicalLocation **********         
--->
-	<xs:element name="physicalLocation" type="physicalLocationDefinition"/>
-	<!-- -->
-	<xs:complexType name="physicalLocationDefinition">
-		<xs:simpleContent>
-			<xs:extension base="stringPlusLanguagePlusAuthority">
-				<xs:attributeGroup ref="xlink:simpleLink"/>
-				<xs:attribute name="displayLabel" type="xs:string"/>
-				<xs:attribute name="type" type="xs:string"/>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<!-- -->
-	<xs:element name="shelfLocator" type="stringPlusLanguage"/>
-	<!--  
-********** holdingSimple **********      
- -->
-	<xs:element name="holdingSimple" type="holdingSimpleDefinition"/>
-	<!-- -->
-	<xs:complexType name="holdingSimpleDefinition">
-		<xs:sequence>
-			<xs:element ref="copyInformation" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--
-**********copyInformation **********     
- -->
-	<xs:element name="copyInformation" type="copyInformationDefinition"/>
-	<!-- -->
-	<xs:complexType name="copyInformationDefinition">
-		<xs:sequence>
-			<xs:element ref="form" minOccurs="0"/>
-			<xs:element ref="subLocation" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element ref="shelfLocator" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element ref="electronicLocator" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="note" minOccurs="0" maxOccurs="unbounded">
-				<xs:complexType>
-					<xs:simpleContent>
-						<xs:extension base="stringPlusLanguage">
-							<xs:attribute name="displayLabel" type="xs:string"/>
-							<xs:attribute name="type" type="xs:string"/>
-							<xs:attributeGroup ref="xlink:simpleLink"/>
-							<xs:attribute name="ID" type="xs:ID"/>
-						</xs:extension>
-					</xs:simpleContent>
-				</xs:complexType>
-			</xs:element>
-			<xs:element ref="enumerationAndChronology" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element ref="itemIdentifier" minOccurs="0" maxOccurs="unbounded"/>
-			<!--	-->
-		</xs:sequence>
-	</xs:complexType>
-	<!--
-**********itemIdentifier **********     
- -->
-		<xs:element name="itemIdentifier" type="itemIdentifierDefinition"/>
-			<xs:complexType name="itemIdentifierDefinition">
-				<xs:simpleContent>
-					<xs:extension base="stringPlusLanguage">
-						<xs:attribute name="type" type="xs:string"/>
-					</xs:extension>
-				</xs:simpleContent>
-			</xs:complexType>
-	<!--
-**********form**********     
- -->
-	<xs:element name="form" type="formDefinition"/>
-	<!-- -->
-	<xs:complexType name="formDefinition">
-		<xs:simpleContent>
-			<xs:extension base="stringPlusLanguagePlusAuthority">
-				<xs:attribute name="type" type="xs:string"/>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<!-- -->
-	<xs:element name="subLocation" type="stringPlusLanguage"/>
-	<xs:element name="electronicLocator" type="stringPlusLanguage"/>
-	<!--  
-**********enumerationAndChronology  **********     
-     -->
-	<xs:element name="enumerationAndChronology" type="enumerationAndChronologyDefinition"/>
-	<!-- -->
-	<xs:complexType name="enumerationAndChronologyDefinition">
-		<xs:simpleContent>
-			<xs:extension base="stringPlusLanguage">
-				<xs:attribute name="unitType">
-					<xs:simpleType>
-						<xs:restriction base="xs:string">
-							<xs:enumeration value="1"/>
-							<xs:enumeration value="2"/>
-							<xs:enumeration value="3"/>
-						</xs:restriction>
-					</xs:simpleType>
-				</xs:attribute>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<!--
- ********** url  **********        
-     -->
-	<xs:element name="url" type="urlDefinition"/>
-	<!-- -->
-	<xs:complexType name="urlDefinition">
-		<xs:simpleContent>
-			<xs:extension base="xs:anyURI">
-				<xs:attribute name="dateLastAccessed" type="xs:string"/>
-				<xs:attribute name="displayLabel" type="xs:string"/>
-				<xs:attribute name="note" type="xs:string"/>
-				<xs:attribute name="access">
-					<xs:simpleType>
-						<xs:restriction base="xs:string">
-							<xs:enumeration value="preview"/>
-							<xs:enumeration value="raw object"/>
-							<xs:enumeration value="object in context"/>
-						</xs:restriction>
-					</xs:simpleType>
-				</xs:attribute>
-				<xs:attribute name="usage">
-					<xs:simpleType>
-						<xs:restriction base="xs:string">
-							<xs:enumeration value="primary display"/>
-							<xs:enumeration value="primary"/>
-						</xs:restriction>
-					</xs:simpleType>
-				</xs:attribute>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<!-- -->
-	<xs:element name="holdingExternal" type="extensionDefinition"/>
-	<!-- 
-****************************************************
-*   Top Level Element <name>                 *
-*****************************************************         
--->
-	<xs:element name="name" type="nameDefinition"/>
-	<!-- -->
-	<xs:complexType name="nameDefinition">
-		<xs:choice>
-			
-			<!-- this choice gives two ways to do this.  
-				The second way allows the element <etal>,  to express "et. al."
-
-Choice one. WITHOUT <etal>.
--->
-			<xs:choice minOccurs="0" maxOccurs="unbounded">
-				<xs:element ref="namePart"/>
-				<xs:element ref="displayForm"/>
-				<xs:element ref="affiliation"/>
-				<xs:element ref="role"/>
-				<xs:element ref="description"/>
-				<xs:element ref="nameIdentifier"/>
-				<!-- 
-				The following,alternativeName, is new in 3.7-->
-				<xs:element ref="alternativeName"/>				
-		<!--   -->		
-			</xs:choice>
-			<!-- 
-Choice two.	With <etal>.
-               The presence of <etal> indicates that there are names that cannot 
-               be explicitily included. It may be empty, or it may have simple content
-               - e.g. <etal>et al.</etal>.  In the latter case the content is what is 
-               suggested for display. 
-               When <etal> occurs:
-                  - <namePart>, <displayForm>, and <identifier> MAY NOT occur;
-                  - <affiliation>, <role>, <description>   MAY occur (but are NOT repeatable).
-              <etal> is not repeatable within a given <name>, however there may be 
-              mutilple <etal> elements, each within in a separate <name> element.
--->
-			<xs:sequence>
-				<!--   
-             <etal> is mandatory, nonrepeatable, and must occur first. 
-            After that <affiliation>, <role>, and <description> may occur, in any order or number. 
-            <nameIdentifier> is not used with <etal>
--->
-				<xs:element ref="etal"/>
-				<xs:choice minOccurs="0" maxOccurs="unbounded">
-					<xs:element ref="affiliation"/>
-					<xs:element ref="role"/>
-					<xs:element ref="description"/>
-				</xs:choice>
-			</xs:sequence>
-			<!-- -->
-		</xs:choice>
-		<xs:attribute name="ID" type="xs:ID"/>
-		<xs:attributeGroup ref="authorityAttributeGroup"/>
-		<xs:attributeGroup ref="xlink:simpleLink"/>
-		<xs:attributeGroup ref="languageAttributeGroup"/>
-		<xs:attribute name="displayLabel" type="xs:string"/>
-		<xs:attribute name="altRepGroup" type="xs:string"/>
-		<xs:attribute name="nameTitleGroup" type="xs:string"/>
-		<xs:attribute name="usage" fixed="primary"/>
-		<xs:attribute name="type">
-			<xs:simpleType>
-				<xs:restriction base="xs:string">
-					<xs:enumeration value="personal"/>
-					<xs:enumeration value="corporate"/>
-					<xs:enumeration value="conference"/>
-					<xs:enumeration value="family"/>
-				</xs:restriction>
-			</xs:simpleType>
-		</xs:attribute>
-	</xs:complexType>
-	<!--
-
-********   Subordinate Elements for <name>                
- -->
-	<!-- namePart-->
-	<xs:element name="namePart" type="namePartDefinition"/>
-	<!-- -->
-	<xs:complexType name="namePartDefinition">
-		<xs:simpleContent>
-			<xs:extension base="stringPlusLanguage">
-				<xs:attribute name="type">
-					<xs:simpleType>
-						<xs:restriction base="xs:string">
-							<xs:enumeration value="date"/>
-							<xs:enumeration value="family"/>
-							<xs:enumeration value="given"/>
-							<xs:enumeration value="termsOfAddress"/>
-						</xs:restriction>
-					</xs:simpleType>
-				</xs:attribute>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<!-- displayForm, affiliation, description, alternativeName -->
-	<xs:element name="displayForm" type="stringPlusLanguage"/>
-	<xs:element name="affiliation" type="stringPlusLanguage"/>
-	<xs:element name="description" type="stringPlusLanguage"/>
-	<xs:element name="nameIdentifier" type="identifierDefinition"/>
-	<!-- the following element, alternativeName, is new in 3.7 -->
-	<xs:element name="alternativeName" type="alternativeNameDefinition"/>
-
-	<!--  
-******** role *********************
-    -->
-	<xs:element name="role" type="roleDefinition"/>
-	<!-- -->
-	<xs:complexType name="roleDefinition">
-		<xs:sequence maxOccurs="unbounded">
-			<xs:element ref="roleTerm"/>
-		</xs:sequence>
-	</xs:complexType>
-	<!--  
-***************roleTerm *********************** 
-    -->
-	<xs:element name="roleTerm" type="roleTermDefinition"/>
-	<!-- -->
-	<xs:complexType name="roleTermDefinition">
-		<xs:simpleContent>
-			<xs:extension base="stringPlusLanguagePlusAuthority">
-				<xs:attribute name="type" type="codeOrText"/>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<!-- 
-********  etal  ********
--->
-	<xs:element name="etal" type="stringPlusLanguage"/>
-	<!--   
-********  alternativeName  ********
-******************** new in 3.7 ****************************
--->
-<xs:complexType name="alternativeNameDefinition">
-
-			<xs:choice minOccurs="0" maxOccurs="unbounded">
-				<xs:element ref="namePart"/>
-				<xs:element ref="displayForm"/>
-				<xs:element ref="affiliation"/>
-				<xs:element ref="role"/>
-				<xs:element ref="description"/>
-				<xs:element ref="nameIdentifier"/>				
-		</xs:choice>
-			<!-- -->
-		<xs:attributeGroup ref="xlink:simpleLink"/>
-		<xs:attributeGroup ref="languageAttributeGroup"/>
-		<xs:attribute name="displayLabel" type="xs:string"/>
-		<xs:attribute name="altType" type="xs:string"/>
-</xs:complexType>
-	
-	<!--
-
-****************************************************
-*   Top Level Element <note>                      *
-*****************************************************         
--->
-	<xs:element name="note" type="noteDefinition"/>
-	<!-- -->
-	<xs:complexType name="noteDefinition">
-		<xs:simpleContent>
-			<xs:extension base="stringPlusLanguage">
-				<xs:attribute name="displayLabel" type="xs:string"/>
-				<xs:attribute name="type" type="xs:string"/>
-				<xs:attribute name="typeURI" type="xs:anyURI"/>
-				<xs:attributeGroup ref="xlink:simpleLink"/>
-				<xs:attribute name="ID" type="xs:ID"/>
-				<xs:attribute name="altRepGroup" type="xs:string"/>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<!--  
-
-****************************************************
-*   Top Level Element <originInfo>                 *
-*****************************************************         
--->
-	<xs:element name="originInfo" type="originInfoDefinition"/>
-	<!-- -->
-	<xs:complexType name="originInfoDefinition">
-		<xs:choice maxOccurs="unbounded">
-			<xs:element ref="place"/>
-			<xs:element ref="publisher"/>
-			<xs:element ref="dateIssued"/>
-			<xs:element ref="dateCreated"/>
-			<xs:element ref="dateCaptured"/>
-			<xs:element ref="dateValid"/>
-			<xs:element ref="dateModified"/>
-			<xs:element ref="copyrightDate"/>
-			<xs:element ref="dateOther"/>
-			<xs:element ref="edition"/>
-			<xs:element ref="issuance"/>
-			<xs:element ref="frequency"/>
-		</xs:choice>
-		<xs:attributeGroup ref="languageAttributeGroup"/>
-		<xs:attribute name="displayLabel" type="xs:string"/>
-		<xs:attribute name="altRepGroup" type="xs:string"/>
-		<xs:attribute name="eventType" type="xs:string"/>
-	</xs:complexType>
-	<!--
-
-********   Subordinate Elements for <originInfo>                
- -->
-	<!-- 
-*** place ***
--->
-	<xs:element name="place" type="placeDefinition"/>
-	<!-- -->
-	<xs:complexType name="placeDefinition">
-		<xs:sequence>
-			<xs:element ref="placeTerm" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:attribute name="supplied" fixed="yes"/>
-	</xs:complexType>
-	<!-- 
-*** placeTerm ***
--->
-	<xs:element name="placeTerm" type="placeTermDefinition"/>
-	<!-- -->
-	<xs:complexType name="placeTermDefinition">
-		<xs:simpleContent>
-			<xs:extension base="stringPlusLanguage">
-				<xs:attribute name="authorityURI" type="xs:anyURI"/>
-				<xs:attribute name="valueURI" type="xs:anyURI"/>
-				<xs:attribute name="authority">
-					<xs:simpleType>
-						<xs:restriction base="xs:string">
-							<xs:enumeration value="marcgac"/>
-							<xs:enumeration value="marccountry"/>
-							<xs:enumeration value="iso3166"/>
-						</xs:restriction>
-					</xs:simpleType>
-				</xs:attribute>
-				<xs:attribute name="type" type="codeOrText"/>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<!-- 
-*** publisher ***
--->
-	<xs:element name="publisher" type="publisherDefinition"/> 
-<!--     ******************* definition changed in 3.7 *******************
-		****** in 3.6, publisher was defined as stringPlusLanguagePlusSupplied
-		****** in 3.7, the authority attributes are added
--->		
-	<xs:complexType  name="publisherDefinition">
-		<xs:simpleContent>
-			<xs:extension base="stringPlusLanguagePlusSupplied">
-				<xs:attributeGroup ref="authorityAttributeGroup"/>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-
-	
-	
-	
-	
-	<!--  
-********** dates  **********  
--->
-	<xs:element name="dateIssued" type="dateDefinition"/>
-	<xs:element name="dateCreated" type="dateDefinition"/>
-	<xs:element name="dateCaptured" type="dateDefinition"/>
-	<xs:element name="dateValid" type="dateDefinition"/>
-	<xs:element name="dateModified" type="dateDefinition"/>
-	<xs:element name="copyrightDate" type="dateDefinition"/>
-	<xs:element name="dateOther" type="dateOtherDefinition"/>
-	<!--  -->
-	<xs:complexType name="dateDefinition">
-		<xs:simpleContent>
-			<xs:extension base="stringPlusLanguage">
-				<xs:attribute name="encoding">
-					<xs:simpleType>
-						<xs:restriction base="xs:string">
-							<xs:enumeration value="w3cdtf"/>
-							<xs:enumeration value="iso8601"/>
-							<xs:enumeration value="marc"/>
-							<xs:enumeration value="temper"/>
-							<xs:enumeration value="edtf"/>
-						</xs:restriction>
-					</xs:simpleType>
-				</xs:attribute>
-				<xs:attribute name="qualifier">
-					<xs:simpleType>
-						<xs:restriction base="xs:string">
-							<xs:enumeration value="approximate"/>
-							<xs:enumeration value="inferred"/>
-							<xs:enumeration value="questionable"/>
-						</xs:restriction>
-					</xs:simpleType>
-				</xs:attribute>
-				<xs:attribute name="point">
-					<xs:simpleType>
-						<xs:restriction base="xs:string">
-							<xs:enumeration value="start"/>
-							<xs:enumeration value="end"/>
-						</xs:restriction>
-					</xs:simpleType>
-				</xs:attribute>
-				<xs:attribute name="keyDate" fixed="yes"/>
-				<!-- 
-				***********  Following attribute, @calendar, added in 3.7
-				-->
-				<xs:attribute name="calendar" type="xs:string"/>
-<!-- -->				
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<!--
-	********** dateOther  **********  
--->
-	<xs:complexType name="dateOtherDefinition">
-		<xs:simpleContent>
-			<xs:extension base="dateDefinition">
-				<xs:attribute name="type" type="xs:string"/>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<!--
-	********** edition **********  
--->
-	<xs:element name="edition" type="stringPlusLanguagePlusSupplied"/>
-	<!--  
-********** issuance **********  	
-       -->
-	<xs:element name="issuance" type="issuanceDefinition"/>
-	<!-- -->
-	<xs:simpleType name="issuanceDefinition">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="continuing"/>
-			<xs:enumeration value="monographic"/>
-			<xs:enumeration value="single unit"/>
-			<xs:enumeration value="multipart monograph"/>
-			<xs:enumeration value="serial"/>
-			<xs:enumeration value="integrating resource"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--
-	********** frequency**********  
--->
-	<xs:element name="frequency" type="stringPlusLanguagePlusAuthority"/>
-	<!--  
-
-****************************************************
-*   Top Level Element <part>                       *
-*****************************************************         
--->
-	<xs:element name="part" type="partDefinition"/>
-	<!-- -->
-	<xs:complexType name="partDefinition">
-		<xs:choice minOccurs="0" maxOccurs="unbounded">
-			<xs:element ref="detail"/>
-			<xs:element name="extent" type="extentDefinition"/>
-			<xs:element ref="date"/>
-			<xs:element ref="text"/>
-		</xs:choice>
-		<xs:attribute name="ID" type="xs:ID"/>
-		<xs:attribute name="type" type="xs:string"/>
-		<xs:attribute name="order" type="xs:integer"/>
-		<xs:attributeGroup ref="languageAttributeGroup"/>
-		<xs:attribute name="displayLabel" type="xs:string"/>
-		<xs:attribute name="altRepGroup" type="xs:string"/>
-	</xs:complexType>
-	<!--
-
-********   Subordinate Elements for <part>                
- -->
-	<!-- 
-********** detail **********  
--->
-	<xs:element name="detail" type="detailDefinition"/>
-	<!-- -->
-	<xs:complexType name="detailDefinition">
-		<xs:choice maxOccurs="unbounded">
-			<xs:element ref="number"/>
-			<xs:element ref="caption"/>
-			<xs:element ref="title"/>
-		</xs:choice>
-		<xs:attribute name="type" type="xs:string"/>
-		<xs:attribute name="level" type="xs:positiveInteger"/>
-	</xs:complexType>
-	<!-- -->
-	<xs:element name="number" type="stringPlusLanguage"/>
-	<xs:element name="caption" type="stringPlusLanguage"/>
-	<!-- 
-********** extent **********  
--->
-	<xs:complexType name="extentDefinition">
-		<xs:sequence>
-			<xs:element ref="start" minOccurs="0"/>
-			<xs:element ref="end" minOccurs="0"/>
-			<xs:element ref="total" minOccurs="0"/>
-			<xs:element ref="list" minOccurs="0"/>
-		</xs:sequence>
-		<xs:attribute name="unit" type="xs:string"/>
-	</xs:complexType>
-	<!-- -->
-	<xs:element name="start" type="stringPlusLanguage"/>
-	<xs:element name="end" type="stringPlusLanguage"/>
-	<xs:element name="total" type="xs:positiveInteger"/>
-	<xs:element name="list" type="stringPlusLanguage"/>
-	<!--
-***************** date *** 
--->
-	<xs:element name="date" type="dateDefinition"/>
-	<!--
-***************** text *** 
--->
-	<xs:element name="text">
-		<xs:complexType>
-			<xs:simpleContent>
-				<xs:extension base="stringPlusLanguage">
-					<xs:attribute name="displayLabel" type="xs:string"/>
-					<xs:attribute name="type" type="xs:string"/>
-					<xs:attributeGroup ref="xlink:simpleLink"/>
-				</xs:extension>
-			</xs:simpleContent>
-		</xs:complexType>
-	</xs:element>
-	<!--
-
-****************************************************
-*   Top Level Element <physicalDescription> *
-*****************************************************         
- -->
-	<xs:element name="physicalDescription" type="physicalDescriptionDefinition"/>
-	<!-- -->
-	<xs:complexType name="physicalDescriptionDefinition">
-		<xs:choice maxOccurs="unbounded">
-			<xs:element ref="form"/>
-			<!-- same definition as is used in copyInformation -->
-			<xs:element ref="reformattingQuality"/>
-			<xs:element ref="internetMediaType"/>
-			<xs:element ref="extent"/>
-			<xs:element ref="digitalOrigin"/>
-			<xs:element name="note" type="physicalDescriptionNote"/>
-		</xs:choice>
-		<xs:attributeGroup ref="languageAttributeGroup"/>
-		<xs:attribute name="displayLabel" type="xs:string"/>
-		<xs:attribute name="altRepGroup" type="xs:string"/>
-	</xs:complexType>
-	<!--
-
-********   Subordinate Elements for <physicalDescription>                
- -->
-	<!-- 
-**********reformattingQuality **********  		 
- -->
-	<xs:element name="reformattingQuality" type="reformattingQualityDefinition"/>
-	<!-- -->
-	<xs:simpleType name="reformattingQualityDefinition">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="access"/>
-			<xs:enumeration value="preservation"/>
-			<xs:enumeration value="replacement"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!-- 
-**********internetMediaType **********  		 
- -->
-	<xs:element name="internetMediaType" type="stringPlusLanguage"/>
-	<!--
-********** extent **********  	
- -->
-	<xs:element name="extent">
-		<xs:complexType>
-			<xs:simpleContent>
-				<xs:extension base="stringPlusLanguagePlusSupplied">
-					<xs:attribute name="unit"/>
-				</xs:extension>
-				</xs:simpleContent>
-		</xs:complexType>
-	</xs:element>
-	<!--
-********** digitalOrigin **********  	
- -->
-	<xs:element name="digitalOrigin" type="digitalOriginDefinition"/>
-	<!-- -->
-	<xs:simpleType name="digitalOriginDefinition">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="born digital"/>
-			<xs:enumeration value="reformatted digital"/>
-			<xs:enumeration value="digitized microfilm"/>
-			<xs:enumeration value="digitized other analog"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!--
-********** note **********  	
- -->
-	<xs:complexType name="physicalDescriptionNote">
-		<xs:simpleContent>
-			<xs:extension base="stringPlusLanguage">
-				<xs:attribute name="displayLabel" type="xs:string"/>
-				<xs:attribute name="type" type="xs:string"/>
-				<xs:attribute name="typeURI" type="xs:anyURI"/>
-				<xs:attributeGroup ref="xlink:simpleLink"/>
-				<xs:attribute name="ID" type="xs:ID"/>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<!--
-****************************************************
-*   Top Level Element <recordInfo>              *
-*****************************************************         
-
-**********  recordInfo  **********   
--->
-	<xs:element name="recordInfo" type="recordInfoDefinition"/>
-	<!-- -->
-	<xs:complexType name="recordInfoDefinition">
-		<xs:choice maxOccurs="unbounded">
-			<xs:element ref="recordContentSource"/>
-			<xs:element ref="recordCreationDate"/>
-			<xs:element ref="recordChangeDate"/>
-			<xs:element ref="recordIdentifier"/>
-			<xs:element ref="languageOfCataloging"/>
-			<xs:element ref="recordOrigin"/>
-			<xs:element ref="descriptionStandard"/>
-			<xs:element ref="recordInfoNote"/>
-<!-- -->			
-		</xs:choice>
-		<xs:attributeGroup ref="languageAttributeGroup"/>
-		<xs:attribute name="displayLabel" type="xs:string"/>
-		<xs:attribute name="altRepGroup" type="xs:string"/>
-	</xs:complexType>
-	<!--
-
-********   Subordinate Elements for <recordInfo>                
- -->
-	<xs:element name="recordContentSource" type="stringPlusLanguagePlusAuthority"/>
-	<xs:element name="recordCreationDate" type="dateDefinition"/>
-	<xs:element name="recordChangeDate" type="dateDefinition"/>
-	<xs:element name="recordInfoNote" type="noteDefinition"/>
-	<!--
-********** recordIdentifier 
--->
-	<xs:element name="recordIdentifier" type="recordIdentifierDefinition"/>
-	<!-- -->
-	<xs:complexType name="recordIdentifierDefinition">
-		<xs:simpleContent>
-			<xs:extension base="stringPlusLanguage">
-				<xs:attribute name="source" type="xs:string"/>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<!-- -->
-	<xs:element name="languageOfCataloging" type="languageDefinition"/>
-	<xs:element name="recordOrigin" type="stringPlusLanguage"/>
-	<xs:element name="descriptionStandard" type="stringPlusLanguagePlusAuthority"/>
-	<!-- 
-
-****************************************************
-*   Top Level Element <relatedItem>             *
-*****************************************************         
-
-**********   relatedItem  **********  
--->
-	<xs:element name="relatedItem" type="relatedItemDefinition"/>
-	<!-- -->
-	<xs:complexType name="relatedItemDefinition">
-		<xs:group ref="modsGroup" minOccurs="0" maxOccurs="unbounded"/>
-		<xs:attribute name="type">
-			<xs:simpleType>
-				<xs:restriction base="xs:string">
-					<xs:enumeration value="preceding"/>
-					<xs:enumeration value="succeeding"/>
-					<xs:enumeration value="original"/>
-					<xs:enumeration value="host"/>
-					<xs:enumeration value="constituent"/>
-					<xs:enumeration value="series"/>
-					<xs:enumeration value="otherVersion"/>
-					<xs:enumeration value="otherFormat"/>
-					<xs:enumeration value="isReferencedBy"/>
-					<xs:enumeration value="references"/>
-					<xs:enumeration value="reviewOf"/>
-				</xs:restriction>
-			</xs:simpleType>
-		</xs:attribute>
-		<!-- -->	
-		<xs:attribute name="otherType" type="xs:string"/>
-		<xs:attribute name="otherTypeAuth" type="xs:string"/>
-		<xs:attribute name="otherTypeAuthURI" type="xs:string"/>
-		<xs:attribute name="otherTypeURI" type="xs:string"/>
-		<xs:attribute name="displayLabel" type="xs:string"/>
-		<xs:attribute name="ID" type="xs:ID"/>
-		<xs:attributeGroup ref="xlink:simpleLink"/>
-		
-	</xs:complexType>
-	<!--  
-
-****************************************************
-*   Top Level Element <subject>                  *
-*****************************************************         
--->
-	<xs:element name="subject" type="subjectDefinition"/>
-	<!-- -->
-	<xs:complexType name="subjectDefinition">
-		<xs:choice minOccurs="0" maxOccurs="unbounded">
-			<xs:element ref="topic"/>
-			<xs:element ref="geographic"/>
-			<xs:element ref="temporal"/>
-			<xs:element name="titleInfo" type="subjectTitleInfoDefinition"/>
-			<xs:element name="name" type="subjectNameDefinition"/>
-			<xs:element ref="geographicCode"/>
-			<xs:element ref="hierarchicalGeographic"/>
-			<xs:element ref="cartographics"/>
-			<xs:element ref="occupation"/>
-			<xs:element ref="genre"/>
-			<!-- uses top-level genre definition -->
-		</xs:choice>
-		<xs:attribute name="ID" type="xs:ID"/>
-		<xs:attributeGroup ref="authorityAttributeGroup"/>
-		<xs:attributeGroup ref="languageAttributeGroup"/>
-		<xs:attributeGroup ref="xlink:simpleLink"/>
-		<xs:attribute name="displayLabel" type="xs:string"/>
-		<xs:attribute name="altRepGroup" type="xs:string"/>
-		<xs:attribute name="usage" fixed="primary"/>
-	</xs:complexType>
-	<!--
-
-********   Subordinate Elements for <subject>                
- -->
-	<!-- topic, geographic -->
-	<xs:element name="topic" type="stringPlusLanguagePlusAuthority"/>
-	<xs:element name="geographic" type="stringPlusLanguagePlusAuthority"/>
-	<!-- 
-*****************temporal  ************************
- -->
-	<xs:element name="temporal" type="temporalDefinition"/>
-	<!-- -->
-	<xs:complexType name="temporalDefinition">
-		<xs:simpleContent>
-			<xs:extension base="dateDefinition">
-				<xs:attributeGroup ref="authorityAttributeGroup"/>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<!-- 
-*****************subjectTitleInfo ************************
--->
-	<xs:complexType name="subjectTitleInfoDefinition">
-		<xs:choice minOccurs="0" maxOccurs="unbounded">
-			<xs:element ref="title"/>
-			<xs:element ref="subTitle"/>
-			<xs:element ref="partNumber"/>
-			<xs:element ref="partName"/>
-			<xs:element ref="nonSort"/>
-		</xs:choice>
-		<xs:attribute name="ID" type="xs:ID"/>
-		<xs:attributeGroup ref="authorityAttributeGroup"/>
-		<xs:attributeGroup ref="xlink:simpleLink"/>
-		<xs:attributeGroup ref="languageAttributeGroup"/>
-		<xs:attribute name="displayLabel" type="xs:string"/>
-		<xs:attribute name="type">
-			<xs:simpleType>
-				<xs:restriction base="xs:string">
-					<xs:enumeration value="abbreviated"/>
-					<xs:enumeration value="translated"/>
-					<xs:enumeration value="alternative"/>
-					<xs:enumeration value="uniform"/>
-				</xs:restriction>
-			</xs:simpleType>
-		</xs:attribute>
-	</xs:complexType>
-	<!-- 
-*****************subjectName ************************
--->
-	<xs:complexType name="subjectNameDefinition">
-		<xs:choice minOccurs="0" maxOccurs="unbounded">
-			<xs:element ref="namePart"/>
-			<xs:element ref="displayForm"/>
-			<xs:element ref="affiliation"/>
-			<xs:element ref="role"/>
-			<xs:element ref="description"/>
-			<xs:element ref="nameIdentifier"/>
-			<!-- -->
-		</xs:choice>
-		<xs:attribute name="type">
-			<xs:simpleType>
-				<xs:restriction base="xs:string">
-					<xs:enumeration value="personal"/>
-					<xs:enumeration value="corporate"/>
-					<xs:enumeration value="conference"/>
-					<xs:enumeration value="family"/>
-				</xs:restriction>
-			</xs:simpleType>
-		</xs:attribute>
-		<xs:attribute name="ID" type="xs:ID"/>
-		<xs:attributeGroup ref="authorityAttributeGroup"/>
-		<xs:attributeGroup ref="xlink:simpleLink"/>
-		<xs:attributeGroup ref="languageAttributeGroup"/>
-		<xs:attribute name="displayLabel" type="xs:string"/>
-	</xs:complexType>
-	<!--
- ********** geographicCode **********  	 	
--->
-	<xs:element name="geographicCode" type="geographicCodeDefinition"/>
-	<!-- -->
-	<xs:complexType name="geographicCodeDefinition">
-		<xs:simpleContent>
-			<xs:extension base="stringPlusLanguage">
-				<xs:attribute name="authorityURI" type="xs:anyURI"/>
-				<xs:attribute name="valueURI" type="xs:anyURI"/>
-				<xs:attribute name="authority">
-					<xs:simpleType>
-						<xs:restriction base="xs:string">
-							<xs:enumeration value="marcgac"/>
-							<xs:enumeration value="marccountry"/>
-							<xs:enumeration value="iso3166"/>
-						</xs:restriction>
-					</xs:simpleType>
-				</xs:attribute>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<!--  
-********** hierarchicalGeographic **********  	 
--->
-	<xs:element name="hierarchicalGeographic" type="hierarchicalGeographicDefinition"/>
-	<!-- -->
-	<xs:complexType name="hierarchicalGeographicDefinition">
-		<xs:choice maxOccurs="unbounded">
-			<xs:element ref="extraTerrestrialArea"/>
-			<xs:element ref="continent"/>
-			<xs:element ref="country"/>
-			<xs:element ref="province"/>
-			<!-- province is deprecated.  Use <state> instead.  -->
-			<xs:element ref="region"/>
-			<xs:element ref="state"/>
-			<xs:element ref="territory"/>
-			<xs:element ref="county"/>
-			<xs:element ref="city"/>
-			<xs:element ref="citySection"/>
-			<xs:element ref="island"/>
-			<xs:element ref="area"/>
-		</xs:choice>
-		<xs:attributeGroup ref="authorityAttributeGroup"/>
-	</xs:complexType>
-	<!-- -->
-		<!-- 		********** hierarchicalPart   *** auxiliary definition 	-->
-	<xs:complexType name="hierarchicalPart">
-		<xs:simpleContent>
-			<xs:extension base="stringPlusLanguage">
-				<xs:attribute name="level"/>
-				<xs:attribute name="period"/>
-				<xs:attributeGroup ref="authorityAttributeGroup"/>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-		<!-- 
-		Next, definitions for the place elements, starting with area, region, and citySection
-		-->
-
-		<xs:element name="area" type="areaDefinition"/>
-	<!-- -->
-	<xs:complexType name="areaDefinition">
-		<xs:simpleContent>
-			<xs:extension base="hierarchicalPart">
-				<xs:attribute name="areaType"/>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-		<!-- -->
-	
-	<xs:element name="region" type="regionDefinition"/>
-	<!-- -->
-	<xs:complexType name="regionDefinition">
-		<xs:simpleContent>
-			<xs:extension base="hierarchicalPart">
-				<xs:attribute name="regionType"/>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	
-		<xs:element name="citySection" type="citySectionDefinition"/>
-	<!-- -->
-	<xs:complexType name="citySectionDefinition">
-		<xs:simpleContent>
-			<xs:extension base="hierarchicalPart">
-				<xs:attribute name="citySectionType"/>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-		<!--  
-	The rest are all of type "hierarchicalPart"   ......
-		-->
-	<xs:element name="extraTerrestrialArea" type="hierarchicalPart"/>
-		<xs:element name="city" type="hierarchicalPart"/>
-	<xs:element name="continent" type="hierarchicalPart"/>
-	<xs:element name="country" type="hierarchicalPart"/>
-	<xs:element name="county" type="hierarchicalPart"/>
-	<xs:element name="island" type="hierarchicalPart"/>
-	<xs:element name="state" type="hierarchicalPart"/>
-	<xs:element name="territory" type="hierarchicalPart"/>
-	<!--  
-		..... except for province
-	-->
-	<xs:element name="province" type="stringPlusLanguage"/>
-	<!--  
- ********** cartographics **********  
--->
-	<xs:element name="cartographics" type="cartographicsDefinition"/>
-	<!-- -->
-	<xs:complexType name="cartographicsDefinition">
-		
-		<xs:sequence>
-			<xs:element ref="scale" minOccurs="0"/>
-			<xs:element ref="projection" minOccurs="0"/>
-			<xs:element ref="coordinates" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element ref="cartographicExtension" minOccurs="0" maxOccurs="unbounded"/>
-<!--  -->   
-		</xs:sequence>
-		
-		<xs:attributeGroup ref="authorityAttributeGroup"/>
-	</xs:complexType>
-	<!-- -->
-	<xs:element name="scale" type="stringPlusLanguage"/>
-	<xs:element name="projection" type="stringPlusLanguage"/>
-	<xs:element name="coordinates" type="stringPlusLanguage"/>
-	<xs:element name="cartographicExtension" type="extensionDefinition"/>
-	<!-- 
- ********** occupation **********  
--->
-	<xs:element name="occupation" type="stringPlusLanguagePlusAuthority"/>
-	<!--
-****************************************************
-*   Top Level Element <tableOfContents>     *
-*****************************************************           
- -->
-	<xs:element name="tableOfContents" type="tableOfContentsDefinition"/>
-	<!-- -->
-	<xs:complexType name="tableOfContentsDefinition">
-		<xs:simpleContent>
-			<xs:extension base="stringPlusLanguage">
-				<xs:attribute name="displayLabel" type="xs:string"/>
-				<xs:attribute name="type" type="xs:string"/>
-				<xs:attributeGroup ref="xlink:simpleLink"/>
-				<xs:attribute name="shareable" fixed="no"/>
-				<xs:attribute name="altRepGroup" type="xs:string"/>
-				<xs:attributeGroup ref="altFormatAttributeGroup"/>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<!-- 
-
-****************************************************
-*   Top Level Element <targetAudience>       *
-*****************************************************           
- -->
-	<xs:element name="targetAudience" type="targetAudienceDefinition"/>
-	<!-- -->
-	<xs:complexType name="targetAudienceDefinition">
-		<xs:simpleContent>
-			<xs:extension base="stringPlusLanguagePlusAuthority">
-				<xs:attribute name="displayLabel" type="xs:string"/>
-				<xs:attribute name="altRepGroup" type="xs:string"/>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<!--
-****************************************************
-*   Top Level Element <titleInfo>                   *
-*****************************************************
-          -->
-	<xs:element name="titleInfo" type="titleInfoDefinition"/>
-	<!-- -->
-	<xs:complexType name="titleInfoDefinition">
-		<xs:choice minOccurs="0" maxOccurs="unbounded">
-			<xs:element ref="title"/>
-			<xs:element ref="subTitle"/>
-			<xs:element ref="partNumber"/>
-			<xs:element ref="partName"/>
-			<xs:element ref="nonSort"/>
-		</xs:choice>
-		<xs:attribute name="type">
-			<xs:simpleType>
-				<xs:restriction base="xs:string">
-					<xs:enumeration value="abbreviated"/>
-					<xs:enumeration value="translated"/>
-					<xs:enumeration value="alternative"/>
-					<xs:enumeration value="uniform"/>
-				</xs:restriction>
-			</xs:simpleType>
-		</xs:attribute>
-		<xs:attribute name="otherType"/>
-		<xs:attribute name="supplied" fixed="yes"/>
-		<xs:attribute name="altRepGroup" type="xs:string"/>
-		<xs:attributeGroup ref="altFormatAttributeGroup"/>
-		<xs:attribute name="nameTitleGroup" type="xs:string"/>
-		<xs:attribute name="usage" fixed="primary"/>
-		<xs:attribute name="ID" type="xs:ID"/>
-		<xs:attributeGroup ref="authorityAttributeGroup"/>
-		<xs:attributeGroup ref="xlink:simpleLink"/>
-		<xs:attributeGroup ref="languageAttributeGroup"/>
-		<xs:attribute name="displayLabel" type="xs:string"/>
-	</xs:complexType>
-	<!--
-
-********   Subordinate Elements for <titleInfo>                
- -->
-	<xs:element name="title" type="stringPlusLanguage"/>
-	<xs:element name="subTitle" type="stringPlusLanguage"/>
-	<xs:element name="partNumber" type="stringPlusLanguage"/>
-	<xs:element name="partName" type="stringPlusLanguage"/>
-	<!-- 
-*********  nonSort
-		-->
-	<xs:element name="nonSort">
-		<xs:complexType>
-			<xs:simpleContent>
-				<xs:extension base="stringPlusLanguage">
-					<xs:attribute ref="xml:space"/>
-				</xs:extension>
-			</xs:simpleContent>
-		</xs:complexType>
-	</xs:element> 
-	<!--
-****************************************************
-*   Top Level Element <typeOfResource>     *
-*****************************************************         
- -->
-	<xs:element name="typeOfResource" type="typeOfResourceDefinition"/>
-	<!-- -->
-	<xs:complexType name="typeOfResourceDefinition">
-		<xs:simpleContent>
-			<xs:extension base="stringPlusLanguagePlusAuthority">
-				<!-- 
-					***************** definition changed in 3.7 *****************
-				In 3.6 the base was "resourceTypeDefinition", 
-				which was a controlled list.
-				In 3.7 resourceTypeDefinition is removed, so
-				any value may be supplied.
-				-->
-				<xs:attribute name="collection" fixed="yes"/>
-				<xs:attribute name="manuscript" fixed="yes"/>
-				<xs:attribute name="displayLabel" type="xs:string"/>
-				<xs:attribute name="altRepGroup" type="xs:string"/>
-				<xs:attribute name="usage" fixed="primary"/>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	
-	<!--  
-         *********************************
-         *********************************
-         Part 3:   Auxiliary definitions
-         *********************************
-         *********************************
-
-**********************************
-String Definitions 
-**********************************
--->
-	<!--
-********** stringPlusLanguage  
-   -->
-	<xs:complexType name="stringPlusLanguage">
-		<xs:simpleContent>
-			<xs:extension base="xs:string">
-				<xs:attributeGroup ref="languageAttributeGroup"/>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<!--
-************************* stringPlusLanguagePlusAuthority  *************************     	
- -->
-	<xs:complexType name="stringPlusLanguagePlusAuthority">
-		<xs:simpleContent>
-			<xs:extension base="stringPlusLanguage">
-				<xs:attributeGroup ref="authorityAttributeGroup"/>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<!--                     
-************************* stringPlusLanguagePlusSupplied  *************************     	 
- -->
-	<xs:complexType name="stringPlusLanguagePlusSupplied">
-		<xs:simpleContent>
-			<xs:extension base="stringPlusLanguage">
-				<xs:attribute name="supplied" fixed="yes"/>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<!-- 
-**********************************
-  Attribute Group Definitions 
-**********************************
--->
-	<!--   
- ********** authorityAttributeGroup   **********  	                       	  
-   -->
-	<xs:attributeGroup name="authorityAttributeGroup">
-		<!-- new in 3.4 -->
-		<xs:attribute name="authority" type="xs:string"/>
-		<xs:attribute name="authorityURI" type="xs:anyURI"/>
-		<xs:attribute name="valueURI" type="xs:anyURI"/>
-	</xs:attributeGroup>
-	<!--   
-  ********** languageAttributeGroup   **********  	                       	  
--->
-	<xs:attributeGroup name="languageAttributeGroup">
-		<xs:attribute name="lang" type="xs:string"/>
-		<xs:attribute ref="xml:lang"/>
-		<xs:attribute name="script" type="xs:string"/>
-		<xs:attribute name="transliteration" type="xs:string"/>
-	</xs:attributeGroup>
-	<!--   
-  ********** altFormatAttributeGroup   **********  	                       	  
--->
-	<xs:attributeGroup name="altFormatAttributeGroup">
-		<xs:attribute name="altFormat" type="xs:anyURI"/>
-		<xs:attribute name="contentType" type="xs:string"/>
-	</xs:attributeGroup>
-	<!--  
-****************************************************
-  - Attribute definitions (simpleTypes)
-*****************************************************
--->
-	<!--  
-   ********** codeOrText
-                  ******** used by type attribute  for elements that distinguish code from text:
-                  ******** <languageTerm>, <placeTerm>, <roleTerm>, <scriptTerm>
- -->
-	<xs:simpleType name="codeOrText">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="code"/>
-			<xs:enumeration value="text"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<!-- -->
-</xs:schema>
diff --git a/src/main/resources/xjc/mods/mods-binding.xjb b/src/main/resources/xjc/mods/mods-binding.xjb
deleted file mode 100644
index 6d30b7c7cf4..00000000000
--- a/src/main/resources/xjc/mods/mods-binding.xjb
+++ /dev/null
@@ -1,96 +0,0 @@
-<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">
-
-        <jxb:bindings node="//xsd:complexType[@name='namePartDefinition']">
-			<jxb:bindings node=".//xsd:attribute[@name='type']">
-				<jxb:property name="atType" />
-			</jxb:bindings>
-		</jxb:bindings>
-
-        <jxb:bindings node="//xsd:complexType[@name='noteDefinition']">
-			<jxb:bindings node=".//xsd:attribute[@name='type']">
-				<jxb:property name="atType" />
-			</jxb:bindings>
-		</jxb:bindings>
-
-        <jxb:bindings node="//*[@name='text']">
-			<jxb:bindings node=".//xsd:attribute[@name='type']">
-				<jxb:property name="atType" />
-			</jxb:bindings>
-		</jxb:bindings>
-
-        <jxb:bindings node="//*[@name='languageAttributeGroup']">
-			<jxb:bindings node=".//xsd:attribute[@name='lang']">
-				<jxb:property name="atlang" />
-			</jxb:bindings>
-		</jxb:bindings>
-
-        <jxb:bindings node="//*[@name='titleInfoDefinition']">
-			<jxb:bindings node=".//xsd:attribute[@name='type']">
-				<jxb:property name="atType" />
-			</jxb:bindings>
-		</jxb:bindings>
-
-		<jxb:bindings node="//*[@name='relatedItemDefinition']">
-			<jxb:bindings node=".//xsd:attribute[@name='type']">
-				<jxb:property name="atType" />
-			</jxb:bindings>
-		</jxb:bindings>
-
-        <jxb:bindings node="//*[@name='subjectNameDefinition']">
-			<jxb:bindings node=".//xsd:attribute[@name='type']">
-				<jxb:property name="atType" />
-			</jxb:bindings>
-		</jxb:bindings>
-
-        <jxb:bindings node="//*[@name='subjectTitleInfoDefinition']">
-			<jxb:bindings node=".//xsd:attribute[@name='type']">
-				<jxb:property name="atType" />
-			</jxb:bindings>
-		</jxb:bindings>
-
-        <jxb:bindings node="//*[@name='tableOfContentsDefinition']">
-			<jxb:bindings node=".//xsd:attribute[@name='type']">
-				<jxb:property name="atType" />
-			</jxb:bindings>
-		</jxb:bindings>
-
-        <jxb:bindings node="//*[@name='physicalDescriptionNote']">
-			<jxb:bindings node=".//xsd:attribute[@name='type']">
-				<jxb:property name="atType" />
-			</jxb:bindings>
-		</jxb:bindings>
-
-        <jxb:bindings node="//*[@name='nameDefinition']">
-			<jxb:bindings node=".//xsd:attribute[@name='type']">
-				<jxb:property name="atType" />
-			</jxb:bindings>
-		</jxb:bindings>
-
-        <jxb:bindings node="//*[@name='copyInformationDefinition']">
-			<jxb:bindings node=".//xsd:attribute[@name='type']">
-				<jxb:property name="atType" />
-			</jxb:bindings>
-		</jxb:bindings>
-
-        <jxb:bindings node="//*[@name='physicalLocationDefinition']">
-			<jxb:bindings node=".//xsd:attribute[@name='type']">
-				<jxb:property name="atType" />
-			</jxb:bindings>
-		</jxb:bindings>
-
-        <jxb:bindings node="//*[@name='accessConditionDefinition']">
-			<jxb:bindings node=".//xsd:attribute[@name='type']">
-				<jxb:property name="atType" />
-			</jxb:bindings>
-		</jxb:bindings>
-
-        <jxb:bindings node="//*[@name='abstractDefinition']">
-			<jxb:bindings node=".//xsd:attribute[@name='type']">
-				<jxb:property name="atType" />
-			</jxb:bindings>
-		</jxb:bindings>
-
-    </jxb:bindings>
-</jxb:bindings>
diff --git a/src/main/resources/xjc/mods/xlink.xsd b/src/main/resources/xjc/mods/xlink.xsd
deleted file mode 100644
index f55eb6dae16..00000000000
--- a/src/main/resources/xjc/mods/xlink.xsd
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- METS XLink Schema, v. 2, Nov. 15, 2004 -->
-<schema targetNamespace="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" elementFormDefault="qualified">
-  <!--  global attributes  --> 
-  <attribute name="href"  type="anyURI"/>
-  <attribute name="role" type="string"/>
-  <attribute name="arcrole" type="string"/>
-  <attribute name="title" type="string" /> 
-  <attribute name="show">
-    <simpleType>
-      <restriction base="string">
-	<enumeration value="new" /> 
-	<enumeration value="replace" /> 
-	<enumeration value="embed" /> 
-	<enumeration value="other" /> 
-	<enumeration value="none" /> 
-      </restriction>
-    </simpleType>
-  </attribute>
-  <attribute name="actuate">
-    <simpleType>
-      <restriction base="string">
-	<enumeration value="onLoad" /> 
-	<enumeration value="onRequest" /> 
-	<enumeration value="other" /> 
-	<enumeration value="none" /> 
-      </restriction>
-    </simpleType>
-  </attribute>
-  <attribute name="label" type="string" /> 
-  <attribute name="from" type="string" /> 
-  <attribute name="to" type="string" /> 
-  <attributeGroup name="simpleLink">
-    <attribute name="type" type="string" fixed="simple" form="qualified" /> 
-    <attribute ref="xlink:href" use="optional" /> 
-    <attribute ref="xlink:role" use="optional" /> 
-    <attribute ref="xlink:arcrole" use="optional" /> 
-    <attribute ref="xlink:title" use="optional" /> 
-    <attribute ref="xlink:show" use="optional" /> 
-    <attribute ref="xlink:actuate" use="optional" /> 
-  </attributeGroup>
-  <attributeGroup name="extendedLink">
-    <attribute name="type" type="string" fixed="extended" form="qualified" /> 
-    <attribute ref="xlink:role" use="optional" /> 
-    <attribute ref="xlink:title" use="optional" /> 
-  </attributeGroup>
-  <attributeGroup name="locatorLink">
-    <attribute name="type" type="string" fixed="locator" form="qualified" /> 
-    <attribute ref="xlink:href" use="required" /> 
-    <attribute ref="xlink:role" use="optional" /> 
-    <attribute ref="xlink:title" use="optional" /> 
-    <attribute ref="xlink:label" use="optional" /> 
-  </attributeGroup>
-  <attributeGroup name="arcLink">
-    <attribute name="type" type="string" fixed="arc" form="qualified" /> 
-    <attribute ref="xlink:arcrole" use="optional" /> 
-    <attribute ref="xlink:title" use="optional" /> 
-    <attribute ref="xlink:show" use="optional" /> 
-    <attribute ref="xlink:actuate" use="optional" /> 
-    <attribute ref="xlink:from" use="optional" /> 
-    <attribute ref="xlink:to" use="optional" /> 
-  </attributeGroup>
-  <attributeGroup name="resourceLink">
-    <attribute name="type" type="string" fixed="resource" form="qualified" /> 
-    <attribute ref="xlink:role" use="optional" /> 
-    <attribute ref="xlink:title" use="optional" /> 
-    <attribute ref="xlink:label" use="optional" /> 
-  </attributeGroup>
-  <attributeGroup name="titleLink">
-    <attribute name="type" type="string" fixed="title" form="qualified" /> 
-  </attributeGroup>
-  <attributeGroup name="emptyLink">
-    <attribute name="type" type="string" fixed="none" form="qualified" /> 
-  </attributeGroup>
-</schema>
diff --git a/src/main/resources/xjc/mods/xml.xsd b/src/main/resources/xjc/mods/xml.xsd
deleted file mode 100644
index bb367ccf5dc..00000000000
--- a/src/main/resources/xjc/mods/xml.xsd
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version="1.0"?>
-<xs:schema targetNamespace="http://www.w3.org/XML/1998/namespace" xmlns:xs="http://www.w3.org/2001/XMLSchema" xml:lang="en">
-
- <xs:annotation>
-  <xs:documentation>
-   See http://www.w3.org/XML/1998/namespace.html and
-   http://www.w3.org/TR/REC-xml for information about this namespace.
-
-    This schema document describes the XML namespace, in a form
-    suitable for import by other schema documents.  
-
-    Note that local names in this namespace are intended to be defined
-    only by the World Wide Web Consortium or its subgroups.  The
-    following names are currently defined in this namespace and should
-    not be used with conflicting semantics by any Working Group,
-    specification, or document instance:
-
-    base (as an attribute name): denotes an attribute whose value
-         provides a URI to be used as the base for interpreting any
-         relative URIs in the scope of the element on which it
-         appears; its value is inherited.  This name is reserved
-         by virtue of its definition in the XML Base specification.
-
-    id   (as an attribute name): denotes an attribute whose value
-         should be interpreted as if declared to be of type ID.
-         The xml:id specification is not yet a W3C Recommendation,
-         but this attribute is included here to facilitate experimentation
-         with the mechanisms it proposes.  Note that it is _not_ included
-         in the specialAttrs attribute group.
-
-    lang (as an attribute name): denotes an attribute whose value
-         is a language code for the natural language of the content of
-         any element; its value is inherited.  This name is reserved
-         by virtue of its definition in the XML specification.
-  
-    space (as an attribute name): denotes an attribute whose
-         value is a keyword indicating what whitespace processing
-         discipline is intended for the content of the element; its
-         value is inherited.  This name is reserved by virtue of its
-         definition in the XML specification.
-
-    Father (in any context at all): denotes Jon Bosak, the chair of 
-         the original XML Working Group.  This name is reserved by 
-         the following decision of the W3C XML Plenary and 
-         XML Coordination groups:
-
-             In appreciation for his vision, leadership and dedication
-             the W3C XML Plenary on this 10th day of February, 2000
-             reserves for Jon Bosak in perpetuity the XML name
-             xml:Father
-  </xs:documentation>
- </xs:annotation>
-
- <xs:annotation>
-  <xs:documentation>This schema defines attributes and an attribute group
-        suitable for use by
-        schemas wishing to allow xml:base, xml:lang, xml:space or xml:id
-        attributes on elements they define.
-
-        To enable this, such a schema must import this schema
-        for the XML namespace, e.g. as follows:
-        &lt;schema . . .&gt;
-         . . .
-         &lt;import namespace="http://www.w3.org/XML/1998/namespace"
-                    schemaLocation="http://www.w3.org/2001/xml.xsd"/&gt;
-
-        Subsequently, qualified reference to any of the attributes
-        or the group defined below will have the desired effect, e.g.
-
-        &lt;type . . .&gt;
-         . . .
-         &lt;attributeGroup ref="xml:specialAttrs"/&gt;
- 
-         will define a type which will schema-validate an instance
-         element with any of those attributes</xs:documentation>
- </xs:annotation>
-
- <xs:annotation>
-  <xs:documentation>In keeping with the XML Schema WG's standard versioning
-   policy, this schema document will persist at
-   http://www.w3.org/2005/08/xml.xsd.
-   At the date of issue it can also be found at
-   http://www.w3.org/2001/xml.xsd.
-   The schema document at that URI may however change in the future,
-   in order to remain compatible with the latest version of XML Schema
-   itself, or with the XML namespace itself.  In other words, if the XML
-   Schema or XML namespaces change, the version of this document at
-   http://www.w3.org/2001/xml.xsd will change
-   accordingly; the version at
-   http://www.w3.org/2005/08/xml.xsd will not change.
-  </xs:documentation>
- </xs:annotation>
-
- <xs:attribute name="lang">
-  <xs:annotation>
-   <xs:documentation>Attempting to install the relevant ISO 2- and 3-letter
-         codes as the enumerated possible values is probably never
-         going to be a realistic possibility.  See
-         RFC 3066 at http://www.ietf.org/rfc/rfc3066.txt and the IANA registry
-         at http://www.iana.org/assignments/lang-tag-apps.htm for
-         further information.
-
-         The union allows for the 'un-declaration' of xml:lang with
-         the empty string.</xs:documentation>
-  </xs:annotation>
-  <xs:simpleType>
-   <xs:union memberTypes="xs:language">
-    <xs:simpleType>    
-     <xs:restriction base="xs:string">
-      <xs:enumeration value=""/>
-     </xs:restriction>
-    </xs:simpleType>
-   </xs:union>
-  </xs:simpleType>
- </xs:attribute>
-
- <xs:attribute name="space">
-  <xs:simpleType>
-   <xs:restriction base="xs:NCName">
-    <xs:enumeration value="default"/>
-    <xs:enumeration value="preserve"/>
-   </xs:restriction>
-  </xs:simpleType>
- </xs:attribute>
-
- <xs:attribute name="base" type="xs:anyURI">
-  <xs:annotation>
-   <xs:documentation>See http://www.w3.org/TR/xmlbase/ for
-                     information about this attribute.</xs:documentation>
-  </xs:annotation>
- </xs:attribute>
- 
- <xs:attribute name="id" type="xs:ID">
-  <xs:annotation>
-   <xs:documentation>See http://www.w3.org/TR/xml-id/ for
-                     information about this attribute.</xs:documentation>
-  </xs:annotation>
- </xs:attribute>
-
- <xs:attributeGroup name="specialAttrs">
-  <xs:attribute ref="xml:base"/>
-  <xs:attribute ref="xml:lang"/>
-  <xs:attribute ref="xml:space"/>
- </xs:attributeGroup>
-
-</xs:schema>
\ No newline at end of file
diff --git a/src/main/resources/xslt/mathml_latex/README b/src/main/resources/xslt/mathml_latex/README
new file mode 100644
index 00000000000..b5fdf158bbe
--- /dev/null
+++ b/src/main/resources/xslt/mathml_latex/README
@@ -0,0 +1,97 @@
+README for the XSLT MathML Library
+
+XSLT MathML Library is a set of XSLT stylesheets to transform
+MathML 2.0 to LaTeX.
+
+For more information, see
+http://www.raleigh.ru/MathML/mmltex/index.php?lang=en
+
+Manifest
+--------
+
+README        this file
+mmltex.xsl
+tokens.xsl
+glayout.xsl
+scripts.xsl
+tables.xsl
+entities.xsl
+cmarkup.xsl
+
+Use
+---
+
+There are two ways of using the library:
+
+    * Use a local copy of the library.
+
+        1. Download the distribution (see below).
+
+        2. Unpack the distribution, using unzip.
+
+        3. In your stylesheet import or include either the main
+           stylesheet, mmltex.xsl, or the stylesheet module you
+           wish to use, such as tokens.xsl. This example assumes
+           that the distribution has been extracted into the same
+           directory as your own stylesheet:
+
+           <xsl:import href="mmltex.xsl"/>
+
+    * Import or include either the main stylesheet, or the
+      stylesheet module you wish to use, directly from the library
+      website; http://www.raleigh.ru/MathML/mmltex/. For example:
+
+      <xsl:import href="http://www.raleigh.ru/MathML/mmltex/mmltex.xsl"/>
+
+Obtaining The Library
+---------------------
+
+The XSLT MathML Library is available for download as:
+
+    * Zip file: http://www.raleigh.ru/MathML/mmltex/mmltex.zip
+
+Copyright
+---------
+
+Copyright (C) 2001, 2002 Vasil Yaroshevich
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the ``Software''), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+Except as contained in this notice, the names of individuals
+credited with contribution to this software shall not be used in
+advertising or otherwise to promote the sale, use or other
+dealings in this Software without prior written authorization
+from the individuals in question.
+
+Any stylesheet derived from this Software that is publically
+distributed will be identified with a different name and the
+version strings in any derived Software will be changed so that
+no possibility of confusion between the derived package and this
+Software will exist.
+
+Warranty
+--------
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT.  IN NO EVENT SHALL NORMAN WALSH OR ANY OTHER
+CONTRIBUTOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+Contacting the Author
+---------------------
+
+These stylesheets are maintained by Vasil Yaroshevich, <yarosh@raleigh.ru>.
diff --git a/src/main/resources/xslt/mathml_latex/cmarkup.xsl b/src/main/resources/xslt/mathml_latex/cmarkup.xsl
new file mode 100644
index 00000000000..3c30286d4ce
--- /dev/null
+++ b/src/main/resources/xslt/mathml_latex/cmarkup.xsl
@@ -0,0 +1,1093 @@
+<?xml version='1.0' encoding="UTF-8"?>
+<xsl:stylesheet
+        xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+        xmlns:m="http://www.w3.org/1998/Math/MathML"
+        version='1.0'>
+
+<!-- ====================================================================== -->
+<!-- $id: tokens.xsl, 2002/22/11 Exp $
+     This file is part of the XSLT MathML Library distribution.
+     See ./README or http://www.raleigh.ru/MathML/mmltex for
+     copyright and other information                                        -->
+<!-- ====================================================================== -->
+
+<!-- 4.4.1.1 cn -->
+<xsl:template match="m:cn"><xsl:apply-templates/></xsl:template>
+
+<xsl:template match="m:cn[@type='complex-cartesian']">
+    <xsl:apply-templates select="text()[1]"/>
+    <xsl:text>+</xsl:text>
+    <xsl:apply-templates select="text()[2]"/>
+    <xsl:text>i</xsl:text>
+</xsl:template>
+
+<xsl:template match="m:cn[@type='rational']">
+    <xsl:apply-templates select="text()[1]"/>
+    <xsl:text>/</xsl:text>
+    <xsl:apply-templates select="text()[2]"/>
+</xsl:template>
+
+<xsl:template match="m:cn[@type='integer' and @base!=10]">
+        <xsl:apply-templates/>
+        <xsl:text>_{</xsl:text><xsl:value-of select="@base"/><xsl:text>}</xsl:text>
+</xsl:template>
+
+<xsl:template match="m:cn[@type='complex-polar']">
+    <xsl:apply-templates select="text()[1]"/>
+    <xsl:text>e^{i </xsl:text>
+    <xsl:apply-templates select="text()[2]"/>
+    <xsl:text>}</xsl:text>
+</xsl:template>
+
+<xsl:template match="m:cn[@type='e-notation']">
+    <xsl:apply-templates select="text()[1]"/>
+    <xsl:text>E</xsl:text>
+    <xsl:apply-templates select="text()[2]"/>
+</xsl:template>
+
+<!-- 4.4.1.1 ci 4.4.1.2 csymbol -->
+<xsl:template match="m:ci | m:csymbol">
+    <xsl:choose>
+        <xsl:when test="string-length(normalize-space(text()))>1">
+            <xsl:text>\mathrm{</xsl:text><xsl:apply-templates/><xsl:text>}</xsl:text>
+        </xsl:when>
+        <xsl:otherwise><xsl:apply-templates/></xsl:otherwise>
+    </xsl:choose>
+</xsl:template>
+
+<!-- 4.4.2.1 apply 4.4.2.2 reln -->
+<xsl:template match="m:apply | m:reln">
+    <xsl:apply-templates select="*[1]">
+    <!-- <? -->
+        <xsl:with-param name="p" select="10"/>
+    </xsl:apply-templates>
+    <!-- ?> -->
+    <xsl:text>(</xsl:text>
+    <xsl:for-each select="*[position()>1]">
+        <xsl:apply-templates select="."/>
+        <xsl:if test="not(position()=last())"><xsl:text>, </xsl:text></xsl:if>
+    </xsl:for-each>
+    <xsl:text>)</xsl:text>
+</xsl:template>
+
+<!-- 4.4.2.3 fn -->
+<xsl:template match="m:fn[m:apply[1]]"> <!-- for m:fn using default rule -->
+    <xsl:text>(</xsl:text><xsl:apply-templates/><xsl:text>)</xsl:text>
+</xsl:template>
+
+<!-- 4.4.2.4 interval -->
+<xsl:template match="m:interval[*[2]]">
+    <xsl:choose>
+        <xsl:when test="@closure='open' or @closure='open-closed'">
+            <xsl:text>\left(</xsl:text>
+        </xsl:when>
+        <xsl:otherwise><xsl:text>\left[</xsl:text></xsl:otherwise>
+    </xsl:choose>
+    <xsl:apply-templates select="*[1]"/>
+    <xsl:text> , </xsl:text>
+    <xsl:apply-templates select="*[2]"/>
+    <xsl:choose>
+        <xsl:when test="@closure='open' or @closure='closed-open'">
+            <xsl:text>\right)</xsl:text>
+        </xsl:when>
+        <xsl:otherwise><xsl:text>\right]</xsl:text></xsl:otherwise>
+    </xsl:choose>
+</xsl:template>
+
+<xsl:template match="m:interval">
+    <xsl:text>\left\{</xsl:text><xsl:apply-templates/><xsl:text>\right\}</xsl:text>
+</xsl:template>
+
+<!-- 4.4.2.5 inverse -->
+<xsl:template match="m:apply[*[1][self::m:inverse]]">
+    <xsl:apply-templates select="*[2]"/><xsl:text>^{(-1)}</xsl:text>
+</xsl:template>
+
+<!-- 4.4.2.6 sep 4.4.2.7 condition -->
+<xsl:template match="m:sep | m:condition"><xsl:apply-templates/></xsl:template>
+
+<!-- 4.4.2.9 lambda -->
+<xsl:template match="m:lambda">
+    <xsl:text>\mathrm{lambda}\: </xsl:text>
+    <xsl:apply-templates select="m:bvar/*"/>
+    <xsl:text>.\: </xsl:text>
+  <xsl:apply-templates select="*[last()]"/>
+</xsl:template>
+
+<!-- 4.4.2.10 compose -->
+<xsl:template match="m:apply[*[1][self::m:compose]]">
+    <xsl:param name="p" select="0"/>
+    <xsl:call-template name="infix">
+        <xsl:with-param name="this-p" select="1"/>
+        <xsl:with-param name="p" select="$p"/>
+        <xsl:with-param name="mo">\circ </xsl:with-param>
+    </xsl:call-template>
+</xsl:template>
+
+<!-- 4.4.2.11 ident -->
+<xsl:template match="m:ident"><xsl:text>\mathrm{id}</xsl:text></xsl:template>
+
+<!-- 4.4.2.12 domain 4.4.2.13 codomain 4.4.2.14 image 4.4.3.21 arg 4.4.3.24 lcm
+        4.4.5.9 grad 4.4.5.10 curl 4.4.9.4 median 4.4.9.5 mode-->
+<xsl:template match="m:domain | m:codomain | m:image | m:arg | m:lcm | m:grad |
+                                 m:curl | m:median | m:mode">
+    <xsl:text>\mathop{\mathrm{</xsl:text>
+    <xsl:value-of select="local-name()"/>
+    <xsl:text>}}</xsl:text>
+</xsl:template>
+
+<!-- 4.4.2.15 domainofapplication -->
+<xsl:template match="m:domainofapplication"/>
+
+<!-- 4.4.2.16 piecewise -->
+<xsl:template match="m:piecewise">
+    <xsl:text>\begin{cases}</xsl:text>
+    <xsl:apply-templates select="m:piece"/>
+    <xsl:apply-templates select="m:otherwise"/>
+    <xsl:text>\end{cases}</xsl:text>
+</xsl:template>
+
+<xsl:template match="m:piece">
+        <xsl:apply-templates select="*[1]"/>
+        <xsl:text> &amp; \text{if $</xsl:text>
+        <xsl:apply-templates select="*[2]"/>
+        <xsl:text>$}</xsl:text>
+        <xsl:if test="not(position()=last()) or ../m:otherwise"><xsl:text>\\ </xsl:text></xsl:if>
+</xsl:template>
+
+<xsl:template match="m:otherwise">
+    <xsl:apply-templates select="*[1]"/>
+    <xsl:text> &amp; \text{otherwise}</xsl:text>
+</xsl:template>
+
+<!-- 4.4.3.1 quotient -->
+<xsl:template match="m:apply[*[1][self::m:quotient]]">
+    <xsl:text>\left\lfloor\frac{</xsl:text>
+    <xsl:apply-templates select="*[2]"/>
+    <xsl:text>}{</xsl:text>
+    <xsl:apply-templates select="*[3]"/>
+    <xsl:text>}\right\rfloor </xsl:text>
+</xsl:template>
+
+<!-- 4.4.3.2 factorial -->
+<xsl:template match="m:apply[*[1][self::m:factorial]]">
+    <xsl:apply-templates select="*[2]">
+        <xsl:with-param name="p" select="7"/>
+    </xsl:apply-templates>
+    <xsl:text>!</xsl:text>
+</xsl:template>
+
+<!-- 4.4.3.3 divide -->
+<xsl:template match="m:apply[*[1][self::m:divide]]">
+    <xsl:param name="p" select="0"/>
+  <xsl:param name="this-p" select="3"/>
+  <xsl:if test="$this-p &lt; $p"><xsl:text>\left(</xsl:text></xsl:if>
+  <xsl:text>\frac{</xsl:text>
+    <xsl:apply-templates select="*[2]"/>
+<!--        <xsl:with-param name="p" select="$this-p"/>
+    </xsl:apply-templates>-->
+    <xsl:text>}{</xsl:text>
+    <xsl:apply-templates select="*[3]"/>
+<!--        <xsl:with-param name="p" select="$this-p"/>
+    </xsl:apply-templates>-->
+    <xsl:text>}</xsl:text>
+    <xsl:if test="$this-p &lt; $p"><xsl:text>\right)</xsl:text></xsl:if>
+</xsl:template>
+
+<!-- 4.4.3.4 max min -->
+<xsl:template match="m:apply[*[1][self::m:max or self::m:min]]">
+    <xsl:text>\</xsl:text>
+    <xsl:value-of select="local-name(*[1])"/>
+    <xsl:text>\{</xsl:text>
+   <xsl:choose>
+        <xsl:when test="m:condition">
+        <xsl:apply-templates select="*[last()]"/>
+        <xsl:text>, </xsl:text>
+            <xsl:apply-templates select="m:condition/node()"/>
+        </xsl:when>
+        <xsl:otherwise>
+            <xsl:for-each select="*[position() &gt; 1]">
+                <xsl:apply-templates select="."/>
+                <xsl:if test="position() !=last()"><xsl:text> , </xsl:text></xsl:if>
+            </xsl:for-each>
+        </xsl:otherwise>
+   </xsl:choose>
+    <xsl:text>\}</xsl:text>
+</xsl:template>
+
+<!-- 4.4.3.5  minus-->
+<xsl:template match="m:apply[*[1][self::m:minus] and count(*)=2]">
+    <xsl:text>-</xsl:text>
+    <xsl:apply-templates select="*[2]">
+        <xsl:with-param name="p" select="5"/>
+    </xsl:apply-templates>
+</xsl:template>
+
+<xsl:template match="m:apply[*[1][self::m:minus] and count(*)&gt;2]">
+    <xsl:param name="p" select="0"/>
+    <xsl:call-template name="binary">
+        <xsl:with-param name="mo">-</xsl:with-param>
+        <xsl:with-param name="p" select="$p"/>
+        <xsl:with-param name="this-p" select="2"/>
+    </xsl:call-template>
+</xsl:template>
+
+<!-- 4.4.3.6  plus-->
+<xsl:template match="m:apply[*[1][self::m:plus]]">
+  <xsl:param name="p" select="0"/>
+  <xsl:if test="$p &gt; 2">
+        <xsl:text>(</xsl:text>
+    </xsl:if>
+  <xsl:for-each select="*[position()&gt;1]">
+   <xsl:if test="position() &gt; 1">
+    <xsl:choose>
+      <xsl:when test="self::m:apply[*[1][self::m:times] and
+      *[2][self::m:apply/*[1][self::m:minus] or self::m:cn[not(m:sep) and
+      (number(.) &lt; 0)]]]">-</xsl:when>
+      <xsl:otherwise>+</xsl:otherwise>
+    </xsl:choose>
+   </xsl:if>
+    <xsl:choose>
+      <xsl:when test="self::m:apply[*[1][self::m:times] and
+      *[2][self::m:cn[not(m:sep) and (number(.) &lt;0)]]]">
+            <xsl:value-of select="-(*[2])"/>
+            <xsl:apply-templates select=".">
+             <xsl:with-param name="first" select="2"/>
+             <xsl:with-param name="p" select="2"/>
+           </xsl:apply-templates>
+       </xsl:when>
+      <xsl:when test="self::m:apply[*[1][self::m:times] and
+      *[2][self::m:apply/*[1][self::m:minus]]]">
+                <xsl:apply-templates select="./*[2]/*[2]"/>
+                <xsl:apply-templates select=".">
+                    <xsl:with-param name="first" select="2"/>
+                    <xsl:with-param name="p" select="2"/>
+                </xsl:apply-templates>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:apply-templates select=".">
+                    <xsl:with-param name="p" select="2"/>
+                </xsl:apply-templates>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:for-each>
+    <xsl:if test="$p &gt; 2">
+        <xsl:text>)</xsl:text>
+    </xsl:if>
+</xsl:template>
+
+<!-- 4.4.3.7 power -->
+<xsl:template match="m:apply[*[1][self::m:power]]">
+    <xsl:apply-templates select="*[2]">
+        <xsl:with-param name="p" select="5"/>
+    </xsl:apply-templates>
+    <xsl:text>^{</xsl:text>
+    <xsl:apply-templates select="*[3]">
+        <xsl:with-param name="p" select="5"/>
+    </xsl:apply-templates>
+    <xsl:text>}</xsl:text>
+</xsl:template>
+
+<!-- 4.4.3.8 remainder -->
+<xsl:template match="m:apply[*[1][self::m:rem]]">
+    <xsl:param name="p" select="0"/>
+    <xsl:call-template name="binary">
+        <xsl:with-param name="mo">\mod </xsl:with-param>
+        <xsl:with-param name="p" select="$p"/>
+        <xsl:with-param name="this-p" select="3"/>
+    </xsl:call-template>
+</xsl:template>
+
+<!-- 4.4.3.9  times-->
+<xsl:template match="m:apply[*[1][self::m:times]]" name="times">
+  <xsl:param name="p" select="0"/>
+  <xsl:param name="first" select="1"/>
+  <xsl:if test="$p &gt; 3"><xsl:text>(</xsl:text></xsl:if>
+  <xsl:for-each select="*[position()&gt;1]">
+        <xsl:if test="position() &gt; 1">
+            <xsl:choose>
+                <xsl:when test="self::m:cn">\times <!-- times --></xsl:when>
+                <xsl:otherwise><!--invisible times--></xsl:otherwise>
+            </xsl:choose>
+        </xsl:if>
+        <xsl:if test="position()&gt;= $first">
+            <xsl:apply-templates select=".">
+                <xsl:with-param name="p" select="3"/>
+            </xsl:apply-templates>
+        </xsl:if>
+    </xsl:for-each>
+  <xsl:if test="$p &gt; 3"><xsl:text>)</xsl:text></xsl:if>
+</xsl:template>
+
+<!-- 4.4.3.10 root -->
+<xsl:template match="m:apply[*[1][self::m:root]]">
+    <xsl:text>\sqrt</xsl:text>
+    <xsl:if test="m:degree!=2">
+        <xsl:text>[</xsl:text>
+        <xsl:apply-templates select="m:degree/*"/>
+        <xsl:text>]</xsl:text>
+    </xsl:if>
+    <xsl:text>{</xsl:text>
+    <xsl:apply-templates select="*[position()&gt;1 and not(self::m:degree)]"/>
+    <xsl:text>}</xsl:text>
+</xsl:template>
+
+<!-- 4.4.3.11 gcd -->
+<xsl:template match="m:gcd"><xsl:text>\gcd </xsl:text></xsl:template>
+
+<!-- 4.4.3.12 and -->
+<xsl:template match="m:apply[*[1][self::m:and]]">
+    <xsl:param name="p" select="0"/>
+    <xsl:call-template name="infix">
+        <xsl:with-param name="this-p" select="2"/>
+        <xsl:with-param name="p" select="$p"/>
+        <xsl:with-param name="mo">\land <!-- and --></xsl:with-param>
+    </xsl:call-template>
+</xsl:template>
+
+<!-- 4.4.3.13 or -->
+<xsl:template match="m:apply[*[1][self::m:or]]">
+    <xsl:param name="p" select="0"/>
+    <xsl:call-template name="infix">
+        <xsl:with-param name="this-p" select="3"/>
+        <xsl:with-param name="p" select="$p"/>
+        <xsl:with-param name="mo">\lor </xsl:with-param>
+    </xsl:call-template>
+</xsl:template>
+
+<!-- 4.4.3.14 xor -->
+<xsl:template match="m:apply[*[1][self::m:xor]]">
+    <xsl:param name="p" select="0"/>
+    <xsl:call-template name="infix">
+        <xsl:with-param name="this-p" select="3"/>
+        <xsl:with-param name="p" select="$p"/>
+        <xsl:with-param name="mo">\mathop{\mathrm{xor}}</xsl:with-param>
+    </xsl:call-template>
+</xsl:template>
+
+<!-- 4.4.3.15 not -->
+<xsl:template match="m:apply[*[1][self::m:not]]">
+    <xsl:text>\neg </xsl:text>
+    <xsl:apply-templates select="*[2]">
+        <xsl:with-param name="p" select="7"/>
+    </xsl:apply-templates>
+</xsl:template>
+
+<!-- 4.4.3.16 implies -->
+<xsl:template match="m:apply[*[1][self::m:implies]]">
+    <xsl:param name="p" select="0"/>
+    <xsl:call-template name="binary">
+        <xsl:with-param name="mo">\implies </xsl:with-param>
+        <xsl:with-param name="p" select="$p"/>
+        <xsl:with-param name="this-p" select="3"/>
+    </xsl:call-template>
+</xsl:template>
+
+<!-- 4.4.3.17 forall 4.4.3.18 exists -->
+<xsl:template match="m:apply[*[1][self::m:forall or self::m:exists]]">
+    <xsl:text>\</xsl:text>
+    <xsl:value-of select="local-name(*[1])"/>
+    <xsl:text> </xsl:text>
+    <xsl:apply-templates select="m:bvar"/>
+    <xsl:if test="m:condition">
+        <xsl:text>, </xsl:text><xsl:apply-templates select="m:condition"/>
+    </xsl:if>
+    <xsl:if test="*[last()][local-name()!='condition'][local-name()!='bvar']">
+        <xsl:text>\colon </xsl:text>
+      <xsl:apply-templates select="*[last()]"/>
+  </xsl:if>
+</xsl:template>
+
+<!-- 4.4.3.19 abs -->
+<xsl:template match="m:apply[*[1][self::m:abs]]">
+    <xsl:text>\left|</xsl:text>
+    <xsl:apply-templates select="*[2]"/>
+    <xsl:text>\right|</xsl:text>
+</xsl:template>
+
+<!-- 4.4.3.20 conjugate -->
+<xsl:template match="m:apply[*[1][self::m:conjugate]]">
+    <xsl:text>\overline{</xsl:text><xsl:apply-templates select="*[2]"/><xsl:text>}</xsl:text>
+</xsl:template>
+
+<!-- 4.4.3.22 real -->
+<xsl:template match="m:real"><xsl:text>\Re </xsl:text></xsl:template>
+
+<!-- 4.4.3.23 imaginary -->
+<xsl:template match="m:imaginary"><xsl:text>\Im </xsl:text></xsl:template>
+
+<!-- 4.4.3.25 floor -->
+<xsl:template match="m:apply[*[1][self::m:floor]]">
+    <xsl:text>\lfloor </xsl:text>
+    <xsl:apply-templates select="*[2]"/>
+    <xsl:text>\rfloor </xsl:text>
+</xsl:template>
+
+<!-- 4.4.3.25 ceiling -->
+<xsl:template match="m:apply[*[1][self::m:ceiling]]">
+    <xsl:text>\lceil </xsl:text>
+    <xsl:apply-templates select="*[2]"/>
+    <xsl:text>\rceil </xsl:text>
+</xsl:template>
+
+<!-- 4.4.4.1 eq -->
+<xsl:template match="m:apply[*[1][self::m:eq]]">
+    <xsl:param name="p" select="0"/>
+    <xsl:call-template name="infix">
+        <xsl:with-param name="this-p" select="1"/>
+        <xsl:with-param name="p" select="$p"/>
+        <xsl:with-param name="mo">=</xsl:with-param>
+    </xsl:call-template>
+</xsl:template>
+
+<!-- 4.4.4.2 neq -->
+<xsl:template match="m:apply[*[1][self::m:neq]]">
+    <xsl:param name="p" select="0"/>
+    <xsl:call-template name="infix">
+        <xsl:with-param name="this-p" select="1"/>
+        <xsl:with-param name="p" select="$p"/>
+        <xsl:with-param name="mo">\neq </xsl:with-param>
+    </xsl:call-template>
+</xsl:template>
+
+<!-- 4.4.4.3 gt -->
+<xsl:template match="m:apply[*[1][self::m:gt]]">
+<xsl:param name="p" select="0"/>
+<xsl:call-template name="infix">
+    <xsl:with-param name="this-p" select="1"/>
+    <xsl:with-param name="p" select="$p"/>
+    <xsl:with-param name="mo">&gt; </xsl:with-param>
+</xsl:call-template>
+</xsl:template>
+
+<!-- 4.4.4.4 lt -->
+<xsl:template match="m:apply[*[1][self::m:lt]]">
+<xsl:param name="p" select="0"/>
+<xsl:call-template name="infix">
+    <xsl:with-param name="this-p" select="1"/>
+    <xsl:with-param name="p" select="$p"/>
+    <xsl:with-param name="mo">&lt; </xsl:with-param>
+</xsl:call-template>
+</xsl:template>
+
+<!-- 4.4.4.5 geq -->
+<xsl:template match="m:apply[*[1][self::m:geq]]">
+    <xsl:param name="p" select="0"/>
+    <xsl:call-template name="infix">
+        <xsl:with-param name="this-p" select="1"/>
+        <xsl:with-param name="p" select="$p"/>
+        <xsl:with-param name="mo">\ge </xsl:with-param>
+    </xsl:call-template>
+</xsl:template>
+
+<!-- 4.4.4.6 leq -->
+<xsl:template match="m:apply[*[1][self::m:leq]]">
+    <xsl:param name="p" select="0"/>
+    <xsl:call-template name="infix">
+        <xsl:with-param name="this-p" select="1"/>
+        <xsl:with-param name="p" select="$p"/>
+        <xsl:with-param name="mo">\le </xsl:with-param>
+    </xsl:call-template>
+</xsl:template>
+
+<!-- 4.4.4.7 equivalent -->
+<xsl:template match="m:apply[*[1][self::m:equivalent]]">
+    <xsl:param name="p" select="0"/>
+    <xsl:call-template name="infix">
+        <xsl:with-param name="this-p" select="1"/>
+        <xsl:with-param name="p" select="$p"/>
+        <xsl:with-param name="mo">\equiv </xsl:with-param>
+    </xsl:call-template>
+</xsl:template>
+
+<!-- 4.4.4.8 approx -->
+<xsl:template match="m:apply[*[1][self::m:approx]]">
+    <xsl:param name="p" select="0"/>
+    <xsl:call-template name="infix">
+        <xsl:with-param name="this-p" select="1"/>
+        <xsl:with-param name="p" select="$p"/>
+        <xsl:with-param name="mo">\approx </xsl:with-param>
+    </xsl:call-template>
+</xsl:template>
+
+<!-- 4.4.4.9 factorof -->
+<xsl:template match="m:apply[*[1][self::m:factorof]]">
+    <xsl:param name="p" select="0"/>
+    <xsl:call-template name="binary">
+        <xsl:with-param name="mo"> | </xsl:with-param>
+        <xsl:with-param name="p" select="$p"/>
+        <xsl:with-param name="this-p" select="3"/>
+    </xsl:call-template>
+</xsl:template>
+
+<!-- 4.4.5.1 int -->
+<xsl:template match="m:apply[*[1][self::m:int]]">
+    <xsl:text>\int</xsl:text>
+    <xsl:if test="m:lowlimit/*|m:interval/*[1]|m:condition/*">
+        <xsl:text>_{</xsl:text>
+        <xsl:apply-templates select="m:lowlimit/*|m:interval/*[1]|m:condition/*"/>
+        <xsl:text>}</xsl:text>
+    </xsl:if>
+    <xsl:if test="m:uplimit/*|m:interval/*[2]">
+        <xsl:text>^{</xsl:text>
+        <xsl:apply-templates select="m:uplimit/*|m:interval/*[2]"/>
+        <xsl:text>}</xsl:text>
+    </xsl:if>
+    <xsl:text> </xsl:text>
+    <xsl:apply-templates select="*[last()]"/>
+    <xsl:text>\,d </xsl:text>
+    <xsl:apply-templates select="m:bvar"/>
+</xsl:template>
+
+<!-- 4.4.5.2 diff -->
+<xsl:template match="m:apply[*[1][self::m:diff] and m:ci and count(*)=2]" priority="2">
+    <xsl:apply-templates select="*[2]"/>
+    <xsl:text>^\prime </xsl:text>
+</xsl:template>
+
+<xsl:template match="m:apply[*[1][self::m:diff]]" priority="1">
+    <xsl:text>\frac{</xsl:text>
+    <xsl:choose>
+        <xsl:when test="m:bvar/m:degree">
+            <xsl:text>d^{</xsl:text>
+            <xsl:apply-templates select="m:bvar/m:degree/node()"/>
+            <xsl:text>}</xsl:text>
+            <xsl:apply-templates select="*[last()]"/>
+            <xsl:text>}{d</xsl:text>
+            <xsl:apply-templates select="m:bvar/node()"/>
+            <xsl:text>^{</xsl:text>
+            <xsl:apply-templates select="m:bvar/m:degree/node()"/>
+            <xsl:text>}</xsl:text>
+        </xsl:when>
+        <xsl:otherwise>
+            <xsl:text>d </xsl:text>
+            <xsl:apply-templates select="*[last()]"/>
+            <xsl:text>}{d </xsl:text>
+            <xsl:apply-templates select="m:bvar"/>
+            <xsl:text>}</xsl:text>
+        </xsl:otherwise>
+    </xsl:choose>
+    <xsl:text>}</xsl:text>
+</xsl:template>
+
+<!-- 4.4.5.3 partialdiff -->
+<xsl:template match="m:apply[*[1][self::m:partialdiff] and m:list and m:ci and count(*)=3]" priority="2">
+    <xsl:text>D_{</xsl:text>
+    <xsl:for-each select="m:list[1]/*">
+        <xsl:apply-templates select="."/>
+        <xsl:if test="position()&lt;last()"><xsl:text>, </xsl:text></xsl:if>
+    </xsl:for-each>
+    <xsl:text>}</xsl:text>
+    <xsl:apply-templates select="*[3]"/>
+</xsl:template>
+
+<xsl:template match="m:apply[*[1][self::m:partialdiff]]" priority="1">
+    <xsl:text>\frac{\partial^{</xsl:text>
+    <xsl:choose>
+        <xsl:when test="m:degree">
+            <xsl:apply-templates select="m:degree/node()"/>
+        </xsl:when>
+        <xsl:when test="m:bvar/m:degree[string(number(.))='NaN']">
+            <xsl:for-each select="m:bvar/m:degree">
+                <xsl:apply-templates select="node()"/>
+                <xsl:if test="position()&lt;last()"><xsl:text>+</xsl:text></xsl:if>
+            </xsl:for-each>
+            <xsl:if test="count(m:bvar[not(m:degree)])&gt;0">
+                <xsl:text>+</xsl:text>
+                <xsl:value-of select="count(m:bvar[not(m:degree)])"/>
+            </xsl:if>
+        </xsl:when>
+        <xsl:otherwise>
+            <xsl:value-of select="sum(m:bvar/m:degree)+count(m:bvar[not(m:degree)])"/>
+        </xsl:otherwise>
+    </xsl:choose>
+    <xsl:text>}</xsl:text>
+    <xsl:apply-templates select="*[last()]"/>
+    <xsl:text>}{</xsl:text>
+    <xsl:for-each select="m:bvar">
+        <xsl:text>\partial </xsl:text>
+        <xsl:apply-templates select="node()"/>
+        <xsl:if test="m:degree">
+            <xsl:text>^{</xsl:text>
+            <xsl:apply-templates select="m:degree/node()"/>
+            <xsl:text>}</xsl:text>
+        </xsl:if>
+    </xsl:for-each>
+    <xsl:text>}</xsl:text>
+</xsl:template>
+
+<!-- 4.4.2.8 declare 4.4.5.4 lowlimit 4.4.5.5 uplimit 4.4.5.7 degree 4.4.9.5 momentabout -->
+<xsl:template match="m:declare | m:lowlimit | m:uplimit | m:degree | m:momentabout"/>
+
+<!-- 4.4.5.6  bvar-->
+<xsl:template match="m:bvar">
+    <xsl:apply-templates/>
+    <xsl:if test="following-sibling::m:bvar"><xsl:text>, </xsl:text></xsl:if>
+</xsl:template>
+
+<!-- 4.4.5.8 divergence-->
+<xsl:template match="m:divergence"><xsl:text>\mathop{\mathrm{div}}</xsl:text></xsl:template>
+
+<!-- 4.4.5.11 laplacian-->
+<xsl:template match="m:laplacian"><xsl:text>\nabla^2 </xsl:text></xsl:template>
+
+<!-- 4.4.6.1 set -->
+<xsl:template match="m:set">
+    <xsl:text>\{</xsl:text><xsl:call-template name="set"/><xsl:text>\}</xsl:text>
+</xsl:template>
+
+<!-- 4.4.6.2 list -->
+<xsl:template match="m:list">
+    <xsl:text>\left[</xsl:text><xsl:call-template name="set"/><xsl:text>\right]</xsl:text>
+</xsl:template>
+
+<xsl:template name="set">
+   <xsl:choose>
+        <xsl:when test="m:condition">
+        <xsl:apply-templates select="m:bvar/*[not(self::bvar or self::condition)]"/>
+        <xsl:text>\colon </xsl:text>
+            <xsl:apply-templates select="m:condition/node()"/>
+        </xsl:when>
+        <xsl:otherwise>
+            <xsl:for-each select="*">
+                <xsl:apply-templates select="."/>
+                <xsl:if test="position()!=last()"><xsl:text>, </xsl:text></xsl:if>
+            </xsl:for-each>
+        </xsl:otherwise>
+   </xsl:choose>
+</xsl:template>
+
+<!-- 4.4.6.3 union -->
+<xsl:template match="m:apply[*[1][self::m:union]]">
+    <xsl:param name="p" select="0"/>
+    <xsl:call-template name="infix">
+        <xsl:with-param name="this-p" select="2"/>
+        <xsl:with-param name="p" select="$p"/>
+        <xsl:with-param name="mo">\cup </xsl:with-param>
+    </xsl:call-template>
+</xsl:template>
+
+<!-- 4.4.6.4 intersect -->
+<xsl:template match="m:apply[*[1][self::m:intersect]]">
+    <xsl:param name="p" select="0"/>
+    <xsl:call-template name="infix">
+        <xsl:with-param name="this-p" select="3"/>
+        <xsl:with-param name="p" select="$p"/>
+        <xsl:with-param name="mo">\cap </xsl:with-param>
+    </xsl:call-template>
+</xsl:template>
+
+<!-- 4.4.6.5 in -->
+<xsl:template match="m:apply[*[1][self::m:in]]">
+    <xsl:param name="p" select="0"/>
+    <xsl:call-template name="binary">
+        <xsl:with-param name="mo">\in </xsl:with-param>
+        <xsl:with-param name="p" select="$p"/>
+        <xsl:with-param name="this-p" select="3"/>
+    </xsl:call-template>
+</xsl:template>
+
+<!-- 4.4.6.5 notin -->
+<xsl:template match="m:apply[*[1][self::m:notin]]">
+    <xsl:param name="p" select="0"/>
+    <xsl:call-template name="binary">
+        <xsl:with-param name="mo">\notin </xsl:with-param>
+        <xsl:with-param name="p" select="$p"/>
+        <xsl:with-param name="this-p" select="3"/>
+    </xsl:call-template>
+</xsl:template>
+
+<!-- 4.4.6.7 subset -->
+<xsl:template match="m:apply[*[1][self::m:subset]]">
+    <xsl:param name="p" select="0"/>
+    <xsl:call-template name="infix">
+        <xsl:with-param name="this-p" select="2"/>
+        <xsl:with-param name="p" select="$p"/>
+        <xsl:with-param name="mo">\subseteq </xsl:with-param>
+    </xsl:call-template>
+</xsl:template>
+
+<!-- 4.4.6.8 prsubset -->
+<xsl:template match="m:apply[*[1][self::m:prsubset]]">
+    <xsl:param name="p" select="0"/>
+    <xsl:call-template name="infix">
+        <xsl:with-param name="this-p" select="2"/>
+        <xsl:with-param name="p" select="$p"/>
+        <xsl:with-param name="mo">\subset </xsl:with-param>
+    </xsl:call-template>
+</xsl:template>
+
+<!-- 4.4.6.9 notsubset -->
+<xsl:template match="m:apply[*[1][self::m:notsubset]]">
+    <xsl:param name="p" select="0"/>
+    <xsl:call-template name="binary">
+        <xsl:with-param name="this-p" select="2"/>
+        <xsl:with-param name="p" select="$p"/>
+        <xsl:with-param name="mo">\nsubseteq </xsl:with-param>
+    </xsl:call-template>
+</xsl:template>
+
+<!-- 4.4.6.10 notprsubset -->
+<xsl:template match="m:apply[*[1][self::m:notprsubset]]">
+    <xsl:param name="p" select="0"/>
+    <xsl:call-template name="binary">
+        <xsl:with-param name="this-p" select="2"/>
+        <xsl:with-param name="p" select="$p"/>
+        <xsl:with-param name="mo">\not\subset </xsl:with-param>
+    </xsl:call-template>
+</xsl:template>
+
+<!-- 4.4.6.11 setdiff -->
+<xsl:template match="m:apply[*[1][self::m:setdiff]]">
+    <xsl:param name="p" select="0"/>
+    <xsl:call-template name="binary">
+        <xsl:with-param name="this-p" select="2"/>
+        <xsl:with-param name="p" select="$p"/>
+        <xsl:with-param name="mo">\setminus </xsl:with-param>
+    </xsl:call-template>
+</xsl:template>
+
+<!-- 4.4.6.12 card -->
+<xsl:template match="m:apply[*[1][self::m:card]]">
+    <xsl:text>|</xsl:text>
+    <xsl:apply-templates select="*[2]"/>
+    <xsl:text>|</xsl:text>
+</xsl:template>
+
+<!-- 4.4.6.13 cartesianproduct 4.4.10.6 vectorproduct -->
+<xsl:template match="m:apply[*[1][self::m:cartesianproduct or self::m:vectorproduct]]">
+    <xsl:param name="p" select="0"/>
+    <xsl:call-template name="infix">
+        <xsl:with-param name="this-p" select="2"/>
+        <xsl:with-param name="p" select="$p"/>
+        <xsl:with-param name="mo">\times </xsl:with-param>
+    </xsl:call-template>
+</xsl:template>
+
+<xsl:template
+match="m:apply[*[1][self::m:cartesianproduct][count(following-sibling::m:reals)=count(following-sibling::*)]]"
+priority="2">
+    <xsl:apply-templates select="*[2]">
+        <xsl:with-param name="p" select="5"/>
+    </xsl:apply-templates>
+    <xsl:text>^{</xsl:text>
+    <xsl:value-of select="count(*)-1"/>
+    <xsl:text>}</xsl:text>
+</xsl:template>
+
+<!-- 4.4.7.1 sum -->
+<xsl:template match="m:apply[*[1][self::m:sum]]">
+    <xsl:text>\sum</xsl:text><xsl:call-template name="series"/>
+</xsl:template>
+
+<!-- 4.4.7.2 product -->
+<xsl:template match="m:apply[*[1][self::m:product]]">
+    <xsl:text>\prod</xsl:text><xsl:call-template name="series"/>
+</xsl:template>
+
+<xsl:template name="series">
+    <xsl:if test="m:lowlimit/*|m:interval/*[1]|m:condition/*">
+        <xsl:text>_{</xsl:text>
+        <xsl:if test="not(m:condition)">
+            <xsl:apply-templates select="m:bvar"/>
+            <xsl:text>=</xsl:text>
+        </xsl:if>
+        <xsl:apply-templates select="m:lowlimit/*|m:interval/*[1]|m:condition/*"/>
+        <xsl:text>}</xsl:text>
+    </xsl:if>
+    <xsl:if test="m:uplimit/*|m:interval/*[2]">
+        <xsl:text>^{</xsl:text>
+        <xsl:apply-templates select="m:uplimit/*|m:interval/*[2]"/>
+        <xsl:text>}</xsl:text>
+    </xsl:if>
+    <xsl:text> </xsl:text>
+    <xsl:apply-templates select="*[last()]"/>
+</xsl:template>
+
+<!-- 4.4.7.3 limit -->
+<xsl:template match="m:apply[*[1][self::m:limit]]">
+    <xsl:text>\lim_{</xsl:text>
+    <xsl:apply-templates select="m:lowlimit|m:condition/*"/>
+    <xsl:text>}</xsl:text>
+    <xsl:apply-templates select="*[last()]"/>
+</xsl:template>
+
+<xsl:template match="m:apply[m:limit]/m:lowlimit" priority="3">
+    <xsl:apply-templates select="../m:bvar/node()"/>
+    <xsl:text>\to </xsl:text>
+    <xsl:apply-templates/>
+</xsl:template>
+
+<!-- 4.4.7.4 tendsto -->
+<xsl:template match="m:apply[*[1][self::m:tendsto]]">
+    <xsl:param name="p"/>
+    <xsl:call-template name="binary">
+        <xsl:with-param name="this-p" select="2"/>
+        <xsl:with-param name="p" select="$p"/>
+        <xsl:with-param name="mo">
+            <xsl:choose>
+                <xsl:when test="@type='above'">\searrow </xsl:when>
+                <xsl:when test="@type='below'">\nearrow </xsl:when>
+                <xsl:when test="@type='two-sided'">\rightarrow </xsl:when>
+                <xsl:otherwise>\to </xsl:otherwise>
+            </xsl:choose>
+        </xsl:with-param>
+    </xsl:call-template>
+</xsl:template>
+
+<!-- 4.4.8.1 common tringonometric functions 4.4.8.3 natural logarithm -->
+<xsl:template match="m:apply[*[1][
+ self::m:sin or         self::m:cos or     self::m:tan or        self::m:sec or
+ self::m:csc or         self::m:cot or     self::m:sinh or         self::m:cosh or
+ self::m:tanh or         self::m:coth or    self::m:arcsin or     self::m:arccos or
+ self::m:arctan or     self::m:ln]]">
+    <xsl:text>\</xsl:text>
+    <xsl:value-of select="local-name(*[1])"/>
+    <xsl:text> </xsl:text>
+    <xsl:apply-templates select="*[2]">
+        <xsl:with-param name="p" select="7"/>
+    </xsl:apply-templates>
+</xsl:template>
+
+<xsl:template match="m:sin | m:cos | m:tan | m:sec | m:csc |
+                                 m:cot | m:sinh | m:cosh | m:tanh | m:coth |
+                                 m:arcsin | m:arccos | m:arctan | m:ln">
+    <xsl:text>\</xsl:text>
+    <xsl:value-of select="local-name(.)"/>
+    <xsl:text> </xsl:text>
+</xsl:template>
+
+<xsl:template match="m:apply[*[1][
+ self::m:sech or         self::m:csch or        self::m:arccosh or
+ self::m:arccot or     self::m:arccoth or     self::m:arccsc or
+ self::m:arccsch or self::m:arcsec or     self::m:arcsech or
+ self::m:arcsinh or self::m:arctanh]]">
+    <xsl:text>\mathrm{</xsl:text>
+    <xsl:value-of select="local-name(*[1])"/>
+    <xsl:text>\,}</xsl:text>
+    <xsl:apply-templates select="*[2]">
+        <xsl:with-param name="p" select="7"/>
+    </xsl:apply-templates>
+</xsl:template>
+
+<xsl:template match="m:sech | m:csch | m:arccosh | m:arccot |
+                                 m:arccoth | m:arccsc |m:arccsch |m:arcsec |
+                                 m:arcsech | m:arcsinh | m:arctanh">
+    <xsl:text>\mathrm{</xsl:text>
+    <xsl:value-of select="local-name(.)"/>
+    <xsl:text>}</xsl:text>
+</xsl:template>
+
+<!-- 4.4.8.2 exp -->
+<xsl:template match="m:apply[*[1][self::m:exp]]">
+    <xsl:text>e^{</xsl:text><xsl:apply-templates select="*[2]"/><xsl:text>}</xsl:text>
+</xsl:template>
+
+<!-- 4.4.8.4 log -->
+<xsl:template match="m:apply[*[1][self::m:log]]">
+    <xsl:text>\lg </xsl:text>
+    <xsl:apply-templates select="*[last()]">
+        <xsl:with-param name="p" select="7"/>
+    </xsl:apply-templates>
+</xsl:template>
+
+<xsl:template match="m:apply[*[1][self::m:log] and m:logbase != 10]">
+    <xsl:text>\log_{</xsl:text>
+    <xsl:apply-templates select="m:logbase/node()"/>
+    <xsl:text>}</xsl:text>
+    <xsl:apply-templates select="*[last()]">
+        <xsl:with-param name="p" select="7"/>
+    </xsl:apply-templates>
+</xsl:template>
+
+<!-- 4.4.9.1 mean -->
+<xsl:template match="m:apply[*[1][self::m:mean]]">
+    <xsl:text>\langle </xsl:text>
+    <xsl:for-each select="*[position()&gt;1]">
+        <xsl:apply-templates select="."/>
+        <xsl:if test="position() !=last()"><xsl:text>, </xsl:text></xsl:if>
+    </xsl:for-each>
+    <xsl:text>\rangle </xsl:text>
+</xsl:template>
+
+<!-- 4.4.9.2 sdef -->
+<xsl:template match="m:sdev"><xsl:text>\sigma </xsl:text></xsl:template>
+
+<!-- 4.4.9.3 variance -->
+<xsl:template match="m:apply[*[1][self::m:variance]]">
+    <xsl:text>\sigma(</xsl:text>
+    <xsl:apply-templates select="*[2]"/>
+    <xsl:text>)^2</xsl:text>
+</xsl:template>
+
+<!-- 4.4.9.5 moment -->
+<xsl:template match="m:apply[*[1][self::m:moment]]">
+    <xsl:text>\langle </xsl:text>
+    <xsl:apply-templates select="*[last()]"/>
+    <xsl:text>^{</xsl:text>
+    <xsl:apply-templates select="m:degree/node()"/>
+    <xsl:text>}\rangle</xsl:text>
+    <xsl:if test="m:momentabout">
+        <xsl:text>_{</xsl:text>
+        <xsl:apply-templates select="m:momentabout/node()"/>
+        <xsl:text>}</xsl:text>
+    </xsl:if>
+    <xsl:text> </xsl:text>
+</xsl:template>
+
+<!-- 4.4.10.1 vector  -->
+<xsl:template match="m:vector">
+    <xsl:text>\left(\begin{array}{c}</xsl:text>
+    <xsl:for-each select="*">
+        <xsl:apply-templates select="."/>
+        <xsl:if test="position()!=last()"><xsl:text>\\ </xsl:text></xsl:if>
+    </xsl:for-each>
+    <xsl:text>\end{array}\right)</xsl:text>
+</xsl:template>
+
+<!-- 4.4.10.2 matrix  -->
+<xsl:template match="m:matrix">
+    <xsl:text>\begin{pmatrix}</xsl:text>
+    <xsl:apply-templates/>
+    <xsl:text>\end{pmatrix}</xsl:text>
+</xsl:template>
+
+<!-- 4.4.10.3 matrixrow  -->
+<xsl:template match="m:matrixrow">
+    <xsl:for-each select="*">
+        <xsl:apply-templates select="."/>
+        <xsl:if test="position()!=last()"><xsl:text> &amp; </xsl:text></xsl:if>
+    </xsl:for-each>
+    <xsl:if test="position()!=last()"><xsl:text>\\ </xsl:text></xsl:if>
+</xsl:template>
+
+<!-- 4.4.10.4 determinant  -->
+<xsl:template match="m:apply[*[1][self::m:determinant]]">
+    <xsl:text>\det </xsl:text>
+    <xsl:apply-templates select="*[2]">
+        <xsl:with-param name="p" select="7"/>
+    </xsl:apply-templates>
+</xsl:template>
+
+<xsl:template match="m:apply[*[1][self::m:determinant]][*[2][self::m:matrix]]" priority="2">
+    <xsl:text>\begin{vmatrix}</xsl:text>
+    <xsl:apply-templates select="m:matrix/*"/>
+    <xsl:text>\end{vmatrix}</xsl:text>
+</xsl:template>
+
+<!-- 4.4.10.5 transpose -->
+<xsl:template match="m:apply[*[1][self::m:transpose]]">
+    <xsl:apply-templates select="*[2]">
+        <xsl:with-param name="p" select="7"/>
+    </xsl:apply-templates>
+    <xsl:text>^T</xsl:text>
+</xsl:template>
+
+<!-- 4.4.10.5 selector -->
+<xsl:template match="m:apply[*[1][self::m:selector]]">
+    <xsl:apply-templates select="*[2]">
+        <xsl:with-param name="p" select="7"/>
+    </xsl:apply-templates>
+    <xsl:text>_{</xsl:text>
+    <xsl:for-each select="*[position()&gt;2]">
+        <xsl:apply-templates select="."/>
+        <xsl:if test="position() !=last()"><xsl:text>, </xsl:text></xsl:if>
+    </xsl:for-each>
+    <xsl:text>}</xsl:text>
+</xsl:template>
+
+<!-- 4.4.10.7 scalarproduct 4.4.10.8 outerproduct -->
+<xsl:template match="m:apply[*[1][self::m:scalarproduct or self::m:outerproduct]]">
+    <xsl:param name="p" select="0"/>
+    <xsl:call-template name="infix">
+        <xsl:with-param name="this-p" select="2"/>
+        <xsl:with-param name="p" select="$p"/>
+        <xsl:with-param name="mo">\dot </xsl:with-param>
+    </xsl:call-template>
+</xsl:template>
+
+<!-- 4.4.11.2 semantics -->
+<xsl:template match="m:semantics"><xsl:apply-templates select="*[1]"/></xsl:template>
+
+<xsl:template match="m:semantics[m:annotation/@encoding='TeX']">
+    <xsl:apply-templates select="m:annotation[@encoding='TeX']/node()"/>
+</xsl:template>
+
+<!-- 4.4.12.1 integers -->
+<xsl:template match="m:integers"><xsl:text>\mathbb{Z}</xsl:text></xsl:template>
+
+<!-- 4.4.12.2 reals -->
+<xsl:template match="m:reals"><xsl:text>\mathbb{R}</xsl:text></xsl:template>
+
+<!-- 4.4.12.3 rationals -->
+<xsl:template match="m:rationals"><xsl:text>\mathbb{Q}</xsl:text></xsl:template>
+
+<!-- 4.4.12.4 naturalnumbers -->
+<xsl:template match="m:naturalnumbers"><xsl:text>\mathbb{N}</xsl:text></xsl:template>
+
+<!-- 4.4.12.5 complexes -->
+<xsl:template match="m:complexes"><xsl:text>\mathbb{C}</xsl:text></xsl:template>
+
+<!-- 4.4.12.6 primes -->
+<xsl:template match="m:primes"><xsl:text>\mathbb{P}</xsl:text></xsl:template>
+
+<!-- 4.4.12.7 exponentiale -->
+<xsl:template match="m:exponentiale"><xsl:text>e</xsl:text></xsl:template>
+
+<!-- 4.4.12.8 imaginaryi -->
+<xsl:template match="m:imaginaryi"><xsl:text>i</xsl:text></xsl:template>
+
+<!-- 4.4.12.9 notanumber -->
+<xsl:template match="m:notanumber"><xsl:text>NaN</xsl:text></xsl:template>
+
+<!-- 4.4.12.10 true -->
+<xsl:template match="m:true"><xsl:text>\mbox{true}</xsl:text></xsl:template>
+
+<!-- 4.4.12.11 false -->
+<xsl:template match="m:false"><xsl:text>\mbox{false}</xsl:text></xsl:template>
+
+<!-- 4.4.12.12 emptyset -->
+<xsl:template match="m:emptyset"><xsl:text>\emptyset </xsl:text></xsl:template>
+
+<!-- 4.4.12.13 pi -->
+<xsl:template match="m:pi"><xsl:text>\pi </xsl:text></xsl:template>
+
+<!-- 4.4.12.14 eulergamma -->
+<xsl:template match="m:eulergamma"><xsl:text>\gamma </xsl:text></xsl:template>
+
+<!-- 4.4.12.15 infinity -->
+<xsl:template match="m:infinity"><xsl:text>\infty </xsl:text></xsl:template>
+
+<!-- ****************************** -->
+<xsl:template name="infix" >
+  <xsl:param name="mo"/>
+  <xsl:param name="p" select="0"/>
+  <xsl:param name="this-p" select="0"/>
+  <xsl:if test="$this-p &lt; $p"><xsl:text>(</xsl:text></xsl:if>
+  <xsl:for-each select="*[position()&gt;1]">
+        <xsl:if test="position() &gt; 1">
+            <xsl:copy-of select="$mo"/>
+        </xsl:if>
+        <xsl:apply-templates select=".">
+            <xsl:with-param name="p" select="$this-p"/>
+        </xsl:apply-templates>
+    </xsl:for-each>
+  <xsl:if test="$this-p &lt; $p"><xsl:text>)</xsl:text></xsl:if>
+</xsl:template>
+
+<xsl:template name="binary" >
+  <xsl:param name="mo"/>
+  <xsl:param name="p" select="0"/>
+  <xsl:param name="this-p" select="0"/>
+  <xsl:if test="$this-p &lt; $p"><xsl:text>(</xsl:text></xsl:if>
+    <xsl:apply-templates select="*[2]">
+        <xsl:with-param name="p" select="$this-p"/>
+    </xsl:apply-templates>
+    <xsl:value-of select="$mo"/>
+    <xsl:apply-templates select="*[3]">
+        <xsl:with-param name="p" select="$this-p"/>
+    </xsl:apply-templates>
+    <xsl:if test="$this-p &lt; $p"><xsl:text>)</xsl:text></xsl:if>
+</xsl:template>
+
+</xsl:stylesheet>
diff --git a/src/main/resources/xslt/mathml_latex/entities.xsl b/src/main/resources/xslt/mathml_latex/entities.xsl
new file mode 100644
index 00000000000..3b4338152a5
--- /dev/null
+++ b/src/main/resources/xslt/mathml_latex/entities.xsl
@@ -0,0 +1,316 @@
+<?xml version='1.0' encoding="UTF-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+        xmlns:m="http://www.w3.org/1998/Math/MathML"
+                version='1.0'>
+
+<!-- ====================================================================== -->
+<!-- $id: entities.xsl, 2002/22/11 Exp $
+     This file is part of the XSLT MathML Library distribution.
+     See ./README or http://www.raleigh.ru/MathML/mmltex for
+     copyright and other information                                        -->
+<!-- ====================================================================== -->
+
+<xsl:template name="replaceEntities">
+    <xsl:param name="content"/>
+    <xsl:if test="string-length($content)>0">
+    <xsl:choose>
+        <xsl:when test="starts-with($content,'&#x0025B;')"><xsl:value-of select="'\varepsilon '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0025B;')"/></xsl:call-template></xsl:when>    <!--/varepsilon -->
+
+<!-- ====================================================================== -->
+<!--     Unicode 3.2
+    Greek
+    Range: 0370-03FF
+    http://www.unicode.org/charts/PDF/U0370.pdf                        -->
+<!-- ====================================================================== -->
+        <xsl:when test="starts-with($content,'&#x00393;')"><xsl:value-of select="'\Gamma '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00393;')"/></xsl:call-template></xsl:when>    <!--/Gamma capital Gamma, Greek -->
+        <xsl:when test="starts-with($content,'&#x00394;')"><xsl:value-of select="'\Delta '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00394;')"/></xsl:call-template></xsl:when>    <!--/Delta capital Delta, Greek -->
+        <xsl:when test="starts-with($content,'&#x00398;')"><xsl:value-of select="'\Theta '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x00398;')"/></xsl:call-template></xsl:when>    <!--/Theta capital Theta, Greek -->
+        <xsl:when test="starts-with($content,'&#x0039B;')"><xsl:value-of select="'\Lambda '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0039B;')"/></xsl:call-template></xsl:when>    <!--/Lambda capital Lambda, Greek -->
+        <xsl:when test="starts-with($content,'&#x0039E;')"><xsl:value-of select="'\Xi '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0039E;')"/></xsl:call-template></xsl:when>    <!--/Xi capital Xi, Greek -->
+        <xsl:when test="starts-with($content,'&#x003A0;')"><xsl:value-of select="'\Pi '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003A0;')"/></xsl:call-template></xsl:when>    <!--/Pi capital Pi, Greek -->
+        <xsl:when test="starts-with($content,'&#x003A3;')"><xsl:value-of select="'\Sigma '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003A3;')"/></xsl:call-template></xsl:when>    <!--/Sigma capital Sigma, Greek -->
+        <xsl:when test="starts-with($content,'&#x003A6;')"><xsl:value-of select="'\Phi '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003A6;')"/></xsl:call-template></xsl:when>    <!--/Phi capital Phi, Greek -->
+        <xsl:when test="starts-with($content,'&#x003A8;')"><xsl:value-of select="'\Psi '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003A8;')"/></xsl:call-template></xsl:when>    <!--/Psi capital Psi, Greek -->
+        <xsl:when test="starts-with($content,'&#x003A9;')"><xsl:value-of select="'\Omega '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003A9;')"/></xsl:call-template></xsl:when>    <!--/Omega capital Omega, Greek -->
+        <xsl:when test="starts-with($content,'&#x003B1;')"><xsl:value-of select="'\alpha '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003B1;')"/></xsl:call-template></xsl:when>    <!--/alpha small alpha, Greek -->
+        <xsl:when test="starts-with($content,'&#x003B2;')"><xsl:value-of select="'\beta '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003B2;')"/></xsl:call-template></xsl:when>    <!--/beta small beta, Greek -->
+        <xsl:when test="starts-with($content,'&#x003B3;')"><xsl:value-of select="'\gamma '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003B3;')"/></xsl:call-template></xsl:when>    <!--/gamma small gamma, Greek -->
+        <xsl:when test="starts-with($content,'&#x003B4;')"><xsl:value-of select="'\delta '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003B4;')"/></xsl:call-template></xsl:when>    <!--/delta small delta, Greek -->
+        <xsl:when test="starts-with($content,'&#x003B5;')"><xsl:value-of select="'\epsilon '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003B5;')"/></xsl:call-template></xsl:when>    <!--/straightepsilon, small epsilon, Greek -->
+        <xsl:when test="starts-with($content,'&#x003B6;')"><xsl:value-of select="'\zeta '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003B6;')"/></xsl:call-template></xsl:when>    <!--/zeta small zeta, Greek -->
+        <xsl:when test="starts-with($content,'&#x003B7;')"><xsl:value-of select="'\eta '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003B7;')"/></xsl:call-template></xsl:when>    <!--/eta small eta, Greek -->
+        <xsl:when test="starts-with($content,'&#x003B8;')"><xsl:value-of select="'\theta '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003B8;')"/></xsl:call-template></xsl:when>    <!--/theta straight theta, small theta, Greek -->
+        <xsl:when test="starts-with($content,'&#x003B9;')"><xsl:value-of select="'\iota '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003B9;')"/></xsl:call-template></xsl:when>    <!--/iota small iota, Greek -->
+        <xsl:when test="starts-with($content,'&#x003BA;')"><xsl:value-of select="'\kappa '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003BA;')"/></xsl:call-template></xsl:when>    <!--/kappa small kappa, Greek -->
+        <xsl:when test="starts-with($content,'&#x003BB;')"><xsl:value-of select="'\lambda '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003BB;')"/></xsl:call-template></xsl:when>    <!--/lambda small lambda, Greek -->
+        <xsl:when test="starts-with($content,'&#x003BC;')"><xsl:value-of select="'\mu '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003BC;')"/></xsl:call-template></xsl:when>    <!--/mu small mu, Greek -->
+        <xsl:when test="starts-with($content,'&#x003BD;')"><xsl:value-of select="'\nu '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003BD;')"/></xsl:call-template></xsl:when>    <!--/nu small nu, Greek -->
+        <xsl:when test="starts-with($content,'&#x003BE;')"><xsl:value-of select="'\xi '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003BE;')"/></xsl:call-template></xsl:when>    <!--/xi small xi, Greek -->
+        <xsl:when test="starts-with($content,'&#x003C0;')"><xsl:value-of select="'\pi '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003C0;')"/></xsl:call-template></xsl:when>    <!--/pi small pi, Greek -->
+        <xsl:when test="starts-with($content,'&#x003C1;')"><xsl:value-of select="'\rho '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003C1;')"/></xsl:call-template></xsl:when>    <!--/rho small rho, Greek -->
+        <xsl:when test="starts-with($content,'&#x003C2;')"><xsl:value-of select="'\varsigma '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003C2;')"/></xsl:call-template></xsl:when>    <!--/varsigma -->
+        <xsl:when test="starts-with($content,'&#x003C3;')"><xsl:value-of select="'\sigma '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003C3;')"/></xsl:call-template></xsl:when>    <!--/sigma small sigma, Greek -->
+        <xsl:when test="starts-with($content,'&#x003C4;')"><xsl:value-of select="'\tau '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003C4;')"/></xsl:call-template></xsl:when>    <!--/tau small tau, Greek -->
+        <xsl:when test="starts-with($content,'&#x003C5;')"><xsl:value-of select="'\upsilon '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003C5;')"/></xsl:call-template></xsl:when>    <!--/upsilon small upsilon, Greek -->
+        <xsl:when test="starts-with($content,'&#x003C6;')"><xsl:value-of select="'\phi '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003C6;')"/></xsl:call-template></xsl:when>    <!--/straightphi - small phi, Greek -->
+        <xsl:when test="starts-with($content,'&#x003C7;')"><xsl:value-of select="'\chi '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003C7;')"/></xsl:call-template></xsl:when>    <!--/chi small chi, Greek -->
+        <xsl:when test="starts-with($content,'&#x003C8;')"><xsl:value-of select="'\psi '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003C8;')"/></xsl:call-template></xsl:when>    <!--/psi small psi, Greek -->
+        <xsl:when test="starts-with($content,'&#x003C9;')"><xsl:value-of select="'\omega '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003C9;')"/></xsl:call-template></xsl:when>    <!--/omega small omega, Greek -->
+        <xsl:when test="starts-with($content,'&#x003D1;')"><xsl:value-of select="'\vartheta '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003D1;')"/></xsl:call-template></xsl:when>    <!--/vartheta - curly or open theta -->
+        <xsl:when test="starts-with($content,'&#x003D2;')"><xsl:value-of select="'\Upsilon '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003D2;')"/></xsl:call-template></xsl:when>    <!--/Upsilon capital Upsilon, Greek -->
+        <xsl:when test="starts-with($content,'&#x003D5;')"><xsl:value-of select="'\varphi '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003D5;')"/></xsl:call-template></xsl:when>    <!--/varphi - curly or open phi -->
+        <xsl:when test="starts-with($content,'&#x003D6;')"><xsl:value-of select="'\varpi '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003D6;')"/></xsl:call-template></xsl:when>        <!--/varpi -->
+        <xsl:when test="starts-with($content,'&#x003F0;')"><xsl:value-of select="'\varkappa '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003F0;')"/></xsl:call-template></xsl:when>    <!--/varkappa -->
+        <xsl:when test="starts-with($content,'&#x003F1;')"><xsl:value-of select="'\varrho '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x003F1;')"/></xsl:call-template></xsl:when>    <!--/varrho -->
+
+<!-- ====================================================================== -->
+        <xsl:when test="starts-with($content,'&#x0200B;')"><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0200B;')"/></xsl:call-template></xsl:when>                        <!--short form of  &InvisibleComma; -->
+        <xsl:when test="starts-with($content,'&#x02026;')"><xsl:value-of select="'\dots '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02026;')"/></xsl:call-template></xsl:when>
+        <xsl:when test="starts-with($content,'&#x02032;')"><xsl:value-of select="'\prime '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02032;')"/></xsl:call-template></xsl:when>        <!--/prime prime or minute -->
+        <xsl:when test="starts-with($content,'&#x02061;')"><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02061;')"/></xsl:call-template></xsl:when>                        <!-- ApplyFunction -->
+        <xsl:when test="starts-with($content,'&#x02062;')"><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02062;')"/></xsl:call-template></xsl:when>                        <!-- InvisibleTimes -->
+<!-- ====================================================================== -->
+<!--     Unicode 3.2
+    Letterlike Symbols
+    Range: 2100-214F
+    http://www.unicode.org/charts/PDF/U2100.pdf                        -->
+<!-- ====================================================================== -->
+        <xsl:when test="starts-with($content,'&#x0210F;&#x0FE00;')"><xsl:value-of select="'\hbar '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0210F;&#x0FE00;')"/></xsl:call-template></xsl:when>    <!--/hbar - Planck's over 2pi -->
+        <xsl:when test="starts-with($content,'&#x0210F;')"><xsl:value-of select="'\hslash '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0210F;')"/></xsl:call-template></xsl:when>    <!--/hslash - variant Planck's over 2pi --> <!-- Required amssymb -->
+        <xsl:when test="starts-with($content,'&#x02111;')"><xsl:value-of select="'\Im '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02111;')"/></xsl:call-template></xsl:when>        <!--/Im - imaginary   -->
+        <xsl:when test="starts-with($content,'&#x02113;')"><xsl:value-of select="'\ell '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02113;')"/></xsl:call-template></xsl:when>        <!--/ell - cursive small l -->
+        <xsl:when test="starts-with($content,'&#x02118;')"><xsl:value-of select="'\wp '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02118;')"/></xsl:call-template></xsl:when>        <!--/wp - Weierstrass p -->
+        <xsl:when test="starts-with($content,'&#x0211C;')"><xsl:value-of select="'\Re '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0211C;')"/></xsl:call-template></xsl:when>        <!--/Re - real -->
+        <xsl:when test="starts-with($content,'&#x02127;')"><xsl:value-of select="'\mho '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02127;')"/></xsl:call-template></xsl:when>        <!--/mho - conductance -->
+        <xsl:when test="starts-with($content,'&#x02135;')"><xsl:value-of select="'\aleph '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02135;')"/></xsl:call-template></xsl:when>        <!--/aleph aleph, Hebrew -->
+        <xsl:when test="starts-with($content,'&#x02136;')"><xsl:value-of select="'\beth '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02136;')"/></xsl:call-template></xsl:when>        <!--/beth - beth, Hebrew --> <!-- Required amssymb -->
+        <xsl:when test="starts-with($content,'&#x02137;')"><xsl:value-of select="'\gimel '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02137;')"/></xsl:call-template></xsl:when>        <!--/gimel - gimel, Hebrew --> <!-- Required amssymb -->
+        <xsl:when test="starts-with($content,'&#x02138;')"><xsl:value-of select="'\daleth '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02138;')"/></xsl:call-template></xsl:when>    <!--/daleth - daleth, Hebrew --> <!-- Required amssymb -->
+        <xsl:when test="starts-with($content,'&#x02145;')"><xsl:value-of select="'D'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02145;')"/></xsl:call-template></xsl:when>        <!--D for use in differentials, e.g., within integrals -->
+        <xsl:when test="starts-with($content,'&#x02146;')"><xsl:value-of select="'d'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02146;')"/></xsl:call-template></xsl:when>        <!--d for use in differentials, e.g., within integrals -->
+        <xsl:when test="starts-with($content,'&#x02147;')"><xsl:value-of select="'e'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02147;')"/></xsl:call-template></xsl:when>        <!--e use for the exponential base of the natural logarithms -->
+        <xsl:when test="starts-with($content,'&#x02148;')"><xsl:value-of select="'i'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02148;')"/></xsl:call-template></xsl:when>        <!--i for use as a square root of -1 -->
+
+<!-- ====================================================================== -->
+        <xsl:when test="starts-with($content,'&#x02192;')"><xsl:value-of select="'\to '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02192;')"/></xsl:call-template></xsl:when>        <!--/rightarrow /to A: =rightward arrow -->
+
+<!-- ====================================================================== -->
+<!--     Unicode 3.2
+    Mathematical Operators
+    Range: 2200-22FF
+    http://www.unicode.org/charts/PDF/U2200.pdf                         -->
+<!-- ====================================================================== -->
+        <xsl:when test="starts-with($content,'&#x02200;')"><xsl:value-of select="'\forall '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02200;')"/></xsl:call-template></xsl:when>    <!--/forall for all -->
+        <xsl:when test="starts-with($content,'&#x02201;')"><xsl:value-of select="'\complement '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02201;')"/></xsl:call-template></xsl:when>    <!--/complement - complement sign --> <!-- Required amssymb -->
+        <xsl:when test="starts-with($content,'&#x02202;')"><xsl:value-of select="'\partial '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02202;')"/></xsl:call-template></xsl:when>    <!--/partial partial differential -->
+        <xsl:when test="starts-with($content,'&#x02203;')"><xsl:value-of select="'\exists '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02203;')"/></xsl:call-template></xsl:when>    <!--/exists at least one exists -->
+        <xsl:when test="starts-with($content,'&#x02204;')"><xsl:value-of select="'\nexists '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02204;')"/></xsl:call-template></xsl:when>    <!--/nexists - negated exists --> <!-- Required amssymb -->
+        <xsl:when test="starts-with($content,'&#x02205;&#x0FE00;')"><xsl:value-of select="'\emptyset '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02205;&#x0FE00;')"/></xsl:call-template></xsl:when>    <!--/emptyset - zero, slash -->
+        <xsl:when test="starts-with($content,'&#x02205;')"><xsl:value-of select="'\varnothing '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02205;')"/></xsl:call-template></xsl:when>    <!--/varnothing - circle, slash --> <!-- Required amssymb -->
+<!--        <xsl:when test="starts-with($content,'&#x02206;')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02206;')"/></xsl:call-template></xsl:when>-->
+        <xsl:when test="starts-with($content,'&#x02207;')"><xsl:value-of select="'\nabla '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02207;')"/></xsl:call-template></xsl:when>        <!--/nabla del, Hamilton operator -->
+        <xsl:when test="starts-with($content,'&#x02208;')"><xsl:value-of select="'\in '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02208;')"/></xsl:call-template></xsl:when>        <!--/in R: set membership  -->
+        <xsl:when test="starts-with($content,'&#x02209;')"><xsl:value-of select="'\notin '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02209;')"/></xsl:call-template></xsl:when>        <!--/notin N: negated set membership -->
+        <xsl:when test="starts-with($content,'&#x0220B;')"><xsl:value-of select="'\ni '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0220B;')"/></xsl:call-template></xsl:when>        <!--/ni /owns R: contains -->
+        <xsl:when test="starts-with($content,'&#x0220C;')"><xsl:value-of select="'\not\ni '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0220C;')"/></xsl:call-template></xsl:when>    <!--negated contains -->
+        <xsl:when test="starts-with($content,'&#x0220F;')"><xsl:value-of select="'\prod '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0220F;')"/></xsl:call-template></xsl:when>        <!--/prod L: product operator -->
+        <xsl:when test="starts-with($content,'&#x02210;')"><xsl:value-of select="'\coprod '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02210;')"/></xsl:call-template></xsl:when>    <!--/coprod L: coproduct operator -->
+        <xsl:when test="starts-with($content,'&#x02211;')"><xsl:value-of select="'\sum '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02211;')"/></xsl:call-template></xsl:when>        <!--/sum L: summation operator -->
+        <xsl:when test="starts-with($content,'&#x02212;')"><xsl:value-of select="'-'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02212;')"/></xsl:call-template></xsl:when>        <!--B: minus sign -->
+        <xsl:when test="starts-with($content,'&#x02213;')"><xsl:value-of select="'\mp '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02213;')"/></xsl:call-template></xsl:when>        <!--/mp B: minus-or-plus sign -->
+        <xsl:when test="starts-with($content,'&#x02214;')"><xsl:value-of select="'\dotplus '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02214;')"/></xsl:call-template></xsl:when>    <!--/dotplus B: plus sign, dot above --> <!-- Required amssymb -->
+<!--        <xsl:when test="starts-with($content,'&#x02215;')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02215;')"/></xsl:call-template></xsl:when>-->
+        <xsl:when test="starts-with($content,'&#x02216;')"><xsl:value-of select="'\setminus '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02216;')"/></xsl:call-template></xsl:when>    <!--/setminus B: reverse solidus -->
+        <xsl:when test="starts-with($content,'&#x02217;')"><xsl:value-of select="'\ast '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02217;')"/></xsl:call-template></xsl:when>        <!--low asterisk -->
+        <xsl:when test="starts-with($content,'&#x02218;')"><xsl:value-of select="'\circ '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02218;')"/></xsl:call-template></xsl:when>        <!--/circ B: composite function (small circle) -->
+        <xsl:when test="starts-with($content,'&#x02219;')"><xsl:value-of select="'\bullet '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02219;')"/></xsl:call-template></xsl:when>
+        <xsl:when test="starts-with($content,'&#x0221A;')"><xsl:value-of select="'\surd '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0221A;')"/></xsl:call-template></xsl:when>        <!--/surd radical -->
+        <xsl:when test="starts-with($content,'&#x0221D;')"><xsl:value-of select="'\propto '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0221D;')"/></xsl:call-template></xsl:when>    <!--/propto R: is proportional to -->
+        <xsl:when test="starts-with($content,'&#x0221E;')"><xsl:value-of select="'\infty '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0221E;')"/></xsl:call-template></xsl:when>        <!--/infty infinity -->
+<!--        <xsl:when test="starts-with($content,'&#x0221F;')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0221F;')"/></xsl:call-template></xsl:when>        right (90 degree) angle -->
+        <xsl:when test="starts-with($content,'&#x02220;')"><xsl:value-of select="'\angle '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02220;')"/></xsl:call-template></xsl:when>        <!--/angle - angle -->
+        <xsl:when test="starts-with($content,'&#x02221;')"><xsl:value-of select="'\measuredangle '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02221;')"/></xsl:call-template></xsl:when>    <!--/measuredangle - angle-measured -->    <!-- Required amssymb -->
+        <xsl:when test="starts-with($content,'&#x02222;')"><xsl:value-of select="'\sphericalangle '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02222;')"/></xsl:call-template></xsl:when><!--/sphericalangle angle-spherical -->    <!-- Required amssymb -->
+        <xsl:when test="starts-with($content,'&#x02223;')"><xsl:value-of select="'\mid '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02223;')"/></xsl:call-template></xsl:when>        <!--/mid R: -->
+        <xsl:when test="starts-with($content,'&#x02224;&#x0FE00;')"><xsl:value-of select="'\nshortmid '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02224;&#x0FE00;')"/></xsl:call-template></xsl:when>    <!--/nshortmid --> <!-- Required amssymb -->
+        <xsl:when test="starts-with($content,'&#x02224;')"><xsl:value-of select="'\nmid '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02224;')"/></xsl:call-template></xsl:when>        <!--/nmid --> <!-- Required amssymb -->
+        <xsl:when test="starts-with($content,'&#x02225;')"><xsl:value-of select="'\parallel '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02225;')"/></xsl:call-template></xsl:when>    <!--/parallel R: parallel -->
+        <xsl:when test="starts-with($content,'&#x02226;&#x0FE00;')"><xsl:value-of select="'\nshortparallel '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02226;&#x0FE00;')"/></xsl:call-template></xsl:when>    <!--/nshortparallel N: not short par --> <!-- Required amssymb -->
+        <xsl:when test="starts-with($content,'&#x02226;')"><xsl:value-of select="'\nparallel '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02226;')"/></xsl:call-template></xsl:when>    <!--/nparallel N: not parallel --> <!-- Required amssymb -->
+        <xsl:when test="starts-with($content,'&#x02227;')"><xsl:value-of select="'\wedge '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02227;')"/></xsl:call-template></xsl:when>        <!--/wedge /land B: logical and -->
+        <xsl:when test="starts-with($content,'&#x02228;')"><xsl:value-of select="'\vee '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02228;')"/></xsl:call-template></xsl:when>        <!--/vee /lor B: logical or -->
+        <xsl:when test="starts-with($content,'&#x02229;')"><xsl:value-of select="'\cap '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02229;')"/></xsl:call-template></xsl:when>        <!--/cap B: intersection -->
+        <xsl:when test="starts-with($content,'&#x0222A;')"><xsl:value-of select="'\cup '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0222A;')"/></xsl:call-template></xsl:when>        <!--/cup B: union or logical sum -->
+        <xsl:when test="starts-with($content,'&#x0222B;')"><xsl:value-of select="'\int '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0222B;')"/></xsl:call-template></xsl:when>        <!--/int L: integral operator -->
+        <xsl:when test="starts-with($content,'&#x0222C;')"><xsl:value-of select="'\iint '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0222C;')"/></xsl:call-template></xsl:when>        <!--double integral operator --> <!-- Required amsmath -->
+        <xsl:when test="starts-with($content,'&#x0222D;')"><xsl:value-of select="'\iiint '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0222D;')"/></xsl:call-template></xsl:when>        <!--/iiint triple integral operator -->    <!-- Required amsmath -->
+        <xsl:when test="starts-with($content,'&#x0222E;')"><xsl:value-of select="'\oint '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0222E;')"/></xsl:call-template></xsl:when>        <!--/oint L: contour integral operator -->
+<!--        <xsl:when test="starts-with($content,'&#x0222F;')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0222F;')"/></xsl:call-template></xsl:when>-->
+<!--        <xsl:when test="starts-with($content,'&#x02230;')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02230;')"/></xsl:call-template></xsl:when>-->
+<!--        <xsl:when test="starts-with($content,'&#x02231;')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02231;')"/></xsl:call-template></xsl:when>-->
+<!--        <xsl:when test="starts-with($content,'&#x02232;')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02232;')"/></xsl:call-template></xsl:when>-->
+<!--        <xsl:when test="starts-with($content,'&#x02233;')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02233;')"/></xsl:call-template></xsl:when>-->
+        <xsl:when test="starts-with($content,'&#x02234;')"><xsl:value-of select="'\therefore '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02234;')"/></xsl:call-template></xsl:when>    <!--/therefore R: therefore --> <!-- Required amssymb -->
+        <xsl:when test="starts-with($content,'&#x02235;')"><xsl:value-of select="'\because '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02235;')"/></xsl:call-template></xsl:when>    <!--/because R: because --> <!-- Required amssymb -->
+<!-- ? -->    <xsl:when test="starts-with($content,'&#x02236;')"><xsl:value-of select="':'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02236;')"/></xsl:call-template></xsl:when>        <!--/ratio -->
+<!-- ? -->    <xsl:when test="starts-with($content,'&#x02237;')"><xsl:value-of select="'\colon\colon '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02237;')"/></xsl:call-template></xsl:when>    <!--/Colon, two colons -->
+<!-- ? -->    <xsl:when test="starts-with($content,'&#x02238;')"><xsl:value-of select="'\dot{-}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02238;')"/></xsl:call-template></xsl:when>        <!--/dotminus B: minus sign, dot above -->
+<!--        <xsl:when test="starts-with($content,'&#x02239;')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02239;')"/></xsl:call-template></xsl:when>        -->
+<!--        <xsl:when test="starts-with($content,'&#x0223A;')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0223A;')"/></xsl:call-template></xsl:when>        minus with four dots, geometric properties -->
+<!--        <xsl:when test="starts-with($content,'&#x0223B;')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0223B;')"/></xsl:call-template></xsl:when>        homothetic -->
+        <xsl:when test="starts-with($content,'&#x0223C;')"><xsl:value-of select="'\sim '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0223C;')"/></xsl:call-template></xsl:when>        <!--/sim R: similar -->
+        <xsl:when test="starts-with($content,'&#x0223D;')"><xsl:value-of select="'\backsim '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0223D;')"/></xsl:call-template></xsl:when>    <!--/backsim R: reverse similar --> <!-- Required amssymb -->
+<!--        <xsl:when test="starts-with($content,'&#x0223E;')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0223E;')"/></xsl:call-template></xsl:when>        most positive -->
+<!--        <xsl:when test="starts-with($content,'&#x0223F;')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0223F;')"/></xsl:call-template></xsl:when>        ac current -->
+        <xsl:when test="starts-with($content,'&#x02240;')"><xsl:value-of select="'\wr '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02240;')"/></xsl:call-template></xsl:when>        <!--/wr B: wreath product -->
+        <xsl:when test="starts-with($content,'&#x02241;')"><xsl:value-of select="'\nsim '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02241;')"/></xsl:call-template></xsl:when>        <!--/nsim N: not similar --> <!-- Required amssymb -->
+        <xsl:when test="starts-with($content,'&#x02242;')"><xsl:value-of select="'\eqsim '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02242;')"/></xsl:call-template></xsl:when>        <!--/esim R: equals, similar --> <!-- Required amssymb -->
+        <xsl:when test="starts-with($content,'&#x02243;')"><xsl:value-of select="'\simeq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02243;')"/></xsl:call-template></xsl:when>        <!--/simeq R: similar, equals -->
+        <xsl:when test="starts-with($content,'&#x02244;')"><xsl:value-of select="'\not\simeq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02244;')"/></xsl:call-template></xsl:when>    <!--/nsimeq N: not similar, equals -->
+        <xsl:when test="starts-with($content,'&#x02245;')"><xsl:value-of select="'\cong '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02245;')"/></xsl:call-template></xsl:when>        <!--/cong R: congruent with -->
+<!--        <xsl:when test="starts-with($content,'&#x02246;')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02246;')"/></xsl:call-template></xsl:when>        similar, not equals -->
+        <xsl:when test="starts-with($content,'&#x02247;')"><xsl:value-of select="'\ncong '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02247;')"/></xsl:call-template></xsl:when>        <!--/ncong N: not congruent with --> <!-- Required amssymb -->
+        <xsl:when test="starts-with($content,'&#x02248;')"><xsl:value-of select="'\approx '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02248;')"/></xsl:call-template></xsl:when>    <!--/approx R: approximate -->
+<!--        <xsl:when test="starts-with($content,'&#x02249;&#x00338;')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02249;&#x00338;')"/></xsl:call-template></xsl:when>    not, vert, approximate -->
+        <xsl:when test="starts-with($content,'&#x02249;')"><xsl:value-of select="'\not\approx '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02249;')"/></xsl:call-template></xsl:when>    <!--/napprox N: not approximate -->
+        <xsl:when test="starts-with($content,'&#x0224A;')"><xsl:value-of select="'\approxeq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0224A;')"/></xsl:call-template></xsl:when>    <!--/approxeq R: approximate, equals --> <!-- Required amssymb -->
+<!--        <xsl:when test="starts-with($content,'&#x0224B;')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0224B;')"/></xsl:call-template></xsl:when>        approximately identical to -->
+<!--        <xsl:when test="starts-with($content,'&#x0224C;')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0224C;')"/></xsl:call-template></xsl:when>        /backcong R: reverse congruent -->
+        <xsl:when test="starts-with($content,'&#x0224D;')"><xsl:value-of select="'\asymp '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0224D;')"/></xsl:call-template></xsl:when>        <!--/asymp R: asymptotically equal to -->
+        <xsl:when test="starts-with($content,'&#x0224E;')"><xsl:value-of select="'\Bumpeq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0224E;')"/></xsl:call-template></xsl:when>    <!--/Bumpeq R: bumpy equals --> <!-- Required amssymb -->
+        <xsl:when test="starts-with($content,'&#x0224F;')"><xsl:value-of select="'\bumpeq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0224F;')"/></xsl:call-template></xsl:when>    <!--/bumpeq R: bumpy equals, equals --> <!-- Required amssymb -->
+        <xsl:when test="starts-with($content,'&#x02250;')"><xsl:value-of select="'\doteq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02250;')"/></xsl:call-template></xsl:when>        <!--/doteq R: equals, single dot above -->
+        <xsl:when test="starts-with($content,'&#x02251;')"><xsl:value-of select="'\doteqdot '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02251;')"/></xsl:call-template></xsl:when>    <!--/doteqdot /Doteq R: eq, even dots --> <!-- Required amssymb -->
+        <xsl:when test="starts-with($content,'&#x02252;')"><xsl:value-of select="'\fallingdotseq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02252;')"/></xsl:call-template></xsl:when>    <!--/fallingdotseq R: eq, falling dots --> <!-- Required amssymb -->
+        <xsl:when test="starts-with($content,'&#x02253;')"><xsl:value-of select="'\risingdotseq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02253;')"/></xsl:call-template></xsl:when>    <!--/risingdotseq R: eq, rising dots --> <!-- Required amssymb -->
+<!--        <xsl:when test="starts-with($content,'&#x02254;')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02254;')"/></xsl:call-template></xsl:when>        /coloneq R: colon, equals -->
+<!--        <xsl:when test="starts-with($content,'&#x02255;')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02255;')"/></xsl:call-template></xsl:when>        /eqcolon R: equals, colon -->
+        <xsl:when test="starts-with($content,'&#x02256;')"><xsl:value-of select="'\eqcirc '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02256;')"/></xsl:call-template></xsl:when>    <!--/eqcirc R: circle on equals sign --> <!-- Required amssymb -->
+        <xsl:when test="starts-with($content,'&#x02257;')"><xsl:value-of select="'\circeq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02257;')"/></xsl:call-template></xsl:when>    <!--/circeq R: circle, equals --> <!-- Required amssymb -->
+<!-- ? -->    <xsl:when test="starts-with($content,'&#x02258;')"><xsl:value-of select="'\stackrel{\frown}{=}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02258;')"/></xsl:call-template></xsl:when>
+<!-- ? -->    <xsl:when test="starts-with($content,'&#x02259;')"><xsl:value-of select="'\stackrel{\wedge}{=}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02259;')"/></xsl:call-template></xsl:when>    <!--/wedgeq R: corresponds to (wedge, equals) -->
+<!-- ? -->    <xsl:when test="starts-with($content,'&#x0225A;')"><xsl:value-of select="'\stackrel{\vee}{=}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0225A;')"/></xsl:call-template></xsl:when>    <!--logical or, equals -->
+<!-- ? -->    <xsl:when test="starts-with($content,'&#x0225B;')"><xsl:value-of select="'\stackrel{\star}{=}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0225B;')"/></xsl:call-template></xsl:when>    <!--equal, asterisk above -->
+        <xsl:when test="starts-with($content,'&#x0225C;')"><xsl:value-of select="'\triangleq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0225C;')"/></xsl:call-template></xsl:when>    <!--/triangleq R: triangle, equals --> <!-- Required amssymb -->
+<!-- ? -->    <xsl:when test="starts-with($content,'&#x0225D;')"><xsl:value-of select="'\stackrel{\scriptscriptstyle\mathrm{def}}{=}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0225D;')"/></xsl:call-template></xsl:when>
+<!-- ? -->    <xsl:when test="starts-with($content,'&#x0225E;')"><xsl:value-of select="'\stackrel{\scriptscriptstyle\mathrm{m}}{=}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0225E;')"/></xsl:call-template></xsl:when>
+<!-- ? -->    <xsl:when test="starts-with($content,'&#x0225F;')"><xsl:value-of select="'\stackrel{?}{=}'" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0225F;')"/></xsl:call-template></xsl:when>    <!--/questeq R: equal with questionmark -->
+<!--        <xsl:when test="starts-with($content,'&#x02260;&#x0FE00;')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02260;&#x0FE00;')"/></xsl:call-template></xsl:when>    not equal, dot -->
+        <xsl:when test="starts-with($content,'&#x02260;')"><xsl:value-of select="'\ne '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02260;')"/></xsl:call-template></xsl:when>        <!--/ne /neq R: not equal -->
+<!--        <xsl:when test="starts-with($content,'&#x02261;&#x020E5;')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02261;&#x020E5;')"/></xsl:call-template></xsl:when>    reverse not equivalent -->
+        <xsl:when test="starts-with($content,'&#x02261;')"><xsl:value-of select="'\equiv '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02261;')"/></xsl:call-template></xsl:when>        <!--/equiv R: identical with -->
+        <xsl:when test="starts-with($content,'&#x02262;')"><xsl:value-of select="'\not\equiv '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02262;')"/></xsl:call-template></xsl:when>    <!--/nequiv N: not identical with -->
+<!--        <xsl:when test="starts-with($content,'&#x02263;')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02263;')"/></xsl:call-template></xsl:when>        -->
+        <xsl:when test="starts-with($content,'&#x02264;')"><xsl:value-of select="'\le '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02264;')"/></xsl:call-template></xsl:when>        <!--/leq /le R: less-than-or-equal -->
+        <xsl:when test="starts-with($content,'&#x02265;')"><xsl:value-of select="'\ge '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02265;')"/></xsl:call-template></xsl:when>        <!--/geq /ge R: greater-than-or-equal -->
+        <xsl:when test="starts-with($content,'&#x02266;')"><xsl:value-of select="'\leqq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02266;')"/></xsl:call-template></xsl:when>        <!--/leqq R: less, double equals --> <!-- Required amssymb -->
+        <xsl:when test="starts-with($content,'&#x02267;')"><xsl:value-of select="'\geqq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02267;')"/></xsl:call-template></xsl:when>        <!--/geqq R: greater, double equals --> <!-- Required amssymb -->
+        <xsl:when test="starts-with($content,'&#x02268;')"><xsl:value-of select="'\lneqq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02268;')"/></xsl:call-template></xsl:when>        <!--/lneqq N: less, not double equals --> <!-- Required amssymb -->
+        <xsl:when test="starts-with($content,'&#x02269;')"><xsl:value-of select="'\gneqq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02269;')"/></xsl:call-template></xsl:when>        <!--/gneqq N: greater, not dbl equals --> <!-- Required amssymb -->
+<!--        <xsl:when test="starts-with($content,'&#x0226A;&#x00338;&#x0FE00;')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0226A;&#x00338;&#x0FE00;')"/></xsl:call-template></xsl:when>    not much less than, variant -->
+<!--        <xsl:when test="starts-with($content,'&#x0226A;&#x00338;')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0226A;&#x00338;')"/></xsl:call-template></xsl:when>    not, vert, much less than -->
+        <xsl:when test="starts-with($content,'&#x0226A;')"><xsl:value-of select="'\ll '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0226A;')"/></xsl:call-template></xsl:when>        <!--/ll R: double less-than sign -->
+<!--        <xsl:when test="starts-with($content,'&#x0226B;&#x00338;&#x0FE00;')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0226B;&#x00338;&#x0FE00;')"/></xsl:call-template></xsl:when>    not much greater than, variant -->
+<!--        <xsl:when test="starts-with($content,'&#x0226B;&#x00338;')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0226B;&#x00338;')"/></xsl:call-template></xsl:when>    not, vert, much greater than -->
+        <xsl:when test="starts-with($content,'&#x0226B;')"><xsl:value-of select="'\gg '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0226B;')"/></xsl:call-template></xsl:when>        <!--/gg R: dbl greater-than sign -->
+        <xsl:when test="starts-with($content,'&#x0226C;')"><xsl:value-of select="'\between '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0226C;')"/></xsl:call-template></xsl:when>    <!--/between R: between --> <!-- Required amssymb -->
+        <xsl:when test="starts-with($content,'&#x0226D;')"><xsl:value-of select="'\not\asymp '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0226D;')"/></xsl:call-template></xsl:when>
+        <xsl:when test="starts-with($content,'&#x0226E;')"><xsl:value-of select="'\nless '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0226E;')"/></xsl:call-template></xsl:when>        <!--/nless N: not less-than --> <!-- Required amssymb -->
+        <xsl:when test="starts-with($content,'&#x0226F;')"><xsl:value-of select="'\ngtr '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0226F;')"/></xsl:call-template></xsl:when>        <!--/ngtr N: not greater-than --> <!-- Required amssymb -->
+        <xsl:when test="starts-with($content,'&#x02270;&#x020E5;')"><xsl:value-of select="'\nleq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02270;&#x020E5;')"/></xsl:call-template></xsl:when>    <!--/nleq N: not less-than-or-equal --> <!-- Required amssymb -->
+        <xsl:when test="starts-with($content,'&#x02270;')"><xsl:value-of select="'\nleqq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02270;')"/></xsl:call-template></xsl:when>        <!--/nleqq N: not less, dbl equals --> <!-- Required amssymb -->
+        <xsl:when test="starts-with($content,'&#x02271;&#x020E5;')"><xsl:value-of select="'\ngeq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02271;&#x020E5;')"/></xsl:call-template></xsl:when>    <!--/ngeq N: not greater-than-or-equal --> <!-- Required amssymb -->
+        <xsl:when test="starts-with($content,'&#x02271;')"><xsl:value-of select="'\ngeqq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02271;')"/></xsl:call-template></xsl:when>        <!--/ngeqq N: not greater, dbl equals --> <!-- Required amssymb -->
+        <xsl:when test="starts-with($content,'&#x02272;')"><xsl:value-of select="'\lesssim '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02272;')"/></xsl:call-template></xsl:when>    <!--/lesssim R: less, similar --> <!-- Required amssymb -->
+        <xsl:when test="starts-with($content,'&#x02273;')"><xsl:value-of select="'\gtrsim '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02273;')"/></xsl:call-template></xsl:when>    <!--/gtrsim R: greater, similar --> <!-- Required amssymb -->
+        <xsl:when test="starts-with($content,'&#x02274;')"><xsl:value-of select="'\not\lesssim '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02274;')"/></xsl:call-template></xsl:when>    <!--not less, similar --> <!-- Required amssymb -->
+        <xsl:when test="starts-with($content,'&#x02275;')"><xsl:value-of select="'\not\gtrsim '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02275;')"/></xsl:call-template></xsl:when>    <!--not greater, similar --> <!-- Required amssymb -->
+        <xsl:when test="starts-with($content,'&#x02276;')"><xsl:value-of select="'\lessgtr '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02276;')"/></xsl:call-template></xsl:when>    <!--/lessgtr R: less, greater --> <!-- Required amssymb -->
+        <xsl:when test="starts-with($content,'&#x02277;')"><xsl:value-of select="'\gtrless '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02277;')"/></xsl:call-template></xsl:when>    <!--/gtrless R: greater, less --> <!-- Required amssymb -->
+        <xsl:when test="starts-with($content,'&#x02278;')"><xsl:value-of select="'\not\lessgtr '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02278;')"/></xsl:call-template></xsl:when>    <!--not less, greater --> <!-- Required amssymb -->
+        <xsl:when test="starts-with($content,'&#x02279;')"><xsl:value-of select="'\not\gtrless '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02279;')"/></xsl:call-template></xsl:when>    <!--not greater, less --> <!-- Required amssymb -->
+        <xsl:when test="starts-with($content,'&#x0227A;')"><xsl:value-of select="'\prec '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0227A;')"/></xsl:call-template></xsl:when>        <!--/prec R: precedes -->
+        <xsl:when test="starts-with($content,'&#x0227B;')"><xsl:value-of select="'\succ '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0227B;')"/></xsl:call-template></xsl:when>        <!--/succ R: succeeds -->
+        <xsl:when test="starts-with($content,'&#x0227C;')"><xsl:value-of select="'\preccurlyeq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0227C;')"/></xsl:call-template></xsl:when>    <!--/preccurlyeq R: precedes, curly eq --> <!-- Required amssymb -->
+        <xsl:when test="starts-with($content,'&#x0227D;')"><xsl:value-of select="'\succcurlyeq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0227D;')"/></xsl:call-template></xsl:when>    <!--/succcurlyeq R: succeeds, curly eq --> <!-- Required amssymb -->
+        <xsl:when test="starts-with($content,'&#x0227E;')"><xsl:value-of select="'\precsim '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0227E;')"/></xsl:call-template></xsl:when>    <!--/precsim R: precedes, similar --> <!-- Required amssymb -->
+        <xsl:when test="starts-with($content,'&#x0227F;')"><xsl:value-of select="'\succsim '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0227F;')"/></xsl:call-template></xsl:when>    <!--/succsim R: succeeds, similar --> <!-- Required amssymb -->
+        <xsl:when test="starts-with($content,'&#x02280;')"><xsl:value-of select="'\nprec '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02280;')"/></xsl:call-template></xsl:when>        <!--/nprec N: not precedes --> <!-- Required amssymb -->
+        <xsl:when test="starts-with($content,'&#x02281;')"><xsl:value-of select="'\nsucc '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02281;')"/></xsl:call-template></xsl:when>        <!--/nsucc N: not succeeds --> <!-- Required amssymb -->
+        <xsl:when test="starts-with($content,'&#x02282;')"><xsl:value-of select="'\subset '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02282;')"/></xsl:call-template></xsl:when>    <!--/subset R: subset or is implied by -->
+        <xsl:when test="starts-with($content,'&#x02283;')"><xsl:value-of select="'\supset '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02283;')"/></xsl:call-template></xsl:when>    <!--/supset R: superset or implies -->
+        <xsl:when test="starts-with($content,'&#x02284;')"><xsl:value-of select="'\not\subset '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02284;')"/></xsl:call-template></xsl:when>    <!--not subset -->
+        <xsl:when test="starts-with($content,'&#x02285;')"><xsl:value-of select="'\not\supset '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02285;')"/></xsl:call-template></xsl:when>    <!--not superset -->
+        <xsl:when test="starts-with($content,'&#x02286;')"><xsl:value-of select="'\subseteq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02286;')"/></xsl:call-template></xsl:when>    <!--/subseteq R: subset, equals -->
+        <xsl:when test="starts-with($content,'&#x02287;')"><xsl:value-of select="'\supseteq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02287;')"/></xsl:call-template></xsl:when>    <!--/supseteq R: superset, equals -->
+        <xsl:when test="starts-with($content,'&#x0228E;')"><xsl:value-of select="'\uplus '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0228E;')"/></xsl:call-template></xsl:when>        <!--/uplus B: plus sign in union -->
+        <xsl:when test="starts-with($content,'&#x02293;')"><xsl:value-of select="'\sqcap '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02293;')"/></xsl:call-template></xsl:when>        <!--/sqcap B: square intersection -->
+        <xsl:when test="starts-with($content,'&#x02294;')"><xsl:value-of select="'\bigsqcup '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02294;')"/></xsl:call-template></xsl:when>        <!--/sqcup B: square union -->
+        <xsl:when test="starts-with($content,'&#x02295;')"><xsl:value-of select="'\oplus '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02295;')"/></xsl:call-template></xsl:when>        <!--/oplus B: plus sign in circle -->
+        <xsl:when test="starts-with($content,'&#x02296;')"><xsl:value-of select="'\ominus '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02296;')"/></xsl:call-template></xsl:when>    <!--/ominus B: minus sign in circle -->
+        <xsl:when test="starts-with($content,'&#x02297;')"><xsl:value-of select="'\otimes '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02297;')"/></xsl:call-template></xsl:when>    <!--/otimes B: multiply sign in circle -->
+        <xsl:when test="starts-with($content,'&#x02298;')"><xsl:value-of select="'\oslash '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02298;')"/></xsl:call-template></xsl:when>    <!--/oslash B: solidus in circle -->
+<!-- ? -->    <xsl:when test="starts-with($content,'&#x02299;')"><xsl:value-of select="'\odot '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x02299;')"/></xsl:call-template></xsl:when>        <!--/odot B: middle dot in circle --> <!--/bigodot L: circle dot operator -->
+        <xsl:when test="starts-with($content,'&#x0229F;')"><xsl:value-of select="'\boxminus '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x0229F;')"/></xsl:call-template></xsl:when>    <!--/boxminus B: minus sign in box --> <!-- Required amssymb -->
+        <xsl:when test="starts-with($content,'&#x022A4;')"><xsl:value-of select="'\top '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022A4;')"/></xsl:call-template></xsl:when>        <!--/top top -->
+        <xsl:when test="starts-with($content,'&#x022A5;')"><xsl:value-of select="'\perp '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022A5;')"/></xsl:call-template></xsl:when>        <!--/perp R: perpendicular --><!--/bot bottom -->
+        <xsl:when test="starts-with($content,'&#x022A6;')"><xsl:value-of select="'\vdash '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022A6;')"/></xsl:call-template></xsl:when>        <!--/vdash R: vertical, dash -->
+        <xsl:when test="starts-with($content,'&#x022A7;')"><xsl:value-of select="'\vDash '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022A7;')"/></xsl:call-template></xsl:when>        <!--/vDash R: vertical, dbl dash --> <!-- Required amssymb -->
+        <xsl:when test="starts-with($content,'&#x022A8;')"><xsl:value-of select="'\models '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022A8;')"/></xsl:call-template></xsl:when>    <!--/models R: -->
+        <xsl:when test="starts-with($content,'&#x022AA;')"><xsl:value-of select="'\Vvdash '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022AA;')"/></xsl:call-template></xsl:when>    <!--/Vvdash R: triple vertical, dash --> <!-- Required amssymb -->
+        <xsl:when test="starts-with($content,'&#x022C0;')"><xsl:value-of select="'\bigwedge '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022C0;')"/></xsl:call-template></xsl:when>    <!--/bigwedge L: logical or operator -->
+        <xsl:when test="starts-with($content,'&#x022C1;')"><xsl:value-of select="'\bigvee '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022C1;')"/></xsl:call-template></xsl:when>    <!--/bigcap L: intersection operator -->
+        <xsl:when test="starts-with($content,'&#x022C2;')"><xsl:value-of select="'\bigcap '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022C2;')"/></xsl:call-template></xsl:when>    <!--/bigvee L: logical and operator -->
+        <xsl:when test="starts-with($content,'&#x022C3;')"><xsl:value-of select="'\bigcup '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022C3;')"/></xsl:call-template></xsl:when>    <!--/bigcup L: union operator -->
+        <xsl:when test="starts-with($content,'&#x022C4;')"><xsl:value-of select="'\diamond '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022C4;')"/></xsl:call-template></xsl:when>    <!--/diamond B: open diamond -->
+        <xsl:when test="starts-with($content,'&#x022C5;')"><xsl:value-of select="'\cdot '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022C5;')"/></xsl:call-template></xsl:when>        <!--/cdot B: small middle dot -->
+        <xsl:when test="starts-with($content,'&#x022C6;')"><xsl:value-of select="'\star '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022C6;')"/></xsl:call-template></xsl:when>        <!--/star B: small star, filled -->
+        <xsl:when test="starts-with($content,'&#x022C7;')"><xsl:value-of select="'\divideontimes '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022C7;')"/></xsl:call-template></xsl:when>    <!--/divideontimes B: division on times --> <!-- Required amssymb -->
+        <xsl:when test="starts-with($content,'&#x022C8;')"><xsl:value-of select="'\bowtie '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022C8;')"/></xsl:call-template></xsl:when>    <!--/bowtie R: -->
+        <xsl:when test="starts-with($content,'&#x022CD;')"><xsl:value-of select="'\backsimeq '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022CD;')"/></xsl:call-template></xsl:when>    <!--/backsimeq R: reverse similar, eq --> <!-- Required amssymb -->
+        <xsl:when test="starts-with($content,'&#x022EF;')"><xsl:value-of select="'\cdots '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022EF;')"/></xsl:call-template></xsl:when>        <!--/cdots, three dots, centered -->
+<!--        <xsl:when test="starts-with($content,'&#x022F0;')"><xsl:value-of select="' '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022F0;')"/></xsl:call-template></xsl:when>        three dots, ascending -->
+        <xsl:when test="starts-with($content,'&#x022F1;')"><xsl:value-of select="'\ddots '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x022F1;')"/></xsl:call-template></xsl:when>        <!--/ddots, three dots, descending -->
+
+<!-- ====================================================================== -->
+        <xsl:when test="starts-with($content,'&#x025A1;')"><xsl:value-of select="'\square '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x025A1;')"/></xsl:call-template></xsl:when>    <!--/square, square --> <!-- Required amssymb -->
+        <xsl:when test="starts-with($content,'&#x025AA;')"><xsl:value-of select="'\blacksquare '" /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '&#x025AA;')"/></xsl:call-template></xsl:when>    <!--/blacksquare, square, filled  --> <!-- Required amssymb -->
+
+        <xsl:when test='starts-with($content,"&apos;")'><xsl:value-of select='"\text{&apos;}"' /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select='substring-after($content, "&apos;")'/></xsl:call-template></xsl:when><!-- \text required amslatex -->
+        <xsl:when test='starts-with($content,"(")'><xsl:value-of select='"\left("' /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '(')"/></xsl:call-template></xsl:when>
+        <xsl:when test='starts-with($content,")")'><xsl:value-of select='"\right)"' /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, ')')"/></xsl:call-template></xsl:when>
+        <xsl:when test='starts-with($content,"[")'><xsl:value-of select='"\left["' /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '[')"/></xsl:call-template></xsl:when>
+        <xsl:when test='starts-with($content,"]")'><xsl:value-of select='"\right]"' /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, ']')"/></xsl:call-template></xsl:when>
+        <xsl:when test='starts-with($content,"{")'><xsl:value-of select='"\left\{"' /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '{')"/></xsl:call-template></xsl:when>
+        <xsl:when test='starts-with($content,"}")'><xsl:value-of select='"\right\}"' /><xsl:call-template name="replaceEntities"><xsl:with-param name="content" select="substring-after($content, '}')"/></xsl:call-template></xsl:when>
+
+
+        <xsl:otherwise>
+            <xsl:value-of select="substring($content,1,1)"/>
+            <xsl:call-template name="replaceEntities">
+                <xsl:with-param name="content" select="substring($content, 2)"/>
+            </xsl:call-template>
+        </xsl:otherwise>
+    </xsl:choose></xsl:if>
+</xsl:template>
+
+<xsl:template name="replaceMtextEntities">
+    <xsl:param name="content"/>
+    <xsl:choose>
+    <xsl:when test="contains($content,'&#x02009;&#x0200A;&#x0200A;')">    <!-- ThickSpace - space of width 5/18 em -->
+        <xsl:call-template name="replaceMtextEntities">
+            <xsl:with-param name="content" select="concat(substring-before($content,'&#x02009;&#x0200A;&#x0200A;'),'\hspace{0.28em}',substring-after($content,'&#x02009;&#x0200A;&#x0200A;'))"/>
+        </xsl:call-template>
+    </xsl:when>
+    <xsl:when test="contains($content,'&#x02009;')">    <!-- ThinSpace - space of width 3/18 em -->
+        <xsl:call-template name="replaceMtextEntities">
+            <xsl:with-param name="content" select="concat(substring-before($content,'&#x02009;'),'\hspace{0.17em}',substring-after($content,'&#x02009;'))"/>
+        </xsl:call-template>
+    </xsl:when>
+    <xsl:otherwise>
+        <xsl:value-of select="normalize-space($content)"/>
+    </xsl:otherwise>
+    </xsl:choose>
+</xsl:template>
+
+</xsl:stylesheet>
diff --git a/src/main/resources/xslt/mathml_latex/glayout.xsl b/src/main/resources/xslt/mathml_latex/glayout.xsl
new file mode 100644
index 00000000000..6f5d802ab49
--- /dev/null
+++ b/src/main/resources/xslt/mathml_latex/glayout.xsl
@@ -0,0 +1,220 @@
+<?xml version='1.0' encoding="UTF-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+        xmlns:m="http://www.w3.org/1998/Math/MathML"
+                version='1.0'>
+
+<!-- ====================================================================== -->
+<!-- $id: glayout.xsl, 2002/17/05 Exp $
+     This file is part of the XSLT MathML Library distribution.
+     See ./README or http://www.raleigh.ru/MathML/mmltex for
+     copyright and other information                                        -->
+<!-- ====================================================================== -->
+
+<xsl:template match="m:mfrac">
+    <xsl:choose>
+        <xsl:when test="@bevelled='true'">
+<!--            <xsl:text>\raisebox{1ex}{</xsl:text>
+            <xsl:apply-templates select="./*[1]"/>
+            <xsl:text>}\!\left/ \!\raisebox{-1ex}{</xsl:text>
+            <xsl:apply-templates select="./*[2]"/>
+            <xsl:text>}\right.</xsl:text>-->
+        </xsl:when>
+        <xsl:when test="@linethickness">
+            <xsl:text>\genfrac{}{}{</xsl:text>
+            <xsl:choose>
+                <xsl:when test="number(@linethickness)">
+                    <xsl:value-of select="@linethickness div 10"/>
+                    <xsl:text>ex</xsl:text>
+                </xsl:when>
+                <xsl:when test="@linethickness='thin'">
+                    <xsl:text>.05ex</xsl:text>
+                </xsl:when>
+                <xsl:when test="@linethickness='medium'"/>
+                <xsl:when test="@linethickness='thick'">
+                    <xsl:text>.2ex</xsl:text>
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:value-of select="@linethickness"/>
+                </xsl:otherwise>
+            </xsl:choose>
+            <xsl:text>}{}{</xsl:text>
+        </xsl:when>
+        <xsl:otherwise>
+            <xsl:text>\frac{</xsl:text>
+        </xsl:otherwise>
+    </xsl:choose>
+    <xsl:if test="@numalign='right'">
+        <xsl:text>\hfill </xsl:text>
+    </xsl:if>
+    <xsl:apply-templates select="./*[1]"/>
+    <xsl:if test="@numalign='left'">
+        <xsl:text>\hfill </xsl:text>
+    </xsl:if>
+    <xsl:text>}{</xsl:text>
+    <xsl:if test="@denomalign='right'">
+        <xsl:text>\hfill </xsl:text>
+    </xsl:if>
+    <xsl:apply-templates select="./*[2]"/>
+        <xsl:if test="@denomalign='left'">
+        <xsl:text>\hfill </xsl:text>
+    </xsl:if>
+    <xsl:text>}</xsl:text>
+</xsl:template>
+
+<xsl:template match="m:mroot">
+    <xsl:choose>
+        <xsl:when test="count(./*)=2">
+            <xsl:text>\sqrt[</xsl:text>
+            <xsl:apply-templates select="./*[2]"/>
+            <xsl:text>]{</xsl:text>
+            <xsl:apply-templates select="./*[1]"/>
+            <xsl:text>}</xsl:text>
+        </xsl:when>
+        <xsl:otherwise>
+        <!-- number of argumnets is not 2 - code 25 -->
+            <xsl:message>exception 25:</xsl:message>
+            <xsl:text>\text{exception 25:}</xsl:text>
+        </xsl:otherwise>
+    </xsl:choose>
+</xsl:template>
+
+<xsl:template match="m:msqrt">
+    <xsl:text>\sqrt{</xsl:text>
+    <xsl:apply-templates/>
+    <xsl:text>}</xsl:text>
+</xsl:template>
+
+<xsl:template match="m:mfenced">
+    <xsl:choose>
+        <xsl:when test="@open">
+            <xsl:if test="translate(@open,'{}[]()|','{{{{{{{')='{'">
+                <xsl:text>\left</xsl:text>
+            </xsl:if>
+            <xsl:if test="@open='{' or @open='}'">
+                <xsl:text>\</xsl:text>
+            </xsl:if>
+            <xsl:value-of select="@open"/>
+        </xsl:when>
+        <xsl:otherwise><xsl:text>\left(</xsl:text></xsl:otherwise>
+    </xsl:choose>
+    <xsl:choose>
+        <xsl:when test="count(./*)>1">
+            <xsl:variable name="symbol">
+                <xsl:choose>
+                    <xsl:when test="@separators">
+                        <xsl:call-template name="startspace">
+                            <xsl:with-param name="symbol" select="@separators"/>
+                        </xsl:call-template>
+                    </xsl:when>
+                    <xsl:otherwise>,</xsl:otherwise>
+                </xsl:choose>
+            </xsl:variable>
+            <xsl:for-each select="./*">
+                <xsl:apply-templates select="."/>
+                <xsl:if test="not(position()=last())">
+                    <xsl:choose>
+                        <xsl:when test="position()>string-length($symbol)">
+                            <xsl:value-of select="substring($symbol,string-length($symbol))"/>
+                        </xsl:when>
+                        <xsl:otherwise>
+                            <xsl:value-of select="substring($symbol,position(),1)"/>
+                        </xsl:otherwise>
+                    </xsl:choose>
+                </xsl:if>
+            </xsl:for-each>
+        </xsl:when>
+        <xsl:otherwise>
+            <xsl:apply-templates/>
+        </xsl:otherwise>
+    </xsl:choose>
+    <xsl:choose>
+        <xsl:when test="@close">
+            <xsl:if test="translate(@open,'{}[]()|','{{{{{{{')='{'">
+                <xsl:text>\right</xsl:text>
+            </xsl:if>
+            <xsl:if test="@open='{' or @open='}'">
+                <xsl:text>\</xsl:text>
+            </xsl:if>
+            <xsl:value-of select="@close"/>
+        </xsl:when>
+        <xsl:otherwise><xsl:text>\right)</xsl:text></xsl:otherwise>
+    </xsl:choose>
+</xsl:template>
+
+<xsl:template match="m:mphantom">
+    <xsl:text>\phantom{</xsl:text>
+    <xsl:apply-templates/>
+    <xsl:text>}</xsl:text>
+</xsl:template>
+
+<xsl:template match="m:menclose">
+    <xsl:choose>
+        <xsl:when test="@notation = 'actuarial'">
+            <xsl:text>\overline{</xsl:text>
+            <xsl:apply-templates/>
+            <xsl:text>\hspace{.2em}|}</xsl:text>
+        </xsl:when>
+        <xsl:when test="@notation = 'radical'">
+            <xsl:text>\sqrt{</xsl:text>
+            <xsl:apply-templates/>
+            <xsl:text>}</xsl:text>
+        </xsl:when>
+        <xsl:otherwise>
+            <xsl:text>\overline{)</xsl:text>
+            <xsl:apply-templates/>
+            <xsl:text>}</xsl:text>
+        </xsl:otherwise>
+    </xsl:choose>
+</xsl:template>
+
+<xsl:template match="m:mrow">
+    <xsl:apply-templates/>
+</xsl:template>
+
+<xsl:template match="m:mstyle">
+    <xsl:if test="@background">
+        <xsl:text>\colorbox[rgb]{</xsl:text>
+        <xsl:call-template name="color">
+            <xsl:with-param name="color" select="@background"/>
+        </xsl:call-template>
+        <xsl:text>}{$</xsl:text>
+    </xsl:if>
+    <xsl:if test="@color">
+        <xsl:text>\textcolor[rgb]{</xsl:text>
+        <xsl:call-template name="color">
+            <xsl:with-param name="color" select="@color"/>
+        </xsl:call-template>
+        <xsl:text>}{</xsl:text>
+    </xsl:if>
+    <xsl:apply-templates/>
+    <xsl:if test="@color">
+        <xsl:text>}</xsl:text>
+    </xsl:if>
+    <xsl:if test="@background">
+        <xsl:text>$}</xsl:text>
+    </xsl:if>
+</xsl:template>
+<!--
+
+<xsl:template match="m:mstyle">
+    <xsl:if test="@displaystyle='true'">
+        <xsl:text>{\displaystyle</xsl:text>
+    </xsl:if>
+    <xsl:if test="@scriptlevel=2">
+        <xsl:text>{\scriptscriptstyle</xsl:text>
+    </xsl:if>
+    <xsl:apply-templates/>
+    <xsl:if test="@scriptlevel=2">
+        <xsl:text>}</xsl:text>
+    </xsl:if>
+    <xsl:if test="@displaystyle='true'">
+        <xsl:text>}</xsl:text>
+    </xsl:if>
+</xsl:template>
+-->
+
+<xsl:template match="m:merror">
+    <xsl:apply-templates/>
+</xsl:template>
+
+</xsl:stylesheet>
diff --git a/src/main/resources/xslt/mathml_latex/mmltex.xsl b/src/main/resources/xslt/mathml_latex/mmltex.xsl
new file mode 100644
index 00000000000..f4cc22e4b6d
--- /dev/null
+++ b/src/main/resources/xslt/mathml_latex/mmltex.xsl
@@ -0,0 +1,45 @@
+<?xml version='1.0' encoding="UTF-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+        xmlns:m="http://www.w3.org/1998/Math/MathML"
+                version='1.0'>
+
+<xsl:output method="text" indent="no" encoding="UTF-8"/>
+
+<!-- ====================================================================== -->
+<!-- $id: mmltex.xsl, 2002/22/11 Exp $
+     This file is part of the XSLT MathML Library distribution.
+     See ./README or http://www.raleigh.ru/MathML/mmltex for
+     copyright and other information                                        -->
+<!-- ====================================================================== -->
+
+<xsl:include href="tokens.xsl"/>
+<xsl:include href="glayout.xsl"/>
+<xsl:include href="scripts.xsl"/>
+<xsl:include href="tables.xsl"/>
+<xsl:include href="entities.xsl"/>
+<xsl:include href="cmarkup.xsl"/>
+
+<!-- Note: variables colora (template color) and symbola (template startspace) only for Sablotron -->
+
+<xsl:template name="startspace">
+    <xsl:param name="symbol"/>
+    <xsl:if test="contains($symbol,' ')">
+        <xsl:variable name="symbola" select="concat(substring-before($symbol,' '),substring-after($symbol,' '))"/>
+        <xsl:call-template name="startspace">
+            <xsl:with-param name="symbol" select="$symbola"/>
+        </xsl:call-template>
+    </xsl:if>
+    <xsl:if test="not(contains($symbol,' '))">
+        <xsl:value-of select="$symbol"/>
+    </xsl:if>
+</xsl:template>
+
+<xsl:strip-space elements="m:*"/>
+
+<xsl:template match="m:math">
+    <xsl:text>&#x00024;</xsl:text>
+    <xsl:apply-templates/>
+    <xsl:text>&#x00024;</xsl:text>
+</xsl:template>
+
+</xsl:stylesheet>
diff --git a/src/main/resources/xslt/mathml_latex/scripts.xsl b/src/main/resources/xslt/mathml_latex/scripts.xsl
new file mode 100644
index 00000000000..8c6984fda00
--- /dev/null
+++ b/src/main/resources/xslt/mathml_latex/scripts.xsl
@@ -0,0 +1,292 @@
+<?xml version='1.0' encoding="UTF-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+        xmlns:m="http://www.w3.org/1998/Math/MathML"
+                version='1.0'>
+
+<!-- ====================================================================== -->
+<!-- $Id: scripts.xsl,v 1.1.1.1 2002/10/26 14:20:06 shade33 Exp $
+     This file is part of the XSLT MathML Library distribution.
+     See ./README or http://www.raleigh.ru/MathML/mmltex for
+     copyright and other information                                        -->
+<!-- ====================================================================== -->
+
+<xsl:template match="m:munderover">
+    <xsl:variable name="base">
+        <xsl:call-template name="startspace">
+            <xsl:with-param name="symbol" select="./*[1]"/>
+        </xsl:call-template>
+    </xsl:variable>
+    <xsl:variable name="under">
+        <xsl:call-template name="startspace">
+            <xsl:with-param name="symbol" select="./*[2]"/>
+        </xsl:call-template>
+    </xsl:variable>
+    <xsl:variable name="over">
+        <xsl:call-template name="startspace">
+            <xsl:with-param name="symbol" select="./*[3]"/>
+        </xsl:call-template>
+    </xsl:variable>
+
+    <xsl:choose>
+        <xsl:when test="$over='&#x000AF;'">    <!-- OverBar - over bar -->
+            <xsl:text>\overline{</xsl:text>
+            <xsl:call-template name="munder">
+                <xsl:with-param name="base" select="$base"/>
+                <xsl:with-param name="under" select="$under"/>
+            </xsl:call-template>
+            <xsl:text>}</xsl:text>
+        </xsl:when>
+        <xsl:when test="$over='&#x0FE37;'">    <!-- OverBrace - over brace -->
+            <xsl:text>\overbrace{</xsl:text>
+            <xsl:call-template name="munder">
+                <xsl:with-param name="base" select="$base"/>
+                <xsl:with-param name="under" select="$under"/>
+            </xsl:call-template>
+            <xsl:text>}</xsl:text>
+        </xsl:when>
+        <xsl:when test="$under='&#x00332;'">    <!-- UnderBar - combining low line -->
+            <xsl:text>\underline{</xsl:text>
+            <xsl:call-template name="mover">
+                <xsl:with-param name="base" select="$base"/>
+                <xsl:with-param name="over" select="$over"/>
+                <xsl:with-param name="pos_over" select="3"/>
+            </xsl:call-template>
+            <xsl:text>}</xsl:text>
+        </xsl:when>
+        <xsl:when test="$under='&#x0FE38;'">    <!-- UnderBrace - under brace -->
+            <xsl:text>\underbrace{</xsl:text>
+            <xsl:call-template name="mover">
+                <xsl:with-param name="base" select="$base"/>
+                <xsl:with-param name="over" select="$over"/>
+                <xsl:with-param name="pos_over" select="3"/>
+            </xsl:call-template>
+            <xsl:text>}</xsl:text>
+        </xsl:when>
+        <xsl:when test="translate($base,'&#x0220F;&#x02210;&#x022c2;&#x022c3;&#x02294;',
+                        '&#x02211;&#x02211;&#x02211;&#x02211;&#x02211;')='&#x02211;'">
+<!-- if $base is operator, such as
+            &#x02211;    /sum L: summation operator
+            &#x0220F;    /prod L: product operator
+            &#x02210;    /coprod L: coproduct operator
+            &#x022c2;    /bigcap
+            &#x022c3;    /bigcup
+            &#x02294;    /bigsqcup
+-->
+            <xsl:apply-templates select="./*[1]"/>
+            <xsl:text>_{</xsl:text>
+            <xsl:apply-templates select="./*[2]"/>
+            <xsl:text>}^{</xsl:text>
+            <xsl:apply-templates select="./*[3]"/>
+            <xsl:text>}</xsl:text>
+        </xsl:when>
+        <xsl:otherwise>
+            <xsl:text>\underset{</xsl:text>
+            <xsl:apply-templates select="./*[2]"/>
+            <xsl:text>}{\overset{</xsl:text>
+            <xsl:apply-templates select="./*[3]"/>
+            <xsl:text>}{</xsl:text>
+            <xsl:apply-templates select="./*[1]"/>
+            <xsl:text>}}</xsl:text>
+        </xsl:otherwise>
+    </xsl:choose>
+</xsl:template>
+
+<xsl:template match="m:mover">
+    <xsl:call-template name="mover">
+        <xsl:with-param name="base">
+            <xsl:call-template name="startspace">
+                <xsl:with-param name="symbol" select="./*[1]"/>
+            </xsl:call-template>
+        </xsl:with-param>
+        <xsl:with-param name="over">
+            <xsl:call-template name="startspace">
+                <xsl:with-param name="symbol" select="./*[2]"/>
+            </xsl:call-template>
+        </xsl:with-param>
+    </xsl:call-template>
+</xsl:template>
+
+<xsl:template match="m:munder">
+    <xsl:call-template name="munder">
+        <xsl:with-param name="base">
+            <xsl:call-template name="startspace">
+                <xsl:with-param name="symbol" select="./*[1]"/>
+            </xsl:call-template>
+        </xsl:with-param>
+        <xsl:with-param name="under">
+            <xsl:call-template name="startspace">
+                <xsl:with-param name="symbol" select="./*[2]"/>
+            </xsl:call-template>
+        </xsl:with-param>
+    </xsl:call-template>
+</xsl:template>
+
+<xsl:template name="mover">
+    <xsl:param name="base"/>
+    <xsl:param name="over"/>
+    <xsl:param name="pos_over" select="2"/>
+    <xsl:choose>
+        <xsl:when test="$over='&#x000AF;'">    <!-- OverBar - over bar -->
+            <xsl:text>\overline{</xsl:text>
+            <xsl:apply-templates select="./*[1]"/>
+            <xsl:text>}</xsl:text>
+        </xsl:when>
+        <xsl:when test="$over='&#x0FE37;'">    <!-- OverBrace - over brace -->
+            <xsl:text>\overbrace{</xsl:text>
+            <xsl:apply-templates select="./*[1]"/>
+            <xsl:text>}</xsl:text>
+        </xsl:when>
+        <xsl:when test="translate($base,'&#x0220F;&#x02210;&#x022c2;&#x022c3;&#x02294;',
+                        '&#x02211;&#x02211;&#x02211;&#x02211;&#x02211;')='&#x02211;'">
+<!-- if $base is operator, such as
+            &#x02211;    /sum L: summation operator
+            &#x0220F;    /prod L: product operator
+            &#x02210;    /coprod L: coproduct operator
+            &#x022c2;    /bigcap
+            &#x022c3;    /bigcup
+            &#x02294;    /bigsqcup
+-->
+            <xsl:apply-templates select="./*[1]"/>
+            <xsl:text>^{</xsl:text>
+            <xsl:apply-templates select="./*[$pos_over]"/>
+            <xsl:text>}</xsl:text>
+        </xsl:when>
+        <xsl:otherwise>
+            <xsl:text>\stackrel{</xsl:text>
+            <xsl:apply-templates select="./*[$pos_over]"/>
+            <xsl:text>}{</xsl:text>
+            <xsl:apply-templates select="./*[1]"/>
+            <xsl:text>}</xsl:text>
+            <!--
+            <xsl:text>\overset{</xsl:text>
+            <xsl:apply-templates select="./*[$pos_over]"/>
+            <xsl:text>}{</xsl:text>
+            <xsl:apply-templates select="./*[1]"/>
+            <xsl:text>}</xsl:text>-->
+        </xsl:otherwise>
+    </xsl:choose>
+</xsl:template>
+
+<xsl:template name="munder">
+    <xsl:param name="base"/>
+    <xsl:param name="under"/>
+    <xsl:choose>
+        <xsl:when test="$under='&#x00332;'">    <!-- UnderBar - combining low line -->
+            <xsl:text>\underline{</xsl:text>
+            <xsl:apply-templates select="./*[1]"/>
+            <xsl:text>}</xsl:text>
+        </xsl:when>
+        <xsl:when test="$under='&#x0FE38;'">    <!-- UnderBrace - under brace -->
+            <xsl:text>\underbrace{</xsl:text>
+            <xsl:apply-templates select="./*[1]"/>
+            <xsl:text>}</xsl:text>
+        </xsl:when>
+        <xsl:when test="translate($base,'&#x0220F;&#x02210;&#x022c2;&#x022c3;&#x02294;',
+                        '&#x02211;&#x02211;&#x02211;&#x02211;&#x02211;')='&#x02211;'">
+<!-- if $base is operator, such as
+            &#x02211;    /sum L: summation operator
+            &#x0220F;    /prod L: product operator
+            &#x02210;    /coprod L: coproduct operator
+            &#x022c2;    /bigcap
+            &#x022c3;    /bigcup
+            &#x02294;    /bigsqcup
+-->
+            <xsl:apply-templates select="./*[1]"/>
+            <xsl:text>_{</xsl:text>
+            <xsl:apply-templates select="./*[2]"/>
+            <xsl:text>}</xsl:text>
+        </xsl:when>
+        <xsl:otherwise>
+            <xsl:text>\underset{</xsl:text>        <!-- Required AmsMath package -->
+            <xsl:apply-templates select="./*[2]"/>
+            <xsl:text>}{</xsl:text>
+            <xsl:apply-templates select="./*[1]"/>
+            <xsl:text>}</xsl:text>
+        </xsl:otherwise>
+    </xsl:choose>
+</xsl:template>
+
+<xsl:template match="m:msubsup">
+    <xsl:text>{</xsl:text>
+    <xsl:apply-templates select="./*[1]"/>
+    <xsl:text>}_{</xsl:text>
+    <xsl:apply-templates select="./*[2]"/>
+    <xsl:text>}^{</xsl:text>
+    <xsl:apply-templates select="./*[3]"/>
+    <xsl:text>}</xsl:text>
+</xsl:template>
+
+<xsl:template match="m:msup">
+    <xsl:text>{</xsl:text>
+    <xsl:apply-templates select="./*[1]"/>
+    <xsl:text>}^{</xsl:text>
+    <xsl:apply-templates select="./*[2]"/>
+    <xsl:text>}</xsl:text>
+</xsl:template>
+
+<xsl:template match="m:msub">
+    <xsl:text>{</xsl:text>
+    <xsl:apply-templates select="./*[1]"/>
+    <xsl:text>}_{</xsl:text>
+    <xsl:apply-templates select="./*[2]"/>
+    <xsl:text>}</xsl:text>
+</xsl:template>
+
+<xsl:template match="m:mmultiscripts" mode="mprescripts">
+    <xsl:for-each select="m:mprescripts/following-sibling::*">
+        <xsl:if test="position() mod 2 and local-name(.)!='none'">
+            <xsl:text>{}_{</xsl:text>
+            <xsl:apply-templates select="."/>
+            <xsl:text>}</xsl:text>
+        </xsl:if>
+        <xsl:if test="not(position() mod 2) and local-name(.)!='none'">
+            <xsl:text>{}^{</xsl:text>
+            <xsl:apply-templates select="."/>
+            <xsl:text>}</xsl:text>
+        </xsl:if>
+    </xsl:for-each>
+    <xsl:apply-templates select="./*[1]"/>
+    <xsl:for-each select="m:mprescripts/preceding-sibling::*[position()!=last()]">
+        <xsl:if test="position()>2 and local-name(.)!='none'">
+            <xsl:text>{}</xsl:text>
+        </xsl:if>
+        <xsl:if test="position() mod 2 and local-name(.)!='none'">
+            <xsl:text>_{</xsl:text>
+            <xsl:apply-templates select="."/>
+            <xsl:text>}</xsl:text>
+        </xsl:if>
+        <xsl:if test="not(position() mod 2) and local-name(.)!='none'">
+            <xsl:text>^{</xsl:text>
+            <xsl:apply-templates select="."/>
+            <xsl:text>}</xsl:text>
+        </xsl:if>
+    </xsl:for-each>
+</xsl:template>
+
+<xsl:template match="m:mmultiscripts">
+    <xsl:choose>
+        <xsl:when test="m:mprescripts">
+            <xsl:apply-templates select="." mode="mprescripts"/>
+        </xsl:when>
+        <xsl:otherwise>
+            <xsl:apply-templates select="./*[1]"/>
+            <xsl:for-each select="*[position()>1]">
+                <xsl:if test="position()>2 and local-name(.)!='none'">
+                    <xsl:text>{}</xsl:text>
+                </xsl:if>
+                <xsl:if test="position() mod 2 and local-name(.)!='none'">
+                    <xsl:text>_{</xsl:text>
+                    <xsl:apply-templates select="."/>
+                    <xsl:text>}</xsl:text>
+                </xsl:if>
+                <xsl:if test="not(position() mod 2) and local-name(.)!='none'">
+                    <xsl:text>^{</xsl:text>
+                    <xsl:apply-templates select="."/>
+                    <xsl:text>}</xsl:text>
+                </xsl:if>
+            </xsl:for-each>
+        </xsl:otherwise>
+    </xsl:choose>
+</xsl:template>
+
+</xsl:stylesheet>
diff --git a/src/main/resources/xslt/mathml_latex/tables.xsl b/src/main/resources/xslt/mathml_latex/tables.xsl
new file mode 100644
index 00000000000..1cd6f8e63f7
--- /dev/null
+++ b/src/main/resources/xslt/mathml_latex/tables.xsl
@@ -0,0 +1,130 @@
+<?xml version='1.0' encoding="UTF-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+        xmlns:m="http://www.w3.org/1998/Math/MathML"
+                version='1.0'>
+
+<!-- ====================================================================== -->
+<!-- $id: tables.xsl, 2002/17/05 Exp $
+     This file is part of the XSLT MathML Library distribution.
+     See ./README or http://www.raleigh.ru/MathML/mmltex for
+     copyright and other information                                        -->
+<!-- ====================================================================== -->
+
+<xsl:template match="m:mtd[@columnspan]">
+    <xsl:text>\multicolumn{</xsl:text>
+    <xsl:value-of select="@columnspan"/>
+    <xsl:text>}{c}{</xsl:text>
+    <xsl:apply-templates/>
+    <xsl:text>}</xsl:text>
+    <xsl:if test="count(following-sibling::*)>0">
+        <xsl:text>&amp; </xsl:text>
+    </xsl:if>
+</xsl:template>
+
+
+<xsl:template match="m:mtd">
+    <xsl:if test="@columnalign='right' or @columnalign='center'">
+        <xsl:text>\hfill </xsl:text>
+    </xsl:if>
+    <xsl:apply-templates/>
+    <xsl:if test="@columnalign='left' or @columnalign='center'">
+        <xsl:text>\hfill </xsl:text>
+    </xsl:if>
+    <xsl:if test="count(following-sibling::*)>0">
+<!--    this test valid for Sablotron, another form - test="not(position()=last())".
+    Also for m:mtd[@columnspan] and m:mtr  -->
+        <xsl:text>&amp; </xsl:text>
+    </xsl:if>
+</xsl:template>
+
+<xsl:template match="m:mtr">
+    <xsl:apply-templates/>
+    <xsl:if test="count(following-sibling::*)>0">
+        <xsl:text>\\ </xsl:text>
+    </xsl:if>
+</xsl:template>
+
+<xsl:template match="m:mtable">
+    <xsl:text>\begin{array}{</xsl:text>
+    <xsl:if test="@frame='solid'">
+        <xsl:text>|</xsl:text>
+    </xsl:if>
+    <xsl:variable name="numbercols" select="count(./m:mtr[1]/m:mtd[not(@columnspan)])+sum(./m:mtr[1]/m:mtd/@columnspan)"/>
+    <xsl:choose>
+        <xsl:when test="@columnalign">
+            <xsl:variable name="colalign">
+                <xsl:call-template name="colalign">
+                    <xsl:with-param name="colalign" select="@columnalign"/>
+                </xsl:call-template>
+            </xsl:variable>
+            <xsl:choose>
+                <xsl:when test="string-length($colalign) > $numbercols">
+                    <xsl:value-of select="substring($colalign,1,$numbercols)"/>
+                </xsl:when>
+                <xsl:when test="string-length($colalign) &lt; $numbercols">
+                    <xsl:value-of select="$colalign"/>
+                    <xsl:call-template name="generate-string">
+                        <xsl:with-param name="text" select="substring($colalign,string-length($colalign))"/>
+                        <xsl:with-param name="count" select="$numbercols - string-length($colalign)"/>
+                    </xsl:call-template>
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:value-of select="$colalign"/>
+                </xsl:otherwise>
+            </xsl:choose>
+        </xsl:when>
+        <xsl:otherwise>
+            <xsl:call-template name="generate-string">
+                <xsl:with-param name="text" select="'c'"/>
+                <xsl:with-param name="count" select="$numbercols"/>
+            </xsl:call-template>
+        </xsl:otherwise>
+    </xsl:choose>
+    <xsl:if test="@frame='solid'">
+        <xsl:text>|</xsl:text>
+    </xsl:if>
+    <xsl:text>}</xsl:text>
+    <xsl:if test="@frame='solid'">
+        <xsl:text>\hline </xsl:text>
+    </xsl:if>
+    <xsl:apply-templates/>
+    <xsl:if test="@frame='solid'">
+        <xsl:text>\\ \hline</xsl:text>
+    </xsl:if>
+    <xsl:text>\end{array}</xsl:text>
+</xsl:template>
+
+<xsl:template name="colalign">
+    <xsl:param name="colalign"/>
+    <xsl:choose>
+        <xsl:when test="contains($colalign,' ')">
+            <xsl:value-of select="substring($colalign,1,1)"/>
+            <xsl:call-template name="colalign">
+                <xsl:with-param name="colalign" select="substring-after($colalign,' ')"/>
+            </xsl:call-template>
+        </xsl:when>
+        <xsl:otherwise>
+            <xsl:value-of select="substring($colalign,1,1)"/>
+        </xsl:otherwise>
+    </xsl:choose>
+</xsl:template>
+
+<xsl:template name="generate-string">
+<!-- template from XSLT Standard Library v1.1 -->
+    <xsl:param name="text"/>
+    <xsl:param name="count"/>
+
+    <xsl:choose>
+      <xsl:when test="string-length($text) = 0 or $count &lt;= 0"/>
+
+      <xsl:otherwise>
+    <xsl:value-of select="$text"/>
+    <xsl:call-template name="generate-string">
+      <xsl:with-param name="text" select="$text"/>
+      <xsl:with-param name="count" select="$count - 1"/>
+    </xsl:call-template>
+      </xsl:otherwise>
+    </xsl:choose>
+</xsl:template>
+
+</xsl:stylesheet>
diff --git a/src/main/resources/xslt/mathml_latex/tokens.xsl b/src/main/resources/xslt/mathml_latex/tokens.xsl
new file mode 100644
index 00000000000..956b6205676
--- /dev/null
+++ b/src/main/resources/xslt/mathml_latex/tokens.xsl
@@ -0,0 +1,296 @@
+<?xml version='1.0' encoding="UTF-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+        xmlns:m="http://www.w3.org/1998/Math/MathML"
+                version='1.0'>
+
+<!-- ====================================================================== -->
+<!-- $id: tokens.xsl, 2002/22/11 Exp $
+     This file is part of the XSLT MathML Library distribution.
+     See ./README or http://www.raleigh.ru/MathML/mmltex for
+     copyright and other information                                        -->
+<!-- ====================================================================== -->
+
+<xsl:template match="m:mi|m:mn|m:mo|m:mtext|m:ms">
+    <xsl:call-template name="CommonTokenAtr"/>
+</xsl:template>
+
+<xsl:template name="mi">
+    <xsl:choose>
+        <xsl:when test="string-length(normalize-space(.))>1 and not(@mathvariant)">
+            <xsl:text>\mathrm{</xsl:text>
+                <xsl:apply-templates/>
+            <xsl:text>}</xsl:text>
+        </xsl:when>
+        <xsl:otherwise>
+            <xsl:apply-templates/>
+        </xsl:otherwise>
+    </xsl:choose>
+</xsl:template>
+
+<xsl:template name="mn">
+    <xsl:apply-templates/>
+</xsl:template>
+
+<xsl:template name="mo">
+    <xsl:apply-templates/>
+</xsl:template>
+
+<xsl:template name="mtext">
+    <xsl:variable name="content">
+        <xsl:call-template name="replaceMtextEntities">
+            <xsl:with-param name="content" select="."/>
+        </xsl:call-template>
+    </xsl:variable>
+    <xsl:text>\text{</xsl:text>
+    <xsl:value-of select="$content"/>
+    <xsl:text>}</xsl:text>
+</xsl:template>
+
+<xsl:template match="m:mspace">
+    <xsl:text>\phantom{\rule</xsl:text>
+    <xsl:if test="@depth">
+        <xsl:text>[-</xsl:text>
+        <xsl:value-of select="@depth"/>
+        <xsl:text>]</xsl:text>
+    </xsl:if>
+    <xsl:text>{</xsl:text>
+    <xsl:if test="not(@width)">
+        <xsl:text>0ex</xsl:text>
+    </xsl:if>
+    <xsl:value-of select="@width"/>
+    <xsl:text>}{</xsl:text>
+    <xsl:if test="not(@height)">
+        <xsl:text>0ex</xsl:text>
+    </xsl:if>
+    <xsl:value-of select="@height"/>
+    <xsl:text>}}</xsl:text>
+</xsl:template>
+
+<xsl:template name="ms">
+    <xsl:choose>
+        <xsl:when test="@lquote"><xsl:value-of select="@lquote"/></xsl:when>
+        <xsl:otherwise><xsl:text>"</xsl:text></xsl:otherwise>
+    </xsl:choose><xsl:apply-templates/><xsl:choose>
+        <xsl:when test="@rquote"><xsl:value-of select="@rquote"/></xsl:when>
+        <xsl:otherwise><xsl:text>"</xsl:text></xsl:otherwise>
+    </xsl:choose>
+</xsl:template>
+
+<xsl:template name="CommonTokenAtr">
+    <xsl:if test="@mathbackground">
+        <xsl:text>\colorbox[rgb]{</xsl:text>
+        <xsl:call-template name="color">
+            <xsl:with-param name="color" select="@mathbackground"/>
+        </xsl:call-template>
+        <xsl:text>}{$</xsl:text>
+    </xsl:if>
+    <xsl:if test="@color or @mathcolor"> <!-- Note: @color is deprecated in MathML 2.0 -->
+        <xsl:text>\textcolor[rgb]{</xsl:text>
+        <xsl:call-template name="color">
+            <xsl:with-param name="color" select="@color|@mathcolor"/>
+        </xsl:call-template>
+        <xsl:text>}{</xsl:text>
+    </xsl:if>
+    <xsl:if test="@mathvariant">
+        <xsl:choose>
+            <xsl:when test="@mathvariant='normal'">
+                <xsl:text>\mathrm{</xsl:text>
+            </xsl:when>
+            <xsl:when test="@mathvariant='bold'">
+                <xsl:text>\mathbf{</xsl:text>
+            </xsl:when>
+            <xsl:when test="@mathvariant='italic'">
+                <xsl:text>\mathit{</xsl:text>
+            </xsl:when>
+            <xsl:when test="@mathvariant='bold-italic'">    <!-- Required definition -->
+                <xsl:text>\mathbit{</xsl:text>
+            </xsl:when>
+            <xsl:when test="@mathvariant='double-struck'">    <!-- Required amsfonts -->
+                <xsl:text>\mathbb{</xsl:text>
+            </xsl:when>
+            <xsl:when test="@mathvariant='bold-fraktur'">    <!-- Error -->
+                <xsl:text>{</xsl:text>
+            </xsl:when>
+            <xsl:when test="@mathvariant='script'">
+                <xsl:text>\mathcal{</xsl:text>
+            </xsl:when>
+            <xsl:when test="@mathvariant='bold-script'">    <!-- Error -->
+                <xsl:text>\mathsc{</xsl:text>
+            </xsl:when>
+            <xsl:when test="@mathvariant='fraktur'">    <!-- Required amsfonts -->
+                <xsl:text>\mathfrak{</xsl:text>
+            </xsl:when>
+            <xsl:when test="@mathvariant='sans-serif'">
+                <xsl:text>\mathsf{</xsl:text>
+            </xsl:when>
+            <xsl:when test="@mathvariant='bold-sans-serif'"> <!-- Required definition -->
+                <xsl:text>\mathbsf{</xsl:text>
+            </xsl:when>
+            <xsl:when test="@mathvariant='sans-serif-italic'"> <!-- Required definition -->
+                <xsl:text>\mathsfit{</xsl:text>
+            </xsl:when>
+            <xsl:when test="@mathvariant='sans-serif-bold-italic'">    <!-- Error -->
+                <xsl:text>\mathbsfit{</xsl:text>
+            </xsl:when>
+            <xsl:when test="@mathvariant='monospace'">
+                <xsl:text>\mathtt{</xsl:text>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:text>{</xsl:text>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:if>
+    <xsl:call-template name="selectTemplate"/>
+    <xsl:if test="@mathvariant">
+        <xsl:text>}</xsl:text>
+    </xsl:if>
+    <xsl:if test="@color or @mathcolor">
+        <xsl:text>}</xsl:text>
+    </xsl:if>
+    <xsl:if test="@mathbackground">
+        <xsl:text>$}</xsl:text>
+    </xsl:if>
+</xsl:template>
+
+<xsl:template name="selectTemplate">
+<!--    <xsl:variable name="name" select="local-name()"/>
+    <xsl:call-template name="{$name}"/>-->
+    <xsl:choose>
+        <xsl:when test="local-name(.)='mi'">
+            <xsl:call-template name="mi"/>
+        </xsl:when>
+        <xsl:when test="local-name(.)='mn'">
+            <xsl:call-template name="mn"/>
+        </xsl:when>
+        <xsl:when test="local-name(.)='mo'">
+            <xsl:call-template name="mo"/>
+        </xsl:when>
+        <xsl:when test="local-name(.)='mtext'">
+            <xsl:call-template name="mtext"/>
+        </xsl:when>
+        <xsl:when test="local-name(.)='ms'">
+            <xsl:call-template name="ms"/>
+        </xsl:when>
+    </xsl:choose>
+</xsl:template>
+
+<xsl:template name="color">
+<!-- NB: Variables colora and valueColor{n} only for Sablotron -->
+    <xsl:param name="color"/>
+    <xsl:variable name="colora" select="translate($color,'ABCDEFGHIJKLMNOPQRSTUVWXYZ','abcdefghijklmnopqrstuvwxyz')"/>
+    <xsl:choose>
+    <xsl:when test="starts-with($colora,'#') and string-length($colora)=4">
+        <xsl:variable name="valueColor">
+            <xsl:call-template name="Hex2Decimal">
+                <xsl:with-param name="arg" select="substring($colora,2,1)"/>
+            </xsl:call-template>
+        </xsl:variable>
+        <xsl:value-of select="$valueColor div 15"/><xsl:text>,</xsl:text>
+        <xsl:variable name="valueColor1">
+            <xsl:call-template name="Hex2Decimal">
+                <xsl:with-param name="arg" select="substring($colora,3,1)"/>
+            </xsl:call-template>
+        </xsl:variable>
+        <xsl:value-of select="$valueColor1 div 15"/><xsl:text>,</xsl:text>
+        <xsl:variable name="valueColor2">
+            <xsl:call-template name="Hex2Decimal">
+                <xsl:with-param name="arg" select="substring($colora,4,1)"/>
+            </xsl:call-template>
+        </xsl:variable>
+        <xsl:value-of select="$valueColor2 div 15"/>
+    </xsl:when>
+    <xsl:when test="starts-with($colora,'#') and string-length($colora)=7">
+        <xsl:variable name="valueColor1">
+            <xsl:call-template name="Hex2Decimal">
+                <xsl:with-param name="arg" select="substring($colora,2,1)"/>
+            </xsl:call-template>
+        </xsl:variable>
+        <xsl:variable name="valueColor2">
+            <xsl:call-template name="Hex2Decimal">
+                <xsl:with-param name="arg" select="substring($colora,3,1)"/>
+            </xsl:call-template>
+        </xsl:variable>
+        <xsl:value-of select="($valueColor1*16 + $valueColor2) div 255"/><xsl:text>,</xsl:text>
+        <xsl:variable name="valueColor1a">
+            <xsl:call-template name="Hex2Decimal">
+                <xsl:with-param name="arg" select="substring($colora,4,1)"/>
+            </xsl:call-template>
+        </xsl:variable>
+        <xsl:variable name="valueColor2a">
+            <xsl:call-template name="Hex2Decimal">
+                <xsl:with-param name="arg" select="substring($colora,5,1)"/>
+            </xsl:call-template>
+        </xsl:variable>
+        <xsl:value-of select="($valueColor1a*16 + $valueColor2a) div 255"/><xsl:text>,</xsl:text>
+        <xsl:variable name="valueColor1b">
+            <xsl:call-template name="Hex2Decimal">
+                <xsl:with-param name="arg" select="substring($colora,6,1)"/>
+            </xsl:call-template>
+        </xsl:variable>
+        <xsl:variable name="valueColor2b">
+            <xsl:call-template name="Hex2Decimal">
+                <xsl:with-param name="arg" select="substring($colora,7,1)"/>
+            </xsl:call-template>
+        </xsl:variable>
+        <xsl:value-of select="($valueColor1b*16 + $valueColor2b) div 255"/>
+    </xsl:when>
+<!-- ======================= if color specifed as an html-color-name ========================================== -->
+    <xsl:when test="$colora='aqua'"><xsl:text>0,1,1</xsl:text></xsl:when>
+    <xsl:when test="$colora='black'"><xsl:text>0,0,0</xsl:text></xsl:when>
+    <xsl:when test="$colora='blue'"><xsl:text>0,0,1</xsl:text></xsl:when>
+    <xsl:when test="$colora='fuchsia'"><xsl:text>1,0,1</xsl:text></xsl:when>
+    <xsl:when test="$colora='gray'"><xsl:text>.5,.5,.5</xsl:text></xsl:when>
+    <xsl:when test="$colora='green'"><xsl:text>0,.5,0</xsl:text></xsl:when>
+    <xsl:when test="$colora='lime'"><xsl:text>0,1,0</xsl:text></xsl:when>
+    <xsl:when test="$colora='maroon'"><xsl:text>.5,0,0</xsl:text></xsl:when>
+    <xsl:when test="$colora='navy'"><xsl:text>0,0,.5</xsl:text></xsl:when>
+    <xsl:when test="$colora='olive'"><xsl:text>.5,.5,0</xsl:text></xsl:when>
+    <xsl:when test="$colora='purple'"><xsl:text>.5,0,.5</xsl:text></xsl:when>
+    <xsl:when test="$colora='red'"><xsl:text>1,0,0</xsl:text></xsl:when>
+    <xsl:when test="$colora='silver'"><xsl:text>.75,.75,.75</xsl:text></xsl:when>
+    <xsl:when test="$colora='teal'"><xsl:text>0,.5,.5</xsl:text></xsl:when>
+    <xsl:when test="$colora='white'"><xsl:text>1,1,1</xsl:text></xsl:when>
+    <xsl:when test="$colora='yellow'"><xsl:text>1,1,0</xsl:text></xsl:when>
+    <xsl:otherwise>
+        <xsl:message>Exception at color template</xsl:message>
+    </xsl:otherwise>
+    </xsl:choose>
+</xsl:template>
+
+<xsl:template name="Hex2Decimal">
+    <xsl:param name="arg"/>
+    <xsl:choose>
+        <xsl:when test="$arg='f'">
+            <xsl:value-of select="15"/>
+        </xsl:when>
+        <xsl:when test="$arg='e'">
+            <xsl:value-of select="14"/>
+        </xsl:when>
+        <xsl:when test="$arg='d'">
+            <xsl:value-of select="13"/>
+        </xsl:when>
+        <xsl:when test="$arg='c'">
+            <xsl:value-of select="12"/>
+        </xsl:when>
+        <xsl:when test="$arg='b'">
+            <xsl:value-of select="11"/>
+        </xsl:when>
+        <xsl:when test="$arg='a'">
+            <xsl:value-of select="10"/>
+        </xsl:when>
+        <xsl:when test="translate($arg, '0123456789', '9999999999')='9'"> <!-- if $arg is number -->
+            <xsl:value-of select="$arg"/>
+        </xsl:when>
+        <xsl:otherwise>
+            <xsl:message>Exception at Hex2Decimal template</xsl:message>
+        </xsl:otherwise>
+    </xsl:choose>
+</xsl:template>
+
+<xsl:template match="m:*/text()">
+    <xsl:call-template name="replaceEntities">
+        <xsl:with-param name="content" select="normalize-space()"/>
+    </xsl:call-template>
+</xsl:template>
+
+</xsl:stylesheet>
diff --git a/src/test/java/org/jabref/cli/ArgumentProcessorTest.java b/src/test/java/org/jabref/cli/ArgumentProcessorTest.java
index ca9f50f04de..78dcb77f755 100644
--- a/src/test/java/org/jabref/cli/ArgumentProcessorTest.java
+++ b/src/test/java/org/jabref/cli/ArgumentProcessorTest.java
@@ -10,14 +10,14 @@
 
 import org.jabref.cli.ArgumentProcessor.Mode;
 import org.jabref.logic.bibtex.BibEntryAssert;
-import org.jabref.logic.exporter.SavePreferences;
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.ImporterPreferences;
 import org.jabref.logic.importer.fileformat.BibtexImporter;
 import org.jabref.model.entry.BibEntry;
-import org.jabref.model.metadata.SaveOrderConfig;
+import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.search.rules.SearchRules;
 import org.jabref.model.util.DummyFileUpdateMonitor;
+import org.jabref.model.util.FileUpdateMonitor;
 import org.jabref.preferences.PreferencesService;
 import org.jabref.preferences.SearchPreferences;
 
@@ -35,15 +35,13 @@ class ArgumentProcessorTest {
     private ArgumentProcessor processor;
     private BibtexImporter bibtexImporter;
     private final PreferencesService preferencesService = mock(PreferencesService.class, Answers.RETURNS_DEEP_STUBS);
-    private final SavePreferences savePreferences = mock(SavePreferences.class, Answers.RETURNS_DEEP_STUBS);
+    private final BibEntryTypesManager entryTypesManager = mock(BibEntryTypesManager.class);
     private final ImporterPreferences importerPreferences = mock(ImporterPreferences.class, Answers.RETURNS_DEEP_STUBS);
     private final ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
 
     @BeforeEach()
     void setup() {
-        when(savePreferences.getSaveOrder()).thenReturn(SaveOrderConfig.getDefaultSaveOrder());
-        when(preferencesService.getSavePreferences()).thenReturn(savePreferences);
-        when(importerPreferences.getCustomImportList()).thenReturn(FXCollections.emptyObservableSet());
+        when(importerPreferences.getCustomImporters()).thenReturn(FXCollections.emptyObservableSet());
         when(preferencesService.getSearchPreferences()).thenReturn(
                 new SearchPreferences(null, EnumSet.noneOf(SearchRules.SearchFlags.class), false)
         );
@@ -62,7 +60,12 @@ void testAuxImport(@TempDir Path tempDir) throws Exception {
 
         List<String> args = List.of("--nogui", "--debug", "--aux", auxFile + "," + outputBibFile, originBib);
 
-        processor = new ArgumentProcessor(args.toArray(String[]::new), Mode.INITIAL_START, preferencesService);
+        processor = new ArgumentProcessor(
+                args.toArray(String[]::new),
+                Mode.INITIAL_START,
+                preferencesService,
+                mock(FileUpdateMonitor.class),
+                entryTypesManager);
 
         assertTrue(Files.exists(outputBib));
     }
@@ -83,7 +86,12 @@ void testExportMatches(@TempDir Path tempDir) throws Exception {
 
         List<String> args = List.of("-n", "--debug", "--exportMatches", "Author=Einstein," + outputBibFile, originBibFile);
 
-        processor = new ArgumentProcessor(args.toArray(String[]::new), Mode.INITIAL_START, preferencesService);
+        processor = new ArgumentProcessor(
+                args.toArray(String[]::new),
+                Mode.INITIAL_START,
+                preferencesService,
+                mock(FileUpdateMonitor.class),
+                entryTypesManager);
 
         assertTrue(Files.exists(outputBib));
         BibEntryAssert.assertEquals(expectedEntries, outputBib, bibtexImporter);
diff --git a/src/test/java/org/jabref/cli/AuxCommandLineTest.java b/src/test/java/org/jabref/cli/AuxCommandLineTest.java
index 74531b9c5eb..d746bffea9a 100644
--- a/src/test/java/org/jabref/cli/AuxCommandLineTest.java
+++ b/src/test/java/org/jabref/cli/AuxCommandLineTest.java
@@ -12,7 +12,6 @@
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.logic.importer.fileformat.BibtexParser;
 import org.jabref.model.database.BibDatabase;
-import org.jabref.model.util.DummyFileUpdateMonitor;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -37,7 +36,7 @@ public void test() throws URISyntaxException, IOException {
 
         File auxFile = Path.of(AuxCommandLineTest.class.getResource("paper.aux").toURI()).toFile();
         try (InputStreamReader originalReader = new InputStreamReader(originalStream, StandardCharsets.UTF_8)) {
-            ParserResult result = new BibtexParser(importFormatPreferences, new DummyFileUpdateMonitor()).parse(originalReader);
+            ParserResult result = new BibtexParser(importFormatPreferences).parse(originalReader);
 
             AuxCommandLine auxCommandLine = new AuxCommandLine(auxFile.getAbsolutePath(), result.getDatabase());
             BibDatabase newDB = auxCommandLine.perform();
diff --git a/src/test/java/org/jabref/cli/JabRefCLITest.java b/src/test/java/org/jabref/cli/JabRefCLITest.java
index 7fb40505602..dfcd8478cd7 100644
--- a/src/test/java/org/jabref/cli/JabRefCLITest.java
+++ b/src/test/java/org/jabref/cli/JabRefCLITest.java
@@ -3,6 +3,8 @@
 import java.util.Collections;
 import java.util.List;
 
+import javafx.util.Pair;
+
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -143,4 +145,22 @@ void wrapStringList() {
 
         assertEquals(expected, "Available export formats: " + JabRefCLI.wrapStringList(given, 26));
     }
+
+    @Test
+    void alignStringTable() {
+        List<Pair<String, String>> given = List.of(
+                new Pair<>("Apple", "Slice"),
+                new Pair<>("Bread", "Loaf"),
+                new Pair<>("Paper", "Sheet"),
+                new Pair<>("Country", "County"));
+
+        String expected = """
+                Apple   : Slice
+                Bread   : Loaf
+                Paper   : Sheet
+                Country : County
+                """;
+
+        assertEquals(expected, JabRefCLI.alignStringTable(given));
+    }
 }
diff --git a/src/test/java/org/jabref/gui/autocompleter/BibEntrySuggestionProviderTest.java b/src/test/java/org/jabref/gui/autocompleter/BibEntrySuggestionProviderTest.java
index 3c6816d6464..7b641e987dd 100644
--- a/src/test/java/org/jabref/gui/autocompleter/BibEntrySuggestionProviderTest.java
+++ b/src/test/java/org/jabref/gui/autocompleter/BibEntrySuggestionProviderTest.java
@@ -27,7 +27,7 @@ void setUp() throws Exception {
 
     @Test
     void completeWithoutAddingAnythingReturnsNothing() {
-        Collection<BibEntry> result = autoCompleter.provideSuggestions(getRequest(("test")));
+        Collection<BibEntry> result = autoCompleter.provideSuggestions(getRequest("test"));
         assertEquals(Collections.emptyList(), result);
     }
 
@@ -36,7 +36,7 @@ void completeAfterAddingEmptyEntryReturnsNothing() {
         BibEntry entry = new BibEntry();
         database.insertEntry(entry);
 
-        Collection<BibEntry> result = autoCompleter.provideSuggestions(getRequest(("test")));
+        Collection<BibEntry> result = autoCompleter.provideSuggestions(getRequest("test"));
         assertEquals(Collections.emptyList(), result);
     }
 
@@ -46,7 +46,7 @@ void completeKeyReturnsKey() {
         entry.setCitationKey("testKey");
         database.insertEntry(entry);
 
-        Collection<BibEntry> result = autoCompleter.provideSuggestions(getRequest(("testKey")));
+        Collection<BibEntry> result = autoCompleter.provideSuggestions(getRequest("testKey"));
         assertEquals(Collections.singletonList(entry), result);
     }
 
@@ -56,7 +56,7 @@ void completeBeginningOfKeyReturnsKey() {
         entry.setCitationKey("testKey");
         database.insertEntry(entry);
 
-        Collection<BibEntry> result = autoCompleter.provideSuggestions(getRequest(("test")));
+        Collection<BibEntry> result = autoCompleter.provideSuggestions(getRequest("test"));
         assertEquals(Collections.singletonList(entry), result);
     }
 
@@ -66,7 +66,7 @@ void completeLowercaseKeyReturnsKey() {
         entry.setCitationKey("testKey");
         database.insertEntry(entry);
 
-        Collection<BibEntry> result = autoCompleter.provideSuggestions(getRequest(("testkey")));
+        Collection<BibEntry> result = autoCompleter.provideSuggestions(getRequest("testkey"));
         assertEquals(Collections.singletonList(entry), result);
     }
 
@@ -76,7 +76,7 @@ void completeNullThrowsException() {
         entry.setCitationKey("testKey");
         database.insertEntry(entry);
 
-        assertThrows(NullPointerException.class, () -> autoCompleter.provideSuggestions(getRequest((null))));
+        assertThrows(NullPointerException.class, () -> autoCompleter.provideSuggestions(getRequest(null)));
     }
 
     @Test
@@ -85,7 +85,7 @@ void completeEmptyStringReturnsNothing() {
         entry.setCitationKey("testKey");
         database.insertEntry(entry);
 
-        Collection<BibEntry> result = autoCompleter.provideSuggestions(getRequest(("")));
+        Collection<BibEntry> result = autoCompleter.provideSuggestions(getRequest(""));
         assertEquals(Collections.emptyList(), result);
     }
 
@@ -98,7 +98,7 @@ void completeReturnsMultipleResults() {
         entryTwo.setCitationKey("testKeyTwo");
         database.insertEntry(entryTwo);
 
-        Collection<BibEntry> result = autoCompleter.provideSuggestions(getRequest(("testKey")));
+        Collection<BibEntry> result = autoCompleter.provideSuggestions(getRequest("testKey"));
         assertEquals(Arrays.asList(entryTwo, entryOne), result);
     }
 
@@ -108,7 +108,7 @@ void completeShortKeyReturnsKey() {
         entry.setCitationKey("key");
         database.insertEntry(entry);
 
-        Collection<BibEntry> result = autoCompleter.provideSuggestions(getRequest(("k")));
+        Collection<BibEntry> result = autoCompleter.provideSuggestions(getRequest("k"));
         assertEquals(Collections.singletonList(entry), result);
     }
 }
diff --git a/src/test/java/org/jabref/gui/autocompleter/ContentSelectorSuggestionProviderTest.java b/src/test/java/org/jabref/gui/autocompleter/ContentSelectorSuggestionProviderTest.java
index e0ded4056e8..efa4139f4e3 100644
--- a/src/test/java/org/jabref/gui/autocompleter/ContentSelectorSuggestionProviderTest.java
+++ b/src/test/java/org/jabref/gui/autocompleter/ContentSelectorSuggestionProviderTest.java
@@ -24,7 +24,7 @@ void completeWithoutAddingAnythingReturnsNothing() {
         autoCompleter = new ContentSelectorSuggestionProvider(suggestionProvider, Collections.emptyList());
 
         Collection<String> expected = Collections.emptyList();
-        Collection<String> result = autoCompleter.provideSuggestions(getRequest(("test")));
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest("test"));
 
         assertEquals(expected, result);
     }
@@ -35,7 +35,7 @@ void completeKeywordReturnsKeyword() {
         autoCompleter = new ContentSelectorSuggestionProvider(suggestionProvider, Collections.singletonList("test"));
 
         Collection<String> expected = Collections.singletonList("test");
-        Collection<String> result = autoCompleter.provideSuggestions(getRequest(("test")));
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest("test"));
 
         assertEquals(expected, result);
     }
@@ -46,7 +46,7 @@ void completeBeginningOfKeywordReturnsKeyword() {
         autoCompleter = new ContentSelectorSuggestionProvider(suggestionProvider, Collections.singletonList("test"));
 
         Collection<String> expected = Collections.singletonList("test");
-        Collection<String> result = autoCompleter.provideSuggestions(getRequest(("te")));
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest("te"));
 
         assertEquals(expected, result);
     }
@@ -62,7 +62,7 @@ void completeKeywordReturnsKeywordFromDatabase() {
         autoCompleter = new ContentSelectorSuggestionProvider(suggestionProvider, Collections.emptyList());
 
         Collection<String> expected = Collections.singletonList("test");
-        Collection<String> result = autoCompleter.provideSuggestions(getRequest(("test")));
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest("test"));
 
         assertEquals(expected, result);
     }
@@ -73,14 +73,14 @@ void completeUppercaseBeginningOfNameReturnsName() {
         autoCompleter = new ContentSelectorSuggestionProvider(suggestionProvider, Collections.singletonList("test"));
 
         Collection<String> expected = Collections.singletonList("test");
-        Collection<String> result = autoCompleter.provideSuggestions(getRequest(("TE")));
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest("TE"));
 
         assertEquals(expected, result);
     }
 
     @Test
     void completeNullThrowsException() {
-        assertThrows(NullPointerException.class, () -> autoCompleter.provideSuggestions(getRequest((null))));
+        assertThrows(NullPointerException.class, () -> autoCompleter.provideSuggestions(getRequest(null)));
     }
 
     @Test
@@ -89,7 +89,7 @@ void completeEmptyStringReturnsNothing() {
         autoCompleter = new ContentSelectorSuggestionProvider(suggestionProvider, Collections.singletonList("test"));
 
         Collection<String> expected = Collections.emptyList();
-        Collection<String> result = autoCompleter.provideSuggestions(getRequest(("")));
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest(""));
 
         assertEquals(expected, result);
     }
@@ -105,7 +105,7 @@ void completeReturnsMultipleResults() {
         autoCompleter = new ContentSelectorSuggestionProvider(suggestionProvider, Collections.singletonList("testb"));
 
         Collection<String> expected = Arrays.asList("testa", "testb");
-        Collection<String> result = autoCompleter.provideSuggestions(getRequest(("test")));
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest("test"));
 
         assertEquals(expected, result);
     }
@@ -122,7 +122,7 @@ void completeReturnsKeywordsInAlphabeticalOrder() {
         autoCompleter = new ContentSelectorSuggestionProvider(suggestionProvider, Arrays.asList("testb", "testa"));
 
         Collection<String> expected = Arrays.asList("testa", "testb", "testc", "testd");
-        Collection<String> result = autoCompleter.provideSuggestions(getRequest(("test")));
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest("test"));
 
         assertEquals(expected, result);
     }
diff --git a/src/test/java/org/jabref/gui/autocompleter/DefaultAutoCompleterTest.java b/src/test/java/org/jabref/gui/autocompleter/DefaultAutoCompleterTest.java
index 8d833b199aa..767eff82374 100644
--- a/src/test/java/org/jabref/gui/autocompleter/DefaultAutoCompleterTest.java
+++ b/src/test/java/org/jabref/gui/autocompleter/DefaultAutoCompleterTest.java
@@ -33,7 +33,7 @@ void initAutoCompleterWithNullFieldThrowsException() {
 
     @Test
     void completeWithoutAddingAnythingReturnsNothing() {
-        Collection<String> result = autoCompleter.provideSuggestions(getRequest(("test")));
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest("test"));
         assertEquals(Collections.emptyList(), result);
     }
 
@@ -42,7 +42,7 @@ void completeAfterAddingEmptyEntryReturnsNothing() {
         BibEntry entry = new BibEntry();
         database.insertEntry(entry);
 
-        Collection<String> result = autoCompleter.provideSuggestions(getRequest(("test")));
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest("test"));
         assertEquals(Collections.emptyList(), result);
     }
 
@@ -52,7 +52,7 @@ void completeAfterAddingEntryWithoutFieldReturnsNothing() {
         entry.setField(StandardField.AUTHOR, "testAuthor");
         database.insertEntry(entry);
 
-        Collection<String> result = autoCompleter.provideSuggestions(getRequest(("test")));
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest("test"));
         assertEquals(Collections.emptyList(), result);
     }
 
@@ -62,7 +62,7 @@ void completeValueReturnsValue() {
         entry.setField(StandardField.TITLE, "testValue");
         database.insertEntry(entry);
 
-        Collection<String> result = autoCompleter.provideSuggestions(getRequest(("testValue")));
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest("testValue"));
         assertEquals(Arrays.asList("testValue"), result);
     }
 
@@ -72,7 +72,7 @@ void completeBeginningOfValueReturnsValue() {
         entry.setField(StandardField.TITLE, "testValue");
         database.insertEntry(entry);
 
-        Collection<String> result = autoCompleter.provideSuggestions(getRequest(("test")));
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest("test"));
         assertEquals(Arrays.asList("testValue"), result);
     }
 
@@ -82,7 +82,7 @@ void completeLowercaseValueReturnsValue() {
         entry.setField(StandardField.TITLE, "testValue");
         database.insertEntry(entry);
 
-        Collection<String> result = autoCompleter.provideSuggestions(getRequest(("testvalue")));
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest("testvalue"));
         assertEquals(Arrays.asList("testValue"), result);
     }
 
@@ -92,7 +92,7 @@ void completeNullThrowsException() {
         entry.setField(StandardField.TITLE, "testKey");
         database.insertEntry(entry);
 
-        assertThrows(NullPointerException.class, () -> autoCompleter.provideSuggestions(getRequest((null))));
+        assertThrows(NullPointerException.class, () -> autoCompleter.provideSuggestions(getRequest(null)));
     }
 
     @Test
@@ -101,7 +101,7 @@ void completeEmptyStringReturnsNothing() {
         entry.setField(StandardField.TITLE, "testKey");
         database.insertEntry(entry);
 
-        Collection<String> result = autoCompleter.provideSuggestions(getRequest(("")));
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest(""));
         assertEquals(Collections.emptyList(), result);
     }
 
@@ -114,7 +114,7 @@ void completeReturnsMultipleResults() {
         entryTwo.setField(StandardField.TITLE, "testValueTwo");
         database.insertEntry(entryTwo);
 
-        Collection<String> result = autoCompleter.provideSuggestions(getRequest(("testValue")));
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest("testValue"));
         assertEquals(Arrays.asList("testValueOne", "testValueTwo"), result);
     }
 
@@ -124,7 +124,7 @@ void completeShortStringReturnsValue() {
         entry.setField(StandardField.TITLE, "val");
         database.insertEntry(entry);
 
-        Collection<String> result = autoCompleter.provideSuggestions(getRequest(("va")));
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest("va"));
         assertEquals(Collections.singletonList("val"), result);
     }
 
@@ -134,7 +134,7 @@ void completeBeginnigOfSecondWordReturnsWord() {
         entry.setField(StandardField.TITLE, "test value");
         database.insertEntry(entry);
 
-        Collection<String> result = autoCompleter.provideSuggestions(getRequest(("val")));
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest("val"));
         assertEquals(Collections.singletonList("value"), result);
     }
 
@@ -144,7 +144,7 @@ void completePartOfWordReturnsValue() {
         entry.setField(StandardField.TITLE, "test value");
         database.insertEntry(entry);
 
-        Collection<String> result = autoCompleter.provideSuggestions(getRequest(("lue")));
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest("lue"));
         assertEquals(Collections.singletonList("value"), result);
     }
 }
diff --git a/src/test/java/org/jabref/gui/autocompleter/FieldValueSuggestionProviderTest.java b/src/test/java/org/jabref/gui/autocompleter/FieldValueSuggestionProviderTest.java
index 15c2bde30e4..e4baeeb3405 100644
--- a/src/test/java/org/jabref/gui/autocompleter/FieldValueSuggestionProviderTest.java
+++ b/src/test/java/org/jabref/gui/autocompleter/FieldValueSuggestionProviderTest.java
@@ -40,7 +40,7 @@ void initAutoCompleterWithNullFieldThrowsException() {
 
     @Test
     void completeWithoutAddingAnythingReturnsNothing() {
-        Collection<String> result = autoCompleter.provideSuggestions(getRequest(("test")));
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest("test"));
         assertEquals(Collections.emptyList(), result);
     }
 
@@ -49,7 +49,7 @@ void completeAfterAddingEmptyEntryReturnsNothing() {
         BibEntry entry = new BibEntry();
         database.insertEntry(entry);
 
-        Collection<String> result = autoCompleter.provideSuggestions(getRequest(("test")));
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest("test"));
         assertEquals(Collections.emptyList(), result);
     }
 
@@ -59,7 +59,7 @@ void completeAfterAddingEntryWithoutFieldReturnsNothing() {
         entry.setField(StandardField.AUTHOR, "testAuthor");
         database.insertEntry(entry);
 
-        Collection<String> result = autoCompleter.provideSuggestions(getRequest(("test")));
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest("test"));
         assertEquals(Collections.emptyList(), result);
     }
 
@@ -76,7 +76,7 @@ void completeOnIgnoredFieldReturnsNothing() {
         entry.setField(StandardField.TITLE, "testValue");
         database.insertEntry(entry);
 
-        Collection<String> result = autoCompleter.provideSuggestions(getRequest(("testValue")));
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest("testValue"));
         assertEquals(Collections.emptyList(), result);
     }
 
@@ -86,7 +86,7 @@ void completeValueReturnsValue() {
         entry.setField(StandardField.TITLE, "testValue");
         database.insertEntry(entry);
 
-        Collection<String> result = autoCompleter.provideSuggestions(getRequest(("testValue")));
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest("testValue"));
         assertEquals(List.of("testValue"), result);
     }
 
@@ -96,7 +96,7 @@ void completeBeginnigOfValueReturnsValue() {
         entry.setField(StandardField.TITLE, "testValue");
         database.insertEntry(entry);
 
-        Collection<String> result = autoCompleter.provideSuggestions(getRequest(("test")));
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest("test"));
         assertEquals(List.of("testValue"), result);
     }
 
@@ -106,7 +106,7 @@ void completeLowercaseValueReturnsValue() {
         entry.setField(StandardField.TITLE, "testValue");
         database.insertEntry(entry);
 
-        Collection<String> result = autoCompleter.provideSuggestions(getRequest(("testvalue")));
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest("testvalue"));
         assertEquals(List.of("testValue"), result);
     }
 
@@ -125,7 +125,7 @@ void completeEmptyStringReturnsNothing() {
         entry.setField(StandardField.TITLE, "testKey");
         database.insertEntry(entry);
 
-        Collection<String> result = autoCompleter.provideSuggestions(getRequest(("")));
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest(""));
         assertEquals(Collections.emptyList(), result);
     }
 
@@ -138,7 +138,7 @@ void completeReturnsMultipleResults() {
         entryTwo.setField(StandardField.TITLE, "testValueTwo");
         database.insertEntry(entryTwo);
 
-        Collection<String> result = autoCompleter.provideSuggestions(getRequest(("testValue")));
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest("testValue"));
         assertEquals(Arrays.asList("testValueOne", "testValueTwo"), result);
     }
 
@@ -148,7 +148,7 @@ void completeShortStringReturnsFieldValue() {
         entry.setField(StandardField.TITLE, "val");
         database.insertEntry(entry);
 
-        Collection<String> result = autoCompleter.provideSuggestions(getRequest(("va")));
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest("va"));
         assertEquals(Collections.singletonList("val"), result);
     }
 
@@ -158,7 +158,7 @@ void completeBeginnigOfSecondWordReturnsWholeFieldValue() {
         entry.setField(StandardField.TITLE, "test value");
         database.insertEntry(entry);
 
-        Collection<String> result = autoCompleter.provideSuggestions(getRequest(("val")));
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest("val"));
         assertEquals(Collections.singletonList("test value"), result);
     }
 
@@ -168,7 +168,7 @@ void completePartOfWordReturnsWholeFieldValue() {
         entry.setField(StandardField.TITLE, "test value");
         database.insertEntry(entry);
 
-        Collection<String> result = autoCompleter.provideSuggestions(getRequest(("lue")));
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest("lue"));
         assertEquals(Collections.singletonList("test value"), result);
     }
 
@@ -178,7 +178,7 @@ void completeReturnsWholeFieldValue() {
         entry.setField(StandardField.TITLE, "test value");
         database.insertEntry(entry);
 
-        Collection<String> result = autoCompleter.provideSuggestions(getRequest(("te")));
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest("te"));
         assertEquals(Collections.singletonList("test value"), result);
     }
 }
diff --git a/src/test/java/org/jabref/gui/autocompleter/PersonNameSuggestionProviderTest.java b/src/test/java/org/jabref/gui/autocompleter/PersonNameSuggestionProviderTest.java
index 1c3f344f5da..980868f7306 100644
--- a/src/test/java/org/jabref/gui/autocompleter/PersonNameSuggestionProviderTest.java
+++ b/src/test/java/org/jabref/gui/autocompleter/PersonNameSuggestionProviderTest.java
@@ -40,7 +40,7 @@ void initAutoCompleterWithNullFieldThrowsException() {
 
     @Test
     void completeWithoutAddingAnythingReturnsNothing() {
-        Collection<Author> result = autoCompleter.provideSuggestions(getRequest(("test")));
+        Collection<Author> result = autoCompleter.provideSuggestions(getRequest("test"));
         assertEquals(Collections.emptyList(), result);
     }
 
@@ -49,7 +49,7 @@ void completeAfterAddingEmptyEntryReturnsNothing() {
         BibEntry entry = new BibEntry();
         database.insertEntry(entry);
 
-        Collection<Author> result = autoCompleter.provideSuggestions(getRequest(("test")));
+        Collection<Author> result = autoCompleter.provideSuggestions(getRequest("test"));
         assertEquals(Collections.emptyList(), result);
     }
 
@@ -59,7 +59,7 @@ void completeAfterAddingEntryWithoutFieldReturnsNothing() {
         entry.setField(StandardField.TITLE, "testTitle");
         database.insertEntry(entry);
 
-        Collection<Author> result = autoCompleter.provideSuggestions(getRequest(("test")));
+        Collection<Author> result = autoCompleter.provideSuggestions(getRequest("test"));
         assertEquals(Collections.emptyList(), result);
     }
 
@@ -67,7 +67,7 @@ void completeAfterAddingEntryWithoutFieldReturnsNothing() {
     void completeNameReturnsName() {
         database.insertEntry(entry);
 
-        Collection<Author> result = autoCompleter.provideSuggestions(getRequest(("Kostakos")));
+        Collection<Author> result = autoCompleter.provideSuggestions(getRequest("Kostakos"));
         assertEquals(Collections.singletonList(vassilisKostakos), result);
     }
 
@@ -75,7 +75,7 @@ void completeNameReturnsName() {
     void completeBeginningOfNameReturnsName() {
         database.insertEntry(entry);
 
-        Collection<Author> result = autoCompleter.provideSuggestions(getRequest(("Kosta")));
+        Collection<Author> result = autoCompleter.provideSuggestions(getRequest("Kosta"));
         assertEquals(Collections.singletonList(vassilisKostakos), result);
     }
 
@@ -83,20 +83,20 @@ void completeBeginningOfNameReturnsName() {
     void completeLowercaseBeginningOfNameReturnsName() {
         database.insertEntry(entry);
 
-        Collection<Author> result = autoCompleter.provideSuggestions(getRequest(("kosta")));
+        Collection<Author> result = autoCompleter.provideSuggestions(getRequest("kosta"));
         assertEquals(Collections.singletonList(vassilisKostakos), result);
     }
 
     @Test
     void completeNullThrowsException() {
-        assertThrows(NullPointerException.class, () -> autoCompleter.provideSuggestions(getRequest((null))));
+        assertThrows(NullPointerException.class, () -> autoCompleter.provideSuggestions(getRequest(null)));
     }
 
     @Test
     void completeEmptyStringReturnsNothing() {
         database.insertEntry(entry);
 
-        Collection<Author> result = autoCompleter.provideSuggestions(getRequest(("")));
+        Collection<Author> result = autoCompleter.provideSuggestions(getRequest(""));
         assertEquals(Collections.emptyList(), result);
     }
 
@@ -108,7 +108,7 @@ void completeReturnsMultipleResults() {
         database.insertEntry(entryTwo);
         Author authorTwo = new Author("", "", "", "Kosta", "");
 
-        Collection<Author> result = autoCompleter.provideSuggestions(getRequest(("Ko")));
+        Collection<Author> result = autoCompleter.provideSuggestions(getRequest("Ko"));
         assertEquals(Arrays.asList(authorTwo, vassilisKostakos), result);
     }
 
@@ -116,7 +116,7 @@ void completeReturnsMultipleResults() {
     void completePartOfNameReturnsName() {
         database.insertEntry(entry);
 
-        Collection<Author> result = autoCompleter.provideSuggestions(getRequest(("osta")));
+        Collection<Author> result = autoCompleter.provideSuggestions(getRequest("osta"));
         assertEquals(Collections.singletonList(vassilisKostakos), result);
     }
 
@@ -124,7 +124,7 @@ void completePartOfNameReturnsName() {
     void completeBeginningOfFirstNameReturnsName() {
         database.insertEntry(entry);
 
-        Collection<Author> result = autoCompleter.provideSuggestions(getRequest(("Vas")));
+        Collection<Author> result = autoCompleter.provideSuggestions(getRequest("Vas"));
         assertEquals(Collections.singletonList(vassilisKostakos), result);
     }
 
@@ -135,7 +135,7 @@ void completeBeginningOfFirstNameReturnsNameWithJr() {
         database.insertEntry(entry);
         Author author = new Author("Joseph M.", "J. M.", "", "Reagle", "Jr.");
 
-        Collection<Author> result = autoCompleter.provideSuggestions(getRequest(("Jos")));
+        Collection<Author> result = autoCompleter.provideSuggestions(getRequest("Jos"));
         assertEquals(Collections.singletonList(author), result);
     }
 
@@ -146,7 +146,7 @@ void completeBeginningOfFirstNameReturnsNameWithVon() {
         database.insertEntry(entry);
         Author author = new Author("Eric", "E.", "von", "Hippel", "");
 
-        Collection<Author> result = autoCompleter.provideSuggestions(getRequest(("Eric")));
+        Collection<Author> result = autoCompleter.provideSuggestions(getRequest("Eric"));
         assertEquals(Collections.singletonList(author), result);
     }
 
@@ -157,7 +157,7 @@ void completeBeginningOfLastNameReturnsNameWithUmlauts() {
         database.insertEntry(entry);
         Author author = new Author("Honig", "H.", "", "Bär", "");
 
-        Collection<Author> result = autoCompleter.provideSuggestions(getRequest(("Bä")));
+        Collection<Author> result = autoCompleter.provideSuggestions(getRequest("Bä"));
         assertEquals(Collections.singletonList(author), result);
     }
 
@@ -168,7 +168,7 @@ void completeVonReturnsName() {
         database.insertEntry(entry);
         Author author = new Author("Eric", "E.", "von", "Hippel", "");
 
-        Collection<Author> result = autoCompleter.provideSuggestions(getRequest(("von")));
+        Collection<Author> result = autoCompleter.provideSuggestions(getRequest("von"));
         assertEquals(Collections.singletonList(author), result);
     }
 
@@ -178,7 +178,7 @@ void completeBeginningOfFullNameReturnsName() {
         entry.setField(StandardField.AUTHOR, "Vassilis Kostakos");
         database.insertEntry(entry);
 
-        Collection<Author> result = autoCompleter.provideSuggestions(getRequest(("Kostakos, Va")));
+        Collection<Author> result = autoCompleter.provideSuggestions(getRequest("Kostakos, Va"));
         assertEquals(Collections.singletonList(vassilisKostakos), result);
     }
 }
diff --git a/src/test/java/org/jabref/gui/autocompleter/SuggestionProvidersTest.java b/src/test/java/org/jabref/gui/autocompleter/SuggestionProvidersTest.java
index 15cc1e22182..247ee476fd8 100644
--- a/src/test/java/org/jabref/gui/autocompleter/SuggestionProvidersTest.java
+++ b/src/test/java/org/jabref/gui/autocompleter/SuggestionProvidersTest.java
@@ -39,19 +39,19 @@ public void initializeSuggestionProviders() {
     private static Stream<Arguments> getTestPairs() {
         return Stream.of(
                 // a person
-                Arguments.of(org.jabref.gui.autocompleter.PersonNameSuggestionProvider.class, StandardField.AUTHOR),
+                Arguments.of(PersonNameSuggestionProvider.class, StandardField.AUTHOR),
 
                 // a single entry field
-                Arguments.of(org.jabref.gui.autocompleter.BibEntrySuggestionProvider.class, StandardField.XREF),
+                Arguments.of(BibEntrySuggestionProvider.class, StandardField.XREF),
 
                 // multi entry fieldg
-                Arguments.of(org.jabref.gui.autocompleter.JournalsSuggestionProvider.class, StandardField.JOURNAL),
+                Arguments.of(JournalsSuggestionProvider.class, StandardField.JOURNAL),
 
                 // TODO: We should offer pre-configured publishers
-                Arguments.of(org.jabref.gui.autocompleter.JournalsSuggestionProvider.class, StandardField.PUBLISHER),
+                Arguments.of(JournalsSuggestionProvider.class, StandardField.PUBLISHER),
 
                 // TODO: Auto completion should be aware of possible values of special fields
-                Arguments.of(org.jabref.gui.autocompleter.WordSuggestionProvider.class, SpecialField.PRINTED)
+                Arguments.of(WordSuggestionProvider.class, SpecialField.PRINTED)
         );
     }
 
diff --git a/src/test/java/org/jabref/logic/autosaveandbackup/BackupManagerDiscardedTest.java b/src/test/java/org/jabref/gui/autosaveandbackup/BackupManagerDiscardedTest.java
similarity index 66%
rename from src/test/java/org/jabref/logic/autosaveandbackup/BackupManagerDiscardedTest.java
rename to src/test/java/org/jabref/gui/autosaveandbackup/BackupManagerDiscardedTest.java
index 85507f6c5c8..a1ee0b8031e 100644
--- a/src/test/java/org/jabref/logic/autosaveandbackup/BackupManagerDiscardedTest.java
+++ b/src/test/java/org/jabref/gui/autosaveandbackup/BackupManagerDiscardedTest.java
@@ -1,4 +1,4 @@
-package org.jabref.logic.autosaveandbackup;
+package org.jabref.gui.autosaveandbackup;
 
 import java.io.IOException;
 import java.io.Writer;
@@ -6,16 +6,18 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 
+import org.jabref.gui.LibraryTab;
 import org.jabref.logic.exporter.AtomicFileWriter;
+import org.jabref.logic.exporter.BibDatabaseWriter;
 import org.jabref.logic.exporter.BibWriter;
 import org.jabref.logic.exporter.BibtexDatabaseWriter;
-import org.jabref.logic.exporter.SavePreferences;
+import org.jabref.logic.exporter.SelfContainedSaveConfiguration;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.entry.field.StandardField;
-import org.jabref.model.metadata.SaveOrderConfig;
+import org.jabref.model.metadata.SaveOrder;
 import org.jabref.preferences.PreferencesService;
 
 import org.junit.jupiter.api.BeforeEach;
@@ -25,9 +27,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
 
 /**
  * Test for "discarded" flag
@@ -37,13 +37,14 @@ class BackupManagerDiscardedTest {
     private BibDatabaseContext bibDatabaseContext;
     private BackupManager backupManager;
     private Path testBib;
-    private SavePreferences savePreferences;
+    private SelfContainedSaveConfiguration saveConfiguration;
     private PreferencesService preferencesService;
     private BibEntryTypesManager bibEntryTypesManager;
+    private Path backupDir;
 
     @BeforeEach
     public void setup(@TempDir Path tempDir) throws Exception {
-        Path backupDir = tempDir.resolve("backups");
+        this.backupDir = tempDir.resolve("backups");
         Files.createDirectories(backupDir);
 
         testBib = tempDir.resolve("test.bib");
@@ -52,26 +53,25 @@ public void setup(@TempDir Path tempDir) throws Exception {
         bibDatabaseContext.setDatabasePath(testBib);
 
         bibEntryTypesManager = new BibEntryTypesManager();
-
-        savePreferences = mock(SavePreferences.class, Answers.RETURNS_DEEP_STUBS);
-        when(savePreferences.shouldMakeBackup()).thenReturn(false);
-        when(savePreferences.getSaveOrder()).thenReturn(new SaveOrderConfig());
-        when(savePreferences.withMakeBackup(anyBoolean())).thenReturn(savePreferences);
-        when(savePreferences.shouldSaveInOriginalOrder()).thenReturn(true);
-
+        saveConfiguration = new SelfContainedSaveConfiguration(SaveOrder.getDefaultSaveOrder(), false, BibDatabaseWriter.SaveType.WITH_JABREF_META_DATA, false);
         preferencesService = mock(PreferencesService.class, Answers.RETURNS_DEEP_STUBS);
-        when(preferencesService.getSavePreferences()).thenReturn(savePreferences);
 
         saveDatabase();
 
-        backupManager = new BackupManager(bibDatabaseContext, bibEntryTypesManager, preferencesService);
+        backupManager = new BackupManager(mock(LibraryTab.class), bibDatabaseContext, bibEntryTypesManager, preferencesService);
+
         makeBackup();
     }
 
     private void saveDatabase() throws IOException {
         try (Writer writer = new AtomicFileWriter(testBib, StandardCharsets.UTF_8, false)) {
             BibWriter bibWriter = new BibWriter(writer, bibDatabaseContext.getDatabase().getNewLineSeparator());
-            new BibtexDatabaseWriter(bibWriter, preferencesService.getGeneralPreferences(), savePreferences, bibEntryTypesManager)
+            new BibtexDatabaseWriter(
+                    bibWriter,
+                    saveConfiguration,
+                    preferencesService.getFieldPreferences(),
+                    preferencesService.getCitationKeyPatternPreferences(),
+                    bibEntryTypesManager)
                     .saveDatabase(bibDatabaseContext);
         }
     }
@@ -81,14 +81,14 @@ private void databaseModification() {
     }
 
     private void makeBackup() {
-        backupManager.determineBackupPathForNewBackup().ifPresent(backupManager::performBackup);
+        backupManager.determineBackupPathForNewBackup(backupDir).ifPresent(path -> backupManager.performBackup(path));
     }
 
     @Test
     public void noDiscardingAChangeLeadsToNewerBackupBeReported() throws Exception {
         databaseModification();
         makeBackup();
-        assertTrue(BackupManager.backupFileDiffers(testBib));
+        assertTrue(BackupManager.backupFileDiffers(testBib, backupDir));
     }
 
     @Test
@@ -96,14 +96,14 @@ public void noDiscardingASavedChange() throws Exception {
         databaseModification();
         makeBackup();
         saveDatabase();
-        assertFalse(BackupManager.backupFileDiffers(testBib));
+        assertFalse(BackupManager.backupFileDiffers(testBib, backupDir));
     }
 
     @Test
     public void discardingAChangeLeadsToNewerBackupToBeIgnored() throws Exception {
         databaseModification();
         makeBackup();
-        backupManager.discardBackup();
-        assertFalse(BackupManager.backupFileDiffers(testBib));
+        backupManager.discardBackup(backupDir);
+        assertFalse(BackupManager.backupFileDiffers(testBib, backupDir));
     }
 }
diff --git a/src/test/java/org/jabref/logic/autosaveandbackup/BackupManagerTest.java b/src/test/java/org/jabref/gui/autosaveandbackup/BackupManagerTest.java
similarity index 50%
rename from src/test/java/org/jabref/logic/autosaveandbackup/BackupManagerTest.java
rename to src/test/java/org/jabref/gui/autosaveandbackup/BackupManagerTest.java
index e99e3a3d8e8..c1a0caf267d 100644
--- a/src/test/java/org/jabref/logic/autosaveandbackup/BackupManagerTest.java
+++ b/src/test/java/org/jabref/gui/autosaveandbackup/BackupManagerTest.java
@@ -1,25 +1,52 @@
-package org.jabref.logic.autosaveandbackup;
+package org.jabref.gui.autosaveandbackup;
 
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
 import java.nio.file.attribute.FileTime;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
 
+import org.jabref.gui.LibraryTab;
 import org.jabref.logic.util.BackupFileType;
+import org.jabref.logic.util.OS;
 import org.jabref.logic.util.io.BackupFileUtil;
-
+import org.jabref.model.database.BibDatabase;
+import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.entry.BibEntryTypesManager;
+import org.jabref.model.groups.event.GroupUpdatedEvent;
+import org.jabref.model.metadata.MetaData;
+import org.jabref.model.metadata.event.MetaDataChangedEvent;
+import org.jabref.preferences.FilePreferences;
+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.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;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 public class BackupManagerTest {
 
+    Path backupDir;
+
+    @BeforeEach
+    void setup(@TempDir Path tempDir) {
+        backupDir = tempDir.resolve("backup");
+    }
+
     @Test
     public void backupFileNameIsCorrectlyGeneratedInAppDataDirectory() {
         Path bibPath = Path.of("tmp", "test.bib");
-        Path bakPath = BackupManager.getBackupPathForNewBackup(bibPath);
+        backupDir = OS.getNativeDesktop().getBackupDirectory();
+        Path bakPath = BackupManager.getBackupPathForNewBackup(bibPath, backupDir);
 
         // Pattern is "27182d3c--test.bib--", but the hashing is implemented differently on Linux than on Windows
         assertNotEquals("", bakPath);
@@ -28,29 +55,29 @@ public void backupFileNameIsCorrectlyGeneratedInAppDataDirectory() {
     @Test
     public void backupFileIsEqualForNonExistingBackup() throws Exception {
         Path originalFile = Path.of(BackupManagerTest.class.getResource("no-autosave.bib").toURI());
-        assertFalse(BackupManager.backupFileDiffers(originalFile));
+        assertFalse(BackupManager.backupFileDiffers(originalFile, backupDir));
     }
 
     @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);
+        Path target = BackupFileUtil.getPathForNewBackupFileAndCreateDirectory(Path.of(BackupManagerTest.class.getResource("no-changes.bib").toURI()), BackupFileType.BACKUP, backupDir);
         Files.copy(source, target, StandardCopyOption.REPLACE_EXISTING);
 
         Path originalFile = Path.of(BackupManagerTest.class.getResource("no-changes.bib").toURI());
-        assertFalse(BackupManager.backupFileDiffers(originalFile));
+        assertFalse(BackupManager.backupFileDiffers(originalFile, backupDir));
     }
 
     @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);
+        Path target = BackupFileUtil.getPathForNewBackupFileAndCreateDirectory(Path.of(BackupManagerTest.class.getResource("changes.bib").toURI()), BackupFileType.BACKUP, backupDir);
         Files.copy(source, target, StandardCopyOption.REPLACE_EXISTING);
 
         Path originalFile = Path.of(BackupManagerTest.class.getResource("changes.bib").toURI());
-        assertTrue(BackupManager.backupFileDiffers(originalFile));
+        assertTrue(BackupManager.backupFileDiffers(originalFile, backupDir));
     }
 
     @Test
@@ -60,13 +87,13 @@ public void correctBackupFileDeterminedForMultipleBakFiles() throws Exception {
 
         // Prepare test: Create backup files on "right" path
         // most recent file does not have any changes
-        Path target = BackupFileUtil.getPathForNewBackupFileAndCreateDirectory(noChangesBib, BackupFileType.BACKUP);
+        Path target = BackupFileUtil.getPathForNewBackupFileAndCreateDirectory(noChangesBib, BackupFileType.BACKUP, backupDir);
         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();
+            Path directory = backupDir;
             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);
@@ -74,7 +101,7 @@ public void correctBackupFileDeterminedForMultipleBakFiles() throws Exception {
         }
 
         Path originalFile = noChangesBib;
-        assertFalse(BackupManager.backupFileDiffers(originalFile));
+        assertFalse(BackupManager.backupFileDiffers(originalFile, backupDir));
     }
 
     @Test
@@ -82,10 +109,10 @@ 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);
+        Path target = BackupFileUtil.getPathForNewBackupFileAndCreateDirectory(changesBib, BackupFileType.BACKUP, backupDir);
         Files.copy(changesBibBak, target, StandardCopyOption.REPLACE_EXISTING);
 
-        assertTrue(BackupManager.backupFileDiffers(changesBib));
+        assertTrue(BackupManager.backupFileDiffers(changesBib, backupDir));
     }
 
     @Test
@@ -93,12 +120,71 @@ 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);
+        Path target = BackupFileUtil.getPathForNewBackupFileAndCreateDirectory(changesBib, BackupFileType.BACKUP, backupDir);
         Files.copy(changesBibBak, target, StandardCopyOption.REPLACE_EXISTING);
 
         // Make .bak file very old
         Files.setLastModifiedTime(target, FileTime.fromMillis(0));
 
-        assertFalse(BackupManager.backupFileDiffers(changesBib));
+        assertFalse(BackupManager.backupFileDiffers(changesBib, backupDir));
+    }
+
+    @Test
+    public void shouldNotCreateABackup(@TempDir Path customDir) throws Exception {
+        Path backupDir = customDir.resolve("subBackupDir");
+        Files.createDirectories(backupDir);
+
+        var database = new BibDatabaseContext(new BibDatabase());
+        database.setDatabasePath(customDir.resolve("Bibfile.bib"));
+
+        var preferences = mock(PreferencesService.class, Answers.RETURNS_DEEP_STUBS);
+        var filePreferences = mock(FilePreferences.class);
+        when(preferences.getFilePreferences()).thenReturn(filePreferences);
+        when(filePreferences.getBackupDirectory()).thenReturn(backupDir);
+
+        BackupManager manager = BackupManager.start(
+                mock(LibraryTab.class),
+                database,
+                mock(BibEntryTypesManager.class, Answers.RETURNS_DEEP_STUBS),
+                preferences);
+        manager.listen(new MetaDataChangedEvent(new MetaData()));
+
+        BackupManager.shutdown(database, backupDir, false);
+
+        List<Path> files = Files.list(backupDir).toList();
+        assertEquals(Collections.emptyList(), files);
+    }
+
+    @Test
+    public void shouldCreateABackup(@TempDir Path customDir) throws Exception {
+        Path backupDir = customDir.resolve("subBackupDir");
+        Files.createDirectories(backupDir);
+
+        var database = new BibDatabaseContext(new BibDatabase());
+        database.setDatabasePath(customDir.resolve("Bibfile.bib"));
+
+        var preferences = mock(PreferencesService.class, Answers.RETURNS_DEEP_STUBS);
+        var filePreferences = mock(FilePreferences.class);
+        when(preferences.getFilePreferences()).thenReturn(filePreferences);
+        when(filePreferences.getBackupDirectory()).thenReturn(backupDir);
+        when(filePreferences.shouldCreateBackup()).thenReturn(true);
+
+        BackupManager manager = BackupManager.start(
+                mock(LibraryTab.class),
+                database,
+                mock(BibEntryTypesManager.class, Answers.RETURNS_DEEP_STUBS),
+                preferences);
+        manager.listen(new MetaDataChangedEvent(new MetaData()));
+
+        Optional<Path> fullBackupPath = manager.determineBackupPathForNewBackup(backupDir);
+        fullBackupPath.ifPresent(manager::performBackup);
+        manager.listen(new GroupUpdatedEvent(new MetaData()));
+
+        BackupManager.shutdown(database, backupDir, true);
+
+        List<Path> files = Files.list(backupDir).sorted().toList();
+        // we only know the first backup path because the second one is created on shutdown
+        // due to timing issues we cannot test that reliable
+        assertEquals(fullBackupPath.get(), files.get(0));
     }
 }
diff --git a/src/test/java/org/jabref/gui/commonfxcontrols/SaveOrderConfigPanelViewModelTest.java b/src/test/java/org/jabref/gui/commonfxcontrols/SaveOrderPanelViewModelTest.java
similarity index 86%
rename from src/test/java/org/jabref/gui/commonfxcontrols/SaveOrderConfigPanelViewModelTest.java
rename to src/test/java/org/jabref/gui/commonfxcontrols/SaveOrderPanelViewModelTest.java
index da85a54cef9..0bc69329a33 100644
--- a/src/test/java/org/jabref/gui/commonfxcontrols/SaveOrderConfigPanelViewModelTest.java
+++ b/src/test/java/org/jabref/gui/commonfxcontrols/SaveOrderPanelViewModelTest.java
@@ -3,18 +3,18 @@
 import java.util.List;
 
 import org.jabref.model.entry.field.StandardField;
-import org.jabref.model.metadata.SaveOrderConfig;
+import org.jabref.model.metadata.SaveOrder;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-class SaveOrderConfigPanelViewModelTest {
+class SaveOrderPanelViewModelTest {
 
-    SortCriterionViewModel sortCriterionKey = new SortCriterionViewModel(new SaveOrderConfig.SortCriterion(StandardField.KEY, false));
-    SortCriterionViewModel sortCriterionAuthor = new SortCriterionViewModel(new SaveOrderConfig.SortCriterion(StandardField.AUTHOR, false));
-    SortCriterionViewModel sortCriterionTitle = new SortCriterionViewModel(new SaveOrderConfig.SortCriterion(StandardField.TITLE, true));
+    SortCriterionViewModel sortCriterionKey = new SortCriterionViewModel(new SaveOrder.SortCriterion(StandardField.KEY, false));
+    SortCriterionViewModel sortCriterionAuthor = new SortCriterionViewModel(new SaveOrder.SortCriterion(StandardField.AUTHOR, false));
+    SortCriterionViewModel sortCriterionTitle = new SortCriterionViewModel(new SaveOrder.SortCriterion(StandardField.TITLE, true));
 
     SaveOrderConfigPanelViewModel viewModel;
 
@@ -32,7 +32,7 @@ void addCriterion() {
 
     @Test
     void removeCriterion() {
-        SortCriterionViewModel unknownCriterion = new SortCriterionViewModel(new SaveOrderConfig.SortCriterion(StandardField.ABSTRACT, false));
+        SortCriterionViewModel unknownCriterion = new SortCriterionViewModel(new SaveOrder.SortCriterion(StandardField.ABSTRACT, false));
         viewModel.removeCriterion(unknownCriterion);
         assertEquals(3, viewModel.sortCriteriaProperty().size());
 
diff --git a/src/test/java/org/jabref/gui/edit/CopyMoreActionTest.java b/src/test/java/org/jabref/gui/edit/CopyMoreActionTest.java
index cd6db4c3716..d5fe209a3a0 100644
--- a/src/test/java/org/jabref/gui/edit/CopyMoreActionTest.java
+++ b/src/test/java/org/jabref/gui/edit/CopyMoreActionTest.java
@@ -12,6 +12,7 @@
 import org.jabref.gui.JabRefDialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.StandardActions;
+import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.database.BibDatabaseContext;
@@ -32,15 +33,17 @@
 
 public class CopyMoreActionTest {
 
+    private final DialogService dialogService = spy(DialogService.class);
+    private final ClipBoardManager clipBoardManager = mock(ClipBoardManager.class);
+    private final PreferencesService preferencesService = mock(PreferencesService.class);
+    private final JournalAbbreviationRepository abbreviationRepository = mock(JournalAbbreviationRepository.class);
+    private final StateManager stateManager = mock(StateManager.class);
+    private final List<String> titles = new ArrayList<>();
+    private final List<String> keys = new ArrayList<>();
+    private final List<String> dois = new ArrayList<>();
+
     private CopyMoreAction copyMoreAction;
-    private DialogService dialogService = spy(DialogService.class);
-    private ClipBoardManager clipBoardManager = mock(ClipBoardManager.class);
-    private PreferencesService preferencesService = mock(PreferencesService.class);
-    private StateManager stateManager = mock(StateManager.class);
     private BibEntry entry;
-    private List<String> titles = new ArrayList<>();
-    private List<String> keys = new ArrayList<>();
-    private List<String> dois = new ArrayList<>();
 
     @BeforeEach
     public void setUp() {
@@ -61,7 +64,7 @@ public void setUp() {
     public void testExecuteOnFail() {
         when(stateManager.getActiveDatabase()).thenReturn(Optional.empty());
         when(stateManager.getSelectedEntries()).thenReturn(FXCollections.emptyObservableList());
-        copyMoreAction = new CopyMoreAction(StandardActions.COPY_TITLE, dialogService, stateManager, clipBoardManager, preferencesService);
+        copyMoreAction = new CopyMoreAction(StandardActions.COPY_TITLE, dialogService, stateManager, clipBoardManager, preferencesService, abbreviationRepository);
         copyMoreAction.execute();
 
         verify(clipBoardManager, times(0)).setContent(any(String.class));
@@ -77,7 +80,7 @@ public void testExecuteCopyTitleWithNoTitle() {
 
         when(stateManager.getActiveDatabase()).thenReturn(Optional.ofNullable(databaseContext));
         when(stateManager.getSelectedEntries()).thenReturn(entriesWithNoTitles);
-        copyMoreAction = new CopyMoreAction(StandardActions.COPY_TITLE, dialogService, stateManager, clipBoardManager, preferencesService);
+        copyMoreAction = new CopyMoreAction(StandardActions.COPY_TITLE, dialogService, stateManager, clipBoardManager, preferencesService, abbreviationRepository);
         copyMoreAction.execute();
 
         verify(clipBoardManager, times(0)).setContent(any(String.class));
@@ -93,7 +96,7 @@ public void testExecuteCopyTitleOnPartialSuccess() {
 
         when(stateManager.getActiveDatabase()).thenReturn(Optional.ofNullable(databaseContext));
         when(stateManager.getSelectedEntries()).thenReturn(mixedEntries);
-        copyMoreAction = new CopyMoreAction(StandardActions.COPY_TITLE, dialogService, stateManager, clipBoardManager, preferencesService);
+        copyMoreAction = new CopyMoreAction(StandardActions.COPY_TITLE, dialogService, stateManager, clipBoardManager, preferencesService, abbreviationRepository);
         copyMoreAction.execute();
 
         String copiedTitles = String.join("\n", titles);
@@ -109,7 +112,7 @@ public void testExecuteCopyTitleOnSuccess() {
 
         when(stateManager.getActiveDatabase()).thenReturn(Optional.ofNullable(databaseContext));
         when(stateManager.getSelectedEntries()).thenReturn(entriesWithTitles);
-        copyMoreAction = new CopyMoreAction(StandardActions.COPY_TITLE, dialogService, stateManager, clipBoardManager, preferencesService);
+        copyMoreAction = new CopyMoreAction(StandardActions.COPY_TITLE, dialogService, stateManager, clipBoardManager, preferencesService, abbreviationRepository);
         copyMoreAction.execute();
 
         String copiedTitles = String.join("\n", titles);
@@ -127,7 +130,7 @@ public void testExecuteCopyKeyWithNoKey() {
 
         when(stateManager.getActiveDatabase()).thenReturn(Optional.ofNullable(databaseContext));
         when(stateManager.getSelectedEntries()).thenReturn(entriesWithNoKeys);
-        copyMoreAction = new CopyMoreAction(StandardActions.COPY_KEY, dialogService, stateManager, clipBoardManager, preferencesService);
+        copyMoreAction = new CopyMoreAction(StandardActions.COPY_KEY, dialogService, stateManager, clipBoardManager, preferencesService, abbreviationRepository);
         copyMoreAction.execute();
 
         verify(clipBoardManager, times(0)).setContent(any(String.class));
@@ -143,7 +146,7 @@ public void testExecuteCopyKeyOnPartialSuccess() {
 
         when(stateManager.getActiveDatabase()).thenReturn(Optional.ofNullable(databaseContext));
         when(stateManager.getSelectedEntries()).thenReturn(mixedEntries);
-        copyMoreAction = new CopyMoreAction(StandardActions.COPY_KEY, dialogService, stateManager, clipBoardManager, preferencesService);
+        copyMoreAction = new CopyMoreAction(StandardActions.COPY_KEY, dialogService, stateManager, clipBoardManager, preferencesService, abbreviationRepository);
         copyMoreAction.execute();
 
         String copiedKeys = String.join("\n", keys);
@@ -159,7 +162,7 @@ public void testExecuteCopyKeyOnSuccess() {
 
         when(stateManager.getActiveDatabase()).thenReturn(Optional.ofNullable(databaseContext));
         when(stateManager.getSelectedEntries()).thenReturn(entriesWithKeys);
-        copyMoreAction = new CopyMoreAction(StandardActions.COPY_KEY, dialogService, stateManager, clipBoardManager, preferencesService);
+        copyMoreAction = new CopyMoreAction(StandardActions.COPY_KEY, dialogService, stateManager, clipBoardManager, preferencesService, abbreviationRepository);
         copyMoreAction.execute();
 
         String copiedKeys = String.join("\n", keys);
@@ -177,7 +180,7 @@ public void testExecuteCopyDoiWithNoDoi() {
 
         when(stateManager.getActiveDatabase()).thenReturn(Optional.ofNullable(databaseContext));
         when(stateManager.getSelectedEntries()).thenReturn(entriesWithNoDois);
-        copyMoreAction = new CopyMoreAction(StandardActions.COPY_DOI, dialogService, stateManager, clipBoardManager, preferencesService);
+        copyMoreAction = new CopyMoreAction(StandardActions.COPY_DOI, dialogService, stateManager, clipBoardManager, preferencesService, abbreviationRepository);
         copyMoreAction.execute();
 
         verify(clipBoardManager, times(0)).setContent(any(String.class));
@@ -193,7 +196,7 @@ public void testExecuteCopyDoiOnPartialSuccess() {
 
         when(stateManager.getActiveDatabase()).thenReturn(Optional.ofNullable(databaseContext));
         when(stateManager.getSelectedEntries()).thenReturn(mixedEntries);
-        copyMoreAction = new CopyMoreAction(StandardActions.COPY_DOI, dialogService, stateManager, clipBoardManager, preferencesService);
+        copyMoreAction = new CopyMoreAction(StandardActions.COPY_DOI, dialogService, stateManager, clipBoardManager, preferencesService, abbreviationRepository);
         copyMoreAction.execute();
 
         String copiedDois = String.join("\n", dois);
@@ -209,7 +212,7 @@ public void testExecuteCopyDoiOnSuccess() {
 
         when(stateManager.getActiveDatabase()).thenReturn(Optional.ofNullable(databaseContext));
         when(stateManager.getSelectedEntries()).thenReturn(entriesWithDois);
-        copyMoreAction = new CopyMoreAction(StandardActions.COPY_DOI, dialogService, stateManager, clipBoardManager, preferencesService);
+        copyMoreAction = new CopyMoreAction(StandardActions.COPY_DOI, dialogService, stateManager, clipBoardManager, preferencesService, abbreviationRepository);
         copyMoreAction.execute();
 
         String copiedDois = String.join("\n", dois);
diff --git a/src/test/java/org/jabref/gui/edit/ReplaceStringViewModelTest.java b/src/test/java/org/jabref/gui/edit/ReplaceStringViewModelTest.java
index b2a86cee2bc..758e3a8241b 100644
--- a/src/test/java/org/jabref/gui/edit/ReplaceStringViewModelTest.java
+++ b/src/test/java/org/jabref/gui/edit/ReplaceStringViewModelTest.java
@@ -64,7 +64,7 @@ void setUp() {
             "2020, 2021, date, FALSE, FALSE, 1", // only replace "2020" in the DATE field to "2021" in the BibEntry
             "2020, 2021, date, TRUE, TRUE, 2", // replace all the "2020"s in the entries
 
-            "System, replaceText, title, FALSE, TRUE, 1", // replace "System" in all entries is case sensitive
+            "System, replaceText, title, FALSE, TRUE, 1", // replace "System" in all entries is case-sensitive
             "and, '', author, TRUE, FALSE, 2", // replace two "and"s with empty string in the same AUTHOR field
             "' ', ',', date, TRUE, FALSE, 1" // replace space with comma in DATE field
     })
diff --git a/src/test/java/org/jabref/gui/entryeditor/CommentsTabTest.java b/src/test/java/org/jabref/gui/entryeditor/CommentsTabTest.java
new file mode 100644
index 00000000000..1d255cf7536
--- /dev/null
+++ b/src/test/java/org/jabref/gui/entryeditor/CommentsTabTest.java
@@ -0,0 +1,132 @@
+package org.jabref.gui.entryeditor;
+
+import java.util.Optional;
+import java.util.Set;
+
+import javax.swing.undo.UndoManager;
+
+import org.jabref.gui.DialogService;
+import org.jabref.gui.StateManager;
+import org.jabref.gui.autocompleter.SuggestionProviders;
+import org.jabref.gui.theme.ThemeManager;
+import org.jabref.gui.util.TaskExecutor;
+import org.jabref.logic.journals.JournalAbbreviationRepository;
+import org.jabref.logic.pdf.search.indexing.IndexingTaskManager;
+import org.jabref.logic.preferences.OwnerPreferences;
+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.field.Field;
+import org.jabref.model.entry.field.StandardField;
+import org.jabref.model.entry.field.UserSpecificCommentField;
+import org.jabref.model.entry.types.StandardEntryType;
+import org.jabref.preferences.PreferencesService;
+import org.jabref.testutils.category.GUITest;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.testfx.framework.junit5.ApplicationExtension;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+@GUITest
+@ExtendWith(ApplicationExtension.class)
+class CommentsTabTest {
+
+    private final String ownerName = "user1";
+
+    private CommentsTab commentsTab;
+
+    @Mock
+    private BibEntryTypesManager entryTypesManager;
+    @Mock
+    private BibDatabaseContext databaseContext;
+    @Mock
+    private SuggestionProviders suggestionProviders;
+    @Mock
+    private UndoManager undoManager;
+    @Mock
+    private DialogService dialogService;
+    @Mock
+    private PreferencesService preferences;
+    @Mock
+    private StateManager stateManager;
+    @Mock
+    private ThemeManager themeManager;
+    @Mock
+    private TaskExecutor taskExecutor;
+    @Mock
+    private JournalAbbreviationRepository journalAbbreviationRepository;
+    @Mock
+    private IndexingTaskManager indexingTaskManager;
+    @Mock
+    private OwnerPreferences ownerPreferences;
+
+    @BeforeEach
+    void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        when(preferences.getOwnerPreferences()).thenReturn(ownerPreferences);
+        when(ownerPreferences.getDefaultOwner()).thenReturn(ownerName);
+        when(databaseContext.getMode()).thenReturn(BibDatabaseMode.BIBLATEX);
+        BibEntryType entryTypeMock = mock(BibEntryType.class);
+        when(entryTypesManager.enrich(any(), any())).thenReturn(Optional.of(entryTypeMock));
+
+        commentsTab = new CommentsTab(
+                preferences,
+                databaseContext,
+                suggestionProviders,
+                undoManager,
+                dialogService,
+                stateManager,
+                themeManager,
+                indexingTaskManager,
+                taskExecutor,
+                journalAbbreviationRepository
+        );
+    }
+
+    @Test
+    void testDetermineFieldsToShowWorksForASingleUser() {
+        final UserSpecificCommentField ownerComment = new UserSpecificCommentField(ownerName);
+
+        BibEntry entry = new BibEntry(StandardEntryType.Book)
+                .withField(StandardField.COMMENT, "Standard comment text")
+                .withField(ownerComment, "User-specific comment text");
+
+        Set<Field> fields = commentsTab.determineFieldsToShow(entry);
+
+        assertEquals(Set.of(StandardField.COMMENT, ownerComment), fields);
+    }
+
+    @Test
+    void testDetermineFieldsToShowWorksForMultipleUsers() {
+        final UserSpecificCommentField ownerComment = new UserSpecificCommentField(ownerName);
+        final UserSpecificCommentField otherUsersComment = new UserSpecificCommentField("other-user-id");
+
+        BibEntry entry = new BibEntry(StandardEntryType.Book)
+                .withField(StandardField.COMMENT, "Standard comment text")
+                .withField(ownerComment, "User-specific comment text")
+                .withField(otherUsersComment, "other-user-id comment text");
+
+        Set<Field> fields = commentsTab.determineFieldsToShow(entry);
+
+        assertEquals(Set.of(StandardField.COMMENT, ownerComment, otherUsersComment), fields);
+    }
+
+    @Test
+    public void testDifferentiateCaseInUserName() {
+        UserSpecificCommentField field1 = new UserSpecificCommentField("USER");
+        UserSpecificCommentField field2 = new UserSpecificCommentField("user");
+        assertNotEquals(field1, field2, "Two UserSpecificCommentField instances with usernames that differ only by case should be considered different");
+    }
+}
diff --git a/src/test/java/org/jabref/gui/entryeditor/SourceTabTest.java b/src/test/java/org/jabref/gui/entryeditor/SourceTabTest.java
index 125b8880cb4..f9f41a73ab4 100644
--- a/src/test/java/org/jabref/gui/entryeditor/SourceTabTest.java
+++ b/src/test/java/org/jabref/gui/entryeditor/SourceTabTest.java
@@ -1,8 +1,8 @@
 package org.jabref.gui.entryeditor;
 
 import java.util.Collections;
-import java.util.List;
 
+import javafx.collections.FXCollections;
 import javafx.scene.Scene;
 import javafx.scene.control.Label;
 import javafx.scene.control.Tab;
@@ -14,12 +14,11 @@
 import org.jabref.gui.keyboard.KeyBindingRepository;
 import org.jabref.gui.undo.CountingUndoManager;
 import org.jabref.gui.util.OptionalObjectProperty;
-import org.jabref.logic.bibtex.FieldContentFormatterPreferences;
-import org.jabref.logic.bibtex.FieldWriterPreferences;
+import org.jabref.logic.bibtex.FieldPreferences;
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
-import org.jabref.model.entry.field.StandardField;
+import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.entry.field.UnknownField;
 import org.jabref.model.util.DummyFileUpdateMonitor;
 import org.jabref.testutils.category.GUITest;
@@ -54,9 +53,19 @@ public void onStart(Stage stage) {
         KeyBindingRepository keyBindingRepository = new KeyBindingRepository(Collections.emptyList(), Collections.emptyList());
         ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
         when(importFormatPreferences.bibEntryPreferences().getKeywordSeparator()).thenReturn(',');
-        FieldWriterPreferences fieldWriterPreferences = new FieldWriterPreferences(true, List.of(StandardField.MONTH), new FieldContentFormatterPreferences());
+        FieldPreferences fieldPreferences = mock(FieldPreferences.class);
+        when(fieldPreferences.getNonWrappableFields()).thenReturn(FXCollections.emptyObservableList());
 
-        sourceTab = new SourceTab(new BibDatabaseContext(), new CountingUndoManager(), fieldWriterPreferences, importFormatPreferences, new DummyFileUpdateMonitor(), mock(DialogService.class), stateManager, keyBindingRepository);
+        sourceTab = new SourceTab(
+                new BibDatabaseContext(),
+                new CountingUndoManager(),
+                fieldPreferences,
+                importFormatPreferences,
+                new DummyFileUpdateMonitor(),
+                mock(DialogService.class),
+                stateManager,
+                mock(BibEntryTypesManager.class),
+                keyBindingRepository);
         pane = new TabPane(
                 new Tab("main area", area),
                 new Tab("other tab", new Label("some text")),
diff --git a/src/test/java/org/jabref/gui/exporter/ExportToClipboardActionTest.java b/src/test/java/org/jabref/gui/exporter/ExportToClipboardActionTest.java
index 7ec45efaef7..973247fe8f0 100644
--- a/src/test/java/org/jabref/gui/exporter/ExportToClipboardActionTest.java
+++ b/src/test/java/org/jabref/gui/exporter/ExportToClipboardActionTest.java
@@ -14,8 +14,7 @@
 import org.jabref.gui.util.CurrentThreadTaskExecutor;
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.exporter.Exporter;
-import org.jabref.logic.exporter.ExporterFactory;
-import org.jabref.logic.exporter.SavePreferences;
+import org.jabref.logic.exporter.SelfContainedSaveConfiguration;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.logic.xmp.XmpPreferences;
@@ -24,9 +23,9 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.model.metadata.MetaData;
+import org.jabref.model.metadata.SaveOrder;
 import org.jabref.preferences.FilePreferences;
-import org.jabref.preferences.GeneralPreferences;
-import org.jabref.preferences.ImportExportPreferences;
+import org.jabref.preferences.LibraryPreferences;
 import org.jabref.preferences.PreferencesService;
 
 import org.junit.jupiter.api.BeforeEach;
@@ -48,11 +47,9 @@ public class ExportToClipboardActionTest {
     private final DialogService dialogService = spy(DialogService.class);
     private final ClipBoardManager clipBoardManager = mock(ClipBoardManager.class);
     private final BibDatabaseContext databaseContext = mock(BibDatabaseContext.class);
-    private final PreferencesService preferences = mock(PreferencesService.class);
-    private final ImportExportPreferences importExportPrefs = mock(ImportExportPreferences.class);
+    private final PreferencesService preferences = mock(PreferencesService.class, Answers.RETURNS_DEEP_STUBS);
     private final StateManager stateManager = mock(StateManager.class);
 
-    private ExporterFactory exporterFactory;
     private TaskExecutor taskExecutor;
     private ObservableList<BibEntry> selectedEntries;
 
@@ -69,8 +66,8 @@ public void setUp() {
         when(stateManager.getSelectedEntries()).thenReturn(selectedEntries);
 
         taskExecutor = new CurrentThreadTaskExecutor();
-        when(preferences.getCustomExportFormats(any())).thenReturn(List.of());
-        when(preferences.getSavePreferencesForExport()).thenReturn(mock(SavePreferences.class));
+        when(preferences.getExportPreferences().getCustomExporters()).thenReturn(FXCollections.observableList(List.of()));
+        when(preferences.getSelfContainedExportConfiguration()).thenReturn(mock(SelfContainedSaveConfiguration.class));
         when(preferences.getXmpPreferences()).thenReturn(mock(XmpPreferences.class));
         exportToClipboardAction = new ExportToClipboardAction(dialogService, stateManager, clipBoardManager, taskExecutor, preferences);
     }
@@ -91,12 +88,12 @@ public void export(BibDatabaseContext databaseContext, Path file, List<BibEntry>
             }
         };
 
-        when(importExportPrefs.getLastExportExtension()).thenReturn("HTML");
-        when(preferences.getImportExportPreferences()).thenReturn(importExportPrefs);
-        GeneralPreferences generalPreferences = mock(GeneralPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        LibraryPreferences libraryPreferences = mock(LibraryPreferences.class, Answers.RETURNS_DEEP_STUBS);
         FilePreferences filePreferences = mock(FilePreferences.class, Answers.RETURNS_DEEP_STUBS);
         when(preferences.getFilePreferences()).thenReturn(filePreferences);
-        when(preferences.getGeneralPreferences()).thenReturn(generalPreferences);
+        when(preferences.getLibraryPreferences()).thenReturn(libraryPreferences);
+        when(preferences.getExportPreferences().getLastExportExtension()).thenReturn("HTML");
+        when(preferences.getSelfContainedExportConfiguration().getSaveOrder()).thenReturn(SaveOrder.getDefaultSaveOrder());
         when(stateManager.getSelectedEntries()).thenReturn(selectedEntries);
         when(stateManager.getActiveDatabase()).thenReturn(Optional.ofNullable(databaseContext));
         // noinspection ConstantConditions since databaseContext is mocked
diff --git a/src/test/java/org/jabref/gui/exporter/SaveDatabaseActionTest.java b/src/test/java/org/jabref/gui/exporter/SaveDatabaseActionTest.java
index fd4de9544db..821ad7a5130 100644
--- a/src/test/java/org/jabref/gui/exporter/SaveDatabaseActionTest.java
+++ b/src/test/java/org/jabref/gui/exporter/SaveDatabaseActionTest.java
@@ -8,16 +8,18 @@
 import java.util.Optional;
 import java.util.stream.Collectors;
 
+import javafx.collections.FXCollections;
+
 import org.jabref.gui.DialogService;
 import org.jabref.gui.JabRefFrame;
 import org.jabref.gui.LibraryTab;
 import org.jabref.gui.undo.CountingUndoManager;
 import org.jabref.gui.util.FileDialogConfiguration;
-import org.jabref.logic.bibtex.FieldContentFormatterPreferences;
-import org.jabref.logic.bibtex.FieldWriterPreferences;
+import org.jabref.logic.bibtex.FieldPreferences;
 import org.jabref.logic.citationkeypattern.CitationKeyPatternPreferences;
 import org.jabref.logic.citationkeypattern.GlobalCitationKeyPattern;
-import org.jabref.logic.exporter.SavePreferences;
+import org.jabref.logic.exporter.BibDatabaseWriter;
+import org.jabref.logic.exporter.SaveConfiguration;
 import org.jabref.logic.shared.DatabaseLocation;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.database.BibDatabaseContext;
@@ -25,9 +27,11 @@
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.metadata.MetaData;
+import org.jabref.model.metadata.SaveOrder;
+import org.jabref.preferences.ExportPreferences;
 import org.jabref.preferences.FilePreferences;
-import org.jabref.preferences.GeneralPreferences;
 import org.jabref.preferences.JabRefPreferences;
+import org.jabref.preferences.LibraryPreferences;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -60,8 +64,8 @@ public void setUp() {
         when(libraryTab.getBibDatabaseContext()).thenReturn(dbContext);
         when(filePreferences.getWorkingDirectory()).thenReturn(Path.of(TEST_BIBTEX_LIBRARY_LOCATION));
         when(preferences.getFilePreferences()).thenReturn(filePreferences);
+        when(preferences.getExportPreferences()).thenReturn(mock(ExportPreferences.class));
         when(jabRefFrame.getDialogService()).thenReturn(dialogService);
-
         saveDatabaseAction = spy(new SaveDatabaseAction(libraryTab, preferences, mock(BibEntryTypesManager.class)));
     }
 
@@ -102,29 +106,27 @@ private SaveDatabaseAction createSaveDatabaseActionForBibDatabase(BibDatabase da
         file = Files.createTempFile("JabRef", ".bib");
         file.toFile().deleteOnExit();
 
-        FieldWriterPreferences fieldWriterPreferences = mock(FieldWriterPreferences.class);
-        when(fieldWriterPreferences.getFieldContentFormatterPreferences()).thenReturn(mock(FieldContentFormatterPreferences.class));
-        GeneralPreferences generalPreferences = mock(GeneralPreferences.class);
-        SavePreferences savePreferences = mock(SavePreferences.class);
+        FieldPreferences fieldPreferences = mock(FieldPreferences.class);
+        SaveConfiguration saveConfiguration = mock(SaveConfiguration.class);
         // In case a "thenReturn" is modified, the whole mock has to be recreated
         dbContext = mock(BibDatabaseContext.class);
         libraryTab = mock(LibraryTab.class);
         MetaData metaData = mock(MetaData.class);
-        when(savePreferences.withSaveType(any(SavePreferences.DatabaseSaveType.class))).thenReturn(savePreferences);
-        when(savePreferences.getFieldWriterPreferences()).thenReturn(fieldWriterPreferences);
+        when(saveConfiguration.withSaveType(any(BibDatabaseWriter.SaveType.class))).thenReturn(saveConfiguration);
+        when(saveConfiguration.getSaveOrder()).thenReturn(SaveOrder.getDefaultSaveOrder());
         GlobalCitationKeyPattern emptyGlobalCitationKeyPattern = GlobalCitationKeyPattern.fromPattern("");
         when(metaData.getCiteKeyPattern(any(GlobalCitationKeyPattern.class))).thenReturn(emptyGlobalCitationKeyPattern);
-        when(savePreferences.getCitationKeyPatternPreferences()).thenReturn(mock(CitationKeyPatternPreferences.class));
-        when(savePreferences.getCitationKeyPatternPreferences().getKeyPattern()).thenReturn(emptyGlobalCitationKeyPattern);
         when(dbContext.getDatabasePath()).thenReturn(Optional.of(file));
         when(dbContext.getLocation()).thenReturn(DatabaseLocation.LOCAL);
         when(dbContext.getDatabase()).thenReturn(database);
         when(dbContext.getMetaData()).thenReturn(metaData);
         when(dbContext.getEntries()).thenReturn(database.getEntries());
         when(preferences.getBoolean(JabRefPreferences.LOCAL_AUTO_SAVE)).thenReturn(false);
-        when(preferences.getGeneralPreferences()).thenReturn(generalPreferences);
-        when(preferences.getFieldContentParserPreferences()).thenReturn(mock(FieldContentFormatterPreferences.class));
-        when(preferences.getSavePreferences()).thenReturn(savePreferences);
+        when(preferences.getFieldPreferences()).thenReturn(fieldPreferences);
+        when(preferences.getCitationKeyPatternPreferences()).thenReturn(mock(CitationKeyPatternPreferences.class));
+        when(preferences.getCitationKeyPatternPreferences().getKeyPattern()).thenReturn(emptyGlobalCitationKeyPattern);
+        when(preferences.getFieldPreferences().getNonWrappableFields()).thenReturn(FXCollections.emptyObservableList());
+        when(preferences.getLibraryPreferences()).thenReturn(mock(LibraryPreferences.class));
         when(libraryTab.frame()).thenReturn(jabRefFrame);
         when(libraryTab.getBibDatabaseContext()).thenReturn(dbContext);
         when(libraryTab.getUndoManager()).thenReturn(mock(CountingUndoManager.class));
diff --git a/src/test/java/org/jabref/gui/externalfiles/ImportHandlerTest.java b/src/test/java/org/jabref/gui/externalfiles/ImportHandlerTest.java
index 06cabd6eb21..443e14545a6 100644
--- a/src/test/java/org/jabref/gui/externalfiles/ImportHandlerTest.java
+++ b/src/test/java/org/jabref/gui/externalfiles/ImportHandlerTest.java
@@ -8,7 +8,6 @@
 import org.jabref.gui.StateManager;
 import org.jabref.gui.util.CurrentThreadTaskExecutor;
 import org.jabref.logic.importer.ImportFormatPreferences;
-import org.jabref.logic.importer.ImportFormatReader;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
@@ -41,7 +40,6 @@ void handleBibTeXData() {
                 mock(UndoManager.class),
                 mock(StateManager.class),
                 mock(DialogService.class),
-                mock(ImportFormatReader.class),
                 new CurrentThreadTaskExecutor());
 
         List<BibEntry> bibEntries = importHandler.handleBibTeXData("""
diff --git a/src/test/java/org/jabref/gui/fieldeditors/LinkedFileViewModelTest.java b/src/test/java/org/jabref/gui/fieldeditors/LinkedFileViewModelTest.java
index a501f43ec88..54d74b154fb 100644
--- a/src/test/java/org/jabref/gui/fieldeditors/LinkedFileViewModelTest.java
+++ b/src/test/java/org/jabref/gui/fieldeditors/LinkedFileViewModelTest.java
@@ -259,7 +259,7 @@ void downloadHtmlWhenLinkedFilePointsToHtml() throws MalformedURLException {
         List<LinkedFile> linkedFiles = entry.getFiles();
 
         for (LinkedFile file: linkedFiles) {
-            if (file.getLink().equalsIgnoreCase("Misc/asdf.html")) {
+            if ("Misc/asdf.html".equalsIgnoreCase(file.getLink())) {
                 assertEquals("URL", file.getFileType());
                 return;
             }
@@ -345,7 +345,7 @@ void downloadPdfFileWhenLinkedFilePointsToPdfUrl() throws MalformedURLException
         // Loop through downloaded files to check for filetype='pdf'
         List<LinkedFile> linkedFiles = entry.getFiles();
         for (LinkedFile files : linkedFiles) {
-            if (files.getLink().equalsIgnoreCase("Misc/asdf.pdf")) {
+            if ("Misc/asdf.pdf".equalsIgnoreCase(files.getLink())) {
                 assertEquals("pdf", files.getFileType().toLowerCase());
                 return;
             }
diff --git a/src/test/java/org/jabref/gui/groups/GroupDialogViewModelTest.java b/src/test/java/org/jabref/gui/groups/GroupDialogViewModelTest.java
index e7ea0f85d13..6022ef4d7c5 100644
--- a/src/test/java/org/jabref/gui/groups/GroupDialogViewModelTest.java
+++ b/src/test/java/org/jabref/gui/groups/GroupDialogViewModelTest.java
@@ -9,6 +9,7 @@
 import org.jabref.model.groups.AbstractGroup;
 import org.jabref.model.groups.GroupHierarchyType;
 import org.jabref.model.metadata.MetaData;
+import org.jabref.model.util.DummyFileUpdateMonitor;
 import org.jabref.preferences.BibEntryPreferences;
 import org.jabref.preferences.FilePreferences;
 import org.jabref.preferences.PreferencesService;
@@ -45,12 +46,12 @@ void setUp(@TempDir Path temporaryFolder) {
         when(preferencesService.getBibEntryPreferences()).thenReturn(mock(BibEntryPreferences.class));
         when(preferencesService.getBibEntryPreferences().getKeywordSeparator()).thenReturn(',');
         when(preferencesService.getFilePreferences()).thenReturn(mock(FilePreferences.class));
-        when(preferencesService.getFilePreferences().getUser()).thenReturn("MockedUser");
+        when(preferencesService.getFilePreferences().getUserAndHost()).thenReturn("MockedUser-mockedhost");
         when(preferencesService.getGroupsPreferences()).thenReturn(groupsPreferences);
 
         bibDatabaseContext.setMetaData(metaData);
 
-        viewModel = new GroupDialogViewModel(dialogService, bibDatabaseContext, preferencesService, group, GroupDialogHeader.SUBGROUP);
+        viewModel = new GroupDialogViewModel(dialogService, bibDatabaseContext, preferencesService, group, new DummyFileUpdateMonitor());
     }
 
     @Test
@@ -87,7 +88,7 @@ void validateExistingRelativePath() throws Exception {
     void testHierarchicalContextFromGroup() throws Exception {
         GroupHierarchyType groupHierarchyType = GroupHierarchyType.INCLUDING;
         when(group.getHierarchicalContext()).thenReturn(groupHierarchyType);
-        viewModel = new GroupDialogViewModel(dialogService, bibDatabaseContext, preferencesService, group, GroupDialogHeader.SUBGROUP);
+        viewModel = new GroupDialogViewModel(dialogService, bibDatabaseContext, preferencesService, group, new DummyFileUpdateMonitor());
 
         assertEquals(groupHierarchyType, viewModel.groupHierarchySelectedProperty().getValue());
     }
@@ -96,7 +97,7 @@ void testHierarchicalContextFromGroup() throws Exception {
     void testDefaultHierarchicalContext() throws Exception {
         GroupHierarchyType defaultHierarchicalContext = GroupHierarchyType.REFINING;
         when(preferencesService.getGroupsPreferences().getDefaultHierarchicalContext()).thenReturn(defaultHierarchicalContext);
-        viewModel = new GroupDialogViewModel(dialogService, bibDatabaseContext, preferencesService, null, GroupDialogHeader.SUBGROUP);
+        viewModel = new GroupDialogViewModel(dialogService, bibDatabaseContext, preferencesService, null, new DummyFileUpdateMonitor());
 
         assertEquals(defaultHierarchicalContext, viewModel.groupHierarchySelectedProperty().getValue());
     }
diff --git a/src/test/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModelTest.java b/src/test/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModelTest.java
index 6903ce89cae..4c1d900b1c0 100644
--- a/src/test/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModelTest.java
+++ b/src/test/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModelTest.java
@@ -57,4 +57,46 @@ void notCorrectQueryValidationStatus() {
         viewModel.queryProperty().setValue("Miami AND Beach OR Houston AND Texas");
         assertFalse(viewModel.queryValidationStatus().validProperty().not().getValue());
     }
+
+    @Test
+    void queryConsistingOfDOIIsValid() {
+        viewModel.queryProperty().setValue("10.1007/JHEP02(2023)082");
+        assertTrue(viewModel.queryValidationStatus().validProperty().getValue());
+    }
+
+    @Test
+    void canExtractDOIFromQueryText() {
+        viewModel.queryProperty().setValue("this is the DOI: 10.1007/JHEP02(2023)082, other text");
+        assertTrue(viewModel.queryValidationStatus().validProperty().getValue());
+    }
+
+    @Test
+    void queryConsistingOfInvalidDOIIsInvalid() {
+        viewModel.queryProperty().setValue("101.1007/JHEP02(2023)082");
+        assertFalse(viewModel.queryValidationStatus().validProperty().getValue());
+    }
+
+    @Test
+    void queryConsistingOfISBNIsValid() {
+        viewModel.queryProperty().setValue("9780134685991");
+        assertTrue(viewModel.queryValidationStatus().validProperty().getValue());
+    }
+
+    @Test
+    void canExtractISBNFromQueryText() {
+        viewModel.queryProperty().setValue(";:isbn (9780134685991), text2");
+        assertTrue(viewModel.queryValidationStatus().validProperty().getValue());
+    }
+
+    @Test
+    void queryConsistingOfArXivIdIsValid() {
+        viewModel.queryProperty().setValue("arXiv:2110.02957");
+        assertTrue(viewModel.queryValidationStatus().validProperty().getValue());
+    }
+
+    @Test
+    void canExtractArXivIdFromQueryText() {
+        viewModel.queryProperty().setValue("this query contains an ArXiv identifier 2110.02957");
+        assertTrue(viewModel.queryValidationStatus().validProperty().getValue());
+    }
 }
diff --git a/src/test/java/org/jabref/gui/libraryproperties/constants/ConstantsPropertiesViewModelTest.java b/src/test/java/org/jabref/gui/libraryproperties/constants/ConstantsPropertiesViewModelTest.java
new file mode 100644
index 00000000000..7280c3e33e1
--- /dev/null
+++ b/src/test/java/org/jabref/gui/libraryproperties/constants/ConstantsPropertiesViewModelTest.java
@@ -0,0 +1,73 @@
+package org.jabref.gui.libraryproperties.constants;
+
+import java.util.List;
+
+import javafx.beans.property.StringProperty;
+
+import org.jabref.gui.DialogService;
+import org.jabref.model.database.BibDatabase;
+import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.entry.BibtexString;
+import org.jabref.preferences.FilePreferences;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+
+class ConstantsPropertiesViewModelTest {
+
+    private DialogService service;
+    private FilePreferences filePreferences;
+
+    @BeforeEach
+    void setUp() {
+        service = mock(DialogService.class);
+        filePreferences = mock(FilePreferences.class);
+    }
+
+    @DisplayName("Check that the list of strings is sorted according to their keys")
+    @Test
+    void testStringsListPropertySorting() {
+        BibtexString string1 = new BibtexString("TSE", "Transactions on Software Engineering");
+        BibtexString string2 = new BibtexString("ICSE", "International Conference on Software Engineering");
+        BibDatabase db = new BibDatabase();
+        db.setStrings(List.of(string1, string2));
+        BibDatabaseContext context = new BibDatabaseContext(db);
+        List<String> expected = List.of(string2.getName(), string1.getName()); // ICSE before TSE
+
+        ConstantsPropertiesViewModel model = new ConstantsPropertiesViewModel(context, service, filePreferences);
+        model.setValues();
+
+        List<String> actual = model.stringsListProperty().stream()
+                .map(ConstantsItemModel::labelProperty)
+                .map(StringProperty::getValue)
+                .toList();
+
+        assertEquals(expected, actual);
+    }
+
+    @DisplayName("Check that the list of strings is sorted after resorting it")
+    @Test
+    void testStringsListPropertyResorting() {
+        BibDatabase db = new BibDatabase();
+        BibDatabaseContext context = new BibDatabaseContext(db);
+        List<String> expected = List.of("ICSE", "TSE");
+
+        ConstantsPropertiesViewModel model = new ConstantsPropertiesViewModel(context, service, filePreferences);
+        var stringsList = model.stringsListProperty();
+        stringsList.add(new ConstantsItemModel("TSE", "Transactions on Software Engineering"));
+        stringsList.add(new ConstantsItemModel("ICSE", "International Conference on Software Engineering"));
+
+        model.resortStrings();
+
+        List<String> actual = model.stringsListProperty().stream()
+                .map(ConstantsItemModel::labelProperty)
+                .map(StringProperty::getValue)
+                .toList();
+
+        assertEquals(expected, actual);
+    }
+}
diff --git a/src/test/java/org/jabref/gui/libraryproperties/contentselectors/ContentSelectorViewModelTest.java b/src/test/java/org/jabref/gui/libraryproperties/contentselectors/ContentSelectorViewModelTest.java
index af7db3bf09a..05dfbf152b9 100644
--- a/src/test/java/org/jabref/gui/libraryproperties/contentselectors/ContentSelectorViewModelTest.java
+++ b/src/test/java/org/jabref/gui/libraryproperties/contentselectors/ContentSelectorViewModelTest.java
@@ -85,7 +85,7 @@ void addsNewField() {
         addField(testField);
 
         ListProperty<Field> fields = viewModel.getFieldNamesBackingList();
-        boolean fieldsContainTestValue = fields.stream().anyMatch(field -> field.getDisplayName().equals("Test"));
+        boolean fieldsContainTestValue = fields.stream().anyMatch(field -> "Test".equals(field.getDisplayName()));
 
         assertTrue(fieldsContainTestValue);
     }
@@ -147,7 +147,7 @@ private void removeKeyword(Field field, String keyword) {
 
     private void addField(Field field) {
         when(dialogService.showInputDialogAndWait(
-                Localization.lang("Add new field name"), Localization.lang("Field name:")))
+                Localization.lang("Add new field name"), Localization.lang("Field name")))
                 .thenReturn(Optional.of(field.getDisplayName()));
 
         viewModel.showInputFieldNameDialog();
diff --git a/src/test/java/org/jabref/gui/menus/FileHistoryMenuTest.java b/src/test/java/org/jabref/gui/menus/FileHistoryMenuTest.java
new file mode 100644
index 00000000000..ee1529cc512
--- /dev/null
+++ b/src/test/java/org/jabref/gui/menus/FileHistoryMenuTest.java
@@ -0,0 +1,45 @@
+package org.jabref.gui.menus;
+
+import java.nio.file.Path;
+
+import org.jabref.gui.DialogService;
+import org.jabref.gui.importer.actions.OpenDatabaseAction;
+import org.jabref.logic.util.io.FileHistory;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.testfx.framework.junit5.ApplicationExtension;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.MockitoAnnotations.openMocks;
+
+@ExtendWith(ApplicationExtension.class)
+public class FileHistoryMenuTest {
+    private static final String BIBTEX_LIBRARY_PATH = "src/test/resources/org/jabref/";
+
+    private FileHistoryMenu fileHistoryMenu;
+    @Mock
+    private FileHistory fileHistory;
+    @Mock
+    private DialogService dialogService;
+    @Mock
+    private OpenDatabaseAction openDatabaseAction;
+
+    @BeforeEach
+    public void setUp() {
+        openMocks(this);
+        fileHistoryMenu = new FileHistoryMenu(fileHistory, dialogService, openDatabaseAction);
+    }
+
+    @Test
+    void recentLibrariesAreCleared() {
+        fileHistoryMenu.newFile(Path.of(BIBTEX_LIBRARY_PATH.concat("bibtexFiles/test.bib")));
+
+        fileHistoryMenu.clearLibrariesHistory();
+        assertTrue(fileHistoryMenu.isDisable());
+        assertEquals(0, fileHistory.size());
+    }
+}
diff --git a/src/test/java/org/jabref/gui/preferences/journals/JournalAbbreviationsViewModelTabTest.java b/src/test/java/org/jabref/gui/preferences/journals/JournalAbbreviationsViewModelTabTest.java
index 62cf94d2b7a..433d736862d 100644
--- a/src/test/java/org/jabref/gui/preferences/journals/JournalAbbreviationsViewModelTabTest.java
+++ b/src/test/java/org/jabref/gui/preferences/journals/JournalAbbreviationsViewModelTabTest.java
@@ -85,9 +85,9 @@ public TestAbbreviation(String name, String abbreviation, String shortestUniqueA
         @Override
         public String toString() {
             if (showShortestUniqueAbbreviation) {
-                return this.getName() + ";" + this.getAbbreviation() + ";" + this.getShortestUniqueAbbreviation();
+                return this.getName() + "," + this.getAbbreviation() + "," + this.getShortestUniqueAbbreviation();
             }
-            return this.getName() + ";" + this.getAbbreviation();
+            return this.getName() + "," + this.getAbbreviation();
         }
     }
 
diff --git a/src/test/java/org/jabref/gui/search/GlobalSearchBarTest.java b/src/test/java/org/jabref/gui/search/GlobalSearchBarTest.java
new file mode 100644
index 00000000000..b702ec57e2d
--- /dev/null
+++ b/src/test/java/org/jabref/gui/search/GlobalSearchBarTest.java
@@ -0,0 +1,109 @@
+package org.jabref.gui.search;
+
+import java.util.EnumSet;
+import java.util.List;
+
+import javafx.scene.Scene;
+import javafx.scene.control.TextInputControl;
+import javafx.scene.layout.HBox;
+import javafx.stage.Stage;
+
+import org.jabref.gui.DialogService;
+import org.jabref.gui.JabRefFrame;
+import org.jabref.gui.StateManager;
+import org.jabref.gui.undo.CountingUndoManager;
+import org.jabref.gui.util.DefaultTaskExecutor;
+import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.search.rules.SearchRules;
+import org.jabref.preferences.PreferencesService;
+import org.jabref.preferences.SearchPreferences;
+import org.jabref.testutils.category.GUITest;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Answers;
+import org.testfx.api.FxRobot;
+import org.testfx.framework.junit5.ApplicationExtension;
+import org.testfx.framework.junit5.Start;
+
+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;
+
+@GUITest
+@ExtendWith(ApplicationExtension.class)
+public class GlobalSearchBarTest {
+    private Stage stage;
+    private Scene scene;
+    private HBox hBox;
+
+    private GlobalSearchBar searchBar;
+    private StateManager stateManager;
+
+    @Start
+    public void onStart(Stage stage) {
+        SearchPreferences searchPreferences = mock(SearchPreferences.class);
+        when(searchPreferences.getSearchFlags()).thenReturn(EnumSet.noneOf(SearchRules.SearchFlags.class));
+        PreferencesService prefs = mock(PreferencesService.class, Answers.RETURNS_DEEP_STUBS);
+        when(prefs.getSearchPreferences()).thenReturn(searchPreferences);
+
+        stateManager = new StateManager();
+        // Need for active database, otherwise the searchField will be disabled
+        stateManager.setActiveDatabase(new BibDatabaseContext());
+
+        // Instantiate GlobalSearchBar class, so the change listener is registered
+        searchBar = new GlobalSearchBar(
+                mock(JabRefFrame.class),
+                stateManager,
+                prefs,
+                mock(CountingUndoManager.class),
+                mock(DialogService.class)
+        );
+
+        hBox = new HBox(searchBar);
+
+        scene = new Scene(hBox, 400, 400);
+        this.stage = stage;
+        stage.setScene(scene);
+
+        stage.show();
+    }
+
+    @Test
+    void recordingSearchQueriesOnFocusLostOnly(FxRobot robot) throws InterruptedException {
+        stateManager.clearSearchHistory();
+        String searchQuery = "Smith";
+        // Track the node, that the search query will be typed into
+        TextInputControl searchField = robot.lookup("#searchField").queryTextInputControl();
+
+        // The focus is on searchField node, as we click on the search box
+        var searchFieldRoboto = robot.clickOn(searchField);
+        for (char c : searchQuery.toCharArray()) {
+            searchFieldRoboto.write(String.valueOf(c));
+            Thread.sleep(401);
+            assertTrue(stateManager.getWholeSearchHistory().isEmpty());
+        }
+
+        // Set the focus to another node to trigger the listener and finally record the query.
+        DefaultTaskExecutor.runAndWaitInJavaFXThread(hBox::requestFocus);
+        List<String> lastSearchHistory = stateManager.getWholeSearchHistory().stream().toList();
+
+        assertEquals(List.of("Smith"), lastSearchHistory);
+    }
+
+    @Test
+    void emptyQueryIsNotRecorded(FxRobot robot) {
+        stateManager.clearSearchHistory();
+        String searchQuery = "";
+        TextInputControl searchField = robot.lookup("#searchField").queryTextInputControl();
+
+        var searchFieldRoboto = robot.clickOn(searchField);
+        searchFieldRoboto.write(searchQuery);
+
+        DefaultTaskExecutor.runAndWaitInJavaFXThread(hBox::requestFocus);
+        List<String> lastSearchHistory = stateManager.getWholeSearchHistory().stream().toList();
+
+        assertEquals(List.of(), lastSearchHistory);
+    }
+}
diff --git a/src/test/java/org/jabref/gui/sidepane/SidePaneViewModelTest.java b/src/test/java/org/jabref/gui/sidepane/SidePaneViewModelTest.java
index 03fb4dc6483..49bd0c0073b 100644
--- a/src/test/java/org/jabref/gui/sidepane/SidePaneViewModelTest.java
+++ b/src/test/java/org/jabref/gui/sidepane/SidePaneViewModelTest.java
@@ -14,6 +14,7 @@
 import org.jabref.gui.util.CustomLocalDragboard;
 import org.jabref.gui.util.OptionalObjectProperty;
 import org.jabref.gui.util.TaskExecutor;
+import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.preferences.PreferencesService;
 import org.jabref.preferences.SidePanePreferences;
 
@@ -31,6 +32,7 @@
 class SidePaneViewModelTest {
 
     PreferencesService preferencesService = mock(PreferencesService.class);
+    JournalAbbreviationRepository abbreviationRepository = mock(JournalAbbreviationRepository.class);
     StateManager stateManager = mock(StateManager.class);
     TaskExecutor taskExecutor = mock(TaskExecutor.class);
     DialogService dialogService = mock(DialogService.class);
@@ -52,7 +54,7 @@ void setUp() {
         sidePanePreferences.getPreferredPositions().put(SidePaneType.WEB_SEARCH, 1);
         sidePanePreferences.getPreferredPositions().put(SidePaneType.OPEN_OFFICE, 2);
 
-        sidePaneViewModel = new SidePaneViewModel(preferencesService, stateManager, taskExecutor, dialogService, undoManager);
+        sidePaneViewModel = new SidePaneViewModel(preferencesService, abbreviationRepository, stateManager, taskExecutor, dialogService, undoManager);
     }
 
     @Test
diff --git a/src/test/java/org/jabref/gui/slr/ManageStudyDefinitionViewModelTest.java b/src/test/java/org/jabref/gui/slr/ManageStudyDefinitionViewModelTest.java
index cb0438ce4c4..2e28e83c7c6 100644
--- a/src/test/java/org/jabref/gui/slr/ManageStudyDefinitionViewModelTest.java
+++ b/src/test/java/org/jabref/gui/slr/ManageStudyDefinitionViewModelTest.java
@@ -34,26 +34,26 @@ void setUp() {
     public void emptyStudyConstructorFillsDatabasesCorrectly() {
         ManageStudyDefinitionViewModel manageStudyDefinitionViewModel = new ManageStudyDefinitionViewModel(importFormatPreferences, importerPreferences, dialogService);
         assertEquals(List.of(
-                new StudyDatabaseItem("ACM Portal", true),
-                new StudyDatabaseItem("ArXiv", false),
-                new StudyDatabaseItem("Bibliotheksverbund Bayern (Experimental)", false),
-                new StudyDatabaseItem("Biodiversity Heritage", false),
-                new StudyDatabaseItem("Collection of Computer Science Bibliographies", false),
-                new StudyDatabaseItem("Crossref", false),
-                new StudyDatabaseItem("DBLP", true),
-                new StudyDatabaseItem("DOAB", false),
-                new StudyDatabaseItem("DOAJ", false),
-                new StudyDatabaseItem("GVK", false),
-                new StudyDatabaseItem("IEEEXplore", true),
-                new StudyDatabaseItem("INSPIRE", false),
-                new StudyDatabaseItem("MathSciNet", false),
-                new StudyDatabaseItem("Medline/PubMed", false),
-                new StudyDatabaseItem("ResearchGate", false),
-                new StudyDatabaseItem("SAO/NASA ADS", false),
-                new StudyDatabaseItem("SemanticScholar", false),
-                new StudyDatabaseItem("Springer", true),
-                new StudyDatabaseItem("zbMATH", false)
-        ), manageStudyDefinitionViewModel.getDatabases());
+                new StudyCatalogItem("ACM Portal", true),
+                new StudyCatalogItem("ArXiv", false),
+                new StudyCatalogItem("Bibliotheksverbund Bayern (Experimental)", false),
+                new StudyCatalogItem("Biodiversity Heritage", false),
+                new StudyCatalogItem("CiteSeerX", false),
+                new StudyCatalogItem("Crossref", false),
+                new StudyCatalogItem("DBLP", true),
+                new StudyCatalogItem("DOAB", false),
+                new StudyCatalogItem("DOAJ", false),
+                new StudyCatalogItem("GVK", false),
+                new StudyCatalogItem("IEEEXplore", true),
+                new StudyCatalogItem("INSPIRE", false),
+                new StudyCatalogItem("MathSciNet", false),
+                new StudyCatalogItem("Medline/PubMed", false),
+                new StudyCatalogItem("ResearchGate", false),
+                new StudyCatalogItem("SAO/NASA ADS", false),
+                new StudyCatalogItem("SemanticScholar", false),
+                new StudyCatalogItem("Springer", true),
+                new StudyCatalogItem("zbMATH", false)
+        ), manageStudyDefinitionViewModel.getCatalogs());
     }
 
     @Test
@@ -74,25 +74,25 @@ public void studyConstructorFillsDatabasesCorrectly(@TempDir Path tempDir) {
                 importerPreferences,
                 dialogService);
         assertEquals(List.of(
-                new StudyDatabaseItem("ACM Portal", true),
-                new StudyDatabaseItem("ArXiv", false),
-                new StudyDatabaseItem("Bibliotheksverbund Bayern (Experimental)", false),
-                new StudyDatabaseItem("Biodiversity Heritage", false),
-                new StudyDatabaseItem("Collection of Computer Science Bibliographies", false),
-                new StudyDatabaseItem("Crossref", false),
-                new StudyDatabaseItem("DBLP", false),
-                new StudyDatabaseItem("DOAB", false),
-                new StudyDatabaseItem("DOAJ", false),
-                new StudyDatabaseItem("GVK", false),
-                new StudyDatabaseItem("IEEEXplore", false),
-                new StudyDatabaseItem("INSPIRE", false),
-                new StudyDatabaseItem("MathSciNet", false),
-                new StudyDatabaseItem("Medline/PubMed", false),
-                new StudyDatabaseItem("ResearchGate", false),
-                new StudyDatabaseItem("SAO/NASA ADS", false),
-                new StudyDatabaseItem("SemanticScholar", false),
-                new StudyDatabaseItem("Springer", false),
-                new StudyDatabaseItem("zbMATH", false)
-        ), manageStudyDefinitionViewModel.getDatabases());
+                new StudyCatalogItem("ACM Portal", true),
+                new StudyCatalogItem("ArXiv", false),
+                new StudyCatalogItem("Bibliotheksverbund Bayern (Experimental)", false),
+                new StudyCatalogItem("Biodiversity Heritage", false),
+                new StudyCatalogItem("CiteSeerX", false),
+                new StudyCatalogItem("Crossref", false),
+                new StudyCatalogItem("DBLP", false),
+                new StudyCatalogItem("DOAB", false),
+                new StudyCatalogItem("DOAJ", false),
+                new StudyCatalogItem("GVK", false),
+                new StudyCatalogItem("IEEEXplore", false),
+                new StudyCatalogItem("INSPIRE", false),
+                new StudyCatalogItem("MathSciNet", false),
+                new StudyCatalogItem("Medline/PubMed", false),
+                new StudyCatalogItem("ResearchGate", false),
+                new StudyCatalogItem("SAO/NASA ADS", false),
+                new StudyCatalogItem("SemanticScholar", false),
+                new StudyCatalogItem("Springer", false),
+                new StudyCatalogItem("zbMATH", false)
+        ), manageStudyDefinitionViewModel.getCatalogs());
     }
 }
diff --git a/src/test/java/org/jabref/gui/theme/ThemeManagerTest.java b/src/test/java/org/jabref/gui/theme/ThemeManagerTest.java
index d772ca6deff..4f53fadc9be 100644
--- a/src/test/java/org/jabref/gui/theme/ThemeManagerTest.java
+++ b/src/test/java/org/jabref/gui/theme/ThemeManagerTest.java
@@ -16,13 +16,14 @@
 
 import org.jabref.gui.util.DefaultFileUpdateMonitor;
 import org.jabref.model.util.DummyFileUpdateMonitor;
-import org.jabref.preferences.AppearancePreferences;
+import org.jabref.preferences.WorkspacePreferences;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.api.io.TempDir;
+import org.mockito.Answers;
 import org.testfx.framework.junit5.ApplicationExtension;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -52,10 +53,10 @@ void setUp(@TempDir Path tempFolder) {
     public void themeManagerUsesProvidedTheme() throws IOException {
         Path testCss = tempFolder.resolve("test.css");
         Files.writeString(testCss, TEST_CSS_CONTENT, StandardOpenOption.CREATE);
-        AppearancePreferences appearancePreferences =
-                new AppearancePreferences(false, 0, 0, new Theme(testCss.toString()));
+        WorkspacePreferences workspacePreferences = mock(WorkspacePreferences.class, Answers.RETURNS_DEEP_STUBS);
+        when(workspacePreferences.getTheme()).thenReturn(new Theme(testCss.toString()));
 
-        ThemeManager themeManager = new ThemeManager(appearancePreferences, new DummyFileUpdateMonitor(), Runnable::run);
+        ThemeManager themeManager = new ThemeManager(workspacePreferences, new DummyFileUpdateMonitor(), Runnable::run);
 
         assertEquals(Theme.Type.CUSTOM, themeManager.getActiveTheme().getType());
         assertEquals(testCss.toString(), themeManager.getActiveTheme().getName());
@@ -72,11 +73,11 @@ public void customThemeAvailableEvenWhenDeleted() throws IOException {
          validation (at the moment) but by making a valid CSS block we don't preclude adding validation later */
         Path testCss = tempFolder.resolve("test.css");
         Files.writeString(testCss, TEST_CSS_CONTENT, StandardOpenOption.CREATE);
-        AppearancePreferences appearancePreferences =
-                new AppearancePreferences(false, 0, 0, new Theme(testCss.toString()));
+        WorkspacePreferences workspacePreferences = mock(WorkspacePreferences.class, Answers.RETURNS_DEEP_STUBS);
+        when(workspacePreferences.getTheme()).thenReturn(new Theme(testCss.toString()));
 
         // ActiveTheme should provide the additionalStylesheet that was created before
-        ThemeManager themeManagerCreatedBeforeFileDeleted = new ThemeManager(appearancePreferences, new DummyFileUpdateMonitor(), Runnable::run);
+        ThemeManager themeManagerCreatedBeforeFileDeleted = new ThemeManager(workspacePreferences, new DummyFileUpdateMonitor(), Runnable::run);
 
         Files.delete(testCss);
 
@@ -100,11 +101,11 @@ public void customThemeAvailableEvenWhenDeleted() throws IOException {
     @Test
     public void customThemeBecomesAvailableAfterFileIsCreated() throws IOException {
         Path testCss = tempFolder.resolve("test.css");
-        AppearancePreferences appearancePreferences =
-                new AppearancePreferences(false, 0, 0, new Theme(testCss.toString()));
+        WorkspacePreferences workspacePreferences = mock(WorkspacePreferences.class);
+        when(workspacePreferences.getTheme()).thenReturn(new Theme(testCss.toString()));
 
         // ActiveTheme should provide no additionalStylesheet when no file exists
-        ThemeManager themeManagerCreatedBeforeFileExists = new ThemeManager(appearancePreferences, new DummyFileUpdateMonitor(), Runnable::run);
+        ThemeManager themeManagerCreatedBeforeFileExists = new ThemeManager(workspacePreferences, new DummyFileUpdateMonitor(), Runnable::run);
         assertEquals(Optional.empty(), themeManagerCreatedBeforeFileExists.getActiveTheme()
                                                                           .getAdditionalStylesheet(),
                 "didn't expect additional stylesheet to be available because it didn't exist when theme was created");
@@ -131,11 +132,11 @@ public void largeCustomThemeNotHeldInMemory() throws IOException {
             Files.writeString(largeCssTestFile, testString, StandardOpenOption.APPEND);
         }
         Files.writeString(largeCssTestFile, " */", StandardOpenOption.APPEND);
-        AppearancePreferences appearancePreferences =
-                new AppearancePreferences(false, 0, 0, new Theme(largeCssTestFile.toString()));
+        WorkspacePreferences workspacePreferences = mock(WorkspacePreferences.class, Answers.RETURNS_DEEP_STUBS);
+        when(workspacePreferences.getTheme()).thenReturn(new Theme(largeCssTestFile.toString()));
 
         // ActiveTheme should provide the large additionalStylesheet that was created before
-        ThemeManager themeManager = new ThemeManager(appearancePreferences, new DummyFileUpdateMonitor(), Runnable::run);
+        ThemeManager themeManager = new ThemeManager(workspacePreferences, new DummyFileUpdateMonitor(), Runnable::run);
         Optional<String> cssLocationBeforeRemoved = themeManager.getActiveTheme()
                                                                 .getAdditionalStylesheet()
                                                                 .map(StyleSheet::getWebEngineStylesheet);
@@ -164,10 +165,10 @@ public void installThemeOnScene() throws IOException {
 
         Path testCss = tempFolder.resolve("reload.css");
         Files.writeString(testCss, TEST_CSS_CONTENT, StandardOpenOption.CREATE);
-        AppearancePreferences appearancePreferences =
-                new AppearancePreferences(false, 0, 0, new Theme(testCss.toString()));
+        WorkspacePreferences workspacePreferences = mock(WorkspacePreferences.class, Answers.RETURNS_DEEP_STUBS);
+        when(workspacePreferences.getTheme()).thenReturn(new Theme(testCss.toString()));
 
-        ThemeManager themeManager = new ThemeManager(appearancePreferences, new DummyFileUpdateMonitor(), Runnable::run);
+        ThemeManager themeManager = new ThemeManager(workspacePreferences, new DummyFileUpdateMonitor(), Runnable::run);
 
         themeManager.installCss(scene);
 
@@ -179,10 +180,10 @@ public void installThemeOnScene() throws IOException {
     public void installThemeOnWebEngine() throws IOException {
         Path testCss = tempFolder.resolve("reload.css");
         Files.writeString(testCss, TEST_CSS_CONTENT, StandardOpenOption.CREATE);
-        AppearancePreferences appearancePreferences =
-                new AppearancePreferences(false, 0, 0, new Theme(testCss.toString()));
+        WorkspacePreferences workspacePreferences = mock(WorkspacePreferences.class, Answers.RETURNS_DEEP_STUBS);
+        when(workspacePreferences.getTheme()).thenReturn(new Theme(testCss.toString()));
 
-        ThemeManager themeManager = new ThemeManager(appearancePreferences, new DummyFileUpdateMonitor(), Runnable::run);
+        ThemeManager themeManager = new ThemeManager(workspacePreferences, new DummyFileUpdateMonitor(), Runnable::run);
 
         CompletableFuture<String> webEngineStyleSheetLocation = new CompletableFuture<>();
 
@@ -208,8 +209,8 @@ public void installThemeOnWebEngine() throws IOException {
     public void liveReloadCssDataUrl() throws IOException, InterruptedException {
         Path testCss = tempFolder.resolve("reload.css");
         Files.writeString(testCss, TEST_CSS_CONTENT, StandardOpenOption.CREATE);
-        AppearancePreferences appearancePreferences =
-                new AppearancePreferences(false, 0, 0, new Theme(testCss.toString()));
+        WorkspacePreferences workspacePreferences = mock(WorkspacePreferences.class, Answers.RETURNS_DEEP_STUBS);
+        when(workspacePreferences.getTheme()).thenReturn(new Theme(testCss.toString()));
 
         final ThemeManager themeManager;
 
@@ -220,7 +221,7 @@ public void liveReloadCssDataUrl() throws IOException, InterruptedException {
         // Wait for the watch service to start
         Thread.sleep(500);
 
-        themeManager = new ThemeManager(appearancePreferences, fileUpdateMonitor, Runnable::run);
+        themeManager = new ThemeManager(workspacePreferences, fileUpdateMonitor, Runnable::run);
 
         Scene scene = mock(Scene.class);
         when(scene.getStylesheets()).thenReturn(FXCollections.observableArrayList());
diff --git a/src/test/java/org/jabref/logic/auxparser/AuxParserTest.java b/src/test/java/org/jabref/logic/auxparser/AuxParserTest.java
index 7b1ecb29e4f..bbff99034ab 100644
--- a/src/test/java/org/jabref/logic/auxparser/AuxParserTest.java
+++ b/src/test/java/org/jabref/logic/auxparser/AuxParserTest.java
@@ -14,7 +14,6 @@
 import org.jabref.logic.importer.fileformat.BibtexParser;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
-import org.jabref.model.util.DummyFileUpdateMonitor;
 
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -44,7 +43,7 @@ void testNormal() throws URISyntaxException, IOException {
         InputStream originalStream = AuxParserTest.class.getResourceAsStream("origin.bib");
         Path auxFile = Path.of(AuxParserTest.class.getResource("paper.aux").toURI());
         try (InputStreamReader originalReader = new InputStreamReader(originalStream, StandardCharsets.UTF_8)) {
-            ParserResult result = new BibtexParser(importFormatPreferences, new DummyFileUpdateMonitor()).parse(originalReader);
+            ParserResult result = new BibtexParser(importFormatPreferences).parse(originalReader);
 
             AuxParser auxParser = new DefaultAuxParser(result.getDatabase());
             AuxParserResult auxResult = auxParser.parse(auxFile);
@@ -71,7 +70,7 @@ void testTwoArgMacro() throws URISyntaxException, IOException {
         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);
+            ParserResult result = new BibtexParser(importFormatPreferences).parse(originalReader);
 
             AuxParser auxParser = new DefaultAuxParser(result.getDatabase());
             AuxParserResult auxResult = auxParser.parse(auxFile);
@@ -96,7 +95,7 @@ void testNotAllFound() throws URISyntaxException, IOException {
         InputStream originalStream = AuxParserTest.class.getResourceAsStream("origin.bib");
         Path auxFile = Path.of(AuxParserTest.class.getResource("badpaper.aux").toURI());
         try (InputStreamReader originalReader = new InputStreamReader(originalStream, StandardCharsets.UTF_8)) {
-            ParserResult result = new BibtexParser(importFormatPreferences, new DummyFileUpdateMonitor()).parse(originalReader);
+            ParserResult result = new BibtexParser(importFormatPreferences).parse(originalReader);
 
             AuxParser auxParser = new DefaultAuxParser(result.getDatabase());
             AuxParserResult auxResult = auxParser.parse(auxFile);
@@ -118,7 +117,7 @@ void duplicateBibDatabaseConfiguration() throws URISyntaxException, IOException
         InputStream originalStream = AuxParserTest.class.getResourceAsStream("config.bib");
         Path auxFile = Path.of(AuxParserTest.class.getResource("paper.aux").toURI());
         try (InputStreamReader originalReader = new InputStreamReader(originalStream, StandardCharsets.UTF_8)) {
-            ParserResult result = new BibtexParser(importFormatPreferences, new DummyFileUpdateMonitor()).parse(originalReader);
+            ParserResult result = new BibtexParser(importFormatPreferences).parse(originalReader);
 
             AuxParser auxParser = new DefaultAuxParser(result.getDatabase());
             AuxParserResult auxResult = auxParser.parse(auxFile);
@@ -134,7 +133,7 @@ void testNestedAux() throws URISyntaxException, IOException {
         InputStream originalStream = AuxParserTest.class.getResourceAsStream("origin.bib");
         Path auxFile = Path.of(AuxParserTest.class.getResource("nested.aux").toURI());
         try (InputStreamReader originalReader = new InputStreamReader(originalStream, StandardCharsets.UTF_8)) {
-            ParserResult result = new BibtexParser(importFormatPreferences, new DummyFileUpdateMonitor()).parse(originalReader);
+            ParserResult result = new BibtexParser(importFormatPreferences).parse(originalReader);
 
             AuxParser auxParser = new DefaultAuxParser(result.getDatabase());
             AuxParserResult auxResult = auxParser.parse(auxFile);
@@ -156,7 +155,7 @@ void testCrossRef() throws URISyntaxException, IOException {
         InputStream originalStream = AuxParserTest.class.getResourceAsStream("origin.bib");
         Path auxFile = Path.of(AuxParserTest.class.getResource("crossref.aux").toURI());
         try (InputStreamReader originalReader = new InputStreamReader(originalStream, StandardCharsets.UTF_8)) {
-            ParserResult result = new BibtexParser(importFormatPreferences, new DummyFileUpdateMonitor()).parse(originalReader);
+            ParserResult result = new BibtexParser(importFormatPreferences).parse(originalReader);
 
             AuxParser auxParser = new DefaultAuxParser(result.getDatabase());
             AuxParserResult auxResult = auxParser.parse(auxFile);
diff --git a/src/test/java/org/jabref/logic/bibtex/BibEntryAssert.java b/src/test/java/org/jabref/logic/bibtex/BibEntryAssert.java
index 19c276cad2d..55b9ed98560 100644
--- a/src/test/java/org/jabref/logic/bibtex/BibEntryAssert.java
+++ b/src/test/java/org/jabref/logic/bibtex/BibEntryAssert.java
@@ -16,7 +16,6 @@
 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.junit.jupiter.api.Assertions;
 import org.mockito.Answers;
@@ -65,7 +64,7 @@ public static void assertEquals(Class<?> clazz, String resourceName, List<BibEnt
     private static List<BibEntry> getListFromInputStream(InputStream is) throws IOException {
         ParserResult result;
         try (Reader reader = new InputStreamReader(is, StandardCharsets.UTF_8)) {
-            BibtexParser parser = new BibtexParser(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS), new DummyFileUpdateMonitor());
+            BibtexParser parser = new BibtexParser(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS));
             result = parser.parse(reader);
         }
         assertNotNull(result);
diff --git a/src/test/java/org/jabref/logic/bibtex/BibEntryWriterTest.java b/src/test/java/org/jabref/logic/bibtex/BibEntryWriterTest.java
index ab3346c87e4..69a9695bbd3 100644
--- a/src/test/java/org/jabref/logic/bibtex/BibEntryWriterTest.java
+++ b/src/test/java/org/jabref/logic/bibtex/BibEntryWriterTest.java
@@ -5,6 +5,7 @@
 import java.io.StringWriter;
 import java.nio.file.Path;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Stream;
@@ -24,8 +25,6 @@
 import org.jabref.model.entry.types.EntryTypeFactory;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.model.entry.types.UnknownEntryType;
-import org.jabref.model.util.DummyFileUpdateMonitor;
-import org.jabref.model.util.FileUpdateMonitor;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -45,13 +44,12 @@ class BibEntryWriterTest {
     private final StringWriter stringWriter = new StringWriter();
     private BibWriter bibWriter = new BibWriter(stringWriter, OS.NEWLINE);
     private BibEntryWriter bibEntryWriter;
-    private final FileUpdateMonitor fileMonitor = new DummyFileUpdateMonitor();
 
     @BeforeEach
     void setUpWriter() {
         importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        FieldWriterPreferences fieldWriterPreferences = new FieldWriterPreferences(true, List.of(StandardField.MONTH), new FieldContentFormatterPreferences());
-        bibEntryWriter = new BibEntryWriter(new FieldWriter(fieldWriterPreferences), new BibEntryTypesManager());
+        FieldPreferences fieldPreferences = new FieldPreferences(true, List.of(StandardField.MONTH), Collections.emptyList());
+        bibEntryWriter = new BibEntryWriter(new FieldWriter(fieldPreferences), new BibEntryTypesManager());
     }
 
     @Test
@@ -74,7 +72,7 @@ void testSerialization() throws IOException {
                   note    = {some note},
                   number  = {1},
                 }
-                """.replaceAll("\n", OS.NEWLINE);
+                """.replace("\n", OS.NEWLINE);
         // @formatter:on
 
         assertEquals(expected, stringWriter.toString());
@@ -86,7 +84,7 @@ void writeOtherTypeTest() throws Exception {
                 @Other{test,
                   comment = {testentry},
                 }
-                """.replaceAll("\n", OS.NEWLINE);
+                """.replace("\n", OS.NEWLINE);
 
         BibEntry entry = new BibEntry(new UnknownEntryType("other"));
         entry.setField(StandardField.COMMENT, "testentry");
@@ -108,7 +106,7 @@ void writeEntryWithFile() throws Exception {
                 @Article{,
                   file = {test:/home/uers/test.pdf:PDF},
                 }
-                """.replaceAll("\n", OS.NEWLINE), stringWriter.toString());
+                """.replace("\n", OS.NEWLINE), stringWriter.toString());
     }
 
     @Test
@@ -131,7 +129,7 @@ void writeEntryWithOrField() throws Exception {
                   number  = {1},
                   journal = {International Journal of Something},
                 }
-                """.replaceAll("\n", OS.NEWLINE);
+                """.replace("\n", OS.NEWLINE);
         // @formatter:on
 
         assertEquals(expected, stringWriter.toString());
@@ -159,7 +157,7 @@ void writeEntryWithOrFieldBothFieldsPresent() throws Exception {
                   number  = {1},
                   journal = {International Journal of Something},
                 }
-                """.replaceAll("\n", OS.NEWLINE);
+                """.replace("\n", OS.NEWLINE);
         // @formatter:on
 
         assertEquals(expected, stringWriter.toString());
@@ -171,7 +169,7 @@ void writeReallyUnknownTypeTest() throws Exception {
                 @Reallyunknowntype{test,
                   comment = {testentry},
                 }
-                """.replaceAll("\n", OS.NEWLINE);
+                """.replace("\n", OS.NEWLINE);
 
         BibEntry entry = new BibEntry();
         entry.setType(new UnknownEntryType("ReallyUnknownType"));
@@ -191,10 +189,10 @@ void roundTripTest() throws IOException {
                   Note                     = {some note},
                   Number                   = {1}
                 }
-                """.replaceAll("\n", OS.NEWLINE);
+                """.replace("\n", OS.NEWLINE);
 
         // read in bibtex string
-        ParserResult result = new BibtexParser(importFormatPreferences, fileMonitor).parse(new StringReader(bibtexEntry));
+        ParserResult result = new BibtexParser(importFormatPreferences).parse(new StringReader(bibtexEntry));
         Collection<BibEntry> entries = result.getDatabase().getEntries();
         BibEntry entry = entries.iterator().next();
 
@@ -210,10 +208,10 @@ void roundTripKeepsFilePathWithBackslashes() throws IOException {
                 @Article{,
                   file = {Tagungen\\2013\\KWTK45},
                 }
-                """.replaceAll("\n", OS.NEWLINE);
+                """.replace("\n", OS.NEWLINE);
 
         // read in bibtex string
-        ParserResult result = new BibtexParser(importFormatPreferences, fileMonitor).parse(new StringReader(bibtexEntry));
+        ParserResult result = new BibtexParser(importFormatPreferences).parse(new StringReader(bibtexEntry));
         Collection<BibEntry> entries = result.getDatabase().getEntries();
         BibEntry entry = entries.iterator().next();
 
@@ -229,10 +227,10 @@ void roundTripKeepsEscapedCharacters() throws IOException {
                 @Article{,
                   demofield = {Tagungen\\2013\\KWTK45},
                 }
-                """.replaceAll("\n", OS.NEWLINE);
+                """.replace("\n", OS.NEWLINE);
 
         // read in bibtex string
-        ParserResult result = new BibtexParser(importFormatPreferences, fileMonitor).parse(new StringReader(bibtexEntry));
+        ParserResult result = new BibtexParser(importFormatPreferences).parse(new StringReader(bibtexEntry));
         Collection<BibEntry> entries = result.getDatabase().getEntries();
         BibEntry entry = entries.iterator().next();
 
@@ -248,10 +246,10 @@ void roundTripKeepsFilePathEndingWithBackslash() throws IOException {
                 @Article{,
                   file = {dir\\},
                 }
-                """.replaceAll("\n", OS.NEWLINE);
+                """.replace("\n", OS.NEWLINE);
 
         // read in bibtex string
-        ParserResult result = new BibtexParser(importFormatPreferences, fileMonitor).parse(new StringReader(bibtexEntry));
+        ParserResult result = new BibtexParser(importFormatPreferences).parse(new StringReader(bibtexEntry));
         Collection<BibEntry> entries = result.getDatabase().getEntries();
         BibEntry entry = entries.iterator().next();
 
@@ -273,7 +271,7 @@ void roundTripWithPrependingNewlines() throws IOException {
         // @formatter:on
 
         // read in bibtex string
-        ParserResult result = new BibtexParser(importFormatPreferences, fileMonitor).parse(new StringReader(bibtexEntry));
+        ParserResult result = new BibtexParser(importFormatPreferences).parse(new StringReader(bibtexEntry));
         Collection<BibEntry> entries = result.getDatabase().getEntries();
         BibEntry entry = entries.iterator().next();
 
@@ -295,7 +293,7 @@ void roundTripWithKeepsCRLFLineBreakStyle() throws IOException {
         // @formatter:on
 
         // read in bibtex string
-        ParserResult result = new BibtexParser(importFormatPreferences, fileMonitor).parse(new StringReader(bibtexEntry));
+        ParserResult result = new BibtexParser(importFormatPreferences).parse(new StringReader(bibtexEntry));
         Collection<BibEntry> entries = result.getDatabase().getEntries();
         BibEntry entry = entries.iterator().next();
 
@@ -319,7 +317,7 @@ void roundTripWithKeepsLFLineBreakStyle() throws IOException {
         // @formatter:on
 
         // read in bibtex string
-        ParserResult result = new BibtexParser(importFormatPreferences, fileMonitor).parse(new StringReader(bibtexEntry));
+        ParserResult result = new BibtexParser(importFormatPreferences).parse(new StringReader(bibtexEntry));
         Collection<BibEntry> entries = result.getDatabase().getEntries();
         BibEntry entry = entries.iterator().next();
 
@@ -341,11 +339,11 @@ void roundTripWithModification() throws IOException {
                   Note                     = {some note},
                   Number                   = {1},
                 }
-                """.replaceAll("\n", OS.NEWLINE);
+                """.replace("\n", OS.NEWLINE);
         // @formatter:on
 
         // read in bibtex string
-        ParserResult result = new BibtexParser(importFormatPreferences, fileMonitor).parse(new StringReader(bibtexEntry));
+        ParserResult result = new BibtexParser(importFormatPreferences).parse(new StringReader(bibtexEntry));
         Collection<BibEntry> entries = result.getDatabase().getEntries();
         BibEntry entry = entries.iterator().next();
 
@@ -363,7 +361,7 @@ void roundTripWithModification() throws IOException {
                   note    = {some note},
                   number  = {1},
                 }
-                """.replaceAll("\n", OS.NEWLINE);
+                """.replace("\n", OS.NEWLINE);
         // @formatter:on
         assertEquals(expected, stringWriter.toString());
     }
@@ -379,11 +377,11 @@ void roundTripWithCamelCasingInTheOriginalEntryAndResultInLowerCase() throws IOE
                   Note                     = {some note},
                   HowPublished             = {asdf},
                 }
-                """.replaceAll("\n", OS.NEWLINE);
+                """.replace("\n", OS.NEWLINE);
         // @formatter:on
 
         // read in bibtex string
-        ParserResult result = new BibtexParser(importFormatPreferences, fileMonitor).parse(new StringReader(bibtexEntry));
+        ParserResult result = new BibtexParser(importFormatPreferences).parse(new StringReader(bibtexEntry));
         Collection<BibEntry> entries = result.getDatabase().getEntries();
         BibEntry entry = entries.iterator().next();
 
@@ -402,7 +400,7 @@ void roundTripWithCamelCasingInTheOriginalEntryAndResultInLowerCase() throws IOE
                   number       = {1},
                   howpublished = {asdf},
                 }
-                """.replaceAll("\n", OS.NEWLINE);
+                """.replace("\n", OS.NEWLINE);
         // @formatter:on
         assertEquals(expected, stringWriter.toString());
     }
@@ -419,11 +417,11 @@ void testEntryTypeChange() throws IOException {
                   note         = {some note},
                   howpublished = {asdf},
                 }
-                """.replaceAll("\n", OS.NEWLINE);
+                """.replace("\n", OS.NEWLINE);
         // @formatter:on
 
         // read in bibtex string
-        ParserResult result = new BibtexParser(importFormatPreferences, fileMonitor).parse(new StringReader(expected));
+        ParserResult result = new BibtexParser(importFormatPreferences).parse(new StringReader(expected));
         Collection<BibEntry> entries = result.getDatabase().getEntries();
         BibEntry entry = entries.iterator().next();
 
@@ -442,7 +440,7 @@ void testEntryTypeChange() throws IOException {
                   howpublished = {asdf},
                   journal      = {International Journal of Something},
                 }
-                """.replaceAll("\n", OS.NEWLINE);
+                """.replace("\n", OS.NEWLINE);
         // @formatter:on
         assertEquals(expectedNewEntry, stringWriter.toString());
     }
@@ -459,7 +457,7 @@ void roundTripWithAppendedNewlines() throws IOException {
         // @formatter:on
 
         // read in bibtex string
-        ParserResult result = new BibtexParser(importFormatPreferences, fileMonitor).parse(new StringReader(bibtexEntry));
+        ParserResult result = new BibtexParser(importFormatPreferences).parse(new StringReader(bibtexEntry));
         Collection<BibEntry> entries = result.getDatabase().getEntries();
         BibEntry entry = entries.iterator().next();
 
@@ -484,7 +482,7 @@ void roundTripNormalizesNewLines() throws IOException {
         // @formatter:on
 
         // read in bibtex string
-        ParserResult result = new BibtexParser(importFormatPreferences, fileMonitor).parse(new StringReader(bibtexEntry));
+        ParserResult result = new BibtexParser(importFormatPreferences).parse(new StringReader(bibtexEntry));
         Collection<BibEntry> entries = result.getDatabase().getEntries();
         BibEntry entry = entries.iterator().next();
 
@@ -511,7 +509,7 @@ void multipleWritesWithoutModification() throws IOException {
                   Note                     = {some note},
                   Number                   = {1}
                 }
-                """.replaceAll("\n", OS.NEWLINE);
+                """.replace("\n", OS.NEWLINE);
         // @formatter:on
 
         String result = testSingleWrite(bibtexEntry);
@@ -523,7 +521,7 @@ void multipleWritesWithoutModification() throws IOException {
 
     private String testSingleWrite(String bibtexEntry) throws IOException {
         // read in bibtex string
-        ParserResult result = new BibtexParser(importFormatPreferences, fileMonitor).parse(new StringReader(bibtexEntry));
+        ParserResult result = new BibtexParser(importFormatPreferences).parse(new StringReader(bibtexEntry));
         Collection<BibEntry> entries = result.getDatabase().getEntries();
         BibEntry entry = entries.iterator().next();
 
@@ -546,11 +544,11 @@ void monthFieldSpecialSyntax() throws IOException {
                   Month                    = mar,
                   Number                   = {1}
                 }
-                """.replaceAll("\n", OS.NEWLINE);
+                """.replace("\n", OS.NEWLINE);
         // @formatter:on
 
         // read in bibtex string
-        ParserResult result = new BibtexParser(importFormatPreferences, fileMonitor).parse(new StringReader(bibtexEntry));
+        ParserResult result = new BibtexParser(importFormatPreferences).parse(new StringReader(bibtexEntry));
         Collection<BibEntry> entries = result.getDatabase().getEntries();
         BibEntry entry = entries.iterator().next();
 
@@ -586,7 +584,7 @@ void customTypeCanBewritten() throws IOException {
         // @formatter:on
 
         // read in bibtex string
-        ParserResult result = new BibtexParser(importFormatPreferences, fileMonitor).parse(new StringReader(bibtexEntry));
+        ParserResult result = new BibtexParser(importFormatPreferences).parse(new StringReader(bibtexEntry));
         Collection<BibEntry> entries = result.getDatabase().getEntries();
         BibEntry entry = entries.iterator().next();
 
@@ -609,7 +607,7 @@ void customTypeCanBewritten() throws IOException {
                   subtitle   = {Encyclopedia of Photography},
                   title      = {International Center of Photography},
                 }
-                """.replaceAll("\n", OS.NEWLINE);
+                """.replace("\n", OS.NEWLINE);
 
         assertEquals(expected, stringWriter.toString());
     }
@@ -627,7 +625,7 @@ void constantMonthApril() throws Exception {
                         @Misc{,
                           month = apr,
                         }
-                        """.replaceAll("\n", OS.NEWLINE),
+                        """.replace("\n", OS.NEWLINE),
                 stringWriter.toString());
     }
 
@@ -644,7 +642,7 @@ void monthApril() throws Exception {
                         @Misc{,
                           month = {apr},
                         }
-                        """.replaceAll("\n", OS.NEWLINE),
+                        """.replace("\n", OS.NEWLINE),
                 stringWriter.toString());
     }
 
@@ -661,10 +659,10 @@ void filenameIsUnmodifiedDuringWrite() throws Exception {
                       file      = {:Hue17 - Leiter # Halbleiter # Supraleiter.pdf:PDF},
                       timestamp = {2020.10.13},
                 }
-                """.replaceAll("\n", OS.NEWLINE);
+                """.replace("\n", OS.NEWLINE);
 
         // read in bibtex string
-        ParserResult result = new BibtexParser(importFormatPreferences, fileMonitor).parse(new StringReader(bibtexEntry));
+        ParserResult result = new BibtexParser(importFormatPreferences).parse(new StringReader(bibtexEntry));
         Collection<BibEntry> entries = result.getDatabase().getEntries();
         BibEntry entry = entries.iterator().next();
 
@@ -686,7 +684,7 @@ void addFieldWithLongerLength() throws IOException {
         // @formatter:on
 
         // read in bibtex string
-        ParserResult result = new BibtexParser(importFormatPreferences, fileMonitor).parse(new StringReader(bibtexEntry));
+        ParserResult result = new BibtexParser(importFormatPreferences).parse(new StringReader(bibtexEntry));
         Collection<BibEntry> entries = result.getDatabase().getEntries();
         BibEntry entry = entries.iterator().next();
 
@@ -742,11 +740,11 @@ void roundTripWithPrecedingCommentTest() throws IOException {
                   Note                     = {some note},
                   Number                   = {1}
                 }
-                """.replaceAll("\n", OS.NEWLINE);
+                """.replace("\n", OS.NEWLINE);
         // @formatter:on
 
         // read in bibtex string
-        ParserResult result = new BibtexParser(importFormatPreferences, fileMonitor).parse(new StringReader(bibtexEntry));
+        ParserResult result = new BibtexParser(importFormatPreferences).parse(new StringReader(bibtexEntry));
         Collection<BibEntry> entries = result.getDatabase().getEntries();
         BibEntry entry = entries.iterator().next();
 
@@ -767,11 +765,11 @@ void roundTripWithPrecedingCommentAndModificationTest() throws IOException {
                   Number                   = {1},
                   Note                     = {some note}
                 }
-                """.replaceAll("\n", OS.NEWLINE);
+                """.replace("\n", OS.NEWLINE);
         // @formatter:on
 
         // read in bibtex string
-        ParserResult result = new BibtexParser(importFormatPreferences, fileMonitor).parse(new StringReader(bibtexEntry));
+        ParserResult result = new BibtexParser(importFormatPreferences).parse(new StringReader(bibtexEntry));
         Collection<BibEntry> entries = result.getDatabase().getEntries();
         BibEntry entry = entries.iterator().next();
 
@@ -790,7 +788,7 @@ void roundTripWithPrecedingCommentAndModificationTest() throws IOException {
                   note    = {some note},
                   number  = {1},
                 }
-                """.replaceAll("\n", OS.NEWLINE);
+                """.replace("\n", OS.NEWLINE);
         // @formatter:on
 
         assertEquals(expected, stringWriter.toString());
@@ -825,7 +823,7 @@ void alphabeticSerialization() throws IOException {
                   chapter      = {chapter},
                   year         = {2019},
                 }
-                """.replaceAll("\n", OS.NEWLINE);
+                """.replace("\n", OS.NEWLINE);
         // @formatter:on
 
         assertEquals(expected, stringWriter.toString());
@@ -875,7 +873,7 @@ void testSerializeAll() throws IOException {
                   chapter      = {chapter},
                   year         = {2019},
                 }
-                """.replaceAll("\n", OS.NEWLINE);
+                """.replace("\n", OS.NEWLINE);
         // @formatter:on
 
         // @formatter:off
@@ -890,7 +888,7 @@ void testSerializeAll() throws IOException {
                   booktitle = {The Big Book of Books},
                   year      = {2020},
                 }
-                """.replaceAll("\n", OS.NEWLINE);
+                """.replace("\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 08cd66fe0f6..a6705425be5 100644
--- a/src/test/java/org/jabref/logic/bibtex/FieldContentFormatterTest.java
+++ b/src/test/java/org/jabref/logic/bibtex/FieldContentFormatterTest.java
@@ -15,9 +15,11 @@ class FieldContentFormatterTest {
     private FieldContentFormatter parser;
 
     @BeforeEach
-    void setUp() throws Exception {
-        FieldContentFormatterPreferences preferences = new FieldContentFormatterPreferences(Collections.emptyList());
-        parser = new FieldContentFormatter(preferences);
+    void setUp() {
+        parser = new FieldContentFormatter(new FieldPreferences(
+                false,
+                Collections.emptyList(),
+                Collections.emptyList()));
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/bibtex/FieldWriterTest.java b/src/test/java/org/jabref/logic/bibtex/FieldWriterTest.java
index 7f49eefeed2..d86fddb1b0f 100644
--- a/src/test/java/org/jabref/logic/bibtex/FieldWriterTest.java
+++ b/src/test/java/org/jabref/logic/bibtex/FieldWriterTest.java
@@ -1,5 +1,6 @@
 package org.jabref.logic.bibtex;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Stream;
 
@@ -51,8 +52,8 @@ public static Stream<Arguments> getMarkdowns() {
 
     @BeforeEach
     void setUp() {
-        FieldWriterPreferences fieldWriterPreferences = new FieldWriterPreferences(true, List.of(StandardField.MONTH), new FieldContentFormatterPreferences());
-        writer = new FieldWriter(fieldWriterPreferences);
+        FieldPreferences fieldPreferences = new FieldPreferences(true, List.of(StandardField.MONTH), Collections.emptyList());
+        writer = new FieldWriter(fieldPreferences);
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/bibtex/FileFieldWriterTest.java b/src/test/java/org/jabref/logic/bibtex/FileFieldWriterTest.java
index ef0dd2bf5ec..34032fb7859 100644
--- a/src/test/java/org/jabref/logic/bibtex/FileFieldWriterTest.java
+++ b/src/test/java/org/jabref/logic/bibtex/FileFieldWriterTest.java
@@ -37,10 +37,10 @@ public void testQuoteNull() {
 
     private static Stream<Arguments> getEncodingTestData() {
         return Stream.of(
-                Arguments.of("a:b;c:d", new String[][] {{"a", "b"}, {"c", "d"}}),
-                Arguments.of("a:;c:d", new String[][] {{"a", ""}, {"c", "d"}}),
-                Arguments.of("a:" + null + ";c:d", new String[][] {{"a", null}, {"c", "d"}}),
-                Arguments.of("a:\\:b;c\\;:d", new String[][] {{"a", ":b"}, {"c;", "d"}})
+                Arguments.of("a:b;c:d", new String[][]{{"a", "b"}, {"c", "d"}}),
+                Arguments.of("a:;c:d", new String[][]{{"a", ""}, {"c", "d"}}),
+                Arguments.of("a:" + null + ";c:d", new String[][]{{"a", null}, {"c", "d"}}),
+                Arguments.of("a:\\:b;c\\;:d", new String[][]{{"a", ":b"}, {"c;", "d"}})
         );
     }
 
diff --git a/src/test/java/org/jabref/logic/bibtex/comparator/FieldComparatorTest.java b/src/test/java/org/jabref/logic/bibtex/comparator/FieldComparatorTest.java
index 59c9d116132..47ed17128ed 100644
--- a/src/test/java/org/jabref/logic/bibtex/comparator/FieldComparatorTest.java
+++ b/src/test/java/org/jabref/logic/bibtex/comparator/FieldComparatorTest.java
@@ -202,25 +202,52 @@ public void compareParsableWithNonParsableNumericFieldDescending() throws Except
     }
 
     @ParameterizedTest
-    @MethodSource("provideArgumentsForNumericalComparison")
-    public void compareNumericalValues(int comparisonResult, String id1, String id2, String errorMessage) {
+    @MethodSource
+    public void compareNumericalValues(int comparisonResult, String id1, String id2, String message) {
         FieldComparator comparator = new FieldComparator(StandardField.PMID);
         BibEntry entry1 = new BibEntry()
                 .withField(StandardField.PMID, id1);
         BibEntry entry2 = new BibEntry()
                 .withField(StandardField.PMID, id2);
 
-        assertEquals(comparisonResult, comparator.compare(entry1, entry2), errorMessage);
+        assertEquals(comparisonResult, comparator.compare(entry1, entry2), message);
     }
 
-    private static Stream<Arguments> provideArgumentsForNumericalComparison() {
+    private static Stream<Arguments> compareNumericalValues() {
         return Stream.of(
-                Arguments.of(0, "123456", "123456", "IDs are lexicographically not equal [1]"),
-                Arguments.of(1, "234567", "123456", "234567 is lexicographically smaller than 123456"),
-                Arguments.of(1, "abc##z", "123456", "abc##z is lexicographically smaller than 123456 "),
-                Arguments.of(0, "", "", "IDs are lexicographically not equal [2]"),
-                Arguments.of(1, "", "123456", "No ID is lexicographically smaller than 123456"),
-                Arguments.of(-1, "123456", "", "123456 is lexicographically greater than no ID")
+                Arguments.of(0, "123456", "123456", "IDs should be lexicographically equal"),
+                Arguments.of(1, "234567", "123456", "234567 should be lexicographically greater than 123456"),
+                Arguments.of(1, "abc##z", "123456", "abc##z should be lexicographically greater than 123456 "),
+                Arguments.of(0, "", "", "Empty IDs should be lexicographically equal"),
+                Arguments.of(-1, "", "123456", "No ID should be lexicographically smaller than 123456"),
+                Arguments.of(1, "123456", "", "123456 should be lexicographically greater than no ID")
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource
+    public void nullTests(int comparisonResult, String firstValue, String secondValue) {
+        FieldComparator comparator = new FieldComparator(StandardField.TITLE);
+
+        BibEntry entry1 = new BibEntry();
+        if (firstValue != null) {
+            entry1.setField(StandardField.TITLE, firstValue);
+        }
+
+        BibEntry entry2 = new BibEntry();
+        if (secondValue != null) {
+            entry2.setField(StandardField.TITLE, secondValue);
+        }
+
+        assertEquals(comparisonResult, comparator.compare(entry1, entry2));
+    }
+
+    private static Stream<Arguments> nullTests() {
+        return Stream.of(
+                Arguments.of(0, null, null),
+                Arguments.of(0, "value", "value"),
+                Arguments.of(-1, null, "value"),
+                Arguments.of(1, "value", null)
         );
     }
 }
diff --git a/src/test/java/org/jabref/logic/citationkeypattern/AbstractCitationKeyPatternTest.java b/src/test/java/org/jabref/logic/citationkeypattern/AbstractCitationKeyPatternTest.java
index 7523223e698..a7774903e1c 100644
--- a/src/test/java/org/jabref/logic/citationkeypattern/AbstractCitationKeyPatternTest.java
+++ b/src/test/java/org/jabref/logic/citationkeypattern/AbstractCitationKeyPatternTest.java
@@ -3,17 +3,20 @@
 import java.util.List;
 
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Execution;
+import org.junit.jupiter.api.parallel.ExecutionMode;
 import org.mockito.Mockito;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.mock;
 
+@Execution(ExecutionMode.CONCURRENT)
 class AbstractCitationKeyPatternTest {
-    
+
     @Test
     void AbstractCitationKeyPatternParse() throws Exception {
         AbstractCitationKeyPattern pattern = mock(AbstractCitationKeyPattern.class, Mockito.CALLS_REAL_METHODS);
-        
+
         pattern.setDefaultValue("[field1]spacer1[field2]spacer2[field3]");
         List<String> expectedPattern = List.of(
             "[field1]spacer1[field2]spacer2[field3]",
@@ -35,7 +38,7 @@ void AbstractCitationKeyPatternParse() throws Exception {
     @Test
     void AbstractCitationKeyPatternParseEmptySpacer() throws Exception {
         AbstractCitationKeyPattern pattern = mock(AbstractCitationKeyPattern.class, Mockito.CALLS_REAL_METHODS);
-        
+
         pattern.setDefaultValue("[field1][field2]spacer2[field3]");
         List<String> expectedPattern = List.of(
             "[field1][field2]spacer2[field3]",
diff --git a/src/test/java/org/jabref/logic/citationkeypattern/BracketedPatternTest.java b/src/test/java/org/jabref/logic/citationkeypattern/BracketedPatternTest.java
index 5d84f2c45a1..6959dde3ce0 100644
--- a/src/test/java/org/jabref/logic/citationkeypattern/BracketedPatternTest.java
+++ b/src/test/java/org/jabref/logic/citationkeypattern/BracketedPatternTest.java
@@ -3,6 +3,7 @@
 import java.util.stream.Stream;
 
 import org.jabref.model.database.BibDatabase;
+import org.jabref.model.entry.AuthorList;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.BibtexString;
 import org.jabref.model.entry.field.StandardField;
@@ -10,14 +11,21 @@
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Execution;
+import org.junit.jupiter.api.parallel.ExecutionMode;
 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 static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
+/**
+ * Tests based on a BibEntry are contained in {@link CitationKeyGeneratorTest}
+ */
+@Execution(ExecutionMode.CONCURRENT)
 class BracketedPatternTest {
 
     private BibEntry bibentry;
@@ -48,6 +56,265 @@ void setUp() {
         database.insertEntry(dbentry);
     }
 
+    static Stream<Arguments> allAuthors() {
+        return Stream.of(
+                Arguments.of("ArtemenkoEtAl", "Alexander Artemenko and others"),
+                Arguments.of("AachenEtAl", "Aachen and others"),
+                Arguments.of("AachenBerlinEtAl", "Aachen and Berlin and others"),
+                Arguments.of("AachenBerlinChemnitzEtAl", "Aachen and Berlin and Chemnitz and others"),
+                Arguments.of("AachenBerlinChemnitzDüsseldorf", "Aachen and Berlin and Chemnitz and Düsseldorf"),
+                Arguments.of("AachenBerlinChemnitzDüsseldorfEtAl", "Aachen and Berlin and Chemnitz and Düsseldorf and others"),
+                Arguments.of("AachenBerlinChemnitzDüsseldorfEssen", "Aachen and Berlin and Chemnitz and Düsseldorf and Essen"),
+                Arguments.of("AachenBerlinChemnitzDüsseldorfEssenEtAl", "Aachen and Berlin and Chemnitz and Düsseldorf and Essen and others"));
+    }
+
+    @ParameterizedTest
+    @MethodSource
+    void allAuthors(String expected, AuthorList list) {
+        assertEquals(expected, BracketedPattern.allAuthors(list));
+    }
+
+    static Stream<Arguments> authorsAlpha() {
+        return Stream.of(
+                Arguments.of("A+", "Alexander Artemenko and others"),
+                Arguments.of("A+", "Aachen and others"),
+                Arguments.of("AB+", "Aachen and Berlin and others"),
+                Arguments.of("ABC+", "Aachen and Berlin and Chemnitz and others"),
+                Arguments.of("ABCD", "Aachen and Berlin and Chemnitz and Düsseldorf"),
+                Arguments.of("ABC+", "Aachen and Berlin and Chemnitz and Düsseldorf and others"),
+                Arguments.of("ABC+", "Aachen and Berlin and Chemnitz and Düsseldorf and Essen"),
+                Arguments.of("ABC+", "Aachen and Berlin and Chemnitz and Düsseldorf and Essen and others"));
+    }
+
+    @ParameterizedTest
+    @MethodSource
+    void authorsAlpha(String expected, AuthorList list) {
+        assertEquals(expected, BracketedPattern.authorsAlpha(list));
+    }
+
+    /**
+     * Tests [authorIni]
+     */
+    static Stream<Arguments> oneAuthorPlusInitials() {
+        return Stream.of(
+                Arguments.of("Aalst", "Wil van der Aalst"),
+                Arguments.of("AalstL", "Wil van der Aalst and Tammo van Lessen"),
+                Arguments.of("Newto", "I. Newton"),
+                Arguments.of("NewtoM", "I. Newton and J. Maxwell"),
+                Arguments.of("NewtoME", "I. Newton and J. Maxwell and A. Einstein"),
+                Arguments.of("NewtoMEB", "I. Newton and J. Maxwell and A. Einstein and N. Bohr"),
+                Arguments.of("NewtoMEBU", "I. Newton and J. Maxwell and A. Einstein and N. Bohr and Harry Unknown"),
+                Arguments.of("Aache+", "Aachen and others"),
+                Arguments.of("AacheB", "Aachen and Berlin"),
+                Arguments.of("AacheB+", "Aachen and Berlin and others"),
+                Arguments.of("AacheBC", "Aachen and Berlin and Chemnitz"),
+                Arguments.of("AacheBC+", "Aachen and Berlin and Chemnitz and others"),
+                Arguments.of("AacheBCD", "Aachen and Berlin and Chemnitz and Düsseldorf"),
+                Arguments.of("AacheBCD+", "Aachen and Berlin and Chemnitz and Düsseldorf and others"),
+                Arguments.of("AacheBCDE", "Aachen and Berlin and Chemnitz and Düsseldorf and Essen"),
+                Arguments.of("AacheBCDE+", "Aachen and Berlin and Chemnitz and Düsseldorf and Essen and others"));
+    }
+
+    @ParameterizedTest
+    @MethodSource
+    void oneAuthorPlusInitials(String expected, AuthorList list) {
+        assertEquals(expected, BracketedPattern.oneAuthorPlusInitials(list));
+    }
+
+    static Stream<Arguments> authShort() {
+        return Stream.of(
+                Arguments.of("Newton", "Isaac Newton"),
+                Arguments.of("NM", "Isaac Newton and James Maxwell"),
+                Arguments.of("NME", "Isaac Newton and James Maxwell and Albert Einstein"),
+                Arguments.of("NME+", "Isaac Newton and James Maxwell and Albert Einstein and N. Bohr"),
+                Arguments.of("Aachen", "Aachen"),
+                Arguments.of("A+", "Aachen and others"),
+                Arguments.of("AB", "Aachen and Berlin"),
+                Arguments.of("AB+", "Aachen and Berlin and others"),
+                Arguments.of("ABC", "Aachen and Berlin and Chemnitz"),
+                Arguments.of("ABC+", "Aachen and Berlin and Chemnitz and others"),
+                Arguments.of("ABC+", "Aachen and Berlin and Chemnitz and Düsseldorf"),
+                Arguments.of("ABC+", "Aachen and Berlin and Chemnitz and Düsseldorf and others"),
+                Arguments.of("ABC+", "Aachen and Berlin and Chemnitz and Düsseldorf and Essen"),
+                Arguments.of("ABC+", "Aachen and Berlin and Chemnitz and Düsseldorf and Essen and others"));
+    }
+
+    @ParameterizedTest
+    @MethodSource
+    void authIni1(String expected, AuthorList list) {
+        assertEquals(expected, BracketedPattern.authIniN(list, 1));
+    }
+
+    static Stream<Arguments> authIni1() {
+        return Stream.of(
+                Arguments.of("N", "Isaac Newton"),
+                Arguments.of("N", "Isaac Newton and James Maxwell"),
+                Arguments.of("N", "Isaac Newton and James Maxwell and Albert Einstein"),
+                Arguments.of("N", "Isaac Newton and James Maxwell and Albert Einstein and N. Bohr"),
+                Arguments.of("A", "Aachen"),
+                Arguments.of("A", "Aachen and others"),
+                Arguments.of("A", "Aachen and Berlin"),
+                Arguments.of("A", "Aachen and Berlin and others"),
+                Arguments.of("A", "Aachen and Berlin and Chemnitz"),
+                Arguments.of("A", "Aachen and Berlin and Chemnitz and others"),
+                Arguments.of("A", "Aachen and Berlin and Chemnitz and Düsseldorf"),
+                Arguments.of("A", "Aachen and Berlin and Chemnitz and Düsseldorf and others"),
+                Arguments.of("A", "Aachen and Berlin and Chemnitz and Düsseldorf and Essen"),
+                Arguments.of("A", "Aachen and Berlin and Chemnitz and Düsseldorf and Essen and others"));
+    }
+
+    @ParameterizedTest
+    @MethodSource
+    void authIni2(String expected, AuthorList list) {
+        assertEquals(expected, BracketedPattern.authIniN(list, 2));
+    }
+
+    static Stream<Arguments> authIni2() {
+        return Stream.of(
+                Arguments.of("Ne", "Isaac Newton"),
+                Arguments.of("NM", "Isaac Newton and James Maxwell"),
+                Arguments.of("N+", "Isaac Newton and James Maxwell and Albert Einstein"),
+                Arguments.of("N+", "Isaac Newton and James Maxwell and Albert Einstein and N. Bohr"),
+                Arguments.of("Aa", "Aachen"),
+                Arguments.of("A+", "Aachen and others"),
+                Arguments.of("AB", "Aachen and Berlin"),
+                Arguments.of("A+", "Aachen and Berlin and others"),
+                Arguments.of("A+", "Aachen and Berlin and Chemnitz"),
+                Arguments.of("D+", "John Doe and Donald Smith and Will Wonder"),
+                Arguments.of("A+", "Aachen and Berlin and Chemnitz and others"),
+                Arguments.of("A+", "Aachen and Berlin and Chemnitz and Düsseldorf"),
+                Arguments.of("A+", "Aachen and Berlin and Chemnitz and Düsseldorf and others"),
+                Arguments.of("A+", "Aachen and Berlin and Chemnitz and Düsseldorf and Essen"),
+                Arguments.of("A+", "Aachen and Berlin and Chemnitz and Düsseldorf and Essen and others"));
+    }
+
+    @ParameterizedTest
+    @MethodSource
+    void authIni4(String expected, AuthorList list) {
+        assertEquals(expected, BracketedPattern.authIniN(list, 4));
+    }
+
+    static Stream<Arguments> authIni4() {
+        return Stream.of(
+                Arguments.of("Newt", "Isaac Newton"),
+                Arguments.of("NeMa", "Isaac Newton and James Maxwell"),
+                Arguments.of("NeME", "Isaac Newton and James Maxwell and Albert Einstein"),
+                Arguments.of("NMEB", "Isaac Newton and James Maxwell and Albert Einstein and N. Bohr"),
+                Arguments.of("Aach", "Aachen"),
+                Arguments.of("Aac+", "Aachen and others"),
+                Arguments.of("AaBe", "Aachen and Berlin"),
+                Arguments.of("AaB+", "Aachen and Berlin and others"),
+                Arguments.of("AaBC", "Aachen and Berlin and Chemnitz"),
+                Arguments.of("ABC+", "Aachen and Berlin and Chemnitz and others"),
+                Arguments.of("ABCD", "Aachen and Berlin and Chemnitz and Düsseldorf"),
+                Arguments.of("ABC+", "Aachen and Berlin and Chemnitz and Düsseldorf and others"),
+                Arguments.of("ABC+", "Aachen and Berlin and Chemnitz and Düsseldorf and Essen"),
+                Arguments.of("ABC+", "Aachen and Berlin and Chemnitz and Düsseldorf and Essen and others"));
+    }
+
+    @ParameterizedTest
+    @MethodSource
+    void authEtAlDotDotEal(String expected, AuthorList list) {
+        assertEquals(expected, BracketedPattern.authEtal(list, ".", ".etal"));
+    }
+
+    static Stream<Arguments> authEtAlDotDotEal() {
+        return Stream.of(
+                Arguments.of("Newton", "Isaac Newton"),
+                Arguments.of("Newton.Maxwell", "Isaac Newton and James Maxwell"),
+                Arguments.of("Newton.etal", "Isaac Newton and James Maxwell and Albert Einstein"),
+                Arguments.of("Newton.etal", "Isaac Newton and James Maxwell and Albert Einstein and N. Bohr"),
+                Arguments.of("Aachen", "Aachen"),
+                Arguments.of("Aachen.etal", "Aachen and others"),
+                Arguments.of("Aachen.Berlin", "Aachen and Berlin"),
+                Arguments.of("Aachen.etal", "Aachen and Berlin and others"),
+                Arguments.of("Aachen.etal", "Aachen and Berlin and Chemnitz"),
+                Arguments.of("Aachen.etal", "Aachen and Berlin and Chemnitz and others"),
+                Arguments.of("Aachen.etal", "Aachen and Berlin and Chemnitz and Düsseldorf"),
+                Arguments.of("Aachen.etal", "Aachen and Berlin and Chemnitz and Düsseldorf and others"),
+                Arguments.of("Aachen.etal", "Aachen and Berlin and Chemnitz and Düsseldorf and Essen"),
+                Arguments.of("Aachen.etal", "Aachen and Berlin and Chemnitz and Düsseldorf and Essen and others"));
+    }
+
+    @ParameterizedTest
+    @MethodSource
+    void authAuthEa(String expected, AuthorList list) {
+        assertEquals(expected, BracketedPattern.authAuthEa(list));
+    }
+
+    static Stream<Arguments> authAuthEa() {
+        return Stream.of(
+                Arguments.of("Newton", "Isaac Newton"),
+                Arguments.of("Newton.Maxwell", "Isaac Newton and James Maxwell"),
+                Arguments.of("Newton.Maxwell.ea", "Isaac Newton and James Maxwell and Albert Einstein"),
+                Arguments.of("Newton.Maxwell.ea", "Isaac Newton and James Maxwell and Albert Einstein and N. Bohr"),
+                Arguments.of("Aachen", "Aachen"),
+                Arguments.of("Aachen.ea", "Aachen and others"),
+                Arguments.of("Aachen.Berlin", "Aachen and Berlin"),
+                Arguments.of("Aachen.Berlin.ea", "Aachen and Berlin and others"),
+                Arguments.of("Aachen.Berlin.ea", "Aachen and Berlin and Chemnitz"),
+                Arguments.of("Aachen.Berlin.ea", "Aachen and Berlin and Chemnitz and others"),
+                Arguments.of("Aachen.Berlin.ea", "Aachen and Berlin and Chemnitz and Düsseldorf"),
+                Arguments.of("Aachen.Berlin.ea", "Aachen and Berlin and Chemnitz and Düsseldorf and others"),
+                Arguments.of("Aachen.Berlin.ea", "Aachen and Berlin and Chemnitz and Düsseldorf and Essen"),
+                Arguments.of("Aachen.Berlin.ea", "Aachen and Berlin and Chemnitz and Düsseldorf and Essen and others"));
+    }
+
+    @ParameterizedTest
+    @MethodSource
+    void authShort(String expected, AuthorList list) {
+        assertEquals(expected, BracketedPattern.authShort(list));
+    }
+
+    @ParameterizedTest
+    @CsvSource({
+            "'Newton', '[auth]', 'Isaac Newton'",
+            "'Newton', '[authFirstFull]', 'Isaac Newton'",
+            "'I', '[authForeIni]', 'Isaac Newton'",
+            "'Newton', '[auth.etal]', 'Isaac Newton'",
+            "'Newton', '[authEtAl]', 'Isaac Newton'",
+            "'Newton', '[auth.auth.ea]', 'Isaac Newton'",
+            "'Newton', '[authors]', 'Isaac Newton'",
+            "'Newton', '[authors2]', 'Isaac Newton'",
+            "'Ne', '[authIni2]', 'Isaac Newton'",
+            "'New', '[auth3]', 'Isaac Newton'",
+            "'New', '[auth3_1]', 'Isaac Newton'",
+            "'Newton', '[authshort]', 'Isaac Newton'",
+            "'New', '[authorsAlpha]', 'Isaac Newton'",
+            "'Newton', '[authorLast]', 'Isaac Newton'",
+            "'I', '[authorLastForeIni]', 'Isaac Newton'",
+
+            "'Agency', '[authors]', 'European Union Aviation Safety Agency'",
+            "'EUASA', '[authors]', '{European Union Aviation Safety Agency}'"
+    })
+    void testAuthorFieldMarkers(String expectedCitationKey, String pattern, String author) {
+        BibEntry bibEntry = new BibEntry().withField(StandardField.AUTHOR, author);
+        BracketedPattern bracketedPattern = new BracketedPattern(pattern);
+        assertEquals(expectedCitationKey, bracketedPattern.expand(bibEntry));
+    }
+
+    private static Stream<Arguments> expandBracketsWithFallback() {
+        return Stream.of(
+                Arguments.of("auth", "[title:(auth)]"),
+                Arguments.of("auth2021", "[title:(auth[YEAR])]"),
+                Arguments.of("not2021", "[title:(not[YEAR])]"),
+                Arguments.of("", "[title:([YEAR)]"),
+                Arguments.of(")]", "[title:(YEAR])]"),
+                Arguments.of("2105.02891", "[title:([EPRINT:([YEAR])])]"),
+                Arguments.of("2021", "[title:([auth:([YEAR])])]")
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource()
+    void expandBracketsWithFallback(String expandResult, String pattern) {
+        BibEntry bibEntry = new BibEntry()
+                .withField(StandardField.YEAR, "2021").withField(StandardField.EPRINT, "2105.02891");
+        BracketedPattern bracketedPattern = new BracketedPattern(pattern);
+
+        assertEquals(expandResult, bracketedPattern.expand(bibEntry));
+    }
+
     @Test
     void bibentryExpansionTest() {
         BracketedPattern pattern = new BracketedPattern("[year]_[auth]_[firstpage]");
@@ -348,18 +615,19 @@ void expandBracketsUnmodifiedStringFromLongLastPageNumber() {
 
     @Test
     void expandBracketsWithTestCasesFromRegExpBasedFileFinder() {
-        BibEntry entry = new BibEntry(StandardEntryType.Article).withCitationKey("HipKro03");
-        entry.setField(StandardField.AUTHOR, "Eric von Hippel and Georg von Krogh");
-        entry.setField(StandardField.TITLE, "Open Source Software and the \"Private-Collective\" Innovation Model: Issues for Organization Science");
-        entry.setField(StandardField.JOURNAL, "Organization Science");
-        entry.setField(StandardField.YEAR, "2003");
-        entry.setField(StandardField.VOLUME, "14");
-        entry.setField(StandardField.PAGES, "209--223");
-        entry.setField(StandardField.NUMBER, "2");
-        entry.setField(StandardField.ADDRESS, "Institute for Operations Research and the Management Sciences (INFORMS), Linthicum, Maryland, USA");
-        entry.setField(StandardField.DOI, "http://dx.doi.org/10.1287/orsc.14.2.209.14992");
-        entry.setField(StandardField.ISSN, "1526-5455");
-        entry.setField(StandardField.PUBLISHER, "INFORMS");
+        BibEntry entry = new BibEntry(StandardEntryType.Article)
+                .withCitationKey("HipKro03")
+                .withField(StandardField.AUTHOR, "Eric von Hippel and Georg von Krogh")
+                .withField(StandardField.TITLE, "Open Source Software and the \"Private-Collective\" Innovation Model: Issues for Organization Science")
+                .withField(StandardField.JOURNAL, "Organization Science")
+                .withField(StandardField.YEAR, "2003")
+                .withField(StandardField.VOLUME, "14")
+                .withField(StandardField.PAGES, "209--223")
+                .withField(StandardField.NUMBER, "2")
+                .withField(StandardField.ADDRESS, "Institute for Operations Research and the Management Sciences (INFORMS), Linthicum, Maryland, USA")
+                .withField(StandardField.DOI, "http://dx.doi.org/10.1287/orsc.14.2.209.14992")
+                .withField(StandardField.ISSN, "1526-5455")
+                .withField(StandardField.PUBLISHER, "INFORMS");
 
         BibDatabase database = new BibDatabase();
         database.insertEntry(entry);
@@ -394,24 +662,25 @@ void expandBracketsWithoutProtectiveBracesUsingUnprotectTermsModifier() {
     }
 
     @ParameterizedTest
-    @MethodSource("provideArgumentsForFallback")
-    void expandBracketsWithFallback(String expandResult, String pattern) {
-        BibEntry bibEntry = new BibEntry()
-                .withField(StandardField.YEAR, "2021").withField(StandardField.EPRINT, "2105.02891");
+    @CsvSource({
+            "'Newton', '[edtr]', 'Isaac Newton'",
+            "'I', '[edtrForeIni]', 'Isaac Newton'",
+            "'Newton', '[editors]', 'Isaac Newton'",
+            "'Ne', '[edtrIni2]', 'Isaac Newton'",
+            "'New', '[edtr3]', 'Isaac Newton'",
+            "'Newton', '[edtr7]', 'Isaac Newton'",
+            "'New', '[edtr3_1]', 'Isaac Newton'",
+            "'Newton.Maxwell', '[edtr.edtr.ea]', 'Isaac Newton and James Maxwell'",
+            "'Newton', '[edtrshort]', 'Isaac Newton'",
+            "'Newton', '[editorLast]', 'Isaac Newton'",
+            "'I', '[editorLastForeIni]', 'Isaac Newton'",
+
+            "'EUASA', '[editors]', '{European Union Aviation Safety Agency}'"
+    })
+
+    void testEditorFieldMarkers(String expectedCitationKey, String pattern, String editor) {
+        BibEntry bibEntry = new BibEntry().withField(StandardField.EDITOR, editor);
         BracketedPattern bracketedPattern = new BracketedPattern(pattern);
-
-        assertEquals(expandResult, bracketedPattern.expand(bibEntry));
-    }
-
-    private static Stream<Arguments> provideArgumentsForFallback() {
-        return Stream.of(
-                Arguments.of("auth", "[title:(auth)]"),
-                Arguments.of("auth2021", "[title:(auth[YEAR])]"),
-                Arguments.of("not2021", "[title:(not[YEAR])]"),
-                Arguments.of("", "[title:([YEAR)]"),
-                Arguments.of(")]", "[title:(YEAR])]"),
-                Arguments.of("2105.02891", "[title:([EPRINT:([YEAR])])]"),
-                Arguments.of("2021", "[title:([auth:([YEAR])])]")
-        );
+        assertEquals(expectedCitationKey, bracketedPattern.expand(bibEntry));
     }
 }
diff --git a/src/test/java/org/jabref/logic/citationkeypattern/CitationKeyGeneratorTest.java b/src/test/java/org/jabref/logic/citationkeypattern/CitationKeyGeneratorTest.java
index bf021584be2..37a2f0c4a05 100644
--- a/src/test/java/org/jabref/logic/citationkeypattern/CitationKeyGeneratorTest.java
+++ b/src/test/java/org/jabref/logic/citationkeypattern/CitationKeyGeneratorTest.java
@@ -1,6 +1,7 @@
 package org.jabref.logic.citationkeypattern;
 
 import java.util.Optional;
+import java.util.stream.Stream;
 
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.ParseException;
@@ -8,11 +9,13 @@
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
-import org.jabref.model.util.DummyFileUpdateMonitor;
-import org.jabref.model.util.FileUpdateMonitor;
 
 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.jabref.logic.citationkeypattern.CitationKeyGenerator.DEFAULT_UNWANTED_CHARACTERS;
@@ -20,15 +23,26 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.Mockito.mock;
 
+/**
+ * Tests whole citation key patterns such as <code>[authorsAlpha][year]</code>.
+ * The concrete patterns such as <code>authorsAlpha</code> should better be tested at {@link BracketedPatternTest}.
+ *
+ * Concurrent execution leads to issues on GitHub actions.
+ */
 class CitationKeyGeneratorTest {
 
     private static final BibEntry AUTHOR_EMPTY = createABibEntryAuthor("");
 
     private static final String AUTHOR_STRING_FIRSTNAME_FULL_LASTNAME_FULL_COUNT_1 = "Isaac Newton";
-    private static final BibEntry AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_COUNT_1 = createABibEntryAuthor("Isaac Newton");
+    private static final BibEntry AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_COUNT_1 = createABibEntryAuthor(AUTHOR_STRING_FIRSTNAME_FULL_LASTNAME_FULL_COUNT_1);
+
     private static final BibEntry AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_COUNT_2 = createABibEntryAuthor("Isaac Newton and James Maxwell");
+
     private static final String AUTHOR_STRING_FIRSTNAME_FULL_LASTNAME_FULL_COUNT_3 = "Isaac Newton and James Maxwell and Albert Einstein";
-    private static final BibEntry AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_COUNT_3 = createABibEntryAuthor("Isaac Newton and James Maxwell and Albert Einstein");
+    private static final BibEntry AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_COUNT_3 = createABibEntryAuthor(AUTHOR_STRING_FIRSTNAME_FULL_LASTNAME_FULL_COUNT_3);
+
+    private static final String AUTHOR_STRING_FIRSTNAME_FULL_LASTNAME_FULL_AND_OTHERS_COUNT_3 = "Isaac Newton and James Maxwell and others";
+    private static final BibEntry AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_AND_OTHERS_COUNT_3 = createABibEntryAuthor(AUTHOR_STRING_FIRSTNAME_FULL_LASTNAME_FULL_AND_OTHERS_COUNT_3);
 
     private static final BibEntry AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_WITH_VAN_COUNT_1 = createABibEntryAuthor("Wil van der Aalst");
     private static final BibEntry AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_WITH_VAN_COUNT_2 = createABibEntryAuthor("Wil van der Aalst and Tammo van Lessen");
@@ -63,7 +77,6 @@ class CitationKeyGeneratorTest {
     private static final String AUTHAUTHEA = "[auth.auth.ea]";
 
     private static ImportFormatPreferences importFormatPreferences;
-    private final FileUpdateMonitor fileMonitor = new DummyFileUpdateMonitor();
 
     @BeforeEach
     void setUp() {
@@ -98,7 +111,7 @@ static String generateKey(BibEntry entry, String pattern, BibDatabase database)
     @Test
     void testAndInAuthorName() throws ParseException {
         Optional<BibEntry> entry0 = BibtexParser.singleFromString("@ARTICLE{kohn, author={Simon Holland}}",
-                importFormatPreferences, fileMonitor);
+                importFormatPreferences);
         assertEquals("Holland",
                 CitationKeyGenerator.cleanKey(generateKey(entry0.orElse(null), "[auth]",
                         new BibDatabase()), DEFAULT_UNWANTED_CHARACTERS));
@@ -122,7 +135,7 @@ void testCrossrefAndInAuthorNames() {
     @Test
     void testAndAuthorNames() throws ParseException {
         String bibtexString = "@ARTICLE{whatevery, author={Mari D. Herland and Mona-Iren Hauge and Ingeborg M. Helgeland}}";
-        Optional<BibEntry> entry = BibtexParser.singleFromString(bibtexString, importFormatPreferences, fileMonitor);
+        Optional<BibEntry> entry = BibtexParser.singleFromString(bibtexString, importFormatPreferences);
         assertEquals("HerlandHaugeHelgeland",
                 CitationKeyGenerator.cleanKey(generateKey(entry.orElse(null), "[authors3]",
                         new BibDatabase()), DEFAULT_UNWANTED_CHARACTERS));
@@ -147,208 +160,50 @@ void testCrossrefAndAuthorNames() {
     @Test
     void testSpecialLatexCharacterInAuthorName() throws ParseException {
         Optional<BibEntry> entry = BibtexParser.singleFromString(
-                "@ARTICLE{kohn, author={Simon Popovi\\v{c}ov\\'{a}}}", importFormatPreferences, fileMonitor);
+                "@ARTICLE{kohn, author={Simon Popovi\\v{c}ov\\'{a}}}", importFormatPreferences);
         assertEquals("Popovicova",
                 CitationKeyGenerator.cleanKey(generateKey(entry.orElse(null), "[auth]",
                         new BibDatabase()), DEFAULT_UNWANTED_CHARACTERS));
     }
 
-    /**
-     * Test for https://sourceforge.net/forum/message.php?msg_id=4498555 Test the Labelmaker and all kind of accents Á á
-     * Ć ć É é Í í Ĺ ĺ Ń ń Ó ó Ŕ ŕ Ś ś Ú ú Ý ý Ź ź
-     */
-    @Test
-    void testMakeLabelAndCheckLegalKeys() throws ParseException {
-
-        Optional<BibEntry> entry0 = BibtexParser.singleFromString(
-                "@ARTICLE{kohn, author={Andreas Köning}, year={2000}}", importFormatPreferences, fileMonitor);
-        assertEquals("Koe",
-                CitationKeyGenerator.cleanKey(generateKey(entry0.orElse(null), "[auth3]",
-                        new BibDatabase()), DEFAULT_UNWANTED_CHARACTERS));
-
-        entry0 = BibtexParser.singleFromString("@ARTICLE{kohn, author={Andreas Áöning}, year={2000}}",
-                importFormatPreferences, fileMonitor);
-        assertEquals("Aoe",
-                CitationKeyGenerator.cleanKey(generateKey(entry0.orElse(null), "[auth3]",
-                        new BibDatabase()), DEFAULT_UNWANTED_CHARACTERS));
-
-        entry0 = BibtexParser.singleFromString("@ARTICLE{kohn, author={Andreas Éöning}, year={2000}}",
-                importFormatPreferences, fileMonitor);
-        assertEquals("Eoe",
-                CitationKeyGenerator.cleanKey(generateKey(entry0.orElse(null), "[auth3]",
-                        new BibDatabase()), DEFAULT_UNWANTED_CHARACTERS));
-
-        entry0 = BibtexParser.singleFromString("@ARTICLE{kohn, author={Andreas Íöning}, year={2000}}",
-                importFormatPreferences, fileMonitor);
-        assertEquals("Ioe",
-                CitationKeyGenerator.cleanKey(generateKey(entry0.orElse(null), "[auth3]",
-                        new BibDatabase()), DEFAULT_UNWANTED_CHARACTERS));
-
-        entry0 = BibtexParser.singleFromString("@ARTICLE{kohn, author={Andreas Ĺöning}, year={2000}}",
-                importFormatPreferences, fileMonitor);
-        assertEquals("Loe",
-                CitationKeyGenerator.cleanKey(generateKey(entry0.orElse(null), "[auth3]",
-                        new BibDatabase()), DEFAULT_UNWANTED_CHARACTERS));
-
-        entry0 = BibtexParser.singleFromString("@ARTICLE{kohn, author={Andreas Ńöning}, year={2000}}",
-                importFormatPreferences, fileMonitor);
-        assertEquals("Noe",
-                CitationKeyGenerator.cleanKey(generateKey(entry0.orElse(null), "[auth3]",
-                        new BibDatabase()), DEFAULT_UNWANTED_CHARACTERS));
-
-        entry0 = BibtexParser.singleFromString("@ARTICLE{kohn, author={Andreas Óöning}, year={2000}}",
-                importFormatPreferences, fileMonitor);
-        assertEquals("Ooe",
-                CitationKeyGenerator.cleanKey(generateKey(entry0.orElse(null), "[auth3]",
-                        new BibDatabase()), DEFAULT_UNWANTED_CHARACTERS));
-
-        entry0 = BibtexParser.singleFromString("@ARTICLE{kohn, author={Andreas Ŕöning}, year={2000}}",
-                importFormatPreferences, fileMonitor);
-        assertEquals("Roe",
-                CitationKeyGenerator.cleanKey(generateKey(entry0.orElse(null), "[auth3]",
-                        new BibDatabase()), DEFAULT_UNWANTED_CHARACTERS));
-
-        entry0 = BibtexParser.singleFromString("@ARTICLE{kohn, author={Andreas Śöning}, year={2000}}",
-                importFormatPreferences, fileMonitor);
-        assertEquals("Soe",
-                CitationKeyGenerator.cleanKey(generateKey(entry0.orElse(null), "[auth3]",
-                        new BibDatabase()), DEFAULT_UNWANTED_CHARACTERS));
-
-        entry0 = BibtexParser.singleFromString("@ARTICLE{kohn, author={Andreas Úöning}, year={2000}}",
-                importFormatPreferences, fileMonitor);
-        assertEquals("Uoe",
-                CitationKeyGenerator.cleanKey(generateKey(entry0.orElse(null), "[auth3]",
-                        new BibDatabase()), DEFAULT_UNWANTED_CHARACTERS));
-
-        entry0 = BibtexParser.singleFromString("@ARTICLE{kohn, author={Andreas Ýöning}, year={2000}}",
-                importFormatPreferences, fileMonitor);
-        assertEquals("Yoe",
-                CitationKeyGenerator.cleanKey(generateKey(entry0.orElse(null), "[auth3]",
-                        new BibDatabase()), DEFAULT_UNWANTED_CHARACTERS));
-
-        entry0 = BibtexParser.singleFromString("@ARTICLE{kohn, author={Andreas Źöning}, year={2000}}",
-                importFormatPreferences, fileMonitor);
-        assertEquals("Zoe",
-                CitationKeyGenerator.cleanKey(generateKey(entry0.orElse(null), "[auth3]",
-                        new BibDatabase()), DEFAULT_UNWANTED_CHARACTERS));
-    }
-
-    /**
-     * Test the Labelmaker and with accent grave Chars to test: "ÀÈÌÒÙ";
-     */
-    @Test
-    void testMakeLabelAndCheckLegalKeysAccentGrave() throws ParseException {
-        Optional<BibEntry> entry0 = BibtexParser.singleFromString("@ARTICLE{kohn, author={Andreas Àöning}, year={2000}}",
-                importFormatPreferences, fileMonitor);
-        assertEquals("Aoe",
-                CitationKeyGenerator.cleanKey(generateKey(entry0.orElse(null), "[auth3]",
-                        new BibDatabase()), DEFAULT_UNWANTED_CHARACTERS));
-
-        entry0 = BibtexParser.singleFromString("@ARTICLE{kohn, author={Andreas Èöning}, year={2000}}",
-                importFormatPreferences, fileMonitor);
-        assertEquals("Eoe",
-                CitationKeyGenerator.cleanKey(generateKey(entry0.orElse(null), "[auth3]",
-                        new BibDatabase()), DEFAULT_UNWANTED_CHARACTERS));
-
-        entry0 = BibtexParser.singleFromString("@ARTICLE{kohn, author={Andreas Ìöning}, year={2000}}",
-                importFormatPreferences, fileMonitor);
-        assertEquals("Ioe",
-                CitationKeyGenerator.cleanKey(generateKey(entry0.orElse(null), "[auth3]",
-                        new BibDatabase()), DEFAULT_UNWANTED_CHARACTERS));
-
-        entry0 = BibtexParser.singleFromString("@ARTICLE{kohn, author={Andreas Òöning}, year={2000}}",
-                importFormatPreferences, fileMonitor);
-        assertEquals("Ooe",
-                CitationKeyGenerator.cleanKey(generateKey(entry0.orElse(null), "[auth3]",
-                        new BibDatabase()), DEFAULT_UNWANTED_CHARACTERS));
-
-        entry0 = BibtexParser.singleFromString("@ARTICLE{kohn, author={Andreas Ùöning}, year={2000}}",
-                importFormatPreferences, fileMonitor);
-        assertEquals("Uoe",
-                CitationKeyGenerator.cleanKey(generateKey(entry0.orElse(null), "[auth3]",
-                        new BibDatabase()), DEFAULT_UNWANTED_CHARACTERS));
-
-        entry0 = BibtexParser.singleFromString("@ARTICLE{kohn, author={Oraib Al-Ketan}, year={2000}}",
-                importFormatPreferences, fileMonitor);
-        assertEquals("AlK",
-                CitationKeyGenerator.cleanKey(generateKey(entry0.orElse(null), "[auth3]",
-                        new BibDatabase()), DEFAULT_UNWANTED_CHARACTERS));
-
-        entry0 = BibtexParser.singleFromString("@ARTICLE{kohn, author={Andrés D'Alessandro}, year={2000}}",
-                importFormatPreferences, fileMonitor);
-        assertEquals("DAl",
-                CitationKeyGenerator.cleanKey(generateKey(entry0.orElse(null), "[auth3]",
-                        new BibDatabase()), DEFAULT_UNWANTED_CHARACTERS));
-
-        entry0 = BibtexParser.singleFromString("@ARTICLE{kohn, author={Andrés Aʹrnold}, year={2000}}",
-                importFormatPreferences, fileMonitor);
-        assertEquals("Arn",
-                CitationKeyGenerator.cleanKey(generateKey(entry0.orElse(null), "[auth3]",
-                        new BibDatabase()), DEFAULT_UNWANTED_CHARACTERS));
-    }
-
-    /**
-     * Tests if cleanKey replaces Non-ASCII chars. There are quite a few chars that should be replaced. Perhaps there is
-     * a better method than the current.
-     *
-     * @see CitationKeyGenerator#cleanKey(String, String)
-     */
-    @Test
-    void testCheckLegalKey() {
-        // not tested/ not in hashmap UNICODE_CHARS:
-        // Ł ł   Ő ő Ű ű   Ŀ ŀ   Ħ ħ   Ð ð Þ þ   Œ œ   Æ æ Ø ø Å å   Ə ə Đ đ   Ů ů    Ǣ ǣ ǖ ǘ ǚ ǜ
-        // " Ǣ ǣ ǖ ǘ ǚ ǜ   " +
-        // "Đ đ   Ů ů  " +
-        // "Ł ł   Ő ő Ű ű   Ŀ ŀ   Ħ ħ   Ð ð Þ þ   Œ œ   Æ æ Ø ø Å å   Ə ə
-        String accents = "ÀàÈèÌìÒòÙù  â Ĉ ĉ Ê ê Ĝ ĝ Ĥ ĥ Î î Ĵ ĵ Ô ô Ŝ ŝ Û û Ŵ ŵ Ŷ ŷ";
-        String expectedResult = "AaEeIiOoUuAaCcEeGgHhIiJjOoSsUuWwYy";
-        assertEquals(expectedResult, CitationKeyGenerator.cleanKey(accents, DEFAULT_UNWANTED_CHARACTERS));
+    @ParameterizedTest(name = "bibtexString={0}, expectedResult={1}")
+    @CsvSource(quoteCharacter = '"', textBlock = """
+            # see https://sourceforge.net/forum/message.php?msg_id=4498555
+            "@ARTICLE{kohn, author={Andreas Köning}, year={2000}}", "Koe",
 
-        accents = "ÄäËëÏïÖöÜüŸÿ";
-        expectedResult = "AeaeEeIiOeoeUeueYy";
-        assertEquals(expectedResult, CitationKeyGenerator.cleanKey(accents, DEFAULT_UNWANTED_CHARACTERS));
+            # Accent ague: Á á Ć ć É é Í í Ĺ ĺ Ń ń Ó ó Ŕ ŕ Ś ś Ú ú Ý ý Ź ź
+            "@ARTICLE{kohn, author={Andreas Áöning}, year={2000}}", "Aoe",
+            "@ARTICLE{kohn, author={Andreas Éöning}, year={2000}}", "Eoe",
+            "@ARTICLE{kohn, author={Andreas Íöning}, year={2000}}", "Ioe",
+            "@ARTICLE{kohn, author={Andreas Ĺöning}, year={2000}}", "Loe",
+            "@ARTICLE{kohn, author={Andreas Ńöning}, year={2000}}", "Noe",
+            "@ARTICLE{kohn, author={Andreas Óöning}, year={2000}}", "Ooe",
+            "@ARTICLE{kohn, author={Andreas Ŕöning}, year={2000}}", "Roe",
+            "@ARTICLE{kohn, author={Andreas Śöning}, year={2000}}", "Soe",
+            "@ARTICLE{kohn, author={Andreas Úöning}, year={2000}}", "Uoe",
+            "@ARTICLE{kohn, author={Andreas Ýöning}, year={2000}}", "Yoe",
+            "@ARTICLE{kohn, author={Andreas Źöning}, year={2000}}", "Zoe",
 
-        accents = "Ç ç Ģ ģ Ķ ķ Ļ ļ Ņ ņ Ŗ ŗ Ş ş Ţ ţ";
-        expectedResult = "CcGgKkLlNnRrSsTt";
-        assertEquals(expectedResult, CitationKeyGenerator.cleanKey(accents, DEFAULT_UNWANTED_CHARACTERS));
+            # Accent grave: À È Ì Ò Ù
+            "@ARTICLE{kohn, author={Andreas Àöning}, year={2000}}", "Aoe",
+            "@ARTICLE{kohn, author={Andreas Èöning}, year={2000}}", "Eoe",
+            "@ARTICLE{kohn, author={Andreas Ìöning}, year={2000}}", "Ioe",
+            "@ARTICLE{kohn, author={Andreas Òöning}, year={2000}}", "Ooe",
+            "@ARTICLE{kohn, author={Andreas Ùöning}, year={2000}}", "Uoe",
 
-        accents = "Ă ă Ĕ ĕ Ğ ğ Ĭ ĭ Ŏ ŏ Ŭ ŭ";
-        expectedResult = "AaEeGgIiOoUu";
-        assertEquals(expectedResult, CitationKeyGenerator.cleanKey(accents, DEFAULT_UNWANTED_CHARACTERS));
-
-        accents = "Ċ ċ Ė ė Ġ ġ İ ı Ż ż";
-        expectedResult = "CcEeGgIiZz";
-        assertEquals(expectedResult, CitationKeyGenerator.cleanKey(accents, DEFAULT_UNWANTED_CHARACTERS));
-
-        accents = "Ą ą Ę ę Į į Ǫ ǫ Ų ų";
-        expectedResult = "AaEeIiOoUu"; // O or Q? o or q?
-        assertEquals(expectedResult, CitationKeyGenerator.cleanKey(accents, DEFAULT_UNWANTED_CHARACTERS));
-
-        accents = "Ā ā Ē ē Ī ī Ō ō Ū ū Ȳ ȳ";
-        expectedResult = "AaEeIiOoUuYy";
-        assertEquals(expectedResult, CitationKeyGenerator.cleanKey(accents, DEFAULT_UNWANTED_CHARACTERS));
-
-        accents = "Ǎ ǎ Č č Ď ď Ě ě Ǐ ǐ Ľ ľ Ň ň Ǒ ǒ Ř ř Š š Ť ť Ǔ ǔ Ž ž";
-        expectedResult = "AaCcDdEeIiLlNnOoRrSsTtUuZz";
-        assertEquals(expectedResult, CitationKeyGenerator.cleanKey(accents, DEFAULT_UNWANTED_CHARACTERS));
+            # Special cases
+            "@ARTICLE{kohn, author={Oraib Al-Ketan}, year={2000}}", "AlK",
+            "@ARTICLE{kohn, author={Andrés D'Alessandro}, year={2000}}", "DAl",
+            "@ARTICLE{kohn, author={Andrés Aʹrnold}, year={2000}}", "Arn"
+            """
+    )
+    void testMakeLabelAndCheckLegalKeys(String bibtexString, String expectedResult) throws ParseException {
+        Optional<BibEntry> bibEntry = BibtexParser.singleFromString(bibtexString, importFormatPreferences);
+        String citationKey = generateKey(bibEntry.orElse(null), "[auth3]", new BibDatabase());
 
-        expectedResult = "AaEeIiNnOoUuYy";
-        accents = "ÃãẼẽĨĩÑñÕõŨũỸỹ";
-        assertEquals(expectedResult, CitationKeyGenerator.cleanKey(accents, DEFAULT_UNWANTED_CHARACTERS));
-
-        accents = "Ḍ ḍ Ḥ ḥ Ḷ ḷ Ḹ ḹ Ṃ ṃ Ṇ ṇ Ṛ ṛ Ṝ ṝ Ṣ ṣ Ṭ ṭ";
-        expectedResult = "DdHhLlLlMmNnRrRrSsTt";
-        assertEquals(expectedResult, CitationKeyGenerator.cleanKey(accents, DEFAULT_UNWANTED_CHARACTERS));
+        String cleanedKey = CitationKeyGenerator.cleanKey(citationKey, DEFAULT_UNWANTED_CHARACTERS);
 
-        String totest = "À à È è Ì ì Ò ò Ù ù   Â â Ĉ ĉ Ê ê Ĝ ĝ Ĥ ĥ Î î Ĵ ĵ Ô ô Ŝ ŝ Û û Ŵ ŵ Ŷ ŷ  Ä ä Ë ë Ï ï Ö ö Ü ü Ÿ ÿ    "
-                + "Ã ã Ẽ ẽ Ĩ ĩ Ñ ñ Õ õ Ũ ũ Ỹ ỹ   Ç ç Ģ ģ Ķ ķ Ļ ļ Ņ ņ Ŗ ŗ Ş ş Ţ ţ"
-                + " Ǎ ǎ Č č Ď ď Ě ě Ǐ ǐ Ľ ľ Ň ň Ǒ ǒ Ř ř Š š Ť ť Ǔ ǔ Ž ž   " + "Ā ā Ē ē Ī ī Ō ō Ū ū Ȳ ȳ"
-                + "Ă ă Ĕ ĕ Ğ ğ Ĭ ĭ Ŏ ŏ Ŭ ŭ   " + "Ċ ċ Ė ė Ġ ġ İ ı Ż ż   Ą ą Ę ę Į į Ǫ ǫ Ų ų   "
-                + "Ḍ ḍ Ḥ ḥ Ḷ ḷ Ḹ ḹ Ṃ ṃ Ṇ ṇ Ṛ ṛ Ṝ ṝ Ṣ ṣ Ṭ ṭ   ";
-        String expectedResults = "AaEeIiOoUuAaCcEeGgHhIiJjOoSsUuWwYyAeaeEeIiOeoeUeueYy"
-                + "AaEeIiNnOoUuYyCcGgKkLlNnRrSsTt" + "AaCcDdEeIiLlNnOoRrSsTtUuZz" + "AaEeIiOoUuYy" + "AaEeGgIiOoUu"
-                + "CcEeGgIiZzAaEeIiOoUu" + "DdHhLlLlMmNnRrRrSsTt";
-        assertEquals(expectedResults, CitationKeyGenerator.cleanKey(totest, DEFAULT_UNWANTED_CHARACTERS));
+        assertEquals(expectedResult, cleanedKey);
     }
 
     @Test
@@ -365,12 +220,54 @@ void testFirstAuthor() {
     @Test
     void testUniversity() throws ParseException {
         Optional<BibEntry> entry = BibtexParser.singleFromString(
-                "@ARTICLE{kohn, author={{Link{\\\"{o}}ping University}}}", importFormatPreferences, fileMonitor);
+                "@ARTICLE{kohn, author={{Link{\\\"{o}}ping University}}}", importFormatPreferences);
         assertEquals("UniLinkoeping",
                 CitationKeyGenerator.cleanKey(generateKey(entry.orElse(null), "[auth]",
                         new BibDatabase()), DEFAULT_UNWANTED_CHARACTERS));
     }
 
+    /**
+     * Tests if cleanKey replaces Non-ASCII chars. There are quite a few chars that should be replaced. Perhaps there is
+     * a better method than the current.
+     * <p>
+     * not tested/ not in hashmap UNICODE_CHARS:
+     * {@code
+     * Ł ł   Ő ő Ű ű   Ŀ ŀ   Ħ ħ   Ð ð Þ þ   Œ œ   Æ æ Ø ø Å å   Ə ə Đ đ   Ů ů    Ǣ ǣ ǖ ǘ ǚ ǜ
+     *  Ǣ ǣ ǖ ǘ ǚ ǜ
+     * Đ đ   Ů ů
+     * Ł ł   Ő ő Ű ű   Ŀ ŀ   Ħ ħ   Ð ð Þ þ   Œ œ   Æ æ Ø ø Å å   Ə ə
+     * }
+     *
+     * @see CitationKeyGenerator#cleanKey(String, String)
+     */
+    @ParameterizedTest(name = "accents={0}, expectedResult={1}")
+    @CsvSource(quoteCharacter = '"', textBlock = """
+            "ÀàÈèÌìÒòÙù  â Ĉ ĉ Ê ê Ĝ ĝ Ĥ ĥ Î î Ĵ ĵ Ô ô Ŝ ŝ Û û Ŵ ŵ Ŷ ŷ", "AaEeIiOoUuAaCcEeGgHhIiJjOoSsUuWwYy",
+            "ÄäËëÏïÖöÜüŸÿ", "AeaeEeIiOeoeUeueYy",
+            "ÅåŮů", "AaaaUu",
+            "Ç ç Ģ ģ Ķ ķ Ļ ļ Ņ ņ Ŗ ŗ Ş ş Ţ ţ", "CcGgKkLlNnRrSsTt",
+            "Ă ă Ĕ ĕ Ğ ğ Ĭ ĭ Ŏ ŏ Ŭ ŭ", "AaEeGgIiOoUu",
+            "Ċ ċ Ė ė Ġ ġ İ ı Ż ż", "CcEeGgIiZz",
+            "Ą ą Ę ę Į į Ǫ ǫ Ų ų", "AaEeIiOoUu", # O or Q? o or q?
+            "Ā ā Ē ē Ī ī Ō ō Ū ū Ȳ ȳ", "AaEeIiOoUuYy",
+            "Ǎ ǎ Č č Ď ď Ě ě Ǐ ǐ Ľ ľ Ň ň Ǒ ǒ Ř ř Š š Ť ť Ǔ ǔ Ž ž", "AaCcDdEeIiLlNnOoRrSsTtUuZz",
+            "ÃãẼẽĨĩÑñÕõŨũỸỹ", "AaEeIiNnOoUuYy",
+            "Ḍ ḍ Ḥ ḥ Ḷ ḷ Ḹ ḹ Ṃ ṃ Ṇ ṇ Ṛ ṛ Ṝ ṝ Ṣ ṣ Ṭ ṭ", "DdHhLlLlMmNnRrRrSsTt",
+            "À à È è Ì ì Ò ò Ù ù   Â â Ĉ ĉ Ê ê Ĝ ĝ Ĥ ĥ Î î Ĵ ĵ Ô ô Ŝ ŝ Û û Ŵ ŵ Ŷ ŷ  Ä ä Ë ë Ï ï Ö ö Ü ü Ÿ ÿ    ", "AaEeIiOoUuAaCcEeGgHhIiJjOoSsUuWwYyAeaeEeIiOeoeUeueYy",
+            "Ã ã Ẽ ẽ Ĩ ĩ Ñ ñ Õ õ Ũ ũ Ỹ ỹ   Ç ç Ģ ģ Ķ ķ Ļ ļ Ņ ņ Ŗ ŗ Ş ş Ţ ţ", "AaEeIiNnOoUuYyCcGgKkLlNnRrSsTt",
+            " Ǎ ǎ Č č Ď ď Ě ě Ǐ ǐ Ľ ľ Ň ň Ǒ ǒ Ř ř Š š Ť ť Ǔ ǔ Ž ž   ", "AaCcDdEeIiLlNnOoRrSsTtUuZz",
+            "Ā ā Ē ē Ī ī Ō ō Ū ū Ȳ ȳ", "AaEeIiOoUuYy",
+            "Ă ă Ĕ ĕ Ğ ğ Ĭ ĭ Ŏ ŏ Ŭ ŭ   ", "AaEeGgIiOoUu",
+            "Ả ả Ẻ ẻ Ỉ ỉ Ỏ ỏ Ủ ủ Ỷ ỷ", "AaEeIiOoUuYy",
+            "Ḛ ḛ Ḭ ḭ Ṵ ṵ", "EeIiUu",
+            "Ċ ċ Ė ė Ġ ġ İ ı Ż ż   Ą ą Ę ę Į į Ǫ ǫ Ų ų   ", "CcEeGgIiZzAaEeIiOoUu",
+            "Ḍ ḍ Ḥ ḥ Ḷ ḷ Ḹ ḹ Ṃ ṃ Ṇ ṇ Ṛ ṛ Ṝ ṝ Ṣ ṣ Ṭ ṭ   ", "DdHhLlLlMmNnRrRrSsTt"
+            """
+    )
+    void testCheckLegalKey(String accents, String expectedResult) {
+        assertEquals(expectedResult, CitationKeyGenerator.cleanKey(accents, DEFAULT_UNWANTED_CHARACTERS));
+    }
+
     @Test
     void testcrossrefUniversity() {
         BibDatabase database = new BibDatabase();
@@ -391,7 +288,7 @@ void testcrossrefUniversity() {
     void testDepartment() throws ParseException {
         Optional<BibEntry> entry = BibtexParser.singleFromString(
                 "@ARTICLE{kohn, author={{Link{\\\"{o}}ping University, Department of Electrical Engineering}}}",
-                importFormatPreferences, fileMonitor);
+                importFormatPreferences);
         assertEquals("UniLinkoepingEE",
                 CitationKeyGenerator.cleanKey(generateKey(entry.orElse(null), "[auth]",
                         new BibDatabase()), DEFAULT_UNWANTED_CHARACTERS));
@@ -417,7 +314,7 @@ void testcrossrefDepartment() {
     void testSchool() throws ParseException {
         Optional<BibEntry> entry = BibtexParser.singleFromString(
                 "@ARTICLE{kohn, author={{Link{\\\"{o}}ping University, School of Computer Engineering}}}",
-                importFormatPreferences, fileMonitor);
+                importFormatPreferences);
         assertEquals("UniLinkoepingCE",
                 CitationKeyGenerator.cleanKey(generateKey(entry.orElse(null), "[auth]",
                         new BibDatabase()), DEFAULT_UNWANTED_CHARACTERS));
@@ -427,7 +324,7 @@ void testSchool() throws ParseException {
     void generateKeyAbbreviateCorporateAuthorDepartmentWithoutAcademicInstitute() throws ParseException {
         Optional<BibEntry> entry = BibtexParser.singleFromString(
                 "@ARTICLE{null, author={{Department of Localhost NullGenerators}}}",
-                importFormatPreferences, fileMonitor);
+                importFormatPreferences);
         assertEquals("DLN",
                 CitationKeyGenerator.cleanKey(generateKey(entry.orElse(null), "[auth]",
                         new BibDatabase()), DEFAULT_UNWANTED_CHARACTERS));
@@ -437,7 +334,7 @@ void generateKeyAbbreviateCorporateAuthorDepartmentWithoutAcademicInstitute() th
     void generateKeyAbbreviateCorporateAuthorSchoolWithoutAcademicInstitute() throws ParseException {
         Optional<BibEntry> entry = BibtexParser.singleFromString(
                 "@ARTICLE{null, author={{The School of Null}}}",
-                importFormatPreferences, fileMonitor);
+                importFormatPreferences);
         assertEquals("SchoolNull",
                 CitationKeyGenerator.cleanKey(generateKey(entry.orElse(null), "[auth]",
                         new BibDatabase()), DEFAULT_UNWANTED_CHARACTERS));
@@ -462,7 +359,7 @@ void testcrossrefSchool() {
     @Test
     void testInstituteOfTechnology() throws ParseException {
         Optional<BibEntry> entry = BibtexParser.singleFromString(
-                "@ARTICLE{kohn, author={{Massachusetts Institute of Technology}}}", importFormatPreferences, fileMonitor);
+                "@ARTICLE{kohn, author={{Massachusetts Institute of Technology}}}", importFormatPreferences);
         assertEquals("MIT",
                 CitationKeyGenerator.cleanKey(generateKey(entry.orElse(null), "[auth]",
                         new BibDatabase()), DEFAULT_UNWANTED_CHARACTERS));
@@ -486,12 +383,12 @@ void testcrossrefInstituteOfTechnology() {
 
     @Test
     void testAuthIniN() {
-        assertEquals("NMEB", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_5, "[authIni4]"));
-        assertEquals("NMEB", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_4, "[authIni4]"));
-        assertEquals("NeME", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_3, "[authIni4]"));
-        assertEquals("NeMa", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_2, "[authIni4]"));
-        assertEquals("Newt", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_1, "[authIni4]"));
         assertEquals("", generateKey(AUTHOR_EMPTY, "[authIni4]"));
+        assertEquals("Newt", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_1, "[authIni4]"));
+        assertEquals("NeMa", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_2, "[authIni4]"));
+        assertEquals("NeME", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_3, "[authIni4]"));
+        assertEquals("NMEB", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_4, "[authIni4]"));
+        assertEquals("NME+", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_5, "[authIni4]"));
 
         assertEquals("N", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_1, "[authIni1]"));
         assertEquals("", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_1, "[authIni0]"));
@@ -542,7 +439,7 @@ void testAuthEtAl() {
     @Test
     void testAuthShort() {
         // tests taken from the comments
-        assertEquals("NME", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_4, AUTHSHORT));
+        assertEquals("NME+", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_4, AUTHSHORT));
         assertEquals("NME", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_3, AUTHSHORT));
         assertEquals("NM", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_2, AUTHSHORT));
         assertEquals("Newton", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_1, AUTHSHORT));
@@ -606,19 +503,23 @@ void testAllAuthors() {
         assertEquals("NewtonMaxwellEinstein", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_3, AUTHORS));
     }
 
-    /**
-     * Tests [authorsAlpha]
-     */
-    @Test
-    void authorsAlpha() {
-        assertEquals("New", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_1, AUTHORSALPHA));
-        assertEquals("NM", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_2, AUTHORSALPHA));
-        assertEquals("NME", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_3, AUTHORSALPHA));
-        assertEquals("NMEB", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_4, AUTHORSALPHA));
-        assertEquals("NME", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_5, AUTHORSALPHA));
+    static Stream<Arguments> testAuthorsAlpha() {
+        return Stream.of(
+                Arguments.of("New", AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_1, AUTHORSALPHA),
+                Arguments.of("NM", AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_2, AUTHORSALPHA),
+                Arguments.of("NME", AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_3, AUTHORSALPHA),
+                Arguments.of("NMEB", AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_4, AUTHORSALPHA),
+                Arguments.of("NME+", AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_5, AUTHORSALPHA),
+                Arguments.of("vdAal", AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_WITH_VAN_COUNT_1, AUTHORSALPHA),
+                Arguments.of("vdAvL", AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_WITH_VAN_COUNT_2, AUTHORSALPHA),
+                Arguments.of("NM+", AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_AND_OTHERS_COUNT_3, AUTHORSALPHA)
+        );
+    }
 
-        assertEquals("vdAal", generateKey(AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_WITH_VAN_COUNT_1, AUTHORSALPHA));
-        assertEquals("vdAvL", generateKey(AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_WITH_VAN_COUNT_2, AUTHORSALPHA));
+    @ParameterizedTest
+    @MethodSource
+    void testAuthorsAlpha(String expected, BibEntry entry, String pattern) {
+        assertEquals(expected, generateKey(entry, pattern));
     }
 
     /**
@@ -1150,4 +1051,11 @@ void generateKeyWithLowercaseAuthorWithVonAndLastname() {
         entry.setField(StandardField.YEAR, "2021");
         assertEquals("Brekel2021", generateKey(entry, "[auth][year]"));
     }
+
+    @Test
+    void generateKeyCorrectKeyWithAndOthersAtTheEnd() {
+        BibEntry entry = createABibEntryAuthor("Alexander Artemenko and others");
+        entry.setField(StandardField.YEAR, "2019");
+        assertEquals("Artemenko2019", generateKey(entry, "[auth][year]"));
+    }
 }
diff --git a/src/test/java/org/jabref/logic/citationkeypattern/MakeLabelWithDatabaseTest.java b/src/test/java/org/jabref/logic/citationkeypattern/MakeLabelWithDatabaseTest.java
index ed37c618b02..202e06fcc3c 100644
--- a/src/test/java/org/jabref/logic/citationkeypattern/MakeLabelWithDatabaseTest.java
+++ b/src/test/java/org/jabref/logic/citationkeypattern/MakeLabelWithDatabaseTest.java
@@ -8,10 +8,13 @@
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Execution;
+import org.junit.jupiter.api.parallel.ExecutionMode;
 
 import static org.jabref.logic.citationkeypattern.CitationKeyGenerator.DEFAULT_UNWANTED_CHARACTERS;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+@Execution(ExecutionMode.CONCURRENT)
 class MakeLabelWithDatabaseTest {
 
     private BibDatabase database;
@@ -446,7 +449,7 @@ void generateKeyAuthIni() {
         bibtexKeyPattern.setDefaultValue("[authIni2]");
         entry.setField(StandardField.AUTHOR, "John Doe and Donald Smith and Will Wonder");
         new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
-        assertEquals(Optional.of("DS"), entry.getCitationKey());
+        assertEquals(Optional.of("D+"), entry.getCitationKey());
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/citationkeypattern/MakeLabelWithoutDatabaseTest.java b/src/test/java/org/jabref/logic/citationkeypattern/MakeLabelWithoutDatabaseTest.java
index bb7a8bffda5..18afa3b2dd0 100644
--- a/src/test/java/org/jabref/logic/citationkeypattern/MakeLabelWithoutDatabaseTest.java
+++ b/src/test/java/org/jabref/logic/citationkeypattern/MakeLabelWithoutDatabaseTest.java
@@ -10,9 +10,12 @@
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Execution;
+import org.junit.jupiter.api.parallel.ExecutionMode;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+@Execution(ExecutionMode.CONCURRENT)
 class MakeLabelWithoutDatabaseTest {
 
     private CitationKeyGenerator citationKeyGenerator;
diff --git a/src/test/java/org/jabref/logic/exporter/FieldFormatterCleanupsTest.java b/src/test/java/org/jabref/logic/cleanup/FieldFormatterCleanupsTest.java
similarity index 93%
rename from src/test/java/org/jabref/logic/exporter/FieldFormatterCleanupsTest.java
rename to src/test/java/org/jabref/logic/cleanup/FieldFormatterCleanupsTest.java
index 9ac6e612423..b6737e8c924 100644
--- a/src/test/java/org/jabref/logic/exporter/FieldFormatterCleanupsTest.java
+++ b/src/test/java/org/jabref/logic/cleanup/FieldFormatterCleanupsTest.java
@@ -1,4 +1,4 @@
-package org.jabref.logic.exporter;
+package org.jabref.logic.cleanup;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -6,8 +6,6 @@
 import java.util.List;
 import java.util.Optional;
 
-import org.jabref.logic.cleanup.FieldFormatterCleanup;
-import org.jabref.logic.cleanup.FieldFormatterCleanups;
 import org.jabref.logic.formatter.IdentityFormatter;
 import org.jabref.logic.formatter.bibtexfields.EscapeAmpersandsFormatter;
 import org.jabref.logic.formatter.bibtexfields.EscapeDollarSignFormatter;
@@ -17,6 +15,7 @@
 import org.jabref.logic.formatter.bibtexfields.NormalizeMonthFormatter;
 import org.jabref.logic.formatter.bibtexfields.NormalizePagesFormatter;
 import org.jabref.logic.formatter.casechanger.LowerCaseFormatter;
+import org.jabref.logic.layout.format.ReplaceUnicodeLigaturesFormatter;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.StandardField;
@@ -309,4 +308,29 @@ void parserTest() {
                 ),
                 fieldFormatterCleanups);
     }
+
+    @Test
+    void getMetaDataStringWorks() {
+        assertEquals("""
+                pages[normalize_page_numbers]
+                date[normalize_date]
+                month[normalize_month]
+                all-text-fields[replace_unicode_ligatures]
+                """, FieldFormatterCleanups.getMetaDataString(FieldFormatterCleanups.DEFAULT_SAVE_ACTIONS, "\n"));
+    }
+
+    @Test
+    void parsingOfDefaultSaveActions() {
+        assertEquals(FieldFormatterCleanups.DEFAULT_SAVE_ACTIONS, FieldFormatterCleanups.parse("""
+                pages[normalize_page_numbers]
+                date[normalize_date]
+                month[normalize_month]
+                all-text-fields[replace_unicode_ligatures]
+                """));
+    }
+
+    @Test
+    void formatterFromString() {
+        assertEquals(new ReplaceUnicodeLigaturesFormatter(), FieldFormatterCleanups.getFormatterFromString("replace_unicode_ligatures"));
+    }
 }
diff --git a/src/test/java/org/jabref/logic/cleanup/URLCleanupTest.java b/src/test/java/org/jabref/logic/cleanup/URLCleanupTest.java
new file mode 100644
index 00000000000..1c967a1a781
--- /dev/null
+++ b/src/test/java/org/jabref/logic/cleanup/URLCleanupTest.java
@@ -0,0 +1,176 @@
+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.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 URLCleanupTest {
+
+    @ParameterizedTest
+    @MethodSource("provideURL")
+    public void testChangeURL(BibEntry expected, BibEntry urlInputField) {
+        URLCleanup cleanUp = new URLCleanup();
+        cleanUp.cleanup(urlInputField);
+
+        assertEquals(expected, urlInputField);
+    }
+
+    private static Stream<Arguments> provideURL() {
+        return Stream.of(
+
+            // Input Note field has two arguments stored , with the latter being a url.
+            Arguments.of(
+                new BibEntry().withField(StandardField.URL,
+                                    "https://hdl.handle.net/10442/hedi/6089")
+                              .withField(StandardField.NOTE,
+                                    "this is a note"),
+                new BibEntry().withField(StandardField.NOTE,
+                                    "this is a note, \\url{https://hdl.handle.net/10442/hedi/6089}")),
+
+            // Input Note field has two arguments stored, with the former being a url.
+            Arguments.of(
+                new BibEntry().withField(StandardField.URL,
+                                    "https://hdl.handle.net/10442/hedi/6089")
+                              .withField(StandardField.NOTE,
+                                    "this is a note"),
+                new BibEntry().withField(StandardField.NOTE,
+                                    "\\url{https://hdl.handle.net/10442/hedi/6089}, this is a note")),
+
+            // Input Note field has more than one URLs stored.
+            Arguments.of(
+                new BibEntry().withField(StandardField.URL,
+                                    "https://hdl.handle.net/10442/hedi/6089")
+                              .withField(StandardField.NOTE,
+                                    "\\url{http://142.42.1.1:8080}"),
+                new BibEntry().withField(StandardField.NOTE,
+                                    "\\url{https://hdl.handle.net/10442/hedi/6089}, "
+                                        + "\\url{http://142.42.1.1:8080}")),
+
+            // Input entry holds the same URL both in Note and Url field.
+            Arguments.of(
+                new BibEntry().withField(StandardField.URL,
+                                     "https://hdl.handle.net/10442/hedi/6089"),
+                new BibEntry().withField(StandardField.NOTE,
+                                     "\\url{https://hdl.handle.net/10442/hedi/6089}")
+                              .withField(StandardField.URL,
+                                     "https://hdl.handle.net/10442/hedi/6089")),
+
+            // Input Note field has several values stored.
+            Arguments.of(
+                new BibEntry().withField(StandardField.URL,
+                                    "https://example.org")
+                              .withField(StandardField.NOTE,
+                                    "cited by Kramer, 2002."),
+                new BibEntry().withField(StandardField.NOTE,
+                                    "\\url{https://example.org}, cited by Kramer, 2002.")),
+
+            /*
+             * Several input URL types (e.g, not secure protocol, password included for
+             * authentication, IP address, port etc.) to be correctly identified.
+             */
+            Arguments.of(
+                new BibEntry().withField(StandardField.URL,
+                                    "https://hdl.handle.net/10442/hedi/6089"),
+                new BibEntry().withField(StandardField.NOTE,
+                                    "\\url{https://hdl.handle.net/10442/hedi/6089}")),
+
+            Arguments.of(
+                new BibEntry().withField(StandardField.URL,
+                                    "http://hdl.handle.net/10442/hedi/6089"),
+                new BibEntry().withField(StandardField.NOTE,
+                                    "\\url{http://hdl.handle.net/10442/hedi/6089}")),
+
+            Arguments.of(
+                new BibEntry().withField(StandardField.URL,
+                                    "http://userid:password@example.com:8080"),
+                new BibEntry().withField(StandardField.NOTE,
+                                    "\\url{http://userid:password@example.com:8080}")),
+
+            Arguments.of(
+                new BibEntry().withField(StandardField.URL,
+                                    "http://142.42.1.1:8080"),
+                new BibEntry().withField(StandardField.NOTE,
+                                    "\\url{http://142.42.1.1:8080}")),
+
+            Arguments.of(
+                new BibEntry().withField(StandardField.URL,
+                                    "http://☺.damowmow.com"),
+                new BibEntry().withField(StandardField.NOTE,
+                                    "\\url{http://☺.damowmow.com}")),
+
+            Arguments.of(
+                new BibEntry().withField(StandardField.URL,
+                                    "http://-.~_!$&'()*+,;=:%40:80%2f::::::@example.com"),
+                new BibEntry().withField(StandardField.NOTE,
+                                    "\\url{http://-.~_!$&'()*+,;=:%40:80%2f::::::@example.com}")),
+
+            Arguments.of(
+                new BibEntry().withField(StandardField.URL,
+                                    "https://www.example.com/foo/?bar=baz&inga=42&quux"),
+                new BibEntry().withField(StandardField.NOTE,
+                                    "\\url{https://www.example.com/foo/?bar=baz&inga=42&quux}")),
+
+            Arguments.of(
+                new BibEntry().withField(StandardField.URL,
+                                    "https://www.example.com/foo/?bar=baz&inga=42&quux"),
+                new BibEntry().withField(StandardField.NOTE,
+                                    "https://www.example.com/foo/?bar=baz&inga=42&quux")),
+
+            // Expected entry returns formatted the url-date in the Urldate field.
+            Arguments.of(
+                new BibEntry().withField(StandardField.URL,
+                                    "http://142.42.1.1:8080")
+                              .withField(StandardField.URLDATE,
+                                    "2021-01-15"),
+                new BibEntry().withField(StandardField.NOTE,
+                                    "\\url{http://142.42.1.1:8080}, accessed on January 15, 2021")),
+
+            // Input entry doesn't hold any URL in the Note field.
+            Arguments.of(
+                new BibEntry().withField(StandardField.NOTE,
+                                    "Accessed on 2015-01-15"),
+                new BibEntry().withField(StandardField.NOTE,
+                                    "Accessed on 2015-01-15")),
+
+            // Input entry has multiple url-dates stored in the Note field.
+            Arguments.of(
+                new BibEntry().withField(StandardField.URL,
+                                    "http://142.42.1.1:8080")
+                              .withField(StandardField.URLDATE,
+                                    "2021-01-15")
+                              .withField(StandardField.NOTE,
+                                    "visited on February 12, 2017"),
+                new BibEntry().withField(StandardField.NOTE,
+                                    "\\url{http://142.42.1.1:8080}, accessed on January 15, 2021, visited on February 12, 2017")),
+
+            // Input entry holds the same url-date in both Note and Urldate field.
+            Arguments.of(
+                new BibEntry().withField(StandardField.URL,
+                                    "http://142.42.1.1:8080")
+                              .withField(StandardField.URLDATE,
+                                    "2015-01-15"),
+                new BibEntry().withField(StandardField.NOTE,
+                                    "\\url{http://142.42.1.1:8080}, visited on 2015.01.15")
+                              .withField(StandardField.URLDATE,
+                                    "2015-01-15")),
+
+            // Input Note field has several values stored.
+            Arguments.of(
+                new BibEntry().withField(StandardField.URL,
+                                    "https://example.org")
+                              .withField(StandardField.URLDATE,
+                                    "2023-04-11")
+                              .withField(StandardField.NOTE,
+                                    "cited by Kramer"),
+                new BibEntry().withField(StandardField.NOTE,
+                                    "\\url{https://example.org}, cited by Kramer, accessed on 2023-04-11"))
+        );
+    }
+}
diff --git a/src/test/java/org/jabref/logic/crawler/CrawlerTest.java b/src/test/java/org/jabref/logic/crawler/CrawlerTest.java
index 9abaf5dea83..3bb915cf568 100644
--- a/src/test/java/org/jabref/logic/crawler/CrawlerTest.java
+++ b/src/test/java/org/jabref/logic/crawler/CrawlerTest.java
@@ -9,18 +9,19 @@
 
 import org.jabref.logic.citationkeypattern.CitationKeyPatternPreferences;
 import org.jabref.logic.citationkeypattern.GlobalCitationKeyPattern;
-import org.jabref.logic.exporter.SavePreferences;
+import org.jabref.logic.exporter.SaveConfiguration;
 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;
+import org.jabref.model.metadata.SaveOrder;
 import org.jabref.model.util.DummyFileUpdateMonitor;
-import org.jabref.preferences.GeneralPreferences;
+import org.jabref.preferences.PreferencesService;
 import org.jabref.testutils.category.FetcherTest;
 
 import org.eclipse.jgit.api.Git;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 import org.mockito.Answers;
@@ -40,48 +41,19 @@ class CrawlerTest {
     Path tempRepositoryDirectory;
     ImportFormatPreferences importFormatPreferences;
     ImporterPreferences importerPreferences;
-    SavePreferences savePreferences;
+    SaveConfiguration saveConfiguration;
     BibEntryTypesManager entryTypesManager;
     SlrGitHandler gitHandler = mock(SlrGitHandler.class, Answers.RETURNS_DEFAULTS);
     String hashCodeQuantum = String.valueOf("Quantum".hashCode());
     String hashCodeCloudComputing = String.valueOf("Cloud Computing".hashCode());
 
-    GeneralPreferences generalPreferences = mock(GeneralPreferences.class, Answers.RETURNS_DEEP_STUBS);
-
-    @Test
-    public void testWhetherAllFilesAreCreated() throws Exception {
-        setUp();
-        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")));
-
-        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")));
-    }
-
-    private Path getPathToStudyDefinitionFile() {
-        return tempRepositoryDirectory;
-    }
+    PreferencesService preferencesService = mock(PreferencesService.class, Answers.RETURNS_DEEP_STUBS);
 
     /**
      * Set up mocks and copies the study definition file into the test repository
      */
-    private void setUp() throws Exception {
+    @BeforeEach
+    public void setUp() throws Exception {
         setUpRepository();
 
         CitationKeyPatternPreferences citationKeyPatternPreferences = new CitationKeyPatternPreferences(
@@ -98,13 +70,13 @@ 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);
+        saveConfiguration = mock(SaveConfiguration.class, Answers.RETURNS_DEEP_STUBS);
+        when(saveConfiguration.getSaveOrder()).thenReturn(SaveOrder.getDefaultSaveOrder());
         when(importerPreferences.getApiKeys()).thenReturn(FXCollections.emptyObservableSet());
         when(importFormatPreferences.bibEntryPreferences().getKeywordSeparator()).thenReturn(',');
 
+        when(preferencesService.getCitationKeyPatternPreferences()).thenReturn(citationKeyPatternPreferences);
+
         entryTypesManager = new BibEntryTypesManager();
     }
 
@@ -127,4 +99,30 @@ private void setUpTestStudyDefinitionFile() throws Exception {
         URL studyDefinition = this.getClass().getResource(StudyRepository.STUDY_DEFINITION_FILE_NAME);
         FileUtil.copyFile(Path.of(studyDefinition.toURI()), destination, false);
     }
+
+    @Test
+    public void testWhetherAllFilesAreCreated() throws Exception {
+        Crawler testCrawler = new Crawler(getPathToStudyDefinitionFile(),
+                gitHandler,
+                preferencesService,
+                entryTypesManager,
+                new DummyFileUpdateMonitor());
+
+        testCrawler.performCrawl();
+
+        assertTrue(Files.exists(Path.of(tempRepositoryDirectory.toString(), hashCodeQuantum + " - Quantum")));
+        assertTrue(Files.exists(Path.of(tempRepositoryDirectory.toString(), hashCodeCloudComputing + " - Cloud Computing")));
+
+        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")));
+    }
+
+    private Path getPathToStudyDefinitionFile() {
+        return tempRepositoryDirectory;
+    }
 }
diff --git a/src/test/java/org/jabref/logic/crawler/StudyDatabaseToFetcherConverterTest.java b/src/test/java/org/jabref/logic/crawler/StudyCatalogToFetcherConverterTest.java
similarity index 59%
rename from src/test/java/org/jabref/logic/crawler/StudyDatabaseToFetcherConverterTest.java
rename to src/test/java/org/jabref/logic/crawler/StudyCatalogToFetcherConverterTest.java
index d874a14544b..e3bee090ebf 100644
--- a/src/test/java/org/jabref/logic/crawler/StudyDatabaseToFetcherConverterTest.java
+++ b/src/test/java/org/jabref/logic/crawler/StudyCatalogToFetcherConverterTest.java
@@ -7,17 +7,16 @@
 
 import javafx.collections.FXCollections;
 
-import org.jabref.logic.exporter.SavePreferences;
+import org.jabref.logic.exporter.SaveConfiguration;
 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;
 import org.jabref.model.entry.BibEntryTypesManager;
-import org.jabref.model.metadata.SaveOrderConfig;
+import org.jabref.model.metadata.SaveOrder;
 import org.jabref.model.util.DummyFileUpdateMonitor;
-import org.jabref.preferences.GeneralPreferences;
+import org.jabref.preferences.PreferencesService;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
@@ -28,12 +27,9 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-class StudyDatabaseToFetcherConverterTest {
-    GeneralPreferences generalPreferences;
-    ImportFormatPreferences importFormatPreferences;
-    ImporterPreferences importerPreferences;
-    SavePreferences savePreferences;
-    TimestampPreferences timestampPreferences;
+class StudyCatalogToFetcherConverterTest {
+    SaveConfiguration saveConfiguration;
+    PreferencesService preferencesService;
     BibEntryTypesManager entryTypesManager;
     SlrGitHandler gitHandler;
     @TempDir
@@ -41,15 +37,12 @@ class StudyDatabaseToFetcherConverterTest {
 
     @BeforeEach
     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(savePreferences.getSaveOrder()).thenReturn(new SaveOrderConfig());
-        when(savePreferences.takeMetadataSaveOrderInAccount()).thenReturn(true);
-        when(importFormatPreferences.bibEntryPreferences().getKeywordSeparator()).thenReturn(',');
-        when(importerPreferences.getApiKeys()).thenReturn(FXCollections.emptyObservableSet());
+        preferencesService = mock(PreferencesService.class, Answers.RETURNS_DEEP_STUBS);
+        saveConfiguration = mock(SaveConfiguration.class, Answers.RETURNS_DEEP_STUBS);
+        when(saveConfiguration.getSaveOrder()).thenReturn(SaveOrder.getDefaultSaveOrder());
+        when(preferencesService.getBibEntryPreferences().getKeywordSeparator()).thenReturn(',');
+        when(preferencesService.getImporterPreferences().getApiKeys()).thenReturn(FXCollections.emptyObservableSet());
+
         entryTypesManager = new BibEntryTypesManager();
         gitHandler = mock(SlrGitHandler.class, Answers.RETURNS_DEFAULTS);
     }
@@ -62,16 +55,13 @@ public void getActiveFetcherInstances() throws Exception {
         StudyRepository studyRepository = new StudyRepository(
                 tempRepositoryDirectory,
                 gitHandler,
-                generalPreferences,
-                importFormatPreferences,
-                importerPreferences,
+                preferencesService,
                 new DummyFileUpdateMonitor(),
-                savePreferences,
                 entryTypesManager);
-        StudyDatabaseToFetcherConverter converter = new StudyDatabaseToFetcherConverter(
+        StudyCatalogToFetcherConverter converter = new StudyCatalogToFetcherConverter(
                 studyRepository.getActiveLibraryEntries(),
-                importFormatPreferences,
-                importerPreferences);
+                mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS),
+                mock(ImporterPreferences.class));
         List<SearchBasedFetcher> result = converter.getActiveFetchers();
 
         Assertions.assertEquals(
diff --git a/src/test/java/org/jabref/logic/crawler/StudyRepositoryTest.java b/src/test/java/org/jabref/logic/crawler/StudyRepositoryTest.java
index c32a4966da2..5ca6c35200c 100644
--- a/src/test/java/org/jabref/logic/crawler/StudyRepositoryTest.java
+++ b/src/test/java/org/jabref/logic/crawler/StudyRepositoryTest.java
@@ -10,16 +10,13 @@
 
 import javafx.collections.FXCollections;
 
-import org.jabref.logic.bibtex.FieldContentFormatterPreferences;
 import org.jabref.logic.citationkeypattern.CitationKeyGenerator;
 import org.jabref.logic.citationkeypattern.CitationKeyPatternPreferences;
 import org.jabref.logic.citationkeypattern.GlobalCitationKeyPattern;
 import org.jabref.logic.database.DatabaseMerger;
-import org.jabref.logic.exporter.SavePreferences;
+import org.jabref.logic.exporter.SaveConfiguration;
 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;
 import org.jabref.model.database.BibDatabaseContext;
@@ -27,11 +24,11 @@
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
-import org.jabref.model.metadata.SaveOrderConfig;
 import org.jabref.model.study.FetchResult;
 import org.jabref.model.study.QueryResult;
 import org.jabref.model.util.DummyFileUpdateMonitor;
-import org.jabref.preferences.GeneralPreferences;
+import org.jabref.preferences.LibraryPreferences;
+import org.jabref.preferences.PreferencesService;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -49,11 +46,10 @@
 class StudyRepositoryTest {
     private static final String NON_EXISTING_DIRECTORY = "nonExistingTestRepositoryDirectory";
     CitationKeyPatternPreferences citationKeyPatternPreferences;
-    GeneralPreferences generalPreferences;
+    PreferencesService preferencesService;
+    LibraryPreferences libraryPreferences;
     ImportFormatPreferences importFormatPreferences;
-    ImporterPreferences importerPreferences;
-    SavePreferences savePreferences;
-    TimestampPreferences timestampPreferences;
+    SaveConfiguration saveConfiguration;
     BibEntryTypesManager entryTypesManager;
     @TempDir
     Path tempRepositoryDirectory;
@@ -68,11 +64,10 @@ class StudyRepositoryTest {
      */
     @BeforeEach
     public void setUpMocks() throws Exception {
-        generalPreferences = mock(GeneralPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        savePreferences = mock(SavePreferences.class, Answers.RETURNS_DEEP_STUBS);
+        libraryPreferences = mock(LibraryPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        saveConfiguration = mock(SaveConfiguration.class, Answers.RETURNS_DEEP_STUBS);
         importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        importerPreferences = mock(ImporterPreferences.class);
-        timestampPreferences = mock(TimestampPreferences.class);
+        preferencesService = mock(PreferencesService.class, Answers.RETURNS_DEEP_STUBS);
         citationKeyPatternPreferences = new CitationKeyPatternPreferences(
                 false,
                 false,
@@ -84,13 +79,11 @@ public void setUpMocks() throws Exception {
                 GlobalCitationKeyPattern.fromPattern("[auth][year]"),
                 "",
                 ',');
-        when(savePreferences.getSaveOrder()).thenReturn(new SaveOrderConfig());
-        when(savePreferences.takeMetadataSaveOrderInAccount()).thenReturn(true);
-        when(savePreferences.getCitationKeyPatternPreferences()).thenReturn(citationKeyPatternPreferences);
-        when(importerPreferences.getApiKeys()).thenReturn(FXCollections.emptyObservableSet());
+        when(preferencesService.getCitationKeyPatternPreferences()).thenReturn(citationKeyPatternPreferences);
+        when(preferencesService.getImporterPreferences().getApiKeys()).thenReturn(FXCollections.emptyObservableSet());
         when(importFormatPreferences.bibEntryPreferences().getKeywordSeparator()).thenReturn(',');
-        when(importFormatPreferences.fieldContentFormatterPreferences()).thenReturn(new FieldContentFormatterPreferences());
-        when(timestampPreferences.getTimestampField()).then(invocation -> StandardField.TIMESTAMP);
+        when(preferencesService.getImportFormatPreferences()).thenReturn(importFormatPreferences);
+        when(preferencesService.getTimestampPreferences().getTimestampField()).then(invocation -> StandardField.TIMESTAMP);
         entryTypesManager = new BibEntryTypesManager();
         getTestStudyRepository();
     }
@@ -102,11 +95,8 @@ void providePathToNonExistentRepositoryThrowsException() {
         assertThrows(IOException.class, () -> new StudyRepository(
                 nonExistingRepositoryDirectory,
                 gitHandler,
-                generalPreferences,
-                importFormatPreferences,
-                importerPreferences,
+                preferencesService,
                 new DummyFileUpdateMonitor(),
-                savePreferences,
                 entryTypesManager));
     }
 
@@ -178,11 +168,8 @@ private StudyRepository getTestStudyRepository() throws Exception {
         studyRepository = new StudyRepository(
                 tempRepositoryDirectory,
                 gitHandler,
-                generalPreferences,
-                importFormatPreferences,
-                importerPreferences,
+                preferencesService,
                 new DummyFileUpdateMonitor(),
-                savePreferences,
                 entryTypesManager);
         return studyRepository;
     }
diff --git a/src/test/java/org/jabref/logic/database/DatabaseMergerTest.java b/src/test/java/org/jabref/logic/database/DatabaseMergerTest.java
index 0ba97e64a89..a7464dbaed5 100644
--- a/src/test/java/org/jabref/logic/database/DatabaseMergerTest.java
+++ b/src/test/java/org/jabref/logic/database/DatabaseMergerTest.java
@@ -10,7 +10,6 @@
 import org.jabref.model.entry.BibtexString;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
-import org.jabref.model.groups.AbstractGroup;
 import org.jabref.model.groups.AllEntriesGroup;
 import org.jabref.model.groups.ExplicitGroup;
 import org.jabref.model.groups.GroupHierarchyType;
@@ -136,7 +135,7 @@ void mergeBibTexStringsWithSameNameAndContentAreIgnored() {
         new DatabaseMerger(importFormatPreferences.bibEntryPreferences().getKeywordSeparator()).mergeStrings(target, source);
         List<BibtexString> resultStringsSorted = target.getStringValues()
                 .stream()
-                .sorted((s1, s2) -> new BibtexStringComparator(false).compare(s1, s2))
+                .sorted(new BibtexStringComparator(false)::compare)
                 .collect(Collectors.toList());
 
         assertEquals(List.of(targetString1, targetString2), resultStringsSorted);
@@ -146,10 +145,10 @@ void mergeBibTexStringsWithSameNameAndContentAreIgnored() {
     void mergeMetaDataWithoutAllEntriesGroup() {
         MetaData target = new MetaData();
         target.addContentSelector(new ContentSelector(StandardField.AUTHOR, List.of("Test Author")));
-        GroupTreeNode targetRootGroup = new GroupTreeNode(new TestGroup("targetGroup", GroupHierarchyType.INDEPENDENT));
+        GroupTreeNode targetRootGroup = new GroupTreeNode(new ExplicitGroup("targetGroup", GroupHierarchyType.INDEPENDENT, ','));
         target.setGroups(targetRootGroup);
         MetaData other = new MetaData();
-        GroupTreeNode otherRootGroup = new GroupTreeNode(new TestGroup("otherGroup", GroupHierarchyType.INCLUDING));
+        GroupTreeNode otherRootGroup = new GroupTreeNode(new ExplicitGroup("otherGroup", GroupHierarchyType.INCLUDING, ','));
         other.setGroups(otherRootGroup);
         other.addContentSelector(new ContentSelector(StandardField.TITLE, List.of("Test Title")));
         List<ContentSelector> expectedContentSelectors =
@@ -190,26 +189,4 @@ void mergeMetaDataWithAllEntriesGroup() {
         assertEquals(expectedImportedGroupNode, target.getGroups().get().getChildren().get(0));
         assertEquals(expectedContentSelectors, target.getContentSelectorList());
     }
-
-    static class TestGroup extends AbstractGroup {
-
-        protected TestGroup(String name, GroupHierarchyType context) {
-            super(name, context);
-        }
-
-        @Override
-        public boolean contains(BibEntry entry) {
-            return false;
-        }
-
-        @Override
-        public boolean isDynamic() {
-            return false;
-        }
-
-        @Override
-        public AbstractGroup deepCopy() {
-            return null;
-        }
-    }
 }
diff --git a/src/test/java/org/jabref/logic/exporter/BibtexDatabaseWriterTest.java b/src/test/java/org/jabref/logic/exporter/BibtexDatabaseWriterTest.java
index 2fe45f8e6ee..be277db4e5b 100644
--- a/src/test/java/org/jabref/logic/exporter/BibtexDatabaseWriterTest.java
+++ b/src/test/java/org/jabref/logic/exporter/BibtexDatabaseWriterTest.java
@@ -13,7 +13,9 @@
 import java.util.Collections;
 import java.util.List;
 
+import org.jabref.logic.bibtex.FieldPreferences;
 import org.jabref.logic.citationkeypattern.AbstractCitationKeyPattern;
+import org.jabref.logic.citationkeypattern.CitationKeyPatternPreferences;
 import org.jabref.logic.citationkeypattern.DatabaseCitationKeyPattern;
 import org.jabref.logic.citationkeypattern.GlobalCitationKeyPattern;
 import org.jabref.logic.cleanup.FieldFormatterCleanup;
@@ -47,10 +49,8 @@
 import org.jabref.model.groups.GroupHierarchyType;
 import org.jabref.model.groups.GroupTreeNode;
 import org.jabref.model.metadata.MetaData;
-import org.jabref.model.metadata.SaveOrderConfig;
+import org.jabref.model.metadata.SaveOrder;
 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;
@@ -72,28 +72,36 @@ public class BibtexDatabaseWriterTest {
     private MetaData metaData;
     private BibDatabaseContext bibtexContext;
     private ImportFormatPreferences importFormatPreferences;
-    private final FileUpdateMonitor fileMonitor = new DummyFileUpdateMonitor();
-    private GeneralPreferences generalPreferences;
-    private SavePreferences savePreferences;
+    private SelfContainedSaveConfiguration saveConfiguration;
+    private FieldPreferences fieldPreferences;
+    private CitationKeyPatternPreferences citationKeyPatternPreferences;
     private BibEntryTypesManager entryTypesManager;
     private StringWriter stringWriter;
     private BibWriter bibWriter;
 
     @BeforeEach
     void setUp() {
-        generalPreferences = mock(GeneralPreferences.class);
-        savePreferences = mock(SavePreferences.class, Answers.RETURNS_DEEP_STUBS);
-        when(savePreferences.getSaveOrder()).thenReturn(new SaveOrderConfig());
-        when(savePreferences.takeMetadataSaveOrderInAccount()).thenReturn(true);
+        fieldPreferences = new FieldPreferences(true, Collections.emptyList(), Collections.emptyList());
+        saveConfiguration = new SelfContainedSaveConfiguration(SaveOrder.getDefaultSaveOrder(), false, BibDatabaseWriter.SaveType.WITH_JABREF_META_DATA, false);
+        citationKeyPatternPreferences = mock(CitationKeyPatternPreferences.class, Answers.RETURNS_DEEP_STUBS);
         entryTypesManager = new BibEntryTypesManager();
         stringWriter = new StringWriter();
         bibWriter = new BibWriter(stringWriter, OS.NEWLINE);
-        databaseWriter = new BibtexDatabaseWriter(bibWriter, generalPreferences, savePreferences, entryTypesManager);
-
+        initializeDatabaseWriter();
         database = new BibDatabase();
         metaData = new MetaData();
         bibtexContext = new BibDatabaseContext(database, metaData);
         importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        when(importFormatPreferences.fieldPreferences()).thenReturn(fieldPreferences);
+    }
+
+    private void initializeDatabaseWriter() {
+        databaseWriter = new BibtexDatabaseWriter(
+                bibWriter,
+                saveConfiguration,
+                fieldPreferences,
+                citationKeyPatternPreferences,
+                entryTypesManager);
     }
 
     @Test
@@ -353,13 +361,15 @@ void writeEntryWithCustomizedTypeAlsoWritesTypeDeclaration() throws Exception {
                         new OrFields(StandardField.AUTHOR),
                         new OrFields(StandardField.DATE)));
         entryTypesManager.addCustomOrModifiedType(customizedBibType, BibDatabaseMode.BIBTEX);
-        BibEntry entry = new BibEntry(customizedType);
+        BibEntry entry = new BibEntry(customizedType).withCitationKey("key");
+        // needed to get a proper serialization
+        entry.setChanged(true);
         database.insertEntry(entry);
         bibtexContext.setMode(BibDatabaseMode.BIBTEX);
 
         databaseWriter.saveDatabase(bibtexContext);
 
-        assertEquals("@Customizedtype{," + OS.NEWLINE + "}" + OS.NEWLINE + OS.NEWLINE
+        assertEquals("@Customizedtype{key," + OS.NEWLINE + "}" + OS.NEWLINE + OS.NEWLINE
                         + "@Comment{jabref-meta: databaseType:bibtex;}"
                         + OS.NEWLINE + OS.NEWLINE
                         + "@Comment{jabref-entrytype: customizedtype: req[title;author;date] opt[year;month;publisher]}" + OS.NEWLINE,
@@ -386,7 +396,7 @@ void writeCustomizedTypesInAlphabeticalOrder() throws Exception {
         database.insertEntry(entry);
         bibtexContext.setMode(BibDatabaseMode.BIBTEX);
 
-        databaseWriter.savePartOfDatabase(bibtexContext, Arrays.asList(entry, otherEntry));
+        databaseWriter.savePartOfDatabase(bibtexContext, List.of(entry, otherEntry));
 
         assertEquals(
                 "@Customizedtype{," + OS.NEWLINE + "}" + OS.NEWLINE + OS.NEWLINE
@@ -402,9 +412,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));
+        ParserResult result = new BibtexParser(importFormatPreferences).parse(Importer.getReader(testBibtexFile));
 
-        when(savePreferences.shouldSaveInOriginalOrder()).thenReturn(true);
         BibDatabaseContext context = new BibDatabaseContext(result.getDatabase(), result.getMetaData());
 
         databaseWriter.savePartOfDatabase(context, result.getDatabase().getEntries());
@@ -423,7 +432,7 @@ void roundtripUtf8EncodingHeaderRemoved() throws Exception {
                 "  number  = {1}," + OS.NEWLINE +
                 "}" + OS.NEWLINE;
         // @formatter:on
-        ParserResult result = new BibtexParser(importFormatPreferences, fileMonitor).parse(new StringReader(bibtexEntry));
+        ParserResult result = new BibtexParser(importFormatPreferences).parse(new StringReader(bibtexEntry));
         BibDatabaseContext context = new BibDatabaseContext(result.getDatabase(), result.getMetaData());
         databaseWriter.saveDatabase(context);
         // @formatter:off
@@ -440,7 +449,7 @@ void roundtripUtf8EncodingHeaderRemoved() throws Exception {
     @Test
     void roundtripWin1252HeaderKept(@TempDir Path bibFolder) throws Exception {
         Path testFile = Path.of(BibtexImporterTest.class.getResource("encoding-windows-1252-with-header.bib").toURI());
-        ParserResult result = new BibtexImporter(importFormatPreferences, fileMonitor).importDatabase(testFile);
+        ParserResult result = new BibtexImporter(importFormatPreferences, new DummyFileUpdateMonitor()).importDatabase(testFile);
         BibDatabaseContext context = new BibDatabaseContext(result.getDatabase(), result.getMetaData());
 
         Path pathToFile = bibFolder.resolve("JabRef.bib");
@@ -449,7 +458,12 @@ void roundtripWin1252HeaderKept(@TempDir Path bibFolder) throws Exception {
 
         try (BufferedWriter fileWriter = Files.newBufferedWriter(file, charset)) {
             BibWriter bibWriter = new BibWriter(fileWriter, context.getDatabase().getNewLineSeparator());
-            BibtexDatabaseWriter databaseWriter = new BibtexDatabaseWriter(bibWriter, generalPreferences, savePreferences, entryTypesManager);
+            BibtexDatabaseWriter databaseWriter = new BibtexDatabaseWriter(
+                    bibWriter,
+                    saveConfiguration,
+                    fieldPreferences,
+                    citationKeyPatternPreferences,
+                    entryTypesManager);
             databaseWriter.saveDatabase(context);
         }
 
@@ -459,7 +473,7 @@ void roundtripWin1252HeaderKept(@TempDir Path bibFolder) throws Exception {
     @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);
+        ParserResult result = new BibtexImporter(importFormatPreferences, new DummyFileUpdateMonitor()).importDatabase(testFile);
         BibDatabaseContext context = new BibDatabaseContext(result.getDatabase(), result.getMetaData());
 
         Path pathToFile = bibFolder.resolve("JabRef.bib");
@@ -468,7 +482,12 @@ void roundtripUtf8HeaderKept(@TempDir Path bibFolder) throws Exception {
 
         try (BufferedWriter fileWriter = Files.newBufferedWriter(file, charset)) {
             BibWriter bibWriter = new BibWriter(fileWriter, context.getDatabase().getNewLineSeparator());
-            BibtexDatabaseWriter databaseWriter = new BibtexDatabaseWriter(bibWriter, generalPreferences, savePreferences, entryTypesManager);
+            BibtexDatabaseWriter databaseWriter = new BibtexDatabaseWriter(
+                    bibWriter,
+                    saveConfiguration,
+                    fieldPreferences,
+                    citationKeyPatternPreferences,
+                    entryTypesManager);
             databaseWriter.saveDatabase(context);
         }
 
@@ -478,7 +497,7 @@ void roundtripUtf8HeaderKept(@TempDir Path bibFolder) throws Exception {
     @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);
+        ParserResult result = new BibtexImporter(importFormatPreferences, new DummyFileUpdateMonitor()).importDatabase(testFile);
         BibDatabaseContext context = new BibDatabaseContext(result.getDatabase(), result.getMetaData());
 
         Path pathToFile = bibFolder.resolve("JabRef.bib");
@@ -487,7 +506,12 @@ void roundtripNotExplicitUtf8HeaderNotInsertedDuringWrite(@TempDir Path bibFolde
 
         try (BufferedWriter fileWriter = Files.newBufferedWriter(file, charset)) {
             BibWriter bibWriter = new BibWriter(fileWriter, context.getDatabase().getNewLineSeparator());
-            BibtexDatabaseWriter databaseWriter = new BibtexDatabaseWriter(bibWriter, generalPreferences, savePreferences, entryTypesManager);
+            BibtexDatabaseWriter databaseWriter = new BibtexDatabaseWriter(
+                    bibWriter,
+                    saveConfiguration,
+                    fieldPreferences,
+                    citationKeyPatternPreferences,
+                    entryTypesManager);
             databaseWriter.saveDatabase(context);
         }
 
@@ -498,11 +522,17 @@ void roundtripNotExplicitUtf8HeaderNotInsertedDuringWrite(@TempDir Path bibFolde
     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));
+        ParserResult result = new BibtexParser(importFormatPreferences).parse(Importer.getReader(testBibtexFile));
 
-        when(savePreferences.shouldSaveInOriginalOrder()).thenReturn(true);
         BibDatabaseContext context = new BibDatabaseContext(result.getDatabase(), result.getMetaData());
 
+        BibWriter bibWriter = new BibWriter(stringWriter, context.getDatabase().getNewLineSeparator());
+        BibtexDatabaseWriter databaseWriter = new BibtexDatabaseWriter(
+                bibWriter,
+                saveConfiguration,
+                fieldPreferences,
+                citationKeyPatternPreferences,
+                entryTypesManager);
         databaseWriter.savePartOfDatabase(context, result.getDatabase().getEntries());
         assertEquals(Files.readString(testBibtexFile, encoding), stringWriter.toString());
     }
@@ -511,9 +541,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));
+        ParserResult result = new BibtexParser(importFormatPreferences).parse(Importer.getReader(testBibtexFile));
 
-        when(savePreferences.shouldSaveInOriginalOrder()).thenReturn(true);
         BibDatabaseContext context = new BibDatabaseContext(result.getDatabase(), result.getMetaData());
 
         databaseWriter.savePartOfDatabase(context, result.getDatabase().getEntries());
@@ -532,17 +561,21 @@ void roundtripWithOneUserCommentAndEntryChange() throws Exception {
 
         // read in bibtex string
         ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        ParserResult result = new BibtexParser(importFormatPreferences, new DummyFileUpdateMonitor()).parse(new StringReader(bibEntry));
+        ParserResult result = new BibtexParser(importFormatPreferences).parse(new StringReader(bibEntry));
 
         BibEntry entry = result.getDatabase().getEntryByCitationKey("1137631").get();
         entry.setField(StandardField.AUTHOR, "Mr. Author");
 
-        when(savePreferences.shouldSaveInOriginalOrder()).thenReturn(true);
         BibDatabaseContext context = new BibDatabaseContext(result.getDatabase(), result.getMetaData());
 
         // we need a new writer because "\n" instead of "OS.NEWLINE"
         bibWriter = new BibWriter(stringWriter, "\n");
-        databaseWriter = new BibtexDatabaseWriter(bibWriter, generalPreferences, savePreferences, entryTypesManager);
+        databaseWriter = new BibtexDatabaseWriter(
+                bibWriter,
+                saveConfiguration,
+                fieldPreferences,
+                citationKeyPatternPreferences,
+                entryTypesManager);
         databaseWriter.savePartOfDatabase(context, result.getDatabase().getEntries());
         assertEquals(bibEntry, stringWriter.toString());
     }
@@ -561,17 +594,21 @@ void roundtripWithTwoEntriesAndOneUserCommentAndEntryChange() throws Exception {
 
         // read in bibtex string
         ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        ParserResult result = new BibtexParser(importFormatPreferences, new DummyFileUpdateMonitor()).parse(new StringReader(bibEntry));
+        ParserResult result = new BibtexParser(importFormatPreferences).parse(new StringReader(bibEntry));
 
         BibEntry entry = result.getDatabase().getEntryByCitationKey("1137631").get();
         entry.setField(StandardField.AUTHOR, "Mr. Author");
 
-        when(savePreferences.shouldSaveInOriginalOrder()).thenReturn(true);
         BibDatabaseContext context = new BibDatabaseContext(result.getDatabase(), result.getMetaData());
 
         // we need a new writer because "\n" instead of "OS.NEWLINE"
         bibWriter = new BibWriter(stringWriter, "\n");
-        databaseWriter = new BibtexDatabaseWriter(bibWriter, generalPreferences, savePreferences, entryTypesManager);
+        databaseWriter = new BibtexDatabaseWriter(
+                bibWriter,
+                saveConfiguration,
+                fieldPreferences,
+                citationKeyPatternPreferences,
+                entryTypesManager);
         databaseWriter.savePartOfDatabase(context, result.getDatabase().getEntries());
         assertEquals(bibEntry, stringWriter.toString());
     }
@@ -580,12 +617,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));
+        ParserResult result = new BibtexParser(importFormatPreferences).parse(Importer.getReader(testBibtexFile));
 
         BibEntry entry = result.getDatabase().getEntryByCitationKey("1137631").get();
         entry.setField(StandardField.AUTHOR, "Mr. Author");
 
-        when(savePreferences.shouldSaveInOriginalOrder()).thenReturn(true);
         BibDatabaseContext context = new BibDatabaseContext(result.getDatabase(), result.getMetaData());
 
         databaseWriter.savePartOfDatabase(context, result.getDatabase().getEntries());
@@ -596,14 +632,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));
+        ParserResult result = new BibtexParser(importFormatPreferences).parse(Importer.getReader(testBibtexFile));
 
         for (BibtexString string : result.getDatabase().getStringValues()) {
             // Mark them as changed
             string.setContent(string.getContent());
         }
 
-        when(savePreferences.shouldSaveInOriginalOrder()).thenReturn(true);
         BibDatabaseContext context = new BibDatabaseContext(result.getDatabase(), result.getMetaData());
 
         databaseWriter.savePartOfDatabase(context, result.getDatabase().getEntries());
@@ -615,9 +650,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));
+        ParserResult result = new BibtexParser(importFormatPreferences).parse(Importer.getReader(testBibtexFile));
 
-        when(savePreferences.shouldSaveInOriginalOrder()).thenReturn(true);
         BibDatabaseContext context = new BibDatabaseContext(result.getDatabase(), result.getMetaData());
 
         databaseWriter.savePartOfDatabase(context, result.getDatabase().getEntries());
@@ -640,14 +674,14 @@ void writeSavedSerializationOfEntryIfUnchanged() throws Exception {
 
     @Test
     void reformatEntryIfAskedToDoSo() throws Exception {
-        BibEntry entry = new BibEntry();
-        entry.setType(StandardEntryType.Article);
-        entry.setField(StandardField.AUTHOR, "Mr. author");
+        BibEntry entry = new BibEntry(StandardEntryType.Article)
+                .withField(StandardField.AUTHOR, "Mr. author");
         entry.setParsedSerialization("wrong serialization");
         entry.setChanged(false);
         database.insertEntry(entry);
 
-        when(savePreferences.shouldReformatFile()).thenReturn(true);
+        saveConfiguration = new SelfContainedSaveConfiguration(SaveOrder.getDefaultSaveOrder(), false, BibDatabaseWriter.SaveType.WITH_JABREF_META_DATA, true);
+        initializeDatabaseWriter();
         databaseWriter.savePartOfDatabase(bibtexContext, Collections.singletonList(entry));
 
         assertEquals("@Article{," + OS.NEWLINE + "  author = {Mr. author}," + OS.NEWLINE + "}"
@@ -672,7 +706,8 @@ void reformatStringIfAskedToDoSo() throws Exception {
         string.setParsedSerialization("wrong serialization");
         database.addString(string);
 
-        when(savePreferences.shouldReformatFile()).thenReturn(true);
+        saveConfiguration = new SelfContainedSaveConfiguration(SaveOrder.getDefaultSaveOrder(), false, BibDatabaseWriter.SaveType.WITH_JABREF_META_DATA, true);
+        initializeDatabaseWriter();
         databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
 
         assertEquals("@String{name = {content}}" + OS.NEWLINE, stringWriter.toString());
@@ -689,22 +724,23 @@ void writeSaveActions() throws Exception {
 
         databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
 
+        // The order should be kept (the cleanups are a list, not a set)
         assertEquals("@Comment{jabref-meta: saveActions:enabled;"
                         + OS.NEWLINE
-                        + "day[upper_case]" + OS.NEWLINE
-                        + "journal[title_case]" + OS.NEWLINE
                         + "title[lower_case]" + OS.NEWLINE
+                        + "journal[title_case]" + OS.NEWLINE
+                        + "day[upper_case]" + OS.NEWLINE
                         + ";}"
                         + OS.NEWLINE, stringWriter.toString());
     }
 
     @Test
     void writeSaveOrderConfig() throws Exception {
-        SaveOrderConfig saveOrderConfig = new SaveOrderConfig(SaveOrderConfig.OrderType.SPECIFIED,
-                List.of(new SaveOrderConfig.SortCriterion(StandardField.AUTHOR, false),
-                        new SaveOrderConfig.SortCriterion(StandardField.YEAR, true),
-                        new SaveOrderConfig.SortCriterion(StandardField.ABSTRACT, false)));
-        metaData.setSaveOrderConfig(saveOrderConfig);
+        SaveOrder saveOrder = new SaveOrder(SaveOrder.OrderType.SPECIFIED,
+                List.of(new SaveOrder.SortCriterion(StandardField.AUTHOR, false),
+                        new SaveOrder.SortCriterion(StandardField.YEAR, true),
+                        new SaveOrder.SortCriterion(StandardField.ABSTRACT, false)));
+        metaData.setSaveOrder(saveOrder);
 
         databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
 
@@ -761,30 +797,28 @@ void writeFileDirectories() throws Exception {
 
     @Test
     void writeEntriesSorted() throws Exception {
-        SaveOrderConfig saveOrderConfig = new SaveOrderConfig(SaveOrderConfig.OrderType.SPECIFIED,
-                List.of(new SaveOrderConfig.SortCriterion(StandardField.AUTHOR, false),
-                        new SaveOrderConfig.SortCriterion(StandardField.YEAR, true),
-                        new SaveOrderConfig.SortCriterion(StandardField.ABSTRACT, false)));
-        metaData.setSaveOrderConfig(saveOrderConfig);
+        SaveOrder saveOrder = new SaveOrder(SaveOrder.OrderType.SPECIFIED,
+                List.of(new SaveOrder.SortCriterion(StandardField.AUTHOR, false),
+                        new SaveOrder.SortCriterion(StandardField.YEAR, true),
+                        new SaveOrder.SortCriterion(StandardField.ABSTRACT, false)));
+        metaData.setSaveOrder(saveOrder);
 
-        BibEntry firstEntry = new BibEntry();
-        firstEntry.setType(StandardEntryType.Article);
-        firstEntry.setField(StandardField.AUTHOR, "A");
-        firstEntry.setField(StandardField.YEAR, "2010");
+        BibEntry firstEntry = new BibEntry(StandardEntryType.Article)
+                .withField(StandardField.AUTHOR, "A")
+                .withField(StandardField.YEAR, "2010")
+                .withChanged(true);
 
-        BibEntry secondEntry = new BibEntry();
-        secondEntry.setType(StandardEntryType.Article);
-        secondEntry.setField(StandardField.AUTHOR, "A");
-        secondEntry.setField(StandardField.YEAR, "2000");
+        BibEntry secondEntry = new BibEntry(StandardEntryType.Article)
+                .withField(StandardField.AUTHOR, "A")
+                .withField(StandardField.YEAR, "2000")
+                .withChanged(true);
 
-        BibEntry thirdEntry = new BibEntry();
-        thirdEntry.setType(StandardEntryType.Article);
-        thirdEntry.setField(StandardField.AUTHOR, "B");
-        thirdEntry.setField(StandardField.YEAR, "2000");
+        BibEntry thirdEntry = new BibEntry(StandardEntryType.Article)
+                .withField(StandardField.AUTHOR, "B")
+                .withField(StandardField.YEAR, "2000")
+                .withChanged(true);
 
-        database.insertEntry(secondEntry);
-        database.insertEntry(thirdEntry);
-        database.insertEntry(firstEntry);
+        database.insertEntries(secondEntry, thirdEntry, firstEntry);
 
         databaseWriter.savePartOfDatabase(bibtexContext, database.getEntries());
 
@@ -826,7 +860,6 @@ void writeEntriesInOriginalOrderWhenNoSaveOrderConfigIsSetInMetadata() throws Ex
         database.insertEntry(secondEntry);
         database.insertEntry(thirdEntry);
 
-        when(savePreferences.shouldSaveInOriginalOrder()).thenReturn(false);
         databaseWriter.savePartOfDatabase(bibtexContext, database.getEntries());
 
         assertEquals("@Article{," + OS.NEWLINE +
@@ -882,9 +915,8 @@ void roundtripWithContentSelectorsAndUmlauts() throws Exception {
         String fileContent = encodingHeader + commentEntry;
         Charset encoding = StandardCharsets.UTF_8;
 
-        ParserResult firstParse = new BibtexParser(importFormatPreferences, fileMonitor).parse(new StringReader(fileContent));
+        ParserResult firstParse = new BibtexParser(importFormatPreferences).parse(new StringReader(fileContent));
 
-        when(savePreferences.shouldSaveInOriginalOrder()).thenReturn(true);
         BibDatabaseContext context = new BibDatabaseContext(firstParse.getDatabase(), firstParse.getMetaData());
 
         databaseWriter.savePartOfDatabase(context, firstParse.getDatabase().getEntries());
@@ -905,7 +937,7 @@ void saveAlsoSavesSecondModification() throws Exception {
 
         // read in bibtex string
         ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        ParserResult firstParse = new BibtexParser(importFormatPreferences, new DummyFileUpdateMonitor()).parse(new StringReader(bibtexEntry));
+        ParserResult firstParse = new BibtexParser(importFormatPreferences).parse(new StringReader(bibtexEntry));
         Collection<BibEntry> entries = firstParse.getDatabase().getEntries();
         BibEntry entry = entries.iterator().next();
 
@@ -923,7 +955,12 @@ void saveAlsoSavesSecondModification() throws Exception {
         // write a second time
         stringWriter = new StringWriter();
         bibWriter = new BibWriter(stringWriter, OS.NEWLINE);
-        databaseWriter = new BibtexDatabaseWriter(bibWriter, generalPreferences, savePreferences, entryTypesManager);
+        databaseWriter = new BibtexDatabaseWriter(
+                bibWriter,
+                saveConfiguration,
+                fieldPreferences,
+                citationKeyPatternPreferences,
+                entryTypesManager);
         databaseWriter.savePartOfDatabase(context, firstParse.getDatabase().getEntries());
 
         assertEquals("@Article{test," + OS.NEWLINE +
@@ -998,7 +1035,12 @@ void saveReturnsToOriginalEntryWhenEntryIsFlaggedUnchangedEvenInThePresenceOfSav
         // write a second time
         stringWriter = new StringWriter();
         bibWriter = new BibWriter(stringWriter, OS.NEWLINE);
-        databaseWriter = new BibtexDatabaseWriter(bibWriter, generalPreferences, savePreferences, entryTypesManager);
+        databaseWriter = new BibtexDatabaseWriter(
+                bibWriter,
+                saveConfiguration,
+                fieldPreferences,
+                citationKeyPatternPreferences,
+                entryTypesManager);
         databaseWriter.savePartOfDatabase(context, firstParse.getDatabase().getEntries());
 
         // returns tu original entry, not to the last saved one
diff --git a/src/test/java/org/jabref/logic/exporter/CsvExportFormatTest.java b/src/test/java/org/jabref/logic/exporter/CsvExportFormatTest.java
index 584f73e109f..53342e7d7fa 100644
--- a/src/test/java/org/jabref/logic/exporter/CsvExportFormatTest.java
+++ b/src/test/java/org/jabref/logic/exporter/CsvExportFormatTest.java
@@ -3,17 +3,14 @@
 import java.io.File;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 import org.jabref.logic.layout.LayoutFormatterPreferences;
-import org.jabref.logic.xmp.XmpPreferences;
+import org.jabref.logic.util.StandardFileType;
 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.model.entry.field.StandardField;
+import org.jabref.model.metadata.SaveOrder;
 
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -31,14 +28,14 @@ public class CsvExportFormatTest {
 
     @BeforeEach
     public void setUp() {
-        List<TemplateExporter> customFormats = new ArrayList<>();
-        LayoutFormatterPreferences layoutPreferences = mock(LayoutFormatterPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        SavePreferences savePreferences = mock(SavePreferences.class);
-        XmpPreferences xmpPreferences = mock(XmpPreferences.class);
-        BibEntryTypesManager entryTypesManager = mock(BibEntryTypesManager.class);
-        ExporterFactory exporterFactory = ExporterFactory.create(customFormats, layoutPreferences, savePreferences, xmpPreferences, BibDatabaseMode.BIBTEX, entryTypesManager);
-
-        exportFormat = exporterFactory.getExporterByName("oocsv").get();
+        exportFormat = new TemplateExporter(
+                "OpenOffice/LibreOffice CSV",
+                "oocsv",
+                "openoffice-csv",
+                "openoffice",
+                StandardFileType.CSV,
+                mock(LayoutFormatterPreferences.class, Answers.RETURNS_DEEP_STUBS),
+                SaveOrder.getDefaultSaveOrder());
 
         databaseContext = new BibDatabaseContext();
     }
@@ -52,9 +49,8 @@ public void tearDown() {
     public void testPerformExportForSingleAuthor(@TempDir Path testFolder) throws Exception {
         Path path = testFolder.resolve("ThisIsARandomlyNamedFile");
 
-        BibEntry entry = new BibEntry();
-        entry.setField(StandardField.AUTHOR, "Someone, Van Something");
-        List<BibEntry> entries = Arrays.asList(entry);
+        BibEntry entry = new BibEntry().withField(StandardField.AUTHOR, "Someone, Van Something");
+        List<BibEntry> entries = List.of(entry);
 
         exportFormat.export(databaseContext, path, entries);
 
@@ -69,9 +65,8 @@ public void testPerformExportForSingleAuthor(@TempDir Path testFolder) throws Ex
     public void testPerformExportForMultipleAuthors(@TempDir Path testFolder) throws Exception {
         Path path = testFolder.resolve("ThisIsARandomlyNamedFile");
 
-        BibEntry entry = new BibEntry();
-        entry.setField(StandardField.AUTHOR, "von Neumann, John and Smith, John and Black Brown, Peter");
-        List<BibEntry> entries = Arrays.asList(entry);
+        BibEntry entry = new BibEntry().withField(StandardField.AUTHOR, "von Neumann, John and Smith, John and Black Brown, Peter");
+        List<BibEntry> entries = List.of(entry);
 
         exportFormat.export(databaseContext, path, entries);
 
@@ -86,9 +81,8 @@ public void testPerformExportForMultipleAuthors(@TempDir Path testFolder) throws
     public void testPerformExportForSingleEditor(@TempDir Path testFolder) throws Exception {
         Path path = testFolder.resolve("ThisIsARandomlyNamedFile");
         File tmpFile = path.toFile();
-        BibEntry entry = new BibEntry();
-        entry.setField(StandardField.EDITOR, "Someone, Van Something");
-        List<BibEntry> entries = Arrays.asList(entry);
+        BibEntry entry = new BibEntry().withField(StandardField.EDITOR, "Someone, Van Something");
+        List<BibEntry> entries = List.of(entry);
 
         exportFormat.export(databaseContext, tmpFile.toPath(), entries);
 
@@ -103,9 +97,9 @@ public void testPerformExportForSingleEditor(@TempDir Path testFolder) throws Ex
     public void testPerformExportForMultipleEditors(@TempDir Path testFolder) throws Exception {
         Path path = testFolder.resolve("ThisIsARandomlyNamedFile");
         File tmpFile = path.toFile();
-        BibEntry entry = new BibEntry();
-        entry.setField(StandardField.EDITOR, "von Neumann, John and Smith, John and Black Brown, Peter");
-        List<BibEntry> entries = Arrays.asList(entry);
+        BibEntry entry = new BibEntry()
+                .withField(StandardField.EDITOR, "von Neumann, John and Smith, John and Black Brown, Peter");
+        List<BibEntry> entries = List.of(entry);
 
         exportFormat.export(databaseContext, tmpFile.toPath(), entries);
 
diff --git a/src/test/java/org/jabref/logic/exporter/DocBook5ExporterTest.java b/src/test/java/org/jabref/logic/exporter/DocBook5ExporterTest.java
index 34e6838a8ab..07877f9c255 100644
--- a/src/test/java/org/jabref/logic/exporter/DocBook5ExporterTest.java
+++ b/src/test/java/org/jabref/logic/exporter/DocBook5ExporterTest.java
@@ -6,18 +6,17 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.time.LocalDate;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
 import org.jabref.logic.layout.LayoutFormatterPreferences;
-import org.jabref.logic.xmp.XmpPreferences;
+import org.jabref.logic.util.StandardFileType;
 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.model.entry.Date;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
+import org.jabref.model.metadata.SaveOrder;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -43,27 +42,26 @@ public class DocBook5ExporterTest {
 
     @BeforeEach
     void setUp() throws URISyntaxException {
-        xmlFile = Path.of(DocBook5ExporterTest.class.getResource("Docbook5ExportFormat.xml").toURI());
-
-        List<TemplateExporter> customFormats = new ArrayList<>();
-        LayoutFormatterPreferences layoutPreferences = mock(LayoutFormatterPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        SavePreferences savePreferences = mock(SavePreferences.class);
-        XmpPreferences xmpPreferences = mock(XmpPreferences.class);
-        BibEntryTypesManager entryTypesManager = mock(BibEntryTypesManager.class);
-        ExporterFactory exporterFactory = ExporterFactory.create(customFormats, layoutPreferences, savePreferences, xmpPreferences, BibDatabaseMode.BIBTEX, entryTypesManager);
-
-        exporter = exporterFactory.getExporterByName("docbook5").get();
+        exporter = new TemplateExporter(
+                "DocBook 5.1",
+                "docbook5",
+                "docbook5",
+                null,
+                StandardFileType.XML,
+                mock(LayoutFormatterPreferences.class, Answers.RETURNS_DEEP_STUBS),
+                SaveOrder.getDefaultSaveOrder());
 
         LocalDate myDate = LocalDate.of(2018, 1, 1);
 
+        xmlFile = Path.of(DocBook5ExporterTest.class.getResource("Docbook5ExportFormat.xml").toURI());
         databaseContext = new BibDatabaseContext();
         charset = StandardCharsets.UTF_8;
-        BibEntry entry = new BibEntry(StandardEntryType.Book);
-        entry.setField(StandardField.TITLE, "my paper title");
-        entry.setField(StandardField.AUTHOR, "Stefan Kolb and Tobias Diez");
-        entry.setField(StandardField.ISBN, "1-2-34");
-        entry.setCitationKey("mykey");
-        entry.setDate(new org.jabref.model.entry.Date(myDate));
+        BibEntry entry = new BibEntry(StandardEntryType.Book)
+                .withField(StandardField.TITLE, "my paper title")
+                .withField(StandardField.AUTHOR, "Stefan Kolb and Tobias Diez")
+                .withField(StandardField.ISBN, "1-2-34")
+                .withCitationKey("mykey")
+                .withDate(new Date(myDate));
         entries = Collections.singletonList(entry);
     }
 
diff --git a/src/test/java/org/jabref/logic/exporter/DocbookExporterTest.java b/src/test/java/org/jabref/logic/exporter/DocbookExporterTest.java
index 6a068df5b27..23221d0311a 100644
--- a/src/test/java/org/jabref/logic/exporter/DocbookExporterTest.java
+++ b/src/test/java/org/jabref/logic/exporter/DocbookExporterTest.java
@@ -4,17 +4,15 @@
 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 org.jabref.logic.layout.LayoutFormatterPreferences;
-import org.jabref.logic.xmp.XmpPreferences;
+import org.jabref.logic.util.StandardFileType;
 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.model.entry.field.StandardField;
+import org.jabref.model.metadata.SaveOrder;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -33,14 +31,14 @@ public class DocbookExporterTest {
 
     @BeforeEach
     public void setUp() {
-        List<TemplateExporter> customFormats = new ArrayList<>();
-        LayoutFormatterPreferences layoutPreferences = mock(LayoutFormatterPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        SavePreferences savePreferences = mock(SavePreferences.class);
-        XmpPreferences xmpPreferences = mock(XmpPreferences.class);
-        BibEntryTypesManager entryTypesManager = mock(BibEntryTypesManager.class);
-        ExporterFactory exporterFactory = ExporterFactory.create(customFormats, layoutPreferences, savePreferences, xmpPreferences, BibDatabaseMode.BIBTEX, entryTypesManager);
-
-        exportFormat = exporterFactory.getExporterByName("docbook4").get();
+        exportFormat = new TemplateExporter(
+                "DocBook 4",
+                "docbook4",
+                "docbook4",
+                null,
+                StandardFileType.XML,
+                mock(LayoutFormatterPreferences.class, Answers.RETURNS_DEEP_STUBS),
+                SaveOrder.getDefaultSaveOrder());
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/exporter/EmbeddedBibFilePdfExporterTest.java b/src/test/java/org/jabref/logic/exporter/EmbeddedBibFilePdfExporterTest.java
index a15c380418d..dc669e07dac 100644
--- a/src/test/java/org/jabref/logic/exporter/EmbeddedBibFilePdfExporterTest.java
+++ b/src/test/java/org/jabref/logic/exporter/EmbeddedBibFilePdfExporterTest.java
@@ -2,11 +2,12 @@
 
 import java.io.IOException;
 import java.nio.file.Path;
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Stream;
 
-import org.jabref.logic.bibtex.FieldContentFormatterPreferences;
-import org.jabref.logic.bibtex.FieldWriterPreferences;
+import org.jabref.logic.bibtex.FieldPreferences;
+import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.database.BibDatabaseMode;
@@ -42,7 +43,7 @@ class EmbeddedBibFilePdfExporterTest {
     private EmbeddedBibFilePdfExporter exporter;
 
     private BibDatabaseContext databaseContext;
-    private BibDatabase dataBase;
+    private JournalAbbreviationRepository abbreviationRepository;
     private FilePreferences filePreferences;
 
     private static void initBibEntries() throws IOException {
@@ -93,21 +94,23 @@ private static void initBibEntries() throws IOException {
      */
     @BeforeEach
     void setUp() throws IOException {
+        abbreviationRepository = mock(JournalAbbreviationRepository.class);
+
         filePreferences = mock(FilePreferences.class);
-        when(filePreferences.getUser()).thenReturn(tempDir.toAbsolutePath().toString());
+        when(filePreferences.getUserAndHost()).thenReturn(tempDir.toAbsolutePath().toString());
         when(filePreferences.shouldStoreFilesRelativeToBibFile()).thenReturn(false);
 
         BibDatabaseMode bibDatabaseMode = BibDatabaseMode.BIBTEX;
         BibEntryTypesManager bibEntryTypesManager = new BibEntryTypesManager();
-        FieldWriterPreferences fieldWriterPreferences = new FieldWriterPreferences(
+        FieldPreferences fieldPreferences = new FieldPreferences(
                 true,
                 List.of(StandardField.MONTH),
-                new FieldContentFormatterPreferences());
+                Collections.emptyList());
 
-        exporter = new EmbeddedBibFilePdfExporter(bibDatabaseMode, bibEntryTypesManager, fieldWriterPreferences);
+        exporter = new EmbeddedBibFilePdfExporter(bibDatabaseMode, bibEntryTypesManager, fieldPreferences);
 
         databaseContext = new BibDatabaseContext();
-        dataBase = databaseContext.getDatabase();
+        BibDatabase dataBase = databaseContext.getDatabase();
 
         initBibEntries();
         dataBase.insertEntry(olly2018);
@@ -118,13 +121,13 @@ void setUp() throws IOException {
     @ParameterizedTest
     @MethodSource("provideBibEntriesWithValidPdfFileLinks")
     void successfulExportToAllFilesOfEntry(BibEntry bibEntryWithValidPdfFileLink) throws Exception {
-        assertTrue(exporter.exportToAllFilesOfEntry(databaseContext, filePreferences, bibEntryWithValidPdfFileLink, List.of(olly2018)));
+        assertTrue(exporter.exportToAllFilesOfEntry(databaseContext, filePreferences, bibEntryWithValidPdfFileLink, List.of(olly2018), abbreviationRepository));
     }
 
     @ParameterizedTest
     @MethodSource("provideBibEntriesWithInvalidPdfFileLinks")
     void unsuccessfulExportToAllFilesOfEntry(BibEntry bibEntryWithValidPdfFileLink) throws Exception {
-        assertFalse(exporter.exportToAllFilesOfEntry(databaseContext, filePreferences, bibEntryWithValidPdfFileLink, List.of(olly2018)));
+        assertFalse(exporter.exportToAllFilesOfEntry(databaseContext, filePreferences, bibEntryWithValidPdfFileLink, List.of(olly2018), abbreviationRepository));
     }
 
     public static Stream<Arguments> provideBibEntriesWithValidPdfFileLinks() {
@@ -138,13 +141,13 @@ public static Stream<Arguments> provideBibEntriesWithInvalidPdfFileLinks() {
     @ParameterizedTest
     @MethodSource("providePathsToValidPDFs")
     void successfulExportToFileByPath(Path path) throws Exception {
-        assertTrue(exporter.exportToFileByPath(databaseContext, dataBase, filePreferences, path));
+        assertTrue(exporter.exportToFileByPath(databaseContext, filePreferences, path, abbreviationRepository));
     }
 
     @ParameterizedTest
     @MethodSource("providePathsToInvalidPDFs")
     void unsuccessfulExportToFileByPath(Path path) throws Exception {
-        assertFalse(exporter.exportToFileByPath(databaseContext, dataBase, filePreferences, path));
+        assertFalse(exporter.exportToFileByPath(databaseContext, filePreferences, path, abbreviationRepository));
     }
 
     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 fddc690af10..b6e4c026e9b 100644
--- a/src/test/java/org/jabref/logic/exporter/ExporterTest.java
+++ b/src/test/java/org/jabref/logic/exporter/ExporterTest.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.ArrayList;
@@ -10,15 +8,13 @@
 import java.util.List;
 import java.util.stream.Stream;
 
-import org.jabref.logic.bibtex.FieldContentFormatterPreferences;
-import org.jabref.logic.bibtex.FieldWriterPreferences;
-import org.jabref.logic.layout.LayoutFormatterPreferences;
-import org.jabref.logic.xmp.XmpPreferences;
+import javafx.collections.FXCollections;
+
 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.model.entry.field.StandardField;
+import org.jabref.model.metadata.SaveOrder;
+import org.jabref.preferences.PreferencesService;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.io.TempDir;
@@ -34,27 +30,24 @@
 public class ExporterTest {
 
     public BibDatabaseContext databaseContext;
-    public Charset charset;
     public List<BibEntry> entries;
 
     @BeforeEach
     public void setUp() {
         databaseContext = new BibDatabaseContext();
-        charset = StandardCharsets.UTF_8;
         entries = Collections.emptyList();
     }
 
     private static Stream<Object[]> exportFormats() {
-        Collection<Object[]> result = new ArrayList<>();
+        PreferencesService preferencesService = mock(PreferencesService.class, Answers.RETURNS_DEEP_STUBS);
+        when(preferencesService.getExportPreferences().getExportSaveOrder()).thenReturn(SaveOrder.getDefaultSaveOrder());
+        when(preferencesService.getExportPreferences().getCustomExporters()).thenReturn(FXCollections.emptyObservableList());
 
-        List<TemplateExporter> customFormats = new ArrayList<>();
-        LayoutFormatterPreferences layoutPreferences = mock(LayoutFormatterPreferences.class);
-        SavePreferences savePreferences = mock(SavePreferences.class, Answers.RETURNS_DEEP_STUBS);
-        when(savePreferences.getFieldWriterPreferences()).thenReturn(new FieldWriterPreferences(true, List.of(StandardField.MONTH), new FieldContentFormatterPreferences()));
-        XmpPreferences xmpPreferences = mock(XmpPreferences.class);
-        BibEntryTypesManager entryTypesManager = mock(BibEntryTypesManager.class);
-        ExporterFactory exporterFactory = ExporterFactory.create(customFormats, layoutPreferences, savePreferences, xmpPreferences, BibDatabaseMode.BIBTEX, entryTypesManager);
+        ExporterFactory exporterFactory = ExporterFactory.create(
+                preferencesService,
+                mock(BibEntryTypesManager.class));
 
+        Collection<Object[]> result = new ArrayList<>();
         for (Exporter format : exporterFactory.getExporters()) {
             result.add(new Object[]{format, format.getName()});
         }
diff --git a/src/test/java/org/jabref/logic/exporter/GroupSerializerTest.java b/src/test/java/org/jabref/logic/exporter/GroupSerializerTest.java
index 1753495506a..da190c5de0a 100644
--- a/src/test/java/org/jabref/logic/exporter/GroupSerializerTest.java
+++ b/src/test/java/org/jabref/logic/exporter/GroupSerializerTest.java
@@ -26,7 +26,6 @@
 import org.jabref.model.groups.WordKeywordGroup;
 import org.jabref.model.metadata.MetaData;
 import org.jabref.model.search.rules.SearchRules;
-import org.jabref.model.util.DummyFileUpdateMonitor;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -119,7 +118,7 @@ void serializeSingleAutomaticPersonGroup() {
 
     @Test
     void serializeSingleTexGroup() throws Exception {
-        TexGroup group = TexGroup.createWithoutFileMonitoring("myTexGroup", GroupHierarchyType.INDEPENDENT, Path.of("path", "To", "File"), new DefaultAuxParser(new BibDatabase()), new DummyFileUpdateMonitor(), new MetaData());
+        TexGroup group = TexGroup.create("myTexGroup", GroupHierarchyType.INDEPENDENT, Path.of("path", "To", "File"), new DefaultAuxParser(new BibDatabase()), new MetaData());
         List<String> serialization = groupSerializer.serializeTree(GroupTreeNode.fromGroup(group));
         assertEquals(Collections.singletonList("0 TexGroup:myTexGroup;0;path/To/File;1;;;;"), serialization);
     }
diff --git a/src/test/java/org/jabref/logic/exporter/HtmlExportFormatTest.java b/src/test/java/org/jabref/logic/exporter/HtmlExportFormatTest.java
index b0157678ecd..b684e84a2e4 100644
--- a/src/test/java/org/jabref/logic/exporter/HtmlExportFormatTest.java
+++ b/src/test/java/org/jabref/logic/exporter/HtmlExportFormatTest.java
@@ -4,17 +4,14 @@
 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 org.jabref.logic.layout.LayoutFormatterPreferences;
-import org.jabref.logic.xmp.XmpPreferences;
+import org.jabref.logic.util.StandardFileType;
 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.model.entry.field.StandardField;
+import org.jabref.model.metadata.SaveOrder;
 
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -33,14 +30,13 @@ public class HtmlExportFormatTest {
 
     @BeforeEach
     public void setUp() {
-        List<TemplateExporter> customFormats = new ArrayList<>();
-        LayoutFormatterPreferences layoutPreferences = mock(LayoutFormatterPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        SavePreferences savePreferences = mock(SavePreferences.class);
-        XmpPreferences xmpPreferences = mock(XmpPreferences.class);
-        BibEntryTypesManager entryTypesManager = mock(BibEntryTypesManager.class);
-        ExporterFactory exporterFactory = ExporterFactory.create(customFormats, layoutPreferences, savePreferences, xmpPreferences, BibDatabaseMode.BIBTEX, entryTypesManager);
-
-        exportFormat = exporterFactory.getExporterByName("html").get();
+        exportFormat = new TemplateExporter("HTML",
+                "html",
+                "html",
+                null,
+                StandardFileType.HTML,
+                mock(LayoutFormatterPreferences.class, Answers.RETURNS_DEEP_STUBS),
+                SaveOrder.getDefaultSaveOrder());
 
         databaseContext = new BibDatabaseContext();
         charset = StandardCharsets.UTF_8;
@@ -48,7 +44,7 @@ public void setUp() {
         entry.setField(StandardField.TITLE, "my paper title");
         entry.setField(StandardField.AUTHOR, "Stefan Kolb");
         entry.setCitationKey("mykey");
-        entries = Arrays.asList(entry);
+        entries = List.of(entry);
     }
 
     @AfterEach
diff --git a/src/test/java/org/jabref/logic/exporter/MetaDataSerializerTest.java b/src/test/java/org/jabref/logic/exporter/MetaDataSerializerTest.java
index f648627acbd..ebff3f7815e 100644
--- a/src/test/java/org/jabref/logic/exporter/MetaDataSerializerTest.java
+++ b/src/test/java/org/jabref/logic/exporter/MetaDataSerializerTest.java
@@ -1,11 +1,11 @@
 package org.jabref.logic.exporter;
 
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.TreeMap;
+import java.util.stream.Stream;
 
 import org.jabref.logic.citationkeypattern.GlobalCitationKeyPattern;
 import org.jabref.logic.cleanup.FieldFormatterCleanup;
@@ -14,10 +14,12 @@
 import org.jabref.logic.importer.util.MetaDataParser;
 import org.jabref.logic.util.OS;
 import org.jabref.model.entry.BibEntryType;
+import org.jabref.model.entry.BibEntryTypeBuilder;
 import org.jabref.model.entry.field.BibField;
 import org.jabref.model.entry.field.FieldPriority;
 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.EntryType;
 import org.jabref.model.entry.types.UnknownEntryType;
 import org.jabref.model.metadata.ContentSelector;
@@ -25,6 +27,9 @@
 
 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.MethodSource;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -65,11 +70,11 @@ public void serializeSingleSaveAction() {
 
     @Test
     public void serializeSingleContentSelectors() {
-        List<String> values = new ArrayList<>(4);
-        values.add("approved");
-        values.add("captured");
-        values.add("received");
-        values.add("status");
+        List<String> values = List.of(
+                "approved",
+                "captured",
+                "received",
+                "status");
 
         metaData.addContentSelector(new ContentSelector(StandardField.PUBSTATE, values));
 
@@ -96,4 +101,43 @@ void testParsingEmptyOptionalFieldsFieldsReturnsEmptyCollections() {
         Optional<BibEntryType> type = MetaDataParser.parseCustomEntryType(serialized);
         assertEquals(Collections.emptySet(), type.get().getOptionalFields());
     }
+
+    /**
+     * Code clone of {@link org.jabref.logic.importer.util.MetaDataParserTest#parseCustomizedEntryType()}
+     */
+    public static Stream<Arguments> serializeCustomizedEntryType() {
+        return Stream.of(
+                Arguments.of(
+                        new BibEntryTypeBuilder()
+                                .withType(new UnknownEntryType("test"))
+                                .withRequiredFields(StandardField.AUTHOR, StandardField.TITLE),
+                        "jabref-entrytype: test: req[author;title] opt[]"
+                ),
+                Arguments.of(
+                        new BibEntryTypeBuilder()
+                                .withType(new UnknownEntryType("test"))
+                                .withRequiredFields(StandardField.AUTHOR)
+                                .withImportantFields(StandardField.TITLE),
+                        "jabref-entrytype: test: req[author] opt[title]"
+                ),
+                Arguments.of(
+                        new BibEntryTypeBuilder()
+                                .withType(new UnknownEntryType("test"))
+                                .withRequiredFields(UnknownField.fromDisplayName("Test1"), UnknownField.fromDisplayName("Test2")),
+                        "jabref-entrytype: test: req[Test1;Test2] opt[]"
+                ),
+                Arguments.of(
+                        new BibEntryTypeBuilder()
+                                .withType(new UnknownEntryType("test"))
+                                .withRequiredFields(UnknownField.fromDisplayName("tEST"), UnknownField.fromDisplayName("tEsT2")),
+                        "jabref-entrytype: test: req[tEST;tEsT2] opt[]"
+                )
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource
+    void serializeCustomizedEntryType(BibEntryTypeBuilder bibEntryTypeBuilder, String expected) {
+        assertEquals(expected, MetaDataSerializer.serializeCustomEntryTypes(bibEntryTypeBuilder.build()));
+    }
 }
diff --git a/src/test/java/org/jabref/logic/exporter/OpenOfficeDocumentCreatorTest.java b/src/test/java/org/jabref/logic/exporter/OpenOfficeDocumentCreatorTest.java
index 886398c7725..53c0d088a45 100644
--- a/src/test/java/org/jabref/logic/exporter/OpenOfficeDocumentCreatorTest.java
+++ b/src/test/java/org/jabref/logic/exporter/OpenOfficeDocumentCreatorTest.java
@@ -8,36 +8,27 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
-import org.jabref.logic.layout.LayoutFormatterPreferences;
-import org.jabref.logic.xmp.XmpPreferences;
 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.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.junit.jupiter.api.io.TempDir;
-import org.mockito.Answers;
 import org.xmlunit.builder.Input;
 import org.xmlunit.diff.DefaultNodeMatcher;
 import org.xmlunit.diff.ElementSelectors;
 import org.xmlunit.matchers.CompareMatcher;
 
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.mockito.Mockito.mock;
 
 public class OpenOfficeDocumentCreatorTest {
-    private static final String OPEN_OFFICE_EXPORTER_ID = "oocalc";
-
     public BibDatabaseContext databaseContext;
     public Charset charset;
     public List<BibEntry> entries;
@@ -49,14 +40,7 @@ public class OpenOfficeDocumentCreatorTest {
     void setUp() throws URISyntaxException {
         xmlFile = Path.of(OpenOfficeDocumentCreatorTest.class.getResource("OldOpenOfficeCalcExportFormatContentSingleEntry.xml").toURI());
 
-        List<TemplateExporter> customFormats = new ArrayList<>();
-        LayoutFormatterPreferences layoutPreferences = mock(LayoutFormatterPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        SavePreferences savePreferences = mock(SavePreferences.class);
-        XmpPreferences xmpPreferences = mock(XmpPreferences.class);
-        BibEntryTypesManager entryTypesManager = mock(BibEntryTypesManager.class);
-        ExporterFactory exporterFactory = ExporterFactory.create(customFormats, layoutPreferences, savePreferences, xmpPreferences, BibDatabaseMode.BIBTEX, entryTypesManager);
-
-        exporter = exporterFactory.getExporterByName(OPEN_OFFICE_EXPORTER_ID).get();
+        exporter = new OpenOfficeDocumentCreator();
 
         databaseContext = new BibDatabaseContext();
         charset = StandardCharsets.UTF_8;
@@ -104,7 +88,7 @@ private static void unzipContentXml(Path zipFile, Path unzipFolder) throws IOExc
             ZipEntry zipEntry = zis.getNextEntry();
 
             while (zipEntry != null) {
-                boolean isContentXml = zipEntry.getName().equals("content.xml");
+                boolean isContentXml = "content.xml".equals(zipEntry.getName());
 
                 Path newPath = zipSlipProtect(zipEntry, unzipFolder);
 
diff --git a/src/test/java/org/jabref/logic/exporter/XmpPdfExporterTest.java b/src/test/java/org/jabref/logic/exporter/XmpPdfExporterTest.java
index acfe7457bed..3e07fd1f085 100644
--- a/src/test/java/org/jabref/logic/exporter/XmpPdfExporterTest.java
+++ b/src/test/java/org/jabref/logic/exporter/XmpPdfExporterTest.java
@@ -1,7 +1,6 @@
 package org.jabref.logic.exporter;
 
 import java.io.IOException;
-import java.nio.charset.Charset;
 import java.nio.file.Path;
 import java.util.Collections;
 import java.util.List;
@@ -9,7 +8,7 @@
 
 import javafx.beans.property.SimpleObjectProperty;
 
-import org.jabref.logic.importer.fileformat.PdfXmpImporter;
+import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.xmp.XmpPreferences;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.database.BibDatabaseContext;
@@ -41,13 +40,10 @@ class XmpPdfExporterTest {
     private static BibEntry toral2006 = new BibEntry(StandardEntryType.Article);
     private static BibEntry vapnik2000 = new BibEntry(StandardEntryType.Article);
 
-    private PdfXmpImporter importer;
     private XmpPdfExporter exporter;
-    private XmpPreferences xmpPreferences;
-    private Charset encoding;
 
     private BibDatabaseContext databaseContext;
-    private BibDatabase dataBase;
+    private JournalAbbreviationRepository abbreviationRepository;
     private FilePreferences filePreferences;
 
     private static void initBibEntries() throws IOException {
@@ -98,19 +94,16 @@ private static void initBibEntries() throws IOException {
      */
     @BeforeEach
     void setUp() throws IOException {
-        xmpPreferences = new XmpPreferences(false, Collections.emptySet(), new SimpleObjectProperty<>(','));
-
-        encoding = Charset.defaultCharset();
-
+        abbreviationRepository = mock(JournalAbbreviationRepository.class);
         filePreferences = mock(FilePreferences.class);
-        when(filePreferences.getUser()).thenReturn(tempDir.toAbsolutePath().toString());
+        when(filePreferences.getUserAndHost()).thenReturn(tempDir.toAbsolutePath().toString());
         when(filePreferences.shouldStoreFilesRelativeToBibFile()).thenReturn(false);
 
-        importer = new PdfXmpImporter(xmpPreferences);
+        XmpPreferences xmpPreferences = new XmpPreferences(false, Collections.emptySet(), new SimpleObjectProperty<>(','));
         exporter = new XmpPdfExporter(xmpPreferences);
 
         databaseContext = new BibDatabaseContext();
-        dataBase = databaseContext.getDatabase();
+        BibDatabase dataBase = databaseContext.getDatabase();
 
         initBibEntries();
         dataBase.insertEntry(olly2018);
@@ -121,13 +114,13 @@ void setUp() throws IOException {
     @ParameterizedTest
     @MethodSource("provideBibEntriesWithValidPdfFileLinks")
     void successfulExportToAllFilesOfEntry(BibEntry bibEntryWithValidPdfFileLink) throws Exception {
-        assertTrue(exporter.exportToAllFilesOfEntry(databaseContext, filePreferences, bibEntryWithValidPdfFileLink, List.of(olly2018)));
+        assertTrue(exporter.exportToAllFilesOfEntry(databaseContext, filePreferences, bibEntryWithValidPdfFileLink, List.of(olly2018), abbreviationRepository));
     }
 
     @ParameterizedTest
     @MethodSource("provideBibEntriesWithInvalidPdfFileLinks")
     void unsuccessfulExportToAllFilesOfEntry(BibEntry bibEntryWithValidPdfFileLink) throws Exception {
-        assertFalse(exporter.exportToAllFilesOfEntry(databaseContext, filePreferences, bibEntryWithValidPdfFileLink, List.of(olly2018)));
+        assertFalse(exporter.exportToAllFilesOfEntry(databaseContext, filePreferences, bibEntryWithValidPdfFileLink, List.of(olly2018), abbreviationRepository));
     }
 
     public static Stream<Arguments> provideBibEntriesWithValidPdfFileLinks() {
@@ -141,13 +134,13 @@ public static Stream<Arguments> provideBibEntriesWithInvalidPdfFileLinks() {
     @ParameterizedTest
     @MethodSource("providePathsToValidPDFs")
     void successfulExportToFileByPath(Path path) throws Exception {
-        assertTrue(exporter.exportToFileByPath(databaseContext, dataBase, filePreferences, path));
+        assertTrue(exporter.exportToFileByPath(databaseContext, filePreferences, path, abbreviationRepository));
     }
 
     @ParameterizedTest
     @MethodSource("providePathsToInvalidPDFs")
     void unsuccessfulExportToFileByPath(Path path) throws Exception {
-        assertFalse(exporter.exportToFileByPath(databaseContext, dataBase, filePreferences, path));
+        assertFalse(exporter.exportToFileByPath(databaseContext, filePreferences, path, abbreviationRepository));
     }
 
     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 6474a97d490..db42e79dbbc 100644
--- a/src/test/java/org/jabref/logic/exporter/YamlExporterTest.java
+++ b/src/test/java/org/jabref/logic/exporter/YamlExporterTest.java
@@ -1,21 +1,17 @@
 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.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
 import org.jabref.logic.layout.LayoutFormatterPreferences;
-import org.jabref.logic.xmp.XmpPreferences;
+import org.jabref.logic.util.StandardFileType;
 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.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
+import org.jabref.model.metadata.SaveOrder;
 
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
@@ -27,22 +23,22 @@
 
 public class YamlExporterTest {
 
-    private static Charset charset;
     private static Exporter yamlExporter;
     private static BibDatabaseContext databaseContext;
 
     @BeforeAll
     static void setUp() {
-        List<TemplateExporter> customFormats = new ArrayList<>();
-        LayoutFormatterPreferences layoutPreferences = mock(LayoutFormatterPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        SavePreferences savePreferences = mock(SavePreferences.class);
-        XmpPreferences xmpPreferences = mock(XmpPreferences.class);
-        BibEntryTypesManager entryTypesManager = mock(BibEntryTypesManager.class);
-        ExporterFactory exporterFactory = ExporterFactory.create(customFormats, layoutPreferences, savePreferences, xmpPreferences, BibDatabaseMode.BIBTEX, entryTypesManager);
+        yamlExporter = new TemplateExporter(
+                "CSL YAML",
+                "yaml",
+                "yaml",
+                null,
+                StandardFileType.YAML,
+                mock(LayoutFormatterPreferences.class, Answers.RETURNS_DEEP_STUBS),
+                SaveOrder.getDefaultSaveOrder(),
+                BlankLineBehaviour.DELETE_BLANKS);
 
         databaseContext = new BibDatabaseContext();
-        charset = StandardCharsets.UTF_8;
-        yamlExporter = exporterFactory.getExporterByName("yaml").get();
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/formatter/FormatterTest.java b/src/test/java/org/jabref/logic/formatter/FormatterTest.java
index d465658add7..d93606c7a1f 100644
--- a/src/test/java/org/jabref/logic/formatter/FormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/FormatterTest.java
@@ -42,7 +42,7 @@ public void allFormatterKeysAreUnique() {
         // idea for uniqueness checking by https://stackoverflow.com/a/44032568/873282
         assertEquals(Collections.emptyList(),
                 getFormatters().collect(Collectors.groupingBy(
-                        formatter -> formatter.getKey(),
+                                       Formatter::getKey,
                         Collectors.counting()))
                                .entrySet().stream()
                                .filter(e -> e.getValue() > 1)
diff --git a/src/test/java/org/jabref/logic/formatter/casechanger/ProtectTermsFormatterTest.java b/src/test/java/org/jabref/logic/formatter/casechanger/ProtectTermsFormatterTest.java
index 5840c12a4c6..f0b5e71811b 100644
--- a/src/test/java/org/jabref/logic/formatter/casechanger/ProtectTermsFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/casechanger/ProtectTermsFormatterTest.java
@@ -53,7 +53,7 @@ public void testCorrectOrderingOfTerms() {
     public void test() {
         assertEquals("{VLSI} {VLSI}", formatter.format("VLSI {VLSI}"));
         assertEquals("{BPEL}", formatter.format("{BPEL}"));
-        assertEquals("{Testing BPEL Engine Performance: A Survey}",
+        assertEquals("{Testing {BPEL} Engine Performance: A Survey}",
                 formatter.format("{Testing BPEL Engine Performance: A Survey}"));
     }
 }
diff --git a/src/test/java/org/jabref/logic/importer/AuthorListParserTest.java b/src/test/java/org/jabref/logic/importer/AuthorListParserTest.java
index 1ec4e02879c..42a3c18b378 100644
--- a/src/test/java/org/jabref/logic/importer/AuthorListParserTest.java
+++ b/src/test/java/org/jabref/logic/importer/AuthorListParserTest.java
@@ -5,8 +5,6 @@
 import org.jabref.model.entry.Author;
 import org.jabref.model.entry.AuthorList;
 
-import org.junit.jupiter.api.Assertions;
-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;
@@ -15,7 +13,9 @@
 
 class AuthorListParserTest {
 
-    private static Stream<Arguments> data() {
+    AuthorListParser parser = new AuthorListParser();
+
+    private static Stream<Arguments> parseSingleAuthorCorrectly() {
         return Stream.of(
                 Arguments.of("王, 军", new Author("军", "军.", null, "王", null)),
                 Arguments.of("Doe, John", new Author("John", "J.", null, "Doe", null)),
@@ -26,21 +26,32 @@ private static Stream<Arguments> data() {
                 Arguments.of("de la Vallée Poussin, J. C. G.", new Author("J. C. G.", "J. C. G.", "de la", "Vallée Poussin", null)),
                 Arguments.of("{K}ent-{B}oswell, E. S.", new Author("E. S.", "E. S.", null, "{K}ent-{B}oswell", null)),
                 Arguments.of("Uhlenhaut, N Henriette", new Author("N Henriette", "N. H.", null, "Uhlenhaut", null)),
-                Arguments.of("Nu{\\~{n}}ez, Jose", new Author("Jose", "J.", null, "Nu{\\~{n}}ez", null))
+                Arguments.of("Nu{\\~{n}}ez, Jose", new Author("Jose", "J.", null, "Nu{\\~{n}}ez", null)),
+                // parseAuthorWithFirstNameAbbreviationContainingUmlaut
+                Arguments.of("{\\OE}rjan Umlauts", new Author("{\\OE}rjan", "{\\OE}.", null, "Umlauts", null))
         );
     }
 
     @ParameterizedTest
-    @MethodSource("data")
-    void parseCorrectly(String authorsString, Author authorsParsed) {
-        AuthorListParser parser = new AuthorListParser();
-        Assertions.assertEquals(AuthorList.of(authorsParsed), parser.parse(authorsString));
+    @MethodSource
+    void parseSingleAuthorCorrectly(String authorsString, Author authorsParsed) {
+        assertEquals(AuthorList.of(authorsParsed), parser.parse(authorsString));
+    }
+
+    private static Stream<Arguments> parseMultipleCorrectly() {
+        return Stream.of(
+                Arguments.of(
+                        AuthorList.of(
+                                new Author("Alexander", "A.", null, "Artemenko", null),
+                                Author.OTHERS
+                        ),
+                        "Alexander Artemenko and others")
+        );
     }
 
-    @Test
-    public void parseAuthorWithFirstNameAbbreviationContainingUmlaut() {
-        assertEquals(AuthorList.of(
-                new Author("{\\OE}rjan", "{\\OE}.", null, "Umlauts", null)),
-                new AuthorListParser().parse("{\\OE}rjan Umlauts"));
+    @ParameterizedTest
+    @MethodSource
+    void parseMultipleCorrectly(AuthorList expected, String authorsString) {
+        assertEquals(expected, parser.parse(authorsString));
     }
 }
diff --git a/src/test/java/org/jabref/logic/importer/BibDatabaseFilesTest.java b/src/test/java/org/jabref/logic/importer/BibDatabaseFilesTest.java
index 0e852701303..e7301dcc905 100644
--- a/src/test/java/org/jabref/logic/importer/BibDatabaseFilesTest.java
+++ b/src/test/java/org/jabref/logic/importer/BibDatabaseFilesTest.java
@@ -7,7 +7,6 @@
 
 import org.jabref.logic.importer.fileformat.BibtexParser;
 import org.jabref.model.database.BibDatabase;
-import org.jabref.model.util.DummyFileUpdateMonitor;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -29,7 +28,7 @@ public void setUp() {
     public void resolveStrings() throws IOException {
         try (FileInputStream stream = new FileInputStream("src/test/resources/org/jabref/util/twente.bib");
              InputStreamReader fr = new InputStreamReader(stream, StandardCharsets.UTF_8)) {
-            ParserResult result = new BibtexParser(importFormatPreferences, new DummyFileUpdateMonitor()).parse(fr);
+            ParserResult result = new BibtexParser(importFormatPreferences).parse(fr);
 
             BibDatabase db = result.getDatabase();
 
diff --git a/src/test/java/org/jabref/logic/importer/FulltextFetchersTest.java b/src/test/java/org/jabref/logic/importer/FulltextFetchersTest.java
index 47308002d0b..a8aa3b7628d 100644
--- a/src/test/java/org/jabref/logic/importer/FulltextFetchersTest.java
+++ b/src/test/java/org/jabref/logic/importer/FulltextFetchersTest.java
@@ -25,7 +25,7 @@ public class FulltextFetchersTest {
     @Test
     public void acceptPdfUrls() throws MalformedURLException {
         URL pdfUrl = new URL("http://docs.oasis-open.org/wsbpel/2.0/OS/wsbpel-v2.0-OS.pdf");
-        FulltextFetcher finder = (e) -> Optional.of(pdfUrl);
+        FulltextFetcher finder = e -> Optional.of(pdfUrl);
         FulltextFetchers fetcher = new FulltextFetchers(Set.of(finder));
         assertEquals(Optional.of(pdfUrl), fetcher.findFullTextPDF(entry));
     }
@@ -33,7 +33,7 @@ public void acceptPdfUrls() throws MalformedURLException {
     @Test
     public void rejectNonPdfUrls() throws MalformedURLException {
         URL pdfUrl = new URL("https://github.com/JabRef/jabref/blob/master/README.md");
-        FulltextFetcher finder = (e) -> Optional.of(pdfUrl);
+        FulltextFetcher finder = e -> Optional.of(pdfUrl);
         FulltextFetchers fetcher = new FulltextFetchers(Set.of(finder));
 
         assertEquals(Optional.empty(), fetcher.findFullTextPDF(entry));
@@ -42,7 +42,7 @@ public void rejectNonPdfUrls() throws MalformedURLException {
     @Test
     public void noTrustLevel() throws MalformedURLException {
         URL pdfUrl = new URL("http://docs.oasis-open.org/wsbpel/2.0/OS/wsbpel-v2.0-OS.pdf");
-        FulltextFetcher finder = (e) -> Optional.of(pdfUrl);
+        FulltextFetcher finder = e -> Optional.of(pdfUrl);
         FulltextFetchers fetcher = new FulltextFetchers(Set.of(finder));
 
         assertEquals(Optional.of(pdfUrl), fetcher.findFullTextPDF(entry));
diff --git a/src/test/java/org/jabref/logic/importer/ImportFormatReaderIntegrationTest.java b/src/test/java/org/jabref/logic/importer/ImportFormatReaderIntegrationTest.java
index 8fc04e795b3..14c447cfe0e 100644
--- a/src/test/java/org/jabref/logic/importer/ImportFormatReaderIntegrationTest.java
+++ b/src/test/java/org/jabref/logic/importer/ImportFormatReaderIntegrationTest.java
@@ -25,10 +25,9 @@ class ImportFormatReaderIntegrationTest {
 
     @BeforeEach
     void setUp() {
-        reader = new ImportFormatReader();
         ImporterPreferences importerPreferences = mock(ImporterPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        when(importerPreferences.getCustomImportList()).thenReturn(FXCollections.emptyObservableSet());
-        reader.resetImportFormats(
+        when(importerPreferences.getCustomImporters()).thenReturn(FXCollections.emptyObservableSet());
+        reader = new ImportFormatReader(
                 importerPreferences,
                 mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS),
                 new DummyFileUpdateMonitor());
@@ -39,7 +38,7 @@ void setUp() {
     void testImportUnknownFormat(String resource, String format, int count) throws Exception {
         Path file = Path.of(ImportFormatReaderIntegrationTest.class.getResource(resource).toURI());
         ImportFormatReader.UnknownFormatImport unknownFormat = reader.importUnknownFormat(file, new DummyFileUpdateMonitor());
-        assertEquals(count, unknownFormat.parserResult.getDatabase().getEntryCount());
+        assertEquals(count, unknownFormat.parserResult().getDatabase().getEntryCount());
     }
 
     @ParameterizedTest
@@ -54,7 +53,7 @@ void testImportFormatFromFile(String resource, String format, int count) throws
     void testImportUnknownFormatFromString(String resource, String format, int count) throws Exception {
         Path file = Path.of(ImportFormatReaderIntegrationTest.class.getResource(resource).toURI());
         String data = Files.readString(file);
-        assertEquals(count, reader.importUnknownFormat(data).parserResult.getDatabase().getEntries().size());
+        assertEquals(count, reader.importUnknownFormat(data).parserResult().getDatabase().getEntries().size());
     }
 
     private static Stream<Object[]> importFormats() {
diff --git a/src/test/java/org/jabref/logic/importer/ImportFormatReaderParameterlessTest.java b/src/test/java/org/jabref/logic/importer/ImportFormatReaderParameterlessTest.java
index 15e79928a03..f05facf0dd0 100644
--- a/src/test/java/org/jabref/logic/importer/ImportFormatReaderParameterlessTest.java
+++ b/src/test/java/org/jabref/logic/importer/ImportFormatReaderParameterlessTest.java
@@ -22,12 +22,10 @@ class ImportFormatReaderParameterlessTest {
 
     @BeforeEach
     void setUp() {
-        reader = new ImportFormatReader();
         ImporterPreferences importerPreferences = mock(ImporterPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        when(importerPreferences.getCustomImportList()).thenReturn(FXCollections.emptyObservableSet());
-
+        when(importerPreferences.getCustomImporters()).thenReturn(FXCollections.emptyObservableSet());
         ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        reader.resetImportFormats(importerPreferences, importFormatPreferences, fileMonitor);
+        reader = new ImportFormatReader(importerPreferences, importFormatPreferences, fileMonitor);
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/importer/OpenDatabaseTest.java b/src/test/java/org/jabref/logic/importer/OpenDatabaseTest.java
index d5fe3876d4b..c170b9e16a2 100644
--- a/src/test/java/org/jabref/logic/importer/OpenDatabaseTest.java
+++ b/src/test/java/org/jabref/logic/importer/OpenDatabaseTest.java
@@ -13,7 +13,7 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.util.DummyFileUpdateMonitor;
 import org.jabref.model.util.FileUpdateMonitor;
-import org.jabref.preferences.GeneralPreferences;
+import org.jabref.preferences.LibraryPreferences;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -25,7 +25,7 @@
 class OpenDatabaseTest {
 
     private final Charset defaultEncoding = StandardCharsets.UTF_8;
-    private GeneralPreferences generalPreferences;
+    private LibraryPreferences libraryPreferences;
     private ImportFormatPreferences importFormatPreferences;
     private final Path bibNoHeader;
     private final Path bibWrongHeader;
@@ -44,7 +44,7 @@ class OpenDatabaseTest {
 
     @BeforeEach
     void setUp() {
-        generalPreferences = mock(GeneralPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        libraryPreferences = mock(LibraryPreferences.class, Answers.RETURNS_DEEP_STUBS);
         importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
     }
 
diff --git a/src/test/java/org/jabref/logic/importer/WebFetchersTest.java b/src/test/java/org/jabref/logic/importer/WebFetchersTest.java
index 47412d20445..ffa6314fff7 100644
--- a/src/test/java/org/jabref/logic/importer/WebFetchersTest.java
+++ b/src/test/java/org/jabref/logic/importer/WebFetchersTest.java
@@ -7,9 +7,10 @@
 import java.util.stream.Collectors;
 
 import org.jabref.logic.importer.fetcher.AbstractIsbnFetcher;
-import org.jabref.logic.importer.fetcher.CiteSeer;
+import org.jabref.logic.importer.fetcher.CollectionOfComputerScienceBibliographiesFetcher;
 import org.jabref.logic.importer.fetcher.GoogleScholar;
 import org.jabref.logic.importer.fetcher.GrobidCitationFetcher;
+import org.jabref.logic.importer.fetcher.GvkFetcher;
 import org.jabref.logic.importer.fetcher.JstorFetcher;
 import org.jabref.logic.importer.fetcher.MrDLibFetcher;
 import org.jabref.logic.importer.fetcher.isbntobibtex.DoiToBibtexConverterComIsbnFetcher;
@@ -75,11 +76,12 @@ void getIdBasedFetchersReturnsAllFetcherDerivingFromIdBasedFetcher() {
             // Remove special ISBN fetcher since we don't want to expose them to the user
             expected.remove(OpenLibraryIsbnFetcher.class);
             expected.remove(EbookDeIsbnFetcher.class);
+            expected.remove(GvkFetcher.class);
             expected.remove(DoiToBibtexConverterComIsbnFetcher.class);
-
             // Remove the following, because they don't work at the moment
             expected.remove(JstorFetcher.class);
             expected.remove(GoogleScholar.class);
+            expected.remove(CollectionOfComputerScienceBibliographiesFetcher.class);
 
             assertEquals(expected, getClasses(idFetchers));
         }
@@ -119,7 +121,7 @@ void getSearchBasedFetchersReturnsAllFetcherDerivingFromSearchBasedFetcher() {
             // Remove the following, because they don't work atm
             expected.remove(JstorFetcher.class);
             expected.remove(GoogleScholar.class);
-            expected.remove(CiteSeer.class);
+            expected.remove(CollectionOfComputerScienceBibliographiesFetcher.class);
 
             expected.remove(PagedSearchBasedParserFetcher.class);
             expected.remove(PagedSearchBasedFetcher.class);
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/ArXivFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/ArXivFetcherTest.java
index 119877fa76a..5ab1bf7032f 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/ArXivFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/ArXivFetcherTest.java
@@ -9,7 +9,8 @@
 import java.util.StringJoiner;
 import java.util.stream.Collectors;
 
-import org.jabref.logic.bibtex.FieldContentFormatterPreferences;
+import javafx.collections.FXCollections;
+
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.ImportCleanup;
 import org.jabref.logic.importer.ImportFormatPreferences;
@@ -57,11 +58,15 @@ static void setUp() {
         importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
         when(importFormatPreferences.bibEntryPreferences().getKeywordSeparator()).thenReturn(',');
         // Used during DOI fetch process
-        when(importFormatPreferences.fieldContentFormatterPreferences()).thenReturn(
-                new FieldContentFormatterPreferences(
-                        Arrays.stream("pdf;ps;url;doi;file;isbn;issn".split(";"))
-                              .map(fieldName -> StandardField.fromName(fieldName).isPresent() ? StandardField.fromName(fieldName).get() : new UnknownField(fieldName))
-                              .collect(Collectors.toList())));
+        when(importFormatPreferences.fieldPreferences().getNonWrappableFields()).thenReturn(
+                FXCollections.observableArrayList(List.of(
+                        StandardField.PDF,
+                        StandardField.PS,
+                        StandardField.URL,
+                        StandardField.DOI,
+                        StandardField.FILE,
+                        StandardField.ISBN,
+                        StandardField.ISSN)));
     }
 
     @BeforeEach
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 16b724924e3..e43e11f6821 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/AstrophysicsDataSystemTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/AstrophysicsDataSystemTest.java
@@ -111,7 +111,7 @@ public void setUp() throws Exception {
                 .withField(StandardField.AUTHOR, "Ingersoll, A.~P. and Pollard, D.")
                 .withField(StandardField.DOI, "10.1016/0019-1035(82)90169-5")
                 .withField(StandardField.JOURNAL, "\\icarus")
-                .withField(StandardField.KEYWORDS, "Atmospheric Circulation, Barotropic Flow, Convective Flow, Flow Stability, Jupiter Atmosphere, Rotating Fluids, Saturn Atmosphere, Adiabatic Flow, Anelasticity, Compressible Fluids, Planetary Rotation, Rotating Cylinders, Scaling Laws, Wind Profiles, PLANETS, JUPITER, SATURN, MOTION, INTERIORS, ATMOSPHERE, ANALYSIS, SCALE, BAROTROPY, CHARACTERISTICS, STRUCTURE, WINDS, VISCOSITY, DATA, CONVECTION, ROTATION, EDDY EFFECTS, ENERGY, ADIABATICITY, DIAGRAMS, REVIEW, LATITUDE, ZONES, VELOCITY, MATHEMATICAL MODELS, HEAT FLOW, EQUATIONS OF MOTION, FLUIDS, DYNAMICS, TEMPERATURE, GRADIENTS, Lunar and Planetary Exploration; Planets")
+                .withField(StandardField.KEYWORDS, "Atmospheric Circulation, Barotropic Flow, Convective Flow, Flow Stability, Jupiter Atmosphere, Rotating Fluids, Saturn Atmosphere, Adiabatic Flow, Anelasticity, Compressible Fluids, Planetary Rotation, Rotating Cylinders, Scaling Laws, Wind Profiles, PLANETS, JUPITER, SATURN, MOTION, INTERIORS, ATMOSPHERE, ANALYSIS, SCALE, BAROTROPY, CHARACTERISTICS, STRUCTURE, WINDS, VISCOSITY, DATA, CONVECTION, ROTATION, EDDY EFFECTS, ENERGY, ADIABATICITY, DIAGRAMS, REVIEW, LATITUDE, ZONES, VELOCITY, MATHEMATICAL MODELS, HEAT FLOW, EQUATIONS OF MOTION, FLUIDS, DYNAMICS, TEMPERATURE, GRADIENTS, Lunar and Planetary Exploration; Planets, Earth Science, Earth Science")
                 .withField(StandardField.MONTH, "#oct#")
                 .withField(StandardField.NUMBER, "1")
                 .withField(StandardField.PAGES, "62-80")
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/BiodiversityLibraryTest.java b/src/test/java/org/jabref/logic/importer/fetcher/BiodiversityLibraryTest.java
index e1ee85d8fc8..84936dd4e26 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/BiodiversityLibraryTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/BiodiversityLibraryTest.java
@@ -2,7 +2,6 @@
 
 import java.net.MalformedURLException;
 import java.net.URISyntaxException;
-import java.util.List;
 
 import javafx.collections.FXCollections;
 
@@ -92,18 +91,19 @@ public void getItemMetadaUrl(String id) throws MalformedURLException, URISyntaxE
 
     @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")
+        BibEntry expected = new BibEntry(StandardEntryType.Article)
+            .withField(StandardField.AUTHOR, "Clark, John L. (John Littner)  and Neill, David A. ")
+            .withField(StandardField.JOURNALTITLE, "PhytoKeys")
             .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));
+            .withField(StandardField.PUBLISHER, "Pensoft Publishers")
+            .withField(StandardField.TITLE, "\uFEFFAmanoa condorensis (Phyllanthaceae), a new shrubby species from the Cordillera del Condor in southern Ecuador")
+            .withField(StandardField.URL, "https://www.biodiversitylibrary.org/part/356490")
+            .withField(StandardField.DATE, "2023")
+            .withField(StandardField.VOLUME, "227")
+            .withField(StandardField.PAGES, "89-97")
+            .withField(StandardField.DOI, "10.3897/phytokeys.227.104703");
+
+        assertEquals(expected, fetcher.performSearch("Amanoa condorensis (Phyllanthaceae)").get(0));
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/BvbFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/BvbFetcherTest.java
index 0bc03b1ce9b..eab59ad8192 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/BvbFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/BvbFetcherTest.java
@@ -17,7 +17,7 @@
 
 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.junit.jupiter.api.Assertions.assertFalse;
 
 @FetcherTest
 public class BvbFetcherTest {
@@ -30,7 +30,7 @@ public class BvbFetcherTest {
     void testPerformTest() throws Exception {
         String searchquery = "effective java author:bloch";
         List<BibEntry> result = fetcher.performSearch(searchquery);
-        assertTrue(result.size() > 0);
+        assertFalse(result.isEmpty());
 
 //        System.out.println("Query:\n");
 //        System.out.println(fetcher.getURLForQuery(new StandardSyntaxParser().parse(searchquery, NO_EXPLICIT_FIELD)));
@@ -52,7 +52,8 @@ public void setUp() {
                 .withField(StandardField.FILE, "ParsedFileField{description='', link='http://search.ebscohost.com/login.aspx?direct=true&scope=site&db=nlebk&db=nlabk&AN=1906353', fileType='PDF'}")
                 .withField(StandardField.ISBN, "9783960886402")
                 .withField(StandardField.KEYWORDS, "Klassen, Interfaces, Generics, Enums, Annotationen, Lambdas, Streams, Module, parallel, Parallele Programmierung, Serialisierung, funktional, funktionale Programmierung, Java EE, Jakarta EE")
-                .withField(StandardField.LOCATION, "Heidelberg")
+                .withField(StandardField.ADDRESS, "Heidelberg")
+                .withField(StandardField.PAGETOTAL, "396")
                 .withField(StandardField.PUBLISHER, "{dpunkt.verlag} and {Dpunkt. Verlag (Heidelberg)}");
 
         bibEntryISBN0134685997 = new BibEntry(StandardEntryType.Misc)
@@ -62,7 +63,8 @@ public void setUp() {
                 .withField(StandardField.TITLEADDON, "Joshua Bloch")
                 .withField(StandardField.EDITION, "Third edition")
                 .withField(StandardField.ISBN, "0134685997")
-                .withField(StandardField.LOCATION, "Boston")
+                .withField(StandardField.PAGETOTAL, "392")
+                .withField(StandardField.ADDRESS, "Boston")
                 .withField(StandardField.PUBLISHER, "{Addison-Wesley}");
     }
 
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/CiteSeerTest.java b/src/test/java/org/jabref/logic/importer/fetcher/CiteSeerTest.java
index 6f47af31866..790c1eee67f 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/CiteSeerTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/CiteSeerTest.java
@@ -1,8 +1,13 @@
 package org.jabref.logic.importer.fetcher;
 
+import java.io.IOException;
+import java.net.URL;
 import java.util.Collections;
+import java.util.Iterator;
 import java.util.List;
+import java.util.Optional;
 
+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;
@@ -12,35 +17,94 @@
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 
-@Disabled
 @FetcherTest
 class CiteSeerTest {
 
     private CiteSeer fetcher = new CiteSeer();
 
     @Test
-    @Disabled("CiteseerX currently has issues with ncites query")
     void searchByQueryFindsEntryRigorousDerivation() throws Exception {
+        String title = "RIGOROUS DERIVATION FROM LANDAU-DE GENNES THEORY TO ERICKSEN-LESLIE THEORY";
         BibEntry expected = new BibEntry(StandardEntryType.Misc)
-                .withField(StandardField.AUTHOR, "Wang Wei and Zhang Pingwen and Zhang Zhifei")
-                .withField(StandardField.TITLE, "Rigorous Derivation from Landau-de Gennes Theory to Eericksen-leslie Theory")
-                .withField(StandardField.DOI, "10.1.1.744.5780");
+                .withField(StandardField.DOI, "68b3fde1aa6354a34061f8811e2050e1b512af26")
+                .withField(StandardField.AUTHOR, "Wang, Wei and Zhang, Pingwen and Zhang, Zhifei")
+                .withField(StandardField.TITLE, title)
+                .withField(StandardField.ABSTRACT, "ar")
+                .withField(StandardField.YEAR, "0")
+                .withField(StandardField.URL, "http://arxiv.org/pdf/1307.0986.pdf");
 
-        List<BibEntry> fetchedEntries = fetcher.performSearch("title:Ericksen-Leslie AND venue:q AND ncites:[10 TO 15000]");
+        List<BibEntry> fetchedEntries = fetcher.performSearch("title:\"Rigorous Derivation from Landau-de Gennes Theory to Ericksen-leslie Theory\" AND pageSize:1");
         assertEquals(Collections.singletonList(expected), fetchedEntries);
     }
 
     @Test
     void searchByQueryFindsEntryCopingTheoryAndResearch() throws Exception {
         BibEntry expected = new BibEntry(StandardEntryType.Misc)
-                .withField(StandardField.AUTHOR, "Lazarus Richard S.")
-                .withField(StandardField.TITLE, "Coping Theory and Research: Past Present and Future")
-                .withField(StandardField.DOI, "10.1.1.115.9665")
+                .withField(StandardField.DOI, "c16e0888b17cb2c689e5dfa4e2be4fdffb23869e")
+                .withField(StandardField.AUTHOR, "Lazarus, Richard S.")
+                .withField(StandardField.TITLE, "Coping theory and research: Past, present, and future")
+                .withField(StandardField.ABSTRACT, "In this essay in honor of Donald Oken, I emphasize coping as a key concept for theory and research on adaptation and health. My focus will be the contrasts between two approaches to coping, one that emphasizes")
                 .withField(StandardField.YEAR, "1993")
-                .withField(StandardField.JOURNALTITLE, "PSYCHOSOMATIC MEDICINE");
+                .withField(StandardField.VENUE, "Psychosomatic Medicine")
+                .withField(StandardField.URL, "http://intl.psychosomaticmedicine.org/content/55/3/234.full.pdf");
 
-        List<BibEntry> fetchedEntries = fetcher.performSearch("doi:10.1.1.115.9665");
+        List<BibEntry> fetchedEntries = fetcher.performSearch("title:\"Coping Theory and Research: Past Present and Future\" AND pageSize:1");
         assertEquals(Collections.singletonList(expected), fetchedEntries);
     }
+
+    /*
+    * CiteSeer seems to only apply year ranges effectively when we search for entries
+    * with associated pdfs, year values do not accurately reflect realistic values
+    * */
+    @Disabled
+    @Test
+    void searchWithSortingByYear() throws FetcherException {
+        Optional<String> expected = Optional.of("1552");
+        List<BibEntry> fetchedEntries = fetcher.performSearch("title:Theory AND year:1552 AND sortBy:Year");
+        for (BibEntry actual: fetchedEntries) {
+            if (actual.hasField(StandardField.YEAR)) {
+                assertEquals(expected, actual.getField(StandardField.YEAR));
+            }
+        }
+    }
+
+    @Test
+    void searchWithSortingByYearAndYearRange() throws FetcherException {
+        List<BibEntry> fetchedEntries = fetcher.performSearch("title:Theory AND year-range:2002-2012 AND sortBy:Year");
+        Iterator<BibEntry> fetchedEntriesIter = fetchedEntries.iterator();
+        BibEntry recentEntry = fetchedEntriesIter.next();
+        while (fetchedEntriesIter.hasNext()) {
+            BibEntry laterEntry = fetchedEntriesIter.next();
+            if (recentEntry.hasField(StandardField.YEAR) && laterEntry.hasField(StandardField.YEAR)) {
+                Integer recentYear = Integer.parseInt(recentEntry.getField(StandardField.YEAR).orElse("0"));
+                Integer laterYear = Integer.parseInt(laterEntry.getField(StandardField.YEAR).orElse("0"));
+                assertFalse(recentYear < laterYear);
+            }
+            recentEntry = laterEntry;
+        }
+    }
+
+    @Test
+    void findByIdAsDOI() throws FetcherException, IOException {
+        BibEntry entry = new BibEntry(StandardEntryType.Misc)
+                .withField(StandardField.DOI, "c16e0888b17cb2c689e5dfa4e2be4fdffb23869e");
+        Optional<URL> expected = Optional.of(new URL("https://citeseerx.ist.psu.edu/document?repid=rep1&type=pdf&doi=c16e0888b17cb2c689e5dfa4e2be4fdffb23869e"));
+        assertEquals(expected, fetcher.findFullText(entry));
+    }
+
+    @Test
+    void findBySourceURL() throws FetcherException, IOException {
+        BibEntry entry = new BibEntry(StandardEntryType.Misc)
+                .withField(StandardField.DOI, "")
+                .withField(StandardField.URL, "http://intl.psychosomaticmedicine.org/content/55/3/234.full.pdf");
+        Optional<URL> expected = Optional.of(new URL("http://intl.psychosomaticmedicine.org/content/55/3/234.full.pdf"));
+        assertEquals(expected, fetcher.findFullText(entry));
+    }
+
+    @Test
+    void notFoundByIdOrURL() throws FetcherException, IOException {
+        assertEquals(Optional.empty(), fetcher.findFullText(new BibEntry()));
+    }
 }
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 0440b67d06a..d171ed5d8e1 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/CompositeIdFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/CompositeIdFetcherTest.java
@@ -79,12 +79,16 @@ public static Stream<Arguments> performSearchByIdReturnsCorrectEntryForIdentifie
                 Arguments.arguments(
                         "performSearchByIdReturnsCorrectEntryForIsbnId",
                         new BibEntry(StandardEntryType.Book)
-                                .withField(StandardField.TITLE, "Effective Java")
-                                .withField(StandardField.PUBLISHER, "Addison-Wesley Professional")
-                                .withField(StandardField.YEAR, "2017")
                                 .withField(StandardField.AUTHOR, "Bloch, Joshua")
-                                .withField(StandardField.PAGES, "416")
-                                .withField(StandardField.ISBN, "9780134685991"),
+                                .withField(StandardField.TITLE, "Effective Java")
+                                .withField(StandardField.PUBLISHER, "Addison-Wesley")
+                                .withField(StandardField.YEAR, "2018")
+                                .withField(StandardField.ISBN, "9780134685991")
+                                .withField(StandardField.NOTE, "Titelzusätze auf dem Umschlag: \"Updated for Java 9. Best practices for ... the Java platform\"")
+                                .withField(StandardField.PAGETOTAL, "392")
+                                .withField(new UnknownField("ppn_gvk"), "100121840X")
+                                .withField(StandardField.EDITION, "Third edition")
+                                .withField(StandardField.ADDRESS, "Boston"),
                         "9780134685991"
                 ),
                 Arguments.arguments(
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 ba943481fff..27b781014fb 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/CompositeSearchBasedFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/CompositeSearchBasedFetcherTest.java
@@ -50,7 +50,7 @@ public void performSearchWithoutFetchers() throws Exception {
 
         List<BibEntry> result = fetcher.performSearch("quantum");
 
-        Assertions.assertEquals(result, Collections.EMPTY_LIST);
+        Assertions.assertEquals(result, Collections.emptyList());
     }
 
     @ParameterizedTest(name = "Perform Search on empty query.")
@@ -60,7 +60,7 @@ public void performSearchOnEmptyQuery(Set<SearchBasedFetcher> fetchers) throws E
 
         List<BibEntry> queryResult = compositeFetcher.performSearch("");
 
-        Assertions.assertEquals(queryResult, Collections.EMPTY_LIST);
+        Assertions.assertEquals(queryResult, Collections.emptyList());
     }
 
     @ParameterizedTest(name = "Perform search on query \"quantum\". Using the CompositeFetcher of the following " +
@@ -100,7 +100,7 @@ static Stream<Arguments> performSearchParameters() {
         List<SearchBasedFetcher> list = List.of(
                 new ArXivFetcher(importFormatPreferences),
                 new INSPIREFetcher(importFormatPreferences),
-                new GvkFetcher(),
+                new GvkFetcher(importFormatPreferences),
                 new AstrophysicsDataSystem(importFormatPreferences, importerPreferences),
                 new MathSciNet(importFormatPreferences),
                 new ZbMATH(importFormatPreferences),
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/DiVATest.java b/src/test/java/org/jabref/logic/importer/fetcher/DiVATest.java
index dbb2d8a21be..bd00f6d1627 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/DiVATest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/DiVATest.java
@@ -38,7 +38,7 @@ public void testPerformSearchById() throws Exception {
         entry.setType(StandardEntryType.Article);
         entry.setCitationKey("Gustafsson260746");
         entry.setField(StandardField.AUTHOR, "Gustafsson, Oscar");
-        entry.setField(StandardField.INSTITUTION, "Linköping University, The Institute of Technology");
+        entry.setField(StandardField.INSTITUTION, "The Institute of Technology");
         entry.setField(StandardField.JOURNAL,
                 "IEEE transactions on circuits and systems. 2, Analog and digital signal processing (Print)");
         entry.setField(StandardField.NUMBER, "11");
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/GvkFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/GvkFetcherTest.java
index 17e8b2ded4e..7ba45ee9aad 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/GvkFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/GvkFetcherTest.java
@@ -5,6 +5,7 @@
 import java.util.List;
 
 import org.jabref.logic.importer.FetcherException;
+import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.fetcher.transformers.AbstractQueryTransformer;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
@@ -16,9 +17,11 @@
 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.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
 
 @FetcherTest
 public class GvkFetcherTest {
@@ -29,19 +32,19 @@ public class GvkFetcherTest {
 
     @BeforeEach
     public void setUp() {
-        fetcher = new GvkFetcher();
+        fetcher = new GvkFetcher(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS));
 
         bibEntryPPN591166003 = new BibEntry(StandardEntryType.Book)
                 .withField(StandardField.TITLE, "Effective Java")
                 .withField(StandardField.PUBLISHER, "Addison-Wesley")
                 .withField(StandardField.YEAR, "2008")
-                .withField(StandardField.AUTHOR, "Joshua Bloch")
-                .withField(StandardField.SERIES, "The @Java series")
-                .withField(StandardField.ADDRESS, "Upper Saddle River, NJ [u.a.]")
+                .withField(StandardField.AUTHOR, "Bloch, Joshua")
+                .withField(StandardField.SERIES, "The Java series ... from the source")
+                .withField(StandardField.ADDRESS, "Upper Saddle River, NJ")
                 .withField(StandardField.EDITION, "2. ed., 5. print.")
-                .withField(StandardField.NOTE, "Literaturverz. S. 321 - 325")
+                .withField(StandardField.NOTE, "Includes bibliographical references and index. - Previous ed.: 2001. - Hier auch später erschienene, unveränderte Nachdrucke")
                 .withField(StandardField.ISBN, "9780321356680")
-                .withField(StandardField.PAGETOTAL, "XXI, 346")
+                .withField(StandardField.PAGETOTAL, "346")
                 .withField(new UnknownField("ppn_gvk"), "591166003")
                 .withField(StandardField.SUBTITLE, "[revised and updated for JAVA SE 6]");
 
@@ -49,10 +52,10 @@ public void setUp() {
                 .withField(StandardField.TITLE, "Effective unit testing")
                 .withField(StandardField.PUBLISHER, "Manning")
                 .withField(StandardField.YEAR, "2013")
-                .withField(StandardField.AUTHOR, "Lasse Koskela")
+                .withField(StandardField.AUTHOR, "Koskela, Lasse")
                 .withField(StandardField.ADDRESS, "Shelter Island, NY")
                 .withField(StandardField.ISBN, "9781935182573")
-                .withField(StandardField.PAGETOTAL, "XXIV, 223")
+                .withField(StandardField.PAGETOTAL, "223")
                 .withField(new UnknownField("ppn_gvk"), "66391437X")
                 .withField(StandardField.SUBTITLE, "A guide for Java developers");
     }
@@ -67,7 +70,7 @@ public void simpleSearchQueryURLCorrect() throws Exception {
         String query = "java jdk";
         QueryNode luceneQuery = new StandardSyntaxParser().parse(query, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
         URL url = fetcher.getURLForQuery(luceneQuery);
-        assertEquals("http://sru.gbv.de/gvk?version=1.1&operation=searchRetrieve&query=pica.all%3Djava+and+pica.all%3Djdk&maximumRecords=50&recordSchema=picaxml&sortKeys=Year%2C%2C1", url.toString());
+        assertEquals("https://sru.k10plus.de/opac-de-627?version=1.1&operation=searchRetrieve&query=pica.all%3Djava+and+pica.all%3Djdk&maximumRecords=50&recordSchema=picaxml&sortKeys=Year%2C%2C1", url.toString());
     }
 
     @Test
@@ -75,7 +78,7 @@ public void complexSearchQueryURLCorrect() throws Exception {
         String query = "kon:java tit:jdk";
         QueryNode luceneQuery = new StandardSyntaxParser().parse(query, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
         URL url = fetcher.getURLForQuery(luceneQuery);
-        assertEquals("http://sru.gbv.de/gvk?version=1.1&operation=searchRetrieve&query=pica.kon%3Djava+and+pica.tit%3Djdk&maximumRecords=50&recordSchema=picaxml&sortKeys=Year%2C%2C1", url.toString());
+        assertEquals("https://sru.k10plus.de/opac-de-627?version=1.1&operation=searchRetrieve&query=pica.kon%3Djava+and+pica.tit%3Djdk&maximumRecords=50&recordSchema=picaxml&sortKeys=Year%2C%2C1", url.toString());
     }
 
     @Test
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 1f1b0a521f7..0bda1a9a216 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/JstorFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/JstorFetcherTest.java
@@ -64,8 +64,10 @@ void searchByTitle() throws Exception {
 
     @Test
     void searchById() throws Exception {
-        bibEntry.setField(StandardField.URLDATE, LocalDate.now().format(DateTimeFormatter.ISO_DATE));
-        assertEquals(Optional.of(bibEntry), fetcher.performSearchById("90002164"));
+        Optional<BibEntry> actual = fetcher.performSearchById("90002164");
+        // The URL date is always the current date in the US. No need to properly check it.
+        actual.ifPresent(entry -> entry.clearField(StandardField.URLDATE));
+        assertEquals(Optional.of(bibEntry), actual);
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/MathSciNetTest.java b/src/test/java/org/jabref/logic/importer/fetcher/MathSciNetTest.java
index adc114c1b2a..a4439ef9a67 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/MathSciNetTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/MathSciNetTest.java
@@ -43,7 +43,7 @@ void setUp() throws Exception {
         ratiuEntry.setField(StandardField.YEAR, "2016");
         ratiuEntry.setField(StandardField.NUMBER, "3");
         ratiuEntry.setField(StandardField.PAGES, "571--589");
-        ratiuEntry.setField(StandardField.ISSN, "1422-6928");
+        ratiuEntry.setField(StandardField.ISSN, "1422-6928,1422-6952");
         ratiuEntry.setField(StandardField.KEYWORDS, "76A15 (35A01 35A02 35K61 82D30)");
         ratiuEntry.setField(StandardField.MR_NUMBER, "3537908");
         ratiuEntry.setField(StandardField.DOI, "10.1007/s00021-016-0250-0");
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 ea04ddca1f4..ac5b57c5587 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/RfcFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/RfcFetcherTest.java
@@ -10,8 +10,9 @@
 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.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
 import org.mockito.Answers;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -21,29 +22,21 @@
 @FetcherTest
 public class RfcFetcherTest {
 
-    private RfcFetcher fetcher;
-    private BibEntry bibEntry;
-
-    @BeforeEach
-    public void setUp() {
-        fetcher = new RfcFetcher(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS));
-
-        bibEntry = new BibEntry();
-        bibEntry.setType(StandardEntryType.Misc);
-        bibEntry.setField(StandardField.SERIES, "Request for Comments");
-        bibEntry.setField(StandardField.NUMBER, "1945");
-        bibEntry.setField(StandardField.HOWPUBLISHED, "RFC 1945");
-        bibEntry.setField(StandardField.PUBLISHER, "RFC Editor");
-        bibEntry.setField(StandardField.DOI, "10.17487/RFC1945");
-        bibEntry.setField(StandardField.URL, "https://www.rfc-editor.org/info/rfc1945");
-        bibEntry.setField(StandardField.AUTHOR, "Henrik Nielsen and Roy T. Fielding and Tim Berners-Lee");
-        bibEntry.setField(StandardField.TITLE, "{Hypertext Transfer Protocol -- HTTP/1.0}");
-        bibEntry.setField(StandardField.PAGETOTAL, "60");
-        bibEntry.setField(StandardField.YEAR, "1996");
-        bibEntry.setField(StandardField.MONTH, "#may#");
-        bibEntry.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. This memo provides information for the Internet community. This memo does not specify an Internet standard of any kind.");
-        bibEntry.setCitationKey("rfc1945");
-    }
+    private RfcFetcher fetcher = new RfcFetcher(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS));
+    private BibEntry bibEntry = new BibEntry(StandardEntryType.Misc)
+            .withCitationKey("rfc1945")
+            .withField(StandardField.SERIES, "Request for Comments")
+            .withField(StandardField.NUMBER, "1945")
+            .withField(StandardField.HOWPUBLISHED, "RFC 1945")
+            .withField(StandardField.PUBLISHER, "RFC Editor")
+            .withField(StandardField.DOI, "10.17487/RFC1945")
+            .withField(StandardField.URL, "https://www.rfc-editor.org/info/rfc1945")
+            .withField(StandardField.AUTHOR, "Henrik Nielsen and Roy T. Fielding and Tim Berners-Lee")
+            .withField(StandardField.TITLE, "{Hypertext Transfer Protocol -- HTTP/1.0}")
+            .withField(StandardField.PAGETOTAL, "60")
+            .withField(StandardField.YEAR, "1996")
+            .withField(StandardField.MONTH, "#may#")
+            .withField(StandardField.ABSTRACT, "The Hypertext Transfer Protocol (HTTP) is an application-level protocol with the lightness and speed necessary for distributed, collaborative, hypermedia information systems. This memo provides information for the Internet community. This memo does not specify an Internet standard of any kind.");
 
     @Test
     public void getNameReturnsEqualIdName() {
@@ -52,35 +45,30 @@ public void getNameReturnsEqualIdName() {
 
     @Test
     public void performSearchByIdFindsEntryWithDraftIdentifier() throws Exception {
-        BibEntry bibDraftEntry = new BibEntry();
-        bibDraftEntry.setType(StandardEntryType.TechReport);
-        bibDraftEntry.setField(InternalField.KEY_FIELD, "fielding-http-spec-01");
-        bibDraftEntry.setField(StandardField.AUTHOR, "Henrik Nielsen and Roy T. Fielding and Tim Berners-Lee");
-        bibDraftEntry.setField(StandardField.DAY, "20");
-        bibDraftEntry.setField(StandardField.INSTITUTION, "Internet Engineering Task Force");
-        bibDraftEntry.setField(StandardField.MONTH, "#dec#");
-        bibDraftEntry.setField(StandardField.NOTE, "Work in Progress");
-        bibDraftEntry.setField(StandardField.NUMBER, "draft-fielding-http-spec-01");
-        bibDraftEntry.setField(StandardField.PAGETOTAL, "41");
-        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/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.");
+        BibEntry bibDraftEntry = new BibEntry(StandardEntryType.TechReport)
+                .withField(InternalField.KEY_FIELD, "fielding-http-spec-01")
+                .withField(StandardField.AUTHOR, "Henrik Nielsen and Roy T. Fielding and Tim Berners-Lee")
+                .withField(StandardField.DAY, "20")
+                .withField(StandardField.INSTITUTION, "Internet Engineering Task Force")
+                .withField(StandardField.MONTH, "#dec#")
+                .withField(StandardField.NOTE, "Work in Progress")
+                .withField(StandardField.NUMBER, "draft-fielding-http-spec-01")
+                .withField(StandardField.PAGETOTAL, "41")
+                .withField(StandardField.PUBLISHER, "Internet Engineering Task Force")
+                .withField(StandardField.TITLE, "{Hypertext Transfer Protocol -- HTTP/1.0}")
+                .withField(StandardField.TYPE, "Internet-Draft")
+                .withField(StandardField.URL, "https://datatracker.ietf.org/doc/draft-fielding-http-spec/01/")
+                .withField(StandardField.YEAR, "1994")
+                .withField(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");
 
         assertEquals(Optional.of(bibDraftEntry), fetcher.performSearchById("draft-fielding-http-spec"));
     }
 
-    @Test
-    public void performSearchByIdFindsEntryWithRfcPrefix() throws Exception {
-        assertEquals(Optional.of(bibEntry), fetcher.performSearchById("RFC1945"));
-    }
-
-    @Test
-    public void performSearchByIdFindsEntryWithoutRfcPrefix() throws Exception {
-        assertEquals(Optional.of(bibEntry), fetcher.performSearchById("1945"));
+    @ParameterizedTest
+    @CsvSource({"rfc1945", "RFC1945", "1945"})
+    public void performSearchByIdFindsEntry(String identifier) throws Exception {
+        assertEquals(Optional.of(bibEntry), fetcher.performSearchById(identifier));
     }
 
     @Test
@@ -88,18 +76,14 @@ public void performSearchByIdFindsNothingWithoutIdentifier() throws Exception {
         assertEquals(Optional.empty(), fetcher.performSearchById(""));
     }
 
-    @Test
-    public void performSearchByIdFindsNothingWithValidDraftIdentifier() throws Exception {
-        assertThrows(FetcherClientException.class, () -> fetcher.performSearchById("draft-test-draft-spec"));
-    }
-
-    @Test
-    public void performSearchByIdFindsNothingWithValidIdentifier() throws Exception {
-        assertThrows(FetcherClientException.class, () -> fetcher.performSearchById("RFC9999"));
-    }
-
-    @Test
-    public void performSearchByIdFindsNothingWithInvalidIdentifier() throws Exception {
-        assertThrows(FetcherClientException.class, () -> fetcher.performSearchById("banana"));
+    @ParameterizedTest
+    @CsvSource({
+            // syntactically valid identifier
+            "draft-test-draft-spec",
+            "RFC9999",
+            // invalid identifier
+            "banana"})
+    public void performSearchByIdFindsNothingWithValidDraftIdentifier(String identifier) throws Exception {
+        assertThrows(FetcherClientException.class, () -> fetcher.performSearchById(identifier));
     }
 }
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 ad466a8e8c4..7e65f95309f 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/SpringerFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/SpringerFetcherTest.java
@@ -182,9 +182,9 @@ 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)"))
+                                                  .filter(bibEntry -> "Computer Supported Cooperative Work (CSCW)"
+                                                                              .equals(bibEntry.getField(StandardField.JOURNAL)
+                                                                                              .orElse("")))
                                                   .toList();
         allEntriesFromCSCW.stream()
                           .map(bibEntry -> bibEntry.getField(StandardField.AUTHOR))
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/isbntobibtex/EbookDeIsbnFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/isbntobibtex/EbookDeIsbnFetcherTest.java
index a7b1e1073e3..842cae00daa 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/isbntobibtex/EbookDeIsbnFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/isbntobibtex/EbookDeIsbnFetcherTest.java
@@ -13,6 +13,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;
 
@@ -20,6 +21,7 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.Mockito.mock;
 
+@Disabled
 @FetcherTest
 public class EbookDeIsbnFetcherTest extends AbstractIsbnFetcherTest {
 
@@ -84,6 +86,6 @@ public void authorsAreCorrectlyFormatted() throws Exception {
      */
     @Test
     public void searchForValidButNotFoundISBN() throws Exception {
-        assertThrows(FetcherClientException.class, ()-> fetcher.performSearchById("3728128155"));
+        assertThrows(FetcherClientException.class, () -> fetcher.performSearchById("3728128155"));
     }
 }
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/isbntobibtex/GVKIsbnFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/isbntobibtex/GVKIsbnFetcherTest.java
new file mode 100644
index 00000000000..0f8e7f76368
--- /dev/null
+++ b/src/test/java/org/jabref/logic/importer/fetcher/isbntobibtex/GVKIsbnFetcherTest.java
@@ -0,0 +1,103 @@
+package org.jabref.logic.importer.fetcher.isbntobibtex;
+
+import java.util.Optional;
+
+import org.jabref.logic.importer.FetcherException;
+import org.jabref.logic.importer.ImportFormatPreferences;
+import org.jabref.logic.importer.fetcher.AbstractIsbnFetcherTest;
+import org.jabref.logic.importer.fetcher.GvkFetcher;
+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.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;
+
+public class GVKIsbnFetcherTest extends AbstractIsbnFetcherTest {
+
+    private BibEntry bibEntryEffectiveJavaLongISBN;
+
+    @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");
+
+        bibEntryEffectiveJavaLongISBN = new BibEntry(StandardEntryType.Book)
+                .withField(StandardField.TITLE, "Effective Java")
+                .withField(StandardField.PUBLISHER, "Addison-Wesley")
+                .withField(StandardField.YEAR, "2011")
+                .withField(StandardField.AUTHOR, "Bloch, Joshua")
+                .withField(StandardField.SERIES, "The @Java series")
+                .withField(StandardField.ADDRESS, "Upper Saddle River, NJ [u.a.]")
+                .withField(StandardField.EDITION, "2. ed., rev. and updated for Java SE 6")
+                .withField(StandardField.NOTE, "*Hier auch später erschienene, unveränderte Nachdrucke*")
+                .withField(StandardField.ISBN, "9780321356680")
+                .withField(StandardField.PAGETOTAL, "346")
+                .withField(new UnknownField("ppn_gvk"), "67954951X")
+                .withField(StandardField.SUBTITLE, "[revised and updated for Java SE 6]");
+
+        fetcher = new GvkFetcher(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS));
+    }
+
+    @Test
+    @Override
+    public void testName() {
+        assertEquals("GVK", fetcher.getName());
+    }
+
+    @Test
+    @Override
+    public void searchByIdSuccessfulWithShortISBN() throws FetcherException {
+        Optional<BibEntry> fetchedEntry = fetcher.performSearchById("0321356683");
+        assertEquals(Optional.of(bibEntryEffectiveJavaLongISBN), fetchedEntry);
+    }
+
+    @Test
+    @Override
+    public void searchByIdSuccessfulWithLongISBN() throws FetcherException {
+        Optional<BibEntry> fetchedEntry = fetcher.performSearchById("9780321356680");
+        assertEquals(Optional.of(bibEntryEffectiveJavaLongISBN), fetchedEntry);
+    }
+
+    @Test
+    @Override
+    public void authorsAreCorrectlyFormatted() throws Exception {
+        BibEntry bibEntry = new BibEntry(StandardEntryType.Misc)
+                .withField(StandardField.TITLE, "Repository")
+                .withField(StandardField.SUBTITLE, "Eine Einführung")
+                .withField(StandardField.PUBLISHER, "De Gruyter Oldenbourg")
+                .withField(StandardField.AUTHOR, "Habermann, Hans-Joachim")
+                .withField(StandardField.ISBN, "9783110702125")
+                .withField(StandardField.YEAR, "2020")
+                .withField(StandardField.ADDRESS, "München")
+                .withField(StandardField.EDITION, "Reprint 2020")
+                .withField(StandardField.EDITOR, "Frank Leymann")
+                .withField(StandardField.NUMBER, "8.1")
+                .withField(StandardField.PAGETOTAL, "1294")
+                .withField(StandardField.SERIES, "Handbuch der Informatik")
+                .withField(new UnknownField("ppn_gvk"), "1738076555");
+
+        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
+       assertEquals(Optional.empty(), fetcher.performSearchById("9785646216541"));
+    }
+}
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/isbntobibtex/IsbnFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/isbntobibtex/IsbnFetcherTest.java
index 4b71b09416a..d2afbfb2b00 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/isbntobibtex/IsbnFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/isbntobibtex/IsbnFetcherTest.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,10 +34,14 @@ void setUp() {
         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");
+                .withField(StandardField.PUBLISHER, "Addison-Wesley")
+                .withField(StandardField.YEAR, "2018")
+                .withField(StandardField.ISBN, "9780134685991")
+                .withField(StandardField.NOTE, "Titelzusätze auf dem Umschlag: \"Updated for Java 9. Best practices for ... the Java platform\"")
+                .withField(StandardField.PAGETOTAL, "392")
+                .withField(new UnknownField("ppn_gvk"), "100121840X")
+                .withField(StandardField.EDITION, "Third edition")
+                .withField(StandardField.ADDRESS, "Boston");
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/transformers/CiteSeerQueryTransformerTest.java b/src/test/java/org/jabref/logic/importer/fetcher/transformers/CiteSeerQueryTransformerTest.java
new file mode 100644
index 00000000000..f2ba8266284
--- /dev/null
+++ b/src/test/java/org/jabref/logic/importer/fetcher/transformers/CiteSeerQueryTransformerTest.java
@@ -0,0 +1,144 @@
+package org.jabref.logic.importer.fetcher.transformers;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Stream;
+
+import org.jabref.logic.importer.FetcherException;
+import org.jabref.model.strings.StringUtil;
+
+import kong.unirest.json.JSONObject;
+import org.apache.lucene.queryparser.flexible.core.QueryNodeParseException;
+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 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 CiteSeerQueryTransformerTest extends InfixTransformerTest<CiteSeerQueryTransformer> {
+
+    @Override
+    protected CiteSeerQueryTransformer getTransformer() {
+        return new CiteSeerQueryTransformer();
+    }
+
+    @Override
+    public void convertYearField() throws Exception {
+        String queryString = "year:2023";
+        QueryNode luceneQuery = new StandardSyntaxParser().parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
+        CiteSeerQueryTransformer transformer = getTransformer();
+        transformer.transformLuceneQuery(luceneQuery);
+
+        Optional<Integer> start = Optional.of(transformer.getJSONPayload().getInt("yearStart"));
+        Optional<Integer> end = Optional.of(transformer.getJSONPayload().getInt("yearEnd"));
+        assertEquals(Optional.of(2023), start);
+        assertEquals(Optional.of(2023), end);
+    }
+
+    @Override
+    public void convertYearRangeField() throws Exception {
+        String queryString = "year-range:2019-2023";
+        QueryNode luceneQuery = new StandardSyntaxParser().parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
+        CiteSeerQueryTransformer transformer = getTransformer();
+        transformer.transformLuceneQuery(luceneQuery);
+
+        Optional<Integer> start = Optional.of(transformer.getJSONPayload().getInt("yearStart"));
+        Optional<Integer> end = Optional.of(transformer.getJSONPayload().getInt("yearEnd"));
+        assertEquals(Optional.of(2019), start);
+        assertEquals(Optional.of(2023), end);
+    }
+
+    @Test
+    public void convertPageField() throws Exception {
+        String queryString = "page:2";
+        QueryNode luceneQuery = new StandardSyntaxParser().parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
+        CiteSeerQueryTransformer transformer = getTransformer();
+        transformer.transformLuceneQuery(luceneQuery);
+
+        Optional<Integer> page = Optional.of(transformer.getJSONPayload().getInt("page"));
+        assertEquals(Optional.of(2), page);
+    }
+
+    @Test
+    public void convertPageSizeField() throws Exception {
+        String queryString = "pageSize:20";
+        QueryNode luceneQuery = new StandardSyntaxParser().parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
+        CiteSeerQueryTransformer transformer = getTransformer();
+        transformer.transformLuceneQuery(luceneQuery);
+
+        Optional<Integer> pageSize = Optional.of(transformer.getJSONPayload().getInt("pageSize"));
+        assertEquals(Optional.of(20), pageSize);
+    }
+
+    @Test
+    public void convertSortByField() throws Exception {
+        String queryString = "sortBy:relevance";
+        QueryNode luceneQuery = new StandardSyntaxParser().parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
+        CiteSeerQueryTransformer transformer = getTransformer();
+        transformer.transformLuceneQuery(luceneQuery);
+
+        Optional<String> sortBy = Optional.of(transformer.getJSONPayload().get("sortBy").toString());
+        assertEquals(Optional.of("relevance"), sortBy);
+    }
+
+    @Test
+    public void convertMultipleAuthors() throws Exception {
+        String queryString = "author:\"Wang Wei\" author:\"Zhang Pingwen\" author:\"Zhang Zhifei\"";
+        QueryNode luceneQuery = new StandardSyntaxParser().parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
+        CiteSeerQueryTransformer transformer = getTransformer();
+        transformer.transformLuceneQuery(luceneQuery);
+
+        List<String> authorsActual = transformer.getJSONPayload().getJSONArray("author").toList();
+        List<String> authorsExpected = List.of("Wang Wei", "Zhang Pingwen", "Zhang Zhifei");
+        assertEquals(authorsExpected, authorsActual);
+    }
+
+    private static Stream<Arguments> getJSONWithYearVariations() throws FetcherException {
+        String baseString = "title:Ericksen-Leslie page:1 pageSize:20 must_have_pdf:false sortBy:relevance";
+        List<String> withYearAndYearRange = List.of(
+                StringUtil.join(new String[]{baseString, "year:2020"}, " ", 0, 2),
+                StringUtil.join(new String[]{baseString, "year-range:2019-2023"}, " ", 0, 2)
+        );
+
+        JSONObject expectedJson = new JSONObject();
+        expectedJson.put("queryString", "Ericksen-Leslie");
+        expectedJson.put("page", 1);
+        expectedJson.put("pageSize", 20);
+        expectedJson.put("must_have_pdf", "false");
+        expectedJson.put("sortBy", "relevance");
+
+        List<JSONObject> actualJSONObjects = new ArrayList<>();
+        withYearAndYearRange.forEach(requestStr -> {
+            QueryNode luceneQuery = null;
+            try {
+                luceneQuery = new StandardSyntaxParser().parse(requestStr, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
+            } catch (QueryNodeParseException e) {
+                throw new RuntimeException(e);
+            }
+            CiteSeerQueryTransformer transformer = new CiteSeerQueryTransformer();
+            transformer.transformLuceneQuery(luceneQuery);
+            actualJSONObjects.add(transformer.getJSONPayload());
+        });
+
+        Iterator<JSONObject> jsonObjectIterator = actualJSONObjects.iterator();
+        return Stream.of(
+                Arguments.of(expectedJson, 2020, 2020, jsonObjectIterator.next()),
+                Arguments.of(expectedJson, 2019, 2023, jsonObjectIterator.next())
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource("getJSONWithYearVariations")
+    public void compareJSONRequestsWithYearVariations(JSONObject expected, Integer yearStart, Integer yearEnd, JSONObject actual) throws Exception {
+        expected.put("yearStart", yearStart);
+        expected.put("yearEnd", yearEnd);
+        assertEquals(expected, actual);
+        expected.remove("yearStart");
+        expected.remove("yearEnd");
+    }
+}
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/ACMPortalParserTest.java b/src/test/java/org/jabref/logic/importer/fileformat/ACMPortalParserTest.java
index d37fa902d54..059890bd01b 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/ACMPortalParserTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/ACMPortalParserTest.java
@@ -8,6 +8,7 @@
 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.ParseException;
@@ -40,7 +41,7 @@ void setUp() throws URISyntaxException, MalformedURLException {
                 .addParameter("AllField", searchQuery).build().toURL();
         searchEntryList = List.of(
                 new BibEntry(StandardEntryType.Conference)
-                        .withField(StandardField.AUTHOR, "Tobias Olsson and Morgan Ericsson and Anna Wingkvist")
+                        .withField(StandardField.AUTHOR, "Olsson, Tobias and Ericsson, Morgan and Wingkvist, Anna")
                         .withField(StandardField.YEAR, "2017")
                         .withField(StandardField.MONTH, "9")
                         .withField(StandardField.DAY, "11")
@@ -58,6 +59,7 @@ void setUp() throws URISyntaxException, MalformedURLException {
                         .withField(StandardField.PAGES, "152–158"),
                 new BibEntry(StandardEntryType.Book)
                         .withField(StandardField.YEAR, "2016")
+                        .withField(StandardField.MONTH, "10")
                         .withField(StandardField.TITLE, "Proceedings of the 2016 24th ACM SIGSOFT International Symposium on Foundations of Software Engineering")
                         .withField(StandardField.LOCATION, "Seattle, WA, USA")
                         .withField(StandardField.ISBN, "9781450342186")
@@ -73,7 +75,7 @@ void testParseEntries() throws IOException, ParseException {
         for (BibEntry bibEntry : bibEntries) {
             bibEntry.clearField(StandardField.ABSTRACT);
         }
-        assertEquals(searchEntryList.get(0), bibEntries.get(0));
+        assertEquals(Optional.of(searchEntryList.get(0)), bibEntries.stream().findFirst());
     }
 
     @Test
@@ -111,6 +113,31 @@ void testParseBibEntry() {
         assertEquals(searchEntryList.get(0), bibEntry);
     }
 
+    @Test
+    void testParseBibEntryWithFamilyAuthorOnly() {
+        String json = "{\"id\":\"10.1145/3011077.3011113\",\"type\":\"PAPER_CONFERENCE\",\"author\":[{\"family\":\"Ngo-Thi-Thu-Trang\"},{\"family\":\"Bui\",\"given\":\"Hieu T.\"},{\"family\":\"Nguyen\",\"given\":\"Nhan D.\"}],\"accessed\":{\"date-parts\":[[2023,8,4]]},\"issued\":{\"date-parts\":[[2016,12,8]]},\"original-date\":{\"date-parts\":[[2016,12,8]]},\"abstract\":\"\",\"call-number\":\"10.1145/3011077.3011113\",\"collection-title\":\"SoICT '16\",\"container-title\":\"Proceedings of the 7th Symposium on Information and Communication Technology\",\"DOI\":\"10.1145/3011077.3011113\",\"event-place\":\"Ho Chi Minh City, Vietnam\",\"ISBN\":\"9781450348157\",\"keyword\":\"orthogonal frequency division multiplexing (OFDM), long-range passive optical network (LR PON), four-wave mixing (FWM), wavelength division multiplexing (WDM)\",\"number-of-pages\":\"6\",\"page\":\"216–221\",\"publisher\":\"Association for Computing Machinery\",\"publisher-place\":\"New York, NY, USA\",\"title\":\"A simple performance analysis of IM-DD OFDM WDM systems in long range PON application\",\"URL\":\"https://doi.org/10.1145/3011077.3011113\"}";
+        BibEntry expectedEntry = new BibEntry(StandardEntryType.Conference)
+            .withField(StandardField.AUTHOR, "Ngo-Thi-Thu-Trang and Bui, Hieu T. and Nguyen, Nhan D.")
+            .withField(StandardField.TITLE, "A simple performance analysis of IM-DD OFDM WDM systems in long range PON application")
+            .withField(StandardField.BOOKTITLE, "Proceedings of the 7th Symposium on Information and Communication Technology")
+            .withField(StandardField.YEAR, "2016")
+            .withField(StandardField.SERIES, "SoICT '16")
+            .withField(StandardField.PAGES, "216–221")
+            .withField(StandardField.ADDRESS, "New York, NY, USA")
+            .withField(StandardField.MONTH, "12")
+            .withField(StandardField.PUBLISHER, "Association for Computing Machinery")
+            .withField(StandardField.LOCATION, "Ho Chi Minh City, Vietnam")
+            .withField(StandardField.ISBN, "9781450348157")
+            .withField(StandardField.DAY, "8")
+            .withField(StandardField.PAGETOTAL, "6")
+            .withField(StandardField.DOI, "10.1145/3011077.3011113")
+            .withField(StandardField.KEYWORDS, "four-wave mixing (FWM), long-range passive optical network (LR PON), orthogonal frequency division multiplexing (OFDM), wavelength division multiplexing (WDM)")
+            .withField(StandardField.URL, "https://doi.org/10.1145/3011077.3011113");
+
+        BibEntry parsedEntry = parser.parseBibEntry(json);
+        assertEquals(expectedEntry, parsedEntry);
+    }
+
     @Test
     void testNoEntryFound() throws URISyntaxException, IOException, ParseException {
         CookieHandler.setDefault(new CookieManager());
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 e34b469f320..d95eb7382c9 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/BibtexImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/BibtexImporterTest.java
@@ -12,12 +12,10 @@
 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;
@@ -36,7 +34,8 @@
 /**
  * This class tests the BibtexImporter.
  * <p>
- * The tests for writing can be found at {@link org.jabref.logic.exporter.BibtexDatabaseWriterTest}
+ * Tests for writing can be found at {@link org.jabref.logic.exporter.BibtexDatabaseWriterTest}.
+ * Tests for parsing single entry BibTeX can be found at {@link BibtexParserTest}
  */
 public class BibtexImporterTest {
 
@@ -61,7 +60,7 @@ public void testImportEntries() throws IOException, URISyntaxException {
         assertEquals(4, bibEntries.size());
 
         for (BibEntry entry : bibEntries) {
-            if (entry.getCitationKey().get().equals("aksin")) {
+            if ("aksin".equals(entry.getCitationKey().get())) {
                 assertEquals(
                         Optional.of(
                                 "Aks{\\i}n, {\\\"O}zge and T{\\\"u}rkmen, Hayati and Artok, Levent and {\\c{C}}etinkaya, "
@@ -78,7 +77,7 @@ public void testImportEntries() throws IOException, URISyntaxException {
                                         + "carbenes in {Mizoroki-Heck} reactions"),
                         entry.getField(StandardField.TITLE));
                 assertEquals(Optional.of("691"), entry.getField(StandardField.VOLUME));
-            } else if (entry.getCitationKey().get().equals("stdmodel")) {
+            } else if ("stdmodel".equals(entry.getCitationKey().get())) {
                 assertEquals(Optional
                                 .of("A \\texttt{set} with three members discussing the standard model of particle physics. "
                                         + "The \\texttt{crossref} field in the \\texttt{@set} entry and the \\texttt{entryset} field in "
@@ -86,7 +85,7 @@ public void testImportEntries() throws IOException, URISyntaxException {
                         entry.getField(StandardField.ANNOTATION));
                 assertEquals(Optional.of("stdmodel"), entry.getCitationKey());
                 assertEquals(Optional.of("glashow,weinberg,salam"), entry.getField(StandardField.ENTRYSET));
-            } else if (entry.getCitationKey().get().equals("set")) {
+            } else if ("set".equals(entry.getCitationKey().get())) {
                 assertEquals(Optional
                                 .of("A \\texttt{set} with three members. The \\texttt{crossref} field in the \\texttt{@set} "
                                         + "entry and the \\texttt{entryset} field in each set member entry is needed only when using "
@@ -94,7 +93,7 @@ public void testImportEntries() throws IOException, URISyntaxException {
                         entry.getField(StandardField.ANNOTATION));
                 assertEquals(Optional.of("set"), entry.getCitationKey());
                 assertEquals(Optional.of("herrmann,aksin,yoon"), entry.getField(StandardField.ENTRYSET));
-            } else if (entry.getCitationKey().get().equals("Preissel2016")) {
+            } else if ("Preissel2016".equals(entry.getCitationKey().get())) {
                 assertEquals(Optional.of("Heidelberg"), entry.getField(StandardField.ADDRESS));
                 assertEquals(Optional.of("Preißel, René"), entry.getField(StandardField.AUTHOR));
                 assertEquals(Optional.of("Preissel2016"), entry.getCitationKey());
@@ -140,7 +139,9 @@ 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")
+                Arguments.of(Charset.forName("Windows-1252"), "encoding-windows-1252-with-header.bib"),
+                Arguments.of(StandardCharsets.UTF_16BE, "encoding-utf-16BE-with-header.bib"),
+                Arguments.of(StandardCharsets.UTF_16BE, "encoding-utf-16BE-without-header.bib")
         );
     }
 
@@ -163,8 +164,9 @@ public void testParsingOfWindows1252EncodedFileReadsDegreeCharacterCorrectly(Str
     }
 
     @ParameterizedTest
-    @CsvSource({"encoding-utf-8-with-header.bib", "encoding-utf-8-without-header.bib"})
-    public void testParsingOfUtf8EncodedFileReadsUmlautCharacterCorrectly(String filename) throws Exception {
+    @CsvSource({"encoding-utf-8-with-header.bib", "encoding-utf-8-without-header.bib",
+                "encoding-utf-16BE-with-header.bib", "encoding-utf-16BE-without-header.bib"})
+    public void testParsingFilesReadsUmlautCharacterCorrectly(String filename) throws Exception {
         ParserResult parserResult = importer.importDatabase(
                 Path.of(BibtexImporterTest.class.getResource(filename).toURI()));
         assertEquals(
@@ -172,27 +174,21 @@ public void testParsingOfUtf8EncodedFileReadsUmlautCharacterCorrectly(String fil
                 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());
+    private static Stream<Arguments> encodingExplicitlySuppliedCorrectlyDetermined() {
+        return Stream.of(
+                Arguments.of("encoding-utf-8-with-header.bib", true),
+                Arguments.of("encoding-utf-8-without-header.bib", false),
+                Arguments.of("encoding-utf-16BE-with-header.bib", true),
+                Arguments.of("encoding-utf-16BE-without-header.bib", false)
+        );
     }
 
-    @Test
-    public void encodingSupplied() throws Exception {
+    @ParameterizedTest
+    @MethodSource
+    public void encodingExplicitlySuppliedCorrectlyDetermined(String filename, boolean encodingExplicitlySupplied) throws Exception {
         ParserResult parserResult = importer.importDatabase(
-                Path.of(BibtexImporterTest.class.getResource("encoding-utf-8-with-header.bib").toURI()));
-        assertTrue(parserResult.getMetaData().getEncodingExplicitlySupplied());
+                Path.of(BibtexImporterTest.class.getResource(filename).toURI()));
+        assertEquals(encodingExplicitlySupplied, parserResult.getMetaData().getEncodingExplicitlySupplied());
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java b/src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java
index 4888a9c6780..bdfc7a8718c 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java
@@ -12,12 +12,14 @@
 import java.util.List;
 import java.util.Optional;
 
+import javafx.collections.FXCollections;
+
 import org.jabref.logic.citationkeypattern.AbstractCitationKeyPattern;
 import org.jabref.logic.citationkeypattern.DatabaseCitationKeyPattern;
 import org.jabref.logic.citationkeypattern.GlobalCitationKeyPattern;
 import org.jabref.logic.cleanup.FieldFormatterCleanup;
 import org.jabref.logic.cleanup.FieldFormatterCleanups;
-import org.jabref.logic.exporter.SavePreferences;
+import org.jabref.logic.exporter.SaveConfiguration;
 import org.jabref.logic.formatter.bibtexfields.EscapeAmpersandsFormatter;
 import org.jabref.logic.formatter.bibtexfields.EscapeDollarSignFormatter;
 import org.jabref.logic.formatter.bibtexfields.EscapeUnderscoresFormatter;
@@ -51,61 +53,58 @@
 import org.jabref.model.groups.RegexKeywordGroup;
 import org.jabref.model.groups.TexGroup;
 import org.jabref.model.groups.WordKeywordGroup;
-import org.jabref.model.metadata.SaveOrderConfig;
-import org.jabref.model.util.DummyFileUpdateMonitor;
-import org.jabref.model.util.FileUpdateMonitor;
+import org.jabref.model.metadata.SaveOrder;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.function.Executable;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
 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.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+/**
+ * Tests for reading whole bib files can be found at {@link org.jabref.logic.importer.fileformat.BibtexImporterTest}
+ * <p>
+ * Tests cannot be executed concurrently, because Localization is used at {@link BibtexParser#parseAndAddEntry(String)}
+ */
 class BibtexParserTest {
 
     private ImportFormatPreferences importFormatPreferences;
     private BibtexParser parser;
-    private final FileUpdateMonitor fileMonitor = new DummyFileUpdateMonitor();
 
     @BeforeEach
     void setUp() {
         importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
         when(importFormatPreferences.bibEntryPreferences().getKeywordSeparator()).thenReturn(',');
-        parser = new BibtexParser(importFormatPreferences, new DummyFileUpdateMonitor());
+        parser = new BibtexParser(importFormatPreferences);
     }
 
     @Test
     void parseWithNullThrowsNullPointerException() throws Exception {
         Executable toBeTested = () -> parser.parse(null);
-
         assertThrows(NullPointerException.class, toBeTested);
     }
 
     @Test
     void fromStringRecognizesEntry() throws ParseException {
-        List<BibEntry> parsed = parser
+        List<BibEntry> result = parser
                 .parseEntries("@article{test,author={Ed von Test}}");
-
-        BibEntry expected = new BibEntry();
-        expected.setType(StandardEntryType.Article);
-        expected.setCitationKey("test");
-        expected.setField(StandardField.AUTHOR, "Ed von Test");
-
-        assertEquals(List.of(expected), parsed);
+        BibEntry expected = new BibEntry(StandardEntryType.Article)
+                .withCitationKey("test")
+                .withField(StandardField.AUTHOR, "Ed von Test");
+        assertEquals(List.of(expected), result);
     }
 
     @Test
     void fromStringReturnsEmptyListFromEmptyString() throws ParseException {
         Collection<BibEntry> parsed = parser.parseEntries("");
-
-        assertNotNull(parsed);
         assertEquals(Collections.emptyList(), parsed);
     }
 
@@ -113,8 +112,6 @@ void fromStringReturnsEmptyListFromEmptyString() throws ParseException {
     void fromStringReturnsEmptyListIfNoEntryRecognized() throws ParseException {
         Collection<BibEntry> parsed = parser
                 .parseEntries("@@article@@{{{{{{}");
-
-        assertNotNull(parsed);
         assertEquals(Collections.emptyList(), parsed);
     }
 
@@ -125,14 +122,11 @@ void singleFromStringRecognizesEntry() throws ParseException {
                         @article{canh05,  author = {Crowston, K. and Annabi, H.},
                           title = {Title A}}
                         """,
-                importFormatPreferences, fileMonitor);
-
-        BibEntry expected = new BibEntry();
-        expected.setType(StandardEntryType.Article);
-        expected.setCitationKey("canh05");
-        expected.setField(StandardField.AUTHOR, "Crowston, K. and Annabi, H.");
-        expected.setField(StandardField.TITLE, "Title A");
-
+                importFormatPreferences);
+        BibEntry expected = new BibEntry(StandardEntryType.Article)
+                .withCitationKey("canh05")
+                .withField(StandardField.AUTHOR, "Crowston, K. and Annabi, H.")
+                .withField(StandardField.TITLE, "Title A");
         assertEquals(Optional.of(expected), parsed);
     }
 
@@ -142,23 +136,20 @@ void singleFromStringRecognizesEntryInMultiple() throws ParseException {
                         @article{canh05, author = {Crowston, K. and Annabi, H.},
                             title = {Title A}}
                         @inProceedings{foo,  author={Norton Bar}}""",
-                importFormatPreferences, fileMonitor);
-
+                importFormatPreferences);
         assertTrue(parsed.get().getCitationKey().equals(Optional.of("canh05"))
                 || parsed.get().getCitationKey().equals(Optional.of("foo")));
     }
 
     @Test
     void singleFromStringReturnsEmptyFromEmptyString() throws ParseException {
-        Optional<BibEntry> parsed = BibtexParser.singleFromString("", importFormatPreferences, fileMonitor);
-
+        Optional<BibEntry> parsed = BibtexParser.singleFromString("", importFormatPreferences);
         assertEquals(Optional.empty(), parsed);
     }
 
     @Test
     void singleFromStringReturnsEmptyIfNoEntryRecognized() throws ParseException {
-        Optional<BibEntry> parsed = BibtexParser.singleFromString("@@article@@{{{{{{}", importFormatPreferences, fileMonitor);
-
+        Optional<BibEntry> parsed = BibtexParser.singleFromString("@@article@@{{{{{{}", importFormatPreferences);
         assertEquals(Optional.empty(), parsed);
     }
 
@@ -166,132 +157,89 @@ void singleFromStringReturnsEmptyIfNoEntryRecognized() throws ParseException {
     void parseRecognizesEntry() throws IOException {
         ParserResult result = parser
                 .parse(new StringReader("@article{test,author={Ed von Test}}"));
-
-        List<BibEntry> parsed = result.getDatabase().getEntries();
-        BibEntry entry = parsed.iterator().next();
-
-        assertEquals(1, parsed.size());
-        assertEquals(StandardEntryType.Article, entry.getType());
-        assertEquals(Optional.of("test"), entry.getCitationKey());
-        assertEquals(2, entry.getFields().size());
-        assertEquals(Optional.of("Ed von Test"), entry.getField(StandardField.AUTHOR));
+        BibEntry expected = new BibEntry(StandardEntryType.Article)
+                .withCitationKey("test")
+                .withField(StandardField.AUTHOR, "Ed von Test");
+        assertEquals(List.of(expected), result.getDatabase().getEntries());
     }
 
     @Test
-    void parseQuotedEntries() throws IOException {
+    void parseRecognizesFieldValuesInQuotationMarks() throws IOException {
         ParserResult result = parser
                 .parse(new StringReader("@article{test,author=\"Ed von Test\"}"));
-
-        List<BibEntry> parsed = result.getDatabase().getEntries();
-        BibEntry entry = parsed.iterator().next();
-
-        assertEquals(1, parsed.size());
-        assertEquals(StandardEntryType.Article, entry.getType());
-        assertEquals(Optional.of("test"), entry.getCitationKey());
-        assertEquals(2, entry.getFields().size());
-        assertEquals(Optional.of("Ed von Test"), entry.getField(StandardField.AUTHOR));
+        BibEntry expected = new BibEntry(StandardEntryType.Article)
+                .withCitationKey("test")
+                .withField(StandardField.AUTHOR, "Ed von Test");
+        assertEquals(List.of(expected), result.getDatabase().getEntries());
     }
 
     @Test
     void parseRecognizesEntryOnlyWithKey() throws IOException {
         ParserResult result = parser.parse(new StringReader("@article{test}"));
-
-        List<BibEntry> parsed = result.getDatabase().getEntries();
-        BibEntry entry = parsed.iterator().next();
-
-        assertEquals(1, parsed.size());
-        assertEquals(StandardEntryType.Article, entry.getType());
-        assertEquals(Optional.of("test"), entry.getCitationKey());
+        BibEntry expected = new BibEntry(StandardEntryType.Article)
+                .withCitationKey("test");
+        assertEquals(List.of(expected), result.getDatabase().getEntries());
     }
 
     @Test
-    void parseRecognizesEntryWithWhitespaceAtBegining() throws IOException {
+    void parseRecognizesEntryWithWhitespaceAtBeginning() throws IOException {
         ParserResult result = parser
                 .parse(new StringReader(" @article{test,author={Ed von Test}}"));
-
-        List<BibEntry> parsed = result.getDatabase().getEntries();
-        BibEntry entry = parsed.iterator().next();
-
-        assertEquals(1, parsed.size());
-        assertEquals(StandardEntryType.Article, entry.getType());
-        assertEquals(Optional.of("test"), entry.getCitationKey());
-        assertEquals(2, entry.getFields().size());
-        assertEquals(Optional.of("Ed von Test"), entry.getField(StandardField.AUTHOR));
+        BibEntry expected = new BibEntry(StandardEntryType.Article)
+                .withUserComments(" ")
+                .withCitationKey("test")
+                .withField(StandardField.AUTHOR, "Ed von Test");
+        assertEquals(List.of(expected), result.getDatabase().getEntries());
     }
 
     @Test
     void parseRecognizesEntryWithWhitespace() throws IOException {
         ParserResult result = parser
                 .parse(new StringReader("@article { test,author={Ed von Test}}"));
-
-        List<BibEntry> parsed = result.getDatabase().getEntries();
-        BibEntry entry = parsed.iterator().next();
-
-        assertEquals(1, parsed.size());
-        assertEquals(StandardEntryType.Article, entry.getType());
-        assertEquals(Optional.of("test"), entry.getCitationKey());
-        assertEquals(2, entry.getFields().size());
-        assertEquals(Optional.of("Ed von Test"), entry.getField(StandardField.AUTHOR));
+        BibEntry expected = new BibEntry(StandardEntryType.Article)
+                .withCitationKey("test")
+                .withField(StandardField.AUTHOR, "Ed von Test");
+        assertEquals(List.of(expected), result.getDatabase().getEntries());
     }
 
     @Test
     void parseRecognizesEntryWithNewlines() throws IOException {
         ParserResult result = parser
                 .parse(new StringReader("@article\n{\ntest,author={Ed von Test}}"));
-
-        Collection<BibEntry> parsed = result.getDatabase().getEntries();
-        BibEntry entry = parsed.iterator().next();
-
-        assertEquals(1, parsed.size());
-        assertEquals(StandardEntryType.Article, entry.getType());
-        assertEquals(Optional.of("test"), entry.getCitationKey());
-        assertEquals(2, entry.getFields().size());
-        assertEquals(Optional.of("Ed von Test"), entry.getField(StandardField.AUTHOR));
+        BibEntry expected = new BibEntry(StandardEntryType.Article)
+                .withCitationKey("test")
+                .withField(StandardField.AUTHOR, "Ed von Test");
+        assertEquals(List.of(expected), result.getDatabase().getEntries());
     }
 
     @Test
     void parseRecognizesEntryWithUnknownType() throws IOException {
         ParserResult result = parser
                 .parse(new StringReader("@unknown{test,author={Ed von Test}}"));
-
-        Collection<BibEntry> parsed = result.getDatabase().getEntries();
-        BibEntry entry = parsed.iterator().next();
-
-        assertEquals(1, parsed.size());
-        assertEquals(new UnknownEntryType("unknown"), entry.getType());
-        assertEquals(Optional.of("test"), entry.getCitationKey());
-        assertEquals(2, entry.getFields().size());
-        assertEquals(Optional.of("Ed von Test"), entry.getField(StandardField.AUTHOR));
+        BibEntry expected = new BibEntry(new UnknownEntryType("unknown"))
+                .withCitationKey("test")
+                .withField(StandardField.AUTHOR, "Ed von Test");
+        assertEquals(List.of(expected), result.getDatabase().getEntries());
     }
 
     @Test
     void parseRecognizesEntryWithVeryLongType() throws IOException {
         ParserResult result = parser.parse(
                 new StringReader("@thisIsALongStringToTestMaybeItIsToLongWhoKnowsNOTme{test,author={Ed von Test}}"));
-
-        Collection<BibEntry> parsed = result.getDatabase().getEntries();
-        BibEntry entry = parsed.iterator().next();
-
-        assertEquals(1, parsed.size());
-        assertEquals(new UnknownEntryType("thisisalongstringtotestmaybeitistolongwhoknowsnotme"), entry.getType());
-        assertEquals(Optional.of("test"), entry.getCitationKey());
-        assertEquals(2, entry.getFields().size());
-        assertEquals(Optional.of("Ed von Test"), entry.getField(StandardField.AUTHOR));
+        BibEntry expected = new BibEntry(new UnknownEntryType("thisisalongstringtotestmaybeitistolongwhoknowsnotme"))
+                .withCitationKey("test")
+                .withField(StandardField.AUTHOR, "Ed von Test");
+        assertEquals(List.of(expected), result.getDatabase().getEntries());
     }
 
     @Test
     void parseRecognizesEntryInParenthesis() throws IOException {
         ParserResult result = parser
                 .parse(new StringReader("@article(test,author={Ed von Test})"));
-
-        Collection<BibEntry> parsed = result.getDatabase().getEntries();
-        BibEntry entry = parsed.iterator().next();
-
-        assertEquals(1, parsed.size());
-        assertEquals(StandardEntryType.Article, entry.getType());
-        assertEquals(Optional.of("test"), entry.getCitationKey());
-        assertEquals(2, entry.getFields().size());
-        assertEquals(Optional.of("Ed von Test"), entry.getField(StandardField.AUTHOR));
+        BibEntry expected = new BibEntry(StandardEntryType.Article)
+                .withCitationKey("test")
+                .withField(StandardField.AUTHOR, "Ed von Test");
+        assertEquals(List.of(expected), result.getDatabase().getEntries());
     }
 
     @Test
@@ -301,57 +249,42 @@ void parseRecognizesEntryWithBigNumbers() throws IOException {
                 isbn2 = {1234567890123456789},
                 small = 1234,
                 }"""));
-
-        Collection<BibEntry> parsed = result.getDatabase().getEntries();
-        BibEntry entry = parsed.iterator().next();
-
-        assertEquals(StandardEntryType.Article, entry.getType());
-        assertEquals(Optional.of("canh05"), entry.getCitationKey());
-        assertEquals(Optional.of("1234567890123456789"), entry.getField(StandardField.ISBN));
-        assertEquals(Optional.of("1234567890123456789"), entry.getField(new UnknownField("isbn2")));
-        assertEquals(Optional.of("1234"), entry.getField(new UnknownField("small")));
+        BibEntry expected = new BibEntry(StandardEntryType.Article)
+                .withCitationKey("canh05")
+                .withField(StandardField.ISBN, "1234567890123456789")
+                .withField(new UnknownField("isbn2"), "1234567890123456789")
+                .withField(new UnknownField("small"), "1234");
+        assertEquals(List.of(expected), result.getDatabase().getEntries());
     }
 
     @Test
     void parseRecognizesCitationKeyWithSpecialCharacters() throws IOException {
         ParserResult result = parser
                 .parse(new StringReader("@article{te_st:with-special(characters),author={Ed von Test}}"));
-
-        Collection<BibEntry> parsed = result.getDatabase().getEntries();
-        BibEntry entry = parsed.iterator().next();
-
-        assertEquals(StandardEntryType.Article, entry.getType());
-        assertEquals(Optional.of("te_st:with-special(characters)"), entry.getCitationKey());
-        assertEquals(2, entry.getFields().size());
-        assertEquals(Optional.of("Ed von Test"), entry.getField(StandardField.AUTHOR));
+        BibEntry expected = new BibEntry(StandardEntryType.Article)
+                .withCitationKey("te_st:with-special(characters)")
+                .withField(StandardField.AUTHOR, "Ed von Test");
+        assertEquals(List.of(expected), result.getDatabase().getEntries());
     }
 
     @Test
     void parseRecognizesEntryWhereLastFieldIsFinishedWithComma() throws IOException {
         ParserResult result = parser
                 .parse(new StringReader("@article{test,author={Ed von Test},}"));
-
-        Collection<BibEntry> parsed = result.getDatabase().getEntries();
-        BibEntry entry = parsed.iterator().next();
-
-        assertEquals(1, parsed.size());
-        assertEquals(StandardEntryType.Article, entry.getType());
-        assertEquals(Optional.of("test"), entry.getCitationKey());
-        assertEquals(2, entry.getFields().size());
-        assertEquals(Optional.of("Ed von Test"), entry.getField(StandardField.AUTHOR));
+        BibEntry expected = new BibEntry(StandardEntryType.Article)
+                .withCitationKey("test")
+                .withField(StandardField.AUTHOR, "Ed von Test");
+        assertEquals(List.of(expected), result.getDatabase().getEntries());
     }
 
     @Test
     void parseRecognizesEntryWithAtInField() throws IOException {
         ParserResult result = parser
                 .parse(new StringReader("@article{test,author={Ed von T@st}}"));
-
-        List<BibEntry> parsed = result.getDatabase().getEntries();
-
-        BibEntry expected = new BibEntry(StandardEntryType.Article).withField(InternalField.KEY_FIELD, "test")
-                                                                   .withField(StandardField.AUTHOR, "Ed von T@st");
-
-        assertEquals(List.of(expected), parsed);
+        BibEntry expected = new BibEntry(StandardEntryType.Article)
+                .withField(InternalField.KEY_FIELD, "test")
+                .withField(StandardField.AUTHOR, "Ed von T@st");
+        assertEquals(List.of(expected), result.getDatabase().getEntries());
     }
 
     @Test
@@ -373,28 +306,20 @@ void parseRecognizesEntryPrecedingComment() throws IOException {
 
     @Test
     void parseRecognizesMultipleEntries() throws IOException {
-        List<BibEntry> expected = new ArrayList<>();
-        BibEntry firstEntry = new BibEntry();
-        firstEntry.setType(StandardEntryType.Article);
-        firstEntry.setCitationKey("canh05");
-        firstEntry.setField(StandardField.AUTHOR, "Crowston, K. and Annabi, H.");
-        firstEntry.setField(StandardField.TITLE, "Title A");
-        expected.add(firstEntry);
-
-        BibEntry secondEntry = new BibEntry();
-        secondEntry.setType(StandardEntryType.InProceedings);
-        secondEntry.setCitationKey("foo");
-        secondEntry.setField(StandardField.AUTHOR, "Norton Bar");
-        expected.add(secondEntry);
-
         ParserResult result = parser.parse(
                 new StringReader("""
                         @article{canh05,  author = {Crowston, K. and Annabi, H.},
                           title = {Title A}}
                         @inProceedings{foo,  author={Norton Bar}}"""));
-        List<BibEntry> parsed = result.getDatabase().getEntries();
-
-        assertEquals(expected, parsed);
+        List<BibEntry> expected = List.of(
+                new BibEntry(StandardEntryType.Article)
+                        .withCitationKey("canh05")
+                        .withField(StandardField.AUTHOR, "Crowston, K. and Annabi, H.")
+                        .withField(StandardField.TITLE, "Title A"),
+                new BibEntry(StandardEntryType.InProceedings)
+                        .withCitationKey("foo")
+                        .withField(StandardField.AUTHOR, "Norton Bar"));
+        assertEquals(expected, result.getDatabase().getEntries());
     }
 
     @Test
@@ -402,82 +327,52 @@ void parseSetsParsedSerialization() throws IOException {
         String firstEntry = "@article{canh05," + "  author = {Crowston, K. and Annabi, H.}," + OS.NEWLINE
                 + "  title = {Title A}}" + OS.NEWLINE;
         String secondEntry = "@inProceedings{foo," + "  author={Norton Bar}}";
-
-        ParserResult result = parser
-                .parse(new StringReader(firstEntry + secondEntry));
-
-        for (BibEntry entry : result.getDatabase().getEntries()) {
-            if (entry.getCitationKey().equals(Optional.of("canh05"))) {
-                assertEquals(firstEntry, entry.getParsedSerialization());
-            } else {
-                assertEquals(secondEntry, entry.getParsedSerialization());
-            }
-        }
+        List<BibEntry> parsedEntries = parser.parse(new StringReader(firstEntry + secondEntry))
+                                             .getDatabase().getEntries();
+        assertEquals(firstEntry, parsedEntries.get(0).getParsedSerialization());
+        assertEquals(secondEntry, parsedEntries.get(1).getParsedSerialization());
     }
 
     @Test
     void parseRecognizesMultipleEntriesOnSameLine() throws IOException {
-        List<BibEntry> expected = new ArrayList<>();
-        BibEntry firstEntry = new BibEntry();
-        firstEntry.setType(StandardEntryType.Article);
-        firstEntry.setCitationKey("canh05");
-        expected.add(firstEntry);
-
-        BibEntry secondEntry = new BibEntry();
-        secondEntry.setType(StandardEntryType.InProceedings);
-        secondEntry.setCitationKey("foo");
-        expected.add(secondEntry);
-
         ParserResult result = parser
                 .parse(new StringReader("@article{canh05}" + "@inProceedings{foo}"));
-        List<BibEntry> parsed = result.getDatabase().getEntries();
-
-        assertEquals(expected, parsed);
+        List<BibEntry> expected = List.of(
+                new BibEntry(StandardEntryType.Article)
+                        .withCitationKey("canh05"),
+                new BibEntry(StandardEntryType.InProceedings)
+                        .withCitationKey("foo"));
+        assertEquals(expected, result.getDatabase().getEntries());
     }
 
     @Test
     void parseCombinesMultipleAuthorFields() throws IOException {
         ParserResult result = parser.parse(
                 new StringReader("@article{test,author={Ed von Test},author={Second Author},author={Third Author}}"));
-
-        Collection<BibEntry> parsed = result.getDatabase().getEntries();
-        BibEntry entry = parsed.iterator().next();
-
-        assertEquals(1, parsed.size());
-        assertEquals(StandardEntryType.Article, entry.getType());
-        assertEquals(Optional.of("test"), entry.getCitationKey());
-        assertEquals(2, entry.getFields().size());
-        assertEquals(Optional.of("Ed von Test and Second Author and Third Author"), entry.getField(StandardField.AUTHOR));
+        BibEntry expected = new BibEntry(StandardEntryType.Article)
+                .withCitationKey("test")
+                .withField(StandardField.AUTHOR, "Ed von Test and Second Author and Third Author");
+        assertEquals(List.of(expected), result.getDatabase().getEntries());
     }
 
     @Test
     void parseCombinesMultipleEditorFields() throws IOException {
         ParserResult result = parser.parse(
                 new StringReader("@article{test,editor={Ed von Test},editor={Second Author},editor={Third Author}}"));
-
-        Collection<BibEntry> parsed = result.getDatabase().getEntries();
-        BibEntry entry = parsed.iterator().next();
-
-        assertEquals(1, parsed.size());
-        assertEquals(StandardEntryType.Article, entry.getType());
-        assertEquals(Optional.of("test"), entry.getCitationKey());
-        assertEquals(2, entry.getFields().size());
-        assertEquals(Optional.of("Ed von Test and Second Author and Third Author"), entry.getField(StandardField.EDITOR));
+        BibEntry expected = new BibEntry(StandardEntryType.Article)
+                .withCitationKey("test")
+                .withField(StandardField.EDITOR, "Ed von Test and Second Author and Third Author");
+        assertEquals(List.of(expected), result.getDatabase().getEntries());
     }
 
     @Test
     void parseCombinesMultipleKeywordsFields() throws IOException {
         ParserResult result = parser.parse(
                 new StringReader("@article{test,Keywords={Test},Keywords={Second Keyword},Keywords={Third Keyword}}"));
-
-        Collection<BibEntry> parsed = result.getDatabase().getEntries();
-        BibEntry entry = parsed.iterator().next();
-
-        assertEquals(1, parsed.size());
-        assertEquals(StandardEntryType.Article, entry.getType());
-        assertEquals(Optional.of("test"), entry.getCitationKey());
-        assertEquals(2, entry.getFields().size());
-        assertEquals(Optional.of("Test, Second Keyword, Third Keyword"), entry.getField(StandardField.KEYWORDS));
+        BibEntry expected = new BibEntry(StandardEntryType.Article)
+                .withCitationKey("test")
+                .withField(StandardField.KEYWORDS, "Test, Second Keyword, Third Keyword");
+        assertEquals(List.of(expected), result.getDatabase().getEntries());
     }
 
     @Test
@@ -547,78 +442,47 @@ void parseRecognizesFormatedEntry() throws IOException {
         assertEquals(Optional.of("http://james.howison.name/publications.html"), entry.getField(StandardField.URL));
     }
 
-    @Test
-    void parseRecognizesFieldValuesInQuotationMarks() throws IOException {
-        ParserResult result = parser
-                .parse(new StringReader("@article{test,author=\"Ed von Test\"}"));
-
-        Collection<BibEntry> parsed = result.getDatabase().getEntries();
-        BibEntry entry = parsed.iterator().next();
-
-        assertEquals(1, parsed.size());
-        assertEquals(StandardEntryType.Article, entry.getType());
-        assertEquals(Optional.of("test"), entry.getCitationKey());
-        assertEquals(2, entry.getFields().size());
-        assertEquals(Optional.of("Ed von Test"), entry.getField(StandardField.AUTHOR));
-    }
-
     @Test
     void parseRecognizesNumbersWithoutBracketsOrQuotationMarks() throws IOException {
         ParserResult result = parser
                 .parse(new StringReader("@article{test,year = 2005}"));
-
-        Collection<BibEntry> parsed = result.getDatabase().getEntries();
-        BibEntry entry = parsed.iterator().next();
-
-        assertEquals(1, parsed.size());
-        assertEquals(StandardEntryType.Article, entry.getType());
-        assertEquals(Optional.of("test"), entry.getCitationKey());
-        assertEquals(2, entry.getFields().size());
-        assertEquals(Optional.of("2005"), entry.getField(StandardField.YEAR));
+        BibEntry expected = new BibEntry(StandardEntryType.Article)
+                .withCitationKey("test")
+                .withField(StandardField.YEAR, "2005");
+        assertEquals(List.of(expected), result.getDatabase().getEntries());
     }
 
     @Test
     void parseRecognizesUppercaseFields() throws IOException {
         ParserResult result = parser
                 .parse(new StringReader("@article{test,AUTHOR={Ed von Test}}"));
-
-        Collection<BibEntry> parsed = result.getDatabase().getEntries();
-        BibEntry entry = parsed.iterator().next();
-
-        assertEquals(1, parsed.size());
-        assertEquals(StandardEntryType.Article, entry.getType());
-        assertEquals(Optional.of("test"), entry.getCitationKey());
-        assertEquals(2, entry.getFields().size());
-        assertEquals(Optional.of("Ed von Test"), entry.getField(StandardField.AUTHOR));
+        BibEntry expected = new BibEntry(StandardEntryType.Article)
+                .withCitationKey("test")
+                .withField(StandardField.AUTHOR, "Ed von Test");
+        assertEquals(List.of(expected), result.getDatabase().getEntries());
     }
 
     @Test
     void parseRecognizesAbsoluteFile() throws IOException {
         ParserResult result = parser
                 .parse(new StringReader("@article{test,file = {D:\\Documents\\literature\\Tansel-PRL2006.pdf}}"));
-
-        Collection<BibEntry> parsed = result.getDatabase().getEntries();
-        BibEntry entry = parsed.iterator().next();
-
-        assertEquals(1, parsed.size());
-        assertEquals(StandardEntryType.Article, entry.getType());
-        assertEquals(Optional.of("test"), entry.getCitationKey());
-        assertEquals(2, entry.getFields().size());
-        assertEquals(Optional.of("D:\\Documents\\literature\\Tansel-PRL2006.pdf"), entry.getField(StandardField.FILE));
+        BibEntry expected = new BibEntry(StandardEntryType.Article)
+                .withCitationKey("test")
+                .withField(StandardField.FILE, "D:\\Documents\\literature\\Tansel-PRL2006.pdf");
+        assertEquals(List.of(expected), result.getDatabase().getEntries());
     }
 
     @Test
     void parseRecognizesFinalSlashAsSlash() throws Exception {
         ParserResult result = parser
                 .parse(new StringReader("""
-        @misc{,
-          test = {wired\\},
-        }
-        """));
-
+                        @misc{,
+                          test = {wired\\},
+                        }
+                        """));
         assertEquals(
                 List.of(new BibEntry()
-                .withField(new UnknownField("test"), "wired\\")),
+                        .withField(new UnknownField("test"), "wired\\")),
                 result.getDatabase().getEntries()
         );
     }
@@ -637,15 +501,10 @@ void parseFailsWithFinalSlashAsSlashWhenSingleLine() throws Exception {
     void parseRecognizesDateFieldWithConcatenation() throws IOException {
         ParserResult result = parser
                 .parse(new StringReader("@article{test,date = {1-4~} # nov}"));
-
-        Collection<BibEntry> parsed = result.getDatabase().getEntries();
-        BibEntry entry = parsed.iterator().next();
-
-        assertEquals(1, parsed.size());
-        assertEquals(StandardEntryType.Article, entry.getType());
-        assertEquals(Optional.of("test"), entry.getCitationKey());
-        assertEquals(2, entry.getFields().size());
-        assertEquals(Optional.of("1-4~#nov#"), entry.getField(StandardField.DATE));
+        BibEntry expected = new BibEntry(StandardEntryType.Article)
+                .withCitationKey("test")
+                .withField(StandardField.DATE, "1-4~#nov#");
+        assertEquals(List.of(expected), result.getDatabase().getEntries());
     }
 
     @Test
@@ -673,35 +532,25 @@ void parseReturnsEmptyListIfNoEntryExistent() throws IOException {
                         This was created with JabRef 2.1 beta 2.
                         Encoding: Cp1252
                         """));
-
-        Collection<BibEntry> parsed = result.getDatabase().getEntries();
-
-        assertEquals(0, parsed.size());
+        assertEquals(List.of(), result.getDatabase().getEntries());
     }
 
     @Test
     void parseNotWarnsAboutEntryWithoutCitationKey() throws IOException {
-        BibEntry expected = new BibEntry();
-        expected.setField(StandardField.AUTHOR, "Ed von Test");
-        expected.setType(StandardEntryType.Article);
-
         ParserResult result = parser
                 .parse(new StringReader("@article{,author={Ed von Test}}"));
-        Collection<BibEntry> parsed = result.getDatabase().getEntries();
-
         assertFalse(result.hasWarnings());
-        assertEquals(List.of(expected), parsed);
+        BibEntry expected = new BibEntry(StandardEntryType.Article)
+                .withField(StandardField.AUTHOR, "Ed von Test");
+        assertEquals(List.of(expected), result.getDatabase().getEntries());
     }
 
     @Test
     void parseIgnoresAndWarnsAboutEntryWithUnmatchedOpenBracket() throws IOException {
         ParserResult result = parser
                 .parse(new StringReader("@article{test,author={author missing bracket}"));
-
-        Collection<BibEntry> parsed = result.getDatabase().getEntries();
-
-        assertEquals(0, parsed.size());
         assertTrue(result.hasWarnings());
+        assertEquals(List.of(), result.getDatabase().getEntries());
     }
 
     @Test
@@ -973,7 +822,7 @@ void parseRecognizesMultipleStrings() throws IOException {
         BibtexString first = iterator.next();
         BibtexString second = iterator.next();
         // Sort them because we can't be sure about the order
-        if (first.getName().equals("adieu")) {
+        if ("adieu".equals(first.getName())) {
             BibtexString tmp = first;
             first = second;
             second = tmp;
@@ -1155,9 +1004,9 @@ void parseConvertsMultipleTabsToSpace() throws IOException {
 
     @Test
     void parsePreservesMultipleSpacesInNonWrappableField() throws IOException {
-        when(importFormatPreferences.fieldContentFormatterPreferences().getNonWrappableFields())
-                .thenReturn(List.of(StandardField.FILE));
-        BibtexParser parser = new BibtexParser(importFormatPreferences, fileMonitor);
+        when(importFormatPreferences.fieldPreferences().getNonWrappableFields()).thenReturn(
+                FXCollections.observableArrayList(List.of(StandardField.FILE)));
+        BibtexParser parser = new BibtexParser(importFormatPreferences);
         ParserResult result = parser
                 .parse(new StringReader("@article{canh05,file = {ups  sala}}"));
 
@@ -1273,7 +1122,7 @@ void parseSavesAllButOneNewlinesBeforeEntryInParsedSerialization() throws IOExce
     void parseRemovesEncodingLineAndSeparatorInParsedSerialization() throws IOException {
         String testEntry = "@article{test,author={Ed von Test}}";
         ParserResult result = parser.parse(
-                new StringReader(SavePreferences.ENCODING_PREFIX + OS.NEWLINE + OS.NEWLINE + OS.NEWLINE + testEntry));
+                new StringReader(SaveConfiguration.ENCODING_PREFIX + OS.NEWLINE + OS.NEWLINE + OS.NEWLINE + testEntry));
 
         Collection<BibEntry> parsedEntries = result.getDatabase().getEntries();
         BibEntry parsedEntry = parsedEntries.iterator().next();
@@ -1473,12 +1322,12 @@ void integrationTestSaveOrderConfig() throws IOException {
                 new StringReader(
                         "@Comment{jabref-meta: saveOrderConfig:specified;author;false;year;true;abstract;false;}"));
 
-        Optional<SaveOrderConfig> saveOrderConfig = result.getMetaData().getSaveOrderConfig();
+        Optional<SaveOrder> saveOrderConfig = result.getMetaData().getSaveOrder();
 
-        assertEquals(new SaveOrderConfig(SaveOrderConfig.OrderType.SPECIFIED, List.of(
-                new SaveOrderConfig.SortCriterion(StandardField.AUTHOR, false),
-                new SaveOrderConfig.SortCriterion(StandardField.YEAR, true),
-                new SaveOrderConfig.SortCriterion(StandardField.ABSTRACT, false))),
+        assertEquals(new SaveOrder(SaveOrder.OrderType.SPECIFIED, List.of(
+                        new SaveOrder.SortCriterion(StandardField.AUTHOR, false),
+                        new SaveOrder.SortCriterion(StandardField.YEAR, true),
+                        new SaveOrder.SortCriterion(StandardField.ABSTRACT, false))),
                 saveOrderConfig.get());
     }
 
@@ -1537,20 +1386,20 @@ void integrationTestGroupTree() throws IOException, ParseException {
     @Test
     void integrationTestTexGroup() throws Exception {
         ParserResult result = parser.parse(new StringReader(
-             "@comment{jabref-meta: grouping:" + OS.NEWLINE
-                     + "0 AllEntriesGroup:;" + OS.NEWLINE
-                     + "1 TexGroup:cited entries\\;0\\;paper.aux\\;1\\;0x8a8a8aff\\;\\;\\;;"
-                     + "}" + OS.NEWLINE
-           + "@Comment{jabref-meta: databaseType:biblatex;}" + OS.NEWLINE
-           + "@Comment{jabref-meta: fileDirectory:src/test/resources/org/jabref/model/groups;}" + OS.NEWLINE
-           + "@Comment{jabref-meta: fileDirectory-"
-                     + System.getProperty("user.name") + "-"
-                     + InetAddress.getLocalHost().getHostName()
-                     + ":src/test/resources/org/jabref/model/groups;}" + OS.NEWLINE
-           + "@Comment{jabref-meta: fileDirectoryLatex-"
-                     + System.getProperty("user.name") + "-"
-                     + InetAddress.getLocalHost().getHostName()
-                     + ":src/test/resources/org/jabref/model/groups;}" + OS.NEWLINE
+                "@comment{jabref-meta: grouping:" + OS.NEWLINE
+                        + "0 AllEntriesGroup:;" + OS.NEWLINE
+                        + "1 TexGroup:cited entries\\;0\\;paper.aux\\;1\\;0x8a8a8aff\\;\\;\\;;"
+                        + "}" + OS.NEWLINE
+                        + "@Comment{jabref-meta: databaseType:biblatex;}" + OS.NEWLINE
+                        + "@Comment{jabref-meta: fileDirectory:src/test/resources/org/jabref/model/groups;}" + OS.NEWLINE
+                        + "@Comment{jabref-meta: fileDirectory-"
+                        + System.getProperty("user.name") + "-"
+                        + InetAddress.getLocalHost().getHostName()
+                        + ":src/test/resources/org/jabref/model/groups;}" + OS.NEWLINE
+                        + "@Comment{jabref-meta: fileDirectoryLatex-"
+                        + System.getProperty("user.name") + "-"
+                        + InetAddress.getLocalHost().getHostName()
+                        + ":src/test/resources/org/jabref/model/groups;}" + OS.NEWLINE
         ));
 
         GroupTreeNode root = result.getMetaData().getGroups().get();
@@ -1646,13 +1495,36 @@ void integrationTestFileDirectories() throws IOException {
         ParserResult result = parser.parse(
                 new StringReader("@comment{jabref-meta: fileDirectory:\\\\Literature\\\\;}"
                         + "@comment{jabref-meta: fileDirectory-defaultOwner-user:D:\\\\Documents;}"
-                         + "@comment{jabref-meta: fileDirectoryLatex-defaultOwner-user:D:\\\\Latex;}"));
+                        + "@comment{jabref-meta: fileDirectoryLatex-defaultOwner-user:D:\\\\Latex;}"));
 
         assertEquals("\\Literature\\", result.getMetaData().getDefaultFileDirectory().get());
         assertEquals("D:\\Documents", result.getMetaData().getUserFileDirectory("defaultOwner-user").get());
         assertEquals("D:\\Latex", result.getMetaData().getLatexFileDirectory("defaultOwner-user").get().toString());
     }
 
+    @ParameterizedTest
+    @CsvSource({
+            // single backslash kept
+            "C:\\temp\\test",
+            "\\\\servername\\path\\to\\file",
+            "//servername/path/to/file",
+            "."})
+    void fileDirectoriesUnmodified(String directory) throws IOException {
+        ParserResult result = parser.parse(
+                new StringReader("@comment{jabref-meta: fileDirectory:" + directory + "}"));
+        assertEquals(directory, result.getMetaData().getDefaultFileDirectory().get());
+    }
+
+    @ParameterizedTest
+    @CsvSource({
+            "C:\\temp\\test, C:\\\\temp\\\\test",
+            "\\\\servername\\path\\to\\file, \\\\\\\\servername\\\\path\\\\to\\\\file"})
+    void fileDirectoryWithDoubleEscapeIsRead(String expected, String provided) throws IOException {
+        ParserResult result = parser.parse(
+                new StringReader("@comment{jabref-meta: fileDirectory: " + provided + "}"));
+        assertEquals(expected, result.getMetaData().getDefaultFileDirectory().get());
+    }
+
     @Test
     void parseReturnsEntriesInSameOrder() throws IOException {
         List<BibEntry> expected = new ArrayList<>();
@@ -1732,10 +1604,10 @@ void preserveEncodingPrefixInsideEntry() throws ParseException {
         BibEntry expected = new BibEntry();
         expected.setType(StandardEntryType.Article);
         expected.setCitationKey("test");
-        expected.setField(StandardField.AUTHOR, SavePreferences.ENCODING_PREFIX);
+        expected.setField(StandardField.AUTHOR, SaveConfiguration.ENCODING_PREFIX);
 
         List<BibEntry> parsed = parser
-                .parseEntries("@article{test,author={" + SavePreferences.ENCODING_PREFIX + "}}");
+                .parseEntries("@article{test,author={" + SaveConfiguration.ENCODING_PREFIX + "}}");
 
         assertEquals(List.of(expected), parsed);
     }
@@ -1852,6 +1724,13 @@ void parseEmptyFileLeadsToPreamble() throws IOException {
 
     @Test
     void parseYearWithMonthString() throws Exception {
+        Optional<BibEntry> result = parser.parseSingleEntry("@ARTICLE{HipKro03, year = {2003}, month = feb }");
+
+        assertEquals(new Date(2003, 2), result.get().getPublicationDate().get());
+    }
+
+    @Test
+    void parseYearWithIllFormattedMonthString() throws Exception {
         Optional<BibEntry> result = parser.parseSingleEntry("@ARTICLE{HipKro03, year = {2003}, month = #FEB# }");
 
         assertEquals(new Date(2003, 2), result.get().getPublicationDate().get());
@@ -1953,12 +1832,12 @@ void bibTeXConstantAprilIsParsedAsStringMonthAprilWhenReadingTheField() throws P
     @Test
     void parseDuplicateKeywordsWithOnlyOneEntry() throws ParseException {
         Optional<BibEntry> result = parser.parseSingleEntry("@Article{,\n"
-            + "Keywords={asdf,asdf,asdf},\n"
-            + "}\n"
-            + "");
+                + "Keywords={asdf,asdf,asdf},\n"
+                + "}\n"
+                + "");
 
         BibEntry expectedEntry = new BibEntry(StandardEntryType.Article)
-            .withField(StandardField.KEYWORDS, "asdf,asdf,asdf");
+                .withField(StandardField.KEYWORDS, "asdf,asdf,asdf");
 
         assertEquals(Optional.of(expectedEntry), result);
     }
@@ -1966,21 +1845,21 @@ void parseDuplicateKeywordsWithOnlyOneEntry() throws ParseException {
     @Test
     void parseDuplicateKeywordsWithTwoEntries() throws Exception {
         BibEntry expectedEntryFirst = new BibEntry(StandardEntryType.Article)
-            .withField(StandardField.KEYWORDS, "bbb")
-            .withCitationKey("Test2017");
+                .withField(StandardField.KEYWORDS, "bbb")
+                .withCitationKey("Test2017");
 
         BibEntry expectedEntrySecond = new BibEntry(StandardEntryType.Article)
-            .withField(StandardField.KEYWORDS, "asdf,asdf,asdf");
+                .withField(StandardField.KEYWORDS, "asdf,asdf,asdf");
 
         String entries = """
-            @Article{Test2017,
-              keywords = {bbb},
-            }
-
-            @Article{,
-              keywords = {asdf,asdf,asdf},
-            },
-            """;
+                @Article{Test2017,
+                  keywords = {bbb},
+                }
+
+                @Article{,
+                  keywords = {asdf,asdf,asdf},
+                },
+                """;
         ParserResult result = parser.parse(new StringReader(entries));
         assertEquals(List.of(expectedEntryFirst, expectedEntrySecond), result.getDatabase().getEntries());
     }
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/MarcXmlParserTest.java b/src/test/java/org/jabref/logic/importer/fileformat/MarcXmlParserTest.java
new file mode 100644
index 00000000000..18425acde19
--- /dev/null
+++ b/src/test/java/org/jabref/logic/importer/fileformat/MarcXmlParserTest.java
@@ -0,0 +1,42 @@
+package org.jabref.logic.importer.fileformat;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.List;
+import java.util.function.Predicate;
+import java.util.stream.Stream;
+
+import org.jabref.logic.bibtex.BibEntryAssert;
+import org.jabref.logic.util.io.FileUtil;
+import org.jabref.model.entry.BibEntry;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+public class MarcXmlParserTest {
+
+    private static final String FILE_ENDING = ".xml";
+
+    private static Stream<String> fileNames() throws IOException {
+        Predicate<String> fileName = name -> name.startsWith("MarcXMLParserTest") && name.endsWith(FILE_ENDING);
+        return ImporterTestEngine.getTestFiles(fileName).stream();
+    }
+
+    private void doTest(String xmlName, String bibName) throws Exception {
+        try (InputStream is = MarcXmlParserTest.class.getResourceAsStream(xmlName)) {
+            MarcXmlParser parser = new MarcXmlParser();
+            List<BibEntry> entries = parser.parseEntries(is);
+            assertNotNull(entries);
+            BibEntryAssert.assertEquals(MarcXmlParserTest.class, bibName, entries.get(0));
+        }
+    }
+
+    @ParameterizedTest
+    @MethodSource("fileNames")
+    public void testImportEntries(String fileName) throws Exception {
+        String bibName = FileUtil.getBaseName(fileName) + ".bib";
+        doTest(fileName, bibName);
+    }
+}
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 03fce0180c4..bdd841c54bc 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/PdfEmbeddedBibFileImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/PdfEmbeddedBibFileImporterTest.java
@@ -4,6 +4,8 @@
 import java.util.Collections;
 import java.util.List;
 
+import javafx.collections.FXCollections;
+
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.entry.BibEntry;
@@ -25,7 +27,7 @@ class PdfEmbeddedBibFileImporterTest {
     @BeforeEach
     void setUp() {
         ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        when(importFormatPreferences.fieldContentFormatterPreferences().getNonWrappableFields()).thenReturn(List.of());
+        when(importFormatPreferences.fieldPreferences().getNonWrappableFields()).thenReturn(FXCollections.emptyObservableList());
         importer = new PdfEmbeddedBibFileImporter(importFormatPreferences);
     }
 
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 d39775df28b..c66f2b01a9d 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/PdfMergeMetadataImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/PdfMergeMetadataImporterTest.java
@@ -4,6 +4,8 @@
 import java.util.Collections;
 import java.util.List;
 
+import javafx.collections.FXCollections;
+
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.fetcher.GrobidPreferences;
 import org.jabref.logic.util.StandardFileType;
@@ -35,7 +37,7 @@ void setUp() {
         when(grobidPreferences.getGrobidURL()).thenReturn("http://grobid.jabref.org:8070");
 
         ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        when(importFormatPreferences.fieldContentFormatterPreferences().getNonWrappableFields()).thenReturn(List.of());
+        when(importFormatPreferences.fieldPreferences().getNonWrappableFields()).thenReturn(FXCollections.emptyObservableList());
         when(importFormatPreferences.grobidPreferences()).thenReturn(grobidPreferences);
 
         importer = new PdfMergeMetadataImporter(importFormatPreferences);
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 1a86d509b2a..c7adc53f8d5 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/PdfVerbatimBibTextImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/PdfVerbatimBibTextImporterTest.java
@@ -4,6 +4,8 @@
 import java.util.Collections;
 import java.util.List;
 
+import javafx.collections.FXCollections;
+
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.entry.BibEntry;
@@ -26,7 +28,7 @@ class PdfVerbatimBibTextImporterTest {
     @BeforeEach
     void setUp() {
         ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        when(importFormatPreferences.fieldContentFormatterPreferences().getNonWrappableFields()).thenReturn(List.of());
+        when(importFormatPreferences.fieldPreferences().getNonWrappableFields()).thenReturn(FXCollections.emptyObservableList());
         importer = new PdfVerbatimBibTextImporter(importFormatPreferences);
     }
 
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 db6de11c190..73a391fa355 100644
--- a/src/test/java/org/jabref/logic/importer/util/FileFieldParserTest.java
+++ b/src/test/java/org/jabref/logic/importer/util/FileFieldParserTest.java
@@ -57,6 +57,12 @@ private static Stream<Arguments> stringsToParseTest() throws Exception {
                         "Desc:File.PDF:PDF"
                 ),
 
+                // Mendeley input
+                Arguments.of(
+                        Collections.singletonList(new LinkedFile("", Path.of("C:/Users/XXXXXX/AppData/Local/Mendeley Ltd./Mendeley Desktop/Downloaded/Brown - 2017 - Physical test methods for elastomers.pdf"), "pdf")),
+                        ":C$\\backslash$:/Users/XXXXXX/AppData/Local/Mendeley Ltd./Mendeley Desktop/Downloaded/Brown - 2017 - Physical test methods for elastomers.pdf:pdf"
+                ),
+
                 // parseCorrectOnlineInput
                 Arguments.of(
                         Collections.singletonList(new LinkedFile(new URL("http://arxiv.org/pdf/2010.08497v1"), "PDF")),
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 69c3693f2d1..755f802c701 100644
--- a/src/test/java/org/jabref/logic/importer/util/GrobidServiceTest.java
+++ b/src/test/java/org/jabref/logic/importer/util/GrobidServiceTest.java
@@ -47,16 +47,13 @@ public static void setup() {
     @Test
     public void processValidCitationTest() throws IOException, ParseException {
         BibEntry exampleBibEntry = new BibEntry(StandardEntryType.Article).withCitationKey("-1")
-                                                                                    .withField(StandardField.AUTHOR, "Derwing, Tracey and Rossiter, Marian and Munro, Murray")
-                                                                                    .withField(StandardField.TITLE, "Teaching Native Speakers to Listen to Foreign-accented Speech")
+                                                                                    .withField(StandardField.AUTHOR, "Derwing, T and Rossiter, M and Munro, M")
+                                                                                    .withField(StandardField.TITLE, "Teaching native speakers to listen to foreign-accented speech")
                                                                                     .withField(StandardField.JOURNAL, "Journal of Multilingual and Multicultural Development")
-                                                                                    .withField(StandardField.DOI, "10.1080/01434630208666468")
-                                                                                    .withField(StandardField.DATE, "2002-09")
+                                                                                    .withField(StandardField.DATE, "2002")
                                                                                     .withField(StandardField.YEAR, "2002")
-                                                                                    .withField(StandardField.MONTH, "9")
-                                                                                    .withField(StandardField.PAGES, "245-259")
+                                                                                    .withField(StandardField.PAGES, "245--259")
                                                                                     .withField(StandardField.VOLUME, "23")
-                                                                                    .withField(StandardField.PUBLISHER, "Informa UK Limited")
                                                                                     .withField(StandardField.NUMBER, "4");
         Optional<BibEntry> response = grobidService.processCitation("Derwing, T. M., Rossiter, M. J., & Munro, " +
                 "M. J. (2002). Teaching native speakers to listen to foreign-accented speech. " +
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 e600056b879..061295491a5 100644
--- a/src/test/java/org/jabref/logic/importer/util/GroupsParserTest.java
+++ b/src/test/java/org/jabref/logic/importer/util/GroupsParserTest.java
@@ -124,7 +124,7 @@ void fromStringParsesAutomaticPersonGroup() throws Exception {
 
     @Test
     void fromStringParsesTexGroup() throws Exception {
-        TexGroup expected = TexGroup.createWithoutFileMonitoring("myTexGroup", GroupHierarchyType.INDEPENDENT, Path.of("path", "To", "File"), new DefaultAuxParser(new BibDatabase()), fileMonitor, metaData);
+        TexGroup expected = TexGroup.create("myTexGroup", GroupHierarchyType.INDEPENDENT, Path.of("path", "To", "File"), new DefaultAuxParser(new BibDatabase()), metaData);
         AbstractGroup parsed = GroupsParser.fromString("TexGroup:myTexGroup;0;path/To/File;1;;;;", ',', fileMonitor, metaData);
         assertEquals(expected, parsed);
     }
diff --git a/src/test/java/org/jabref/logic/importer/util/MathMLParserTest.java b/src/test/java/org/jabref/logic/importer/util/MathMLParserTest.java
new file mode 100644
index 00000000000..f8866cf9c05
--- /dev/null
+++ b/src/test/java/org/jabref/logic/importer/util/MathMLParserTest.java
@@ -0,0 +1,120 @@
+package org.jabref.logic.importer.util;
+
+import java.io.StringReader;
+import java.util.stream.Stream;
+
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+
+import org.junit.jupiter.api.BeforeAll;
+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 MathMLParserTest {
+    private static XMLInputFactory xmlInputFactory;
+
+    @BeforeAll
+    public static void setUp() {
+        xmlInputFactory = XMLInputFactory.newInstance();
+        xmlInputFactory.setProperty(XMLInputFactory.IS_COALESCING, true);
+    }
+
+    @ParameterizedTest
+    @MethodSource("tests")
+    void parserConvertsMathMLIntoLatex(String expected, String input) throws XMLStreamException {
+        XMLStreamReader reader = xmlInputFactory.createXMLStreamReader(new StringReader(input));
+        assertEquals(expected, MathMLParser.parse(reader));
+    }
+
+    private static Stream<Arguments> tests() {
+        return Stream.of(
+                Arguments.of("$\\begin{pmatrix}0 & 1 & 0\\\\ 0 & 0 & 1\\\\ 1 & 0 & 0\\end{pmatrix}$",
+                        """
+                                <math xmlns="http://www.w3.org/1998/Math/MathML">
+                                    <matrix>
+                                        <matrixrow>
+                                            <cn> 0 </cn> <cn> 1 </cn> <cn> 0 </cn>
+                                        </matrixrow>
+                                        <matrixrow>
+                                            <cn> 0 </cn> <cn> 0 </cn> <cn> 1 </cn>
+                                        </matrixrow>
+                                        <matrixrow>
+                                            <cn> 1 </cn> <cn> 0 </cn> <cn> 0 </cn>
+                                        </matrixrow>
+                                    </matrix>
+                                </math>
+                                """),
+                Arguments.of("${\\eta }_{p}^{2}$",
+                        """
+                                <mml:math xmlns:mml="http://www.w3.org/1998/Math/MathML">
+                                    <mml:mrow>
+                                        <mml:msubsup>
+                                            <mml:mi>η</mml:mi>
+                                            <mml:mi>p</mml:mi>
+                                            <mml:mn>2</mml:mn>
+                                        </mml:msubsup>
+                                    </mml:mrow>
+                                </mml:math>
+                                """),
+                Arguments.of("<Unsupported MathML expression>",
+                        """
+                                <mml:math xmlns=http://www.w3.org/1998/Math/MathML>
+                                    <mml:mrow>
+                                        <mml:msubsup>
+                                            <mml:mi>η</abc>
+                                        </mml:msubsup>
+                                    </mml:mrow>
+                                </mml:math>
+                                """),
+                Arguments.of("$\\underset{a}{\\overset{b}{\\int }}\\left(5x+2\\mathrm{sin}\\left(x\\right)\\right)\\mathrm{dx}$",
+                        """
+                                <math xmlns="http://www.w3.org/1998/Math/MathML">
+                                    <munderover>
+                                        <mo>&#x222B;</mo>
+                                        <mi>a</mi>
+                                        <mi>b</mi>
+                                    </munderover>
+                                    <mfenced separators=''>
+                                        <mn>5</mn>
+                                        <mi>x</mi>
+                                        <mo>+</mo>
+                                        <mn>2</mn>
+                                        <mi>sin</mi>
+                                        <mfenced separators=''>
+                                            <mi>x</mi>
+                                        </mfenced>
+                                    </mfenced>
+                                    <mi>dx</mi>
+                                </math>
+                                """),
+                Arguments.of("$\\stackrel{\\to }{v}=\\left({v}_{1},{v}_{2},{v}_{3}\\right)$",
+                        """
+                                <math xmlns="http://www.w3.org/1998/Math/MathML">
+                                    <mover>
+                                        <mi>v</mi>
+                                        <mo>&#x2192;</mo>
+                                    </mover>
+                                    <mo>=</mo>
+                                    <mfenced>
+                                        <msub>
+                                            <mi>v</mi>
+                                            <mn>1</mn>
+                                        </msub>
+                                        <msub>
+                                            <mi>v</mi>
+                                            <mn>2</mn>
+                                        </msub>
+                                        <msub>
+                                            <mi>v</mi>
+                                            <mn>3</mn>
+                                        </msub>
+                                    </mfenced>
+                                </math>
+                                """)
+        );
+    }
+}
diff --git a/src/test/java/org/jabref/logic/importer/util/MetaDataParserTest.java b/src/test/java/org/jabref/logic/importer/util/MetaDataParserTest.java
new file mode 100644
index 00000000000..251b3d10279
--- /dev/null
+++ b/src/test/java/org/jabref/logic/importer/util/MetaDataParserTest.java
@@ -0,0 +1,59 @@
+package org.jabref.logic.importer.util;
+
+import java.util.Optional;
+import java.util.stream.Stream;
+
+import org.jabref.logic.exporter.MetaDataSerializerTest;
+import org.jabref.model.entry.BibEntryTypeBuilder;
+import org.jabref.model.entry.field.UnknownField;
+import org.jabref.model.entry.types.UnknownEntryType;
+
+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 static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class MetaDataParserTest {
+
+    @ParameterizedTest
+    @CsvSource({
+            "C:\\temp\\test,                 C:\\temp\\test",
+            "\\\\servername\\path\\to\\file, \\\\\\\\servername\\\\path\\\\to\\\\file",
+            "\\\\servername\\path\\to\\file, \\\\servername\\path\\to\\file",
+            "//servername/path/to/file,      //servername/path/to/file",
+            ".\\pdfs,                        .\\pdfs,",
+            ".\\pdfs,                        .\\\\pdfs,",
+            ".,                              .",
+    })
+    void parseDirectory(String expected, String input) {
+        assertEquals(expected, MetaDataParser.parseDirectory(input));
+    }
+
+    /**
+     * In case of any change, copy the content to {@link MetaDataSerializerTest#serializeCustomizedEntryType()}
+     */
+    public static Stream<Arguments> parseCustomizedEntryType() {
+        return Stream.of(
+                Arguments.of(
+                        new BibEntryTypeBuilder()
+                                .withType(new UnknownEntryType("test"))
+                                .withRequiredFields(UnknownField.fromDisplayName("Test1"), UnknownField.fromDisplayName("Test2")),
+                        "jabref-entrytype: test: req[Test1;Test2] opt[]"
+                ),
+                Arguments.of(
+                        new BibEntryTypeBuilder()
+                                .withType(new UnknownEntryType("test"))
+                                .withRequiredFields(UnknownField.fromDisplayName("tEST"), UnknownField.fromDisplayName("tEsT2")),
+                        "jabref-entrytype: test: req[tEST;tEsT2] opt[]"
+                )
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource
+    void parseCustomizedEntryType(BibEntryTypeBuilder expected, String source) {
+        assertEquals(Optional.of(expected.build()), MetaDataParser.parseCustomEntryType(source));
+    }
+}
diff --git a/src/test/java/org/jabref/logic/importer/util/StaxParserTest.java b/src/test/java/org/jabref/logic/importer/util/StaxParserTest.java
new file mode 100644
index 00000000000..c49d7b5b79e
--- /dev/null
+++ b/src/test/java/org/jabref/logic/importer/util/StaxParserTest.java
@@ -0,0 +1,91 @@
+package org.jabref.logic.importer.util;
+
+import java.io.StringReader;
+import java.util.stream.Stream;
+
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+
+import org.junit.jupiter.api.BeforeAll;
+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 StaxParserTest {
+    private static XMLInputFactory xmlInputFactory;
+
+    @BeforeAll
+    public static void setUp() {
+        xmlInputFactory = XMLInputFactory.newInstance();
+        xmlInputFactory.setProperty(XMLInputFactory.IS_COALESCING, true);
+    }
+
+    @ParameterizedTest
+    @MethodSource("tests")
+    void getsCompleteXMLContent(String expected, String input) throws XMLStreamException {
+        XMLStreamReader reader = xmlInputFactory.createXMLStreamReader(new StringReader(input));
+        assertEquals(expected, StaxParser.getXMLContent(reader));
+    }
+
+    private static Stream<Arguments> tests() {
+        return Stream.of(
+                Arguments.of("<ForeName attr=\"1\">Alan</ForeName>",
+                        """
+                                <ForeName attr="1">Alan</ForeName>
+                                """),
+                Arguments.of("<ForeName attr=\"1\">Alan</ForeName>",
+                        """
+                                <ForeName attr="1">Alan</ForeName>
+                                <LastName attr="2">Grant</LastName>
+                                """),
+                Arguments.of("<ForeName attr=\"1\">Alan<ForeName attr=\"5\">MiddleName</ForeName></ForeName>",
+                        """
+                                <ForeName attr="1">
+                                    Alan
+                                    <ForeName attr="5">MiddleName</ForeName>
+                                </ForeName>
+                                <LastName attr="2">Grant</LastName>
+                                """),
+                Arguments.of("<PubDate><Year>2020</Year><Month>Jul</Month><Day>24</Day></PubDate>",
+                        """
+                                <PubDate>
+                                    <Year>2020</Year>
+                                    <Month>Jul</Month>
+                                    <Day>24</Day>
+                                </PubDate>
+                                """),
+                Arguments.of("<mml:math xmlns:mml=\"http://www.w3.org/1998/Math/MathML\"><mml:mrow><mml:msubsup><mml:mi>η</mml:mi><mml:mi>p</mml:mi><mml:mn>2</mml:mn></mml:msubsup></mml:mrow></mml:math>",
+                        """
+                                <mml:math xmlns:mml="http://www.w3.org/1998/Math/MathML">
+                                    <mml:mrow>
+                                        <mml:msubsup>
+                                            <mml:mi>η</mml:mi>
+                                            <mml:mi>p</mml:mi>
+                                            <mml:mn>2</mml:mn>
+                                        </mml:msubsup>
+                                    </mml:mrow>
+                                </mml:math>
+                                """),
+                Arguments.of("<Journal><ISSN IssnType=\"Electronic\">1613-4516</ISSN><JournalIssue CitedMedium=\"Internet\"><Volume>17</Volume><Issue>2-3</Issue><PubDate><Year>2020</Year><Month>Jul</Month><Day>24</Day></PubDate></JournalIssue><Title>Journal of integrative bioinformatics</Title><ISOAbbreviation>J Integr Bioinform</ISOAbbreviation></Journal>",
+                        """
+                                <Journal>
+                                    <ISSN IssnType="Electronic">1613-4516</ISSN>
+                                    <JournalIssue CitedMedium="Internet">
+                                        <Volume>17</Volume>
+                                        <Issue>2-3</Issue>
+                                        <PubDate>
+                                            <Year>2020</Year>
+                                            <Month>Jul</Month>
+                                            <Day>24</Day>
+                                        </PubDate>
+                                    </JournalIssue>
+                                    <Title>Journal of integrative bioinformatics</Title>
+                                    <ISOAbbreviation>J Integr Bioinform</ISOAbbreviation>
+                                </Journal>
+                                """)
+        );
+    }
+}
diff --git a/src/test/java/org/jabref/logic/integrity/IntegrityCheckTest.java b/src/test/java/org/jabref/logic/integrity/IntegrityCheckTest.java
index 5ce25cb42a7..5a589970aba 100644
--- a/src/test/java/org/jabref/logic/integrity/IntegrityCheckTest.java
+++ b/src/test/java/org/jabref/logic/integrity/IntegrityCheckTest.java
@@ -146,17 +146,16 @@ void testEntryIsUnchangedAfterChecks() {
     }
 
     private BibDatabaseContext createContext(Field field, String value, EntryType type) {
-        BibEntry entry = new BibEntry();
-        entry.setField(field, value);
-        entry.setType(type);
+        BibEntry entry = new BibEntry(type)
+                .withField(field, value);
         BibDatabase bibDatabase = new BibDatabase();
         bibDatabase.insertEntry(entry);
         return new BibDatabaseContext(bibDatabase);
     }
 
     private BibDatabaseContext createContext(Field field, String value, MetaData metaData) {
-        BibEntry entry = new BibEntry();
-        entry.setField(field, value);
+        BibEntry entry = new BibEntry()
+                .withField(field, value);
         BibDatabase bibDatabase = new BibDatabase();
         bibDatabase.insertEntry(entry);
         return new BibDatabaseContext(bibDatabase, metaData);
diff --git a/src/test/java/org/jabref/logic/integrity/UTF8CheckerTest.java b/src/test/java/org/jabref/logic/integrity/UTF8CheckerTest.java
index cb0e81e2c56..87b0857b7aa 100644
--- a/src/test/java/org/jabref/logic/integrity/UTF8CheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/UTF8CheckerTest.java
@@ -17,6 +17,7 @@
 
 public class UTF8CheckerTest {
 
+    private static final Charset GBK = Charset.forName("GBK");
     private final BibEntry entry = new BibEntry();
 
     /**
@@ -42,7 +43,7 @@ void fieldAcceptsUTF8() {
     @Test
     void fieldDoesNotAcceptUmlauts() throws UnsupportedEncodingException {
         UTF8Checker checker = new UTF8Checker(Charset.forName("GBK"));
-        String NonUTF8 = new String("你好，这条语句使用GBK字符集".getBytes(), "GBK");
+        String NonUTF8 = new String("你好，这条语句使用GBK字符集".getBytes(StandardCharsets.UTF_8), GBK);
         entry.setField(StandardField.MONTH, NonUTF8);
         assertEquals(List.of(new IntegrityMessage("Non-UTF-8 encoded field found", entry, StandardField.MONTH)), checker.check(entry));
     }
@@ -56,8 +57,8 @@ void fieldDoesNotAcceptUmlauts() throws UnsupportedEncodingException {
      */
     @Test
     void NonUTF8EncodingCheckerTest() throws UnsupportedEncodingException {
-        String NonUTF8 = new String("你好，这条语句使用GBK字符集".getBytes(), "GBK");
-            assertFalse(UTF8Checker.UTF8EncodingChecker(NonUTF8.getBytes("GBK")));
+        String NonUTF8 = new String("你好，这条语句使用GBK字符集".getBytes(StandardCharsets.UTF_8), GBK);
+            assertFalse(UTF8Checker.UTF8EncodingChecker(NonUTF8.getBytes(GBK)));
     }
 
     /**
@@ -66,7 +67,7 @@ void NonUTF8EncodingCheckerTest() throws UnsupportedEncodingException {
      */
     @Test
     void UTF8EncodingCheckerTest() {
-        String UTF8Demo = new String("你好，这条语句使用GBK字符集".getBytes(), StandardCharsets.UTF_8);
+        String UTF8Demo = new String("你好，这条语句使用GBK字符集".getBytes(StandardCharsets.UTF_8), StandardCharsets.UTF_8);
             assertTrue(UTF8Checker.UTF8EncodingChecker(UTF8Demo.getBytes(StandardCharsets.UTF_8)));
     }
 }
diff --git a/src/test/java/org/jabref/logic/journals/AbbreviationParserTest.java b/src/test/java/org/jabref/logic/journals/AbbreviationParserTest.java
new file mode 100644
index 00000000000..3237b60588a
--- /dev/null
+++ b/src/test/java/org/jabref/logic/journals/AbbreviationParserTest.java
@@ -0,0 +1,47 @@
+package org.jabref.logic.journals;
+
+import java.io.BufferedWriter;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Set;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class AbbreviationParserTest {
+
+    private Path csvFile;
+    private final AbbreviationParser parser = new AbbreviationParser();
+
+    private final Abbreviation abbreviation = new Abbreviation("Long Name", "L.N.", "L.N.");
+
+    @BeforeEach
+    void setup(@TempDir Path tempDir) {
+        csvFile = tempDir.resolve("test.csv");
+    }
+
+    @Test
+    void testReadingFileFromCSVWithSemicolon() throws Exception {
+        // String name, String abbreviation, String shortestUniqueAbbreviation
+        String testAbbrev = "Long Name;L.N.;L.N.";
+        try (BufferedWriter writer = Files.newBufferedWriter(csvFile, StandardCharsets.UTF_8)) {
+            writer.write(testAbbrev);
+        }
+        parser.readJournalListFromFile(csvFile);
+        assertEquals(Set.of(abbreviation), parser.getAbbreviations());
+    }
+
+    @Test
+    void testReadingFileFromCSVWithComma() throws Exception {
+        String testAbbrev = "Long Name,L.N.,L.N.";
+        try (BufferedWriter writer = Files.newBufferedWriter(csvFile, StandardCharsets.UTF_8)) {
+            writer.write(testAbbrev);
+        }
+        parser.readJournalListFromFile(csvFile);
+        assertEquals(Set.of(abbreviation), parser.getAbbreviations());
+    }
+}
diff --git a/src/test/java/org/jabref/logic/journals/AbbreviationWriterTest.java b/src/test/java/org/jabref/logic/journals/AbbreviationWriterTest.java
index c16e24b23ab..bf207b25da7 100644
--- a/src/test/java/org/jabref/logic/journals/AbbreviationWriterTest.java
+++ b/src/test/java/org/jabref/logic/journals/AbbreviationWriterTest.java
@@ -21,7 +21,7 @@ void shortestUniqueAbbreviationWrittenIfItDiffers(@TempDir Path tempDir) throws
         AbbreviationWriter.writeOrCreate(
                 csvFile,
                 List.of(abbreviation));
-        assertEquals(List.of("Full;Abbr;A"), Files.readAllLines(csvFile));
+        assertEquals(List.of("Full,Abbr,A"), Files.readAllLines(csvFile));
     }
 
     @Test
@@ -31,6 +31,6 @@ void doNotWriteShortestUniqueAbbreviationWrittenIfItDiffers(@TempDir Path tempDi
         AbbreviationWriter.writeOrCreate(
                 csvFile,
                 List.of(abbreviation));
-        assertEquals(List.of("Full;Abbr"), Files.readAllLines(csvFile));
+        assertEquals(List.of("Full,Abbr"), Files.readAllLines(csvFile));
     }
 }
diff --git a/src/test/java/org/jabref/logic/journals/JournalAbbreviationRepositoryTest.java b/src/test/java/org/jabref/logic/journals/JournalAbbreviationRepositoryTest.java
index a0e8465c542..442e9d3a3c1 100644
--- a/src/test/java/org/jabref/logic/journals/JournalAbbreviationRepositoryTest.java
+++ b/src/test/java/org/jabref/logic/journals/JournalAbbreviationRepositoryTest.java
@@ -26,7 +26,7 @@ class JournalAbbreviationRepositoryTest {
 
     private JournalAbbreviationRepository repository;
 
-    private BibDatabase bibDatabase = new BibDatabase();
+    private final BibDatabase bibDatabase = new BibDatabase();
     private UndoableUnabbreviator undoableUnabbreviator;
 
     @BeforeEach
@@ -168,8 +168,8 @@ void getFromAbbreviatedName() {
     void testAbbreviationsWithEscapedAmpersand() {
         assertEquals(new Abbreviation("ACS Applied Materials & Interfaces", "ACS Appl. Mater. Interfaces"), repository.get("ACS Applied Materials & Interfaces").get());
         assertEquals(new Abbreviation("ACS Applied Materials & Interfaces", "ACS Appl. Mater. Interfaces"), repository.get("ACS Applied Materials \\& Interfaces").get());
-        assertEquals(new Abbreviation("Antioxidants & Redox Signaling", "Antioxid. Redox Signaling"), repository.get("Antioxidants & Redox Signaling").get());
-        assertEquals(new Abbreviation("Antioxidants & Redox Signaling", "Antioxid. Redox Signaling"), repository.get("Antioxidants \\& Redox Signaling").get());
+        assertEquals(new Abbreviation("Antioxidants & Redox Signaling", "Antioxid. Redox Sign."), repository.get("Antioxidants & Redox Signaling").get());
+        assertEquals(new Abbreviation("Antioxidants & Redox Signaling", "Antioxid. Redox Sign."), repository.get("Antioxidants \\& Redox Signaling").get());
 
         repository.addCustomAbbreviation(new Abbreviation("Long & Name", "L. N.", "LN"));
         assertEquals(new Abbreviation("Long & Name", "L. N.", "LN"), repository.get("Long & Name").get());
diff --git a/src/test/java/org/jabref/logic/journals/JournalInformationFetcherTest.java b/src/test/java/org/jabref/logic/journals/JournalInformationFetcherTest.java
new file mode 100644
index 00000000000..25a189b0b45
--- /dev/null
+++ b/src/test/java/org/jabref/logic/journals/JournalInformationFetcherTest.java
@@ -0,0 +1,103 @@
+package org.jabref.logic.journals;
+
+import java.util.List;
+import java.util.Optional;
+
+import javafx.util.Pair;
+
+import org.jabref.logic.importer.FetcherException;
+import org.jabref.logic.importer.fetcher.JournalInformationFetcher;
+import org.jabref.testutils.category.FetcherTest;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+@FetcherTest
+class JournalInformationFetcherTest {
+
+    private final JournalInformationFetcher fetcher = new JournalInformationFetcher();
+
+    private final JournalInformation journalInformation = new JournalInformation(
+            "Annual Review of Biochemistry",
+            "Annual Reviews Inc.",
+            "",
+            "",
+            "Biochemistry,  Genetics and Molecular Biology",
+            "United States",
+            "Biochemistry (Q1)",
+            "16801",
+            "316",
+            "15454509,  00664154",
+            List.of(new Pair<>(1999, 50.518), new Pair<>(2000, 39.127), new Pair<>(2001, 39.946), new Pair<>(2002, 35.423), new Pair<>(2003, 35.186), new Pair<>(2004, 34.766), new Pair<>(2005, 32.241), new Pair<>(2006, 35.708), new Pair<>(2007, 34.376), new Pair<>(2008, 35.294), new Pair<>(2009, 31.033), new Pair<>(2010, 30.879), new Pair<>(2011, 30.916), new Pair<>(2012, 27.081), new Pair<>(2013, 27.872), new Pair<>(2014, 23.931), new Pair<>(2015, 24.589), new Pair<>(2016, 20.325), new Pair<>(2017, 18.513), new Pair<>(2018, 17.5), new Pair<>(2019, 17.387), new Pair<>(2020, 16.921), new Pair<>(2021, 13.085), new Pair<>(2022, 11.154)),
+            List.of(),
+            List.of(new Pair<>(1999, 30.0), new Pair<>(2000, 31.0), new Pair<>(2001, 23.0), new Pair<>(2002, 27.0), new Pair<>(2003, 24.0), new Pair<>(2004, 33.0), new Pair<>(2005, 28.0), new Pair<>(2006, 30.0), new Pair<>(2007, 33.0), new Pair<>(2008, 31.0), new Pair<>(2009, 35.0), new Pair<>(2010, 28.0), new Pair<>(2011, 42.0), new Pair<>(2012, 32.0), new Pair<>(2013, 28.0), new Pair<>(2014, 31.0), new Pair<>(2015, 35.0), new Pair<>(2016, 29.0), new Pair<>(2017, 35.0), new Pair<>(2018, 40.0), new Pair<>(2019, 30.0), new Pair<>(2020, 32.0), new Pair<>(2021, 32.0), new Pair<>(2022, 29.0)),
+            List.of(new Pair<>(1999, 79.0), new Pair<>(2000, 84.0), new Pair<>(2001, 88.0), new Pair<>(2002, 84.0), new Pair<>(2003, 81.0), new Pair<>(2004, 74.0), new Pair<>(2005, 84.0), new Pair<>(2006, 85.0), new Pair<>(2007, 91.0), new Pair<>(2008, 91.0), new Pair<>(2009, 94.0), new Pair<>(2010, 99.0), new Pair<>(2011, 94.0), new Pair<>(2012, 105.0), new Pair<>(2013, 102.0), new Pair<>(2014, 102.0), new Pair<>(2015, 91.0), new Pair<>(2016, 94.0), new Pair<>(2017, 95.0), new Pair<>(2018, 99.0), new Pair<>(2019, 104.0), new Pair<>(2020, 105.0), new Pair<>(2021, 102.0), new Pair<>(2022, 94.0)),
+            List.of(new Pair<>(1999, 79.0), new Pair<>(2000, 84.0), new Pair<>(2001, 88.0), new Pair<>(2002, 84.0), new Pair<>(2003, 81.0), new Pair<>(2004, 74.0), new Pair<>(2005, 84.0), new Pair<>(2006, 85.0), new Pair<>(2007, 91.0), new Pair<>(2008, 91.0), new Pair<>(2009, 94.0), new Pair<>(2010, 99.0), new Pair<>(2011, 94.0), new Pair<>(2012, 105.0), new Pair<>(2013, 102.0), new Pair<>(2014, 102.0), new Pair<>(2015, 91.0), new Pair<>(2016, 94.0), new Pair<>(2017, 95.0), new Pair<>(2018, 99.0), new Pair<>(2019, 104.0), new Pair<>(2020, 105.0), new Pair<>(2021, 102.0), new Pair<>(2022, 94.0)),
+            List.of(new Pair<>(1999, 3477.0), new Pair<>(2000, 3423.0), new Pair<>(2001, 4143.0), new Pair<>(2002, 3586.0), new Pair<>(2003, 3266.0), new Pair<>(2004, 3004.0), new Pair<>(2005, 3064.0), new Pair<>(2006, 3422.0), new Pair<>(2007, 3287.0), new Pair<>(2008, 3194.0), new Pair<>(2009, 3193.0), new Pair<>(2010, 3410.0), new Pair<>(2011, 3445.0), new Pair<>(2012, 3617.0), new Pair<>(2013, 3523.0), new Pair<>(2014, 3000.0), new Pair<>(2015, 2634.0), new Pair<>(2016, 2279.0), new Pair<>(2017, 2218.0), new Pair<>(2018, 2655.0), new Pair<>(2019, 2902.0), new Pair<>(2020, 3350.0), new Pair<>(2021, 2788.0), new Pair<>(2022, 2389.0)),
+            List.of(new Pair<>(1999, 36.15), new Pair<>(2000, 43.37), new Pair<>(2001, 32.46), new Pair<>(2002, 37.22), new Pair<>(2003, 39.46), new Pair<>(2004, 33.18), new Pair<>(2005, 34.46), new Pair<>(2006, 39.18), new Pair<>(2007, 33.69), new Pair<>(2008, 31.49), new Pair<>(2009, 32.16), new Pair<>(2010, 31.52), new Pair<>(2011, 36.89), new Pair<>(2012, 30.5), new Pair<>(2013, 29.01), new Pair<>(2014, 32.67), new Pair<>(2015, 23.68), new Pair<>(2016, 21.65), new Pair<>(2017, 22.08), new Pair<>(2018, 28.06), new Pair<>(2019, 27.41), new Pair<>(2020, 22.46), new Pair<>(2021, 26.55), new Pair<>(2022, 17.13)),
+            List.of(new Pair<>(1999, 5913.0), new Pair<>(2000, 5859.0), new Pair<>(2001, 4150.0), new Pair<>(2002, 4856.0), new Pair<>(2003, 4453.0), new Pair<>(2004, 5355.0), new Pair<>(2005, 4201.0), new Pair<>(2006, 4354.0), new Pair<>(2007, 4786.0), new Pair<>(2008, 4666.0), new Pair<>(2009, 5344.0), new Pair<>(2010, 4477.0), new Pair<>(2011, 6209.0), new Pair<>(2012, 4863.0), new Pair<>(2013, 4697.0), new Pair<>(2014, 5207.0), new Pair<>(2015, 5186.0), new Pair<>(2016, 4508.0), new Pair<>(2017, 5103.0), new Pair<>(2018, 5630.0), new Pair<>(2019, 4749.0), new Pair<>(2020, 4637.0), new Pair<>(2021, 4872.0), new Pair<>(2022, 4437.0)),
+            List.of(new Pair<>(1999, 197.1), new Pair<>(2000, 189.0), new Pair<>(2001, 180.43), new Pair<>(2002, 179.85), new Pair<>(2003, 185.54), new Pair<>(2004, 162.27), new Pair<>(2005, 150.04), new Pair<>(2006, 145.13), new Pair<>(2007, 145.03), new Pair<>(2008, 150.52), new Pair<>(2009, 152.69), new Pair<>(2010, 159.89), new Pair<>(2011, 147.83), new Pair<>(2012, 151.97), new Pair<>(2013, 167.75), new Pair<>(2014, 167.97), new Pair<>(2015, 148.17), new Pair<>(2016, 155.45), new Pair<>(2017, 145.8), new Pair<>(2018, 140.75), new Pair<>(2019, 158.3), new Pair<>(2020, 144.91), new Pair<>(2021, 152.25), new Pair<>(2022, 153.0))
+    );
+
+    @Test
+    public void getsName() {
+        assertEquals("Journal Information", fetcher.getName());
+    }
+
+    @Test
+    public void getsJournalInfoValidISSN() throws FetcherException {
+        assertEquals(Optional.of(journalInformation), fetcher.getJournalInformation("1545-4509", ""));
+    }
+
+    @Test
+    public void getsJournalInfoUsingName() throws FetcherException {
+        assertEquals(Optional.of(journalInformation), fetcher.getJournalInformation("", "Annual Review of Biochemistry"));
+    }
+
+    @Test
+    public void sameEntryReturnedFromISSNOrName() throws FetcherException {
+        assertEquals(fetcher.getJournalInformation("1545-4509", ""), fetcher.getJournalInformation("", "Annual Review of Biochemistry"));
+    }
+
+    @Test
+    public void getsJournalInfoValidISSNWithoutHyphen() throws FetcherException {
+        assertEquals(Optional.of(journalInformation), fetcher.getJournalInformation("15454509", ""));
+    }
+
+    @Test
+    public void getsJournalInfoNonTrimmedISSN() throws FetcherException {
+        assertEquals(Optional.of(journalInformation), fetcher.getJournalInformation(" 1545-4509   ", ""));
+    }
+
+    @Test
+    public void getJournalInfoExtraSpaceISSN() {
+        assertThrows(FetcherException.class, () -> fetcher.getJournalInformation("1545 - 4509", ""));
+    }
+
+    @Test
+    public void getJournalInfoEmptyISSN() {
+        assertThrows(FetcherException.class, () -> fetcher.getJournalInformation("", ""));
+    }
+
+    @Test
+    public void getJournalInfoInvalidISSN() {
+        assertThrows(FetcherException.class, () -> fetcher.getJournalInformation("123-123", ""));
+    }
+
+    @Test
+    public void getJournalInfoInvalidISSNAndNoName() {
+        assertThrows(FetcherException.class, () -> fetcher.getJournalInformation("123-123", ""));
+    }
+
+    @Test
+    public void getJournalInfoNoISSNAndNoName() {
+        assertThrows(FetcherException.class, () -> fetcher.getJournalInformation("", ""));
+    }
+
+    @Test
+    public void getJournalInfoNoISSNAndInvalidName() {
+        assertThrows(FetcherException.class, () -> fetcher.getJournalInformation("", "zzz"));
+    }
+}
diff --git a/src/test/java/org/jabref/logic/l10n/LanguageTest.java b/src/test/java/org/jabref/logic/l10n/LanguageTest.java
index d821d892548..c645611973d 100644
--- a/src/test/java/org/jabref/logic/l10n/LanguageTest.java
+++ b/src/test/java/org/jabref/logic/l10n/LanguageTest.java
@@ -12,13 +12,13 @@ class LanguageTest {
 
     @Test
     void convertKnownLanguageOnly() {
-        assertEquals(Optional.of(new Locale("en")), Language.convertToSupportedLocale(Language.ENGLISH));
+        assertEquals(Optional.of(Locale.of("en")), Language.convertToSupportedLocale(Language.ENGLISH));
     }
 
     @Test
     void convertKnownLanguageAndCountryCorrect() {
         // Language and country code have to be separated see: https://stackoverflow.com/a/3318598
-        assertEquals(Optional.of(new Locale("pt", "BR")), Language.convertToSupportedLocale(Language.BRAZILIAN_PORTUGUESE));
+        assertEquals(Optional.of(Locale.of("pt", "BR")), Language.convertToSupportedLocale(Language.BRAZILIAN_PORTUGUESE));
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/layout/LayoutEntryTest.java b/src/test/java/org/jabref/logic/layout/LayoutEntryTest.java
index aaceee79574..5b910a2f2e8 100644
--- a/src/test/java/org/jabref/logic/layout/LayoutEntryTest.java
+++ b/src/test/java/org/jabref/logic/layout/LayoutEntryTest.java
@@ -3,6 +3,7 @@
 import java.io.IOException;
 import java.io.StringReader;
 
+import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.SpecialField;
 import org.jabref.model.entry.field.StandardField;
@@ -62,7 +63,7 @@ public void setUp() {
 
     public String layout(String layoutFile, BibEntry entry) throws IOException {
         StringReader sr = new StringReader(layoutFile.replace("__NEWLINE__", "\n"));
-        Layout layout = new LayoutHelper(sr, mock(LayoutFormatterPreferences.class)).getLayoutFromText();
+        Layout layout = new LayoutHelper(sr, mock(LayoutFormatterPreferences.class), mock(JournalAbbreviationRepository.class)).getLayoutFromText();
 
         return layout.doLayout(entry, null);
     }
diff --git a/src/test/java/org/jabref/logic/layout/LayoutHelperTest.java b/src/test/java/org/jabref/logic/layout/LayoutHelperTest.java
index f78b71b92b0..dec5ab5d781 100644
--- a/src/test/java/org/jabref/logic/layout/LayoutHelperTest.java
+++ b/src/test/java/org/jabref/logic/layout/LayoutHelperTest.java
@@ -3,6 +3,8 @@
 import java.io.IOException;
 import java.io.StringReader;
 
+import org.jabref.logic.journals.JournalAbbreviationRepository;
+
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -11,19 +13,20 @@
 
 class LayoutHelperTest {
 
+    private final LayoutFormatterPreferences layoutFormatterPreferences = mock(LayoutFormatterPreferences.class);
+    private final JournalAbbreviationRepository abbreviationRepository = mock(JournalAbbreviationRepository.class);
+
     @Test
     public void backslashDoesNotTriggerException() {
         StringReader stringReader = new StringReader("\\");
-        LayoutFormatterPreferences layoutFormatterPreferences = mock(LayoutFormatterPreferences.class);
-        LayoutHelper layoutHelper = new LayoutHelper(stringReader, layoutFormatterPreferences);
-        assertThrows(IOException.class, () -> layoutHelper.getLayoutFromText());
+        LayoutHelper layoutHelper = new LayoutHelper(stringReader, layoutFormatterPreferences, abbreviationRepository);
+        assertThrows(IOException.class, layoutHelper::getLayoutFromText);
     }
 
     @Test
     public void unbalancedBeginEndIsParsed() throws Exception {
         StringReader stringReader = new StringReader("\\begin{doi}, DOI: \\doi");
-        LayoutFormatterPreferences layoutFormatterPreferences = mock(LayoutFormatterPreferences.class);
-        LayoutHelper layoutHelper = new LayoutHelper(stringReader, layoutFormatterPreferences);
+        LayoutHelper layoutHelper = new LayoutHelper(stringReader, layoutFormatterPreferences, abbreviationRepository);
         Layout layout = layoutHelper.getLayoutFromText();
         assertNotNull(layout);
     }
@@ -31,8 +34,7 @@ public void unbalancedBeginEndIsParsed() throws Exception {
     @Test
     public void minimalExampleWithDoiGetsParsed() throws Exception {
         StringReader stringReader = new StringReader("\\begin{doi}, DOI: \\doi\\end{doi}");
-        LayoutFormatterPreferences layoutFormatterPreferences = mock(LayoutFormatterPreferences.class);
-        LayoutHelper layoutHelper = new LayoutHelper(stringReader, layoutFormatterPreferences);
+        LayoutHelper layoutHelper = new LayoutHelper(stringReader, layoutFormatterPreferences, abbreviationRepository);
         Layout layout = layoutHelper.getLayoutFromText();
         assertNotNull(layout);
     }
diff --git a/src/test/java/org/jabref/logic/layout/LayoutTest.java b/src/test/java/org/jabref/logic/layout/LayoutTest.java
index a41c65fe801..0e9134e4f52 100644
--- a/src/test/java/org/jabref/logic/layout/LayoutTest.java
+++ b/src/test/java/org/jabref/logic/layout/LayoutTest.java
@@ -7,6 +7,7 @@
 import java.util.Collections;
 import java.util.List;
 
+import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.layout.format.NameFormatterPreferences;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.LinkedFile;
@@ -25,16 +26,18 @@
 class LayoutTest {
 
     private LayoutFormatterPreferences layoutFormatterPreferences;
+    private JournalAbbreviationRepository abbreviationRepository;
 
     @BeforeEach
     void setUp() {
         layoutFormatterPreferences = mock(LayoutFormatterPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        abbreviationRepository = mock(JournalAbbreviationRepository.class);
     }
 
     private String layout(String layout, List<Path> fileDirForDatabase, BibEntry entry) throws IOException {
         StringReader layoutStringReader = new StringReader(layout.replace("__NEWLINE__", "\n"));
 
-        return new LayoutHelper(layoutStringReader, fileDirForDatabase, layoutFormatterPreferences)
+        return new LayoutHelper(layoutStringReader, fileDirForDatabase, layoutFormatterPreferences, abbreviationRepository)
                 .getLayoutFromText()
                 .doLayout(entry, null);
     }
diff --git a/src/test/java/org/jabref/logic/net/ProxyTest.java b/src/test/java/org/jabref/logic/net/ProxyTest.java
index 510f9ce1a50..6b6e844d1b6 100644
--- a/src/test/java/org/jabref/logic/net/ProxyTest.java
+++ b/src/test/java/org/jabref/logic/net/ProxyTest.java
@@ -12,12 +12,14 @@ public class ProxyTest {
    @Test
    public void testProxyPreferencesStorePassword() {
        // mock data
-       Boolean useProxy = true;
+       boolean useProxy = true;
        String hostname = "testName";
        String port = "8080";
-       Boolean useAuthentication = true;
+       boolean useAuthentication = true;
        String username = "testUserName";
        String password = "testPassword";
+       boolean persist = false;
+
        // Creates proxy preference
        ProxyPreferences proxyPref = new ProxyPreferences(
                useProxy,
@@ -25,7 +27,9 @@ public void testProxyPreferencesStorePassword() {
                port,
                useAuthentication,
                username,
-               password);
+               password,
+               persist);
+
        // Check if mock data is stored in object memory and can be extracted
        assertEquals(proxyPref.shouldUseProxy(), true);
        assertEquals(proxyPref.getHostname(), hostname);
@@ -33,5 +37,6 @@ public void testProxyPreferencesStorePassword() {
        assertEquals(proxyPref.shouldUseAuthentication(), true);
        assertEquals(proxyPref.getUsername(), username);
        assertEquals(proxyPref.getPassword(), password);
+       assertEquals(proxyPref.shouldPersistPassword(), persist);
    }
 }
diff --git a/src/test/java/org/jabref/logic/net/URLDownloadTest.java b/src/test/java/org/jabref/logic/net/URLDownloadTest.java
index 9365cff839b..c94eb0dd69a 100644
--- a/src/test/java/org/jabref/logic/net/URLDownloadTest.java
+++ b/src/test/java/org/jabref/logic/net/URLDownloadTest.java
@@ -130,7 +130,7 @@ public void connectTimeoutIsNeverNull() throws MalformedURLException {
     public void test503ErrorThrowsNestedIOExceptionWithFetcherServerException() throws Exception {
         URLDownload urlDownload = new URLDownload(new URL("http://httpstat.us/503"));
 
-        Exception exception = assertThrows(IOException.class, () -> urlDownload.asString());
+        Exception exception = assertThrows(IOException.class, urlDownload::asString);
         assertTrue(exception.getCause() instanceof FetcherServerException);
     }
 
@@ -138,7 +138,7 @@ public void test503ErrorThrowsNestedIOExceptionWithFetcherServerException() thro
     public void test429ErrorThrowsNestedIOExceptionWithFetcherServerException() throws Exception {
         URLDownload urlDownload = new URLDownload(new URL("http://httpstat.us/429"));
 
-        Exception exception = assertThrows(IOException.class, () -> urlDownload.asString());
+        Exception exception = assertThrows(IOException.class, urlDownload::asString);
         assertTrue(exception.getCause() instanceof FetcherClientException);
     }
 }
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 a76c9ae91b3..0f76f68d714 100644
--- a/src/test/java/org/jabref/logic/openoffice/style/OOBibStyleTest.java
+++ b/src/test/java/org/jabref/logic/openoffice/style/OOBibStyleTest.java
@@ -13,6 +13,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.layout.Layout;
 import org.jabref.logic.layout.LayoutFormatterPreferences;
 import org.jabref.model.database.BibDatabase;
@@ -26,7 +27,6 @@
 import org.jabref.model.openoffice.style.CitationMarkerNumericEntry;
 import org.jabref.model.openoffice.style.NonUniqueCitationMarker;
 
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Answers;
 
@@ -37,16 +37,12 @@
 import static org.mockito.Mockito.mock;
 
 class OOBibStyleTest {
-    private LayoutFormatterPreferences layoutFormatterPreferences;
-
-    @BeforeEach
-    void setUp() {
-        layoutFormatterPreferences = mock(LayoutFormatterPreferences.class, Answers.RETURNS_DEEP_STUBS);
-    }
+    private final LayoutFormatterPreferences layoutFormatterPreferences = mock(LayoutFormatterPreferences.class, Answers.RETURNS_DEEP_STUBS);
+    private final JournalAbbreviationRepository abbreviationRepository = mock(JournalAbbreviationRepository.class);
 
     @Test
     void testAuthorYear() throws IOException {
-        OOBibStyle style = new OOBibStyle(StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH, layoutFormatterPreferences);
+        OOBibStyle style = new OOBibStyle(StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH, layoutFormatterPreferences, abbreviationRepository);
         assertTrue(style.isValid());
         assertTrue(style.isInternalStyle());
         assertFalse(style.isCitationKeyCiteMarkers());
@@ -61,7 +57,7 @@ void testAuthorYear() throws IOException {
     void testAuthorYearAsFile() throws URISyntaxException, IOException {
         Path defFile = Path.of(OOBibStyleTest.class.getResource(StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH).toURI());
 
-        OOBibStyle style = new OOBibStyle(defFile, layoutFormatterPreferences);
+        OOBibStyle style = new OOBibStyle(defFile, layoutFormatterPreferences, abbreviationRepository);
         assertTrue(style.isValid());
         assertFalse(style.isInternalStyle());
         assertFalse(style.isCitationKeyCiteMarkers());
@@ -74,8 +70,10 @@ void testAuthorYearAsFile() throws URISyntaxException, IOException {
 
     @Test
     void testNumerical() throws IOException {
-        OOBibStyle style = new OOBibStyle(StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
-                layoutFormatterPreferences);
+        OOBibStyle style = new OOBibStyle(
+                StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
+                layoutFormatterPreferences,
+                abbreviationRepository);
         assertTrue(style.isValid());
         assertFalse(style.isCitationKeyCiteMarkers());
         assertFalse(style.isBoldCitations());
@@ -163,8 +161,10 @@ static String getCitationMarker2b(OOBibStyle style,
 
     @Test
     void testGetNumCitationMarker() throws IOException {
-        OOBibStyle style = new OOBibStyle(StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
-                layoutFormatterPreferences);
+        OOBibStyle style = new OOBibStyle(
+                StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
+                layoutFormatterPreferences,
+                abbreviationRepository);
         assertEquals("[1] ", runGetNumCitationMarker2a(style, List.of(1), -1, true));
 
         assertEquals("[1]", runGetNumCitationMarker2a(style, List.of(1), -1, false));
@@ -181,8 +181,10 @@ void testGetNumCitationMarker() throws IOException {
 
     @Test
     void testGetNumCitationMarkerUndefined() throws IOException {
-        OOBibStyle style = new OOBibStyle(StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
-                layoutFormatterPreferences);
+        OOBibStyle style = new OOBibStyle(
+                StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
+                layoutFormatterPreferences,
+                abbreviationRepository);
 
         // unresolved citations look like [??key]
         assertEquals("[" + OOBibStyle.UNDEFINED_CITATION_MARKER + "key" + "]",
@@ -229,8 +231,10 @@ void testGetNumCitationMarkerUndefined() throws IOException {
 
     @Test
     void testGetCitProperty() throws IOException {
-        OOBibStyle style = new OOBibStyle(StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
-                layoutFormatterPreferences);
+        OOBibStyle style = new OOBibStyle(
+                StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
+                layoutFormatterPreferences,
+                abbreviationRepository);
         assertEquals(", ", style.getStringCitProperty("AuthorSeparator"));
 
         // old
@@ -248,7 +252,10 @@ void testGetCitProperty() throws IOException {
 
     @Test
     void testGetCitationMarker() throws IOException {
-        OOBibStyle style = new OOBibStyle(StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH, layoutFormatterPreferences);
+        OOBibStyle style = new OOBibStyle(
+                StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
+                layoutFormatterPreferences,
+                abbreviationRepository);
         BibEntry entry = 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")
                 .withField(StandardField.YEAR, "2006")
@@ -274,20 +281,23 @@ void testGetCitationMarker() throws IOException {
         assertEquals("Boström et al. [2006]",
                 getCitationMarker2(style,
                         Collections.singletonList(entry), entryDBMap,
-                        false, null, new Boolean[] {false}, null));
+                        false, null, new Boolean[]{false}, null));
 
         assertEquals("[Boström, Wäyrynen, Bodén, Beznosov & Kruchten, 2006]",
                 getCitationMarker2(style,
                         Collections.singletonList(entry), entryDBMap,
                         true,
                         null,
-                        new Boolean[] {true},
+                        new Boolean[]{true},
                         null));
     }
 
     @Test
     void testLayout() throws IOException {
-        OOBibStyle style = new OOBibStyle(StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH, layoutFormatterPreferences);
+        OOBibStyle style = new OOBibStyle(
+                StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
+                layoutFormatterPreferences,
+                abbreviationRepository);
 
         BibEntry entry = 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")
@@ -314,7 +324,10 @@ void testLayout() throws IOException {
 
     @Test
     void testInstitutionAuthor() throws IOException {
-        OOBibStyle style = new OOBibStyle(StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH, layoutFormatterPreferences);
+        OOBibStyle style = new OOBibStyle(
+                StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
+                layoutFormatterPreferences,
+                abbreviationRepository);
         BibDatabase database = new BibDatabase();
 
         Layout l = style.getReferenceFormat(StandardEntryType.Article);
@@ -332,8 +345,10 @@ void testInstitutionAuthor() throws IOException {
 
     @Test
     void testVonAuthor() throws IOException {
-        OOBibStyle style = new OOBibStyle(StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
-                layoutFormatterPreferences);
+        OOBibStyle style = new OOBibStyle(
+                StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
+                layoutFormatterPreferences,
+                abbreviationRepository);
         BibDatabase database = new BibDatabase();
 
         Layout l = style.getReferenceFormat(StandardEntryType.Article);
@@ -351,8 +366,10 @@ void testVonAuthor() throws IOException {
 
     @Test
     void testInstitutionAuthorMarker() throws IOException {
-        OOBibStyle style = new OOBibStyle(StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
-                layoutFormatterPreferences);
+        OOBibStyle style = new OOBibStyle(
+                StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
+                layoutFormatterPreferences,
+                abbreviationRepository);
 
         Map<BibEntry, BibDatabase> entryDBMap = new HashMap<>();
         List<BibEntry> entries = new ArrayList<>();
@@ -375,8 +392,10 @@ void testInstitutionAuthorMarker() throws IOException {
 
     @Test
     void testVonAuthorMarker() throws IOException {
-        OOBibStyle style = new OOBibStyle(StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
-                layoutFormatterPreferences);
+        OOBibStyle style = new OOBibStyle(
+                StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
+                layoutFormatterPreferences,
+                abbreviationRepository);
 
         Map<BibEntry, BibDatabase> entryDBMap = new HashMap<>();
         List<BibEntry> entries = new ArrayList<>();
@@ -396,8 +415,10 @@ void testVonAuthorMarker() throws IOException {
 
     @Test
     void testNullAuthorMarker() throws IOException {
-        OOBibStyle style = new OOBibStyle(StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
-                layoutFormatterPreferences);
+        OOBibStyle style = new OOBibStyle(
+                StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
+                layoutFormatterPreferences,
+                abbreviationRepository);
 
         Map<BibEntry, BibDatabase> entryDBMap = new HashMap<>();
         List<BibEntry> entries = new ArrayList<>();
@@ -415,8 +436,10 @@ void testNullAuthorMarker() throws IOException {
 
     @Test
     void testNullYearMarker() throws IOException {
-        OOBibStyle style = new OOBibStyle(StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
-                layoutFormatterPreferences);
+        OOBibStyle style = new OOBibStyle(
+                StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
+                layoutFormatterPreferences,
+                abbreviationRepository);
 
         Map<BibEntry, BibDatabase> entryDBMap = new HashMap<>();
         List<BibEntry> entries = new ArrayList<>();
@@ -434,8 +457,10 @@ void testNullYearMarker() throws IOException {
 
     @Test
     void testEmptyEntryMarker() throws IOException {
-        OOBibStyle style = new OOBibStyle(StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
-                layoutFormatterPreferences);
+        OOBibStyle style = new OOBibStyle(
+                StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
+                layoutFormatterPreferences,
+                abbreviationRepository);
 
         Map<BibEntry, BibDatabase> entryDBMap = new HashMap<>();
         List<BibEntry> entries = new ArrayList<>();
@@ -452,8 +477,10 @@ void testEmptyEntryMarker() throws IOException {
 
     @Test
     void testGetCitationMarkerInParenthesisUniquefiers() throws IOException {
-        OOBibStyle style = new OOBibStyle(StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
-                layoutFormatterPreferences);
+        OOBibStyle style = new OOBibStyle(
+                StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
+                layoutFormatterPreferences,
+                abbreviationRepository);
 
         Map<BibEntry, BibDatabase> entryDBMap = new HashMap<>();
         List<BibEntry> entries = new ArrayList<>();
@@ -487,15 +514,17 @@ void testGetCitationMarkerInParenthesisUniquefiers() throws IOException {
                 getCitationMarker2b(style, entries, entryDBMap, true, null, null, null));
         assertEquals("[Beta, 2000a,b; Epsilon, 2001]",
                 getCitationMarker2(style, entries, entryDBMap, true,
-                        new String[] {"a", "b", ""},
-                        new Boolean[] {false, false, false},
+                        new String[]{"a", "b", ""},
+                        new Boolean[]{false, false, false},
                         null));
     }
 
     @Test
     void testGetCitationMarkerInTextUniquefiers() throws IOException {
-        OOBibStyle style = new OOBibStyle(StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
-                layoutFormatterPreferences);
+        OOBibStyle style = new OOBibStyle(
+                StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
+                layoutFormatterPreferences,
+                abbreviationRepository);
 
         Map<BibEntry, BibDatabase> entryDBMap = new HashMap<>();
         List<BibEntry> entries = new ArrayList<>();
@@ -529,15 +558,17 @@ void testGetCitationMarkerInTextUniquefiers() throws IOException {
                 getCitationMarker2b(style, entries, entryDBMap, false, null, null, null));
         assertEquals("Beta [2000a,b]; Epsilon [2001]",
                 getCitationMarker2(style, entries, entryDBMap, false,
-                        new String[] {"a", "b", ""},
-                        new Boolean[] {false, false, false},
+                        new String[]{"a", "b", ""},
+                        new Boolean[]{false, false, false},
                         null));
     }
 
     @Test
     void testGetCitationMarkerInParenthesisUniquefiersThreeSameAuthor() throws IOException {
-        OOBibStyle style = new OOBibStyle(StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
-                layoutFormatterPreferences);
+        OOBibStyle style = new OOBibStyle(
+                StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
+                layoutFormatterPreferences,
+                abbreviationRepository);
 
         Map<BibEntry, BibDatabase> entryDBMap = new HashMap<>();
         List<BibEntry> entries = new ArrayList<>();
@@ -570,15 +601,17 @@ void testGetCitationMarkerInParenthesisUniquefiersThreeSameAuthor() throws IOExc
 
         assertEquals("[Beta, 2000a,b,c]",
                 getCitationMarker2(style, entries, entryDBMap, true,
-                        new String[] {"a", "b", "c"},
-                        new Boolean[] {false, false, false},
+                        new String[]{"a", "b", "c"},
+                        new Boolean[]{false, false, false},
                         null));
     }
 
     @Test
     void testGetCitationMarkerInTextUniquefiersThreeSameAuthor() throws IOException {
-        OOBibStyle style = new OOBibStyle(StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
-                layoutFormatterPreferences);
+        OOBibStyle style = new OOBibStyle(
+                StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
+                layoutFormatterPreferences,
+                abbreviationRepository);
 
         Map<BibEntry, BibDatabase> entryDBMap = new HashMap<>();
         List<BibEntry> entries = new ArrayList<>();
@@ -611,53 +644,69 @@ void testGetCitationMarkerInTextUniquefiersThreeSameAuthor() throws IOException
 
         assertEquals("Beta [2000a,b,c]",
                 getCitationMarker2(style, entries, entryDBMap, false,
-                        new String[] {"a", "b", "c"},
-                        new Boolean[] {false, false, false},
+                        new String[]{"a", "b", "c"},
+                        new Boolean[]{false, false, false},
                         null));
     }
 
     @Test
         // 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);
-        OOBibStyle style2 = new OOBibStyle(StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
-                layoutFormatterPreferences);
+        OOBibStyle style1 = new OOBibStyle(
+                StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
+                layoutFormatterPreferences,
+                abbreviationRepository);
+        OOBibStyle style2 = new OOBibStyle(
+                StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
+                layoutFormatterPreferences,
+                abbreviationRepository);
         assertEquals(style1, style2);
     }
 
     @Test
         // 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);
-        OOBibStyle style2 = new OOBibStyle(StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH,
-                layoutFormatterPreferences);
+        OOBibStyle style1 = new OOBibStyle(
+                StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
+                layoutFormatterPreferences,
+                abbreviationRepository);
+        OOBibStyle style2 = new OOBibStyle(
+                StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH,
+                layoutFormatterPreferences,
+                abbreviationRepository);
         assertNotEquals(style1, style2);
     }
 
     @Test
     void testCompareToEqual() throws IOException {
-        OOBibStyle style1 = new OOBibStyle(StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
-                layoutFormatterPreferences);
-        OOBibStyle style2 = new OOBibStyle(StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
-                layoutFormatterPreferences);
+        OOBibStyle style1 = new OOBibStyle(
+                StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
+                layoutFormatterPreferences,
+                abbreviationRepository);
+        OOBibStyle style2 = new OOBibStyle(
+                StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
+                layoutFormatterPreferences,
+                abbreviationRepository);
         assertEquals(0, style1.compareTo(style2));
     }
 
     @Test
     void testCompareToNotEqual() throws IOException {
-        OOBibStyle style1 = new OOBibStyle(StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
-                layoutFormatterPreferences);
-        OOBibStyle style2 = new OOBibStyle(StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH,
-                layoutFormatterPreferences);
+        OOBibStyle style1 = new OOBibStyle(
+                StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
+                layoutFormatterPreferences,
+                abbreviationRepository);
+        OOBibStyle style2 = new OOBibStyle(
+                StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH,
+                layoutFormatterPreferences,
+                abbreviationRepository);
         assertTrue(style1.compareTo(style2) > 0);
         assertFalse(style2.compareTo(style1) > 0);
     }
 
     @Test
     void testEmptyStringPropertyAndOxfordComma() throws Exception {
-        OOBibStyle style = new OOBibStyle("test.jstyle", layoutFormatterPreferences);
+        OOBibStyle style = new OOBibStyle("test.jstyle", layoutFormatterPreferences, abbreviationRepository);
         Map<BibEntry, BibDatabase> entryDBMap = new HashMap<>();
         List<BibEntry> entries = new ArrayList<>();
         BibDatabase database = new BibDatabase();
@@ -677,14 +726,16 @@ void testEmptyStringPropertyAndOxfordComma() throws Exception {
 
     @Test
     void testIsValidWithDefaultSectionAtTheStart() throws Exception {
-        OOBibStyle style = new OOBibStyle("testWithDefaultAtFirstLIne.jstyle", layoutFormatterPreferences);
+        OOBibStyle style = new OOBibStyle("testWithDefaultAtFirstLIne.jstyle", layoutFormatterPreferences, abbreviationRepository);
         assertTrue(style.isValid());
     }
 
     @Test
     void testGetCitationMarkerJoinFirst() throws IOException {
-        OOBibStyle style = new OOBibStyle(StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
-                layoutFormatterPreferences);
+        OOBibStyle style = new OOBibStyle(
+                StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
+                layoutFormatterPreferences,
+                abbreviationRepository);
 
         // Question: What should happen if some sources are
         // marked as isFirstAppearanceOfSource?
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 4ab0c6ef5d3..e681b00753b 100644
--- a/src/test/java/org/jabref/logic/openoffice/style/OOBibStyleTestHelper.java
+++ b/src/test/java/org/jabref/logic/openoffice/style/OOBibStyleTestHelper.java
@@ -38,9 +38,9 @@ static class CitationMarkerNumericEntryImpl implements CitationMarkerNumericEntr
 
         public CitationMarkerNumericEntryImpl(String citationKey, int num, Optional<OOText> pageInfo) {
             this.citationKey = citationKey;
-            this.num = (num == UNRESOLVED_ENTRY_NUMBER
+            this.num = num == UNRESOLVED_ENTRY_NUMBER
                     ? Optional.empty()
-                    : Optional.of(num));
+                    : Optional.of(num);
             this.pageInfo = PageInfo.normalizePageInfo(pageInfo);
         }
 
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 954fb3aa616..38d8a359615 100644
--- a/src/test/java/org/jabref/logic/openoffice/style/StyleLoaderTest.java
+++ b/src/test/java/org/jabref/logic/openoffice/style/StyleLoaderTest.java
@@ -8,6 +8,7 @@
 
 import javafx.collections.FXCollections;
 
+import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.layout.LayoutFormatterPreferences;
 import org.jabref.logic.openoffice.OpenOfficePreferences;
 
@@ -29,27 +30,34 @@ public class StyleLoaderTest {
 
     private OpenOfficePreferences preferences;
     private LayoutFormatterPreferences layoutPreferences;
+    private JournalAbbreviationRepository abbreviationRepository;
 
     @BeforeEach
     public void setUp() {
         preferences = mock(OpenOfficePreferences.class, Answers.RETURNS_DEEP_STUBS);
         layoutPreferences = mock(LayoutFormatterPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        abbreviationRepository = mock(JournalAbbreviationRepository.class);
     }
 
     @Test
     public void throwNPEWithNullPreferences() {
-        assertThrows(NullPointerException.class, () -> loader = new StyleLoader(null, layoutPreferences));
+        assertThrows(NullPointerException.class, () -> loader = new StyleLoader(null, layoutPreferences, abbreviationRepository));
     }
 
     @Test
     public void throwNPEWithNullLayoutPreferences() {
-        assertThrows(NullPointerException.class, () -> loader = new StyleLoader(mock(OpenOfficePreferences.class), null));
+        assertThrows(NullPointerException.class, () -> loader = new StyleLoader(mock(OpenOfficePreferences.class), null, abbreviationRepository));
+    }
+
+    @Test
+    public void throwNPEWithNullAbbreviationRepository() {
+        assertThrows(NullPointerException.class, () -> loader = new StyleLoader(mock(OpenOfficePreferences.class), layoutPreferences, null));
     }
 
     @Test
     public void testGetStylesWithEmptyExternal() {
         preferences.setExternalStyles(Collections.emptyList());
-        loader = new StyleLoader(preferences, layoutPreferences);
+        loader = new StyleLoader(preferences, layoutPreferences, abbreviationRepository);
 
         assertEquals(2, loader.getStyles().size());
     }
@@ -57,7 +65,7 @@ public void testGetStylesWithEmptyExternal() {
     @Test
     public void testAddStyleLeadsToOneMoreStyle() throws URISyntaxException {
         preferences.setExternalStyles(Collections.emptyList());
-        loader = new StyleLoader(preferences, layoutPreferences);
+        loader = new StyleLoader(preferences, layoutPreferences, abbreviationRepository);
 
         String filename = Path.of(StyleLoader.class.getResource(StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH).toURI())
                               .toFile().getPath();
@@ -68,7 +76,7 @@ public void testAddStyleLeadsToOneMoreStyle() throws URISyntaxException {
     @Test
     public void testAddInvalidStyleLeadsToNoMoreStyle() {
         preferences.setExternalStyles(Collections.emptyList());
-        loader = new StyleLoader(preferences, layoutPreferences);
+        loader = new StyleLoader(preferences, layoutPreferences, abbreviationRepository);
         int beforeAdding = loader.getStyles().size();
         loader.addStyleIfValid("DefinitelyNotAValidFileNameOrWeAreExtremelyUnlucky");
         assertEquals(beforeAdding, loader.getStyles().size());
@@ -79,7 +87,7 @@ public void testInitalizeWithOneExternalFile() throws URISyntaxException {
         String filename = Path.of(StyleLoader.class.getResource(StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH).toURI())
                               .toFile().getPath();
         when(preferences.getExternalStyles()).thenReturn(FXCollections.singletonObservableList(filename));
-        loader = new StyleLoader(preferences, layoutPreferences);
+        loader = new StyleLoader(preferences, layoutPreferences, abbreviationRepository);
         assertEquals(NUMBER_OF_INTERNAL_STYLES + 1, loader.getStyles().size());
     }
 
@@ -87,7 +95,7 @@ public void testInitalizeWithOneExternalFile() throws URISyntaxException {
     public void testInitalizeWithIncorrectExternalFile() {
         preferences.setExternalStyles(Collections.singletonList("DefinitelyNotAValidFileNameOrWeAreExtremelyUnlucky"));
 
-        loader = new StyleLoader(preferences, layoutPreferences);
+        loader = new StyleLoader(preferences, layoutPreferences, abbreviationRepository);
         assertEquals(NUMBER_OF_INTERNAL_STYLES, loader.getStyles().size());
     }
 
@@ -97,7 +105,7 @@ public void testInitalizeWithOneExternalFileRemoveStyle() throws URISyntaxExcept
                               .toFile().getPath();
         when(preferences.getExternalStyles()).thenReturn(FXCollections.singletonObservableList(filename));
 
-        loader = new StyleLoader(preferences, layoutPreferences);
+        loader = new StyleLoader(preferences, layoutPreferences, abbreviationRepository);
         List<OOBibStyle> toremove = new ArrayList<>();
         int beforeRemoving = loader.getStyles().size();
         for (OOBibStyle style : loader.getStyles()) {
@@ -118,7 +126,7 @@ public void testInitalizeWithOneExternalFileRemoveStyleUpdatesPreferences() thro
                               .toFile().getPath();
         when(preferences.getExternalStyles()).thenReturn(FXCollections.singletonObservableList(filename));
 
-        loader = new StyleLoader(preferences, layoutPreferences);
+        loader = new StyleLoader(preferences, layoutPreferences, abbreviationRepository);
         List<OOBibStyle> toremove = new ArrayList<>();
         for (OOBibStyle style : loader.getStyles()) {
             if (!style.isInternalStyle()) {
@@ -136,7 +144,7 @@ public void testInitalizeWithOneExternalFileRemoveStyleUpdatesPreferences() thro
     @Test
     public void testAddSameStyleTwiceLeadsToOneMoreStyle() throws URISyntaxException {
         preferences.setExternalStyles(Collections.emptyList());
-        loader = new StyleLoader(preferences, layoutPreferences);
+        loader = new StyleLoader(preferences, layoutPreferences, abbreviationRepository);
         int beforeAdding = loader.getStyles().size();
         String filename = Path.of(StyleLoader.class.getResource(StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH).toURI())
                               .toFile().getPath();
@@ -147,7 +155,7 @@ public void testAddSameStyleTwiceLeadsToOneMoreStyle() throws URISyntaxException
 
     @Test
     public void testAddNullStyleThrowsNPE() {
-        loader = new StyleLoader(preferences, layoutPreferences);
+        loader = new StyleLoader(preferences, layoutPreferences, abbreviationRepository);
         assertThrows(NullPointerException.class, () -> loader.addStyleIfValid(null));
     }
 
@@ -155,7 +163,7 @@ public void testAddNullStyleThrowsNPE() {
     public void testGetDefaultUsedStyleWhenEmpty() {
         when(preferences.getCurrentStyle()).thenReturn(StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH);
         preferences.clearCurrentStyle();
-        loader = new StyleLoader(preferences, layoutPreferences);
+        loader = new StyleLoader(preferences, layoutPreferences, abbreviationRepository);
         OOBibStyle style = loader.getUsedStyle();
         assertTrue(style.isValid());
         assertEquals(StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH, style.getPath());
@@ -165,7 +173,7 @@ public void testGetDefaultUsedStyleWhenEmpty() {
     @Test
     public void testGetStoredUsedStyle() {
         when(preferences.getCurrentStyle()).thenReturn(StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH);
-        loader = new StyleLoader(preferences, layoutPreferences);
+        loader = new StyleLoader(preferences, layoutPreferences, abbreviationRepository);
         OOBibStyle style = loader.getUsedStyle();
         assertTrue(style.isValid());
         assertEquals(StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH, style.getPath());
@@ -175,7 +183,7 @@ public void testGetStoredUsedStyle() {
     @Test
     public void testGetDefaultUsedStyleWhenIncorrect() {
         when(preferences.getCurrentStyle()).thenReturn("ljlkjlkjnljnvdlsjniuhwelfhuewfhlkuewhfuwhelu");
-        loader = new StyleLoader(preferences, layoutPreferences);
+        loader = new StyleLoader(preferences, layoutPreferences, abbreviationRepository);
         OOBibStyle style = loader.getUsedStyle();
         assertTrue(style.isValid());
         assertEquals(StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH, style.getPath());
@@ -185,7 +193,7 @@ public void testGetDefaultUsedStyleWhenIncorrect() {
     public void testRemoveInternalStyleReturnsFalseAndDoNotRemove() {
         preferences.setExternalStyles(Collections.emptyList());
 
-        loader = new StyleLoader(preferences, layoutPreferences);
+        loader = new StyleLoader(preferences, layoutPreferences, abbreviationRepository);
         List<OOBibStyle> toremove = new ArrayList<>();
         for (OOBibStyle style : loader.getStyles()) {
             if (style.isInternalStyle()) {
diff --git a/src/test/java/org/jabref/logic/pdf/search/indexing/DocumentReaderTest.java b/src/test/java/org/jabref/logic/pdf/search/indexing/DocumentReaderTest.java
index 047689eb543..982504c9938 100644
--- a/src/test/java/org/jabref/logic/pdf/search/indexing/DocumentReaderTest.java
+++ b/src/test/java/org/jabref/logic/pdf/search/indexing/DocumentReaderTest.java
@@ -33,7 +33,7 @@ public void setup() {
         this.databaseContext = mock(BibDatabaseContext.class);
         when(databaseContext.getFileDirectories(Mockito.any())).thenReturn(Collections.singletonList(Path.of("src/test/resources/pdfs")));
         this.filePreferences = mock(FilePreferences.class);
-        when(filePreferences.getUser()).thenReturn("test");
+        when(filePreferences.getUserAndHost()).thenReturn("testuser-testhost");
         when(filePreferences.getMainFileDirectory()).thenReturn(Optional.empty());
         when(filePreferences.shouldStoreFilesRelativeToBibFile()).thenReturn(true);
     }
diff --git a/src/test/java/org/jabref/logic/shared/DBMSConnectionTest.java b/src/test/java/org/jabref/logic/shared/DBMSConnectionTest.java
index 9187bf81904..208efc65334 100644
--- a/src/test/java/org/jabref/logic/shared/DBMSConnectionTest.java
+++ b/src/test/java/org/jabref/logic/shared/DBMSConnectionTest.java
@@ -16,6 +16,17 @@ public class DBMSConnectionTest {
     @EnumSource(DBMSType.class)
     public void getConnectionFailsWhenconnectingToInvalidHost(DBMSType dbmsType) {
         assertThrows(SQLException.class,
-                () -> new DBMSConnection(new DBMSConnectionPropertiesBuilder().setType(dbmsType).setHost("XXXX").setPort(33778).setDatabase("XXXX").setUser("XXXX").setPassword("XXXX").setUseSSL(false).setServerTimezone("XXXX").createDBMSConnectionProperties()).getConnection());
+                () -> new DBMSConnection(
+                        new DBMSConnectionPropertiesBuilder()
+                                .setType(dbmsType)
+                                .setHost("XXXX")
+                                .setPort(33778)
+                                .setDatabase("XXXX")
+                                .setUser("XXXX")
+                                .setPassword("XXXX")
+                                .setUseSSL(false)
+                                .setServerTimezone("XXXX")
+                                .createDBMSConnectionProperties())
+                        .getConnection());
     }
 }
diff --git a/src/test/java/org/jabref/logic/shared/DBMSProcessorTest.java b/src/test/java/org/jabref/logic/shared/DBMSProcessorTest.java
index 9ae014f50e6..313b5f907dd 100644
--- a/src/test/java/org/jabref/logic/shared/DBMSProcessorTest.java
+++ b/src/test/java/org/jabref/logic/shared/DBMSProcessorTest.java
@@ -90,7 +90,7 @@ void testInsertEntry() throws SQLException {
             }
         }
 
-        Map<String, String> expectedFieldMap = expectedEntry.getFieldMap().entrySet().stream().collect(Collectors.toMap((entry) -> entry.getKey().getName(), Map.Entry::getValue));
+        Map<String, String> expectedFieldMap = expectedEntry.getFieldMap().entrySet().stream().collect(Collectors.toMap(entry -> entry.getKey().getName(), Map.Entry::getValue));
 
         assertEquals(expectedFieldMap, actualFieldMap);
     }
@@ -417,8 +417,8 @@ void testInsertMultipleEntries() throws SQLException {
         }
         Map<Integer, Map<String, String>> expectedFieldMap = entries.stream()
                                                                     .collect(Collectors.toMap(bibEntry -> bibEntry.getSharedBibEntryData().getSharedID(),
-                                                                            (bibEntry) -> bibEntry.getFieldMap().entrySet().stream()
-                                                                                                  .collect(Collectors.toMap((entry) -> entry.getKey().getName(), Map.Entry::getValue))));
+                                                                            bibEntry -> bibEntry.getFieldMap().entrySet().stream()
+                                                                                                  .collect(Collectors.toMap(entry -> entry.getKey().getName(), Map.Entry::getValue))));
 
         assertEquals(expectedFieldMap, actualFieldMap);
     }
diff --git a/src/test/java/org/jabref/logic/texparser/LatexParserTest.java b/src/test/java/org/jabref/logic/texparser/LatexParserTest.java
index 97929726abb..b4e6edb131f 100644
--- a/src/test/java/org/jabref/logic/texparser/LatexParserTest.java
+++ b/src/test/java/org/jabref/logic/texparser/LatexParserTest.java
@@ -13,7 +13,7 @@
 import org.jabref.model.texparser.LatexParserResult;
 import org.jabref.model.util.DummyFileUpdateMonitor;
 import org.jabref.model.util.FileUpdateMonitor;
-import org.jabref.preferences.GeneralPreferences;
+import org.jabref.preferences.LibraryPreferences;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -31,14 +31,14 @@ public class LatexParserTest {
     private final static String EINSTEIN_C = "Einstein1920c";
 
     private final FileUpdateMonitor fileMonitor = new DummyFileUpdateMonitor();
-    private GeneralPreferences generalPreferences;
+    private LibraryPreferences libraryPreferences;
     private ImportFormatPreferences importFormatPreferences;
     private BibDatabase database;
     private BibDatabase database2;
 
     @BeforeEach
     void setUp() {
-        generalPreferences = mock(GeneralPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        libraryPreferences = mock(LibraryPreferences.class, Answers.RETURNS_DEEP_STUBS);
         importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
 
         database = new BibDatabase();
@@ -102,12 +102,12 @@ public void testSameFileDifferentDatabases() throws URISyntaxException {
         expectedParserResult.addKey(EINSTEIN, texFile, 6, 14, 33, "Einstein said \\cite{Einstein1920} that lorem impsum, consectetur adipiscing elit.");
         expectedParserResult.addKey(DARWIN, texFile, 7, 67, 84, "Nunc ultricies leo nec libero rhoncus, eu vehicula enim efficitur. \\cite{Darwin1888}");
 
-        LatexBibEntriesResolverResult crossingResult = new TexBibEntriesResolver(database, generalPreferences, importFormatPreferences, fileMonitor).resolve(parserResult);
+        LatexBibEntriesResolverResult crossingResult = new TexBibEntriesResolver(database, libraryPreferences, importFormatPreferences, fileMonitor).resolve(parserResult);
         LatexBibEntriesResolverResult expectedCrossingResult = new LatexBibEntriesResolverResult(expectedParserResult);
 
         assertEquals(expectedCrossingResult, crossingResult);
 
-        LatexBibEntriesResolverResult crossingResult2 = new TexBibEntriesResolver(database2, generalPreferences, importFormatPreferences, fileMonitor).resolve(parserResult);
+        LatexBibEntriesResolverResult crossingResult2 = new TexBibEntriesResolver(database2, libraryPreferences, importFormatPreferences, fileMonitor).resolve(parserResult);
         LatexBibEntriesResolverResult expectedCrossingResult2 = new LatexBibEntriesResolverResult(expectedParserResult);
 
         expectedCrossingResult2.addEntry(database.getEntryByCitationKey(EINSTEIN).get());
@@ -135,12 +135,12 @@ public void testTwoFilesDifferentDatabases() throws URISyntaxException {
         expectedParserResult.addKey(EINSTEIN, texFile2, 5, 48, 67, "This is some content trying to cite a bib file: \\cite{Einstein1920}");
         expectedParserResult.addKey(NEWTON, texFile2, 6, 48, 65, "This is some content trying to cite a bib file: \\cite{Newton1999}");
 
-        LatexBibEntriesResolverResult crossingResult = new TexBibEntriesResolver(database, generalPreferences, importFormatPreferences, fileMonitor).resolve(parserResult);
+        LatexBibEntriesResolverResult crossingResult = new TexBibEntriesResolver(database, libraryPreferences, importFormatPreferences, fileMonitor).resolve(parserResult);
         LatexBibEntriesResolverResult expectedCrossingResult = new LatexBibEntriesResolverResult(expectedParserResult);
 
         assertEquals(expectedCrossingResult, crossingResult);
 
-        LatexBibEntriesResolverResult crossingResult2 = new TexBibEntriesResolver(database2, generalPreferences, importFormatPreferences, fileMonitor).resolve(parserResult);
+        LatexBibEntriesResolverResult crossingResult2 = new TexBibEntriesResolver(database2, libraryPreferences, importFormatPreferences, fileMonitor).resolve(parserResult);
         LatexBibEntriesResolverResult expectedCrossingResult2 = new LatexBibEntriesResolverResult(expectedParserResult);
 
         expectedCrossingResult2.addEntry(database.getEntryByCitationKey(EINSTEIN).get());
diff --git a/src/test/java/org/jabref/logic/texparser/TexBibEntriesResolverTest.java b/src/test/java/org/jabref/logic/texparser/TexBibEntriesResolverTest.java
index a3870bafb72..e7c5a943f04 100644
--- a/src/test/java/org/jabref/logic/texparser/TexBibEntriesResolverTest.java
+++ b/src/test/java/org/jabref/logic/texparser/TexBibEntriesResolverTest.java
@@ -13,7 +13,7 @@
 import org.jabref.model.texparser.LatexParserResult;
 import org.jabref.model.util.DummyFileUpdateMonitor;
 import org.jabref.model.util.FileUpdateMonitor;
-import org.jabref.preferences.GeneralPreferences;
+import org.jabref.preferences.LibraryPreferences;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -31,7 +31,7 @@ public class TexBibEntriesResolverTest {
     private final static String EINSTEIN_C = "Einstein1920c";
 
     private final FileUpdateMonitor fileMonitor = new DummyFileUpdateMonitor();
-    private GeneralPreferences generalPreferences;
+    private LibraryPreferences libraryPreferences;
     private ImportFormatPreferences importFormatPreferences;
     private BibDatabase database;
     private BibDatabase database2;
@@ -39,7 +39,7 @@ public class TexBibEntriesResolverTest {
 
     @BeforeEach
     void setUp() {
-        generalPreferences = mock(GeneralPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        libraryPreferences = mock(LibraryPreferences.class, Answers.RETURNS_DEEP_STUBS);
         importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
 
         database = new BibDatabase();
@@ -102,7 +102,7 @@ public void testSingleFile() throws URISyntaxException {
         Path texFile = Path.of(TexBibEntriesResolverTest.class.getResource("paper.tex").toURI());
         LatexParserResult parserResult = new DefaultLatexParser().parse(texFile);
 
-        LatexBibEntriesResolverResult crossingResult = new TexBibEntriesResolver(database, generalPreferences, importFormatPreferences, fileMonitor).resolve(parserResult);
+        LatexBibEntriesResolverResult crossingResult = new TexBibEntriesResolver(database, libraryPreferences, importFormatPreferences, fileMonitor).resolve(parserResult);
         LatexBibEntriesResolverResult expectedCrossingResult = new LatexBibEntriesResolverResult(parserResult);
 
         assertEquals(expectedCrossingResult, crossingResult);
@@ -114,7 +114,7 @@ public void testTwoFiles() throws URISyntaxException {
         Path texFile2 = Path.of(TexBibEntriesResolverTest.class.getResource("paper2.tex").toURI());
         LatexParserResult parserResult = new DefaultLatexParser().parse(Arrays.asList(texFile, texFile2));
 
-        LatexBibEntriesResolverResult crossingResult = new TexBibEntriesResolver(database, generalPreferences, importFormatPreferences, fileMonitor).resolve(parserResult);
+        LatexBibEntriesResolverResult crossingResult = new TexBibEntriesResolver(database, libraryPreferences, importFormatPreferences, fileMonitor).resolve(parserResult);
         LatexBibEntriesResolverResult expectedCrossingResult = new LatexBibEntriesResolverResult(parserResult);
 
         assertEquals(expectedCrossingResult, crossingResult);
@@ -125,7 +125,7 @@ public void testDuplicateFiles() throws URISyntaxException {
         Path texFile = Path.of(TexBibEntriesResolverTest.class.getResource("paper.tex").toURI());
         LatexParserResult parserResult = new DefaultLatexParser().parse(texFile);
 
-        LatexBibEntriesResolverResult crossingResult = new TexBibEntriesResolver(database, generalPreferences, importFormatPreferences, fileMonitor).resolve(parserResult);
+        LatexBibEntriesResolverResult crossingResult = new TexBibEntriesResolver(database, libraryPreferences, importFormatPreferences, fileMonitor).resolve(parserResult);
         LatexBibEntriesResolverResult expectedCrossingResult = new LatexBibEntriesResolverResult(parserResult);
 
         assertEquals(expectedCrossingResult, crossingResult);
@@ -136,7 +136,7 @@ public void testUnknownKey() throws URISyntaxException {
         Path texFile = Path.of(TexBibEntriesResolverTest.class.getResource("unknown_key.tex").toURI());
         LatexParserResult parserResult = new DefaultLatexParser().parse(texFile);
 
-        LatexBibEntriesResolverResult crossingResult = new TexBibEntriesResolver(database, generalPreferences, importFormatPreferences, fileMonitor).resolve(parserResult);
+        LatexBibEntriesResolverResult crossingResult = new TexBibEntriesResolver(database, libraryPreferences, importFormatPreferences, fileMonitor).resolve(parserResult);
         LatexBibEntriesResolverResult expectedCrossingResult = new LatexBibEntriesResolverResult(parserResult);
 
         assertEquals(expectedCrossingResult, crossingResult);
@@ -147,7 +147,7 @@ public void testNestedFiles() throws URISyntaxException {
         Path texFile = Path.of(TexBibEntriesResolverTest.class.getResource("nested.tex").toURI());
         LatexParserResult parserResult = new DefaultLatexParser().parse(texFile);
 
-        LatexBibEntriesResolverResult crossingResult = new TexBibEntriesResolver(database, generalPreferences, importFormatPreferences, fileMonitor).resolve(parserResult);
+        LatexBibEntriesResolverResult crossingResult = new TexBibEntriesResolver(database, libraryPreferences, importFormatPreferences, fileMonitor).resolve(parserResult);
         LatexBibEntriesResolverResult expectedCrossingResult = new LatexBibEntriesResolverResult(parserResult);
 
         assertEquals(expectedCrossingResult, crossingResult);
@@ -158,7 +158,7 @@ public void testCrossRef() throws URISyntaxException {
         Path texFile = Path.of(TexBibEntriesResolverTest.class.getResource("crossref.tex").toURI());
         LatexParserResult parserResult = new DefaultLatexParser().parse(texFile);
 
-        LatexBibEntriesResolverResult crossingResult = new TexBibEntriesResolver(database, generalPreferences, importFormatPreferences, fileMonitor).resolve(parserResult);
+        LatexBibEntriesResolverResult crossingResult = new TexBibEntriesResolver(database, libraryPreferences, importFormatPreferences, fileMonitor).resolve(parserResult);
         LatexBibEntriesResolverResult expectedCrossingResult = new LatexBibEntriesResolverResult(parserResult);
 
         expectedCrossingResult.addEntry(bibEntry);
diff --git a/src/test/java/org/jabref/logic/util/FileNameCleanerTest.java b/src/test/java/org/jabref/logic/util/FileNameCleanerTest.java
index ffda8759230..14911166b4c 100644
--- a/src/test/java/org/jabref/logic/util/FileNameCleanerTest.java
+++ b/src/test/java/org/jabref/logic/util/FileNameCleanerTest.java
@@ -12,6 +12,7 @@ public class FileNameCleanerTest {
     public void testCleanFileName() {
         assertEquals("legalFilename.txt", FileNameCleaner.cleanFileName("legalFilename.txt"));
         assertEquals("illegalFilename______.txt", FileNameCleaner.cleanFileName("illegalFilename/?*<>|.txt"));
+        assertEquals("illegalFileName_.txt", FileNameCleaner.cleanFileName("illegalFileName{.txt"));
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/util/UpdateFieldTest.java b/src/test/java/org/jabref/logic/util/UpdateFieldTest.java
index c6d99f182eb..5012e054f75 100644
--- a/src/test/java/org/jabref/logic/util/UpdateFieldTest.java
+++ b/src/test/java/org/jabref/logic/util/UpdateFieldTest.java
@@ -2,6 +2,7 @@
 
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.List;
 import java.util.Optional;
 
 import org.jabref.logic.preferences.OwnerPreferences;
@@ -179,7 +180,7 @@ public void emptyOwnerFieldNowPresentAfterAutomaticSet() {
 
         OwnerPreferences ownerPreferences = createOwnerPreference(true, true);
         TimestampPreferences timestampPreferences = createTimestampPreference();
-        UpdateField.setAutomaticFields(entry, false, false, ownerPreferences, timestampPreferences);
+        UpdateField.setAutomaticFields(List.of(entry), ownerPreferences, timestampPreferences);
 
         assertEquals(Optional.of("testDefaultOwner"), entry.getField(StandardField.OWNER), "No owner exists");
     }
@@ -188,7 +189,7 @@ public void emptyOwnerFieldNowPresentAfterAutomaticSet() {
     public void ownerAssignedCorrectlyAfterAutomaticSet() {
         OwnerPreferences ownerPreferences = createOwnerPreference(true, true);
         TimestampPreferences timestampPreferences = createTimestampPreference();
-        UpdateField.setAutomaticFields(entry, false, false, ownerPreferences, timestampPreferences);
+        UpdateField.setAutomaticFields(List.of(entry), ownerPreferences, timestampPreferences);
 
         assertEquals(Optional.of("testDefaultOwner"), entry.getField(StandardField.OWNER));
     }
@@ -202,19 +203,19 @@ public void ownerIsNotResetAfterAutomaticSetIfOverwriteOwnerFalse() {
 
         OwnerPreferences ownerPreferences = createOwnerPreference(true, false);
         TimestampPreferences timestampPreferences = createTimestampPreference();
-        UpdateField.setAutomaticFields(entry, false, false, ownerPreferences, timestampPreferences);
+        UpdateField.setAutomaticFields(List.of(entry), ownerPreferences, timestampPreferences);
 
         assertNotEquals(Optional.of("testDefaultOwner"), entry.getField(StandardField.OWNER), "Owner has changed");
         assertEquals(Optional.of(alreadySetOwner), entry.getField(StandardField.OWNER), "Owner has not changed");
     }
 
     @Test
-    public void emptyCreationdateFieldNowPresentAfterAutomaticSet() {
+    public void emptyCreationDateFieldNowPresentAfterAutomaticSet() {
         assertEquals(Optional.empty(), entry.getField(StandardField.CREATIONDATE), "CreationDate is present");
 
         OwnerPreferences ownerPreferences = createOwnerPreference(true, true);
         TimestampPreferences timestampPreferences = createTimestampPreference();
-        UpdateField.setAutomaticFields(entry, false, false, ownerPreferences, timestampPreferences);
+        UpdateField.setAutomaticFields(List.of(entry), ownerPreferences, timestampPreferences);
 
         String creationDate = timestampPreferences.now();
 
@@ -222,10 +223,10 @@ public void emptyCreationdateFieldNowPresentAfterAutomaticSet() {
     }
 
     @Test
-    public void creationdateAssignedCorrectlyAfterAutomaticSet() {
+    public void creationDateAssignedCorrectlyAfterAutomaticSet() {
         OwnerPreferences ownerPreferences = createOwnerPreference(true, true);
         TimestampPreferences timestampPreferences = createTimestampPreference();
-        UpdateField.setAutomaticFields(entry, false, false, ownerPreferences, timestampPreferences);
+        UpdateField.setAutomaticFields(List.of(entry), ownerPreferences, timestampPreferences);
 
         String creationDate = timestampPreferences.now();
 
@@ -245,7 +246,7 @@ public void ownerSetToDefaultValueForCollectionOfBibEntries() {
 
         OwnerPreferences ownerPreferences = createOwnerPreference(true, true);
         TimestampPreferences timestampPreferences = createTimestampPreference();
-        UpdateField.setAutomaticFields(bibs, false, ownerPreferences, timestampPreferences);
+        UpdateField.setAutomaticFields(bibs, ownerPreferences, timestampPreferences);
 
         String defaultOwner = "testDefaultOwner";
 
@@ -269,7 +270,7 @@ public void ownerNotChangedForCollectionOfBibEntriesIfOptionsDisabled() {
 
         OwnerPreferences ownerPreferences = createOwnerPreference(true, false);
         TimestampPreferences timestampPreferences = createTimestampPreference();
-        UpdateField.setAutomaticFields(bibs, false, ownerPreferences, timestampPreferences);
+        UpdateField.setAutomaticFields(bibs, ownerPreferences, timestampPreferences);
 
         assertEquals(Optional.of(initialOwner), entry.getField(StandardField.OWNER), "entry has new value for owner field");
         assertEquals(Optional.of(initialOwner), entry2.getField(StandardField.OWNER), "entry2 has new value for owner field");
diff --git a/src/test/java/org/jabref/logic/util/io/BackupFileUtilTest.java b/src/test/java/org/jabref/logic/util/io/BackupFileUtilTest.java
index f44e6a45e1e..a5ad81b76d9 100644
--- a/src/test/java/org/jabref/logic/util/io/BackupFileUtilTest.java
+++ b/src/test/java/org/jabref/logic/util/io/BackupFileUtilTest.java
@@ -5,8 +5,11 @@
 import java.nio.file.Path;
 
 import org.jabref.logic.util.BackupFileType;
+import org.jabref.logic.util.OS;
 
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
 import org.mockito.Answers;
 import org.mockito.MockedStatic;
 import org.mockito.Mockito;
@@ -16,6 +19,13 @@
 
 public class BackupFileUtilTest {
 
+    Path backupDir;
+
+    @BeforeEach
+    void setup(@TempDir Path tempDir) {
+        backupDir = tempDir.resolve("backup");
+    }
+
     @Test
     void uniqueFilePrefix() {
         // We cannot test for a concrete hash code, because hashing implementation differs from environment to environment
@@ -24,19 +34,21 @@ void uniqueFilePrefix() {
 
     @Test
     void getPathOfBackupFileAndCreateDirectoryReturnsAppDirectoryInCaseOfNoError() {
-        String start = BackupFileUtil.getAppDataBackupDir().toString();
-        String result = BackupFileUtil.getPathForNewBackupFileAndCreateDirectory(Path.of("test.bib"), BackupFileType.BACKUP).toString();
+        String start = OS.getNativeDesktop().getBackupDirectory().toString();
+        backupDir = OS.getNativeDesktop().getBackupDirectory();
+        String result = BackupFileUtil.getPathForNewBackupFileAndCreateDirectory(Path.of("test.bib"), BackupFileType.BACKUP, backupDir).toString();
         // We just check the prefix
         assertEquals(start, result.substring(0, start.length()));
     }
 
     @Test
     void getPathOfBackupFileAndCreateDirectoryReturnsSameDirectoryInCaseOfException() {
+        backupDir = OS.getNativeDesktop().getBackupDirectory();
         try (MockedStatic<Files> files = Mockito.mockStatic(Files.class, Answers.RETURNS_DEEP_STUBS)) {
-            files.when(() -> Files.createDirectories(BackupFileUtil.getAppDataBackupDir()))
+            files.when(() -> Files.createDirectories(OS.getNativeDesktop().getBackupDirectory()))
                  .thenThrow(new IOException());
             Path testPath = Path.of("tmp", "test.bib");
-            Path result = BackupFileUtil.getPathForNewBackupFileAndCreateDirectory(testPath, BackupFileType.BACKUP);
+            Path result = BackupFileUtil.getPathForNewBackupFileAndCreateDirectory(testPath, BackupFileType.BACKUP, backupDir);
             // 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/FileUtilTest.java b/src/test/java/org/jabref/logic/util/io/FileUtilTest.java
index 1123835ddc4..b5bf3b8d5b4 100644
--- a/src/test/java/org/jabref/logic/util/io/FileUtilTest.java
+++ b/src/test/java/org/jabref/logic/util/io/FileUtilTest.java
@@ -11,7 +11,6 @@
 import java.util.stream.Stream;
 
 import org.jabref.architecture.AllowedToUseLogic;
-import org.jabref.logic.layout.LayoutFormatterPreferences;
 import org.jabref.logic.util.OS;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
@@ -21,24 +20,17 @@
 import org.junit.jupiter.api.io.TempDir;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
-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;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.mock;
 
 @AllowedToUseLogic("uses OS from logic package")
 class FileUtilTest {
-    private static final Logger LOGGER = LoggerFactory.getLogger(FileUtilTest.class);
-
     private final Path nonExistingTestPath = Path.of("nonExistingTestPath");
     private Path existingTestFile;
     private Path otherExistingTestFile;
-    private LayoutFormatterPreferences layoutFormatterPreferences;
     private Path rootDir;
 
     @BeforeEach
@@ -54,7 +46,6 @@ void setUpViewModel(@TempDir Path temporaryFolder) throws IOException {
         otherExistingTestFile = subDir.resolve("otherExistingTestFile.txt");
         Files.createFile(otherExistingTestFile);
         Files.write(otherExistingTestFile, "otherExistingTestFile.txt".getBytes(StandardCharsets.UTF_8), StandardOpenOption.APPEND);
-        layoutFormatterPreferences = mock(LayoutFormatterPreferences.class, Answers.RETURNS_DEEP_STUBS);
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/xmp/XmpUtilWriterTest.java b/src/test/java/org/jabref/logic/xmp/XmpUtilWriterTest.java
index 20f3eb6906d..d13a76001dc 100644
--- a/src/test/java/org/jabref/logic/xmp/XmpUtilWriterTest.java
+++ b/src/test/java/org/jabref/logic/xmp/XmpUtilWriterTest.java
@@ -72,7 +72,7 @@ class XmpUtilWriterTest {
             .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_SOURCE), "JabRef")
             .withField(new UnknownField(DC_RIGHTS), "Right To X");
     private XmpPreferences xmpPreferences;
 
diff --git a/src/test/java/org/jabref/migrations/PreferencesMigrationsTest.java b/src/test/java/org/jabref/migrations/PreferencesMigrationsTest.java
index 03d6aa23fcf..7146764d8c1 100644
--- a/src/test/java/org/jabref/migrations/PreferencesMigrationsTest.java
+++ b/src/test/java/org/jabref/migrations/PreferencesMigrationsTest.java
@@ -7,9 +7,15 @@
 
 import org.jabref.preferences.JabRefPreferences;
 
+import com.github.javakeyring.Keyring;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.mockito.Answers;
+import org.mockito.MockedStatic;
+import org.mockito.Mockito;
 
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
@@ -27,7 +33,7 @@ class PreferencesMigrationsTest {
 
     @BeforeEach
     void setUp() {
-        prefs = mock(JabRefPreferences.class);
+        prefs = mock(JabRefPreferences.class, Answers.RETURNS_DEEP_STUBS);
         mainPrefsNode = mock(Preferences.class);
     }
 
@@ -69,123 +75,24 @@ void testArbitraryBibtexkeyPattern() {
     }
 
     @Test
-    void testPreviewStyle() {
-        String oldPreviewStyle = "<font face=\"sans-serif\">"
-                + "<b><i>\\bibtextype</i><a name=\"\\bibtexkey\">\\begin{bibtexkey} (\\bibtexkey)</a>"
-                + "\\end{bibtexkey}</b><br>__NEWLINE__"
-                + "\\begin{author} \\format[Authors(LastFirst,Initials,Semicolon,Amp),HTMLChars]{\\author}<BR>\\end{author}__NEWLINE__"
-                + "\\begin{editor} \\format[Authors(LastFirst,Initials,Semicolon,Amp),HTMLChars]{\\editor} "
-                + "<i>(\\format[IfPlural(Eds.,Ed.)]{\\editor})</i><BR>\\end{editor}__NEWLINE__"
-                + "\\begin{title} \\format[HTMLChars]{\\title} \\end{title}<BR>__NEWLINE__"
-                + "\\begin{chapter} \\format[HTMLChars]{\\chapter}<BR>\\end{chapter}__NEWLINE__"
-                + "\\begin{journal} <em>\\format[HTMLChars]{\\journal}, </em>\\end{journal}__NEWLINE__"
-                // Include the booktitle field for @inproceedings, @proceedings, etc.
-                + "\\begin{booktitle} <em>\\format[HTMLChars]{\\booktitle}, </em>\\end{booktitle}__NEWLINE__"
-                + "\\begin{school} <em>\\format[HTMLChars]{\\school}, </em>\\end{school}__NEWLINE__"
-                + "\\begin{institution} <em>\\format[HTMLChars]{\\institution}, </em>\\end{institution}__NEWLINE__"
-                + "\\begin{publisher} <em>\\format[HTMLChars]{\\publisher}, </em>\\end{publisher}__NEWLINE__"
-                + "\\begin{year}<b>\\year</b>\\end{year}\\begin{volume}<i>, \\volume</i>\\end{volume}"
-                + "\\begin{pages}, \\format[FormatPagesForHTML]{\\pages} \\end{pages}__NEWLINE__"
-                + "\\begin{abstract}<BR><BR><b>Abstract: </b> \\format[HTMLChars]{\\abstract} \\end{abstract}__NEWLINE__"
-                + "\\begin{review}<BR><BR><b>Review: </b> \\format[HTMLChars]{\\review} \\end{review}"
-                + "</dd>__NEWLINE__<p></p></font>";
-
-        String newPreviewStyle = "<font face=\"sans-serif\">"
-                + "<b><i>\\bibtextype</i><a name=\"\\citationkey\">\\begin{citationkey} (\\citationkey)</a>"
-                + "\\end{citationkey}</b><br>__NEWLINE__"
-                + "\\begin{author} \\format[Authors(LastFirst,Initials,Semicolon,Amp),HTMLChars]{\\author}<BR>\\end{author}__NEWLINE__"
-                + "\\begin{editor} \\format[Authors(LastFirst,Initials,Semicolon,Amp),HTMLChars]{\\editor} "
-                + "<i>(\\format[IfPlural(Eds.,Ed.)]{\\editor})</i><BR>\\end{editor}__NEWLINE__"
-                + "\\begin{title} \\format[HTMLChars]{\\title} \\end{title}<BR>__NEWLINE__"
-                + "\\begin{chapter} \\format[HTMLChars]{\\chapter}<BR>\\end{chapter}__NEWLINE__"
-                + "\\begin{journal} <em>\\format[HTMLChars]{\\journal}, </em>\\end{journal}__NEWLINE__"
-                // Include the booktitle field for @inproceedings, @proceedings, etc.
-                + "\\begin{booktitle} <em>\\format[HTMLChars]{\\booktitle}, </em>\\end{booktitle}__NEWLINE__"
-                + "\\begin{school} <em>\\format[HTMLChars]{\\school}, </em>\\end{school}__NEWLINE__"
-                + "\\begin{institution} <em>\\format[HTMLChars]{\\institution}, </em>\\end{institution}__NEWLINE__"
-                + "\\begin{publisher} <em>\\format[HTMLChars]{\\publisher}, </em>\\end{publisher}__NEWLINE__"
-                + "\\begin{year}<b>\\year</b>\\end{year}\\begin{volume}<i>, \\volume</i>\\end{volume}"
-                + "\\begin{pages}, \\format[FormatPagesForHTML]{\\pages} \\end{pages}__NEWLINE__"
-                + "\\begin{abstract}<BR><BR><b>Abstract: </b> \\format[HTMLChars]{\\abstract} \\end{abstract}__NEWLINE__"
-                + "\\begin{comment}<BR><BR><b>Comment: </b> \\format[HTMLChars]{\\comment} \\end{comment}"
-                + "</dd>__NEWLINE__<p></p></font>";
-
-        prefs.setPreviewStyle(oldPreviewStyle);
-        when(prefs.getPreviewStyle()).thenReturn(oldPreviewStyle);
-
-        PreferencesMigrations.upgradePreviewStyleFromReviewToComment(prefs);
-
-        verify(prefs).setPreviewStyle(newPreviewStyle);
-    }
+    void testPreviewStyleReviewToComment() {
+        String oldPreviewStyle = "<font face=\"sans-serif\">__NEWLINE__"
+                + "Customized preview style using reviews and comments:__NEWLINE__"
+                + "\\begin{review}<BR><BR><b>Review: </b> \\format[HTMLChars]{\\review} \\end{review}__NEWLINE__"
+                + "\\begin{comment} Something: \\format[HTMLChars]{\\comment} special \\end{comment}__NEWLINE__"
+                + "</font>__NEWLINE__";
 
-    @Test
-    void upgradePreviewStyleAllowMarkupDefault() {
-        String oldPreviewStyle = "<font face=\"sans-serif\">"
-                + "<b><i>\\bibtextype</i><a name=\"\\bibtexkey\">\\begin{bibtexkey} (\\bibtexkey)</a>"
-                + "\\end{bibtexkey}</b><br>__NEWLINE__"
-                + "\\begin{author} \\format[Authors(LastFirst,Initials,Semicolon,Amp),HTMLChars]{\\author}<BR>\\end{author}__NEWLINE__"
-                + "\\begin{editor} \\format[Authors(LastFirst,Initials,Semicolon,Amp),HTMLChars]{\\editor} "
-                + "<i>(\\format[IfPlural(Eds.,Ed.)]{\\editor})</i><BR>\\end{editor}__NEWLINE__"
-                + "\\begin{title} \\format[HTMLChars]{\\title} \\end{title}<BR>__NEWLINE__"
-                + "\\begin{chapter} \\format[HTMLChars]{\\chapter}<BR>\\end{chapter}__NEWLINE__"
-                + "\\begin{journal} <em>\\format[HTMLChars]{\\journal}, </em>\\end{journal}__NEWLINE__"
-                // Include the booktitle field for @inproceedings, @proceedings, etc.
-                + "\\begin{booktitle} <em>\\format[HTMLChars]{\\booktitle}, </em>\\end{booktitle}__NEWLINE__"
-                + "\\begin{school} <em>\\format[HTMLChars]{\\school}, </em>\\end{school}__NEWLINE__"
-                + "\\begin{institution} <em>\\format[HTMLChars]{\\institution}, </em>\\end{institution}__NEWLINE__"
-                + "\\begin{publisher} <em>\\format[HTMLChars]{\\publisher}, </em>\\end{publisher}__NEWLINE__"
-                + "\\begin{year}<b>\\year</b>\\end{year}\\begin{volume}<i>, \\volume</i>\\end{volume}"
-                + "\\begin{pages}, \\format[FormatPagesForHTML]{\\pages} \\end{pages}__NEWLINE__"
-                + "\\begin{abstract}<BR><BR><b>Abstract: </b> \\format[HTMLChars]{\\abstract} \\end{abstract}__NEWLINE__"
-                + "\\begin{comment}<BR><BR><b>Comment: </b> \\format[HTMLChars]{\\comment} \\end{comment}"
-                + "</dd>__NEWLINE__<p></p></font>";
-
-        String newPreviewStyle = "<font face=\"sans-serif\">"
-                + "<b><i>\\bibtextype</i><a name=\"\\citationkey\">\\begin{citationkey} (\\citationkey)</a>"
-                + "\\end{citationkey}</b><br>__NEWLINE__"
-                + "\\begin{author} \\format[Authors(LastFirst,Initials,Semicolon,Amp),HTMLChars]{\\author}<BR>\\end{author}__NEWLINE__"
-                + "\\begin{editor} \\format[Authors(LastFirst,Initials,Semicolon,Amp),HTMLChars]{\\editor} "
-                + "<i>(\\format[IfPlural(Eds.,Ed.)]{\\editor})</i><BR>\\end{editor}__NEWLINE__"
-                + "\\begin{title} \\format[HTMLChars]{\\title} \\end{title}<BR>__NEWLINE__"
-                + "\\begin{chapter} \\format[HTMLChars]{\\chapter}<BR>\\end{chapter}__NEWLINE__"
-                + "\\begin{journal} <em>\\format[HTMLChars]{\\journal}, </em>\\end{journal}__NEWLINE__"
-                // Include the booktitle field for @inproceedings, @proceedings, etc.
-                + "\\begin{booktitle} <em>\\format[HTMLChars]{\\booktitle}, </em>\\end{booktitle}__NEWLINE__"
-                + "\\begin{school} <em>\\format[HTMLChars]{\\school}, </em>\\end{school}__NEWLINE__"
-                + "\\begin{institution} <em>\\format[HTMLChars]{\\institution}, </em>\\end{institution}__NEWLINE__"
-                + "\\begin{publisher} <em>\\format[HTMLChars]{\\publisher}, </em>\\end{publisher}__NEWLINE__"
-                + "\\begin{year}<b>\\year</b>\\end{year}\\begin{volume}<i>, \\volume</i>\\end{volume}"
-                + "\\begin{pages}, \\format[FormatPagesForHTML]{\\pages} \\end{pages}__NEWLINE__"
-                + "\\begin{abstract}<BR><BR><b>Abstract: </b> \\format[HTMLChars]{\\abstract} \\end{abstract}__NEWLINE__"
-                + "\\begin{comment}<BR><BR><b>Comment: </b> \\format[Markdown,HTMLChars]{\\comment} \\end{comment}"
-                + "</dd>__NEWLINE__<p></p></font>";
-
-        prefs.setPreviewStyle(oldPreviewStyle);
-        when(prefs.getPreviewStyle()).thenReturn(oldPreviewStyle);
-
-        PreferencesMigrations.upgradePreviewStyleAllowMarkdown(prefs);
-
-        verify(prefs).setPreviewStyle(newPreviewStyle);
-    }
+        String newPreviewStyle = "<font face=\"sans-serif\">__NEWLINE__"
+                + "Customized preview style using reviews and comments:__NEWLINE__"
+                + "\\begin{comment}<BR><BR><b>Comment: </b> \\format[Markdown,HTMLChars]{\\comment} \\end{comment}__NEWLINE__"
+                + "\\begin{comment} Something: \\format[Markdown,HTMLChars]{\\comment} special \\end{comment}__NEWLINE__"
+                + "</font>__NEWLINE__";
 
-    @Test
-    void upgradePreviewStyleAllowMarkupCustomized() {
-        String oldPreviewStyle = "<font face=\"sans-serif\">"
-                + "My highly customized format only using comments:<br>"
-                + "\\begin{comment} Something: \\format[HTMLChars]{\\comment} special \\end{comment}"
-                + "</dd>__NEWLINE__<p></p></font>";
+        when(prefs.get(JabRefPreferences.PREVIEW_STYLE)).thenReturn(oldPreviewStyle);
 
-        String newPreviewStyle = "<font face=\"sans-serif\">"
-                + "My highly customized format only using comments:<br>"
-                + "\\begin{comment} Something: \\format[Markdown,HTMLChars]{\\comment} special \\end{comment}"
-                + "</dd>__NEWLINE__<p></p></font>";
+        PreferencesMigrations.upgradePreviewStyle(prefs);
 
-        prefs.setPreviewStyle(oldPreviewStyle);
-        when(prefs.getPreviewStyle()).thenReturn(oldPreviewStyle);
-
-        PreferencesMigrations.upgradePreviewStyleAllowMarkdown(prefs);
-
-        verify(prefs).setPreviewStyle(newPreviewStyle);
+        verify(prefs).put(JabRefPreferences.PREVIEW_STYLE, newPreviewStyle);
     }
 
     @Test
@@ -287,4 +194,26 @@ void testRestoreColumnVariablesForBackwardCompatibility() {
 
         verify(prefs).putInt(JabRefPreferences.MAIN_FONT_SIZE, 11);
     }
+
+    @Test
+    void testMoveApiKeysToKeyRing() throws Exception {
+        final String V5_9_FETCHER_CUSTOM_KEY_NAMES = "fetcherCustomKeyNames";
+        final String V5_9_FETCHER_CUSTOM_KEYS = "fetcherCustomKeys";
+        final Keyring keyring = mock(Keyring.class);
+
+        when(prefs.getStringList(V5_9_FETCHER_CUSTOM_KEY_NAMES)).thenReturn(List.of("FetcherA", "FetcherB", "FetcherC"));
+        when(prefs.getStringList(V5_9_FETCHER_CUSTOM_KEYS)).thenReturn(List.of("KeyA", "KeyB", "KeyC"));
+        when(prefs.getInternalPreferences().getUserAndHost()).thenReturn("user-host");
+
+        try (MockedStatic<Keyring> keyringFactory = Mockito.mockStatic(Keyring.class, Answers.RETURNS_DEEP_STUBS)) {
+            keyringFactory.when(Keyring::create).thenReturn(keyring);
+
+            PreferencesMigrations.moveApiKeysToKeyring(prefs);
+
+            verify(keyring).setPassword(eq("org.jabref.customapikeys"), eq("FetcherA"), any());
+            verify(keyring).setPassword(eq("org.jabref.customapikeys"), eq("FetcherB"), any());
+            verify(keyring).setPassword(eq("org.jabref.customapikeys"), eq("FetcherC"), any());
+            verify(prefs).deleteKey(V5_9_FETCHER_CUSTOM_KEYS);
+        }
+    }
 }
diff --git a/src/test/java/org/jabref/model/TreeNodeTest.java b/src/test/java/org/jabref/model/TreeNodeTest.java
index 4ae97c6c2ea..da2a00f89fc 100644
--- a/src/test/java/org/jabref/model/TreeNodeTest.java
+++ b/src/test/java/org/jabref/model/TreeNodeTest.java
@@ -28,7 +28,7 @@ public void setUp() {
 
     @Test
     public void constructorChecksThatClassImplementsCorrectInterface() {
-        assertThrows(UnsupportedOperationException.class, () -> new WrongTreeNodeImplementation());
+        assertThrows(UnsupportedOperationException.class, WrongTreeNodeImplementation::new);
     }
 
     @Test
@@ -85,7 +85,7 @@ public void getDescendantNonExistentReturnsEmpty() {
     @Test
     public void getPositionInParentForRootThrowsException() {
         TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
-        assertThrows(UnsupportedOperationException.class, () -> root.getPositionInParent());
+        assertThrows(UnsupportedOperationException.class, root::getPositionInParent);
     }
 
     @Test
@@ -620,7 +620,7 @@ public void findChildrenWithSameName() throws Exception {
         TreeNodeTestData.TreeNodeMock node = childB.addChild(new TreeNodeTestData.TreeNodeMock("A"));
         TreeNodeTestData.TreeNodeMock childA = root.addChild(new TreeNodeTestData.TreeNodeMock("A"));
 
-        assertEquals(Arrays.asList(root, node, childA), root.findChildrenSatisfying(treeNode -> treeNode.getName().equals("A")));
+        assertEquals(Arrays.asList(root, node, childA), root.findChildrenSatisfying(treeNode -> "A".equals(treeNode.getName())));
     }
 
     private static class WrongTreeNodeImplementation extends TreeNode<TreeNodeTestData.TreeNodeMock> {
diff --git a/src/test/java/org/jabref/model/database/BibDatabaseContextTest.java b/src/test/java/org/jabref/model/database/BibDatabaseContextTest.java
index 4f6a3335f48..55e4fd2a744 100644
--- a/src/test/java/org/jabref/model/database/BibDatabaseContextTest.java
+++ b/src/test/java/org/jabref/model/database/BibDatabaseContextTest.java
@@ -5,7 +5,8 @@
 import java.util.List;
 import java.util.Optional;
 
-import org.jabref.gui.desktop.JabRefDesktop;
+import org.jabref.architecture.AllowedToUseLogic;
+import org.jabref.logic.util.OS;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.types.IEEETranEntryType;
 import org.jabref.model.metadata.MetaData;
@@ -18,6 +19,7 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+@AllowedToUseLogic("Needs access to OS class")
 class BibDatabaseContextTest {
 
     private Path currentWorkingDir;
@@ -94,7 +96,7 @@ void getFileDirectoriesWithMetadata() {
     @Test
     void getUserFileDirectoryIfAllAreEmpty() {
         when(fileDirPrefs.shouldStoreFilesRelativeToBibFile()).thenReturn(false);
-        Path userDirJabRef = JabRefDesktop.getNativeDesktop().getDefaultFileChooserDirectory();
+        Path userDirJabRef = OS.getNativeDesktop().getDefaultFileChooserDirectory();
 
         when(fileDirPrefs.getMainFileDirectory()).thenReturn(Optional.of(userDirJabRef));
         BibDatabaseContext database = new BibDatabaseContext();
@@ -135,7 +137,7 @@ void testGetFullTextIndexPathWhenPathIsNull() {
         BibDatabaseContext bibDatabaseContext = new BibDatabaseContext();
         bibDatabaseContext.setDatabasePath(null);
 
-        Path expectedPath = BibDatabaseContext.getFulltextIndexBasePath().resolve("unsaved");
+        Path expectedPath = OS.getNativeDesktop().getFulltextIndexBaseDirectory().resolve("unsaved");
         Path actualPath = bibDatabaseContext.getFulltextIndexPath();
 
         assertEquals(expectedPath, actualPath);
@@ -148,7 +150,7 @@ void testGetFullTextIndexPathWhenPathIsNotNull() {
         BibDatabaseContext bibDatabaseContext = new BibDatabaseContext();
         bibDatabaseContext.setDatabasePath(existingPath);
 
-        Path expectedPath = BibDatabaseContext.getFulltextIndexBasePath().resolve(existingPath.hashCode() + "");
+        Path expectedPath = OS.getNativeDesktop().getFulltextIndexBaseDirectory().resolve(existingPath.hashCode() + "");
         Path actualPath = bibDatabaseContext.getFulltextIndexPath();
 
         assertEquals(expectedPath, actualPath);
diff --git a/src/test/java/org/jabref/model/database/BibDatabaseTest.java b/src/test/java/org/jabref/model/database/BibDatabaseTest.java
index 29bb885a9c3..28e9db06298 100644
--- a/src/test/java/org/jabref/model/database/BibDatabaseTest.java
+++ b/src/test/java/org/jabref/model/database/BibDatabaseTest.java
@@ -16,7 +16,6 @@
 import org.jabref.model.entry.field.UnknownField;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.model.event.EventListenerTest;
-import org.jabref.model.metadata.MetaData;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -37,25 +36,6 @@ void setUp() {
         database = new BibDatabase();
     }
 
-    @Test
-    void noEmptyEntry() {
-        BibEntry entry = new BibEntry();
-        entry.setField(StandardField.AUTHOR, "#AAA#");
-        database.insertEntry(entry);
-        BibDatabaseContext bibDatabaseContext = new BibDatabaseContext(database, new MetaData());
-        assertEquals(false, bibDatabaseContext.hasEmptyEntries());
-    }
-
-    @Test
-    void withEmptyEntry() {
-        BibEntry entry = new BibEntry();
-        database.insertEntry(entry);
-        BibDatabaseContext bibDatabaseContext = new BibDatabaseContext(database, new MetaData());
-        assertEquals(true, bibDatabaseContext.hasEmptyEntries());
-        bibDatabaseContext.getDatabase().removeEntries(Collections.singletonList(entry));
-        assertEquals(Collections.emptyList(), bibDatabaseContext.getEntries());
-    }
-
     @Test
     void insertEntryAddsEntryToEntriesList() {
         BibEntry entry = new BibEntry();
diff --git a/src/test/java/org/jabref/model/entry/BibEntryTest.java b/src/test/java/org/jabref/model/entry/BibEntryTest.java
index 784f5f03431..b913030cc73 100644
--- a/src/test/java/org/jabref/model/entry/BibEntryTest.java
+++ b/src/test/java/org/jabref/model/entry/BibEntryTest.java
@@ -9,6 +9,7 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
+import java.util.stream.Stream;
 
 import org.jabref.model.FieldChange;
 import org.jabref.model.database.BibDatabase;
@@ -25,6 +26,8 @@
 import com.google.common.collect.Sets;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.parallel.Execution;
+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.assertFalse;
@@ -809,4 +812,38 @@ void mergeEntriesWithOverlapAndPriorityGivenToOverlappingField() {
         copyEntry.mergeWith(otherEntry, otherPrioritizedFields);
         assertEquals(expected.getFields(), copyEntry.getFields());
     }
+
+    public static Stream<BibEntry> isEmpty() {
+        return Stream.of(
+                new BibEntry(),
+                new BibEntry(StandardEntryType.Book),
+                new BibEntry().withField(StandardField.OWNER, "test"),
+                new BibEntry().withField(StandardField.CREATIONDATE, "test"),
+                new BibEntry()
+                        .withField(StandardField.OWNER, "test")
+                        .withField(StandardField.CREATIONDATE, "test"),
+                // source: https://github.com/JabRef/jabref/issues/8645
+                new BibEntry()
+                        .withField(StandardField.OWNER, "mlep")
+                        .withField(StandardField.CREATIONDATE, "2022-04-05T10:41:54"));
+    }
+
+    @ParameterizedTest
+    @MethodSource
+    void isEmpty(BibEntry entry) {
+        assertTrue(entry.isEmpty());
+    }
+
+    public static Stream<BibEntry> isNotEmpty() {
+        return Stream.of(
+                new BibEntry().withCitationKey("test"),
+                new BibEntry().withField(StandardField.AUTHOR, "test")
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource
+    void isNotEmpty(BibEntry entry) {
+        assertFalse(entry.isEmpty());
+    }
 }
diff --git a/src/test/java/org/jabref/model/entry/BibEntryTypesManagerTest.java b/src/test/java/org/jabref/model/entry/BibEntryTypesManagerTest.java
index 408b27fcaee..0564e8b4bd7 100644
--- a/src/test/java/org/jabref/model/entry/BibEntryTypesManagerTest.java
+++ b/src/test/java/org/jabref/model/entry/BibEntryTypesManagerTest.java
@@ -150,7 +150,7 @@ 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 -> "article".equals(t.getType().getName())).collect(Collectors.toList()));
     }
 
     @ParameterizedTest
diff --git a/src/test/java/org/jabref/model/entry/DateTest.java b/src/test/java/org/jabref/model/entry/DateTest.java
index 8a30c53a94e..e67cad410d4 100644
--- a/src/test/java/org/jabref/model/entry/DateTest.java
+++ b/src/test/java/org/jabref/model/entry/DateTest.java
@@ -45,7 +45,8 @@ private static Stream<Arguments> validDates() {
                 Arguments.of(YearMonth.of(2020, Month.JANUARY), "Jan, 2020"),
                 Arguments.of(LocalDate.of(2015, Month.OCTOBER, 15), "2015.10.15"),
                 Arguments.of(LocalDate.of(-10000, Month.OCTOBER, 15), "-10000-10-15"),
-                Arguments.of(YearMonth.of(2015, Month.NOVEMBER), "2015/11")
+                Arguments.of(YearMonth.of(2015, Month.NOVEMBER), "2015/11"),
+                Arguments.of(LocalDate.of(2015, Month.JANUARY, 15), "15 January 2015")
                 );
     }
 
@@ -55,6 +56,23 @@ void parseByDatePattern(Temporal expected, String provided) {
         assertEquals(Optional.of(new Date(expected)), Date.parse(provided));
     }
 
+    private static Stream<Arguments> validDateRanges() {
+        return Stream.of(
+             Arguments.of(Year.of(2014), Year.of(2017), "2014/2017"),
+             Arguments.of(YearMonth.of(2015, Month.JANUARY), YearMonth.of(2015, Month.FEBRUARY), "2015-01/2015-02"),
+             Arguments.of(LocalDate.of(2015, Month.JANUARY, 15), LocalDate.of(2015, Month.FEBRUARY, 25), "2015-01-15/2015-02-25"),
+             Arguments.of(LocalDate.of(2015, Month.JANUARY, 15), LocalDate.of(2015, Month.FEBRUARY, 25), "2015-01-15 / 2015-02-25"),
+             Arguments.of(LocalDate.of(2015, Month.JANUARY, 15), LocalDate.of(2015, Month.FEBRUARY, 25), "15 January 2015/25 February 2015"),
+             Arguments.of(LocalDate.of(2015, Month.JANUARY, 15), LocalDate.of(2015, Month.FEBRUARY, 25), "15 January 2015 / 25 February 2015")
+         );
+    }
+
+    @ParameterizedTest
+    @MethodSource("validDateRanges")
+    void parseByDatePatternRange(Temporal expectedRangeStart, Temporal expectedRangeEnd, String provided) {
+        assertEquals(Optional.of(new Date(expectedRangeStart, expectedRangeEnd)), Date.parse(provided));
+    }
+
     private static Stream<Arguments> invalidCornerCases() {
         return Stream.of(
                 Arguments.of("", "input value not empty"),
@@ -71,12 +89,6 @@ void nonExistentDates(String invalidDate, String errorMessage) {
         assertEquals(Optional.empty(), Date.parse(invalidDate), errorMessage);
     }
 
-    @Test
-    void parseYearRange() {
-        Date expectedDataRange = new Date(Year.of(2014), Year.of(2017));
-        assertEquals(Optional.of(expectedDataRange), Date.parse("2014/2017"));
-    }
-
     @Test
     void parseZonedTime() {
         Optional<Date> expected = Optional.of(
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 ddb60cb61a7..f218e3f82d7 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,13 @@
 package org.jabref.model.entry.field;
 
+import java.util.stream.Stream;
+
 import org.jabref.model.entry.types.BiblatexApaEntryType;
 
 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;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
@@ -10,12 +15,28 @@
 class FieldFactoryTest {
     @Test
     void testOrFieldsTwoTerms() {
-        assertEquals("aaa/bbb", FieldFactory.serializeOrFields(new UnknownField("aaa"), new UnknownField("bbb")));
+        assertEquals("Aaa/Bbb", FieldFactory.serializeOrFields(new UnknownField("aaa"), new UnknownField("bbb")));
     }
 
     @Test
     void testOrFieldsThreeTerms() {
-        assertEquals("aaa/bbb/ccc", FieldFactory.serializeOrFields(new UnknownField("aaa"), new UnknownField("bbb"), new UnknownField("ccc")));
+        assertEquals("Aaa/Bbb/Ccc", FieldFactory.serializeOrFields(new UnknownField("aaa"), new UnknownField("bbb"), new UnknownField("ccc")));
+    }
+
+    private static Stream<Arguments> fieldsWithoutFieldProperties() {
+        return Stream.of(
+                // comment fields
+                Arguments.of(new UserSpecificCommentField("user1"), "comment-user1"),
+                Arguments.of(new UserSpecificCommentField("other-user-id"), "comment-other-user-id"),
+                // unknown field
+                Arguments.of(new UnknownField("cased", "cAsEd"), "cAsEd")
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource
+    void fieldsWithoutFieldProperties(Field expected, String name) {
+        assertEquals(expected, FieldFactory.parseField(name));
     }
 
     @Test
diff --git a/src/test/java/org/jabref/model/entry/field/UnknownFieldTest.java b/src/test/java/org/jabref/model/entry/field/UnknownFieldTest.java
index 63afeef3e41..1b6ca0212c0 100644
--- a/src/test/java/org/jabref/model/entry/field/UnknownFieldTest.java
+++ b/src/test/java/org/jabref/model/entry/field/UnknownFieldTest.java
@@ -14,4 +14,10 @@ void fieldsConsideredEqualIfSameName() {
     void fieldsConsideredEqualINameDifferByCapitalization() {
         assertEquals(new UnknownField("tiTle"), new UnknownField("Title"));
     }
+
+    @Test
+    void displayNameConstructor() {
+        UnknownField cAsED = UnknownField.fromDisplayName("cAsEd");
+        assertEquals(new UnknownField("cased", "cAsEd"), cAsED);
+    }
 }
diff --git a/src/test/java/org/jabref/model/entry/identifier/DOITest.java b/src/test/java/org/jabref/model/entry/identifier/DOITest.java
index b08e8470d50..7f3f6646829 100644
--- a/src/test/java/org/jabref/model/entry/identifier/DOITest.java
+++ b/src/test/java/org/jabref/model/entry/identifier/DOITest.java
@@ -200,7 +200,9 @@ private static Stream<Arguments> testData() {
                 Arguments.of("10/ab123", DOI.findInText("other stuff doi.org/ab123 end").get().getDOI()),
                 Arguments.of("10/76543", DOI.findInText("other stuff www.doi.org/76543 end").get().getDOI()),
                 Arguments.of("10/abcde", DOI.findInText("other stuff https://www.doi.org/abcde end").get().getDOI()),
-                Arguments.of("10/abcde", DOI.findInText("other stuff https://doi.org/abcde end").get().getDOI())
+                Arguments.of("10/abcde", DOI.findInText("other stuff https://doi.org/abcde end").get().getDOI()),
+                Arguments.of("10.5220/0010404301780189", DOI.findInText("https://www.scitepress.org/Link.aspx?doi=10.5220/0010404301780189").get().getDOI()),
+                Arguments.of("10.5220/0010404301780189", DOI.findInText("10.5220/0010404301780189").get().getDOI())
         );
     }
 
diff --git a/src/test/java/org/jabref/model/strings/StringUtilTest.java b/src/test/java/org/jabref/model/strings/StringUtilTest.java
index 4cda4ec874c..a1ba47b247a 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 <= 765, "StringUtil increased in size to " + lineCount + ". "
+        assertTrue(lineCount <= 774, "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.");
     }
diff --git a/src/test/java/org/jabref/testutils/interactive/styletester/StyleTester.fxml b/src/test/java/org/jabref/testutils/interactive/styletester/StyleTester.fxml
index 2240e83d8bb..69b59a87a7e 100644
--- a/src/test/java/org/jabref/testutils/interactive/styletester/StyleTester.fxml
+++ b/src/test/java/org/jabref/testutils/interactive/styletester/StyleTester.fxml
@@ -6,6 +6,7 @@
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.CheckBox?>
 <?import javafx.scene.control.ChoiceBox?>
+<?import javafx.scene.control.ColorPicker?>
 <?import javafx.scene.control.ComboBox?>
 <?import javafx.scene.control.Hyperlink?>
 <?import javafx.scene.control.Label?>
@@ -35,7 +36,6 @@
 <?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.layout.VBox?>
 <?import org.jabref.gui.icon.JabRefIconView?>
-<?import com.jfoenix.controls.JFXColorPicker?>
 <AnchorPane prefHeight="600.0" prefWidth="900.0" xmlns="http://javafx.com/javafx/8.0.121"
             xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.testutils.interactive.styletester.StyleTesterView">
     <TabPane AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0"
@@ -383,7 +383,7 @@
                                     <Hyperlink maxWidth="1.7976931348623157E308" text="Hyperlink (Visited)"
                                                visited="true"/>
                                     <Separator prefWidth="200.0"/>
-                                    <JFXColorPicker/>
+                                    <ColorPicker/>
                                 </children>
                             </VBox>
                             <Separator orientation="VERTICAL" prefHeight="200.0"/>
diff --git a/src/test/java/org/jabref/testutils/interactive/styletester/StyleTesterMain.java b/src/test/java/org/jabref/testutils/interactive/styletester/StyleTesterMain.java
index 9941472abcb..bc6ebceb2de 100644
--- a/src/test/java/org/jabref/testutils/interactive/styletester/StyleTesterMain.java
+++ b/src/test/java/org/jabref/testutils/interactive/styletester/StyleTesterMain.java
@@ -25,7 +25,7 @@ public void start(Stage stage) throws JabRefException {
         DefaultFileUpdateMonitor fileUpdateMonitor = new DefaultFileUpdateMonitor();
         JabRefExecutorService.INSTANCE.executeInterruptableTask(fileUpdateMonitor, "FileUpdateMonitor");
         ThemeManager themeManager = new ThemeManager(
-                JabRefPreferences.getInstance().getAppearancePreferences(),
+                JabRefPreferences.getInstance().getWorkspacePreferences(),
                 fileUpdateMonitor,
                 Runnable::run);
 
diff --git a/src/test/resources/junit-platform.properties b/src/test/resources/junit-platform.properties
index 4f6f62fc89c..22c2e807a66 100644
--- a/src/test/resources/junit-platform.properties
+++ b/src/test/resources/junit-platform.properties
@@ -1,4 +1,5 @@
 # See https://www.baeldung.com/junit-5-parallel-tests for details
 junit.jupiter.execution.parallel.enabled = true
 
+# Default is "same_thread" - https://junit.org/junit5/docs/snapshot/user-guide/#writing-tests-parallel-execution-config-properties
 # junit.jupiter.execution.parallel.mode.default = concurrent
diff --git a/src/test/resources/org/jabref/logic/autosaveandbackup/changes.bib b/src/test/resources/org/jabref/gui/autosaveandbackup/changes.bib
similarity index 100%
rename from src/test/resources/org/jabref/logic/autosaveandbackup/changes.bib
rename to src/test/resources/org/jabref/gui/autosaveandbackup/changes.bib
diff --git a/src/test/resources/org/jabref/logic/autosaveandbackup/changes.bib.bak b/src/test/resources/org/jabref/gui/autosaveandbackup/changes.bib.bak
similarity index 100%
rename from src/test/resources/org/jabref/logic/autosaveandbackup/changes.bib.bak
rename to src/test/resources/org/jabref/gui/autosaveandbackup/changes.bib.bak
diff --git a/src/test/resources/org/jabref/logic/autosaveandbackup/no-autosave.bib b/src/test/resources/org/jabref/gui/autosaveandbackup/no-autosave.bib
similarity index 100%
rename from src/test/resources/org/jabref/logic/autosaveandbackup/no-autosave.bib
rename to src/test/resources/org/jabref/gui/autosaveandbackup/no-autosave.bib
diff --git a/src/test/resources/org/jabref/logic/autosaveandbackup/no-changes.bib b/src/test/resources/org/jabref/gui/autosaveandbackup/no-changes.bib
similarity index 100%
rename from src/test/resources/org/jabref/logic/autosaveandbackup/no-changes.bib
rename to src/test/resources/org/jabref/gui/autosaveandbackup/no-changes.bib
diff --git a/src/test/resources/org/jabref/logic/autosaveandbackup/no-changes.bib.bak b/src/test/resources/org/jabref/gui/autosaveandbackup/no-changes.bib.bak
similarity index 100%
rename from src/test/resources/org/jabref/logic/autosaveandbackup/no-changes.bib.bak
rename to src/test/resources/org/jabref/gui/autosaveandbackup/no-changes.bib.bak
diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/EndnoteXmlImporterTest_EmptyKeywordStyle.bib b/src/test/resources/org/jabref/logic/importer/fileformat/EndnoteXmlImporterTest_EmptyKeywordStyle.bib
index 480febafa60..8f3f4d58339 100644
--- a/src/test/resources/org/jabref/logic/importer/fileformat/EndnoteXmlImporterTest_EmptyKeywordStyle.bib
+++ b/src/test/resources/org/jabref/logic/importer/fileformat/EndnoteXmlImporterTest_EmptyKeywordStyle.bib
@@ -12,6 +12,6 @@ @Article{
   volume   = {30},
   isbn     = {1933-6586},
   journal  = {Med Acupunct},
-  keywords = {anxiety; craving; dependency; destress; health restoration; },
+  keywords = {anxiety; craving; dependency; destress; health restoration},
   year     = {2018},
 }
diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MarcXMLParserTestInProceedings.bib b/src/test/resources/org/jabref/logic/importer/fileformat/MarcXMLParserTestInProceedings.bib
new file mode 100644
index 00000000000..a36825d4bc3
--- /dev/null
+++ b/src/test/resources/org/jabref/logic/importer/fileformat/MarcXMLParserTestInProceedings.bib
@@ -0,0 +1,13 @@
+@Proceedings{,
+  title      = {VI International Congress on Experimental Mechanics},
+  year       = {1988},
+  address    = {London},
+  editor     = {Adams, Frank},
+  isbn       = {1851662529},
+  publisher  = {{Elsevier [u.a.]}},
+  eventtitle = {International Congress on Experimental Mechanics},
+  subtitle   = {[proceedings of the VI International Congress on Experimental Mechanics ... held on June 5 - 10, 1988 in Portland, Oregon, U.S.A.]},
+  titleaddon = {ed. by Frank Adams ...},
+}
+
+@Comment{jabref-meta: databaseType:bibtex;}
diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MarcXMLParserTestInProceedings.xml b/src/test/resources/org/jabref/logic/importer/fileformat/MarcXMLParserTestInProceedings.xml
new file mode 100644
index 00000000000..617c406c36f
--- /dev/null
+++ b/src/test/resources/org/jabref/logic/importer/fileformat/MarcXMLParserTestInProceedings.xml
@@ -0,0 +1,88 @@
+<zs:searchRetrieveResponse>
+    <zs:version>1.1</zs:version>
+    <zs:numberOfRecords>1</zs:numberOfRecords>
+    <zs:records>
+        <zs:record>
+            <zs:recordSchema>info:srw/schema/1/marcxml-v1.1</zs:recordSchema>
+            <zs:recordPacking>xml</zs:recordPacking>
+            <zs:recordData>
+                <record>
+                    <leader>01080nam a2200265 ca4500</leader>
+                    <controlfield tag="001">BV049029404</controlfield>
+                    <controlfield tag="003">DE-604</controlfield>
+                    <controlfield tag="005">00000000000000.0</controlfield>
+                    <controlfield tag="007">t</controlfield>
+                    <controlfield tag="008">230630m1988uuuu |||| 10||| eng d</controlfield>
+                    <datafield tag="020" ind1=" " ind2=" ">
+                        <subfield code="a">1851662529</subfield>
+                        <subfield code="9">1-85166-252-9</subfield>
+                    </datafield>
+                    <datafield tag="020" ind1=" " ind2=" ">
+                        <subfield code="a">0912053208</subfield>
+                        <subfield code="9">0-912053-20-8</subfield>
+                    </datafield>
+                    <datafield tag="040" ind1=" " ind2=" ">
+                        <subfield code="a">DE-604</subfield>
+                        <subfield code="b">ger</subfield>
+                    </datafield>
+                    <datafield tag="111" ind1="2" ind2=" ">
+                        <subfield code="a">International Congress on Experimental Mechanics</subfield>
+                        <subfield code="n">6</subfield>
+                        <subfield code="d">1988</subfield>
+                        <subfield code="c">Portland, Or.</subfield>
+                        <subfield code="j">Verfasser</subfield>
+                        <subfield code="0">(DE-588)5022525-X</subfield>
+                        <subfield code="4">aut</subfield>
+                    </datafield>
+                    <datafield tag="245" ind1="1" ind2="0">
+                        <subfield code="a">VI International Congress on Experimental Mechanics</subfield>
+                        <subfield code="b">[proceedings of the VI International Congress on Experimental Mechanics ... held on June 5 - 10, 1988 in Portland, Oregon, U.S.A.]</subfield>
+                        <subfield code="c">ed. by Frank Adams ...</subfield>
+                    </datafield>
+                    <datafield tag="246" ind1="1" ind2="3">
+                        <subfield code="a">Sixth International Congress on Experimental Mechanics</subfield>
+                    </datafield>
+                    <datafield tag="264" ind1=" " ind2="1">
+                        <subfield code="a">London</subfield>
+                        <subfield code="b">Elsevier [u.a.]</subfield>
+                        <subfield code="c">1988</subfield>
+                    </datafield>
+                    <datafield tag="655" ind1=" " ind2="7">
+                        <subfield code="0">(DE-588)1071861417</subfield>
+                        <subfield code="a">Konferenzschrift</subfield>
+                        <subfield code="2">gnd-content</subfield>
+                    </datafield>
+                    <datafield tag="700" ind1="1" ind2=" ">
+                        <subfield code="a">Adams, Frank</subfield>
+                        <subfield code="4">edt</subfield>
+                    </datafield>
+                    <datafield tag="710" ind1="2" ind2=" ">
+                        <subfield code="a">Society for Experimental Mechanics (USA)</subfield>
+                        <subfield code="e">Sonstige</subfield>
+                        <subfield code="0">(DE-588)308357-3</subfield>
+                        <subfield code="4">oth</subfield>
+                    </datafield>
+                    <datafield tag="035" ind1=" " ind2=" ">
+                        <subfield code="a">(DE-599)GBV037240986</subfield>
+                    </datafield>
+                    <datafield tag="041" ind1="0" ind2=" ">
+                        <subfield code="a">eng</subfield>
+                    </datafield>
+                    <datafield tag="336" ind1=" " ind2=" ">
+                        <subfield code="b">txt</subfield>
+                        <subfield code="2">rdacontent</subfield>
+                    </datafield>
+                    <datafield tag="337" ind1=" " ind2=" ">
+                        <subfield code="b">n</subfield>
+                        <subfield code="2">rdamedia</subfield>
+                    </datafield>
+                    <datafield tag="338" ind1=" " ind2=" ">
+                        <subfield code="b">nc</subfield>
+                        <subfield code="2">rdacarrier</subfield>
+                    </datafield>
+                </record>
+            </zs:recordData>
+            <zs:recordPosition>1</zs:recordPosition>
+        </zs:record>
+    </zs:records>
+</zs:searchRetrieveResponse>
diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MarcXmlParserTestArticle.bib b/src/test/resources/org/jabref/logic/importer/fileformat/MarcXmlParserTestArticle.bib
new file mode 100644
index 00000000000..7c301eb9487
--- /dev/null
+++ b/src/test/resources/org/jabref/logic/importer/fileformat/MarcXmlParserTestArticle.bib
@@ -0,0 +1,9 @@
+@Article{,
+  author     = {Bello, Emmanuel G.},
+  title      = {Article 22 of the African Charter on Human and Peoples' Rights},
+  year       = {1992},
+  pages      = {447-473},
+  titleaddon = {Emmanuel G. Bello},
+}
+
+@Comment{jabref-meta: databaseType:bibtex;}
diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MarcXmlParserTestArticle.xml b/src/test/resources/org/jabref/logic/importer/fileformat/MarcXmlParserTestArticle.xml
new file mode 100644
index 00000000000..1882401aac5
--- /dev/null
+++ b/src/test/resources/org/jabref/logic/importer/fileformat/MarcXmlParserTestArticle.xml
@@ -0,0 +1,76 @@
+<zs:searchRetrieveResponse>
+    <zs:version>1.1</zs:version>
+    <zs:numberOfRecords>1</zs:numberOfRecords>
+    <zs:records>
+        <zs:record>
+            <zs:recordSchema>info:srw/schema/1/marcxml-v1.1</zs:recordSchema>
+            <zs:recordPacking>xml</zs:recordPacking>
+            <zs:recordData>
+                <record>
+                    <leader>00864naa a2200253 c 4500</leader>
+                    <controlfield tag="001">BV048976418</controlfield>
+                    <controlfield tag="003">DE-604</controlfield>
+                    <controlfield tag="005">00000000000000.0</controlfield>
+                    <controlfield tag="007">t</controlfield>
+                    <controlfield tag="008">230526s1992 |||| 00||| eng d</controlfield>
+                    <datafield tag="040" ind1=" " ind2=" ">
+                        <subfield code="a">DE-604</subfield>
+                        <subfield code="b">ger</subfield>
+                        <subfield code="e">rda</subfield>
+                    </datafield>
+                    <datafield tag="100" ind1="1" ind2=" ">
+                        <subfield code="a">Bello, Emmanuel G.</subfield>
+                        <subfield code="d">1939-</subfield>
+                        <subfield code="e">Verfasser</subfield>
+                        <subfield code="0">(DE-588)136157114</subfield>
+                        <subfield code="4">aut</subfield>
+                    </datafield>
+                    <datafield tag="245" ind1="1" ind2="0">
+                        <subfield code="a">Article 22 of the African Charter on Human and Peoples' Rights</subfield>
+                        <subfield code="c">Emmanuel G. Bello</subfield>
+                    </datafield>
+                    <datafield tag="264" ind1=" " ind2="1">
+                        <subfield code="c">1992</subfield>
+                    </datafield>
+                    <datafield tag="035" ind1=" " ind2=" ">
+                        <subfield code="a">(OCoLC)1381297713</subfield>
+                    </datafield>
+                    <datafield tag="035" ind1=" " ind2=" ">
+                        <subfield code="a">(DE-599)BVBBV048976418</subfield>
+                    </datafield>
+                    <datafield tag="041" ind1="0" ind2=" ">
+                        <subfield code="a">eng</subfield>
+                    </datafield>
+                    <datafield tag="049" ind1=" " ind2=" ">
+                        <subfield code="a">DE-521</subfield>
+                    </datafield>
+                    <datafield tag="336" ind1=" " ind2=" ">
+                        <subfield code="b">txt</subfield>
+                        <subfield code="2">rdacontent</subfield>
+                    </datafield>
+                    <datafield tag="337" ind1=" " ind2=" ">
+                        <subfield code="b">n</subfield>
+                        <subfield code="2">rdamedia</subfield>
+                    </datafield>
+                    <datafield tag="338" ind1=" " ind2=" ">
+                        <subfield code="b">nc</subfield>
+                        <subfield code="2">rdacarrier</subfield>
+                    </datafield>
+                    <datafield tag="773" ind1="1" ind2="8">
+                        <subfield code="g">pages:447-473</subfield>
+                    </datafield>
+                    <datafield tag="773" ind1="0" ind2="8">
+                        <subfield code="t">Essays in honour of Judge Taslim Olawale Elias; 1. Contemporary international law and human rights / edited by Emmanuel G. Bello ...</subfield>
+                        <subfield code="d">Dordrecht [u.a.], 1992</subfield>
+                        <subfield code="g">Seite 447-473</subfield>
+                        <subfield code="w">(DE-604)BV013223576</subfield>
+                    </datafield>
+                    <datafield tag="941" ind1=" " ind2=" ">
+                        <subfield code="s">447-473</subfield>
+                    </datafield>
+                </record>
+            </zs:recordData>
+            <zs:recordPosition>1</zs:recordPosition>
+        </zs:record>
+    </zs:records>
+</zs:searchRetrieveResponse
diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MarcXmlParserTestBook.bib b/src/test/resources/org/jabref/logic/importer/fileformat/MarcXmlParserTestBook.bib
new file mode 100644
index 00000000000..9a668dd205a
--- /dev/null
+++ b/src/test/resources/org/jabref/logic/importer/fileformat/MarcXmlParserTestBook.bib
@@ -0,0 +1,14 @@
+@Misc{,
+  author    = {Caraballo, Margarita J.},
+  title     = {Marketing Automation with Mailchimp},
+  year      = {2023},
+  address   = {Birmingham},
+  edition   = {1st ed},
+  file      = {ParsedFileField{description='', link='https://ebookcentral.proquest.com/lib/hwr/detail.action?docID=30553734', fileType='PDF'}},
+  isbn      = {9781800567566},
+  pagetotal = {304},
+  publisher = {{Packt Publishing, Limited}},
+  subtitle  = {Expert Tips, Techniques, and Best Practices for Scaling Marketing Strategies and ROI for Your Business},
+}
+
+@Comment{jabref-meta: databaseType:bibtex;}
diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MarcXmlParserTestBook.xml b/src/test/resources/org/jabref/logic/importer/fileformat/MarcXmlParserTestBook.xml
new file mode 100644
index 00000000000..3b4941a87fd
--- /dev/null
+++ b/src/test/resources/org/jabref/logic/importer/fileformat/MarcXmlParserTestBook.xml
@@ -0,0 +1,122 @@
+<zs:searchRetrieveResponse>
+    <zs:version>1.1</zs:version>
+    <zs:numberOfRecords>1</zs:numberOfRecords>
+    <zs:records>
+        <zs:record>
+            <zs:recordSchema>info:srw/schema/1/marcxml-v1.1</zs:recordSchema>
+            <zs:recordPacking>xml</zs:recordPacking>
+            <zs:recordData>
+                <record>
+                    <leader>07543nmm a2200397zc 4500</leader>
+                    <controlfield tag="001">BV049020376</controlfield>
+                    <controlfield tag="003">DE-604</controlfield>
+                    <controlfield tag="005">00000000000000.0</controlfield>
+                    <controlfield tag="007">cr|uuu---uuuuu</controlfield>
+                    <controlfield tag="008">230626s2023 |||| o||u| ||||||eng d</controlfield>
+                    <datafield tag="020" ind1=" " ind2=" ">
+                        <subfield code="a">9781800567566</subfield>
+                        <subfield code="9">978-1-80056-756-6</subfield>
+                    </datafield>
+                    <datafield tag="040" ind1=" " ind2=" ">
+                        <subfield code="a">DE-604</subfield>
+                        <subfield code="b">ger</subfield>
+                        <subfield code="e">rda</subfield>
+                    </datafield>
+                    <datafield tag="100" ind1="1" ind2=" ">
+                        <subfield code="a">Caraballo, Margarita J.</subfield>
+                        <subfield code="e">Verfasser</subfield>
+                        <subfield code="4">aut</subfield>
+                    </datafield>
+                    <datafield tag="245" ind1="1" ind2="0">
+                        <subfield code="a">Marketing Automation with Mailchimp</subfield>
+                        <subfield code="b">Expert Tips, Techniques, and Best Practices for Scaling Marketing Strategies and ROI for Your Business</subfield>
+                    </datafield>
+                    <datafield tag="250" ind1=" " ind2=" ">
+                        <subfield code="a">1st ed</subfield>
+                    </datafield>
+                    <datafield tag="264" ind1=" " ind2="1">
+                        <subfield code="a">Birmingham</subfield>
+                        <subfield code="b">Packt Publishing, Limited</subfield>
+                        <subfield code="c">2023</subfield>
+                    </datafield>
+                    <datafield tag="264" ind1=" " ind2="4">
+                        <subfield code="c">©2023</subfield>
+                    </datafield>
+                    <datafield tag="300" ind1=" " ind2=" ">
+                        <subfield code="a">1 Online-Ressource (304 Seiten)</subfield>
+                    </datafield>
+                    <datafield tag="505" ind1="8" ind2=" ">
+                        <subfield code="a">Cover -- Title Page -- Copyright and Credits -- Contributors -- About the reviewer -- Table of Contents -- Preface -- Part 1:Introduction to Mailchimp -- Chapter 1: Welcome to Marketing with Mailchimp -- A glance at Mailchimp's journey -- Understanding and using online marketing with Mailchimp -- Mailchimp-specific terms -- Channels -- Campaigns -- Classic Automations -- Customer Journey Builder -- Common utilizations -- Digital content creators -- Brick and mortar -- Service providers -- Mensa marketers -- E-commerce marketers -- Creating an account -- Summary -- Further reading -- Part 2:Getting Set Up -- Chapter 2: Basics of Account Management and Audiences -- Account management and setting an industry -- Details -- Help us improve your stats -- Default Email Builder -- Email from Mailchimp -- Manage automatic replies -- Setting up an audience -- Why is it important to know about different contact statuses? -- Information you need to make your first list -- The purpose behind using a central versus various list -- Summary -- Further reading -- Chapter 3: Importing and Combining Audiences -- Merge Tags -- Put this tag in your content -- Default merge tag value -- How to import a list -- Combining audiences -- How to combine audiences -- The Combine Audiences tool -- Exporting and importing -- Summary -- Further reading -- Chapter 4: Understanding the Difference between Groups, Tags, and Segments -- How targeting can lead to higher engagement -- What are groups and tags? -- Groups -- Tags -- Importing to groups or tags -- Segmenting tools -- Basics of segmenting logic -- Summary -- Further reading -- Chapter 5: Strategies and Tools for Managing Inactive Contacts -- What are inactive contacts? -- How to develop our own definition -- To unsubscribe or archive? That is the question -- When do I delete? -- Summary -- Further reading</subfield>
+                    </datafield>
+                    <datafield tag="505" ind1="8" ind2=" ">
+                        <subfield code="a">Part 3:Basic Channels -- Chapter 6: Setting Up and Customizing Various Form Types -- Why are forms necessary? -- Hosted forms -- Navigating to the hosted form builder -- Categories of hosted forms you can edit -- Creating a form on a landing page -- Embedded and pop-up forms -- Embedded forms -- Pop-up forms -- Summary -- Further reading -- Chapter 7: Establishing Your Brand with the Content Studio -- What is the Content Studio? -- Individual features and channels nested under Content Studio -- Creative Assistant -- My Files -- Products -- Giphy -- Instagram -- My Logo -- Summary -- Further reading -- Chapter 8: Outreach Marketing with Templates and Campaigns -- Templates and how to start them -- What is a Template? -- Template Editor -- Choosing a template -- Using the Campaign Editor -- Campaign scheduling -- Types of emails to pair with targeted segments -- Summary -- Further reading -- Chapter 9: Setting Up Your Marketing Presence with Websites -- What is a domain? -- An additional entry point and sign-up portal -- Personalizing your domain settings -- Improving deliverability -- Having an authentic appearance -- Where do I get one and what if I have one? -- Making a website -- Editing settings -- Summary -- Further reading -- Part 4:Refine and Automate -- Chapter 10: Understanding Reports and Analytics -- Technical requirements -- The types of information that are accessible in Mailchimp's reporting -- Why opens and clicks? -- General stats overview -- Click performance interface -- Predicted Demographics interface -- How you can use and interpret these reports -- Expanded/advanced reporting features -- Comparative Reports -- Summary -- Further reading -- Chapter 11: Implementing A/B and Multivariate Testing -- Why experiment with engagement? -- Multivariate options and what elements you can experiment with</subfield>
+                    </datafield>
+                    <datafield tag="505" ind1="8" ind2=" ">
+                        <subfield code="a">How do you take information from the results to better understand your audience? -- Summary -- Further reading -- Chapter 12: Strategies for Automating Using the Customer Journey Builder -- Technical requirements -- The basics of automation and events -- Types of automation, journeys, and their logic -- Common use cases and recipes -- Audience/contact activity -- E-commerce activity -- Date-based events and data -- Marketing channel activity -- Integration and API events -- Setting up a Classic Automation or Customer Journey Builder -- Summary -- Further reading -- Chapter 13: Setting Up a Mailchimp E-Commerce Store -- Technical requirements -- What is a commerce feature? -- Setting up a Mailchimp store -- The expansion of a contact dataset to include commerce/purchasing data -- Setting up automations specific to e-commerce -- Summary -- Further reading -- Part 5:Get Smarter and Connect -- Chapter 14: E-Commerce Integrations -- Technical requirements -- Featured commerce integrations -- Movement of information between these platforms -- How to expand your marketing efforts with your commerce data -- Summary -- Further reading -- Chapter 15: Form and Survey Integrations -- Technical requirements -- Using form and survey integrations to build your audience -- How to find the right integration and connect it -- Summary -- Further reading -- Chapter 16: CRM and Connectivity Integrations -- Technical requirements -- Popular CRM and connectivity integrations and why to connect them -- What the various integration paths are and how to find and use them -- Browsing for integrations -- Sample integration walk-throughs -- Zapier integration -- Understanding where data is present when syncing is initiated and associated advanced features -- Summary -- Further reading -- Chapter 17: Use Cases and Real-World Examples -- Starting a business or online presence</subfield>
+                    </datafield>
+                    <datafield tag="505" ind1="8" ind2=" ">
+                        <subfield code="a">
+                            Type of business -- Background of the business -- Next goals and vision for growth -- Ideal Mailchimp usage for this business -- From bricks and mortar to a digital presence -- Type of business -- Background of the business -- Next goals and vision for growth -- Ideal Mailchimp usage for this business -- Service-based business model -- Type of business -- Background of the business -- Next goals and vision for growth -- Ideal Mailchimp usage for this business -- Summary -- Index -- Other Books You May Enjoy
+                        </subfield>
+                    </datafield>
+                    <datafield tag="776" ind1="0" ind2="8">
+                        <subfield code="i">Erscheint auch als</subfield>
+                        <subfield code="n">Druck-Ausgabe</subfield>
+                        <subfield code="a">Caraballo, Margarita J.</subfield>
+                        <subfield code="t">Marketing Automation with Mailchimp</subfield>
+                        <subfield code="d">Birmingham : Packt Publishing, Limited,c2023</subfield>
+                        <subfield code="z">9781800561731</subfield>
+                    </datafield>
+                    <datafield tag="912" ind1=" " ind2=" ">
+                        <subfield code="a">ZDB-30-PQE</subfield>
+                    </datafield>
+                    <datafield tag="035" ind1=" " ind2=" ">
+                        <subfield code="a">(ZDB-30-PQE)EBC30553734</subfield>
+                    </datafield>
+                    <datafield tag="035" ind1=" " ind2=" ">
+                        <subfield code="a">(ZDB-30-PAD)EBC30553734</subfield>
+                    </datafield>
+                    <datafield tag="035" ind1=" " ind2=" ">
+                        <subfield code="a">(ZDB-89-EBL)EBL30553734</subfield>
+                    </datafield>
+                    <datafield tag="035" ind1=" " ind2=" ">
+                        <subfield code="a">(OCoLC)1380745037</subfield>
+                    </datafield>
+                    <datafield tag="035" ind1=" " ind2=" ">
+                        <subfield code="a">(DE-599)BVBBV049020376</subfield>
+                    </datafield>
+                    <datafield tag="041" ind1="0" ind2=" ">
+                        <subfield code="a">eng</subfield>
+                    </datafield>
+                    <datafield tag="049" ind1=" " ind2=" ">
+                        <subfield code="a">DE-2070s</subfield>
+                    </datafield>
+                    <datafield tag="336" ind1=" " ind2=" ">
+                        <subfield code="b">txt</subfield>
+                        <subfield code="2">rdacontent</subfield>
+                    </datafield>
+                    <datafield tag="337" ind1=" " ind2=" ">
+                        <subfield code="b">c</subfield>
+                        <subfield code="2">rdamedia</subfield>
+                    </datafield>
+                    <datafield tag="338" ind1=" " ind2=" ">
+                        <subfield code="b">cr</subfield>
+                        <subfield code="2">rdacarrier</subfield>
+                    </datafield>
+                    <datafield tag="500" ind1=" " ind2=" ">
+                        <subfield code="a">Description based on publisher supplied metadata and other sources</subfield>
+                    </datafield>
+                    <datafield tag="966" ind1="e" ind2=" ">
+                        <subfield code="u">https://ebookcentral.proquest.com/lib/hwr/detail.action?docID=30553734</subfield>
+                        <subfield code="l">DE-2070s</subfield>
+                        <subfield code="p">ZDB-30-PQE</subfield>
+                        <subfield code="q">HWR_PDA_PQE</subfield>
+                        <subfield code="x">Aggregator</subfield>
+                        <subfield code="3">Volltext</subfield>
+                    </datafield>
+                </record>
+            </zs:recordData>
+            <zs:recordPosition>1</zs:recordPosition>
+        </zs:record>
+    </zs:records>
+</zs:searchRetrieveResponse>
diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MarcXmlParserTestBookSeries.bib b/src/test/resources/org/jabref/logic/importer/fileformat/MarcXmlParserTestBookSeries.bib
new file mode 100644
index 00000000000..9b60dc5ca0d
--- /dev/null
+++ b/src/test/resources/org/jabref/logic/importer/fileformat/MarcXmlParserTestBookSeries.bib
@@ -0,0 +1,18 @@
+@Misc{,
+  title      = {Recent Developments and the New Directions of Research, Foundations, and Applications},
+  year       = {2023},
+  address    = {Cham},
+  edition    = {1st ed. 2023},
+  editor     = {Shahbazova, Shahnaz N. and Abbasov, Ali M. and Kreinovich, Vladik and Kacprzyk, Janusz and Batyrshin, Ildar Z.},
+  file       = {ParsedFileField{description='', link='https://doi.org/10.1007/978-3-031-23476-7', fileType='PDF'}},
+  isbn       = {9783031234767},
+  issn       = {1860-0808},
+  pagetotal  = {330},
+  publisher  = {{Springer}},
+  series     = {Studies in Fuzziness and Soft Computing},
+  subtitle   = {Selected Papers of the 8th World Conference on Soft Computing, February 03–05, 2022, Baku, Azerbaijan, Vol. II},
+  titleaddon = {edited by Shahnaz N. Shahbazova, Ali M. Abbasov, Vladik Kreinovich, Janusz Kacprzyk, Ildar Z. Batyrshin},
+  volume     = {423},
+}
+
+@Comment{jabref-meta: databaseType:bibtex;}
diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MarcXmlParserTestBookSeries.xml b/src/test/resources/org/jabref/logic/importer/fileformat/MarcXmlParserTestBookSeries.xml
new file mode 100644
index 00000000000..d89588c020d
--- /dev/null
+++ b/src/test/resources/org/jabref/logic/importer/fileformat/MarcXmlParserTestBookSeries.xml
@@ -0,0 +1,297 @@
+<zs:searchRetrieveResponse>
+    <zs:version>1.1</zs:version>
+    <zs:numberOfRecords>1</zs:numberOfRecords>
+    <zs:records>
+        <zs:record>
+            <zs:recordSchema>info:srw/schema/1/marcxml-v1.1</zs:recordSchema>
+            <zs:recordPacking>xml</zs:recordPacking>
+            <zs:recordData>
+                <record>
+                    <leader>03794nmm a2200709zcb4500</leader>
+                    <controlfield tag="001">BV049032768</controlfield>
+                    <controlfield tag="003">DE-604</controlfield>
+                    <controlfield tag="005">00000000000000.0</controlfield>
+                    <controlfield tag="007">cr|uuu---uuuuu</controlfield>
+                    <controlfield tag="008">230704s2023 |||| o||u| ||||||eng d</controlfield>
+                    <datafield tag="020" ind1=" " ind2=" ">
+                        <subfield code="a">9783031234767</subfield>
+                        <subfield code="c">Online</subfield>
+                        <subfield code="9">978-3-031-23476-7</subfield>
+                    </datafield>
+                    <datafield tag="040" ind1=" " ind2=" ">
+                        <subfield code="a">DE-604</subfield>
+                        <subfield code="b">ger</subfield>
+                        <subfield code="e">rda</subfield>
+                    </datafield>
+                    <datafield tag="245" ind1="1" ind2="0">
+                        <subfield code="a">Recent Developments and the New Directions of Research, Foundations, and Applications</subfield>
+                        <subfield code="b">Selected Papers of the 8th World Conference on Soft Computing, February 03–05, 2022, Baku, Azerbaijan, Vol. II</subfield>
+                        <subfield code="c">edited by Shahnaz N. Shahbazova, Ali M. Abbasov, Vladik Kreinovich, Janusz Kacprzyk, Ildar Z. Batyrshin</subfield>
+                    </datafield>
+                    <datafield tag="250" ind1=" " ind2=" ">
+                        <subfield code="a">1st ed. 2023</subfield>
+                    </datafield>
+                    <datafield tag="264" ind1=" " ind2="1">
+                        <subfield code="a">Cham</subfield>
+                        <subfield code="b">Springer Nature Switzerland</subfield>
+                        <subfield code="c">2023</subfield>
+                    </datafield>
+                    <datafield tag="264" ind1=" " ind2="1">
+                        <subfield code="a">Cham</subfield>
+                        <subfield code="b">Springer</subfield>
+                    </datafield>
+                    <datafield tag="300" ind1=" " ind2=" ">
+                        <subfield code="a">1 Online-Ressource (XII, 330 p. 64 illus., 42 illus. in color)</subfield>
+                    </datafield>
+                    <datafield tag="700" ind1="1" ind2=" ">
+                        <subfield code="a">Shahbazova, Shahnaz N.</subfield>
+                        <subfield code="4">edt</subfield>
+                    </datafield>
+                    <datafield tag="700" ind1="1" ind2=" ">
+                        <subfield code="a">Abbasov, Ali M.</subfield>
+                        <subfield code="4">edt</subfield>
+                    </datafield>
+                    <datafield tag="700" ind1="1" ind2=" ">
+                        <subfield code="a">Kreinovich, Vladik</subfield>
+                        <subfield code="4">edt</subfield>
+                    </datafield>
+                    <datafield tag="700" ind1="1" ind2=" ">
+                        <subfield code="a">Kacprzyk, Janusz</subfield>
+                        <subfield code="4">edt</subfield>
+                    </datafield>
+                    <datafield tag="700" ind1="1" ind2=" ">
+                        <subfield code="a">Batyrshin, Ildar Z.</subfield>
+                        <subfield code="4">edt</subfield>
+                    </datafield>
+                    <datafield tag="776" ind1="0" ind2="8">
+                        <subfield code="i">Erscheint auch als</subfield>
+                        <subfield code="n">Druck-Ausgabe</subfield>
+                        <subfield code="z">978-3-031-23475-0</subfield>
+                    </datafield>
+                    <datafield tag="776" ind1="0" ind2="8">
+                        <subfield code="i">Erscheint auch als</subfield>
+                        <subfield code="n">Druck-Ausgabe</subfield>
+                        <subfield code="z">978-3-031-23477-4</subfield>
+                    </datafield>
+                    <datafield tag="776" ind1="0" ind2="8">
+                        <subfield code="i">Erscheint auch als</subfield>
+                        <subfield code="n">Druck-Ausgabe</subfield>
+                        <subfield code="z">978-3-031-23478-1</subfield>
+                    </datafield>
+                    <datafield tag="912" ind1=" " ind2=" ">
+                        <subfield code="a">ZDB-2-INR</subfield>
+                    </datafield>
+                    <datafield tag="940" ind1="1" ind2=" ">
+                        <subfield code="q">ZDB-2-INR_2023</subfield>
+                    </datafield>
+                    <datafield tag="024" ind1="7" ind2=" ">
+                        <subfield code="a">10.1007/978-3-031-23476-7</subfield>
+                        <subfield code="2">doi</subfield>
+                    </datafield>
+                    <datafield tag="035" ind1=" " ind2=" ">
+                        <subfield code="a">(ZDB-2-INR)9783031234767</subfield>
+                    </datafield>
+                    <datafield tag="035" ind1=" " ind2=" ">
+                        <subfield code="a">(OCoLC)1389184245</subfield>
+                    </datafield>
+                    <datafield tag="035" ind1=" " ind2=" ">
+                        <subfield code="a">(DE-599)BVBBV049032768</subfield>
+                    </datafield>
+                    <datafield tag="041" ind1="0" ind2=" ">
+                        <subfield code="a">eng</subfield>
+                    </datafield>
+                    <datafield tag="049" ind1=" " ind2=" ">
+                        <subfield code="a">DE-91</subfield>
+                        <subfield code="a">DE-1028</subfield>
+                        <subfield code="a">DE-1046</subfield>
+                        <subfield code="a">DE-Aug4</subfield>
+                        <subfield code="a">DE-898</subfield>
+                        <subfield code="a">DE-523</subfield>
+                        <subfield code="a">DE-859</subfield>
+                        <subfield code="a">DE-29</subfield>
+                        <subfield code="a">DE-863</subfield>
+                        <subfield code="a">DE-1050</subfield>
+                        <subfield code="a">DE-862</subfield>
+                        <subfield code="a">DE-92</subfield>
+                        <subfield code="a">DE-522</subfield>
+                        <subfield code="a">DE-573</subfield>
+                        <subfield code="a">DE-M347</subfield>
+                        <subfield code="a">DE-706</subfield>
+                        <subfield code="a">DE-739</subfield>
+                        <subfield code="a">DE-634</subfield>
+                    </datafield>
+                    <datafield tag="082" ind1="0" ind2=" ">
+                        <subfield code="a">006.3</subfield>
+                        <subfield code="2">23</subfield>
+                    </datafield>
+                    <datafield tag="084" ind1=" " ind2=" ">
+                        <subfield code="a">DAT 000</subfield>
+                        <subfield code="2">stub</subfield>
+                    </datafield>
+                    <datafield tag="336" ind1=" " ind2=" ">
+                        <subfield code="b">txt</subfield>
+                        <subfield code="2">rdacontent</subfield>
+                    </datafield>
+                    <datafield tag="337" ind1=" " ind2=" ">
+                        <subfield code="b">c</subfield>
+                        <subfield code="2">rdamedia</subfield>
+                    </datafield>
+                    <datafield tag="338" ind1=" " ind2=" ">
+                        <subfield code="b">cr</subfield>
+                        <subfield code="2">rdacarrier</subfield>
+                    </datafield>
+                    <datafield tag="490" ind1="0" ind2=" ">
+                        <subfield code="a">Studies in Fuzziness and Soft Computing</subfield>
+                        <subfield code="v">423</subfield>
+                        <subfield code="x">1860-0808</subfield>
+                    </datafield>
+                    <datafield tag="650" ind1=" " ind2="4">
+                        <subfield code="a">Computational Intelligence</subfield>
+                    </datafield>
+                    <datafield tag="650" ind1=" " ind2="4">
+                        <subfield code="a">Artificial Intelligence</subfield>
+                    </datafield>
+                    <datafield tag="650" ind1=" " ind2="4">
+                        <subfield code="a">Computational intelligence</subfield>
+                    </datafield>
+                    <datafield tag="650" ind1=" " ind2="4">
+                        <subfield code="a">Artificial intelligence</subfield>
+                    </datafield>
+                    <datafield tag="856" ind1="4" ind2="0">
+                        <subfield code="u">https://doi.org/10.1007/978-3-031-23476-7</subfield>
+                        <subfield code="x">Verlag</subfield>
+                        <subfield code="z">URL des Erstveröffentlichers</subfield>
+                        <subfield code="3">Volltext</subfield>
+                    </datafield>
+                    <datafield tag="966" ind1="e" ind2=" ">
+                        <subfield code="u">https://doi.org/10.1007/978-3-031-23476-7</subfield>
+                        <subfield code="l">DE-522</subfield>
+                        <subfield code="p">ZDB-2-INR</subfield>
+                        <subfield code="x">Verlag</subfield>
+                        <subfield code="3">Volltext</subfield>
+                    </datafield>
+                    <datafield tag="966" ind1="e" ind2=" ">
+                        <subfield code="u">https://doi.org/10.1007/978-3-031-23476-7</subfield>
+                        <subfield code="l">DE-634</subfield>
+                        <subfield code="p">ZDB-2-INR</subfield>
+                        <subfield code="x">Verlag</subfield>
+                        <subfield code="3">Volltext</subfield>
+                    </datafield>
+                    <datafield tag="966" ind1="e" ind2=" ">
+                        <subfield code="u">https://doi.org/10.1007/978-3-031-23476-7</subfield>
+                        <subfield code="l">DE-1046</subfield>
+                        <subfield code="p">ZDB-2-INR</subfield>
+                        <subfield code="x">Verlag</subfield>
+                        <subfield code="3">Volltext</subfield>
+                    </datafield>
+                    <datafield tag="966" ind1="e" ind2=" ">
+                        <subfield code="u">https://doi.org/10.1007/978-3-031-23476-7</subfield>
+                        <subfield code="l">DE-1028</subfield>
+                        <subfield code="p">ZDB-2-INR</subfield>
+                        <subfield code="x">Verlag</subfield>
+                        <subfield code="3">Volltext</subfield>
+                    </datafield>
+                    <datafield tag="966" ind1="e" ind2=" ">
+                        <subfield code="u">https://doi.org/10.1007/978-3-031-23476-7</subfield>
+                        <subfield code="l">DE-Aug4</subfield>
+                        <subfield code="p">ZDB-2-INR</subfield>
+                        <subfield code="x">Verlag</subfield>
+                        <subfield code="3">Volltext</subfield>
+                    </datafield>
+                    <datafield tag="966" ind1="e" ind2=" ">
+                        <subfield code="u">https://doi.org/10.1007/978-3-031-23476-7</subfield>
+                        <subfield code="l">DE-1050</subfield>
+                        <subfield code="p">ZDB-2-INR</subfield>
+                        <subfield code="x">Verlag</subfield>
+                        <subfield code="3">Volltext</subfield>
+                    </datafield>
+                    <datafield tag="966" ind1="e" ind2=" ">
+                        <subfield code="u">https://doi.org/10.1007/978-3-031-23476-7</subfield>
+                        <subfield code="l">DE-573</subfield>
+                        <subfield code="p">ZDB-2-INR</subfield>
+                        <subfield code="x">Verlag</subfield>
+                        <subfield code="3">Volltext</subfield>
+                    </datafield>
+                    <datafield tag="966" ind1="e" ind2=" ">
+                        <subfield code="u">https://doi.org/10.1007/978-3-031-23476-7</subfield>
+                        <subfield code="l">DE-M347</subfield>
+                        <subfield code="p">ZDB-2-INR</subfield>
+                        <subfield code="x">Verlag</subfield>
+                        <subfield code="3">Volltext</subfield>
+                    </datafield>
+                    <datafield tag="966" ind1="e" ind2=" ">
+                        <subfield code="u">https://doi.org/10.1007/978-3-031-23476-7</subfield>
+                        <subfield code="l">DE-92</subfield>
+                        <subfield code="p">ZDB-2-INR</subfield>
+                        <subfield code="x">Verlag</subfield>
+                        <subfield code="3">Volltext</subfield>
+                    </datafield>
+                    <datafield tag="966" ind1="e" ind2=" ">
+                        <subfield code="u">https://doi.org/10.1007/978-3-031-23476-7</subfield>
+                        <subfield code="l">DE-898</subfield>
+                        <subfield code="p">ZDB-2-INR</subfield>
+                        <subfield code="x">Verlag</subfield>
+                        <subfield code="3">Volltext</subfield>
+                    </datafield>
+                    <datafield tag="966" ind1="e" ind2=" ">
+                        <subfield code="u">https://doi.org/10.1007/978-3-031-23476-7</subfield>
+                        <subfield code="l">DE-859</subfield>
+                        <subfield code="p">ZDB-2-INR</subfield>
+                        <subfield code="x">Verlag</subfield>
+                        <subfield code="3">Volltext</subfield>
+                    </datafield>
+                    <datafield tag="966" ind1="e" ind2=" ">
+                        <subfield code="u">https://doi.org/10.1007/978-3-031-23476-7</subfield>
+                        <subfield code="l">DE-863</subfield>
+                        <subfield code="p">ZDB-2-INR</subfield>
+                        <subfield code="x">Verlag</subfield>
+                        <subfield code="3">Volltext</subfield>
+                    </datafield>
+                    <datafield tag="966" ind1="e" ind2=" ">
+                        <subfield code="u">https://doi.org/10.1007/978-3-031-23476-7</subfield>
+                        <subfield code="l">DE-862</subfield>
+                        <subfield code="p">ZDB-2-INR</subfield>
+                        <subfield code="x">Verlag</subfield>
+                        <subfield code="3">Volltext</subfield>
+                    </datafield>
+                    <datafield tag="966" ind1="e" ind2=" ">
+                        <subfield code="u">https://doi.org/10.1007/978-3-031-23476-7</subfield>
+                        <subfield code="l">DE-523</subfield>
+                        <subfield code="p">ZDB-2-INR</subfield>
+                        <subfield code="x">Verlag</subfield>
+                        <subfield code="3">Volltext</subfield>
+                    </datafield>
+                    <datafield tag="966" ind1="e" ind2=" ">
+                        <subfield code="u">https://doi.org/10.1007/978-3-031-23476-7</subfield>
+                        <subfield code="l">DE-91</subfield>
+                        <subfield code="p">ZDB-2-INR</subfield>
+                        <subfield code="x">Verlag</subfield>
+                        <subfield code="3">Volltext</subfield>
+                    </datafield>
+                    <datafield tag="966" ind1="e" ind2=" ">
+                        <subfield code="u">https://doi.org/10.1007/978-3-031-23476-7</subfield>
+                        <subfield code="l">DE-706</subfield>
+                        <subfield code="p">ZDB-2-INR</subfield>
+                        <subfield code="x">Verlag</subfield>
+                        <subfield code="3">Volltext</subfield>
+                    </datafield>
+                    <datafield tag="966" ind1="e" ind2=" ">
+                        <subfield code="u">https://doi.org/10.1007/978-3-031-23476-7</subfield>
+                        <subfield code="l">DE-29</subfield>
+                        <subfield code="p">ZDB-2-INR</subfield>
+                        <subfield code="x">Verlag</subfield>
+                        <subfield code="3">Volltext</subfield>
+                    </datafield>
+                    <datafield tag="966" ind1="e" ind2=" ">
+                        <subfield code="u">https://doi.org/10.1007/978-3-031-23476-7</subfield>
+                        <subfield code="l">DE-739</subfield>
+                        <subfield code="p">ZDB-2-INR</subfield>
+                        <subfield code="x">Verlag</subfield>
+                        <subfield code="3">Volltext</subfield>
+                    </datafield>
+                </record>
+            </zs:recordData>
+            <zs:recordPosition>1</zs:recordPosition>
+        </zs:record>
+    </zs:records>
+</zs:searchRetrieveResponse>
diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MarcXmlParserTestNotes.bib b/src/test/resources/org/jabref/logic/importer/fileformat/MarcXmlParserTestNotes.bib
new file mode 100644
index 00000000000..f273f06da3f
--- /dev/null
+++ b/src/test/resources/org/jabref/logic/importer/fileformat/MarcXmlParserTestNotes.bib
@@ -0,0 +1,13 @@
+@Article,
+  author     = {Sarda, Marie-Anne and Eude-Devaux, Caroline},
+  title      = {Livres de secrets, traités de teinture, journaux de laboratoire ou carnets de notes},
+  year       = {2023},
+  note       = {Text französisch. - Zusammenfassung in englischer Sprache},
+  volume     = {50},
+  file       = {ParsedFileField{description='', link='https://journals.openedition.org/insitu/38769', fileType='PDF'}},
+  pagetotal  = {26},
+  subtitle   = {quelles sources pour l'étude de la couleur dans le textile? = Books of secrets, dyeing treatises, laboratory journals or notebooks : what sources can be used for studying colour in textiles?},
+  titleaddon = {Marie-Anne Sarda et Caroline Eude-Devaux},
+}
+
+@Comment{jabref-meta: databaseType:bibtex;}
diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MarcXmlParserTestNotes.xml b/src/test/resources/org/jabref/logic/importer/fileformat/MarcXmlParserTestNotes.xml
new file mode 100644
index 00000000000..fcc7c1b4e01
--- /dev/null
+++ b/src/test/resources/org/jabref/logic/importer/fileformat/MarcXmlParserTestNotes.xml
@@ -0,0 +1,122 @@
+<zs:searchRetrieveResponse>
+    <zs:version>1.1</zs:version>
+    <zs:numberOfRecords>1</zs:numberOfRecords>
+    <zs:records>
+        <zs:record>
+            <zs:recordSchema>info:srw/schema/1/marcxml-v1.1</zs:recordSchema>
+            <zs:recordPacking>xml</zs:recordPacking>
+            <zs:recordData>
+                <record>
+                    <leader>01672nma a2200349 c 4500</leader>
+                    <controlfield tag="001">BV049029767</controlfield>
+                    <controlfield tag="003">DE-604</controlfield>
+                    <controlfield tag="005">00000000000000.0</controlfield>
+                    <controlfield tag="007">cr|uuu---uuuuu</controlfield>
+                    <controlfield tag="008">230702s2023 |||| o||u| ||||||fre d</controlfield>
+                    <datafield tag="040" ind1=" " ind2=" ">
+                        <subfield code="a">DE-604</subfield>
+                        <subfield code="b">ger</subfield>
+                        <subfield code="e">rda</subfield>
+                    </datafield>
+                    <datafield tag="100" ind1="1" ind2=" ">
+                        <subfield code="a">Sarda, Marie-Anne</subfield>
+                        <subfield code="e">Verfasser</subfield>
+                        <subfield code="0">(DE-588)174386958</subfield>
+                        <subfield code="4">aut</subfield>
+                    </datafield>
+                    <datafield tag="245" ind1="1" ind2="0">
+                        <subfield code="a">Livres de secrets, traités de teinture, journaux de laboratoire ou carnets de notes</subfield>
+                        <subfield code="b">quelles sources pour l'étude de la couleur dans le textile? = Books of secrets, dyeing treatises, laboratory journals or notebooks : what sources can be used for studying colour in textiles?</subfield>
+                        <subfield code="c">Marie-Anne Sarda et Caroline Eude-Devaux</subfield>
+                    </datafield>
+                    <datafield tag="246" ind1="1" ind2="1">
+                        <subfield code="a">Books of secrets, dyeing treatises, laboratory journals or notebooks</subfield>
+                    </datafield>
+                    <datafield tag="264" ind1=" " ind2="1">
+                        <subfield code="c">26 juin 2023</subfield>
+                    </datafield>
+                    <datafield tag="300" ind1=" " ind2=" ">
+                        <subfield code="a">Online-Ressource (26 Seiten)</subfield>
+                        <subfield code="b">14 Illustrationen</subfield>
+                    </datafield>
+                    <datafield tag="546" ind1=" " ind2=" ">
+                        <subfield code="a">Text französisch. - Zusammenfassung in englischer Sprache</subfield>
+                    </datafield>
+                    <datafield tag="700" ind1="1" ind2=" ">
+                        <subfield code="a">Eude-Devaux, Caroline</subfield>
+                        <subfield code="e">Verfasser</subfield>
+                        <subfield code="0">(DE-588)1230640940</subfield>
+                        <subfield code="4">aut</subfield>
+                    </datafield>
+                    <datafield tag="024" ind1="7" ind2=" ">
+                        <subfield code="a">10.4000/insitu.38769</subfield>
+                        <subfield code="2">doi</subfield>
+                    </datafield>
+                    <datafield tag="035" ind1=" " ind2=" ">
+                        <subfield code="a">(OCoLC)1389175862</subfield>
+                    </datafield>
+                    <datafield tag="035" ind1=" " ind2=" ">
+                        <subfield code="a">(DE-599)BVBBV049029767</subfield>
+                    </datafield>
+                    <datafield tag="041" ind1="0" ind2=" ">
+                        <subfield code="a">fre</subfield>
+                    </datafield>
+                    <datafield tag="049" ind1=" " ind2=" ">
+                        <subfield code="a">DE-Y3</subfield>
+                        <subfield code="a">DE-255</subfield>
+                        <subfield code="a">DE-Y7</subfield>
+                        <subfield code="a">DE-Y2</subfield>
+                    </datafield>
+                    <datafield tag="336" ind1=" " ind2=" ">
+                        <subfield code="b">txt</subfield>
+                        <subfield code="2">rdacontent</subfield>
+                    </datafield>
+                    <datafield tag="337" ind1=" " ind2=" ">
+                        <subfield code="b">c</subfield>
+                        <subfield code="2">rdamedia</subfield>
+                    </datafield>
+                    <datafield tag="338" ind1=" " ind2=" ">
+                        <subfield code="b">cr</subfield>
+                        <subfield code="2">rdacarrier</subfield>
+                    </datafield>
+                    <datafield tag="773" ind1="1" ind2="8">
+                        <subfield code="g">volume:50</subfield>
+                        <subfield code="g">year:2023</subfield>
+                    </datafield>
+                    <datafield tag="773" ind1="0" ind2="8">
+                        <subfield code="t">In situ</subfield>
+                        <subfield code="d">Paris, 2023</subfield>
+                        <subfield code="g">50 (2023)</subfield>
+                        <subfield code="w">(DE-604)BV017789122</subfield>
+                        <subfield code="x">1630-7305</subfield>
+                        <subfield code="o">(DE-600)2132615-0</subfield>
+                    </datafield>
+                    <datafield tag="856" ind1="4" ind2="0">
+                        <subfield code="q">application/pdf</subfield>
+                        <subfield code="u">https://journals.openedition.org/insitu/pdf/38769</subfield>
+                        <subfield code="x">Verlag</subfield>
+                        <subfield code="z">kostenfrei</subfield>
+                        <subfield code="3">Volltext</subfield>
+                    </datafield>
+                    <datafield tag="856" ind1="4" ind2="0">
+                        <subfield code="u">https://doi.org/10.4000/insitu.38769</subfield>
+                        <subfield code="x">Resolving-System</subfield>
+                        <subfield code="z">kostenfrei</subfield>
+                        <subfield code="3">Volltext</subfield>
+                    </datafield>
+                    <datafield tag="856" ind1="4" ind2="0">
+                        <subfield code="u">https://journals.openedition.org/insitu/38769</subfield>
+                        <subfield code="x">Verlag</subfield>
+                        <subfield code="z">kostenfrei</subfield>
+                        <subfield code="3">Volltext</subfield>
+                    </datafield>
+                    <datafield tag="941" ind1=" " ind2=" ">
+                        <subfield code="b">50</subfield>
+                        <subfield code="j">2023</subfield>
+                    </datafield>
+                </record>
+            </zs:recordData>
+            <zs:recordPosition>1</zs:recordPosition>
+        </zs:record>
+    </zs:records>
+</zs:searchRetrieveResponse>
diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MarcXmlParserTestSummaryAndKeywords.bib b/src/test/resources/org/jabref/logic/importer/fileformat/MarcXmlParserTestSummaryAndKeywords.bib
new file mode 100644
index 00000000000..46bd1ea6a78
--- /dev/null
+++ b/src/test/resources/org/jabref/logic/importer/fileformat/MarcXmlParserTestSummaryAndKeywords.bib
@@ -0,0 +1,15 @@
+@Misc{,
+  author     = {Cottrell, Robert C.},
+  title      = {Martyrs of the early American Left},
+  year       = {2023},
+  abstract   = {"Uniquely intertwining the stories of three leading early twentieth century radical Americans, this book presents the enthralling tale of the too-short lives of Inez Milholland, Randolph Bourne and John Reed. This collective biography highlights the movements, causes and personal experiences that drew such privileged individuals to the American left, willing to sacrifice comfortable circumstances and opportunities. Operating as writers and activists, the trio became leading spokespersons for feminism, sexual liberation, unions, civil liberties, pacifism, internationalism, socialism, anarchism and, in Reed's case, communism. Determinedly challenging capitalism, patriarchy and the nation-state, the independently-minded Milholland, Bourne and Reed possessed a twofold commitment to personal liberation and community-interclass and transnational. With their early deaths, they left behind personal models for acting, living, thinking afresh and standing as cultural and political radicals in early twentieth century America. In the process, they became martyrs to the very movements they championed."-Provided by publisher"},
+  address    = {Jefferson, North Carolina},
+  isbn       = {9781476691497},
+  keywords   = {Political activists / United States / Biography, Radicals / United States / Biography, Milholland, Inez, Bourne, Randolph Silliman / 1886-1918, Reed, John / 1887-1920, Right and left (Political science) / United States / History / 20th century, Radicalism / United States / History / 20th century, United States / Social conditions / 1865-1918, United States / Politics and government / 1865-1933, Bourne, Randolph Silliman / 1886-1918, Milholland, Inez, Reed, John / 1887-1920, Political activists, Politics and government, Radicalism, Radicals, Right and left (Political science), Social conditions, United States, 1865-1999, Biographies, History},
+  pagetotal  = {301},
+  publisher  = {{McFarland & Company, Inc., Publishers}},
+  subtitle   = {Inez Milholland, Randolph Bourne and John Reed},
+  titleaddon = {Robert C. Cottrell},
+}
+
+@Comment{jabref-meta: databaseType:bibtex;}
diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MarcXmlParserTestSummaryAndKeywords.xml b/src/test/resources/org/jabref/logic/importer/fileformat/MarcXmlParserTestSummaryAndKeywords.xml
new file mode 100644
index 00000000000..dcc2ff3bfa7
--- /dev/null
+++ b/src/test/resources/org/jabref/logic/importer/fileformat/MarcXmlParserTestSummaryAndKeywords.xml
@@ -0,0 +1,156 @@
+<zs:searchRetrieveResponse>
+    <zs:version>1.1</zs:version>
+    <zs:numberOfRecords>1</zs:numberOfRecords>
+    <zs:records>
+        <zs:record>
+            <zs:recordSchema>info:srw/schema/1/marcxml-v1.1</zs:recordSchema>
+            <zs:recordPacking>xml</zs:recordPacking>
+            <zs:recordData>
+                <record>
+                    <leader>03645nam a2200541 c 4500</leader>
+                    <controlfield tag="001">BV049039638</controlfield>
+                    <controlfield tag="003">DE-604</controlfield>
+                    <controlfield tag="005">00000000000000.0</controlfield>
+                    <controlfield tag="007">t</controlfield>
+                    <controlfield tag="008">230706s2023 a||| |||| 00||| eng d</controlfield>
+                    <datafield tag="020" ind1=" " ind2=" ">
+                        <subfield code="a">9781476691497</subfield>
+                        <subfield code="c">pbk</subfield>
+                        <subfield code="9">978-1-4766-9149-7</subfield>
+                    </datafield>
+                    <datafield tag="040" ind1=" " ind2=" ">
+                        <subfield code="a">DE-604</subfield>
+                        <subfield code="b">ger</subfield>
+                        <subfield code="e">rda</subfield>
+                    </datafield>
+                    <datafield tag="100" ind1="1" ind2=" ">
+                        <subfield code="a">Cottrell, Robert C.</subfield>
+                        <subfield code="d">1950-</subfield>
+                        <subfield code="e">Verfasser</subfield>
+                        <subfield code="0">(DE-588)131931563</subfield>
+                        <subfield code="4">aut</subfield>
+                    </datafield>
+                    <datafield tag="245" ind1="1" ind2="0">
+                        <subfield code="a">Martyrs of the early American Left</subfield>
+                        <subfield code="b">Inez Milholland, Randolph Bourne and John Reed</subfield>
+                        <subfield code="c">Robert C. Cottrell</subfield>
+                    </datafield>
+                    <datafield tag="264" ind1=" " ind2="1">
+                        <subfield code="a">Jefferson, North Carolina</subfield>
+                        <subfield code="b">McFarland & Company, Inc., Publishers</subfield>
+                        <subfield code="c">[2023]</subfield>
+                    </datafield>
+                    <datafield tag="300" ind1=" " ind2=" ">
+                        <subfield code="a">vii, 301 Seiten</subfield>
+                        <subfield code="b">Illustrationen</subfield>
+                        <subfield code="c">26 cm</subfield>
+                    </datafield>
+                    <datafield tag="505" ind1="8" ind2=" ">
+                        <subfield code="a">Vassar girl suffragist -- A man of letters -- A poet singing nothing but joy -- An American renaissance -- The unanticipated marriage -- Thirteen months in Europe -- Riding with the revolution -- Keeping faith with the cause -- The lyrical left's response to World War I -- Joining the new republic -- The peace crusade -- The Eastern Front -- The death of a feminist martyr -- Frustrated love and transnationalism -- The love of his life -- The war to make the world safe for democracy -- The Bolshevik Revolution -- "America in 1918" -- War's end -- An American in communist Russia -- Three American martyrs</subfield>
+                    </datafield>
+                    <datafield tag="520" ind1="3" ind2=" ">
+                        <subfield code="a">"Uniquely intertwining the stories of three leading early twentieth century radical Americans, this book presents the enthralling tale of the too-short lives of Inez Milholland, Randolph Bourne and John Reed. This collective biography highlights the movements, causes and personal experiences that drew such privileged individuals to the American left, willing to sacrifice comfortable circumstances and opportunities. Operating as writers and activists, the trio became leading spokespersons for feminism, sexual liberation, unions, civil liberties, pacifism, internationalism, socialism, anarchism and, in Reed's case, communism. Determinedly challenging capitalism, patriarchy and the nation-state, the independently-minded Milholland, Bourne and Reed possessed a twofold commitment to personal liberation and community-interclass and transnational. With their early deaths, they left behind personal models for acting, living, thinking afresh and standing as cultural and political radicals in early twentieth century America. In the process, they became martyrs to the very movements they championed."-Provided by publisher"</subfield>
+                    </datafield>
+                    <datafield tag="653" ind1=" " ind2="0">
+                        <subfield code="a">Political activists / United States / Biography</subfield>
+                    </datafield>
+                    <datafield tag="653" ind1=" " ind2="0">
+                        <subfield code="a">Radicals / United States / Biography</subfield>
+                    </datafield>
+                    <datafield tag="653" ind1=" " ind2="1">
+                        <subfield code="a">Milholland, Inez</subfield>
+                    </datafield>
+                    <datafield tag="653" ind1=" " ind2="1">
+                        <subfield code="a">Bourne, Randolph Silliman / 1886-1918</subfield>
+                    </datafield>
+                    <datafield tag="653" ind1=" " ind2="1">
+                        <subfield code="a">Reed, John / 1887-1920</subfield>
+                    </datafield>
+                    <datafield tag="653" ind1=" " ind2="0">
+                        <subfield code="a">Right and left (Political science) / United States / History / 20th century</subfield>
+                    </datafield>
+                    <datafield tag="653" ind1=" " ind2="0">
+                        <subfield code="a">Radicalism / United States / History / 20th century</subfield>
+                    </datafield>
+                    <datafield tag="653" ind1=" " ind2="2">
+                        <subfield code="a">United States / Social conditions / 1865-1918</subfield>
+                    </datafield>
+                    <datafield tag="653" ind1=" " ind2="2">
+                        <subfield code="a">United States / Politics and government / 1865-1933</subfield>
+                    </datafield>
+                    <datafield tag="653" ind1=" " ind2="1">
+                        <subfield code="a">Bourne, Randolph Silliman / 1886-1918</subfield>
+                    </datafield>
+                    <datafield tag="653" ind1=" " ind2="1">
+                        <subfield code="a">Milholland, Inez</subfield>
+                    </datafield>
+                    <datafield tag="653" ind1=" " ind2="1">
+                        <subfield code="a">Reed, John / 1887-1920</subfield>
+                    </datafield>
+                    <datafield tag="653" ind1=" " ind2="0">
+                        <subfield code="a">Political activists</subfield>
+                    </datafield>
+                    <datafield tag="653" ind1=" " ind2="0">
+                        <subfield code="a">Politics and government</subfield>
+                    </datafield>
+                    <datafield tag="653" ind1=" " ind2="0">
+                        <subfield code="a">Radicalism</subfield>
+                    </datafield>
+                    <datafield tag="653" ind1=" " ind2="0">
+                        <subfield code="a">Radicals</subfield>
+                    </datafield>
+                    <datafield tag="653" ind1=" " ind2="0">
+                        <subfield code="a">Right and left (Political science)</subfield>
+                    </datafield>
+                    <datafield tag="653" ind1=" " ind2="0">
+                        <subfield code="a">Social conditions</subfield>
+                    </datafield>
+                    <datafield tag="653" ind1=" " ind2="2">
+                        <subfield code="a">United States</subfield>
+                    </datafield>
+                    <datafield tag="653" ind1=" " ind2="4">
+                        <subfield code="a">1865-1999</subfield>
+                    </datafield>
+                    <datafield tag="653" ind1=" " ind2="6">
+                        <subfield code="a">Biographies</subfield>
+                    </datafield>
+                    <datafield tag="653" ind1=" " ind2="6">
+                        <subfield code="a">History</subfield>
+                    </datafield>
+                    <datafield tag="655" ind1=" " ind2="7">
+                        <subfield code="0">(DE-588)4006804-3</subfield>
+                        <subfield code="a">Biografie</subfield>
+                        <subfield code="2">gnd-content</subfield>
+                    </datafield>
+                    <datafield tag="776" ind1="0" ind2="8">
+                        <subfield code="i">Erscheint auch als</subfield>
+                        <subfield code="n">Online-Ausgabe</subfield>
+                        <subfield code="z">978-1-4766-4922-1</subfield>
+                    </datafield>
+                    <datafield tag="035" ind1=" " ind2=" ">
+                        <subfield code="a">(DE-599)BVBBV049039638</subfield>
+                    </datafield>
+                    <datafield tag="041" ind1="0" ind2=" ">
+                        <subfield code="a">eng</subfield>
+                    </datafield>
+                    <datafield tag="049" ind1=" " ind2=" ">
+                        <subfield code="a">DE-12</subfield>
+                    </datafield>
+                    <datafield tag="336" ind1=" " ind2=" ">
+                        <subfield code="b">txt</subfield>
+                        <subfield code="2">rdacontent</subfield>
+                    </datafield>
+                    <datafield tag="337" ind1=" " ind2=" ">
+                        <subfield code="b">n</subfield>
+                        <subfield code="2">rdamedia</subfield>
+                    </datafield>
+                    <datafield tag="338" ind1=" " ind2=" ">
+                        <subfield code="b">nc</subfield>
+                        <subfield code="2">rdacarrier</subfield>
+                    </datafield>
+                </record>
+            </zs:recordData>
+            <zs:recordPosition>1</zs:recordPosition>
+        </zs:record>
+    </zs:records>
+</zs:searchRetrieveResponse>
diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MarcXmlParserTestThesis.bib b/src/test/resources/org/jabref/logic/importer/fileformat/MarcXmlParserTestThesis.bib
new file mode 100644
index 00000000000..3b11e8e892f
--- /dev/null
+++ b/src/test/resources/org/jabref/logic/importer/fileformat/MarcXmlParserTestThesis.bib
@@ -0,0 +1,15 @@
+@PhdThesis{,
+  author     = {Blake, Carl LeRoy},
+  school     = {Cornell University},
+  title      = {Tempo rubato in the eigteenth century},
+  year       = {1991},
+  address    = {Ann Arbor, Mich.},
+  edition    = {Faksimile},
+  keywords   = {Geschichte 1700-1800},
+  pagetotal  = {127},
+  publisher  = {{UMI Dissertation Services}},
+  subtitle   = {a thesis},
+  titleaddon = {by Carl LeRoy Blake},
+}
+
+@Comment{jabref-meta: databaseType:bibtex;}
diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MarcXmlParserTestThesis.xml b/src/test/resources/org/jabref/logic/importer/fileformat/MarcXmlParserTestThesis.xml
new file mode 100644
index 00000000000..c65e4310b91
--- /dev/null
+++ b/src/test/resources/org/jabref/logic/importer/fileformat/MarcXmlParserTestThesis.xml
@@ -0,0 +1,91 @@
+<zs:searchRetrieveResponse>
+    <zs:version>1.1</zs:version>
+    <zs:numberOfRecords>1</zs:numberOfRecords>
+    <zs:records>
+        <zs:record>
+            <zs:recordSchema>info:srw/schema/1/marcxml-v1.1</zs:recordSchema>
+            <zs:recordPacking>xml</zs:recordPacking>
+            <zs:recordData>
+                <record>
+                    <leader>00921nam a2200289 c 4500</leader>
+                    <controlfield tag="001">BV048992225</controlfield>
+                    <controlfield tag="003">DE-604</controlfield>
+                    <controlfield tag="005">00000000000000.0</controlfield>
+                    <controlfield tag="007">t</controlfield>
+                    <controlfield tag="008">230607s1991 gl|| m||| 00||| eng d</controlfield>
+                    <datafield tag="040" ind1=" " ind2=" ">
+                        <subfield code="a">DE-604</subfield>
+                        <subfield code="b">ger</subfield>
+                        <subfield code="e">rda</subfield>
+                    </datafield>
+                    <datafield tag="100" ind1="1" ind2=" ">
+                        <subfield code="a">Blake, Carl LeRoy</subfield>
+                        <subfield code="d">1951-</subfield>
+                        <subfield code="e">Verfasser</subfield>
+                        <subfield code="0">(DE-588)1173216472</subfield>
+                        <subfield code="4">aut</subfield>
+                    </datafield>
+                    <datafield tag="245" ind1="1" ind2="0">
+                        <subfield code="a">Tempo rubato in the eigteenth century</subfield>
+                        <subfield code="b">a thesis</subfield>
+                        <subfield code="c">by Carl LeRoy Blake</subfield>
+                    </datafield>
+                    <datafield tag="246" ind1="1" ind2="3">
+                        <subfield code="a">Tempo rubato in the 18th century</subfield>
+                    </datafield>
+                    <datafield tag="250" ind1=" " ind2=" ">
+                        <subfield code="a">Faksimile</subfield>
+                    </datafield>
+                    <datafield tag="264" ind1=" " ind2="1">
+                        <subfield code="a">Ann Arbor, Mich.</subfield>
+                        <subfield code="b">UMI Dissertation Services</subfield>
+                        <subfield code="c">[1991]</subfield>
+                    </datafield>
+                    <datafield tag="300" ind1=" " ind2=" ">
+                        <subfield code="a">xii, 127 Seiten</subfield>
+                        <subfield code="b">Notenbeispiele</subfield>
+                        <subfield code="c">21 cm</subfield>
+                    </datafield>
+                    <datafield tag="502" ind1=" " ind2=" ">
+                        <subfield code="b">Dissertation</subfield>
+                        <subfield code="c">Cornell University</subfield>
+                        <subfield code="d">1988</subfield>
+                    </datafield>
+                    <datafield tag="653" ind1=" " ind2="4">
+                        <subfield code="a">Geschichte 1700-1800</subfield>
+                    </datafield>
+                    <datafield tag="655" ind1=" " ind2="7">
+                        <subfield code="0">(DE-588)4113937-9</subfield>
+                        <subfield code="a">Hochschulschrift</subfield>
+                        <subfield code="2">gnd-content</subfield>
+                    </datafield>
+                    <datafield tag="035" ind1=" " ind2=" ">
+                        <subfield code="a">(OCoLC)1385298558</subfield>
+                    </datafield>
+                    <datafield tag="035" ind1=" " ind2=" ">
+                        <subfield code="a">(DE-599)BVBBV048992225</subfield>
+                    </datafield>
+                    <datafield tag="041" ind1="0" ind2=" ">
+                        <subfield code="a">eng</subfield>
+                    </datafield>
+                    <datafield tag="049" ind1=" " ind2=" ">
+                        <subfield code="a">DE-83</subfield>
+                    </datafield>
+                    <datafield tag="336" ind1=" " ind2=" ">
+                        <subfield code="b">txt</subfield>
+                        <subfield code="2">rdacontent</subfield>
+                    </datafield>
+                    <datafield tag="337" ind1=" " ind2=" ">
+                        <subfield code="b">n</subfield>
+                        <subfield code="2">rdamedia</subfield>
+                    </datafield>
+                    <datafield tag="338" ind1=" " ind2=" ">
+                        <subfield code="b">nc</subfield>
+                        <subfield code="2">rdacarrier</subfield>
+                    </datafield>
+                </record>
+            </zs:recordData>
+            <zs:recordPosition>1</zs:recordPosition>
+        </zs:record>
+    </zs:records>
+</zs:searchRetrieveResponse>
diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestMathML.bib b/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestMathML.bib
new file mode 100644
index 00000000000..775b9727244
--- /dev/null
+++ b/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestMathML.bib
@@ -0,0 +1,27 @@
+@Article{,
+  author                = {Clerx, Michael and Cooling, Michael T and Cooper, Jonathan and Garny, Alan and Moyle, Keri and Nickerson, David P and Nielsen, Poul M F and Sorby, Hugh},
+  journal               = {Journal of integrative bioinformatics},
+  journal-abbreviation  = {J Integr Bioinform},
+  title                 = {CellML 2.0.},
+  year                  = {2020},
+  issn                  = {1613-4516},
+  month                 = jul,
+  volume                = {17},
+  abstract              = {Following are examples of MathML elements:  ${\eta }_{p}^{2}$  $\infty $  $\begin{pmatrix}0 & 1 & 0\\ 0 & 0 & 1\\ 1 & 0 & 0\end{pmatrix}$  $17+29i\in \mathbb{C}$  $\left(a,b,c\right)\left(abc\right)\left|a,b,c\right>$  $\sum _{i=1}^{n}\left({a}_{i}\right)$  $\underset{a}{\overset{b}{\int }}\left(5x+2\mathrm{sin}\left(x\right)\right)\mathrm{dx}$  $\frac{a+1}{b}$  $y=\sqrt[3]{{x}^{2}}$  $\mathrm{det A}=\left|\begin{array}{cccc}{a}_{11}& {a}_{12}& \dots & {a}_{1n}\\ & ⋮\\ {a}_{j1}& {a}_{j2}& \dots & {a}_{jn}\\ & ⋮\\ {a}_{k1}& {a}_{k2}& \dots & {a}_{kn}\\ & ⋮\\ {a}_{n1}& {a}_{n2}& \dots & {a}_{nn}\end{array}\right|$  $\stackrel{\to }{v}=\left({v}_{1},{v}_{2},{v}_{3}\right)$},
+  citation-subset       = {IM},
+  completed             = {2021-04-27},
+  country               = {Germany},
+  doi                   = {10.1515/jib-2020-0021},
+  issn-linking          = {1613-4516},
+  issue                 = {2-3},
+  keywords              = {Computer Simulation; Models, Biological; Models, Theoretical; Software; computational physiology; modularity; physiome project; reproducibility; reusability},
+  nlm-id                = {101503361},
+  status                = {MEDLINE},
+  owner                 = {NLM},
+  pii                   = {20200021},
+  pmc                   = {PMC7756617},
+  pmid                  = {32759406},
+  pubmodel              = {Electronic},
+  pubstate              = {epublish},
+  revised               = {2021-05-06},
+}
diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestMathML.xml b/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestMathML.xml
new file mode 100644
index 00000000000..04e0b433896
--- /dev/null
+++ b/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestMathML.xml
@@ -0,0 +1,490 @@
+<PubmedArticleSet>
+    <PubmedArticle>
+        <MedlineCitation Status="MEDLINE" Owner="NLM" IndexingMethod="Automated">
+            <PMID Version="1">32759406</PMID>
+            <DateCompleted>
+                <Year>2021</Year>
+                <Month>04</Month>
+                <Day>27</Day>
+            </DateCompleted>
+            <DateRevised>
+                <Year>2021</Year>
+                <Month>05</Month>
+                <Day>06</Day>
+            </DateRevised>
+            <Article PubModel="Electronic">
+                <Journal>
+                    <ISSN IssnType="Electronic">1613-4516</ISSN>
+                    <JournalIssue CitedMedium="Internet">
+                        <Volume>17</Volume>
+                        <Issue>2-3</Issue>
+                        <PubDate>
+                            <Year>2020</Year>
+                            <Month>Jul</Month>
+                            <Day>24</Day>
+                        </PubDate>
+                    </JournalIssue>
+                    <Title>Journal of integrative bioinformatics</Title>
+                    <ISOAbbreviation>J Integr Bioinform</ISOAbbreviation>
+                </Journal>
+                <ArticleTitle>CellML 2.0.</ArticleTitle>
+                <ELocationID EIdType="pii" ValidYN="Y">20200021</ELocationID>
+                <ELocationID EIdType="doi" ValidYN="Y">10.1515/jib-2020-0021</ELocationID>
+                <Abstract>
+                    <AbstractText>
+                        Following are examples of MathML elements:
+
+                        <!--Indices & Exponents:-->
+                        <mml:math xmlns:mml="http://www.w3.org/1998/Math/MathML">
+                            <mml:mrow>
+                                <mml:msubsup>
+                                    <mml:mi>η</mml:mi>
+                                    <mml:mi>p</mml:mi>
+                                    <mml:mn>2</mml:mn>
+                                </mml:msubsup>
+                            </mml:mrow>
+                        </mml:math>
+
+                        <!--Symbol:-->
+                        <math xmlns="http://www.w3.org/1998/Math/MathML">
+                            <infinity/>
+                        </math>
+
+                        <!--Matrix:-->
+                        <math xmlns="http://www.w3.org/1998/Math/MathML">
+                            <matrix>
+                                <matrixrow>
+                                    <cn> 0 </cn> <cn> 1 </cn> <cn> 0 </cn>
+                                </matrixrow>
+                                <matrixrow>
+                                    <cn> 0 </cn> <cn> 0 </cn> <cn> 1 </cn>
+                                </matrixrow>
+                                <matrixrow>
+                                    <cn> 1 </cn> <cn> 0 </cn> <cn> 0 </cn>
+                                </matrixrow>
+                            </matrix>
+                        </math>
+
+                        <!--Cartesian:-->
+                        <math xmlns="http://www.w3.org/1998/Math/MathML">
+                            <apply>
+                                <in/>
+                                <cn type="complex-cartesian">17<sep/>29</cn>
+                                <complexes/>
+                            </apply>
+                        </math>
+
+                        <!--Brackets:-->
+                        <math xmlns="http://www.w3.org/1998/Math/MathML">
+                            <mfenced>
+                                <mi>a</mi>
+                                <mi>b</mi>
+                                <mi>c</mi>
+                            </mfenced>
+                            <mfenced separators=''>
+                                <mi>a</mi>
+                                <mi>b</mi>
+                                <mi>c</mi>
+                            </mfenced>
+                            <mfenced open="|" close=">">
+                                <mi>a</mi>
+                                <mi>b</mi>
+                                <mi>c</mi>
+                            </mfenced>
+                        </math>
+
+                        <!--Sum:-->
+                        <math xmlns="http://www.w3.org/1998/Math/MathML" display='block'>
+                            <munderover>
+                                <mo>&#x2211;</mo>
+                                <mrow>
+                                    <mi>i</mi>
+                                    <mo>=</mo>
+                                    <mn>1</mn>
+                                </mrow>
+                                <mi>n</mi>
+                            </munderover>
+                            <mfenced separators=''>
+                                <msub>
+                                    <mi>a</mi>
+                                    <mi>i</mi>
+                                </msub>
+                            </mfenced>
+                        </math>
+
+                        <!--Integral:-->
+                        <math xmlns="http://www.w3.org/1998/Math/MathML">
+                            <munderover>
+                                <mo>&#x222B;</mo>
+                                <mi>a</mi>
+                                <mi>b</mi>
+                            </munderover>
+                            <mfenced separators=''>
+                                <mn>5</mn>
+                                <mi>x</mi>
+                                <mo>+</mo>
+                                <mn>2</mn>
+                                <mi>sin</mi>
+                                <mfenced separators=''>
+                                    <mi>x</mi>
+                                </mfenced>
+                            </mfenced>
+                            <mi>dx</mi>
+                        </math>
+
+                        <!--Fractions:-->
+                        <math xmlns="http://www.w3.org/1998/Math/MathML">
+                            <mfrac>
+                                <mrow>
+                                    <mi>a</mi>
+                                    <mo>+</mo>
+                                    <mn>1</mn>
+                                </mrow>
+                                <mi>b</mi>
+                            </mfrac>
+                        </math>
+
+                        <!--Root:-->
+                        <math xmlns="http://www.w3.org/1998/Math/MathML">
+                            <mi>y</mi>
+                            <mo>=</mo>
+                            <mroot>
+                                <msup>
+                                    <mi>x</mi>
+                                    <mn>2</mn>
+                                </msup>
+                                <mn>3</mn>
+                            </mroot>
+                        </math>
+
+                        <!--Determinant:-->
+                        <math xmlns="http://www.w3.org/1998/Math/MathML">
+                            <mi>det A</mi>
+                            <mo>=</mo>
+                            <mfenced open='|' close='|'>
+                                <mtable>
+                                    <mtr>
+                                        <mtd>
+                                            <msub>
+                                                <mi>a</mi>
+                                                <mrow>
+                                                    <mn>1</mn>
+                                                    <mn>1</mn>
+                                                </mrow>
+                                            </msub>
+                                        </mtd>
+                                        <mtd>
+                                            <msub>
+                                                <mi>a</mi>
+                                                <mrow>
+                                                    <mn>1</mn>
+                                                    <mn>2</mn>
+                                                </mrow>
+                                            </msub>
+                                        </mtd>
+                                        <mtd><mi>&#x2026;</mi>
+                                        </mtd>
+                                        <mtd>
+                                            <msub>
+                                                <mi>a</mi>
+                                                <mrow>
+                                                    <mn>1</mn>
+                                                    <mi>n</mi>
+                                                </mrow>
+                                            </msub>
+                                        </mtd>
+                                    </mtr>
+                                    <mtr>
+                                        <mtd></mtd>
+                                        <mtd><mi>&#x22ee;</mi>
+                                        </mtd>
+                                    </mtr>
+                                    <mtr mathcolor='#00cc00'>
+                                        <mtd>
+                                            <msub>
+                                                <mi>a</mi>
+                                                <mrow>
+                                                    <mi>j</mi>
+                                                    <mn>1</mn>
+                                                </mrow>
+                                            </msub>
+                                        </mtd>
+                                        <mtd>
+                                            <msub>
+                                                <mi>a</mi>
+                                                <mrow>
+                                                    <mi>j</mi>
+                                                    <mn>2</mn>
+                                                </mrow>
+                                            </msub>
+                                        </mtd>
+                                        <mtd><mi>&#x2026;</mi>
+                                        </mtd>
+                                        <mtd>
+                                            <msub>
+                                                <mi>a</mi>
+                                                <mrow>
+                                                    <mi>j</mi>
+                                                    <mi>n</mi>
+                                                </mrow>
+                                            </msub>
+                                        </mtd>
+                                    </mtr>
+                                    <mtr>
+                                        <mtd></mtd>
+                                        <mtd><mi>&#x22ee;</mi>
+                                        </mtd>
+                                    </mtr>
+                                    <mtr mathcolor='#0000cc'>
+                                        <mtd>
+                                            <msub>
+                                                <mi>a</mi>
+                                                <mrow>
+                                                    <mi>k</mi>
+                                                    <mn>1</mn>
+                                                </mrow>
+                                            </msub>
+                                        </mtd>
+                                        <mtd>
+                                            <msub>
+                                                <mi>a</mi>
+                                                <mrow>
+                                                    <mi>k</mi>
+                                                    <mn>2</mn>
+                                                </mrow>
+                                            </msub>
+                                        </mtd>
+                                        <mtd><mi>&#x2026;</mi>
+                                        </mtd>
+                                        <mtd>
+                                            <msub>
+                                                <mi>a</mi>
+                                                <mrow>
+                                                    <mi>k</mi>
+                                                    <mi>n</mi>
+                                                </mrow>
+                                            </msub>
+                                        </mtd>
+                                    </mtr>
+                                    <mtr>
+                                        <mtd></mtd>
+                                        <mtd><mi>&#x22ee;</mi>
+                                        </mtd>
+                                    </mtr>
+                                    <mtr>
+                                        <mtd>
+                                            <msub>
+                                                <mi>a</mi>
+                                                <mrow>
+                                                    <mi>n</mi>
+                                                    <mn>1</mn>
+                                                </mrow>
+                                            </msub>
+                                        </mtd>
+                                        <mtd>
+                                            <msub>
+                                                <mi>a</mi>
+                                                <mrow>
+                                                    <mi>n</mi>
+                                                    <mn>2</mn>
+                                                </mrow>
+                                            </msub>
+                                        </mtd>
+                                        <mtd><mi>&#x2026;</mi>
+                                        </mtd>
+                                        <mtd>
+                                            <msub>
+                                                <mi>a</mi>
+                                                <mrow>
+                                                    <mi>n</mi>
+                                                    <mi>n</mi>
+                                                </mrow>
+                                            </msub>
+                                        </mtd>
+                                    </mtr>
+                                </mtable>
+                            </mfenced>
+                        </math>
+
+                        <!--Vector:-->
+                        <math xmlns="http://www.w3.org/1998/Math/MathML">
+                            <mover>
+                                <mi>v</mi>
+                                <mo>&#x2192;</mo>
+                            </mover>
+                            <mo>=</mo>
+                            <mfenced>
+                                <msub>
+                                    <mi>v</mi>
+                                    <mn>1</mn>
+                                </msub>
+                                <msub>
+                                    <mi>v</mi>
+                                    <mn>2</mn>
+                                </msub>
+                                <msub>
+                                    <mi>v</mi>
+                                    <mn>3</mn>
+                                </msub>
+                            </mfenced>
+                        </math>
+
+                    </AbstractText>
+                </Abstract>
+                <AuthorList CompleteYN="Y">
+                    <Author ValidYN="Y">
+                        <LastName>Clerx</LastName>
+                        <ForeName>Michael</ForeName>
+                        <Initials>M</Initials>
+                        <Identifier Source="ORCID">0000-0003-4062-3061</Identifier>
+                        <AffiliationInfo>
+                            <Affiliation>University of Oxford, Oxford, UK.</Affiliation>
+                        </AffiliationInfo>
+                    </Author>
+                    <Author ValidYN="Y">
+                        <LastName>Cooling</LastName>
+                        <ForeName>Michael T</ForeName>
+                        <Initials>MT</Initials>
+                        <Identifier Source="ORCID">0000-0002-3417-0177</Identifier>
+                        <AffiliationInfo>
+                            <Affiliation>University of Auckland, Auckland, New Zealand.</Affiliation>
+                        </AffiliationInfo>
+                    </Author>
+                    <Author ValidYN="Y">
+                        <LastName>Cooper</LastName>
+                        <ForeName>Jonathan</ForeName>
+                        <Initials>J</Initials>
+                        <Identifier Source="ORCID">0000-0001-6009-3542</Identifier>
+                        <AffiliationInfo>
+                            <Affiliation>University College London, London, UK.</Affiliation>
+                        </AffiliationInfo>
+                    </Author>
+                    <Author ValidYN="Y">
+                        <LastName>Garny</LastName>
+                        <ForeName>Alan</ForeName>
+                        <Initials>A</Initials>
+                        <Identifier Source="ORCID">0000-0001-7606-5888</Identifier>
+                        <AffiliationInfo>
+                            <Affiliation>University of Auckland, Auckland, New Zealand.</Affiliation>
+                        </AffiliationInfo>
+                    </Author>
+                    <Author ValidYN="Y">
+                        <LastName>Moyle</LastName>
+                        <ForeName>Keri</ForeName>
+                        <Initials>K</Initials>
+                        <Identifier Source="ORCID">0000-0002-7178-2631</Identifier>
+                        <AffiliationInfo>
+                            <Affiliation>University of Auckland, Auckland, New Zealand.</Affiliation>
+                        </AffiliationInfo>
+                    </Author>
+                    <Author ValidYN="Y">
+                        <LastName>Nickerson</LastName>
+                        <ForeName>David P</ForeName>
+                        <Initials>DP</Initials>
+                        <Identifier Source="ORCID">0000-0003-4667-9779</Identifier>
+                        <AffiliationInfo>
+                            <Affiliation>University of Auckland, Auckland, New Zealand.</Affiliation>
+                        </AffiliationInfo>
+                    </Author>
+                    <Author ValidYN="Y">
+                        <LastName>Nielsen</LastName>
+                        <ForeName>Poul M F</ForeName>
+                        <Initials>PMF</Initials>
+                        <Identifier Source="ORCID">0000-0002-4704-0179</Identifier>
+                        <AffiliationInfo>
+                            <Affiliation>University of Auckland, Auckland, New Zealand.</Affiliation>
+                        </AffiliationInfo>
+                    </Author>
+                    <Author ValidYN="Y">
+                        <LastName>Sorby</LastName>
+                        <ForeName>Hugh</ForeName>
+                        <Initials>H</Initials>
+                        <Identifier Source="ORCID">0000-0001-8991-4703</Identifier>
+                        <AffiliationInfo>
+                            <Affiliation>University of Auckland, Auckland, New Zealand.</Affiliation>
+                        </AffiliationInfo>
+                    </Author>
+                </AuthorList>
+                <Language>eng</Language>
+                <PublicationTypeList>
+                    <PublicationType UI="D016428">Journal Article</PublicationType>
+                </PublicationTypeList>
+                <ArticleDate DateType="Electronic">
+                    <Year>2020</Year>
+                    <Month>07</Month>
+                    <Day>24</Day>
+                </ArticleDate>
+            </Article>
+            <MedlineJournalInfo>
+                <Country>Germany</Country>
+                <MedlineTA>J Integr Bioinform</MedlineTA>
+                <NlmUniqueID>101503361</NlmUniqueID>
+                <ISSNLinking>1613-4516</ISSNLinking>
+            </MedlineJournalInfo>
+            <CitationSubset>IM</CitationSubset>
+            <MeshHeadingList>
+                <MeshHeading>
+                    <DescriptorName UI="D003198" MajorTopicYN="N">Computer Simulation</DescriptorName>
+                </MeshHeading>
+                <MeshHeading>
+                    <DescriptorName UI="D008954" MajorTopicYN="Y">Models, Biological</DescriptorName>
+                </MeshHeading>
+                <MeshHeading>
+                    <DescriptorName UI="D008962" MajorTopicYN="N">Models, Theoretical</DescriptorName>
+                </MeshHeading>
+                <MeshHeading>
+                    <DescriptorName UI="D012984" MajorTopicYN="Y">Software</DescriptorName>
+                </MeshHeading>
+            </MeshHeadingList>
+            <KeywordList Owner="NOTNLM">
+                <Keyword MajorTopicYN="N">computational physiology</Keyword>
+                <Keyword MajorTopicYN="N">modularity</Keyword>
+                <Keyword MajorTopicYN="N">physiome project</Keyword>
+                <Keyword MajorTopicYN="N">reproducibility</Keyword>
+                <Keyword MajorTopicYN="N">reusability</Keyword>
+            </KeywordList>
+        </MedlineCitation>
+        <PubmedData>
+            <History>
+                <PubMedPubDate PubStatus="received">
+                    <Year>2020</Year>
+                    <Month>4</Month>
+                    <Day>18</Day>
+                </PubMedPubDate>
+                <PubMedPubDate PubStatus="accepted">
+                    <Year>2020</Year>
+                    <Month>4</Month>
+                    <Day>20</Day>
+                </PubMedPubDate>
+                <PubMedPubDate PubStatus="pubmed">
+                    <Year>2020</Year>
+                    <Month>8</Month>
+                    <Day>8</Day>
+                    <Hour>6</Hour>
+                    <Minute>0</Minute>
+                </PubMedPubDate>
+                <PubMedPubDate PubStatus="medline">
+                    <Year>2021</Year>
+                    <Month>4</Month>
+                    <Day>28</Day>
+                    <Hour>6</Hour>
+                    <Minute>0</Minute>
+                </PubMedPubDate>
+                <PubMedPubDate PubStatus="entrez">
+                    <Year>2020</Year>
+                    <Month>8</Month>
+                    <Day>8</Day>
+                    <Hour>6</Hour>
+                    <Minute>0</Minute>
+                </PubMedPubDate>
+            </History>
+            <PublicationStatus>epublish</PublicationStatus>
+            <ArticleIdList>
+                <ArticleId IdType="pubmed">32759406</ArticleId>
+                <ArticleId IdType="pmc">PMC7756617</ArticleId>
+                <ArticleId IdType="doi">10.1515/jib-2020-0021</ArticleId>
+                <ArticleId IdType="pii">jib-2020-0021</ArticleId>
+            </ArticleIdList>
+        </PubmedData>
+    </PubmedArticle>
+</PubmedArticleSet>
diff --git a/src/test/resources/testbib/jabref-authors.bib b/src/test/resources/testbib/jabref-authors.bib
index 8687068e425..118df45c5b5 100644
--- a/src/test/resources/testbib/jabref-authors.bib
+++ b/src/test/resources/testbib/jabref-authors.bib
@@ -39,7 +39,7 @@ @InProceedings{JohanssonGustafsson2015
   bibsource  = {dblp computer science bibliography, http://dblp.org},
   biburl     = {http://dblp.uni-trier.de/rec/bib/conf/icdsp/JohanssonG15a},
   groups     = {By rating},
-  keywords   = {rank4},
+  ranking    = {rank4},
   readstatus = {read},
   timestamp  = {Tue, 22 Sep 2015 18:08:19 +0200},
   year       = {2015},
@@ -1174,8 +1174,8 @@ @InProceedings{GeigerHarrerLenhardEtAl2016
   pages     = {120--128},
   address   = {Oxford, UK},
   file      = {:geiger2016evolution.pdf:PDF},
-  keywords  = {rank4},
   month     = mar,
+  ranking   = {rank4},
   year      = {2016},
 }
 
@@ -1222,8 +1222,8 @@ @InProceedings{HarrerGeigerPreisingerEtAl2015
   address      = {San Francisco Bay, CA, USA},
   file         = {:Harrer2015ImprovingStaticAnalysis.pdf:PDF},
   groups       = {By rating},
-  keywords     = {rank5},
   month        = mar,
+  ranking      = {rank5},
   year         = {2015},
 }
 
@@ -1237,8 +1237,8 @@ @InProceedings{HarrerRoeckWirtz2014
   address   = {Cleveland, Ohio, USA},
   file      = {:Harrer2014AutomatedandIsolated.pdf:PDF},
   groups    = {By rating},
-  keywords  = {rank2},
   month     = apr,
+  ranking   = {rank2},
   year      = {2014},
 }
 
@@ -1591,7 +1591,7 @@ @Article{WettingerBreitenbuecherKoppEtAl2016
   bibsource = {dblp computer science bibliography, http://dblp.org},
   biburl    = {http://dblp.uni-trier.de/rec/bib/journals/fgcs/WettingerBKL16},
   journal   = {Future Generation Comp. Syst.},
-  keywords  = {rank4},
+  ranking   = {rank4},
   timestamp = {Thu, 31 Mar 2016 01:00:00 +0200},
   year      = {2016},
 }
@@ -1624,7 +1624,7 @@ @InProceedings{BreitenbuecherBinzKoppEtAl2015
   bibsource = {dblp computer science bibliography, http://dblp.org},
   biburl    = {http://dblp.uni-trier.de/rec/bib/conf/closer/BreitenbucherBK15},
   groups    = {My papers},
-  keywords  = {rank3},
+  ranking   = {rank3},
   timestamp = {Tue, 04 Aug 2015 09:17:34 +0200},
   year      = {2015},
 }
@@ -1706,7 +1706,7 @@ @Article{EshuisNortaKoppEtAl2015
   bibsource = {dblp computer science bibliography, http://dblp.org},
   biburl    = {http://dblp.uni-trier.de/rec/bib/journals/tsc/EshuisNKP15},
   journal   = {{IEEE} Trans. Services Computing},
-  keywords  = {rank2},
+  ranking   = {rank2},
   timestamp = {Wed, 09 Mar 2016 00:00:00 +0100},
   year      = {2015},
 }
diff --git a/src/test/search/README.md b/src/test/search/README.md
new file mode 100644
index 00000000000..efb1db830db
--- /dev/null
+++ b/src/test/search/README.md
@@ -0,0 +1,9 @@
+# Folder `src\test\search`
+
+This folder contains manual use-cases for testing the search functionality. 
+It contains the folder `src\test\search\resources` with material used in the use-cases.
+
+## Related Issues and Pull Requests
+
+[Pull Request #8963](https://github.com/JabRef/jabref/pull/8963): This PR is about Lucene which
+is used for the search functionality. 
diff --git a/src/test/search/resources/.gitignore b/src/test/search/resources/.gitignore
new file mode 100644
index 00000000000..30aaa5e7abe
--- /dev/null
+++ b/src/test/search/resources/.gitignore
@@ -0,0 +1,8 @@
+# LaTeX temp files
+
+*.aux
+
+*.synctex
+*.synctex.gz
+*.upa
+*.upb
diff --git a/src/test/search/resources/empty.bib b/src/test/search/resources/empty.bib
new file mode 100644
index 00000000000..647c57fd287
--- /dev/null
+++ b/src/test/search/resources/empty.bib
@@ -0,0 +1 @@
+@Comment{jabref-meta: databaseType:bibtex;}
diff --git a/src/test/search/resources/minimal-note.pdf b/src/test/search/resources/minimal-note.pdf
new file mode 100644
index 00000000000..d7b6f754cfe
Binary files /dev/null and b/src/test/search/resources/minimal-note.pdf differ
diff --git a/src/test/search/resources/minimal-note.tex b/src/test/search/resources/minimal-note.tex
new file mode 100644
index 00000000000..c47b1aa8b5d
--- /dev/null
+++ b/src/test/search/resources/minimal-note.tex
@@ -0,0 +1,13 @@
+\documentclass{article}
+\usepackage[utf8]{inputenc}
+\usepackage[english]{babel}
+
+\usepackage{pdfcomment}
+
+\begin{document}
+
+This is a short sentence, comma included.
+
+\pdfcomment{Hello World}
+
+\end{document}
diff --git a/src/test/search/resources/minimal-note1.pdf b/src/test/search/resources/minimal-note1.pdf
new file mode 100644
index 00000000000..d6497ba5bbb
Binary files /dev/null and b/src/test/search/resources/minimal-note1.pdf differ
diff --git a/src/test/search/resources/minimal-note1.tex b/src/test/search/resources/minimal-note1.tex
new file mode 100644
index 00000000000..efc1f5dbf49
--- /dev/null
+++ b/src/test/search/resources/minimal-note1.tex
@@ -0,0 +1,13 @@
+\documentclass{article}
+\usepackage[utf8]{inputenc}
+\usepackage[english]{babel}
+
+\usepackage{pdfcomment}
+
+\begin{document}
+
+THIS IS A SHORT SENTENCE, COMMA INCLUDED.
+
+\pdfcomment{HELLO WORLD}
+
+\end{document}
diff --git a/src/test/search/resources/minimal-note2.pdf b/src/test/search/resources/minimal-note2.pdf
new file mode 100644
index 00000000000..8b00e197a10
Binary files /dev/null and b/src/test/search/resources/minimal-note2.pdf differ
diff --git a/src/test/search/resources/minimal-note2.tex b/src/test/search/resources/minimal-note2.tex
new file mode 100644
index 00000000000..f78511b658b
--- /dev/null
+++ b/src/test/search/resources/minimal-note2.tex
@@ -0,0 +1,13 @@
+\documentclass{article}
+\usepackage[utf8]{inputenc}
+\usepackage[english]{babel}
+
+\usepackage{pdfcomment}
+
+\begin{document}
+
+ThiS IS A SHORT SENTENCE, COMMA INCLUDED.
+
+\pdfcomment{HellO wORLd}
+
+\end{document}
diff --git a/src/test/search/resources/minimal.pdf b/src/test/search/resources/minimal.pdf
new file mode 100644
index 00000000000..3658e1118b0
Binary files /dev/null and b/src/test/search/resources/minimal.pdf differ
diff --git a/src/test/search/resources/minimal.tex b/src/test/search/resources/minimal.tex
new file mode 100644
index 00000000000..c4d88276dcd
--- /dev/null
+++ b/src/test/search/resources/minimal.tex
@@ -0,0 +1,10 @@
+\documentclass{article}
+\usepackage[utf8]{inputenc}
+\usepackage[english]{babel}
+
+
+\begin{document}
+
+This is a short sentence, comma included.
+
+\end{document}
diff --git a/src/test/search/resources/minimal1.pdf b/src/test/search/resources/minimal1.pdf
new file mode 100644
index 00000000000..396acb36d16
Binary files /dev/null and b/src/test/search/resources/minimal1.pdf differ
diff --git a/src/test/search/resources/minimal1.tex b/src/test/search/resources/minimal1.tex
new file mode 100644
index 00000000000..991cd40d6b4
--- /dev/null
+++ b/src/test/search/resources/minimal1.tex
@@ -0,0 +1,9 @@
+\documentclass{article}
+\usepackage[utf8]{inputenc}
+\usepackage[english]{babel}
+
+\begin{document}
+
+THIS is a short sentence, comma included.
+
+\end{document}
diff --git a/src/test/search/resources/minimal2.pdf b/src/test/search/resources/minimal2.pdf
new file mode 100644
index 00000000000..df5641aad1f
Binary files /dev/null and b/src/test/search/resources/minimal2.pdf differ
diff --git a/src/test/search/resources/minimal2.tex b/src/test/search/resources/minimal2.tex
new file mode 100644
index 00000000000..42b3e319f8d
--- /dev/null
+++ b/src/test/search/resources/minimal2.tex
@@ -0,0 +1,9 @@
+\documentclass{article}
+\usepackage[utf8]{inputenc}
+\usepackage[english]{babel}
+
+\begin{document}
+
+ThiS is a short sentence, comma included.
+
+\end{document}
diff --git a/src/test/search/resources/test-library-A.bib b/src/test/search/resources/test-library-A.bib
new file mode 100644
index 00000000000..267ae48d767
--- /dev/null
+++ b/src/test/search/resources/test-library-A.bib
@@ -0,0 +1,26 @@
+@Misc{entry1,
+  author = {Test},
+  title  = {cASe},
+}
+
+@Misc{entry2,
+  author = {test},
+  title  = {casE},
+}
+
+@Misc{entry3,
+  author = {tESt},
+  title  = {Case},
+}
+
+@Misc{entry4,
+  author = {tesT},
+  title  = {CASE},
+}
+
+@Misc{entry5,
+  author = {TEST},
+  title  = {case},
+}
+
+@Comment{jabref-meta: databaseType:bibtex;}
diff --git a/src/test/search/resources/test-library-B.bib b/src/test/search/resources/test-library-B.bib
new file mode 100644
index 00000000000..ff076a5a52c
--- /dev/null
+++ b/src/test/search/resources/test-library-B.bib
@@ -0,0 +1,21 @@
+@Misc{entry1,
+  author = {Test},
+  title  = {Case},
+}
+
+@Misc{entry2,
+  author = {User},
+  title  = {case},
+}
+
+@Misc{entry3,
+  author = {test},
+  title  = {text},
+}
+
+@Misc{entry4,
+  author = {Special},
+  title  = {192? title.},
+}
+
+@Comment{jabref-meta: databaseType:bibtex;}
diff --git a/src/test/search/resources/test-library-C.bib b/src/test/search/resources/test-library-C.bib
new file mode 100644
index 00000000000..02f08f7b632
--- /dev/null
+++ b/src/test/search/resources/test-library-C.bib
@@ -0,0 +1,34 @@
+@Misc{minimal1,
+  file = {:minimal.pdf:PDF},
+}
+
+@Misc{minimal2,
+  file = {:minimal1.pdf:PDF},
+}
+
+@Misc{minimal3,
+  file = {:minimal2.pdf:PDF},
+}
+
+@Misc{minimal-note1,
+  file = {:minimal-note.pdf:PDF},
+}
+
+@Misc{minimal-note2,
+  file = {:minimal-note1.pdf:PDF},
+}
+
+@Misc{minimal-note3,
+  file = {:minimal-note2.pdf:PDF},
+}
+
+@Comment{jabref-meta: databaseType:bibtex;}
+
+@Comment{jabref-meta: fileDirectory:.;}
+
+@Comment{jabref-meta: saveActions:disabled;
+all-text-fields[identity]
+date[normalize_date]
+month[normalize_month]
+pages[normalize_page_numbers]
+;}
diff --git a/src/test/search/resources/test-library-D.bib b/src/test/search/resources/test-library-D.bib
new file mode 100644
index 00000000000..6d78ef8dd5d
--- /dev/null
+++ b/src/test/search/resources/test-library-D.bib
@@ -0,0 +1,55 @@
+@Misc{entry1,
+  author = {Test},
+  title  = {Case},
+  groups = {A},
+}
+
+@Misc{entry2,
+  author = {TEST},
+  title  = {CASE},
+  groups = {A},
+}
+
+@Misc{entry3,
+  author = {Hello},
+  title  = {World},
+  groups = {A},
+}
+
+@Misc{entry4,
+  author = {HELLO},
+  title  = {WORLD},
+  groups = {A},
+}
+
+@Misc{entry5,
+  author = {tesT},
+  title  = {casE},
+  groups = {B},
+}
+
+@Misc{entry6,
+  author = {test},
+  title  = {case},
+  groups = {B},
+}
+
+@Misc{entry7,
+  author = {hellO},
+  title  = {worlD},
+  groups = {B},
+}
+
+@Misc{entry8,
+  author = {hello},
+  title  = {world},
+  groups = {B},
+}
+
+@Comment{jabref-meta: databaseType:bibtex;}
+
+@Comment{jabref-meta: grouping:
+0 AllEntriesGroup:;
+1 StaticGroup:A\;0\;0\;0x8a8a8aff\;\;\;;
+1 StaticGroup:B\;0\;1\;0x8a8a8aff\;\;\;;
+}