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/workflows/automerge.yml b/.github/workflows/automerge.yml
index 7b4a136db05..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.8.0"
-        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 ff7d33c0e28..31cdefde5ce 100644
--- a/.github/workflows/cleanup_pr.yml
+++ b/.github/workflows/cleanup_pr.yml
@@ -26,7 +26,7 @@ jobs:
           BUILDJABREFPRIVATEKEY: ${{ secrets.buildJabRefPrivateKey }}
       - 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/pull/${{ github.event.pull_request.number }} || true
           host: build-upload.jabref.org
diff --git a/.github/workflows/deployment-arm64.yml b/.github/workflows/deployment-arm64.yml
index 3d022b1350d..38693c6fd8b 100644
--- a/.github/workflows/deployment-arm64.yml
+++ b/.github/workflows/deployment-arm64.yml
@@ -5,11 +5,12 @@ on:
     inputs:
       notarization:
         type: boolean
-        required: false
-        default: false
+        required: true
+        default: true
   push:
    branches:
     - arm64mac-release
+    - updateArm64Notarization
 
 env:
   SpringerNatureAPIKey: ${{ secrets.SpringerNatureAPIKey }}
@@ -34,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:
@@ -78,7 +78,7 @@ jobs:
             sed -i'.bak' -e "s/JavaLanguageVersion.of(20)/JavaLanguageVersion.of(21)/" build.gradle
       - name: Clean up keychain
         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
         uses: apple-actions/import-codesign-certs@v2
         with:
@@ -92,8 +92,13 @@ jobs:
           p12-password: ${{ secrets.OSX_CERT_PWD }}
           create-keychain: false
           keychain-password: jabref
+      - 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   
+        run: ./gradlew -i -PprojVersion="${{ steps.gitversion.outputs.AssemblySemVer }}" -PprojVersionInfo="${{ steps.gitversion.outputs.InformationalVersion }}" prepareModulesDir
       - name: Build dmg (macos)
         shell: bash
         run: |
@@ -138,40 +143,38 @@ jobs:
           --resource-dir buildres/mac \
           --file-associations buildres/mac/bibtexAssociations.properties \
           --jlink-options --bind-services
-      - name: Rename files
-        shell: pwsh
+      - name: Rename files with arm64 suffix as well
+        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"}
+          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: |
-          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
+          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: |
-          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
+          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: ${{ matrix.archivePortable }}
+        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: ${{ !startsWith(github.ref, 'refs/heads/gh-readonly-queue') }}
         uses: actions/upload-artifact@v3
         with:
           name: JabRef-${{ matrix.displayName }}
           path: build/distribution
-      - name: Upload to builds.jabref.org (TODO - won't run on Mac, because Dockerized action)
-        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 }}/
diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml
index 5675493901b..c439988a226 100644
--- a/.github/workflows/deployment.yml
+++ b/.github/workflows/deployment.yml
@@ -22,6 +22,7 @@ on:
       - 'docs/**'
       - 'src/test/**'
       - 'README.md'
+  merge_group:
 
 env:
   SpringerNatureAPIKey: ${{ secrets.SpringerNatureAPIKey }}
@@ -54,7 +55,6 @@ jobs:
             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 }}
@@ -74,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:
@@ -223,7 +229,7 @@ jobs:
           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 builds.jabref.org (ubuntu)
-        if: (matrix.os == 'ubuntu-latest') && (steps.checksecrets.outputs.secretspresent == 'YES')
+        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 }}
@@ -234,13 +240,13 @@ jobs:
           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')
+        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 (macos)
-        if: (matrix.os == 'macos-latest') && (steps.checksecrets.outputs.secretspresent == 'YES')
+        if: (matrix.os == 'macos-latest') && (steps.checksecrets.outputs.secretspresent == 'YES') && (!startsWith(github.ref, 'refs/heads/gh-readonly-queue'))
         uses: actions/upload-artifact@v3
         with:
           # tbn = to-be-notarized
@@ -283,25 +289,25 @@ jobs:
           name: JabRef-macOS-tbn
           path: build/distribution/
       - name: Notarize dmg
-        if: (steps.checksecrets.outputs.secretspresent == 'YES') && ((startsWith(github.ref, 'refs/tags/') || (${{ inputs.notarization }}))
+        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 }}))
+        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 }}.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: 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
@@ -312,6 +318,7 @@ jobs:
     name: Upload binaries on builds.jabref.org
     runs-on: ubuntu-latest
     needs: [build, notarize]
+    if: ${{ !startsWith(github.ref, 'refs/heads/gh-readonly-queue') }}
     steps:
       - name: Check secrets presence
         id: checksecrets
@@ -346,13 +353,13 @@ jobs:
           name: JabRef-windows
           path: build/distribution
       - name: Get macOS binaries unsigned
-        if: (steps.checksecrets.outputs.secretspresent == 'YES') && ! (${{ inputs.notarization }})) && ! (startsWith(github.ref, 'refs/tags/')
+        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 }})) || (startsWith(github.ref, 'refs/tags/'))
+        if: (steps.checksecrets.outputs.secretspresent == 'YES') && (inputs.notarization == true || startsWith(github.ref, 'refs/tags/'))
         uses: actions/download-artifact@master
         with:
           name: JabRef-macOS
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 361d27b8218..ac6107c713c 100644
--- a/.github/workflows/refresh-journal-lists.yml
+++ b/.github/workflows/refresh-journal-lists.yml
@@ -58,17 +58,8 @@ jobs:
           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 abbreviation lists"
           commit-message: Update journal abbreviation lists
-      - name: Commit and push changes
-        uses: EndBug/add-and-commit@v9
-        if: github.ref != 'refs/heads/main'
-        with:
-          message: 'Update journal abbreviation lists'
-          committer_email: actions@github.com
-          fetch: false
-          push: true
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index dc6c0b63fa2..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:
@@ -201,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 5b709f65ea7..1d3864a220b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -477,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/CHANGELOG.md b/CHANGELOG.md
index f62f79d5404..6088e85301e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,21 @@ 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)
@@ -18,7 +33,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 - 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 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)
@@ -34,20 +49,27 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 - 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 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.5 for the fulltext search. The search index will be rebuild. [#9584](https://github.com/JabRef/jabref/pull/9584)
+- 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.
+- 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)
@@ -70,15 +92,17 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 - 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)
+- 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 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)
@@ -111,6 +135,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 - 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)
@@ -121,6 +146,12 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 - 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
 
@@ -128,6 +159,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 - 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
 
@@ -315,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
 
@@ -1090,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
@@ -1103,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/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/build.gradle b/build.gradle
index ba859b90c0b..c5a92c9f959 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ 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'
 
@@ -28,7 +28,7 @@ plugins {
 
     id 'idea'
 
-    id 'org.openrewrite.rewrite' version '6.1.16'
+    id 'org.openrewrite.rewrite' version '6.1.25'
 }
 
 // Enable following for debugging
@@ -118,9 +118,9 @@ 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.7.0'
     implementation 'org.apache.lucene:lucene-queryparser:9.7.0'
@@ -129,20 +129,20 @@ dependencies {
     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 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.75'
+    implementation 'org.bouncycastle:bcprov-jdk18on:1.76'
 
     implementation 'commons-cli:commons-cli:1.5.0'
 
-    implementation 'org.libreoffice:unoloader:7.5.3'
+    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.3'
+    implementation 'com.github.javakeyring:java-keyring:1.0.4'
 
     antlr4 'org.antlr:antlr4:4.13.0'
     implementation 'org.antlr:antlr4-runtime:4.13.0'
@@ -161,7 +161,7 @@ dependencies {
         exclude module: 'oraclepki'
     }
 
-    implementation ('com.google.guava:guava:32.1.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"
     }
@@ -177,8 +177,8 @@ dependencies {
     implementation 'de.saxsys:mvvmfx:1.8.0'
     implementation 'com.tobiasdiez:easybind:2.2.1-SNAPSHOT'
     implementation 'org.fxmisc.flowless:flowless:0.7.1'
-    implementation 'org.fxmisc.richtext:richtextfx:0.11.0'
-    implementation (group: 'com.dlsc.gemsfx', name: 'gemsfx', version: '1.74.0') {
+    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'
     }
@@ -214,25 +214,25 @@ dependencies {
 
     implementation group: 'org.jooq', name: 'jool', version: '0.9.15'
 
-    testImplementation 'io.github.classgraph:classgraph:4.8.161'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.9.3'
-    testImplementation 'org.junit.platform:junit-platform-launcher:1.9.3'
+    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.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.12.1'
+    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.0.7"))
+    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")
 }
@@ -272,9 +272,10 @@ processResources {
     }
 }
 
-task generateSource(dependsOn: ["generateBstGrammarSource",
-                                "generateSearchGrammarSource",
-                                "generateCitaviSource"]) {
+tasks.register('generateSource') {
+    dependsOn("generateBstGrammarSource",
+            "generateSearchGrammarSource",
+            "generateCitaviSource")
     group = 'JabRef'
     description 'Generates all necessary (Java) source files.'
 }
@@ -291,10 +292,10 @@ 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/")
@@ -302,8 +303,7 @@ tasks.register("generateSearchGrammarSource", JavaExec) {
 }
 
 
-
-task generateCitaviSource(type: XjcTask) {
+tasks.register('generateCitaviSource', XjcTask) {
     group = 'JabRef'
     description = "Generates java files for the citavi importer."
 
@@ -312,7 +312,7 @@ task generateCitaviSource(type: XjcTask) {
     javaPackage = "org.jabref.logic.importer.fileformat.citavi"
 }
 
-task generateJournalAbbreviationList(type: JournalAbbreviationConverter) {
+tasks.register('generateJournalAbbreviationList', JournalAbbreviationConverter) {
     group = 'JabRef'
     description = "Converts the comma-separated journal abbreviation file to a H2 MVStore."
 
@@ -323,7 +323,7 @@ task generateJournalAbbreviationList(type: JournalAbbreviationConverter) {
     outputDir = file("src/main/resources/journals")
 }
 
-tasks.withType(JavaCompile) {
+tasks.withType(JavaCompile).configureEach {
     options.encoding = 'UTF-8'
 }
 
@@ -377,9 +377,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'
         ])
@@ -610,6 +610,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"
             ]
         }
@@ -639,8 +640,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/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/american-sociological-association.csl b/buildres/csl/csl-styles/american-sociological-association.csl
index 71fc70746ff..15b0f8dba8b 100644
--- a/buildres/csl/csl-styles/american-sociological-association.csl
+++ b/buildres/csl/csl-styles/american-sociological-association.csl
@@ -16,7 +16,7 @@
     <category citation-format="author-date"/>
     <category field="sociology"/>
     <summary>The ASA style following the 6th edition of the Style Guide</summary>
-    <updated>2022-05-08T21:48:56+00:00</updated>
+    <updated>2023-07-16T21:48:56+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <locale xml:lang="en">
@@ -38,8 +38,7 @@
       <name and="text" name-as-sort-order="first" sort-separator=", " delimiter=", " delimiter-precedes-last="always" initialize="false" initialize-with=". "/>
       <label form="short" prefix=", "/>
       <substitute>
-        <names variable="editor"/>
-        <names variable="translator"/>
+        <names variable="editor translator director"/>
         <choose>
           <if type="report">
             <text variable="publisher"/>
@@ -53,8 +52,7 @@
     <names variable="author">
       <name form="short" and="text" delimiter=", " initialize-with=". "/>
       <substitute>
-        <names variable="editor"/>
-        <names variable="translator"/>
+        <names variable="editor director translator"/>
         <choose>
           <if type="report">
             <text variable="publisher"/>
diff --git a/buildres/csl/csl-styles/apa-annotated-bibliography.csl b/buildres/csl/csl-styles/apa-annotated-bibliography.csl
index 15d4d148658..8646210348b 100644
--- a/buildres/csl/csl-styles/apa-annotated-bibliography.csl
+++ b/buildres/csl/csl-styles/apa-annotated-bibliography.csl
@@ -35,295 +35,60 @@
       <term name="circa" form="short">ca.</term>
       <term name="bc"> B.C.E.</term>
       <term name="ad"> C.E.</term>
-      <term name="letter">personal communication</term>
-      <term name="letter" form="short">letter</term>
       <term name="issue" form="long">
         <single>issue</single>
         <multiple>issues</multiple>
       </term>
-    </terms>
-  </locale>
-  <locale xml:lang="af">
-    <terms>
-      <term name="letter">persoonlike kommunikasie</term>
-      <term name="letter" form="short">brief</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ar">
-    <terms>
-      <term name="letter">اتصال شخصي</term>
-      <term name="letter" form="short">خطاب</term>
-    </terms>
-  </locale>
-  <locale xml:lang="bg">
-    <terms>
-      <term name="letter">лична комуникация</term>
-      <term name="letter" form="short">писмо</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ca">
-    <terms>
-      <term name="letter">comunicació personal</term>
-      <term name="letter" form="short">carta</term>
-    </terms>
-  </locale>
-  <locale xml:lang="cs">
-    <terms>
-      <term name="letter">osobní komunikace</term>
-      <term name="letter" form="short">dopis</term>
-    </terms>
-  </locale>
-  <locale xml:lang="cy">
-    <terms>
-      <term name="letter">cyfathrebu personol</term>
-      <term name="letter" form="short">llythyr</term>
+      <term name="software">computer software</term>
     </terms>
   </locale>
   <locale xml:lang="da">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikation</term>
-      <term name="letter" form="short">brev</term>
     </terms>
   </locale>
   <locale xml:lang="de">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">persönliche Kommunikation</term>
-      <term name="letter" form="short">Brief</term>
-    </terms>
-  </locale>
-  <locale xml:lang="el">
-    <terms>
-      <term name="letter">προσωπική επικοινωνία</term>
-      <term name="letter" form="short">επιστολή</term>
     </terms>
   </locale>
   <locale xml:lang="es">
     <terms>
       <term name="from">de</term>
-      <term name="letter">comunicación personal</term>
-      <term name="letter" form="short">carta</term>
-    </terms>
-  </locale>
-  <locale xml:lang="et">
-    <terms>
-      <term name="letter">isiklik suhtlus</term>
-      <term name="letter" form="short">kiri</term>
-    </terms>
-  </locale>
-  <locale xml:lang="eu">
-    <terms>
-      <term name="letter">komunikazio pertsonala</term>
-      <term name="letter" form="short">gutuna</term>
-    </terms>
-  </locale>
-  <locale xml:lang="fa">
-    <terms>
-      <term name="letter">ارتباط شخصی</term>
-      <term name="letter" form="short">نامه</term>
-    </terms>
-  </locale>
-  <locale xml:lang="fi">
-    <terms>
-      <term name="letter">henkilökohtainen viestintä</term>
-      <term name="letter" form="short">kirje</term>
     </terms>
   </locale>
   <locale xml:lang="fr">
     <terms>
-      <term name="letter">communication personnelle</term>
-      <term name="letter" form="short">lettre</term>
       <term name="editor" form="short">
         <single>éd.</single>
         <multiple>éds.</multiple>
       </term>
     </terms>
   </locale>
-  <locale xml:lang="he">
-    <terms>
-      <term name="letter">תקשורת אישית</term>
-      <term name="letter" form="short">מכתב</term>
-    </terms>
-  </locale>
-  <locale xml:lang="hr">
-    <terms>
-      <term name="letter">osobna komunikacija</term>
-      <term name="letter" form="short">pismo</term>
-    </terms>
-  </locale>
-  <locale xml:lang="hu">
-    <terms>
-      <term name="letter">személyes kommunikáció</term>
-      <term name="letter" form="short">levél</term>
-    </terms>
-  </locale>
-  <locale xml:lang="id">
-    <terms>
-      <term name="letter">komunikasi pribadi</term>
-      <term name="letter" form="short">surat</term>
-    </terms>
-  </locale>
-  <locale xml:lang="is">
-    <terms>
-      <term name="letter">persónuleg samskipti</term>
-      <term name="letter" form="short">bréf</term>
-    </terms>
-  </locale>
-  <locale xml:lang="it">
-    <terms>
-      <term name="letter">comunicazione personale</term>
-      <term name="letter" form="short">lettera</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ja">
-    <terms>
-      <term name="letter">個人的なやり取り</term>
-      <term name="letter" form="short">手紙</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ko">
-    <terms>
-      <term name="letter">개인 서신</term>
-      <term name="letter" form="short">편지</term>
-    </terms>
-  </locale>
-  <locale xml:lang="la">
-    <terms>
-      <term name="letter"/>
-      <term name="letter" form="short">epistula</term>
-    </terms>
-  </locale>
-  <locale xml:lang="lt">
-    <terms>
-      <term name="letter">communicationis personalis</term>
-      <term name="letter" form="short"/>
-    </terms>
-  </locale>
-  <locale xml:lang="lv">
-    <terms>
-      <term name="letter">personīga komunikācija</term>
-      <term name="letter" form="short">vēstule</term>
-    </terms>
-  </locale>
-  <locale xml:lang="mn">
-    <terms>
-      <term name="letter">хувийн харилцаа холбоо</term>
-      <term name="letter" form="short">захиа</term>
-    </terms>
-  </locale>
   <locale xml:lang="nb">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikasjon</term>
-      <term name="letter" form="short">brev</term>
     </terms>
   </locale>
   <locale xml:lang="nl">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">persoonlijke communicatie</term>
-      <term name="letter" form="short">brief</term>
     </terms>
   </locale>
   <locale xml:lang="nn">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikasjon</term>
-      <term name="letter" form="short">brev</term>
-    </terms>
-  </locale>
-  <locale xml:lang="pl">
-    <terms>
-      <term name="letter">osobista komunikacja</term>
-      <term name="letter" form="short">list</term>
-    </terms>
-  </locale>
-  <locale xml:lang="pt">
-    <terms>
-      <term name="letter">comunicação pessoal</term>
-      <term name="letter" form="short">carta</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ro">
-    <terms>
-      <term name="letter">comunicare personală</term>
-      <term name="letter" form="short">scrisoare</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ru">
-    <terms>
-      <term name="letter">личная переписка</term>
-      <term name="letter" form="short">письмо</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sk">
-    <terms>
-      <term name="letter">osobná komunikácia</term>
-      <term name="letter" form="short">list</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sl">
-    <terms>
-      <term name="letter">osebna komunikacija</term>
-      <term name="letter" form="short">pismo</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sr">
-    <terms>
-      <term name="letter">лична комуникација</term>
-      <term name="letter" form="short">писмо</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sv">
-    <terms>
-      <term name="letter">personlig kommunikation</term>
-      <term name="letter" form="short">brev</term>
-    </terms>
-  </locale>
-  <locale xml:lang="th">
-    <terms>
-      <term name="letter">การสื่อสารส่วนบุคคล</term>
-      <term name="letter" form="short">จดหมาย</term>
-    </terms>
-  </locale>
-  <locale xml:lang="tr">
-    <terms>
-      <term name="letter">kişisel iletişim</term>
-      <term name="letter" form="short">mektup</term>
-    </terms>
-  </locale>
-  <locale xml:lang="uk">
-    <terms>
-      <term name="letter">особисте спілкування</term>
-      <term name="letter" form="short">лист</term>
-    </terms>
-  </locale>
-  <locale xml:lang="vi">
-    <terms>
-      <term name="letter">giao tiếp cá nhân</term>
-      <term name="letter" form="short">thư</term>
-    </terms>
-  </locale>
-  <locale xml:lang="zh-CN">
-    <terms>
-      <term name="letter">的私人交流</term>
-      <term name="letter" form="short">信函</term>
-    </terms>
-  </locale>
-  <locale xml:lang="zh-TW">
-    <terms>
-      <term name="letter">私人通訊</term>
-      <term name="letter" form="short">信函</term>
     </terms>
   </locale>
   <!-- General categories of item types:
        Periodical: article-journal article-magazine article-newspaper post-weblog review review-book
        Periodical or Booklike: paper-conference
-       Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure
+       Booklike: article book broadcast chapter classic collection dataset document
+                 entry entry-dictionary entry-encyclopedia event figure
                  graphic interview manuscript map motion_picture musical_score pamphlet patent
-                 personal_communication report song speech thesis post webpage
-       Legal: bill legal_case legislation treaty
+                 performance periodical personal_communication post report
+                 software song speech standard thesis webpage
+       Legal: bill hearing legal_case legislation regulation treaty
   -->
   <!-- APA references contain four parts: author, date, title, source -->
   <macro name="author-bib">
@@ -399,8 +164,7 @@
                   <text macro="title-intext"/>
                 </substitute>
               </names>
-              <!-- Replace with term="personal-communication" if that becomes available -->
-              <text term="letter"/>
+              <text term="personal-communication"/>
             </group>
           </if>
           <else>
@@ -638,23 +402,23 @@
       <if variable="title" match="none">
         <text macro="bracketed-intext" prefix="[" suffix="]"/>
       </if>
+      <else-if type="hearing">
+        <!-- Hearings are italicized -->
+        <text variable="title" form="short" font-style="italic" text-case="title"/>
+      </else-if>
       <else-if type="bill">
-        <!-- If a bill has no number or container-title, assume it is a hearing; italic -->
+        <!-- Bills are not italicized and substitute bill number if no title. -->
         <choose>
-          <if variable="number container-title" match="none">
-            <text variable="title" form="short" font-style="italic" text-case="title"/>
-          </if>
-          <else-if variable="title">
+          <if variable="title">
             <text variable="title" form="short" text-case="title"/>
-          </else-if>
+          </if>
           <else>
             <group delimiter=" ">
               <text variable="genre"/>
               <group delimiter=" ">
                 <choose>
                   <if variable="chapter-number container-title" match="none">
-                    <!-- Replace with label variable="number" as that becomes available -->
-                    <text term="issue" form="short"/>
+                    <label variable="number" form="short"/>
                   </if>
                 </choose>
                 <text variable="number"/>
@@ -697,13 +461,11 @@
                 <text variable="genre" text-case="capitalize-first"/>
               </if>
               <else>
-                <!-- This should be localized -->
-                <text value="patent" text-case="capitalize-first"/>
+                <text term="patent" text-case="capitalize-first"/>
               </else>
             </choose>
             <group delimiter=" ">
-              <!-- Replace with label variable="number" if that becomes available -->
-              <text term="issue" form="short" text-case="capitalize-first"/>
+              <label variable="number" form="short" text-case="capitalize-first"/>
               <text variable="number"/>
             </group>
           </group>
@@ -881,7 +643,7 @@
                           <text variable="medium" text-case="capitalize-first"/>
                         </else-if>
                         <else>
-                          <text term="letter" form="short" text-case="capitalize-first"/>
+                          <text term="letter" text-case="capitalize-first"/>
                         </else>
                       </choose>
                     </if>
@@ -891,7 +653,7 @@
                           <text variable="medium" text-case="capitalize-first"/>
                         </if>
                         <else>
-                          <text term="letter" form="short" text-case="capitalize-first"/>
+                          <text term="letter" text-case="capitalize-first"/>
                         </else>
                       </choose>
                     </else>
@@ -992,14 +754,7 @@
                 </if>
               </choose>
             </if>
-            <else-if type="book">
-              <choose>
-                <if variable="version" match="none">
-                  <text macro="format"/>
-                </if>
-              </choose>
-            </else-if>
-            <else-if type="report" match="none">
+            <else-if type="report software" match="none">
               <text macro="format"/>
             </else-if>
           </choose>
@@ -1011,8 +766,10 @@
     <group prefix="[" suffix="]">
       <choose>
         <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
-          <!-- This should be localized -->
-          <text macro="reviewed-title-intext" prefix="Review of "/>
+          <group delimiter=" ">
+            <text term="review-of" text-case="capitalize-first"/>
+            <text macro="reviewed-title-intext"/>
+          </group>
         </if>
         <else-if variable="interviewer" type="interview" match="any">
           <names variable="interviewer">
@@ -1033,7 +790,7 @@
                     <text variable="genre" text-case="capitalize-first"/>
                   </if>
                   <else>
-                    <text term="letter" form="short" text-case="capitalize-first"/>
+                    <text term="letter" text-case="capitalize-first"/>
                   </else>
                 </choose>
                 <names variable="recipient" delimiter=", ">
@@ -1064,7 +821,7 @@
             </if>
           </choose>
         </if>
-        <else-if type="book" variable="version" match="all">
+        <else-if type="software" match="all">
           <!-- For entries in mobile app reference works, place bracketed after the container-title -->
           <text macro="format"/>
         </else-if>
@@ -1172,8 +929,7 @@
             <text variable="genre" text-case="title"/>
             <choose>
               <if is-numeric="number">
-                <!-- Replace with label variable="number" if that becomes available -->
-                <text term="issue" form="short" text-case="capitalize-first"/>
+                <label variable="number" form="short" text-case="capitalize-first"/>
                 <text variable="number"/>
               </if>
               <else>
@@ -1222,8 +978,7 @@
     <choose>
       <if is-numeric="version">
         <group delimiter=" ">
-          <!-- replace with label variable="version" if that becomes available -->
-          <text term="version" text-case="capitalize-first"/>
+          <label variable="version" text-case="capitalize-first"/>
           <text variable="version"/>
         </group>
       </if>
@@ -1271,8 +1026,7 @@
         </if>
         <else>
           <group>
-            <!-- Replace with label variable="number-of-volumes" if that becomes available -->
-            <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+            <label variable="number-of-volumes" form="short" text-case="capitalize-first" suffix=" "/>
             <text term="page-range-delimiter" prefix="1"/>
             <number variable="number-of-volumes" form="numeric"/>
           </group>
@@ -1326,18 +1080,16 @@
         </group>
       </if>
       <!-- Generic labels for specific types -->
-      <!-- These should be localized when possible -->
       <else-if type="dataset">
-        <text value="Data set"/>
+        <text term="dataset"/>
       </else-if>
-      <else-if type="book" variable="version" match="all">
-        <!-- Replace with type="software" and term="software" as that becomes available -->
-        <text value="Computer software"/>
+      <else-if type="software">
+        <text term="software" text-case="capitalize-first"/>
       </else-if>
       <else-if type="interview personal_communication" match="any">
         <choose>
           <if variable="archive container-title DOI publisher URL" match="none">
-            <text term="letter" text-case="capitalize-first"/>
+            <text term="personal-communication" text-case="capitalize-first"/>
           </if>
           <else-if type="interview">
             <text term="interview" text-case="capitalize-first"/>
@@ -1345,7 +1097,7 @@
         </choose>
       </else-if>
       <else-if type="map">
-        <text value="Map"/>
+        <text term="map" text-case="capitalize-first"/>
       </else-if>
     </choose>
   </macro>
@@ -1358,18 +1110,16 @@
         <text variable="medium" text-case="capitalize-first"/>
       </else-if>
       <!-- Generic labels for specific types -->
-      <!-- These should be localized when possible -->
       <else-if type="dataset">
-        <text value="Data set"/>
+        <text term="dataset"/>
       </else-if>
-      <else-if type="book" variable="version" match="all">
-        <!-- Replace with type="software" and term="software" as that becomes available -->
-        <text value="Computer software"/>
+      <else-if type="software">
+        <text term="software" text-case="capitalize-first"/>
       </else-if>
       <else-if type="interview personal_communication" match="any">
         <choose>
           <if variable="archive container-title DOI publisher URL" match="none">
-            <text term="letter" text-case="capitalize-first"/>
+            <text term="personal-communication" text-case="capitalize-first"/>
           </if>
           <else-if type="interview">
             <text term="interview" text-case="capitalize-first"/>
@@ -1377,7 +1127,7 @@
         </choose>
       </else-if>
       <else-if type="map">
-        <text value="Map"/>
+        <text term="map"/>
       </else-if>
     </choose>
   </macro>
@@ -1616,83 +1366,56 @@
   </macro>
   <!-- Legal citations have their own rules -->
   <macro name="legal-cites">
+    <!-- TODO: Add new item types -->
     <choose>
-      <if type="legal_case">
-        <group delimiter=". ">
-          <group delimiter=", ">
-            <text variable="title"/>
-            <group delimiter=" ">
-              <text macro="container-legal"/>
-              <text macro="date-legal"/>
-            </group>
-            <text variable="references"/>
-          </group>
+      <if type="treaty">
+        <!-- APA generally defers to Bluebook for legal citations, but diverges without
+             explanation for treaty items. The Bluebook format that was used in APA 6th
+             ed. is used here. -->
+        <group delimiter=", ">
+          <text variable="title" text-case="title"/>
+          <names variable="author">
+            <name initialize-with="." form="short" delimiter="-"/>
+          </names>
+          <text macro="date-legal"/>
+          <text macro="container-legal"/>
           <text macro="access"/>
         </group>
       </if>
-      <else-if type="bill">
-        <!-- Currently designed to handle bills, resolutions, hearings, rederal reports. -->
+      <else>
+        <!-- For `bill`: currently designed to handle bills, resolutions, federal reports. -->
+        <!-- For `legislation`: currently designed to handle statutes, codified regulations, executive orders. -->
         <group delimiter=". ">
           <group delimiter=", ">
             <choose>
-              <if variable="number container-title" match="none">
-                <!-- If no number or container-title, then assume it is a hearing -->
-                <text variable="title" font-style="italic"/>
-              </if>
-              <else>
+              <if type="bill legal_case legislation" match="any">
                 <text variable="title"/>
-              </else>
+              </if>
+              <else-if type="hearing">
+                <text variable="title" font-style="italic"/>
+              </else-if>
             </choose>
             <group delimiter=" ">
               <text macro="container-legal"/>
               <text macro="date-legal"/>
               <choose>
-                <if variable="number container-title" match="none">
-                  <!-- If no number or container-title, then assume it is a hearing -->
+                <if type="hearing">
                   <names variable="author" prefix="(testimony of " suffix=")">
+                    <!-- TODO: Localize this with the hearing term. -->
                     <name and="symbol" delimiter=", "/>
                   </names>
                 </if>
-                <else>
+                <else-if type="bill legislation" match="any">
+                  <!-- `legislation`: For uncodified regulations, assume future code section is in status. -->
                   <text variable="status" prefix="(" suffix=")"/>
-                </else>
+                </else-if>
               </choose>
             </group>
             <text variable="references"/>
           </group>
           <text macro="access"/>
         </group>
-      </else-if>
-      <else-if type="legislation">
-        <!-- Currently designed to handle statutes, codified regulations, executive orders.
-             For uncodified regulations, assume future code section is in status. -->
-        <group delimiter=". ">
-          <group delimiter=", ">
-            <text variable="title"/>
-            <group delimiter=" ">
-              <text macro="container-legal"/>
-              <text macro="date-legal"/>
-              <text variable="status" prefix="(" suffix=")"/>
-            </group>
-            <text variable="references"/>
-          </group>
-          <text macro="access"/>
-        </group>
-      </else-if>
-      <else-if type="treaty">
-        <!-- APA generally defers to Bluebook for legal citations, but diverges without
-             explanation for treaty items. The Bluebook format that was used in APA 6th
-             ed. is used here. -->
-        <group delimiter=", ">
-          <text variable="title" text-case="title"/>
-          <names variable="author">
-            <name initialize-with="." form="short" delimiter="-"/>
-          </names>
-          <text macro="date-legal"/>
-          <text macro="container-legal"/>
-          <text macro="access"/>
-        </group>
-      </else-if>
+      </else>
     </choose>
   </macro>
   <macro name="date-legal">
@@ -1711,7 +1434,7 @@
           </choose>
         </group>
       </if>
-      <else-if type="bill legislation" match="any">
+      <else-if type="bill legislation hearing" match="any">
         <group prefix="(" suffix=")" delimiter=" ">
           <group delimiter=" ">
             <date variable="original-date">
@@ -1740,8 +1463,7 @@
                 <text variable="volume"/>
                 <text variable="container-title"/>
                 <group delimiter=" ">
-                  <!-- Change to label variable="section" as that becomes available -->
-                  <text term="section" form="symbol"/>
+                  <label variable="section" form="symbol"/>
                   <text variable="section"/>
                 </group>
                 <choose>
@@ -1758,8 +1480,7 @@
               <group delimiter=" ">
                 <choose>
                   <if is-numeric="number">
-                    <!-- Replace with label variable="number" if that becomes available -->
-                    <text term="issue" form="short" text-case="capitalize-first"/>
+                    <label variable="number" form="short" text-case="capitalize-first"/>
                   </if>
                 </choose>
                 <text variable="number"/>
@@ -1775,8 +1496,7 @@
             <group delimiter=" ">
               <choose>
                 <if variable="chapter-number container-title" match="none">
-                  <!-- Replace with label variable="number" as that becomes available -->
-                  <text term="issue" form="short"/>
+                  <label variable="number" form="short"/>
                 </if>
               </choose>
               <text variable="number"/>
@@ -1811,8 +1531,7 @@
               <choose>
                 <if variable="section">
                   <group delimiter=" ">
-                    <!-- Change to label variable="section" as that becomes available -->
-                    <text term="section" form="symbol"/>
+                    <label variable="section" form="symbol"/>
                     <text variable="section"/>
                   </group>
                 </if>
@@ -1834,8 +1553,7 @@
             </if>
             <else>
               <group delimiter=" ">
-                <!-- Replace with label variable="number" if that becomes available -->
-                <text term="issue" form="short" text-case="capitalize-first"/>
+                <label variable="number" form="short" text-case="capitalize-first"/>
                 <text variable="number"/>
               </group>
             </else>
diff --git a/buildres/csl/csl-styles/apa-cv.csl b/buildres/csl/csl-styles/apa-cv.csl
index 8d36a8a8d21..dec03fa0e49 100644
--- a/buildres/csl/csl-styles/apa-cv.csl
+++ b/buildres/csl/csl-styles/apa-cv.csl
@@ -35,295 +35,60 @@
       <term name="circa" form="short">ca.</term>
       <term name="bc"> B.C.E.</term>
       <term name="ad"> C.E.</term>
-      <term name="letter">personal communication</term>
-      <term name="letter" form="short">letter</term>
       <term name="issue" form="long">
         <single>issue</single>
         <multiple>issues</multiple>
       </term>
-    </terms>
-  </locale>
-  <locale xml:lang="af">
-    <terms>
-      <term name="letter">persoonlike kommunikasie</term>
-      <term name="letter" form="short">brief</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ar">
-    <terms>
-      <term name="letter">اتصال شخصي</term>
-      <term name="letter" form="short">خطاب</term>
-    </terms>
-  </locale>
-  <locale xml:lang="bg">
-    <terms>
-      <term name="letter">лична комуникация</term>
-      <term name="letter" form="short">писмо</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ca">
-    <terms>
-      <term name="letter">comunicació personal</term>
-      <term name="letter" form="short">carta</term>
-    </terms>
-  </locale>
-  <locale xml:lang="cs">
-    <terms>
-      <term name="letter">osobní komunikace</term>
-      <term name="letter" form="short">dopis</term>
-    </terms>
-  </locale>
-  <locale xml:lang="cy">
-    <terms>
-      <term name="letter">cyfathrebu personol</term>
-      <term name="letter" form="short">llythyr</term>
+      <term name="software">computer software</term>
     </terms>
   </locale>
   <locale xml:lang="da">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikation</term>
-      <term name="letter" form="short">brev</term>
     </terms>
   </locale>
   <locale xml:lang="de">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">persönliche Kommunikation</term>
-      <term name="letter" form="short">Brief</term>
-    </terms>
-  </locale>
-  <locale xml:lang="el">
-    <terms>
-      <term name="letter">προσωπική επικοινωνία</term>
-      <term name="letter" form="short">επιστολή</term>
     </terms>
   </locale>
   <locale xml:lang="es">
     <terms>
       <term name="from">de</term>
-      <term name="letter">comunicación personal</term>
-      <term name="letter" form="short">carta</term>
-    </terms>
-  </locale>
-  <locale xml:lang="et">
-    <terms>
-      <term name="letter">isiklik suhtlus</term>
-      <term name="letter" form="short">kiri</term>
-    </terms>
-  </locale>
-  <locale xml:lang="eu">
-    <terms>
-      <term name="letter">komunikazio pertsonala</term>
-      <term name="letter" form="short">gutuna</term>
-    </terms>
-  </locale>
-  <locale xml:lang="fa">
-    <terms>
-      <term name="letter">ارتباط شخصی</term>
-      <term name="letter" form="short">نامه</term>
-    </terms>
-  </locale>
-  <locale xml:lang="fi">
-    <terms>
-      <term name="letter">henkilökohtainen viestintä</term>
-      <term name="letter" form="short">kirje</term>
     </terms>
   </locale>
   <locale xml:lang="fr">
     <terms>
-      <term name="letter">communication personnelle</term>
-      <term name="letter" form="short">lettre</term>
       <term name="editor" form="short">
         <single>éd.</single>
         <multiple>éds.</multiple>
       </term>
     </terms>
   </locale>
-  <locale xml:lang="he">
-    <terms>
-      <term name="letter">תקשורת אישית</term>
-      <term name="letter" form="short">מכתב</term>
-    </terms>
-  </locale>
-  <locale xml:lang="hr">
-    <terms>
-      <term name="letter">osobna komunikacija</term>
-      <term name="letter" form="short">pismo</term>
-    </terms>
-  </locale>
-  <locale xml:lang="hu">
-    <terms>
-      <term name="letter">személyes kommunikáció</term>
-      <term name="letter" form="short">levél</term>
-    </terms>
-  </locale>
-  <locale xml:lang="id">
-    <terms>
-      <term name="letter">komunikasi pribadi</term>
-      <term name="letter" form="short">surat</term>
-    </terms>
-  </locale>
-  <locale xml:lang="is">
-    <terms>
-      <term name="letter">persónuleg samskipti</term>
-      <term name="letter" form="short">bréf</term>
-    </terms>
-  </locale>
-  <locale xml:lang="it">
-    <terms>
-      <term name="letter">comunicazione personale</term>
-      <term name="letter" form="short">lettera</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ja">
-    <terms>
-      <term name="letter">個人的なやり取り</term>
-      <term name="letter" form="short">手紙</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ko">
-    <terms>
-      <term name="letter">개인 서신</term>
-      <term name="letter" form="short">편지</term>
-    </terms>
-  </locale>
-  <locale xml:lang="la">
-    <terms>
-      <term name="letter"/>
-      <term name="letter" form="short">epistula</term>
-    </terms>
-  </locale>
-  <locale xml:lang="lt">
-    <terms>
-      <term name="letter">communicationis personalis</term>
-      <term name="letter" form="short"/>
-    </terms>
-  </locale>
-  <locale xml:lang="lv">
-    <terms>
-      <term name="letter">personīga komunikācija</term>
-      <term name="letter" form="short">vēstule</term>
-    </terms>
-  </locale>
-  <locale xml:lang="mn">
-    <terms>
-      <term name="letter">хувийн харилцаа холбоо</term>
-      <term name="letter" form="short">захиа</term>
-    </terms>
-  </locale>
   <locale xml:lang="nb">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikasjon</term>
-      <term name="letter" form="short">brev</term>
     </terms>
   </locale>
   <locale xml:lang="nl">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">persoonlijke communicatie</term>
-      <term name="letter" form="short">brief</term>
     </terms>
   </locale>
   <locale xml:lang="nn">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikasjon</term>
-      <term name="letter" form="short">brev</term>
-    </terms>
-  </locale>
-  <locale xml:lang="pl">
-    <terms>
-      <term name="letter">osobista komunikacja</term>
-      <term name="letter" form="short">list</term>
-    </terms>
-  </locale>
-  <locale xml:lang="pt">
-    <terms>
-      <term name="letter">comunicação pessoal</term>
-      <term name="letter" form="short">carta</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ro">
-    <terms>
-      <term name="letter">comunicare personală</term>
-      <term name="letter" form="short">scrisoare</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ru">
-    <terms>
-      <term name="letter">личная переписка</term>
-      <term name="letter" form="short">письмо</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sk">
-    <terms>
-      <term name="letter">osobná komunikácia</term>
-      <term name="letter" form="short">list</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sl">
-    <terms>
-      <term name="letter">osebna komunikacija</term>
-      <term name="letter" form="short">pismo</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sr">
-    <terms>
-      <term name="letter">лична комуникација</term>
-      <term name="letter" form="short">писмо</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sv">
-    <terms>
-      <term name="letter">personlig kommunikation</term>
-      <term name="letter" form="short">brev</term>
-    </terms>
-  </locale>
-  <locale xml:lang="th">
-    <terms>
-      <term name="letter">การสื่อสารส่วนบุคคล</term>
-      <term name="letter" form="short">จดหมาย</term>
-    </terms>
-  </locale>
-  <locale xml:lang="tr">
-    <terms>
-      <term name="letter">kişisel iletişim</term>
-      <term name="letter" form="short">mektup</term>
-    </terms>
-  </locale>
-  <locale xml:lang="uk">
-    <terms>
-      <term name="letter">особисте спілкування</term>
-      <term name="letter" form="short">лист</term>
-    </terms>
-  </locale>
-  <locale xml:lang="vi">
-    <terms>
-      <term name="letter">giao tiếp cá nhân</term>
-      <term name="letter" form="short">thư</term>
-    </terms>
-  </locale>
-  <locale xml:lang="zh-CN">
-    <terms>
-      <term name="letter">的私人交流</term>
-      <term name="letter" form="short">信函</term>
-    </terms>
-  </locale>
-  <locale xml:lang="zh-TW">
-    <terms>
-      <term name="letter">私人通訊</term>
-      <term name="letter" form="short">信函</term>
     </terms>
   </locale>
   <!-- General categories of item types:
-        Periodical: article-journal article-magazine article-newspaper post-weblog review review-book
-        Periodical or Booklike: paper-conference
-        Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure
-                  graphic interview manuscript map motion_picture musical_score pamphlet patent
-                  personal_communication report song speech thesis post webpage
-        Legal: bill legal_case legislation treaty
+       Periodical: article-journal article-magazine article-newspaper post-weblog review review-book
+       Periodical or Booklike: paper-conference
+       Booklike: article book broadcast chapter classic collection dataset document
+                 entry entry-dictionary entry-encyclopedia event figure
+                 graphic interview manuscript map motion_picture musical_score pamphlet patent
+                 performance periodical personal_communication post report
+                 software song speech standard thesis webpage
+       Legal: bill hearing legal_case legislation regulation treaty
   -->
   <!-- APA references contain four parts: author, date, title, source -->
   <macro name="author-bib">
@@ -534,13 +299,11 @@
                 <text variable="genre" text-case="capitalize-first"/>
               </if>
               <else>
-                <!-- This should be localized -->
-                <text value="patent" text-case="capitalize-first"/>
+                <text term="patent" text-case="capitalize-first"/>
               </else>
             </choose>
             <group delimiter=" ">
-              <!-- Replace with label variable="number" if that becomes available -->
-              <text term="issue" form="short" text-case="capitalize-first"/>
+              <label variable="number" form="short" text-case="capitalize-first"/>
               <text variable="number"/>
             </group>
           </group>
@@ -718,7 +481,7 @@
                           <text variable="medium" text-case="capitalize-first"/>
                         </else-if>
                         <else>
-                          <text term="letter" form="short" text-case="capitalize-first"/>
+                          <text term="letter" text-case="capitalize-first"/>
                         </else>
                       </choose>
                     </if>
@@ -728,7 +491,7 @@
                           <text variable="medium" text-case="capitalize-first"/>
                         </if>
                         <else>
-                          <text term="letter" form="short" text-case="capitalize-first"/>
+                          <text term="letter" text-case="capitalize-first"/>
                         </else>
                       </choose>
                     </else>
@@ -829,14 +592,7 @@
                 </if>
               </choose>
             </if>
-            <else-if type="book">
-              <choose>
-                <if variable="version" match="none">
-                  <text macro="format"/>
-                </if>
-              </choose>
-            </else-if>
-            <else-if type="report" match="none">
+            <else-if type="report software" match="none">
               <text macro="format"/>
             </else-if>
           </choose>
@@ -855,7 +611,7 @@
             </if>
           </choose>
         </if>
-        <else-if type="book" variable="version" match="all">
+        <else-if type="software" match="all">
           <!-- For entries in mobile app reference works, place bracketed after the container-title -->
           <text macro="format"/>
         </else-if>
@@ -963,8 +719,7 @@
             <text variable="genre" text-case="title"/>
             <choose>
               <if is-numeric="number">
-                <!-- Replace with label variable="number" if that becomes available -->
-                <text term="issue" form="short" text-case="capitalize-first"/>
+                <label variable="number" form="short" text-case="capitalize-first"/>
                 <text variable="number"/>
               </if>
               <else>
@@ -1013,8 +768,7 @@
     <choose>
       <if is-numeric="version">
         <group delimiter=" ">
-          <!-- replace with label variable="version" if that becomes available -->
-          <text term="version" text-case="capitalize-first"/>
+          <label variable="version" text-case="capitalize-first"/>
           <text variable="version"/>
         </group>
       </if>
@@ -1062,8 +816,7 @@
         </if>
         <else>
           <group>
-            <!-- Replace with label variable="number-of-volumes" if that becomes available -->
-            <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+            <label variable="number-of-volumes" form="short" text-case="capitalize-first" suffix=" "/>
             <text term="page-range-delimiter" prefix="1"/>
             <number variable="number-of-volumes" form="numeric"/>
           </group>
@@ -1105,18 +858,16 @@
         </group>
       </if>
       <!-- Generic labels for specific types -->
-      <!-- These should be localized when possible -->
       <else-if type="dataset">
-        <text value="Data set"/>
+        <text term="dataset"/>
       </else-if>
-      <else-if type="book" variable="version" match="all">
-        <!-- Replace with type="software" and term="software" as that becomes available -->
-        <text value="Computer software"/>
+      <else-if type="software">
+        <text term="software" text-case="capitalize-first"/>
       </else-if>
       <else-if type="interview personal_communication" match="any">
         <choose>
           <if variable="archive container-title DOI publisher URL" match="none">
-            <text term="letter" text-case="capitalize-first"/>
+            <text term="personal-communication" text-case="capitalize-first"/>
           </if>
           <else-if type="interview">
             <text term="interview" text-case="capitalize-first"/>
@@ -1124,7 +875,7 @@
         </choose>
       </else-if>
       <else-if type="map">
-        <text value="Map"/>
+        <text term="map" text-case="capitalize-first"/>
       </else-if>
     </choose>
   </macro>
@@ -1363,83 +1114,56 @@
   </macro>
   <!-- Legal citations have their own rules -->
   <macro name="legal-cites">
+    <!-- TODO: Add new item types -->
     <choose>
-      <if type="legal_case">
-        <group delimiter=". ">
-          <group delimiter=", ">
-            <text variable="title"/>
-            <group delimiter=" ">
-              <text macro="container-legal"/>
-              <text macro="date-legal"/>
-            </group>
-            <text variable="references"/>
-          </group>
+      <if type="treaty">
+        <!-- APA generally defers to Bluebook for legal citations, but diverges without
+             explanation for treaty items. The Bluebook format that was used in APA 6th
+             ed. is used here. -->
+        <group delimiter=", ">
+          <text variable="title" text-case="title"/>
+          <names variable="author">
+            <name initialize-with="." form="short" delimiter="-"/>
+          </names>
+          <text macro="date-legal"/>
+          <text macro="container-legal"/>
           <text macro="access"/>
         </group>
       </if>
-      <else-if type="bill">
-        <!-- Currently designed to handle bills, resolutions, hearings, rederal reports. -->
+      <else>
+        <!-- For `bill`: currently designed to handle bills, resolutions, federal reports. -->
+        <!-- For `legislation`: currently designed to handle statutes, codified regulations, executive orders. -->
         <group delimiter=". ">
           <group delimiter=", ">
             <choose>
-              <if variable="number container-title" match="none">
-                <!-- If no number or container-title, then assume it is a hearing -->
-                <text variable="title" font-style="italic"/>
-              </if>
-              <else>
+              <if type="bill legal_case legislation" match="any">
                 <text variable="title"/>
-              </else>
+              </if>
+              <else-if type="hearing">
+                <text variable="title" font-style="italic"/>
+              </else-if>
             </choose>
             <group delimiter=" ">
               <text macro="container-legal"/>
               <text macro="date-legal"/>
               <choose>
-                <if variable="number container-title" match="none">
-                  <!-- If no number or container-title, then assume it is a hearing -->
+                <if type="hearing">
                   <names variable="author" prefix="(testimony of " suffix=")">
+                    <!-- TODO: Localize this with the hearing term. -->
                     <name and="symbol" delimiter=", "/>
                   </names>
                 </if>
-                <else>
+                <else-if type="bill legislation" match="any">
+                  <!-- `legislation`: For uncodified regulations, assume future code section is in status. -->
                   <text variable="status" prefix="(" suffix=")"/>
-                </else>
+                </else-if>
               </choose>
             </group>
             <text variable="references"/>
           </group>
           <text macro="access"/>
         </group>
-      </else-if>
-      <else-if type="legislation">
-        <!-- Currently designed to handle statutes, codified regulations, executive orders.
-              For uncodified regulations, assume future code section is in status. -->
-        <group delimiter=". ">
-          <group delimiter=", ">
-            <text variable="title"/>
-            <group delimiter=" ">
-              <text macro="container-legal"/>
-              <text macro="date-legal"/>
-              <text variable="status" prefix="(" suffix=")"/>
-            </group>
-            <text variable="references"/>
-          </group>
-          <text macro="access"/>
-        </group>
-      </else-if>
-      <else-if type="treaty">
-        <!-- APA generally defers to Bluebook for legal citations, but diverges without
-              explanation for treaty items. The Bluebook format that was used in APA 6th
-              ed. is used here. -->
-        <group delimiter=", ">
-          <text variable="title" text-case="title"/>
-          <names variable="author">
-            <name initialize-with="." form="short" delimiter="-"/>
-          </names>
-          <text macro="date-legal"/>
-          <text macro="container-legal"/>
-          <text macro="access"/>
-        </group>
-      </else-if>
+      </else>
     </choose>
   </macro>
   <macro name="date-legal">
@@ -1458,7 +1182,7 @@
           </choose>
         </group>
       </if>
-      <else-if type="bill legislation" match="any">
+      <else-if type="bill legislation hearing" match="any">
         <group prefix="(" suffix=")" delimiter=" ">
           <group delimiter=" ">
             <date variable="original-date">
@@ -1487,8 +1211,7 @@
                 <text variable="volume"/>
                 <text variable="container-title"/>
                 <group delimiter=" ">
-                  <!-- Change to label variable="section" as that becomes available -->
-                  <text term="section" form="symbol"/>
+                  <label variable="section" form="symbol"/>
                   <text variable="section"/>
                 </group>
                 <choose>
@@ -1505,8 +1228,7 @@
               <group delimiter=" ">
                 <choose>
                   <if is-numeric="number">
-                    <!-- Replace with label variable="number" if that becomes available -->
-                    <text term="issue" form="short" text-case="capitalize-first"/>
+                    <label variable="number" form="short" text-case="capitalize-first"/>
                   </if>
                 </choose>
                 <text variable="number"/>
@@ -1522,8 +1244,7 @@
             <group delimiter=" ">
               <choose>
                 <if variable="chapter-number container-title" match="none">
-                  <!-- Replace with label variable="number" as that becomes available -->
-                  <text term="issue" form="short"/>
+                  <label variable="number" form="short"/>
                 </if>
               </choose>
               <text variable="number"/>
@@ -1558,8 +1279,7 @@
               <choose>
                 <if variable="section">
                   <group delimiter=" ">
-                    <!-- Change to label variable="section" as that becomes available -->
-                    <text term="section" form="symbol"/>
+                    <label variable="section" form="symbol"/>
                     <text variable="section"/>
                   </group>
                 </if>
@@ -1581,8 +1301,7 @@
             </if>
             <else>
               <group delimiter=" ">
-                <!-- Replace with label variable="number" if that becomes available -->
-                <text term="issue" form="short" text-case="capitalize-first"/>
+                <label variable="number" form="short" text-case="capitalize-first"/>
                 <text variable="number"/>
               </group>
             </else>
diff --git a/buildres/csl/csl-styles/apa-eu.csl b/buildres/csl/csl-styles/apa-eu.csl
index 590d8c7425e..b08b8464d48 100644
--- a/buildres/csl/csl-styles/apa-eu.csl
+++ b/buildres/csl/csl-styles/apa-eu.csl
@@ -21,12 +21,6 @@
     <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>
-  <locale xml:lang="eu">
-    <terms>
-      <term name="letter">komunikazio pertsonala</term>
-      <term name="letter" form="short">gutuna</term>
-    </terms>
-  </locale>
   <!-- Modifications with respect to 'basic' apa.csl:
        - date-bib macro: fixed month prefix and added suffix
        - citation-locator, container-periodical & volume-booklike macros: reversed variable and label for page no.s, added correct delimiter
@@ -35,10 +29,12 @@
   <!-- 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">
@@ -114,8 +110,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>
@@ -357,23 +352,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"/>
@@ -416,13 +411,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>
@@ -600,7 +593,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>
@@ -610,7 +603,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>
@@ -711,14 +704,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>
@@ -730,8 +716,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">
@@ -752,7 +740,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=", ">
@@ -783,7 +771,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>
@@ -891,8 +879,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>
@@ -941,8 +928,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>
@@ -990,8 +976,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>
@@ -1045,18 +1030,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"/>
@@ -1064,7 +1047,7 @@
         </choose>
       </else-if>
       <else-if type="map">
-        <text value="Map"/>
+        <text term="map" text-case="capitalize-first"/>
       </else-if>
     </choose>
   </macro>
@@ -1077,18 +1060,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"/>
@@ -1096,7 +1077,7 @@
         </choose>
       </else-if>
       <else-if type="map">
-        <text value="Map"/>
+        <text term="map"/>
       </else-if>
     </choose>
   </macro>
@@ -1338,83 +1319,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">
@@ -1433,7 +1387,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">
@@ -1462,8 +1416,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>
@@ -1480,8 +1433,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"/>
@@ -1497,8 +1449,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"/>
@@ -1533,8 +1484,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>
@@ -1556,8 +1506,7 @@
             </if>
             <else>
               <group delimiter=" ">
-                <!-- Replace with label variable="number" if that becomes available -->
-                <text term="issue" form="short" text-case="capitalize-first"/>
+                <label variable="number" form="short" text-case="capitalize-first"/>
                 <text variable="number"/>
               </group>
             </else>
diff --git a/buildres/csl/csl-styles/apa-no-ampersand.csl b/buildres/csl/csl-styles/apa-no-ampersand.csl
index 35af4cce24f..b26a8426573 100644
--- a/buildres/csl/csl-styles/apa-no-ampersand.csl
+++ b/buildres/csl/csl-styles/apa-no-ampersand.csl
@@ -35,295 +35,60 @@
       <term name="circa" form="short">ca.</term>
       <term name="bc"> B.C.E.</term>
       <term name="ad"> C.E.</term>
-      <term name="letter">personal communication</term>
-      <term name="letter" form="short">letter</term>
       <term name="issue" form="long">
         <single>issue</single>
         <multiple>issues</multiple>
       </term>
-    </terms>
-  </locale>
-  <locale xml:lang="af">
-    <terms>
-      <term name="letter">persoonlike kommunikasie</term>
-      <term name="letter" form="short">brief</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ar">
-    <terms>
-      <term name="letter">اتصال شخصي</term>
-      <term name="letter" form="short">خطاب</term>
-    </terms>
-  </locale>
-  <locale xml:lang="bg">
-    <terms>
-      <term name="letter">лична комуникация</term>
-      <term name="letter" form="short">писмо</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ca">
-    <terms>
-      <term name="letter">comunicació personal</term>
-      <term name="letter" form="short">carta</term>
-    </terms>
-  </locale>
-  <locale xml:lang="cs">
-    <terms>
-      <term name="letter">osobní komunikace</term>
-      <term name="letter" form="short">dopis</term>
-    </terms>
-  </locale>
-  <locale xml:lang="cy">
-    <terms>
-      <term name="letter">cyfathrebu personol</term>
-      <term name="letter" form="short">llythyr</term>
+      <term name="software">computer software</term>
     </terms>
   </locale>
   <locale xml:lang="da">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikation</term>
-      <term name="letter" form="short">brev</term>
     </terms>
   </locale>
   <locale xml:lang="de">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">persönliche Kommunikation</term>
-      <term name="letter" form="short">Brief</term>
-    </terms>
-  </locale>
-  <locale xml:lang="el">
-    <terms>
-      <term name="letter">προσωπική επικοινωνία</term>
-      <term name="letter" form="short">επιστολή</term>
     </terms>
   </locale>
   <locale xml:lang="es">
     <terms>
       <term name="from">de</term>
-      <term name="letter">comunicación personal</term>
-      <term name="letter" form="short">carta</term>
-    </terms>
-  </locale>
-  <locale xml:lang="et">
-    <terms>
-      <term name="letter">isiklik suhtlus</term>
-      <term name="letter" form="short">kiri</term>
-    </terms>
-  </locale>
-  <locale xml:lang="eu">
-    <terms>
-      <term name="letter">komunikazio pertsonala</term>
-      <term name="letter" form="short">gutuna</term>
-    </terms>
-  </locale>
-  <locale xml:lang="fa">
-    <terms>
-      <term name="letter">ارتباط شخصی</term>
-      <term name="letter" form="short">نامه</term>
-    </terms>
-  </locale>
-  <locale xml:lang="fi">
-    <terms>
-      <term name="letter">henkilökohtainen viestintä</term>
-      <term name="letter" form="short">kirje</term>
     </terms>
   </locale>
   <locale xml:lang="fr">
     <terms>
-      <term name="letter">communication personnelle</term>
-      <term name="letter" form="short">lettre</term>
       <term name="editor" form="short">
         <single>éd.</single>
         <multiple>éds.</multiple>
       </term>
     </terms>
   </locale>
-  <locale xml:lang="he">
-    <terms>
-      <term name="letter">תקשורת אישית</term>
-      <term name="letter" form="short">מכתב</term>
-    </terms>
-  </locale>
-  <locale xml:lang="hr">
-    <terms>
-      <term name="letter">osobna komunikacija</term>
-      <term name="letter" form="short">pismo</term>
-    </terms>
-  </locale>
-  <locale xml:lang="hu">
-    <terms>
-      <term name="letter">személyes kommunikáció</term>
-      <term name="letter" form="short">levél</term>
-    </terms>
-  </locale>
-  <locale xml:lang="id">
-    <terms>
-      <term name="letter">komunikasi pribadi</term>
-      <term name="letter" form="short">surat</term>
-    </terms>
-  </locale>
-  <locale xml:lang="is">
-    <terms>
-      <term name="letter">persónuleg samskipti</term>
-      <term name="letter" form="short">bréf</term>
-    </terms>
-  </locale>
-  <locale xml:lang="it">
-    <terms>
-      <term name="letter">comunicazione personale</term>
-      <term name="letter" form="short">lettera</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ja">
-    <terms>
-      <term name="letter">個人的なやり取り</term>
-      <term name="letter" form="short">手紙</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ko">
-    <terms>
-      <term name="letter">개인 서신</term>
-      <term name="letter" form="short">편지</term>
-    </terms>
-  </locale>
-  <locale xml:lang="la">
-    <terms>
-      <term name="letter"/>
-      <term name="letter" form="short">epistula</term>
-    </terms>
-  </locale>
-  <locale xml:lang="lt">
-    <terms>
-      <term name="letter">communicationis personalis</term>
-      <term name="letter" form="short"/>
-    </terms>
-  </locale>
-  <locale xml:lang="lv">
-    <terms>
-      <term name="letter">personīga komunikācija</term>
-      <term name="letter" form="short">vēstule</term>
-    </terms>
-  </locale>
-  <locale xml:lang="mn">
-    <terms>
-      <term name="letter">хувийн харилцаа холбоо</term>
-      <term name="letter" form="short">захиа</term>
-    </terms>
-  </locale>
   <locale xml:lang="nb">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikasjon</term>
-      <term name="letter" form="short">brev</term>
     </terms>
   </locale>
   <locale xml:lang="nl">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">persoonlijke communicatie</term>
-      <term name="letter" form="short">brief</term>
     </terms>
   </locale>
   <locale xml:lang="nn">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikasjon</term>
-      <term name="letter" form="short">brev</term>
-    </terms>
-  </locale>
-  <locale xml:lang="pl">
-    <terms>
-      <term name="letter">osobista komunikacja</term>
-      <term name="letter" form="short">list</term>
-    </terms>
-  </locale>
-  <locale xml:lang="pt">
-    <terms>
-      <term name="letter">comunicação pessoal</term>
-      <term name="letter" form="short">carta</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ro">
-    <terms>
-      <term name="letter">comunicare personală</term>
-      <term name="letter" form="short">scrisoare</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ru">
-    <terms>
-      <term name="letter">личная переписка</term>
-      <term name="letter" form="short">письмо</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sk">
-    <terms>
-      <term name="letter">osobná komunikácia</term>
-      <term name="letter" form="short">list</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sl">
-    <terms>
-      <term name="letter">osebna komunikacija</term>
-      <term name="letter" form="short">pismo</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sr">
-    <terms>
-      <term name="letter">лична комуникација</term>
-      <term name="letter" form="short">писмо</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sv">
-    <terms>
-      <term name="letter">personlig kommunikation</term>
-      <term name="letter" form="short">brev</term>
-    </terms>
-  </locale>
-  <locale xml:lang="th">
-    <terms>
-      <term name="letter">การสื่อสารส่วนบุคคล</term>
-      <term name="letter" form="short">จดหมาย</term>
-    </terms>
-  </locale>
-  <locale xml:lang="tr">
-    <terms>
-      <term name="letter">kişisel iletişim</term>
-      <term name="letter" form="short">mektup</term>
-    </terms>
-  </locale>
-  <locale xml:lang="uk">
-    <terms>
-      <term name="letter">особисте спілкування</term>
-      <term name="letter" form="short">лист</term>
-    </terms>
-  </locale>
-  <locale xml:lang="vi">
-    <terms>
-      <term name="letter">giao tiếp cá nhân</term>
-      <term name="letter" form="short">thư</term>
-    </terms>
-  </locale>
-  <locale xml:lang="zh-CN">
-    <terms>
-      <term name="letter">的私人交流</term>
-      <term name="letter" form="short">信函</term>
-    </terms>
-  </locale>
-  <locale xml:lang="zh-TW">
-    <terms>
-      <term name="letter">私人通訊</term>
-      <term name="letter" form="short">信函</term>
     </terms>
   </locale>
   <!-- General categories of item types:
-        Periodical: article-journal article-magazine article-newspaper post-weblog review review-book
-        Periodical or Booklike: paper-conference
-        Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure
-                  graphic interview manuscript map motion_picture musical_score pamphlet patent
-                  personal_communication report song speech thesis post webpage
-        Legal: bill legal_case legislation treaty
+       Periodical: article-journal article-magazine article-newspaper post-weblog review review-book
+       Periodical or Booklike: paper-conference
+       Booklike: article book broadcast chapter classic collection dataset document
+                 entry entry-dictionary entry-encyclopedia event figure
+                 graphic interview manuscript map motion_picture musical_score pamphlet patent
+                 performance periodical personal_communication post report
+                 software song speech standard thesis webpage
+       Legal: bill hearing legal_case legislation regulation treaty
   -->
   <!-- APA references contain four parts: author, date, title, source -->
   <macro name="author-bib">
@@ -399,8 +164,7 @@
                   <text macro="title-intext"/>
                 </substitute>
               </names>
-              <!-- Replace with term="personal-communication" if that becomes available -->
-              <text term="letter"/>
+              <text term="personal-communication"/>
             </group>
           </if>
           <else>
@@ -638,23 +402,23 @@
       <if variable="title" match="none">
         <text macro="bracketed-intext" prefix="[" suffix="]"/>
       </if>
+      <else-if type="hearing">
+        <!-- Hearings are italicized -->
+        <text variable="title" form="short" font-style="italic" text-case="title"/>
+      </else-if>
       <else-if type="bill">
-        <!-- If a bill has no number or container-title, assume it is a hearing; italic -->
+        <!-- Bills are not italicized and substitute bill number if no title. -->
         <choose>
-          <if variable="number container-title" match="none">
-            <text variable="title" form="short" font-style="italic" text-case="title"/>
-          </if>
-          <else-if variable="title">
+          <if variable="title">
             <text variable="title" form="short" text-case="title"/>
-          </else-if>
+          </if>
           <else>
             <group delimiter=" ">
               <text variable="genre"/>
               <group delimiter=" ">
                 <choose>
                   <if variable="chapter-number container-title" match="none">
-                    <!-- Replace with label variable="number" as that becomes available -->
-                    <text term="issue" form="short"/>
+                    <label variable="number" form="short"/>
                   </if>
                 </choose>
                 <text variable="number"/>
@@ -697,13 +461,11 @@
                 <text variable="genre" text-case="capitalize-first"/>
               </if>
               <else>
-                <!-- This should be localized -->
-                <text value="patent" text-case="capitalize-first"/>
+                <text term="patent" text-case="capitalize-first"/>
               </else>
             </choose>
             <group delimiter=" ">
-              <!-- Replace with label variable="number" if that becomes available -->
-              <text term="issue" form="short" text-case="capitalize-first"/>
+              <label variable="number" form="short" text-case="capitalize-first"/>
               <text variable="number"/>
             </group>
           </group>
@@ -881,7 +643,7 @@
                           <text variable="medium" text-case="capitalize-first"/>
                         </else-if>
                         <else>
-                          <text term="letter" form="short" text-case="capitalize-first"/>
+                          <text term="letter" text-case="capitalize-first"/>
                         </else>
                       </choose>
                     </if>
@@ -891,7 +653,7 @@
                           <text variable="medium" text-case="capitalize-first"/>
                         </if>
                         <else>
-                          <text term="letter" form="short" text-case="capitalize-first"/>
+                          <text term="letter" text-case="capitalize-first"/>
                         </else>
                       </choose>
                     </else>
@@ -992,14 +754,7 @@
                 </if>
               </choose>
             </if>
-            <else-if type="book">
-              <choose>
-                <if variable="version" match="none">
-                  <text macro="format"/>
-                </if>
-              </choose>
-            </else-if>
-            <else-if type="report" match="none">
+            <else-if type="report software" match="none">
               <text macro="format"/>
             </else-if>
           </choose>
@@ -1011,8 +766,10 @@
     <group prefix="[" suffix="]">
       <choose>
         <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
-          <!-- This should be localized -->
-          <text macro="reviewed-title-intext" prefix="Review of "/>
+          <group delimiter=" ">
+            <text term="review-of" text-case="capitalize-first"/>
+            <text macro="reviewed-title-intext"/>
+          </group>
         </if>
         <else-if variable="interviewer" type="interview" match="any">
           <names variable="interviewer">
@@ -1033,7 +790,7 @@
                     <text variable="genre" text-case="capitalize-first"/>
                   </if>
                   <else>
-                    <text term="letter" form="short" text-case="capitalize-first"/>
+                    <text term="letter" text-case="capitalize-first"/>
                   </else>
                 </choose>
                 <names variable="recipient" delimiter=", ">
@@ -1064,7 +821,7 @@
             </if>
           </choose>
         </if>
-        <else-if type="book" variable="version" match="all">
+        <else-if type="software" match="all">
           <!-- For entries in mobile app reference works, place bracketed after the container-title -->
           <text macro="format"/>
         </else-if>
@@ -1172,8 +929,7 @@
             <text variable="genre" text-case="title"/>
             <choose>
               <if is-numeric="number">
-                <!-- Replace with label variable="number" if that becomes available -->
-                <text term="issue" form="short" text-case="capitalize-first"/>
+                <label variable="number" form="short" text-case="capitalize-first"/>
                 <text variable="number"/>
               </if>
               <else>
@@ -1222,8 +978,7 @@
     <choose>
       <if is-numeric="version">
         <group delimiter=" ">
-          <!-- replace with label variable="version" if that becomes available -->
-          <text term="version" text-case="capitalize-first"/>
+          <label variable="version" text-case="capitalize-first"/>
           <text variable="version"/>
         </group>
       </if>
@@ -1271,8 +1026,7 @@
         </if>
         <else>
           <group>
-            <!-- Replace with label variable="number-of-volumes" if that becomes available -->
-            <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+            <label variable="number-of-volumes" form="short" text-case="capitalize-first" suffix=" "/>
             <text term="page-range-delimiter" prefix="1"/>
             <number variable="number-of-volumes" form="numeric"/>
           </group>
@@ -1326,18 +1080,16 @@
         </group>
       </if>
       <!-- Generic labels for specific types -->
-      <!-- These should be localized when possible -->
       <else-if type="dataset">
-        <text value="Data set"/>
+        <text term="dataset"/>
       </else-if>
-      <else-if type="book" variable="version" match="all">
-        <!-- Replace with type="software" and term="software" as that becomes available -->
-        <text value="Computer software"/>
+      <else-if type="software">
+        <text term="software" text-case="capitalize-first"/>
       </else-if>
       <else-if type="interview personal_communication" match="any">
         <choose>
           <if variable="archive container-title DOI publisher URL" match="none">
-            <text term="letter" text-case="capitalize-first"/>
+            <text term="personal-communication" text-case="capitalize-first"/>
           </if>
           <else-if type="interview">
             <text term="interview" text-case="capitalize-first"/>
@@ -1345,7 +1097,7 @@
         </choose>
       </else-if>
       <else-if type="map">
-        <text value="Map"/>
+        <text term="map" text-case="capitalize-first"/>
       </else-if>
     </choose>
   </macro>
@@ -1358,18 +1110,16 @@
         <text variable="medium" text-case="capitalize-first"/>
       </else-if>
       <!-- Generic labels for specific types -->
-      <!-- These should be localized when possible -->
       <else-if type="dataset">
-        <text value="Data set"/>
+        <text term="dataset"/>
       </else-if>
-      <else-if type="book" variable="version" match="all">
-        <!-- Replace with type="software" and term="software" as that becomes available -->
-        <text value="Computer software"/>
+      <else-if type="software">
+        <text term="software" text-case="capitalize-first"/>
       </else-if>
       <else-if type="interview personal_communication" match="any">
         <choose>
           <if variable="archive container-title DOI publisher URL" match="none">
-            <text term="letter" text-case="capitalize-first"/>
+            <text term="personal-communication" text-case="capitalize-first"/>
           </if>
           <else-if type="interview">
             <text term="interview" text-case="capitalize-first"/>
@@ -1377,7 +1127,7 @@
         </choose>
       </else-if>
       <else-if type="map">
-        <text value="Map"/>
+        <text term="map"/>
       </else-if>
     </choose>
   </macro>
@@ -1616,83 +1366,56 @@
   </macro>
   <!-- Legal citations have their own rules -->
   <macro name="legal-cites">
+    <!-- TODO: Add new item types -->
     <choose>
-      <if type="legal_case">
-        <group delimiter=". ">
-          <group delimiter=", ">
-            <text variable="title"/>
-            <group delimiter=" ">
-              <text macro="container-legal"/>
-              <text macro="date-legal"/>
-            </group>
-            <text variable="references"/>
-          </group>
+      <if type="treaty">
+        <!-- APA generally defers to Bluebook for legal citations, but diverges without
+             explanation for treaty items. The Bluebook format that was used in APA 6th
+             ed. is used here. -->
+        <group delimiter=", ">
+          <text variable="title" text-case="title"/>
+          <names variable="author">
+            <name initialize-with="." form="short" delimiter="-"/>
+          </names>
+          <text macro="date-legal"/>
+          <text macro="container-legal"/>
           <text macro="access"/>
         </group>
       </if>
-      <else-if type="bill">
-        <!-- Currently designed to handle bills, resolutions, hearings, rederal reports. -->
+      <else>
+        <!-- For `bill`: currently designed to handle bills, resolutions, federal reports. -->
+        <!-- For `legislation`: currently designed to handle statutes, codified regulations, executive orders. -->
         <group delimiter=". ">
           <group delimiter=", ">
             <choose>
-              <if variable="number container-title" match="none">
-                <!-- If no number or container-title, then assume it is a hearing -->
-                <text variable="title" font-style="italic"/>
-              </if>
-              <else>
+              <if type="bill legal_case legislation" match="any">
                 <text variable="title"/>
-              </else>
+              </if>
+              <else-if type="hearing">
+                <text variable="title" font-style="italic"/>
+              </else-if>
             </choose>
             <group delimiter=" ">
               <text macro="container-legal"/>
               <text macro="date-legal"/>
               <choose>
-                <if variable="number container-title" match="none">
-                  <!-- If no number or container-title, then assume it is a hearing -->
+                <if type="hearing">
                   <names variable="author" prefix="(testimony of " suffix=")">
-                    <name and="text" delimiter=", "/>
+                    <!-- TODO: Localize this with the hearing term. -->
+                    <name and="symbol" delimiter=", "/>
                   </names>
                 </if>
-                <else>
+                <else-if type="bill legislation" match="any">
+                  <!-- `legislation`: For uncodified regulations, assume future code section is in status. -->
                   <text variable="status" prefix="(" suffix=")"/>
-                </else>
+                </else-if>
               </choose>
             </group>
             <text variable="references"/>
           </group>
           <text macro="access"/>
         </group>
-      </else-if>
-      <else-if type="legislation">
-        <!-- Currently designed to handle statutes, codified regulations, executive orders.
-              For uncodified regulations, assume future code section is in status. -->
-        <group delimiter=". ">
-          <group delimiter=", ">
-            <text variable="title"/>
-            <group delimiter=" ">
-              <text macro="container-legal"/>
-              <text macro="date-legal"/>
-              <text variable="status" prefix="(" suffix=")"/>
-            </group>
-            <text variable="references"/>
-          </group>
-          <text macro="access"/>
-        </group>
-      </else-if>
-      <else-if type="treaty">
-        <!-- APA generally defers to Bluebook for legal citations, but diverges without
-              explanation for treaty items. The Bluebook format that was used in APA 6th
-              ed. is used here. -->
-        <group delimiter=", ">
-          <text variable="title" text-case="title"/>
-          <names variable="author">
-            <name initialize-with="." form="short" delimiter="-"/>
-          </names>
-          <text macro="date-legal"/>
-          <text macro="container-legal"/>
-          <text macro="access"/>
-        </group>
-      </else-if>
+      </else>
     </choose>
   </macro>
   <macro name="date-legal">
@@ -1711,7 +1434,7 @@
           </choose>
         </group>
       </if>
-      <else-if type="bill legislation" match="any">
+      <else-if type="bill legislation hearing" match="any">
         <group prefix="(" suffix=")" delimiter=" ">
           <group delimiter=" ">
             <date variable="original-date">
@@ -1740,8 +1463,7 @@
                 <text variable="volume"/>
                 <text variable="container-title"/>
                 <group delimiter=" ">
-                  <!-- Change to label variable="section" as that becomes available -->
-                  <text term="section" form="symbol"/>
+                  <label variable="section" form="symbol"/>
                   <text variable="section"/>
                 </group>
                 <choose>
@@ -1758,8 +1480,7 @@
               <group delimiter=" ">
                 <choose>
                   <if is-numeric="number">
-                    <!-- Replace with label variable="number" if that becomes available -->
-                    <text term="issue" form="short" text-case="capitalize-first"/>
+                    <label variable="number" form="short" text-case="capitalize-first"/>
                   </if>
                 </choose>
                 <text variable="number"/>
@@ -1775,8 +1496,7 @@
             <group delimiter=" ">
               <choose>
                 <if variable="chapter-number container-title" match="none">
-                  <!-- Replace with label variable="number" as that becomes available -->
-                  <text term="issue" form="short"/>
+                  <label variable="number" form="short"/>
                 </if>
               </choose>
               <text variable="number"/>
@@ -1811,8 +1531,7 @@
               <choose>
                 <if variable="section">
                   <group delimiter=" ">
-                    <!-- Change to label variable="section" as that becomes available -->
-                    <text term="section" form="symbol"/>
+                    <label variable="section" form="symbol"/>
                     <text variable="section"/>
                   </group>
                 </if>
@@ -1834,8 +1553,7 @@
             </if>
             <else>
               <group delimiter=" ">
-                <!-- Replace with label variable="number" if that becomes available -->
-                <text term="issue" form="short" text-case="capitalize-first"/>
+                <label variable="number" form="short" text-case="capitalize-first"/>
                 <text variable="number"/>
               </group>
             </else>
diff --git a/buildres/csl/csl-styles/apa-no-initials.csl b/buildres/csl/csl-styles/apa-no-initials.csl
index 74fe1e3dfc0..4fc744b9b03 100644
--- a/buildres/csl/csl-styles/apa-no-initials.csl
+++ b/buildres/csl/csl-styles/apa-no-initials.csl
@@ -35,295 +35,60 @@
       <term name="circa" form="short">ca.</term>
       <term name="bc"> B.C.E.</term>
       <term name="ad"> C.E.</term>
-      <term name="letter">personal communication</term>
-      <term name="letter" form="short">letter</term>
       <term name="issue" form="long">
         <single>issue</single>
         <multiple>issues</multiple>
       </term>
-    </terms>
-  </locale>
-  <locale xml:lang="af">
-    <terms>
-      <term name="letter">persoonlike kommunikasie</term>
-      <term name="letter" form="short">brief</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ar">
-    <terms>
-      <term name="letter">اتصال شخصي</term>
-      <term name="letter" form="short">خطاب</term>
-    </terms>
-  </locale>
-  <locale xml:lang="bg">
-    <terms>
-      <term name="letter">лична комуникация</term>
-      <term name="letter" form="short">писмо</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ca">
-    <terms>
-      <term name="letter">comunicació personal</term>
-      <term name="letter" form="short">carta</term>
-    </terms>
-  </locale>
-  <locale xml:lang="cs">
-    <terms>
-      <term name="letter">osobní komunikace</term>
-      <term name="letter" form="short">dopis</term>
-    </terms>
-  </locale>
-  <locale xml:lang="cy">
-    <terms>
-      <term name="letter">cyfathrebu personol</term>
-      <term name="letter" form="short">llythyr</term>
+      <term name="software">computer software</term>
     </terms>
   </locale>
   <locale xml:lang="da">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikation</term>
-      <term name="letter" form="short">brev</term>
     </terms>
   </locale>
   <locale xml:lang="de">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">persönliche Kommunikation</term>
-      <term name="letter" form="short">Brief</term>
-    </terms>
-  </locale>
-  <locale xml:lang="el">
-    <terms>
-      <term name="letter">προσωπική επικοινωνία</term>
-      <term name="letter" form="short">επιστολή</term>
     </terms>
   </locale>
   <locale xml:lang="es">
     <terms>
       <term name="from">de</term>
-      <term name="letter">comunicación personal</term>
-      <term name="letter" form="short">carta</term>
-    </terms>
-  </locale>
-  <locale xml:lang="et">
-    <terms>
-      <term name="letter">isiklik suhtlus</term>
-      <term name="letter" form="short">kiri</term>
-    </terms>
-  </locale>
-  <locale xml:lang="eu">
-    <terms>
-      <term name="letter">komunikazio pertsonala</term>
-      <term name="letter" form="short">gutuna</term>
-    </terms>
-  </locale>
-  <locale xml:lang="fa">
-    <terms>
-      <term name="letter">ارتباط شخصی</term>
-      <term name="letter" form="short">نامه</term>
-    </terms>
-  </locale>
-  <locale xml:lang="fi">
-    <terms>
-      <term name="letter">henkilökohtainen viestintä</term>
-      <term name="letter" form="short">kirje</term>
     </terms>
   </locale>
   <locale xml:lang="fr">
     <terms>
-      <term name="letter">communication personnelle</term>
-      <term name="letter" form="short">lettre</term>
       <term name="editor" form="short">
         <single>éd.</single>
         <multiple>éds.</multiple>
       </term>
     </terms>
   </locale>
-  <locale xml:lang="he">
-    <terms>
-      <term name="letter">תקשורת אישית</term>
-      <term name="letter" form="short">מכתב</term>
-    </terms>
-  </locale>
-  <locale xml:lang="hr">
-    <terms>
-      <term name="letter">osobna komunikacija</term>
-      <term name="letter" form="short">pismo</term>
-    </terms>
-  </locale>
-  <locale xml:lang="hu">
-    <terms>
-      <term name="letter">személyes kommunikáció</term>
-      <term name="letter" form="short">levél</term>
-    </terms>
-  </locale>
-  <locale xml:lang="id">
-    <terms>
-      <term name="letter">komunikasi pribadi</term>
-      <term name="letter" form="short">surat</term>
-    </terms>
-  </locale>
-  <locale xml:lang="is">
-    <terms>
-      <term name="letter">persónuleg samskipti</term>
-      <term name="letter" form="short">bréf</term>
-    </terms>
-  </locale>
-  <locale xml:lang="it">
-    <terms>
-      <term name="letter">comunicazione personale</term>
-      <term name="letter" form="short">lettera</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ja">
-    <terms>
-      <term name="letter">個人的なやり取り</term>
-      <term name="letter" form="short">手紙</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ko">
-    <terms>
-      <term name="letter">개인 서신</term>
-      <term name="letter" form="short">편지</term>
-    </terms>
-  </locale>
-  <locale xml:lang="la">
-    <terms>
-      <term name="letter"/>
-      <term name="letter" form="short">epistula</term>
-    </terms>
-  </locale>
-  <locale xml:lang="lt">
-    <terms>
-      <term name="letter">communicationis personalis</term>
-      <term name="letter" form="short"/>
-    </terms>
-  </locale>
-  <locale xml:lang="lv">
-    <terms>
-      <term name="letter">personīga komunikācija</term>
-      <term name="letter" form="short">vēstule</term>
-    </terms>
-  </locale>
-  <locale xml:lang="mn">
-    <terms>
-      <term name="letter">хувийн харилцаа холбоо</term>
-      <term name="letter" form="short">захиа</term>
-    </terms>
-  </locale>
   <locale xml:lang="nb">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikasjon</term>
-      <term name="letter" form="short">brev</term>
     </terms>
   </locale>
   <locale xml:lang="nl">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">persoonlijke communicatie</term>
-      <term name="letter" form="short">brief</term>
     </terms>
   </locale>
   <locale xml:lang="nn">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikasjon</term>
-      <term name="letter" form="short">brev</term>
-    </terms>
-  </locale>
-  <locale xml:lang="pl">
-    <terms>
-      <term name="letter">osobista komunikacja</term>
-      <term name="letter" form="short">list</term>
-    </terms>
-  </locale>
-  <locale xml:lang="pt">
-    <terms>
-      <term name="letter">comunicação pessoal</term>
-      <term name="letter" form="short">carta</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ro">
-    <terms>
-      <term name="letter">comunicare personală</term>
-      <term name="letter" form="short">scrisoare</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ru">
-    <terms>
-      <term name="letter">личная переписка</term>
-      <term name="letter" form="short">письмо</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sk">
-    <terms>
-      <term name="letter">osobná komunikácia</term>
-      <term name="letter" form="short">list</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sl">
-    <terms>
-      <term name="letter">osebna komunikacija</term>
-      <term name="letter" form="short">pismo</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sr">
-    <terms>
-      <term name="letter">лична комуникација</term>
-      <term name="letter" form="short">писмо</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sv">
-    <terms>
-      <term name="letter">personlig kommunikation</term>
-      <term name="letter" form="short">brev</term>
-    </terms>
-  </locale>
-  <locale xml:lang="th">
-    <terms>
-      <term name="letter">การสื่อสารส่วนบุคคล</term>
-      <term name="letter" form="short">จดหมาย</term>
-    </terms>
-  </locale>
-  <locale xml:lang="tr">
-    <terms>
-      <term name="letter">kişisel iletişim</term>
-      <term name="letter" form="short">mektup</term>
-    </terms>
-  </locale>
-  <locale xml:lang="uk">
-    <terms>
-      <term name="letter">особисте спілкування</term>
-      <term name="letter" form="short">лист</term>
-    </terms>
-  </locale>
-  <locale xml:lang="vi">
-    <terms>
-      <term name="letter">giao tiếp cá nhân</term>
-      <term name="letter" form="short">thư</term>
-    </terms>
-  </locale>
-  <locale xml:lang="zh-CN">
-    <terms>
-      <term name="letter">的私人交流</term>
-      <term name="letter" form="short">信函</term>
-    </terms>
-  </locale>
-  <locale xml:lang="zh-TW">
-    <terms>
-      <term name="letter">私人通訊</term>
-      <term name="letter" form="short">信函</term>
     </terms>
   </locale>
   <!-- General categories of item types:
        Periodical: article-journal article-magazine article-newspaper post-weblog review review-book
        Periodical or Booklike: paper-conference
-       Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure
+       Booklike: article book broadcast chapter classic collection dataset document
+                 entry entry-dictionary entry-encyclopedia event figure
                  graphic interview manuscript map motion_picture musical_score pamphlet patent
-                 personal_communication report song speech thesis post webpage
-       Legal: bill legal_case legislation treaty
+                 performance periodical personal_communication post report
+                 software song speech standard thesis webpage
+       Legal: bill hearing legal_case legislation regulation treaty
   -->
   <!-- APA references contain four parts: author, date, title, source -->
   <macro name="author-bib">
@@ -399,8 +164,7 @@
                   <text macro="title-intext"/>
                 </substitute>
               </names>
-              <!-- Replace with term="personal-communication" if that becomes available -->
-              <text term="letter"/>
+              <text term="personal-communication"/>
             </group>
           </if>
           <else>
@@ -638,23 +402,23 @@
       <if variable="title" match="none">
         <text macro="bracketed-intext" prefix="[" suffix="]"/>
       </if>
+      <else-if type="hearing">
+        <!-- Hearings are italicized -->
+        <text variable="title" form="short" font-style="italic" text-case="title"/>
+      </else-if>
       <else-if type="bill">
-        <!-- If a bill has no number or container-title, assume it is a hearing; italic -->
+        <!-- Bills are not italicized and substitute bill number if no title. -->
         <choose>
-          <if variable="number container-title" match="none">
-            <text variable="title" form="short" font-style="italic" text-case="title"/>
-          </if>
-          <else-if variable="title">
+          <if variable="title">
             <text variable="title" form="short" text-case="title"/>
-          </else-if>
+          </if>
           <else>
             <group delimiter=" ">
               <text variable="genre"/>
               <group delimiter=" ">
                 <choose>
                   <if variable="chapter-number container-title" match="none">
-                    <!-- Replace with label variable="number" as that becomes available -->
-                    <text term="issue" form="short"/>
+                    <label variable="number" form="short"/>
                   </if>
                 </choose>
                 <text variable="number"/>
@@ -697,13 +461,11 @@
                 <text variable="genre" text-case="capitalize-first"/>
               </if>
               <else>
-                <!-- This should be localized -->
-                <text value="patent" text-case="capitalize-first"/>
+                <text term="patent" text-case="capitalize-first"/>
               </else>
             </choose>
             <group delimiter=" ">
-              <!-- Replace with label variable="number" if that becomes available -->
-              <text term="issue" form="short" text-case="capitalize-first"/>
+              <label variable="number" form="short" text-case="capitalize-first"/>
               <text variable="number"/>
             </group>
           </group>
@@ -881,7 +643,7 @@
                           <text variable="medium" text-case="capitalize-first"/>
                         </else-if>
                         <else>
-                          <text term="letter" form="short" text-case="capitalize-first"/>
+                          <text term="letter" text-case="capitalize-first"/>
                         </else>
                       </choose>
                     </if>
@@ -891,7 +653,7 @@
                           <text variable="medium" text-case="capitalize-first"/>
                         </if>
                         <else>
-                          <text term="letter" form="short" text-case="capitalize-first"/>
+                          <text term="letter" text-case="capitalize-first"/>
                         </else>
                       </choose>
                     </else>
@@ -992,14 +754,7 @@
                 </if>
               </choose>
             </if>
-            <else-if type="book">
-              <choose>
-                <if variable="version" match="none">
-                  <text macro="format"/>
-                </if>
-              </choose>
-            </else-if>
-            <else-if type="report" match="none">
+            <else-if type="report software" match="none">
               <text macro="format"/>
             </else-if>
           </choose>
@@ -1011,8 +766,10 @@
     <group prefix="[" suffix="]">
       <choose>
         <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
-          <!-- This should be localized -->
-          <text macro="reviewed-title-intext" prefix="Review of "/>
+          <group delimiter=" ">
+            <text term="review-of" text-case="capitalize-first"/>
+            <text macro="reviewed-title-intext"/>
+          </group>
         </if>
         <else-if variable="interviewer" type="interview" match="any">
           <names variable="interviewer">
@@ -1033,7 +790,7 @@
                     <text variable="genre" text-case="capitalize-first"/>
                   </if>
                   <else>
-                    <text term="letter" form="short" text-case="capitalize-first"/>
+                    <text term="letter" text-case="capitalize-first"/>
                   </else>
                 </choose>
                 <names variable="recipient" delimiter=", ">
@@ -1064,7 +821,7 @@
             </if>
           </choose>
         </if>
-        <else-if type="book" variable="version" match="all">
+        <else-if type="software" match="all">
           <!-- For entries in mobile app reference works, place bracketed after the container-title -->
           <text macro="format"/>
         </else-if>
@@ -1172,8 +929,7 @@
             <text variable="genre" text-case="title"/>
             <choose>
               <if is-numeric="number">
-                <!-- Replace with label variable="number" if that becomes available -->
-                <text term="issue" form="short" text-case="capitalize-first"/>
+                <label variable="number" form="short" text-case="capitalize-first"/>
                 <text variable="number"/>
               </if>
               <else>
@@ -1222,8 +978,7 @@
     <choose>
       <if is-numeric="version">
         <group delimiter=" ">
-          <!-- replace with label variable="version" if that becomes available -->
-          <text term="version" text-case="capitalize-first"/>
+          <label variable="version" text-case="capitalize-first"/>
           <text variable="version"/>
         </group>
       </if>
@@ -1271,8 +1026,7 @@
         </if>
         <else>
           <group>
-            <!-- Replace with label variable="number-of-volumes" if that becomes available -->
-            <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+            <label variable="number-of-volumes" form="short" text-case="capitalize-first" suffix=" "/>
             <text term="page-range-delimiter" prefix="1"/>
             <number variable="number-of-volumes" form="numeric"/>
           </group>
@@ -1326,18 +1080,16 @@
         </group>
       </if>
       <!-- Generic labels for specific types -->
-      <!-- These should be localized when possible -->
       <else-if type="dataset">
-        <text value="Data set"/>
+        <text term="dataset"/>
       </else-if>
-      <else-if type="book" variable="version" match="all">
-        <!-- Replace with type="software" and term="software" as that becomes available -->
-        <text value="Computer software"/>
+      <else-if type="software">
+        <text term="software" text-case="capitalize-first"/>
       </else-if>
       <else-if type="interview personal_communication" match="any">
         <choose>
           <if variable="archive container-title DOI publisher URL" match="none">
-            <text term="letter" text-case="capitalize-first"/>
+            <text term="personal-communication" text-case="capitalize-first"/>
           </if>
           <else-if type="interview">
             <text term="interview" text-case="capitalize-first"/>
@@ -1345,7 +1097,7 @@
         </choose>
       </else-if>
       <else-if type="map">
-        <text value="Map"/>
+        <text term="map" text-case="capitalize-first"/>
       </else-if>
     </choose>
   </macro>
@@ -1358,18 +1110,16 @@
         <text variable="medium" text-case="capitalize-first"/>
       </else-if>
       <!-- Generic labels for specific types -->
-      <!-- These should be localized when possible -->
       <else-if type="dataset">
-        <text value="Data set"/>
+        <text term="dataset"/>
       </else-if>
-      <else-if type="book" variable="version" match="all">
-        <!-- Replace with type="software" and term="software" as that becomes available -->
-        <text value="Computer software"/>
+      <else-if type="software">
+        <text term="software" text-case="capitalize-first"/>
       </else-if>
       <else-if type="interview personal_communication" match="any">
         <choose>
           <if variable="archive container-title DOI publisher URL" match="none">
-            <text term="letter" text-case="capitalize-first"/>
+            <text term="personal-communication" text-case="capitalize-first"/>
           </if>
           <else-if type="interview">
             <text term="interview" text-case="capitalize-first"/>
@@ -1377,7 +1127,7 @@
         </choose>
       </else-if>
       <else-if type="map">
-        <text value="Map"/>
+        <text term="map"/>
       </else-if>
     </choose>
   </macro>
@@ -1616,83 +1366,56 @@
   </macro>
   <!-- Legal citations have their own rules -->
   <macro name="legal-cites">
+    <!-- TODO: Add new item types -->
     <choose>
-      <if type="legal_case">
-        <group delimiter=". ">
-          <group delimiter=", ">
-            <text variable="title"/>
-            <group delimiter=" ">
-              <text macro="container-legal"/>
-              <text macro="date-legal"/>
-            </group>
-            <text variable="references"/>
-          </group>
+      <if type="treaty">
+        <!-- APA generally defers to Bluebook for legal citations, but diverges without
+             explanation for treaty items. The Bluebook format that was used in APA 6th
+             ed. is used here. -->
+        <group delimiter=", ">
+          <text variable="title" text-case="title"/>
+          <names variable="author">
+            <name initialize-with="." form="short" delimiter="-"/>
+          </names>
+          <text macro="date-legal"/>
+          <text macro="container-legal"/>
           <text macro="access"/>
         </group>
       </if>
-      <else-if type="bill">
-        <!-- Currently designed to handle bills, resolutions, hearings, rederal reports. -->
+      <else>
+        <!-- For `bill`: currently designed to handle bills, resolutions, federal reports. -->
+        <!-- For `legislation`: currently designed to handle statutes, codified regulations, executive orders. -->
         <group delimiter=". ">
           <group delimiter=", ">
             <choose>
-              <if variable="number container-title" match="none">
-                <!-- If no number or container-title, then assume it is a hearing -->
-                <text variable="title" font-style="italic"/>
-              </if>
-              <else>
+              <if type="bill legal_case legislation" match="any">
                 <text variable="title"/>
-              </else>
+              </if>
+              <else-if type="hearing">
+                <text variable="title" font-style="italic"/>
+              </else-if>
             </choose>
             <group delimiter=" ">
               <text macro="container-legal"/>
               <text macro="date-legal"/>
               <choose>
-                <if variable="number container-title" match="none">
-                  <!-- If no number or container-title, then assume it is a hearing -->
+                <if type="hearing">
                   <names variable="author" prefix="(testimony of " suffix=")">
+                    <!-- TODO: Localize this with the hearing term. -->
                     <name and="symbol" delimiter=", "/>
                   </names>
                 </if>
-                <else>
+                <else-if type="bill legislation" match="any">
+                  <!-- `legislation`: For uncodified regulations, assume future code section is in status. -->
                   <text variable="status" prefix="(" suffix=")"/>
-                </else>
+                </else-if>
               </choose>
             </group>
             <text variable="references"/>
           </group>
           <text macro="access"/>
         </group>
-      </else-if>
-      <else-if type="legislation">
-        <!-- Currently designed to handle statutes, codified regulations, executive orders.
-             For uncodified regulations, assume future code section is in status. -->
-        <group delimiter=". ">
-          <group delimiter=", ">
-            <text variable="title"/>
-            <group delimiter=" ">
-              <text macro="container-legal"/>
-              <text macro="date-legal"/>
-              <text variable="status" prefix="(" suffix=")"/>
-            </group>
-            <text variable="references"/>
-          </group>
-          <text macro="access"/>
-        </group>
-      </else-if>
-      <else-if type="treaty">
-        <!-- APA generally defers to Bluebook for legal citations, but diverges without
-             explanation for treaty items. The Bluebook format that was used in APA 6th
-             ed. is used here. -->
-        <group delimiter=", ">
-          <text variable="title" text-case="title"/>
-          <names variable="author">
-            <name initialize="false" initialize-with="." form="short" delimiter="-"/>
-          </names>
-          <text macro="date-legal"/>
-          <text macro="container-legal"/>
-          <text macro="access"/>
-        </group>
-      </else-if>
+      </else>
     </choose>
   </macro>
   <macro name="date-legal">
@@ -1711,7 +1434,7 @@
           </choose>
         </group>
       </if>
-      <else-if type="bill legislation" match="any">
+      <else-if type="bill legislation hearing" match="any">
         <group prefix="(" suffix=")" delimiter=" ">
           <group delimiter=" ">
             <date variable="original-date">
@@ -1740,8 +1463,7 @@
                 <text variable="volume"/>
                 <text variable="container-title"/>
                 <group delimiter=" ">
-                  <!-- Change to label variable="section" as that becomes available -->
-                  <text term="section" form="symbol"/>
+                  <label variable="section" form="symbol"/>
                   <text variable="section"/>
                 </group>
                 <choose>
@@ -1758,8 +1480,7 @@
               <group delimiter=" ">
                 <choose>
                   <if is-numeric="number">
-                    <!-- Replace with label variable="number" if that becomes available -->
-                    <text term="issue" form="short" text-case="capitalize-first"/>
+                    <label variable="number" form="short" text-case="capitalize-first"/>
                   </if>
                 </choose>
                 <text variable="number"/>
@@ -1775,8 +1496,7 @@
             <group delimiter=" ">
               <choose>
                 <if variable="chapter-number container-title" match="none">
-                  <!-- Replace with label variable="number" as that becomes available -->
-                  <text term="issue" form="short"/>
+                  <label variable="number" form="short"/>
                 </if>
               </choose>
               <text variable="number"/>
@@ -1811,8 +1531,7 @@
               <choose>
                 <if variable="section">
                   <group delimiter=" ">
-                    <!-- Change to label variable="section" as that becomes available -->
-                    <text term="section" form="symbol"/>
+                    <label variable="section" form="symbol"/>
                     <text variable="section"/>
                   </group>
                 </if>
@@ -1834,8 +1553,7 @@
             </if>
             <else>
               <group delimiter=" ">
-                <!-- Replace with label variable="number" if that becomes available -->
-                <text term="issue" form="short" text-case="capitalize-first"/>
+                <label variable="number" form="short" text-case="capitalize-first"/>
                 <text variable="number"/>
               </group>
             </else>
diff --git a/buildres/csl/csl-styles/apa-numeric-superscript-brackets.csl b/buildres/csl/csl-styles/apa-numeric-superscript-brackets.csl
index 948b03600e0..53c2f69fed4 100644
--- a/buildres/csl/csl-styles/apa-numeric-superscript-brackets.csl
+++ b/buildres/csl/csl-styles/apa-numeric-superscript-brackets.csl
@@ -36,51 +36,30 @@
       <term name="circa" form="short">ca.</term>
       <term name="bc"> B.C.E.</term>
       <term name="ad"> C.E.</term>
-      <term name="letter">personal communication</term>
-      <term name="letter" form="short">letter</term>
       <term name="issue" form="long">
         <single>issue</single>
         <multiple>issues</multiple>
       </term>
-    </terms>
-  </locale>
-  <locale xml:lang="af">
-    <terms>
-      <term name="letter">persoonlike kommunikasie</term>
-      <term name="letter" form="short">brief</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ar">
-    <terms>
-      <term name="letter">اتصال شخصي</term>
-      <term name="letter" form="short">خطاب</term>
+      <term name="software">computer software</term>
     </terms>
   </locale>
   <locale xml:lang="da">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikation</term>
-      <term name="letter" form="short">brev</term>
     </terms>
   </locale>
   <locale xml:lang="de">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">persönliche Kommunikation</term>
-      <term name="letter" form="short">Brief</term>
     </terms>
   </locale>
   <locale xml:lang="es">
     <terms>
       <term name="from">de</term>
-      <term name="letter">comunicación personal</term>
-      <term name="letter" form="short">carta</term>
     </terms>
   </locale>
   <locale xml:lang="fr">
     <terms>
-      <term name="letter">communication personnelle</term>
-      <term name="letter" form="short">lettre</term>
       <term name="editor" form="short">
         <single>éd.</single>
         <multiple>éds.</multiple>
@@ -90,43 +69,27 @@
   <locale xml:lang="nb">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikasjon</term>
-      <term name="letter" form="short">brev</term>
     </terms>
   </locale>
   <locale xml:lang="nl">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">persoonlijke communicatie</term>
-      <term name="letter" form="short">brief</term>
     </terms>
   </locale>
   <locale xml:lang="nn">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikasjon</term>
-      <term name="letter" form="short">brev</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ru">
-    <terms>
-      <term name="letter">личная переписка</term>
-      <term name="letter" form="short">письмо</term>
-    </terms>
-  </locale>
-  <locale xml:lang="tr">
-    <terms>
-      <term name="letter">kişisel iletişim</term>
-      <term name="letter" form="short">mektup</term>
     </terms>
   </locale>
   <!-- General categories of item types:
        Periodical: article-journal article-magazine article-newspaper post-weblog review review-book
        Periodical or Booklike: paper-conference
-       Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure
+       Booklike: article book broadcast chapter classic collection dataset document
+                 entry entry-dictionary entry-encyclopedia event figure
                  graphic interview manuscript map motion_picture musical_score pamphlet patent
-                 personal_communication report song speech thesis post webpage
-       Legal: bill legal_case legislation treaty
+                 performance periodical personal_communication post report
+                 software song speech standard thesis webpage
+       Legal: bill hearing legal_case legislation regulation treaty
   -->
   <!-- APA references contain four parts: author, date, title, source -->
   <macro name="author-bib">
@@ -202,8 +165,7 @@
                   <text macro="title-intext"/>
                 </substitute>
               </names>
-              <!-- Replace with term="personal-communication" if that becomes available -->
-              <text term="letter"/>
+              <text term="personal-communication"/>
             </group>
           </if>
           <else>
@@ -441,23 +403,23 @@
       <if variable="title" match="none">
         <text macro="bracketed-intext" prefix="[" suffix="]"/>
       </if>
+      <else-if type="hearing">
+        <!-- Hearings are italicized -->
+        <text variable="title" form="short" font-style="italic" text-case="title"/>
+      </else-if>
       <else-if type="bill">
-        <!-- If a bill has no number or container-title, assume it is a hearing; italic and title case -->
+        <!-- Bills are not italicized and substitute bill number if no title. -->
         <choose>
-          <if variable="number container-title" match="none">
-            <text variable="title" form="short" font-style="italic" text-case="title"/>
+          <if variable="title">
+            <text variable="title" form="short" text-case="title"/>
           </if>
-          <else-if variable="title">
-            <text variable="title" form="short"/>
-          </else-if>
           <else>
             <group delimiter=" ">
               <text variable="genre"/>
               <group delimiter=" ">
                 <choose>
                   <if variable="chapter-number container-title" match="none">
-                    <!-- Replace with label variable="number" as that becomes available -->
-                    <text term="issue" form="short"/>
+                    <label variable="number" form="short"/>
                   </if>
                 </choose>
                 <text variable="number"/>
@@ -500,13 +462,11 @@
                 <text variable="genre" text-case="capitalize-first"/>
               </if>
               <else>
-                <!-- This should be localized -->
-                <text value="patent" text-case="capitalize-first"/>
+                <text term="patent" text-case="capitalize-first"/>
               </else>
             </choose>
             <group delimiter=" ">
-              <!-- Replace with label variable="number" if that becomes available -->
-              <text term="issue" form="short" text-case="capitalize-first"/>
+              <label variable="number" form="short" text-case="capitalize-first"/>
               <text variable="number"/>
             </group>
           </group>
@@ -684,7 +644,7 @@
                           <text variable="medium" text-case="capitalize-first"/>
                         </else-if>
                         <else>
-                          <text term="letter" form="short" text-case="capitalize-first"/>
+                          <text term="letter" text-case="capitalize-first"/>
                         </else>
                       </choose>
                     </if>
@@ -694,7 +654,7 @@
                           <text variable="medium" text-case="capitalize-first"/>
                         </if>
                         <else>
-                          <text term="letter" form="short" text-case="capitalize-first"/>
+                          <text term="letter" text-case="capitalize-first"/>
                         </else>
                       </choose>
                     </else>
@@ -795,14 +755,7 @@
                 </if>
               </choose>
             </if>
-            <else-if type="book">
-              <choose>
-                <if variable="version" match="none">
-                  <text macro="format"/>
-                </if>
-              </choose>
-            </else-if>
-            <else-if type="report" match="none">
+            <else-if type="report software" match="none">
               <text macro="format"/>
             </else-if>
           </choose>
@@ -814,8 +767,10 @@
     <group prefix="[" suffix="]">
       <choose>
         <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
-          <!-- This should be localized -->
-          <text macro="reviewed-title-intext" prefix="Review of "/>
+          <group delimiter=" ">
+            <text term="review-of" text-case="capitalize-first"/>
+            <text macro="reviewed-title-intext"/>
+          </group>
         </if>
         <else-if variable="interviewer" type="interview" match="any">
           <names variable="interviewer">
@@ -836,7 +791,7 @@
                     <text variable="genre" text-case="capitalize-first"/>
                   </if>
                   <else>
-                    <text term="letter" form="short" text-case="capitalize-first"/>
+                    <text term="letter" text-case="capitalize-first"/>
                   </else>
                 </choose>
                 <names variable="recipient" delimiter=", ">
@@ -867,7 +822,7 @@
             </if>
           </choose>
         </if>
-        <else-if type="book" variable="version" match="all">
+        <else-if type="software" match="all">
           <!-- For entries in mobile app reference works, place bracketed after the container-title -->
           <text macro="format"/>
         </else-if>
@@ -975,8 +930,7 @@
             <text variable="genre" text-case="title"/>
             <choose>
               <if is-numeric="number">
-                <!-- Replace with label variable="number" if that becomes available -->
-                <text term="issue" form="short" text-case="capitalize-first"/>
+                <label variable="number" form="short" text-case="capitalize-first"/>
                 <text variable="number"/>
               </if>
               <else>
@@ -1025,8 +979,7 @@
     <choose>
       <if is-numeric="version">
         <group delimiter=" ">
-          <!-- replace with label variable="version" if that becomes available -->
-          <text term="version" text-case="capitalize-first"/>
+          <label variable="version" text-case="capitalize-first"/>
           <text variable="version"/>
         </group>
       </if>
@@ -1074,8 +1027,7 @@
         </if>
         <else>
           <group>
-            <!-- Replace with label variable="number-of-volumes" if that becomes available -->
-            <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+            <label variable="number-of-volumes" form="short" text-case="capitalize-first" suffix=" "/>
             <text term="page-range-delimiter" prefix="1"/>
             <number variable="number-of-volumes" form="numeric"/>
           </group>
@@ -1129,18 +1081,16 @@
         </group>
       </if>
       <!-- Generic labels for specific types -->
-      <!-- These should be localized when possible -->
       <else-if type="dataset">
-        <text value="Data set"/>
+        <text term="dataset"/>
       </else-if>
-      <else-if type="book" variable="version" match="all">
-        <!-- Replace with type="software" and term="software" as that becomes available -->
-        <text value="Computer software"/>
+      <else-if type="software">
+        <text term="software" text-case="capitalize-first"/>
       </else-if>
       <else-if type="interview personal_communication" match="any">
         <choose>
           <if variable="archive container-title DOI publisher URL" match="none">
-            <text term="letter" text-case="capitalize-first"/>
+            <text term="personal-communication" text-case="capitalize-first"/>
           </if>
           <else-if type="interview">
             <text term="interview" text-case="capitalize-first"/>
@@ -1148,7 +1098,7 @@
         </choose>
       </else-if>
       <else-if type="map">
-        <text value="Map"/>
+        <text term="map" text-case="capitalize-first"/>
       </else-if>
     </choose>
   </macro>
@@ -1161,18 +1111,16 @@
         <text variable="medium" text-case="capitalize-first"/>
       </else-if>
       <!-- Generic labels for specific types -->
-      <!-- These should be localized when possible -->
       <else-if type="dataset">
-        <text value="Data set"/>
+        <text term="dataset"/>
       </else-if>
-      <else-if type="book" variable="version" match="all">
-        <!-- Replace with type="software" and term="software" as that becomes available -->
-        <text value="Computer software"/>
+      <else-if type="software">
+        <text term="software" text-case="capitalize-first"/>
       </else-if>
       <else-if type="interview personal_communication" match="any">
         <choose>
           <if variable="archive container-title DOI publisher URL" match="none">
-            <text term="letter" text-case="capitalize-first"/>
+            <text term="personal-communication" text-case="capitalize-first"/>
           </if>
           <else-if type="interview">
             <text term="interview" text-case="capitalize-first"/>
@@ -1180,7 +1128,7 @@
         </choose>
       </else-if>
       <else-if type="map">
-        <text value="Map"/>
+        <text term="map"/>
       </else-if>
     </choose>
   </macro>
@@ -1419,83 +1367,56 @@
   </macro>
   <!-- Legal citations have their own rules -->
   <macro name="legal-cites">
+    <!-- TODO: Add new item types -->
     <choose>
-      <if type="legal_case">
-        <group delimiter=". ">
-          <group delimiter=", ">
-            <text variable="title"/>
-            <group delimiter=" ">
-              <text macro="container-legal"/>
-              <text macro="date-legal"/>
-            </group>
-            <text variable="references"/>
-          </group>
+      <if type="treaty">
+        <!-- APA generally defers to Bluebook for legal citations, but diverges without
+             explanation for treaty items. The Bluebook format that was used in APA 6th
+             ed. is used here. -->
+        <group delimiter=", ">
+          <text variable="title" text-case="title"/>
+          <names variable="author">
+            <name initialize-with="." form="short" delimiter="-"/>
+          </names>
+          <text macro="date-legal"/>
+          <text macro="container-legal"/>
           <text macro="access"/>
         </group>
       </if>
-      <else-if type="bill">
-        <!-- Currently designed to handle bills, resolutions, hearings, rederal reports. -->
+      <else>
+        <!-- For `bill`: currently designed to handle bills, resolutions, federal reports. -->
+        <!-- For `legislation`: currently designed to handle statutes, codified regulations, executive orders. -->
         <group delimiter=". ">
           <group delimiter=", ">
             <choose>
-              <if variable="number container-title" match="none">
-                <!-- If no number or container-title, then assume it is a hearing -->
-                <text variable="title" font-style="italic"/>
-              </if>
-              <else>
+              <if type="bill legal_case legislation" match="any">
                 <text variable="title"/>
-              </else>
+              </if>
+              <else-if type="hearing">
+                <text variable="title" font-style="italic"/>
+              </else-if>
             </choose>
             <group delimiter=" ">
               <text macro="container-legal"/>
               <text macro="date-legal"/>
               <choose>
-                <if variable="number container-title" match="none">
-                  <!-- If no number or container-title, then assume it is a hearing -->
+                <if type="hearing">
                   <names variable="author" prefix="(testimony of " suffix=")">
+                    <!-- TODO: Localize this with the hearing term. -->
                     <name and="symbol" delimiter=", "/>
                   </names>
                 </if>
-                <else>
+                <else-if type="bill legislation" match="any">
+                  <!-- `legislation`: For uncodified regulations, assume future code section is in status. -->
                   <text variable="status" prefix="(" suffix=")"/>
-                </else>
+                </else-if>
               </choose>
             </group>
             <text variable="references"/>
           </group>
           <text macro="access"/>
         </group>
-      </else-if>
-      <else-if type="legislation">
-        <!-- Currently designed to handle statutes, codified regulations, executive orders.
-             For uncodified regulations, assume future code section is in status. -->
-        <group delimiter=". ">
-          <group delimiter=", ">
-            <text variable="title"/>
-            <group delimiter=" ">
-              <text macro="container-legal"/>
-              <text macro="date-legal"/>
-              <text variable="status" prefix="(" suffix=")"/>
-            </group>
-            <text variable="references"/>
-          </group>
-          <text macro="access"/>
-        </group>
-      </else-if>
-      <else-if type="treaty">
-        <!-- APA generally defers to Bluebook for legal citations, but diverges without
-             explanation for treaty items. The Bluebook format that was used in APA 6th
-             ed. is used here. -->
-        <group delimiter=", ">
-          <text variable="title" text-case="title"/>
-          <names variable="author">
-            <name initialize-with="." form="short" delimiter="-"/>
-          </names>
-          <text macro="date-legal"/>
-          <text macro="container-legal"/>
-          <text macro="access"/>
-        </group>
-      </else-if>
+      </else>
     </choose>
   </macro>
   <macro name="date-legal">
@@ -1514,7 +1435,7 @@
           </choose>
         </group>
       </if>
-      <else-if type="bill legislation" match="any">
+      <else-if type="bill legislation hearing" match="any">
         <group prefix="(" suffix=")" delimiter=" ">
           <group delimiter=" ">
             <date variable="original-date">
@@ -1543,8 +1464,7 @@
                 <text variable="volume"/>
                 <text variable="container-title"/>
                 <group delimiter=" ">
-                  <!-- Change to label variable="section" as that becomes available -->
-                  <text term="section" form="symbol"/>
+                  <label variable="section" form="symbol"/>
                   <text variable="section"/>
                 </group>
                 <choose>
@@ -1561,8 +1481,7 @@
               <group delimiter=" ">
                 <choose>
                   <if is-numeric="number">
-                    <!-- Replace with label variable="number" if that becomes available -->
-                    <text term="issue" form="short" text-case="capitalize-first"/>
+                    <label variable="number" form="short" text-case="capitalize-first"/>
                   </if>
                 </choose>
                 <text variable="number"/>
@@ -1578,8 +1497,7 @@
             <group delimiter=" ">
               <choose>
                 <if variable="chapter-number container-title" match="none">
-                  <!-- Replace with label variable="number" as that becomes available -->
-                  <text term="issue" form="short"/>
+                  <label variable="number" form="short"/>
                 </if>
               </choose>
               <text variable="number"/>
@@ -1614,8 +1532,7 @@
               <choose>
                 <if variable="section">
                   <group delimiter=" ">
-                    <!-- Change to label variable="section" as that becomes available -->
-                    <text term="section" form="symbol"/>
+                    <label variable="section" form="symbol"/>
                     <text variable="section"/>
                   </group>
                 </if>
@@ -1637,8 +1554,7 @@
             </if>
             <else>
               <group delimiter=" ">
-                <!-- Replace with label variable="number" if that becomes available -->
-                <text term="issue" form="short" text-case="capitalize-first"/>
+                <label variable="number" form="short" text-case="capitalize-first"/>
                 <text variable="number"/>
               </group>
             </else>
diff --git a/buildres/csl/csl-styles/apa-numeric-superscript.csl b/buildres/csl/csl-styles/apa-numeric-superscript.csl
index 2a2d81cbde2..5e15fc48c4f 100644
--- a/buildres/csl/csl-styles/apa-numeric-superscript.csl
+++ b/buildres/csl/csl-styles/apa-numeric-superscript.csl
@@ -36,51 +36,30 @@
       <term name="circa" form="short">ca.</term>
       <term name="bc"> B.C.E.</term>
       <term name="ad"> C.E.</term>
-      <term name="letter">personal communication</term>
-      <term name="letter" form="short">letter</term>
       <term name="issue" form="long">
         <single>issue</single>
         <multiple>issues</multiple>
       </term>
-    </terms>
-  </locale>
-  <locale xml:lang="af">
-    <terms>
-      <term name="letter">persoonlike kommunikasie</term>
-      <term name="letter" form="short">brief</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ar">
-    <terms>
-      <term name="letter">اتصال شخصي</term>
-      <term name="letter" form="short">خطاب</term>
+      <term name="software">computer software</term>
     </terms>
   </locale>
   <locale xml:lang="da">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikation</term>
-      <term name="letter" form="short">brev</term>
     </terms>
   </locale>
   <locale xml:lang="de">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">persönliche Kommunikation</term>
-      <term name="letter" form="short">Brief</term>
     </terms>
   </locale>
   <locale xml:lang="es">
     <terms>
       <term name="from">de</term>
-      <term name="letter">comunicación personal</term>
-      <term name="letter" form="short">carta</term>
     </terms>
   </locale>
   <locale xml:lang="fr">
     <terms>
-      <term name="letter">communication personnelle</term>
-      <term name="letter" form="short">lettre</term>
       <term name="editor" form="short">
         <single>éd.</single>
         <multiple>éds.</multiple>
@@ -90,43 +69,27 @@
   <locale xml:lang="nb">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikasjon</term>
-      <term name="letter" form="short">brev</term>
     </terms>
   </locale>
   <locale xml:lang="nl">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">persoonlijke communicatie</term>
-      <term name="letter" form="short">brief</term>
     </terms>
   </locale>
   <locale xml:lang="nn">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikasjon</term>
-      <term name="letter" form="short">brev</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ru">
-    <terms>
-      <term name="letter">личная переписка</term>
-      <term name="letter" form="short">письмо</term>
-    </terms>
-  </locale>
-  <locale xml:lang="tr">
-    <terms>
-      <term name="letter">kişisel iletişim</term>
-      <term name="letter" form="short">mektup</term>
     </terms>
   </locale>
   <!-- General categories of item types:
        Periodical: article-journal article-magazine article-newspaper post-weblog review review-book
        Periodical or Booklike: paper-conference
-       Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure
+       Booklike: article book broadcast chapter classic collection dataset document
+                 entry entry-dictionary entry-encyclopedia event figure
                  graphic interview manuscript map motion_picture musical_score pamphlet patent
-                 personal_communication report song speech thesis post webpage
-       Legal: bill legal_case legislation treaty
+                 performance periodical personal_communication post report
+                 software song speech standard thesis webpage
+       Legal: bill hearing legal_case legislation regulation treaty
   -->
   <!-- APA references contain four parts: author, date, title, source -->
   <macro name="author-bib">
@@ -202,8 +165,7 @@
                   <text macro="title-intext"/>
                 </substitute>
               </names>
-              <!-- Replace with term="personal-communication" if that becomes available -->
-              <text term="letter"/>
+              <text term="personal-communication"/>
             </group>
           </if>
           <else>
@@ -441,23 +403,23 @@
       <if variable="title" match="none">
         <text macro="bracketed-intext" prefix="[" suffix="]"/>
       </if>
+      <else-if type="hearing">
+        <!-- Hearings are italicized -->
+        <text variable="title" form="short" font-style="italic" text-case="title"/>
+      </else-if>
       <else-if type="bill">
-        <!-- If a bill has no number or container-title, assume it is a hearing; italic and title case -->
+        <!-- Bills are not italicized and substitute bill number if no title. -->
         <choose>
-          <if variable="number container-title" match="none">
-            <text variable="title" form="short" font-style="italic" text-case="title"/>
+          <if variable="title">
+            <text variable="title" form="short" text-case="title"/>
           </if>
-          <else-if variable="title">
-            <text variable="title" form="short"/>
-          </else-if>
           <else>
             <group delimiter=" ">
               <text variable="genre"/>
               <group delimiter=" ">
                 <choose>
                   <if variable="chapter-number container-title" match="none">
-                    <!-- Replace with label variable="number" as that becomes available -->
-                    <text term="issue" form="short"/>
+                    <label variable="number" form="short"/>
                   </if>
                 </choose>
                 <text variable="number"/>
@@ -500,13 +462,11 @@
                 <text variable="genre" text-case="capitalize-first"/>
               </if>
               <else>
-                <!-- This should be localized -->
-                <text value="patent" text-case="capitalize-first"/>
+                <text term="patent" text-case="capitalize-first"/>
               </else>
             </choose>
             <group delimiter=" ">
-              <!-- Replace with label variable="number" if that becomes available -->
-              <text term="issue" form="short" text-case="capitalize-first"/>
+              <label variable="number" form="short" text-case="capitalize-first"/>
               <text variable="number"/>
             </group>
           </group>
@@ -684,7 +644,7 @@
                           <text variable="medium" text-case="capitalize-first"/>
                         </else-if>
                         <else>
-                          <text term="letter" form="short" text-case="capitalize-first"/>
+                          <text term="letter" text-case="capitalize-first"/>
                         </else>
                       </choose>
                     </if>
@@ -694,7 +654,7 @@
                           <text variable="medium" text-case="capitalize-first"/>
                         </if>
                         <else>
-                          <text term="letter" form="short" text-case="capitalize-first"/>
+                          <text term="letter" text-case="capitalize-first"/>
                         </else>
                       </choose>
                     </else>
@@ -795,14 +755,7 @@
                 </if>
               </choose>
             </if>
-            <else-if type="book">
-              <choose>
-                <if variable="version" match="none">
-                  <text macro="format"/>
-                </if>
-              </choose>
-            </else-if>
-            <else-if type="report" match="none">
+            <else-if type="report software" match="none">
               <text macro="format"/>
             </else-if>
           </choose>
@@ -814,8 +767,10 @@
     <group prefix="[" suffix="]">
       <choose>
         <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
-          <!-- This should be localized -->
-          <text macro="reviewed-title-intext" prefix="Review of "/>
+          <group delimiter=" ">
+            <text term="review-of" text-case="capitalize-first"/>
+            <text macro="reviewed-title-intext"/>
+          </group>
         </if>
         <else-if variable="interviewer" type="interview" match="any">
           <names variable="interviewer">
@@ -836,7 +791,7 @@
                     <text variable="genre" text-case="capitalize-first"/>
                   </if>
                   <else>
-                    <text term="letter" form="short" text-case="capitalize-first"/>
+                    <text term="letter" text-case="capitalize-first"/>
                   </else>
                 </choose>
                 <names variable="recipient" delimiter=", ">
@@ -867,7 +822,7 @@
             </if>
           </choose>
         </if>
-        <else-if type="book" variable="version" match="all">
+        <else-if type="software" match="all">
           <!-- For entries in mobile app reference works, place bracketed after the container-title -->
           <text macro="format"/>
         </else-if>
@@ -975,8 +930,7 @@
             <text variable="genre" text-case="title"/>
             <choose>
               <if is-numeric="number">
-                <!-- Replace with label variable="number" if that becomes available -->
-                <text term="issue" form="short" text-case="capitalize-first"/>
+                <label variable="number" form="short" text-case="capitalize-first"/>
                 <text variable="number"/>
               </if>
               <else>
@@ -1025,8 +979,7 @@
     <choose>
       <if is-numeric="version">
         <group delimiter=" ">
-          <!-- replace with label variable="version" if that becomes available -->
-          <text term="version" text-case="capitalize-first"/>
+          <label variable="version" text-case="capitalize-first"/>
           <text variable="version"/>
         </group>
       </if>
@@ -1074,8 +1027,7 @@
         </if>
         <else>
           <group>
-            <!-- Replace with label variable="number-of-volumes" if that becomes available -->
-            <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+            <label variable="number-of-volumes" form="short" text-case="capitalize-first" suffix=" "/>
             <text term="page-range-delimiter" prefix="1"/>
             <number variable="number-of-volumes" form="numeric"/>
           </group>
@@ -1129,18 +1081,16 @@
         </group>
       </if>
       <!-- Generic labels for specific types -->
-      <!-- These should be localized when possible -->
       <else-if type="dataset">
-        <text value="Data set"/>
+        <text term="dataset"/>
       </else-if>
-      <else-if type="book" variable="version" match="all">
-        <!-- Replace with type="software" and term="software" as that becomes available -->
-        <text value="Computer software"/>
+      <else-if type="software">
+        <text term="software" text-case="capitalize-first"/>
       </else-if>
       <else-if type="interview personal_communication" match="any">
         <choose>
           <if variable="archive container-title DOI publisher URL" match="none">
-            <text term="letter" text-case="capitalize-first"/>
+            <text term="personal-communication" text-case="capitalize-first"/>
           </if>
           <else-if type="interview">
             <text term="interview" text-case="capitalize-first"/>
@@ -1148,7 +1098,7 @@
         </choose>
       </else-if>
       <else-if type="map">
-        <text value="Map"/>
+        <text term="map" text-case="capitalize-first"/>
       </else-if>
     </choose>
   </macro>
@@ -1161,18 +1111,16 @@
         <text variable="medium" text-case="capitalize-first"/>
       </else-if>
       <!-- Generic labels for specific types -->
-      <!-- These should be localized when possible -->
       <else-if type="dataset">
-        <text value="Data set"/>
+        <text term="dataset"/>
       </else-if>
-      <else-if type="book" variable="version" match="all">
-        <!-- Replace with type="software" and term="software" as that becomes available -->
-        <text value="Computer software"/>
+      <else-if type="software">
+        <text term="software" text-case="capitalize-first"/>
       </else-if>
       <else-if type="interview personal_communication" match="any">
         <choose>
           <if variable="archive container-title DOI publisher URL" match="none">
-            <text term="letter" text-case="capitalize-first"/>
+            <text term="personal-communication" text-case="capitalize-first"/>
           </if>
           <else-if type="interview">
             <text term="interview" text-case="capitalize-first"/>
@@ -1180,7 +1128,7 @@
         </choose>
       </else-if>
       <else-if type="map">
-        <text value="Map"/>
+        <text term="map"/>
       </else-if>
     </choose>
   </macro>
@@ -1419,83 +1367,56 @@
   </macro>
   <!-- Legal citations have their own rules -->
   <macro name="legal-cites">
+    <!-- TODO: Add new item types -->
     <choose>
-      <if type="legal_case">
-        <group delimiter=". ">
-          <group delimiter=", ">
-            <text variable="title"/>
-            <group delimiter=" ">
-              <text macro="container-legal"/>
-              <text macro="date-legal"/>
-            </group>
-            <text variable="references"/>
-          </group>
+      <if type="treaty">
+        <!-- APA generally defers to Bluebook for legal citations, but diverges without
+             explanation for treaty items. The Bluebook format that was used in APA 6th
+             ed. is used here. -->
+        <group delimiter=", ">
+          <text variable="title" text-case="title"/>
+          <names variable="author">
+            <name initialize-with="." form="short" delimiter="-"/>
+          </names>
+          <text macro="date-legal"/>
+          <text macro="container-legal"/>
           <text macro="access"/>
         </group>
       </if>
-      <else-if type="bill">
-        <!-- Currently designed to handle bills, resolutions, hearings, rederal reports. -->
+      <else>
+        <!-- For `bill`: currently designed to handle bills, resolutions, federal reports. -->
+        <!-- For `legislation`: currently designed to handle statutes, codified regulations, executive orders. -->
         <group delimiter=". ">
           <group delimiter=", ">
             <choose>
-              <if variable="number container-title" match="none">
-                <!-- If no number or container-title, then assume it is a hearing -->
-                <text variable="title" font-style="italic"/>
-              </if>
-              <else>
+              <if type="bill legal_case legislation" match="any">
                 <text variable="title"/>
-              </else>
+              </if>
+              <else-if type="hearing">
+                <text variable="title" font-style="italic"/>
+              </else-if>
             </choose>
             <group delimiter=" ">
               <text macro="container-legal"/>
               <text macro="date-legal"/>
               <choose>
-                <if variable="number container-title" match="none">
-                  <!-- If no number or container-title, then assume it is a hearing -->
+                <if type="hearing">
                   <names variable="author" prefix="(testimony of " suffix=")">
+                    <!-- TODO: Localize this with the hearing term. -->
                     <name and="symbol" delimiter=", "/>
                   </names>
                 </if>
-                <else>
+                <else-if type="bill legislation" match="any">
+                  <!-- `legislation`: For uncodified regulations, assume future code section is in status. -->
                   <text variable="status" prefix="(" suffix=")"/>
-                </else>
+                </else-if>
               </choose>
             </group>
             <text variable="references"/>
           </group>
           <text macro="access"/>
         </group>
-      </else-if>
-      <else-if type="legislation">
-        <!-- Currently designed to handle statutes, codified regulations, executive orders.
-             For uncodified regulations, assume future code section is in status. -->
-        <group delimiter=". ">
-          <group delimiter=", ">
-            <text variable="title"/>
-            <group delimiter=" ">
-              <text macro="container-legal"/>
-              <text macro="date-legal"/>
-              <text variable="status" prefix="(" suffix=")"/>
-            </group>
-            <text variable="references"/>
-          </group>
-          <text macro="access"/>
-        </group>
-      </else-if>
-      <else-if type="treaty">
-        <!-- APA generally defers to Bluebook for legal citations, but diverges without
-             explanation for treaty items. The Bluebook format that was used in APA 6th
-             ed. is used here. -->
-        <group delimiter=", ">
-          <text variable="title" text-case="title"/>
-          <names variable="author">
-            <name initialize-with="." form="short" delimiter="-"/>
-          </names>
-          <text macro="date-legal"/>
-          <text macro="container-legal"/>
-          <text macro="access"/>
-        </group>
-      </else-if>
+      </else>
     </choose>
   </macro>
   <macro name="date-legal">
@@ -1514,7 +1435,7 @@
           </choose>
         </group>
       </if>
-      <else-if type="bill legislation" match="any">
+      <else-if type="bill legislation hearing" match="any">
         <group prefix="(" suffix=")" delimiter=" ">
           <group delimiter=" ">
             <date variable="original-date">
@@ -1543,8 +1464,7 @@
                 <text variable="volume"/>
                 <text variable="container-title"/>
                 <group delimiter=" ">
-                  <!-- Change to label variable="section" as that becomes available -->
-                  <text term="section" form="symbol"/>
+                  <label variable="section" form="symbol"/>
                   <text variable="section"/>
                 </group>
                 <choose>
@@ -1561,8 +1481,7 @@
               <group delimiter=" ">
                 <choose>
                   <if is-numeric="number">
-                    <!-- Replace with label variable="number" if that becomes available -->
-                    <text term="issue" form="short" text-case="capitalize-first"/>
+                    <label variable="number" form="short" text-case="capitalize-first"/>
                   </if>
                 </choose>
                 <text variable="number"/>
@@ -1578,8 +1497,7 @@
             <group delimiter=" ">
               <choose>
                 <if variable="chapter-number container-title" match="none">
-                  <!-- Replace with label variable="number" as that becomes available -->
-                  <text term="issue" form="short"/>
+                  <label variable="number" form="short"/>
                 </if>
               </choose>
               <text variable="number"/>
@@ -1614,8 +1532,7 @@
               <choose>
                 <if variable="section">
                   <group delimiter=" ">
-                    <!-- Change to label variable="section" as that becomes available -->
-                    <text term="section" form="symbol"/>
+                    <label variable="section" form="symbol"/>
                     <text variable="section"/>
                   </group>
                 </if>
@@ -1637,8 +1554,7 @@
             </if>
             <else>
               <group delimiter=" ">
-                <!-- Replace with label variable="number" if that becomes available -->
-                <text term="issue" form="short" text-case="capitalize-first"/>
+                <label variable="number" form="short" text-case="capitalize-first"/>
                 <text variable="number"/>
               </group>
             </else>
diff --git a/buildres/csl/csl-styles/apa-single-spaced.csl b/buildres/csl/csl-styles/apa-single-spaced.csl
index 8765b40f36e..2793e6ac5eb 100644
--- a/buildres/csl/csl-styles/apa-single-spaced.csl
+++ b/buildres/csl/csl-styles/apa-single-spaced.csl
@@ -35,295 +35,60 @@
       <term name="circa" form="short">ca.</term>
       <term name="bc"> B.C.E.</term>
       <term name="ad"> C.E.</term>
-      <term name="letter">personal communication</term>
-      <term name="letter" form="short">letter</term>
       <term name="issue" form="long">
         <single>issue</single>
         <multiple>issues</multiple>
       </term>
-    </terms>
-  </locale>
-  <locale xml:lang="af">
-    <terms>
-      <term name="letter">persoonlike kommunikasie</term>
-      <term name="letter" form="short">brief</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ar">
-    <terms>
-      <term name="letter">اتصال شخصي</term>
-      <term name="letter" form="short">خطاب</term>
-    </terms>
-  </locale>
-  <locale xml:lang="bg">
-    <terms>
-      <term name="letter">лична комуникация</term>
-      <term name="letter" form="short">писмо</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ca">
-    <terms>
-      <term name="letter">comunicació personal</term>
-      <term name="letter" form="short">carta</term>
-    </terms>
-  </locale>
-  <locale xml:lang="cs">
-    <terms>
-      <term name="letter">osobní komunikace</term>
-      <term name="letter" form="short">dopis</term>
-    </terms>
-  </locale>
-  <locale xml:lang="cy">
-    <terms>
-      <term name="letter">cyfathrebu personol</term>
-      <term name="letter" form="short">llythyr</term>
+      <term name="software">computer software</term>
     </terms>
   </locale>
   <locale xml:lang="da">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikation</term>
-      <term name="letter" form="short">brev</term>
     </terms>
   </locale>
   <locale xml:lang="de">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">persönliche Kommunikation</term>
-      <term name="letter" form="short">Brief</term>
-    </terms>
-  </locale>
-  <locale xml:lang="el">
-    <terms>
-      <term name="letter">προσωπική επικοινωνία</term>
-      <term name="letter" form="short">επιστολή</term>
     </terms>
   </locale>
   <locale xml:lang="es">
     <terms>
       <term name="from">de</term>
-      <term name="letter">comunicación personal</term>
-      <term name="letter" form="short">carta</term>
-    </terms>
-  </locale>
-  <locale xml:lang="et">
-    <terms>
-      <term name="letter">isiklik suhtlus</term>
-      <term name="letter" form="short">kiri</term>
-    </terms>
-  </locale>
-  <locale xml:lang="eu">
-    <terms>
-      <term name="letter">komunikazio pertsonala</term>
-      <term name="letter" form="short">gutuna</term>
-    </terms>
-  </locale>
-  <locale xml:lang="fa">
-    <terms>
-      <term name="letter">ارتباط شخصی</term>
-      <term name="letter" form="short">نامه</term>
-    </terms>
-  </locale>
-  <locale xml:lang="fi">
-    <terms>
-      <term name="letter">henkilökohtainen viestintä</term>
-      <term name="letter" form="short">kirje</term>
     </terms>
   </locale>
   <locale xml:lang="fr">
     <terms>
-      <term name="letter">communication personnelle</term>
-      <term name="letter" form="short">lettre</term>
       <term name="editor" form="short">
         <single>éd.</single>
         <multiple>éds.</multiple>
       </term>
     </terms>
   </locale>
-  <locale xml:lang="he">
-    <terms>
-      <term name="letter">תקשורת אישית</term>
-      <term name="letter" form="short">מכתב</term>
-    </terms>
-  </locale>
-  <locale xml:lang="hr">
-    <terms>
-      <term name="letter">osobna komunikacija</term>
-      <term name="letter" form="short">pismo</term>
-    </terms>
-  </locale>
-  <locale xml:lang="hu">
-    <terms>
-      <term name="letter">személyes kommunikáció</term>
-      <term name="letter" form="short">levél</term>
-    </terms>
-  </locale>
-  <locale xml:lang="id">
-    <terms>
-      <term name="letter">komunikasi pribadi</term>
-      <term name="letter" form="short">surat</term>
-    </terms>
-  </locale>
-  <locale xml:lang="is">
-    <terms>
-      <term name="letter">persónuleg samskipti</term>
-      <term name="letter" form="short">bréf</term>
-    </terms>
-  </locale>
-  <locale xml:lang="it">
-    <terms>
-      <term name="letter">comunicazione personale</term>
-      <term name="letter" form="short">lettera</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ja">
-    <terms>
-      <term name="letter">個人的なやり取り</term>
-      <term name="letter" form="short">手紙</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ko">
-    <terms>
-      <term name="letter">개인 서신</term>
-      <term name="letter" form="short">편지</term>
-    </terms>
-  </locale>
-  <locale xml:lang="la">
-    <terms>
-      <term name="letter"/>
-      <term name="letter" form="short">epistula</term>
-    </terms>
-  </locale>
-  <locale xml:lang="lt">
-    <terms>
-      <term name="letter">communicationis personalis</term>
-      <term name="letter" form="short"/>
-    </terms>
-  </locale>
-  <locale xml:lang="lv">
-    <terms>
-      <term name="letter">personīga komunikācija</term>
-      <term name="letter" form="short">vēstule</term>
-    </terms>
-  </locale>
-  <locale xml:lang="mn">
-    <terms>
-      <term name="letter">хувийн харилцаа холбоо</term>
-      <term name="letter" form="short">захиа</term>
-    </terms>
-  </locale>
   <locale xml:lang="nb">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikasjon</term>
-      <term name="letter" form="short">brev</term>
     </terms>
   </locale>
   <locale xml:lang="nl">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">persoonlijke communicatie</term>
-      <term name="letter" form="short">brief</term>
     </terms>
   </locale>
   <locale xml:lang="nn">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikasjon</term>
-      <term name="letter" form="short">brev</term>
-    </terms>
-  </locale>
-  <locale xml:lang="pl">
-    <terms>
-      <term name="letter">osobista komunikacja</term>
-      <term name="letter" form="short">list</term>
-    </terms>
-  </locale>
-  <locale xml:lang="pt">
-    <terms>
-      <term name="letter">comunicação pessoal</term>
-      <term name="letter" form="short">carta</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ro">
-    <terms>
-      <term name="letter">comunicare personală</term>
-      <term name="letter" form="short">scrisoare</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ru">
-    <terms>
-      <term name="letter">личная переписка</term>
-      <term name="letter" form="short">письмо</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sk">
-    <terms>
-      <term name="letter">osobná komunikácia</term>
-      <term name="letter" form="short">list</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sl">
-    <terms>
-      <term name="letter">osebna komunikacija</term>
-      <term name="letter" form="short">pismo</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sr">
-    <terms>
-      <term name="letter">лична комуникација</term>
-      <term name="letter" form="short">писмо</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sv">
-    <terms>
-      <term name="letter">personlig kommunikation</term>
-      <term name="letter" form="short">brev</term>
-    </terms>
-  </locale>
-  <locale xml:lang="th">
-    <terms>
-      <term name="letter">การสื่อสารส่วนบุคคล</term>
-      <term name="letter" form="short">จดหมาย</term>
-    </terms>
-  </locale>
-  <locale xml:lang="tr">
-    <terms>
-      <term name="letter">kişisel iletişim</term>
-      <term name="letter" form="short">mektup</term>
-    </terms>
-  </locale>
-  <locale xml:lang="uk">
-    <terms>
-      <term name="letter">особисте спілкування</term>
-      <term name="letter" form="short">лист</term>
-    </terms>
-  </locale>
-  <locale xml:lang="vi">
-    <terms>
-      <term name="letter">giao tiếp cá nhân</term>
-      <term name="letter" form="short">thư</term>
-    </terms>
-  </locale>
-  <locale xml:lang="zh-CN">
-    <terms>
-      <term name="letter">的私人交流</term>
-      <term name="letter" form="short">信函</term>
-    </terms>
-  </locale>
-  <locale xml:lang="zh-TW">
-    <terms>
-      <term name="letter">私人通訊</term>
-      <term name="letter" form="short">信函</term>
     </terms>
   </locale>
   <!-- General categories of item types:
-        Periodical: article-journal article-magazine article-newspaper post-weblog review review-book
-        Periodical or Booklike: paper-conference
-        Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure
-                  graphic interview manuscript map motion_picture musical_score pamphlet patent
-                  personal_communication report song speech thesis post webpage
-        Legal: bill legal_case legislation treaty
+       Periodical: article-journal article-magazine article-newspaper post-weblog review review-book
+       Periodical or Booklike: paper-conference
+       Booklike: article book broadcast chapter classic collection dataset document
+                 entry entry-dictionary entry-encyclopedia event figure
+                 graphic interview manuscript map motion_picture musical_score pamphlet patent
+                 performance periodical personal_communication post report
+                 software song speech standard thesis webpage
+       Legal: bill hearing legal_case legislation regulation treaty
   -->
   <!-- APA references contain four parts: author, date, title, source -->
   <macro name="author-bib">
@@ -399,8 +164,7 @@
                   <text macro="title-intext"/>
                 </substitute>
               </names>
-              <!-- Replace with term="personal-communication" if that becomes available -->
-              <text term="letter"/>
+              <text term="personal-communication"/>
             </group>
           </if>
           <else>
@@ -638,23 +402,23 @@
       <if variable="title" match="none">
         <text macro="bracketed-intext" prefix="[" suffix="]"/>
       </if>
+      <else-if type="hearing">
+        <!-- Hearings are italicized -->
+        <text variable="title" form="short" font-style="italic" text-case="title"/>
+      </else-if>
       <else-if type="bill">
-        <!-- If a bill has no number or container-title, assume it is a hearing; italic -->
+        <!-- Bills are not italicized and substitute bill number if no title. -->
         <choose>
-          <if variable="number container-title" match="none">
-            <text variable="title" form="short" font-style="italic" text-case="title"/>
-          </if>
-          <else-if variable="title">
+          <if variable="title">
             <text variable="title" form="short" text-case="title"/>
-          </else-if>
+          </if>
           <else>
             <group delimiter=" ">
               <text variable="genre"/>
               <group delimiter=" ">
                 <choose>
                   <if variable="chapter-number container-title" match="none">
-                    <!-- Replace with label variable="number" as that becomes available -->
-                    <text term="issue" form="short"/>
+                    <label variable="number" form="short"/>
                   </if>
                 </choose>
                 <text variable="number"/>
@@ -697,13 +461,11 @@
                 <text variable="genre" text-case="capitalize-first"/>
               </if>
               <else>
-                <!-- This should be localized -->
-                <text value="patent" text-case="capitalize-first"/>
+                <text term="patent" text-case="capitalize-first"/>
               </else>
             </choose>
             <group delimiter=" ">
-              <!-- Replace with label variable="number" if that becomes available -->
-              <text term="issue" form="short" text-case="capitalize-first"/>
+              <label variable="number" form="short" text-case="capitalize-first"/>
               <text variable="number"/>
             </group>
           </group>
@@ -881,7 +643,7 @@
                           <text variable="medium" text-case="capitalize-first"/>
                         </else-if>
                         <else>
-                          <text term="letter" form="short" text-case="capitalize-first"/>
+                          <text term="letter" text-case="capitalize-first"/>
                         </else>
                       </choose>
                     </if>
@@ -891,7 +653,7 @@
                           <text variable="medium" text-case="capitalize-first"/>
                         </if>
                         <else>
-                          <text term="letter" form="short" text-case="capitalize-first"/>
+                          <text term="letter" text-case="capitalize-first"/>
                         </else>
                       </choose>
                     </else>
@@ -992,14 +754,7 @@
                 </if>
               </choose>
             </if>
-            <else-if type="book">
-              <choose>
-                <if variable="version" match="none">
-                  <text macro="format"/>
-                </if>
-              </choose>
-            </else-if>
-            <else-if type="report" match="none">
+            <else-if type="report software" match="none">
               <text macro="format"/>
             </else-if>
           </choose>
@@ -1011,8 +766,10 @@
     <group prefix="[" suffix="]">
       <choose>
         <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
-          <!-- This should be localized -->
-          <text macro="reviewed-title-intext" prefix="Review of "/>
+          <group delimiter=" ">
+            <text term="review-of" text-case="capitalize-first"/>
+            <text macro="reviewed-title-intext"/>
+          </group>
         </if>
         <else-if variable="interviewer" type="interview" match="any">
           <names variable="interviewer">
@@ -1033,7 +790,7 @@
                     <text variable="genre" text-case="capitalize-first"/>
                   </if>
                   <else>
-                    <text term="letter" form="short" text-case="capitalize-first"/>
+                    <text term="letter" text-case="capitalize-first"/>
                   </else>
                 </choose>
                 <names variable="recipient" delimiter=", ">
@@ -1064,7 +821,7 @@
             </if>
           </choose>
         </if>
-        <else-if type="book" variable="version" match="all">
+        <else-if type="software" match="all">
           <!-- For entries in mobile app reference works, place bracketed after the container-title -->
           <text macro="format"/>
         </else-if>
@@ -1172,8 +929,7 @@
             <text variable="genre" text-case="title"/>
             <choose>
               <if is-numeric="number">
-                <!-- Replace with label variable="number" if that becomes available -->
-                <text term="issue" form="short" text-case="capitalize-first"/>
+                <label variable="number" form="short" text-case="capitalize-first"/>
                 <text variable="number"/>
               </if>
               <else>
@@ -1222,8 +978,7 @@
     <choose>
       <if is-numeric="version">
         <group delimiter=" ">
-          <!-- replace with label variable="version" if that becomes available -->
-          <text term="version" text-case="capitalize-first"/>
+          <label variable="version" text-case="capitalize-first"/>
           <text variable="version"/>
         </group>
       </if>
@@ -1271,8 +1026,7 @@
         </if>
         <else>
           <group>
-            <!-- Replace with label variable="number-of-volumes" if that becomes available -->
-            <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+            <label variable="number-of-volumes" form="short" text-case="capitalize-first" suffix=" "/>
             <text term="page-range-delimiter" prefix="1"/>
             <number variable="number-of-volumes" form="numeric"/>
           </group>
@@ -1326,18 +1080,16 @@
         </group>
       </if>
       <!-- Generic labels for specific types -->
-      <!-- These should be localized when possible -->
       <else-if type="dataset">
-        <text value="Data set"/>
+        <text term="dataset"/>
       </else-if>
-      <else-if type="book" variable="version" match="all">
-        <!-- Replace with type="software" and term="software" as that becomes available -->
-        <text value="Computer software"/>
+      <else-if type="software">
+        <text term="software" text-case="capitalize-first"/>
       </else-if>
       <else-if type="interview personal_communication" match="any">
         <choose>
           <if variable="archive container-title DOI publisher URL" match="none">
-            <text term="letter" text-case="capitalize-first"/>
+            <text term="personal-communication" text-case="capitalize-first"/>
           </if>
           <else-if type="interview">
             <text term="interview" text-case="capitalize-first"/>
@@ -1345,7 +1097,7 @@
         </choose>
       </else-if>
       <else-if type="map">
-        <text value="Map"/>
+        <text term="map" text-case="capitalize-first"/>
       </else-if>
     </choose>
   </macro>
@@ -1358,18 +1110,16 @@
         <text variable="medium" text-case="capitalize-first"/>
       </else-if>
       <!-- Generic labels for specific types -->
-      <!-- These should be localized when possible -->
       <else-if type="dataset">
-        <text value="Data set"/>
+        <text term="dataset"/>
       </else-if>
-      <else-if type="book" variable="version" match="all">
-        <!-- Replace with type="software" and term="software" as that becomes available -->
-        <text value="Computer software"/>
+      <else-if type="software">
+        <text term="software" text-case="capitalize-first"/>
       </else-if>
       <else-if type="interview personal_communication" match="any">
         <choose>
           <if variable="archive container-title DOI publisher URL" match="none">
-            <text term="letter" text-case="capitalize-first"/>
+            <text term="personal-communication" text-case="capitalize-first"/>
           </if>
           <else-if type="interview">
             <text term="interview" text-case="capitalize-first"/>
@@ -1377,7 +1127,7 @@
         </choose>
       </else-if>
       <else-if type="map">
-        <text value="Map"/>
+        <text term="map"/>
       </else-if>
     </choose>
   </macro>
@@ -1616,83 +1366,56 @@
   </macro>
   <!-- Legal citations have their own rules -->
   <macro name="legal-cites">
+    <!-- TODO: Add new item types -->
     <choose>
-      <if type="legal_case">
-        <group delimiter=". ">
-          <group delimiter=", ">
-            <text variable="title"/>
-            <group delimiter=" ">
-              <text macro="container-legal"/>
-              <text macro="date-legal"/>
-            </group>
-            <text variable="references"/>
-          </group>
+      <if type="treaty">
+        <!-- APA generally defers to Bluebook for legal citations, but diverges without
+             explanation for treaty items. The Bluebook format that was used in APA 6th
+             ed. is used here. -->
+        <group delimiter=", ">
+          <text variable="title" text-case="title"/>
+          <names variable="author">
+            <name initialize-with="." form="short" delimiter="-"/>
+          </names>
+          <text macro="date-legal"/>
+          <text macro="container-legal"/>
           <text macro="access"/>
         </group>
       </if>
-      <else-if type="bill">
-        <!-- Currently designed to handle bills, resolutions, hearings, rederal reports. -->
+      <else>
+        <!-- For `bill`: currently designed to handle bills, resolutions, federal reports. -->
+        <!-- For `legislation`: currently designed to handle statutes, codified regulations, executive orders. -->
         <group delimiter=". ">
           <group delimiter=", ">
             <choose>
-              <if variable="number container-title" match="none">
-                <!-- If no number or container-title, then assume it is a hearing -->
-                <text variable="title" font-style="italic"/>
-              </if>
-              <else>
+              <if type="bill legal_case legislation" match="any">
                 <text variable="title"/>
-              </else>
+              </if>
+              <else-if type="hearing">
+                <text variable="title" font-style="italic"/>
+              </else-if>
             </choose>
             <group delimiter=" ">
               <text macro="container-legal"/>
               <text macro="date-legal"/>
               <choose>
-                <if variable="number container-title" match="none">
-                  <!-- If no number or container-title, then assume it is a hearing -->
+                <if type="hearing">
                   <names variable="author" prefix="(testimony of " suffix=")">
+                    <!-- TODO: Localize this with the hearing term. -->
                     <name and="symbol" delimiter=", "/>
                   </names>
                 </if>
-                <else>
+                <else-if type="bill legislation" match="any">
+                  <!-- `legislation`: For uncodified regulations, assume future code section is in status. -->
                   <text variable="status" prefix="(" suffix=")"/>
-                </else>
+                </else-if>
               </choose>
             </group>
             <text variable="references"/>
           </group>
           <text macro="access"/>
         </group>
-      </else-if>
-      <else-if type="legislation">
-        <!-- Currently designed to handle statutes, codified regulations, executive orders.
-              For uncodified regulations, assume future code section is in status. -->
-        <group delimiter=". ">
-          <group delimiter=", ">
-            <text variable="title"/>
-            <group delimiter=" ">
-              <text macro="container-legal"/>
-              <text macro="date-legal"/>
-              <text variable="status" prefix="(" suffix=")"/>
-            </group>
-            <text variable="references"/>
-          </group>
-          <text macro="access"/>
-        </group>
-      </else-if>
-      <else-if type="treaty">
-        <!-- APA generally defers to Bluebook for legal citations, but diverges without
-              explanation for treaty items. The Bluebook format that was used in APA 6th
-              ed. is used here. -->
-        <group delimiter=", ">
-          <text variable="title" text-case="title"/>
-          <names variable="author">
-            <name initialize-with="." form="short" delimiter="-"/>
-          </names>
-          <text macro="date-legal"/>
-          <text macro="container-legal"/>
-          <text macro="access"/>
-        </group>
-      </else-if>
+      </else>
     </choose>
   </macro>
   <macro name="date-legal">
@@ -1711,7 +1434,7 @@
           </choose>
         </group>
       </if>
-      <else-if type="bill legislation" match="any">
+      <else-if type="bill legislation hearing" match="any">
         <group prefix="(" suffix=")" delimiter=" ">
           <group delimiter=" ">
             <date variable="original-date">
@@ -1740,8 +1463,7 @@
                 <text variable="volume"/>
                 <text variable="container-title"/>
                 <group delimiter=" ">
-                  <!-- Change to label variable="section" as that becomes available -->
-                  <text term="section" form="symbol"/>
+                  <label variable="section" form="symbol"/>
                   <text variable="section"/>
                 </group>
                 <choose>
@@ -1758,8 +1480,7 @@
               <group delimiter=" ">
                 <choose>
                   <if is-numeric="number">
-                    <!-- Replace with label variable="number" if that becomes available -->
-                    <text term="issue" form="short" text-case="capitalize-first"/>
+                    <label variable="number" form="short" text-case="capitalize-first"/>
                   </if>
                 </choose>
                 <text variable="number"/>
@@ -1775,8 +1496,7 @@
             <group delimiter=" ">
               <choose>
                 <if variable="chapter-number container-title" match="none">
-                  <!-- Replace with label variable="number" as that becomes available -->
-                  <text term="issue" form="short"/>
+                  <label variable="number" form="short"/>
                 </if>
               </choose>
               <text variable="number"/>
@@ -1811,8 +1531,7 @@
               <choose>
                 <if variable="section">
                   <group delimiter=" ">
-                    <!-- Change to label variable="section" as that becomes available -->
-                    <text term="section" form="symbol"/>
+                    <label variable="section" form="symbol"/>
                     <text variable="section"/>
                   </group>
                 </if>
@@ -1834,8 +1553,7 @@
             </if>
             <else>
               <group delimiter=" ">
-                <!-- Replace with label variable="number" if that becomes available -->
-                <text term="issue" form="short" text-case="capitalize-first"/>
+                <label variable="number" form="short" text-case="capitalize-first"/>
                 <text variable="number"/>
               </group>
             </else>
diff --git a/buildres/csl/csl-styles/apa-with-abstract.csl b/buildres/csl/csl-styles/apa-with-abstract.csl
index 1e5430b81ba..d16cd2cbcf7 100644
--- a/buildres/csl/csl-styles/apa-with-abstract.csl
+++ b/buildres/csl/csl-styles/apa-with-abstract.csl
@@ -35,295 +35,60 @@
       <term name="circa" form="short">ca.</term>
       <term name="bc"> B.C.E.</term>
       <term name="ad"> C.E.</term>
-      <term name="letter">personal communication</term>
-      <term name="letter" form="short">letter</term>
       <term name="issue" form="long">
         <single>issue</single>
         <multiple>issues</multiple>
       </term>
-    </terms>
-  </locale>
-  <locale xml:lang="af">
-    <terms>
-      <term name="letter">persoonlike kommunikasie</term>
-      <term name="letter" form="short">brief</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ar">
-    <terms>
-      <term name="letter">اتصال شخصي</term>
-      <term name="letter" form="short">خطاب</term>
-    </terms>
-  </locale>
-  <locale xml:lang="bg">
-    <terms>
-      <term name="letter">лична комуникация</term>
-      <term name="letter" form="short">писмо</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ca">
-    <terms>
-      <term name="letter">comunicació personal</term>
-      <term name="letter" form="short">carta</term>
-    </terms>
-  </locale>
-  <locale xml:lang="cs">
-    <terms>
-      <term name="letter">osobní komunikace</term>
-      <term name="letter" form="short">dopis</term>
-    </terms>
-  </locale>
-  <locale xml:lang="cy">
-    <terms>
-      <term name="letter">cyfathrebu personol</term>
-      <term name="letter" form="short">llythyr</term>
+      <term name="software">computer software</term>
     </terms>
   </locale>
   <locale xml:lang="da">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikation</term>
-      <term name="letter" form="short">brev</term>
     </terms>
   </locale>
   <locale xml:lang="de">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">persönliche Kommunikation</term>
-      <term name="letter" form="short">Brief</term>
-    </terms>
-  </locale>
-  <locale xml:lang="el">
-    <terms>
-      <term name="letter">προσωπική επικοινωνία</term>
-      <term name="letter" form="short">επιστολή</term>
     </terms>
   </locale>
   <locale xml:lang="es">
     <terms>
       <term name="from">de</term>
-      <term name="letter">comunicación personal</term>
-      <term name="letter" form="short">carta</term>
-    </terms>
-  </locale>
-  <locale xml:lang="et">
-    <terms>
-      <term name="letter">isiklik suhtlus</term>
-      <term name="letter" form="short">kiri</term>
-    </terms>
-  </locale>
-  <locale xml:lang="eu">
-    <terms>
-      <term name="letter">komunikazio pertsonala</term>
-      <term name="letter" form="short">gutuna</term>
-    </terms>
-  </locale>
-  <locale xml:lang="fa">
-    <terms>
-      <term name="letter">ارتباط شخصی</term>
-      <term name="letter" form="short">نامه</term>
-    </terms>
-  </locale>
-  <locale xml:lang="fi">
-    <terms>
-      <term name="letter">henkilökohtainen viestintä</term>
-      <term name="letter" form="short">kirje</term>
     </terms>
   </locale>
   <locale xml:lang="fr">
     <terms>
-      <term name="letter">communication personnelle</term>
-      <term name="letter" form="short">lettre</term>
       <term name="editor" form="short">
         <single>éd.</single>
         <multiple>éds.</multiple>
       </term>
     </terms>
   </locale>
-  <locale xml:lang="he">
-    <terms>
-      <term name="letter">תקשורת אישית</term>
-      <term name="letter" form="short">מכתב</term>
-    </terms>
-  </locale>
-  <locale xml:lang="hr">
-    <terms>
-      <term name="letter">osobna komunikacija</term>
-      <term name="letter" form="short">pismo</term>
-    </terms>
-  </locale>
-  <locale xml:lang="hu">
-    <terms>
-      <term name="letter">személyes kommunikáció</term>
-      <term name="letter" form="short">levél</term>
-    </terms>
-  </locale>
-  <locale xml:lang="id">
-    <terms>
-      <term name="letter">komunikasi pribadi</term>
-      <term name="letter" form="short">surat</term>
-    </terms>
-  </locale>
-  <locale xml:lang="is">
-    <terms>
-      <term name="letter">persónuleg samskipti</term>
-      <term name="letter" form="short">bréf</term>
-    </terms>
-  </locale>
-  <locale xml:lang="it">
-    <terms>
-      <term name="letter">comunicazione personale</term>
-      <term name="letter" form="short">lettera</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ja">
-    <terms>
-      <term name="letter">個人的なやり取り</term>
-      <term name="letter" form="short">手紙</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ko">
-    <terms>
-      <term name="letter">개인 서신</term>
-      <term name="letter" form="short">편지</term>
-    </terms>
-  </locale>
-  <locale xml:lang="la">
-    <terms>
-      <term name="letter"/>
-      <term name="letter" form="short">epistula</term>
-    </terms>
-  </locale>
-  <locale xml:lang="lt">
-    <terms>
-      <term name="letter">communicationis personalis</term>
-      <term name="letter" form="short"/>
-    </terms>
-  </locale>
-  <locale xml:lang="lv">
-    <terms>
-      <term name="letter">personīga komunikācija</term>
-      <term name="letter" form="short">vēstule</term>
-    </terms>
-  </locale>
-  <locale xml:lang="mn">
-    <terms>
-      <term name="letter">хувийн харилцаа холбоо</term>
-      <term name="letter" form="short">захиа</term>
-    </terms>
-  </locale>
   <locale xml:lang="nb">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikasjon</term>
-      <term name="letter" form="short">brev</term>
     </terms>
   </locale>
   <locale xml:lang="nl">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">persoonlijke communicatie</term>
-      <term name="letter" form="short">brief</term>
     </terms>
   </locale>
   <locale xml:lang="nn">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikasjon</term>
-      <term name="letter" form="short">brev</term>
-    </terms>
-  </locale>
-  <locale xml:lang="pl">
-    <terms>
-      <term name="letter">osobista komunikacja</term>
-      <term name="letter" form="short">list</term>
-    </terms>
-  </locale>
-  <locale xml:lang="pt">
-    <terms>
-      <term name="letter">comunicação pessoal</term>
-      <term name="letter" form="short">carta</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ro">
-    <terms>
-      <term name="letter">comunicare personală</term>
-      <term name="letter" form="short">scrisoare</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ru">
-    <terms>
-      <term name="letter">личная переписка</term>
-      <term name="letter" form="short">письмо</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sk">
-    <terms>
-      <term name="letter">osobná komunikácia</term>
-      <term name="letter" form="short">list</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sl">
-    <terms>
-      <term name="letter">osebna komunikacija</term>
-      <term name="letter" form="short">pismo</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sr">
-    <terms>
-      <term name="letter">лична комуникација</term>
-      <term name="letter" form="short">писмо</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sv">
-    <terms>
-      <term name="letter">personlig kommunikation</term>
-      <term name="letter" form="short">brev</term>
-    </terms>
-  </locale>
-  <locale xml:lang="th">
-    <terms>
-      <term name="letter">การสื่อสารส่วนบุคคล</term>
-      <term name="letter" form="short">จดหมาย</term>
-    </terms>
-  </locale>
-  <locale xml:lang="tr">
-    <terms>
-      <term name="letter">kişisel iletişim</term>
-      <term name="letter" form="short">mektup</term>
-    </terms>
-  </locale>
-  <locale xml:lang="uk">
-    <terms>
-      <term name="letter">особисте спілкування</term>
-      <term name="letter" form="short">лист</term>
-    </terms>
-  </locale>
-  <locale xml:lang="vi">
-    <terms>
-      <term name="letter">giao tiếp cá nhân</term>
-      <term name="letter" form="short">thư</term>
-    </terms>
-  </locale>
-  <locale xml:lang="zh-CN">
-    <terms>
-      <term name="letter">的私人交流</term>
-      <term name="letter" form="short">信函</term>
-    </terms>
-  </locale>
-  <locale xml:lang="zh-TW">
-    <terms>
-      <term name="letter">私人通訊</term>
-      <term name="letter" form="short">信函</term>
     </terms>
   </locale>
   <!-- General categories of item types:
        Periodical: article-journal article-magazine article-newspaper post-weblog review review-book
        Periodical or Booklike: paper-conference
-       Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure
+       Booklike: article book broadcast chapter classic collection dataset document
+                 entry entry-dictionary entry-encyclopedia event figure
                  graphic interview manuscript map motion_picture musical_score pamphlet patent
-                 personal_communication report song speech thesis post webpage
-       Legal: bill legal_case legislation treaty
+                 performance periodical personal_communication post report
+                 software song speech standard thesis webpage
+       Legal: bill hearing legal_case legislation regulation treaty
   -->
   <!-- APA references contain four parts: author, date, title, source -->
   <macro name="author-bib">
@@ -399,8 +164,7 @@
                   <text macro="title-intext"/>
                 </substitute>
               </names>
-              <!-- Replace with term="personal-communication" if that becomes available -->
-              <text term="letter"/>
+              <text term="personal-communication"/>
             </group>
           </if>
           <else>
@@ -638,23 +402,23 @@
       <if variable="title" match="none">
         <text macro="bracketed-intext" prefix="[" suffix="]"/>
       </if>
+      <else-if type="hearing">
+        <!-- Hearings are italicized -->
+        <text variable="title" form="short" font-style="italic" text-case="title"/>
+      </else-if>
       <else-if type="bill">
-        <!-- If a bill has no number or container-title, assume it is a hearing; italic -->
+        <!-- Bills are not italicized and substitute bill number if no title. -->
         <choose>
-          <if variable="number container-title" match="none">
-            <text variable="title" form="short" font-style="italic" text-case="title"/>
-          </if>
-          <else-if variable="title">
+          <if variable="title">
             <text variable="title" form="short" text-case="title"/>
-          </else-if>
+          </if>
           <else>
             <group delimiter=" ">
               <text variable="genre"/>
               <group delimiter=" ">
                 <choose>
                   <if variable="chapter-number container-title" match="none">
-                    <!-- Replace with label variable="number" as that becomes available -->
-                    <text term="issue" form="short"/>
+                    <label variable="number" form="short"/>
                   </if>
                 </choose>
                 <text variable="number"/>
@@ -697,13 +461,11 @@
                 <text variable="genre" text-case="capitalize-first"/>
               </if>
               <else>
-                <!-- This should be localized -->
-                <text value="patent" text-case="capitalize-first"/>
+                <text term="patent" text-case="capitalize-first"/>
               </else>
             </choose>
             <group delimiter=" ">
-              <!-- Replace with label variable="number" if that becomes available -->
-              <text term="issue" form="short" text-case="capitalize-first"/>
+              <label variable="number" form="short" text-case="capitalize-first"/>
               <text variable="number"/>
             </group>
           </group>
@@ -881,7 +643,7 @@
                           <text variable="medium" text-case="capitalize-first"/>
                         </else-if>
                         <else>
-                          <text term="letter" form="short" text-case="capitalize-first"/>
+                          <text term="letter" text-case="capitalize-first"/>
                         </else>
                       </choose>
                     </if>
@@ -891,7 +653,7 @@
                           <text variable="medium" text-case="capitalize-first"/>
                         </if>
                         <else>
-                          <text term="letter" form="short" text-case="capitalize-first"/>
+                          <text term="letter" text-case="capitalize-first"/>
                         </else>
                       </choose>
                     </else>
@@ -992,14 +754,7 @@
                 </if>
               </choose>
             </if>
-            <else-if type="book">
-              <choose>
-                <if variable="version" match="none">
-                  <text macro="format"/>
-                </if>
-              </choose>
-            </else-if>
-            <else-if type="report" match="none">
+            <else-if type="report software" match="none">
               <text macro="format"/>
             </else-if>
           </choose>
@@ -1011,8 +766,10 @@
     <group prefix="[" suffix="]">
       <choose>
         <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
-          <!-- This should be localized -->
-          <text macro="reviewed-title-intext" prefix="Review of "/>
+          <group delimiter=" ">
+            <text term="review-of" text-case="capitalize-first"/>
+            <text macro="reviewed-title-intext"/>
+          </group>
         </if>
         <else-if variable="interviewer" type="interview" match="any">
           <names variable="interviewer">
@@ -1033,7 +790,7 @@
                     <text variable="genre" text-case="capitalize-first"/>
                   </if>
                   <else>
-                    <text term="letter" form="short" text-case="capitalize-first"/>
+                    <text term="letter" text-case="capitalize-first"/>
                   </else>
                 </choose>
                 <names variable="recipient" delimiter=", ">
@@ -1064,7 +821,7 @@
             </if>
           </choose>
         </if>
-        <else-if type="book" variable="version" match="all">
+        <else-if type="software" match="all">
           <!-- For entries in mobile app reference works, place bracketed after the container-title -->
           <text macro="format"/>
         </else-if>
@@ -1172,8 +929,7 @@
             <text variable="genre" text-case="title"/>
             <choose>
               <if is-numeric="number">
-                <!-- Replace with label variable="number" if that becomes available -->
-                <text term="issue" form="short" text-case="capitalize-first"/>
+                <label variable="number" form="short" text-case="capitalize-first"/>
                 <text variable="number"/>
               </if>
               <else>
@@ -1222,8 +978,7 @@
     <choose>
       <if is-numeric="version">
         <group delimiter=" ">
-          <!-- replace with label variable="version" if that becomes available -->
-          <text term="version" text-case="capitalize-first"/>
+          <label variable="version" text-case="capitalize-first"/>
           <text variable="version"/>
         </group>
       </if>
@@ -1271,8 +1026,7 @@
         </if>
         <else>
           <group>
-            <!-- Replace with label variable="number-of-volumes" if that becomes available -->
-            <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+            <label variable="number-of-volumes" form="short" text-case="capitalize-first" suffix=" "/>
             <text term="page-range-delimiter" prefix="1"/>
             <number variable="number-of-volumes" form="numeric"/>
           </group>
@@ -1326,18 +1080,16 @@
         </group>
       </if>
       <!-- Generic labels for specific types -->
-      <!-- These should be localized when possible -->
       <else-if type="dataset">
-        <text value="Data set"/>
+        <text term="dataset"/>
       </else-if>
-      <else-if type="book" variable="version" match="all">
-        <!-- Replace with type="software" and term="software" as that becomes available -->
-        <text value="Computer software"/>
+      <else-if type="software">
+        <text term="software" text-case="capitalize-first"/>
       </else-if>
       <else-if type="interview personal_communication" match="any">
         <choose>
           <if variable="archive container-title DOI publisher URL" match="none">
-            <text term="letter" text-case="capitalize-first"/>
+            <text term="personal-communication" text-case="capitalize-first"/>
           </if>
           <else-if type="interview">
             <text term="interview" text-case="capitalize-first"/>
@@ -1345,7 +1097,7 @@
         </choose>
       </else-if>
       <else-if type="map">
-        <text value="Map"/>
+        <text term="map" text-case="capitalize-first"/>
       </else-if>
     </choose>
   </macro>
@@ -1358,18 +1110,16 @@
         <text variable="medium" text-case="capitalize-first"/>
       </else-if>
       <!-- Generic labels for specific types -->
-      <!-- These should be localized when possible -->
       <else-if type="dataset">
-        <text value="Data set"/>
+        <text term="dataset"/>
       </else-if>
-      <else-if type="book" variable="version" match="all">
-        <!-- Replace with type="software" and term="software" as that becomes available -->
-        <text value="Computer software"/>
+      <else-if type="software">
+        <text term="software" text-case="capitalize-first"/>
       </else-if>
       <else-if type="interview personal_communication" match="any">
         <choose>
           <if variable="archive container-title DOI publisher URL" match="none">
-            <text term="letter" text-case="capitalize-first"/>
+            <text term="personal-communication" text-case="capitalize-first"/>
           </if>
           <else-if type="interview">
             <text term="interview" text-case="capitalize-first"/>
@@ -1377,7 +1127,7 @@
         </choose>
       </else-if>
       <else-if type="map">
-        <text value="Map"/>
+        <text term="map"/>
       </else-if>
     </choose>
   </macro>
@@ -1616,83 +1366,56 @@
   </macro>
   <!-- Legal citations have their own rules -->
   <macro name="legal-cites">
+    <!-- TODO: Add new item types -->
     <choose>
-      <if type="legal_case">
-        <group delimiter=". ">
-          <group delimiter=", ">
-            <text variable="title"/>
-            <group delimiter=" ">
-              <text macro="container-legal"/>
-              <text macro="date-legal"/>
-            </group>
-            <text variable="references"/>
-          </group>
+      <if type="treaty">
+        <!-- APA generally defers to Bluebook for legal citations, but diverges without
+             explanation for treaty items. The Bluebook format that was used in APA 6th
+             ed. is used here. -->
+        <group delimiter=", ">
+          <text variable="title" text-case="title"/>
+          <names variable="author">
+            <name initialize-with="." form="short" delimiter="-"/>
+          </names>
+          <text macro="date-legal"/>
+          <text macro="container-legal"/>
           <text macro="access"/>
         </group>
       </if>
-      <else-if type="bill">
-        <!-- Currently designed to handle bills, resolutions, hearings, rederal reports. -->
+      <else>
+        <!-- For `bill`: currently designed to handle bills, resolutions, federal reports. -->
+        <!-- For `legislation`: currently designed to handle statutes, codified regulations, executive orders. -->
         <group delimiter=". ">
           <group delimiter=", ">
             <choose>
-              <if variable="number container-title" match="none">
-                <!-- If no number or container-title, then assume it is a hearing -->
-                <text variable="title" font-style="italic"/>
-              </if>
-              <else>
+              <if type="bill legal_case legislation" match="any">
                 <text variable="title"/>
-              </else>
+              </if>
+              <else-if type="hearing">
+                <text variable="title" font-style="italic"/>
+              </else-if>
             </choose>
             <group delimiter=" ">
               <text macro="container-legal"/>
               <text macro="date-legal"/>
               <choose>
-                <if variable="number container-title" match="none">
-                  <!-- If no number or container-title, then assume it is a hearing -->
+                <if type="hearing">
                   <names variable="author" prefix="(testimony of " suffix=")">
+                    <!-- TODO: Localize this with the hearing term. -->
                     <name and="symbol" delimiter=", "/>
                   </names>
                 </if>
-                <else>
+                <else-if type="bill legislation" match="any">
+                  <!-- `legislation`: For uncodified regulations, assume future code section is in status. -->
                   <text variable="status" prefix="(" suffix=")"/>
-                </else>
+                </else-if>
               </choose>
             </group>
             <text variable="references"/>
           </group>
           <text macro="access"/>
         </group>
-      </else-if>
-      <else-if type="legislation">
-        <!-- Currently designed to handle statutes, codified regulations, executive orders.
-             For uncodified regulations, assume future code section is in status. -->
-        <group delimiter=". ">
-          <group delimiter=", ">
-            <text variable="title"/>
-            <group delimiter=" ">
-              <text macro="container-legal"/>
-              <text macro="date-legal"/>
-              <text variable="status" prefix="(" suffix=")"/>
-            </group>
-            <text variable="references"/>
-          </group>
-          <text macro="access"/>
-        </group>
-      </else-if>
-      <else-if type="treaty">
-        <!-- APA generally defers to Bluebook for legal citations, but diverges without
-             explanation for treaty items. The Bluebook format that was used in APA 6th
-             ed. is used here. -->
-        <group delimiter=", ">
-          <text variable="title" text-case="title"/>
-          <names variable="author">
-            <name initialize-with="." form="short" delimiter="-"/>
-          </names>
-          <text macro="date-legal"/>
-          <text macro="container-legal"/>
-          <text macro="access"/>
-        </group>
-      </else-if>
+      </else>
     </choose>
   </macro>
   <macro name="date-legal">
@@ -1711,7 +1434,7 @@
           </choose>
         </group>
       </if>
-      <else-if type="bill legislation" match="any">
+      <else-if type="bill legislation hearing" match="any">
         <group prefix="(" suffix=")" delimiter=" ">
           <group delimiter=" ">
             <date variable="original-date">
@@ -1740,8 +1463,7 @@
                 <text variable="volume"/>
                 <text variable="container-title"/>
                 <group delimiter=" ">
-                  <!-- Change to label variable="section" as that becomes available -->
-                  <text term="section" form="symbol"/>
+                  <label variable="section" form="symbol"/>
                   <text variable="section"/>
                 </group>
                 <choose>
@@ -1758,8 +1480,7 @@
               <group delimiter=" ">
                 <choose>
                   <if is-numeric="number">
-                    <!-- Replace with label variable="number" if that becomes available -->
-                    <text term="issue" form="short" text-case="capitalize-first"/>
+                    <label variable="number" form="short" text-case="capitalize-first"/>
                   </if>
                 </choose>
                 <text variable="number"/>
@@ -1775,8 +1496,7 @@
             <group delimiter=" ">
               <choose>
                 <if variable="chapter-number container-title" match="none">
-                  <!-- Replace with label variable="number" as that becomes available -->
-                  <text term="issue" form="short"/>
+                  <label variable="number" form="short"/>
                 </if>
               </choose>
               <text variable="number"/>
@@ -1811,8 +1531,7 @@
               <choose>
                 <if variable="section">
                   <group delimiter=" ">
-                    <!-- Change to label variable="section" as that becomes available -->
-                    <text term="section" form="symbol"/>
+                    <label variable="section" form="symbol"/>
                     <text variable="section"/>
                   </group>
                 </if>
@@ -1834,8 +1553,7 @@
             </if>
             <else>
               <group delimiter=" ">
-                <!-- Replace with label variable="number" if that becomes available -->
-                <text term="issue" form="short" text-case="capitalize-first"/>
+                <label variable="number" form="short" text-case="capitalize-first"/>
                 <text variable="number"/>
               </group>
             </else>
diff --git a/buildres/csl/csl-styles/apa.csl b/buildres/csl/csl-styles/apa.csl
index 0d11d0702e8..772c25e3345 100644
--- a/buildres/csl/csl-styles/apa.csl
+++ b/buildres/csl/csl-styles/apa.csl
@@ -35,298 +35,88 @@
       <term name="circa" form="short">ca.</term>
       <term name="bc"> B.C.E.</term>
       <term name="ad"> C.E.</term>
-      <term name="letter">personal communication</term>
-      <term name="letter" form="short">letter</term>
       <term name="issue" form="long">
         <single>issue</single>
         <multiple>issues</multiple>
       </term>
-    </terms>
-  </locale>
-  <locale xml:lang="af">
-    <terms>
-      <term name="letter">persoonlike kommunikasie</term>
-      <term name="letter" form="short">brief</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ar">
-    <terms>
-      <term name="letter">اتصال شخصي</term>
-      <term name="letter" form="short">خطاب</term>
-    </terms>
-  </locale>
-  <locale xml:lang="bg">
-    <terms>
-      <term name="letter">лична комуникация</term>
-      <term name="letter" form="short">писмо</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ca">
-    <terms>
-      <term name="letter">comunicació personal</term>
-      <term name="letter" form="short">carta</term>
-    </terms>
-  </locale>
-  <locale xml:lang="cs">
-    <terms>
-      <term name="letter">osobní komunikace</term>
-      <term name="letter" form="short">dopis</term>
-    </terms>
-  </locale>
-  <locale xml:lang="cy">
-    <terms>
-      <term name="letter">cyfathrebu personol</term>
-      <term name="letter" form="short">llythyr</term>
+      <term name="software">computer software</term>
     </terms>
   </locale>
   <locale xml:lang="da">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikation</term>
-      <term name="letter" form="short">brev</term>
     </terms>
   </locale>
   <locale xml:lang="de">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">persönliche Kommunikation</term>
-      <term name="letter" form="short">Brief</term>
-    </terms>
-  </locale>
-  <locale xml:lang="el">
-    <terms>
-      <term name="letter">προσωπική επικοινωνία</term>
-      <term name="letter" form="short">επιστολή</term>
     </terms>
   </locale>
   <locale xml:lang="es">
     <terms>
       <term name="from">de</term>
-      <term name="letter">comunicación personal</term>
-      <term name="letter" form="short">carta</term>
-    </terms>
-  </locale>
-  <locale xml:lang="et">
-    <terms>
-      <term name="letter">isiklik suhtlus</term>
-      <term name="letter" form="short">kiri</term>
-    </terms>
-  </locale>
-  <locale xml:lang="eu">
-    <terms>
-      <term name="letter">komunikazio pertsonala</term>
-      <term name="letter" form="short">gutuna</term>
-    </terms>
-  </locale>
-  <locale xml:lang="fa">
-    <terms>
-      <term name="letter">ارتباط شخصی</term>
-      <term name="letter" form="short">نامه</term>
-    </terms>
-  </locale>
-  <locale xml:lang="fi">
-    <terms>
-      <term name="letter">henkilökohtainen viestintä</term>
-      <term name="letter" form="short">kirje</term>
     </terms>
   </locale>
   <locale xml:lang="fr">
     <terms>
-      <term name="letter">communication personnelle</term>
-      <term name="letter" form="short">lettre</term>
       <term name="editor" form="short">
         <single>éd.</single>
         <multiple>éds.</multiple>
       </term>
     </terms>
   </locale>
-  <locale xml:lang="he">
-    <terms>
-      <term name="letter">תקשורת אישית</term>
-      <term name="letter" form="short">מכתב</term>
-    </terms>
-  </locale>
-  <locale xml:lang="hr">
-    <terms>
-      <term name="letter">osobna komunikacija</term>
-      <term name="letter" form="short">pismo</term>
-    </terms>
-  </locale>
-  <locale xml:lang="hu">
-    <terms>
-      <term name="letter">személyes kommunikáció</term>
-      <term name="letter" form="short">levél</term>
-    </terms>
-  </locale>
-  <locale xml:lang="id">
-    <terms>
-      <term name="letter">komunikasi pribadi</term>
-      <term name="letter" form="short">surat</term>
-    </terms>
-  </locale>
-  <locale xml:lang="is">
-    <terms>
-      <term name="letter">persónuleg samskipti</term>
-      <term name="letter" form="short">bréf</term>
-    </terms>
-  </locale>
-  <locale xml:lang="it">
-    <terms>
-      <term name="letter">comunicazione personale</term>
-      <term name="letter" form="short">lettera</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ja">
-    <terms>
-      <term name="letter">個人的なやり取り</term>
-      <term name="letter" form="short">手紙</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ko">
-    <terms>
-      <term name="letter">개인 서신</term>
-      <term name="letter" form="short">편지</term>
-    </terms>
-  </locale>
-  <locale xml:lang="la">
-    <terms>
-      <term name="letter"/>
-      <term name="letter" form="short">epistula</term>
-    </terms>
-  </locale>
-  <locale xml:lang="lt">
-    <terms>
-      <term name="letter">communicationis personalis</term>
-      <term name="letter" form="short"/>
-    </terms>
-  </locale>
-  <locale xml:lang="lv">
-    <terms>
-      <term name="letter">personīga komunikācija</term>
-      <term name="letter" form="short">vēstule</term>
-    </terms>
-  </locale>
-  <locale xml:lang="mn">
-    <terms>
-      <term name="letter">хувийн харилцаа холбоо</term>
-      <term name="letter" form="short">захиа</term>
-    </terms>
-  </locale>
   <locale xml:lang="nb">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikasjon</term>
-      <term name="letter" form="short">brev</term>
     </terms>
   </locale>
   <locale xml:lang="nl">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">persoonlijke communicatie</term>
-      <term name="letter" form="short">brief</term>
     </terms>
   </locale>
   <locale xml:lang="nn">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikasjon</term>
-      <term name="letter" form="short">brev</term>
-    </terms>
-  </locale>
-  <locale xml:lang="pl">
-    <terms>
-      <term name="letter">osobista komunikacja</term>
-      <term name="letter" form="short">list</term>
-    </terms>
-  </locale>
-  <locale xml:lang="pt">
-    <terms>
-      <term name="letter">comunicação pessoal</term>
-      <term name="letter" form="short">carta</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ro">
-    <terms>
-      <term name="letter">comunicare personală</term>
-      <term name="letter" form="short">scrisoare</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ru">
-    <terms>
-      <term name="letter">личная переписка</term>
-      <term name="letter" form="short">письмо</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sk">
-    <terms>
-      <term name="letter">osobná komunikácia</term>
-      <term name="letter" form="short">list</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sl">
-    <terms>
-      <term name="letter">osebna komunikacija</term>
-      <term name="letter" form="short">pismo</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sr">
-    <terms>
-      <term name="letter">лична комуникација</term>
-      <term name="letter" form="short">писмо</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sv">
-    <terms>
-      <term name="letter">personlig kommunikation</term>
-      <term name="letter" form="short">brev</term>
-    </terms>
-  </locale>
-  <locale xml:lang="th">
-    <terms>
-      <term name="letter">การสื่อสารส่วนบุคคล</term>
-      <term name="letter" form="short">จดหมาย</term>
-    </terms>
-  </locale>
-  <locale xml:lang="tr">
-    <terms>
-      <term name="letter">kişisel iletişim</term>
-      <term name="letter" form="short">mektup</term>
-    </terms>
-  </locale>
-  <locale xml:lang="uk">
-    <terms>
-      <term name="letter">особисте спілкування</term>
-      <term name="letter" form="short">лист</term>
-    </terms>
-  </locale>
-  <locale xml:lang="vi">
-    <terms>
-      <term name="letter">giao tiếp cá nhân</term>
-      <term name="letter" form="short">thư</term>
-    </terms>
-  </locale>
-  <locale xml:lang="zh-CN">
-    <terms>
-      <term name="letter">的私人交流</term>
-      <term name="letter" form="short">信函</term>
-    </terms>
-  </locale>
-  <locale xml:lang="zh-TW">
-    <terms>
-      <term name="letter">私人通訊</term>
-      <term name="letter" form="short">信函</term>
     </terms>
   </locale>
+  <!-- TODO: New types: classic collection document event hearing performance periodical regulation -software- standard -->
+  <!-- TODO: New creator roles: chair compiler contributor curator executive-producer guest host narrator organizer performer producer script-writer series-creator -->
+  <!-- TODO: New variables:
+         available-date submitted
+         part-number printing-number supplement-number
+         part-title volume-title
+         archive_collection
+         division jurisdiction
+         event-title
+         language
+         license
+         reviewed-genre
+  -->
+  <!-- TODO: New terms:
+         advance-online-publication
+         album on audio-recording
+         original-work-published
+         personal-communication
+         preprint
+         review-of
+         item types
+  -->
+  <!-- TODO: Check Indigeneous Knowledge format -->
   <!-- General categories of item types:
        Periodical: article-journal article-magazine article-newspaper post-weblog review review-book
        Periodical or Booklike: paper-conference
-       Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure
+       Booklike: article book broadcast chapter classic collection dataset document
+                 entry entry-dictionary entry-encyclopedia event figure
                  graphic interview manuscript map motion_picture musical_score pamphlet patent
-                 personal_communication report song speech thesis post webpage
-       Legal: bill legal_case legislation treaty
+                 performance periodical personal_communication post report
+                 software song speech standard thesis webpage
+       Legal: bill hearing legal_case legislation regulation treaty
   -->
   <!-- APA references contain four parts: author, date, title, source -->
   <macro name="author-bib">
+    <!-- TODO: New creator roles (media, contributor) -->
+    <!-- TODO: Add new item types -->
     <names variable="composer" delimiter=", ">
       <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
       <substitute>
@@ -355,7 +145,7 @@
             </choose>
           </if>
         </choose>
-        <!-- Test for editortranslator and put that first as that becomes available -->
+        <!-- TODO: Test for editortranslator and put that first as that becomes available -->
         <names variable="editor" delimiter=", ">
           <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
           <label form="short" prefix=" (" suffix=")" text-case="title"/>
@@ -383,6 +173,8 @@
     </names>
   </macro>
   <macro name="author-intext">
+    <!-- TODO: New creator roles -->
+    <!-- TODO: Add new item types -->
     <choose>
       <if type="bill legal_case legislation treaty" match="any">
         <text macro="title-intext"/>
@@ -399,8 +191,7 @@
                   <text macro="title-intext"/>
                 </substitute>
               </names>
-              <!-- Replace with term="personal-communication" if that becomes available -->
-              <text term="letter"/>
+              <text term="personal-communication"/>
             </group>
           </if>
           <else>
@@ -438,6 +229,7 @@
     </choose>
   </macro>
   <macro name="date-bib">
+    <!-- TODO: Add new item types -->
     <group delimiter=" " prefix="(" suffix=")">
       <choose>
         <if is-uncertain-date="issued">
@@ -476,6 +268,7 @@
           </if>
           <else-if variable="status">
             <group>
+              <!-- TODO: Should I print status as-is, or should I print the in-press term? -->
               <text variable="status" text-case="lowercase"/>
               <text variable="year-suffix" prefix="-"/>
             </group>
@@ -503,6 +296,7 @@
     </choose>
   </macro>
   <macro name="date-intext">
+    <!-- TODO: Add new item types -->
     <choose>
       <if variable="issued">
         <group delimiter="/">
@@ -550,6 +344,7 @@
         </group>
       </if>
       <else-if variable="status">
+        <!-- TODO: Should I print status as-is, or should I print the in-press term? -->
         <text variable="status" text-case="lowercase"/>
         <text variable="year-suffix" prefix="-"/>
       </else-if>
@@ -579,6 +374,7 @@
     </choose>
   </macro>
   <macro name="title">
+    <!-- TODO: Add new item types -->
     <choose>
       <if type="post webpage" match="any">
         <!-- Webpages are always italicized -->
@@ -600,7 +396,7 @@
               <if variable="collection-editor editor editorial-director" match="any">
                 <group delimiter=": " font-style="italic">
                   <text variable="title"/>
-                  <!-- Replace with volume-title as that becomes available -->
+                  <!-- TODO: Replace with volume-title -->
                   <choose>
                     <if is-numeric="volume" match="none">
                       <group delimiter=" ">
@@ -619,7 +415,7 @@
           <else>
             <group delimiter=": " font-style="italic">
               <text variable="title"/>
-              <!-- Replace with volume-title as that becomes available -->
+              <!-- TODO: Replace with volume-title -->
               <choose>
                 <if is-numeric="volume" match="none">
                   <group delimiter=" ">
@@ -635,27 +431,28 @@
     </choose>
   </macro>
   <macro name="title-intext">
+    <!-- TODO: Add new item types -->
     <choose>
       <if variable="title" match="none">
         <text macro="bracketed-intext" prefix="[" suffix="]"/>
       </if>
+      <else-if type="hearing">
+        <!-- Hearings are italicized -->
+        <text variable="title" form="short" font-style="italic" text-case="title"/>
+      </else-if>
       <else-if type="bill">
-        <!-- If a bill has no number or container-title, assume it is a hearing; italic -->
+        <!-- Bills are not italicized and substitute bill number if no title. -->
         <choose>
-          <if variable="number container-title" match="none">
-            <text variable="title" form="short" font-style="italic" text-case="title"/>
-          </if>
-          <else-if variable="title">
+          <if variable="title">
             <text variable="title" form="short" text-case="title"/>
-          </else-if>
+          </if>
           <else>
             <group delimiter=" ">
               <text variable="genre"/>
               <group delimiter=" ">
                 <choose>
                   <if variable="chapter-number container-title" match="none">
-                    <!-- Replace with label variable="number" as that becomes available -->
-                    <text term="issue" form="short"/>
+                    <label variable="number" form="short"/>
                   </if>
                 </choose>
                 <text variable="number"/>
@@ -686,6 +483,7 @@
     </choose>
   </macro>
   <macro name="parenthetical">
+    <!-- TODO: Add new item types -->
     <!-- (Secondary contributors; Database location; Genre no. 123; Report Series 123, Version, Edition, Volume, Page) -->
     <group prefix="(" suffix=")">
       <choose>
@@ -698,13 +496,11 @@
                 <text variable="genre" text-case="capitalize-first"/>
               </if>
               <else>
-                <!-- This should be localized -->
-                <text value="patent" text-case="capitalize-first"/>
+                <text term="patent" text-case="capitalize-first"/>
               </else>
             </choose>
             <group delimiter=" ">
-              <!-- Replace with label variable="number" if that becomes available -->
-              <text term="issue" form="short" text-case="capitalize-first"/>
+              <label variable="number" form="short" text-case="capitalize-first"/>
               <text variable="number"/>
             </group>
           </group>
@@ -741,6 +537,7 @@
     </group>
   </macro>
   <macro name="parenthetical-container">
+    <!-- TODO: Add new item types -->
     <choose>
       <if variable="container-title" match="any">
         <group prefix="(" suffix=")">
@@ -759,6 +556,7 @@
     </choose>
   </macro>
   <macro name="bracketed">
+    <!-- TODO: Add new item types -->
     <!-- [Descriptive information] -->
     <!-- If there is a number, genre is already printed in macro="number" -->
     <group prefix="[" suffix="]">
@@ -779,7 +577,9 @@
                         <text variable="medium" text-case="capitalize-first"/>
                       </else-if>
                       <else>
-                        <!-- Replace with term="review" as that becomes available -->
+                        <!-- TODO: Replace with term="review" -->
+                        <!-- TODO: Handle review vs review-of depending on presence of reviewed-title -->
+                        <!-- TODO: Add reviewed-genre -->
                         <text value="Review of"/>
                       </else>
                     </choose>
@@ -790,7 +590,9 @@
                         <text variable="medium" text-case="capitalize-first"/>
                       </if>
                       <else>
-                        <!-- Replace with term="review" as that becomes available -->
+                        <!-- TODO: Replace with term="review" -->
+                        <!-- TODO: Handle review vs review-of depending on presence of reviewed-title -->
+                        <!-- TODO: Add reviewed-genre -->
                         <text value="Review of"/>
                       </else>
                     </choose>
@@ -882,7 +684,7 @@
                           <text variable="medium" text-case="capitalize-first"/>
                         </else-if>
                         <else>
-                          <text term="letter" form="short" text-case="capitalize-first"/>
+                          <text term="letter" text-case="capitalize-first"/>
                         </else>
                       </choose>
                     </if>
@@ -892,7 +694,7 @@
                           <text variable="medium" text-case="capitalize-first"/>
                         </if>
                         <else>
-                          <text term="letter" form="short" text-case="capitalize-first"/>
+                          <text term="letter" text-case="capitalize-first"/>
                         </else>
                       </choose>
                     </else>
@@ -927,20 +729,20 @@
                   <choose>
                     <if variable="genre">
                       <text variable="genre" text-case="capitalize-first"/>
-                      <!-- Replace prefix with performer label as that becomes available -->
+                      <!-- TODO: Replace prefix with performer label -->
                       <names variable="author" prefix="recorded by ">
                         <name and="symbol" initialize-with=". " delimiter=", "/>
                       </names>
                     </if>
                     <else-if variable="medium">
                       <text variable="medium" text-case="capitalize-first"/>
-                      <!-- Replace prefix with performer label as that becomes available -->
+                      <!-- TODO: Replace prefix with performer label -->
                       <names variable="author" prefix="recorded by ">
                         <name and="symbol" initialize-with=". " delimiter=", "/>
                       </names>
                     </else-if>
                     <else>
-                      <!-- Replace prefix with performer label as that becomes available -->
+                      <!-- TODO: Replace prefix with performer label -->
                       <names variable="author" prefix="Recorded by ">
                         <name and="symbol" initialize-with=". " delimiter=", "/>
                       </names>
@@ -953,13 +755,13 @@
                   <choose>
                     <if variable="medium">
                       <text variable="medium" text-case="capitalize-first"/>
-                      <!-- Replace prefix with performer label as that becomes available -->
+                      <!-- TODO: Replace prefix with performer label -->
                       <names variable="author" prefix="recorded by ">
                         <name and="symbol" initialize-with=". " delimiter=", "/>
                       </names>
                     </if>
                     <else>
-                      <!-- Replace prefix with performer label as that becomes available -->
+                      <!-- TODO: Replace prefix with performer label -->
                       <names variable="author" prefix="Recorded by ">
                         <name and="symbol" initialize-with=". " delimiter=", "/>
                       </names>
@@ -993,14 +795,7 @@
                 </if>
               </choose>
             </if>
-            <else-if type="book">
-              <choose>
-                <if variable="version" match="none">
-                  <text macro="format"/>
-                </if>
-              </choose>
-            </else-if>
-            <else-if type="report" match="none">
+            <else-if type="report software" match="none">
               <text macro="format"/>
             </else-if>
           </choose>
@@ -1009,11 +804,14 @@
     </group>
   </macro>
   <macro name="bracketed-intext">
+    <!-- TODO: Add new item types -->
     <group prefix="[" suffix="]">
       <choose>
         <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
-          <!-- This should be localized -->
-          <text macro="reviewed-title-intext" prefix="Review of "/>
+          <group delimiter=" ">
+            <text term="review-of" text-case="capitalize-first"/>
+            <text macro="reviewed-title-intext"/>
+          </group>
         </if>
         <else-if variable="interviewer" type="interview" match="any">
           <names variable="interviewer">
@@ -1034,7 +832,7 @@
                     <text variable="genre" text-case="capitalize-first"/>
                   </if>
                   <else>
-                    <text term="letter" form="short" text-case="capitalize-first"/>
+                    <text term="letter" text-case="capitalize-first"/>
                   </else>
                 </choose>
                 <names variable="recipient" delimiter=", ">
@@ -1055,6 +853,7 @@
     </group>
   </macro>
   <macro name="bracketed-container">
+    <!-- TODO: Add new item types -->
     <group prefix="[" suffix="]">
       <choose>
         <if type="paper-conference speech" match="any">
@@ -1065,7 +864,7 @@
             </if>
           </choose>
         </if>
-        <else-if type="book" variable="version" match="all">
+        <else-if type="software" match="all">
           <!-- For entries in mobile app reference works, place bracketed after the container-title -->
           <text macro="format"/>
         </else-if>
@@ -1077,6 +876,8 @@
     </group>
   </macro>
   <macro name="secondary-contributors">
+    <!-- TODO: Add new item types -->
+    <!-- TODO: Add new creator roles -->
     <choose>
       <if type="article-journal article-magazine article-newspaper post-weblog review review-book" match="any">
         <text macro="secondary-contributors-periodical"/>
@@ -1113,6 +914,7 @@
     </group>
   </macro>
   <macro name="secondary-contributors-booklike">
+    <!-- TODO: Add new item types -->
     <group delimiter="; ">
       <choose>
         <if variable="title">
@@ -1122,7 +924,7 @@
           </names>
         </if>
       </choose>
-      <!-- When editortranslator becomes available, add a test: variable="editortranslator" match="none"; then print translator -->
+      <!-- TODO: When editortranslator becomes available, add a test: variable="editortranslator" match="none"; then print translator -->
       <choose>
         <if type="post webpage" match="none">
           <!-- Webpages treat container-title like publisher -->
@@ -1160,12 +962,13 @@
     <choose>
       <if variable="archive-place" match="none">
         <!-- With `archive-place`: physical archives. Without: online archives. -->
-        <!-- Add archive_collection as that becomes available -->
+        <!-- TODO: Add archive_collection -->
         <text variable="archive_location"/>
       </if>
     </choose>
   </macro>
   <macro name="number">
+    <!-- TODO: Add new item types -->
     <choose>
       <if variable="number">
         <group delimiter=", ">
@@ -1173,8 +976,7 @@
             <text variable="genre" text-case="title"/>
             <choose>
               <if is-numeric="number">
-                <!-- Replace with label variable="number" if that becomes available -->
-                <text term="issue" form="short" text-case="capitalize-first"/>
+                <label variable="number" form="short" text-case="capitalize-first"/>
                 <text variable="number"/>
               </if>
               <else>
@@ -1197,6 +999,7 @@
     </choose>
   </macro>
   <macro name="locators-booklike">
+    <!-- TODO: Add new item types -->
     <choose>
       <if type="article-journal article-magazine article-newspaper broadcast interview patent post post-weblog review review-book speech webpage" match="any"/>
       <else-if type="paper-conference">
@@ -1223,8 +1026,7 @@
     <choose>
       <if is-numeric="version">
         <group delimiter=" ">
-          <!-- replace with label variable="version" if that becomes available -->
-          <text term="version" text-case="capitalize-first"/>
+          <label variable="version" text-case="capitalize-first"/>
           <text variable="version"/>
         </group>
       </if>
@@ -1247,6 +1049,7 @@
     </choose>
   </macro>
   <macro name="volume-booklike">
+    <!-- TODO: Add new item types -->
     <group delimiter=", ">
       <!-- Report series [ex. 52] -->
       <choose>
@@ -1259,6 +1062,7 @@
       </choose>
       <choose>
         <if variable="volume" match="any">
+          <!-- TODO: Update using volume-title -->
           <choose>
             <!-- Non-numeric volumes are already printed as part of the book title -->
             <if is-numeric="volume" match="none"/>
@@ -1272,8 +1076,7 @@
         </if>
         <else>
           <group>
-            <!-- Replace with label variable="number-of-volumes" if that becomes available -->
-            <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+            <label variable="number-of-volumes" form="short" text-case="capitalize-first" suffix=" "/>
             <text term="page-range-delimiter" prefix="1"/>
             <number variable="number-of-volumes" form="numeric"/>
           </group>
@@ -1315,6 +1118,7 @@
     </choose>
   </macro>
   <macro name="format">
+    <!-- TODO: Add new item types -->
     <choose>
       <if variable="genre medium" match="any">
         <group delimiter="; ">
@@ -1327,18 +1131,17 @@
         </group>
       </if>
       <!-- Generic labels for specific types -->
-      <!-- These should be localized when possible -->
+      <!-- TODO: Add terms for other types? -->
       <else-if type="dataset">
-        <text value="Data set"/>
+        <text term="dataset"/>
       </else-if>
-      <else-if type="book" variable="version" match="all">
-        <!-- Replace with type="software" and term="software" as that becomes available -->
-        <text value="Computer software"/>
+      <else-if type="software">
+        <text term="software" text-case="capitalize-first"/>
       </else-if>
       <else-if type="interview personal_communication" match="any">
         <choose>
           <if variable="archive container-title DOI publisher URL" match="none">
-            <text term="letter" text-case="capitalize-first"/>
+            <text term="personal-communication" text-case="capitalize-first"/>
           </if>
           <else-if type="interview">
             <text term="interview" text-case="capitalize-first"/>
@@ -1346,11 +1149,12 @@
         </choose>
       </else-if>
       <else-if type="map">
-        <text value="Map"/>
+        <text term="map" text-case="capitalize-first"/>
       </else-if>
     </choose>
   </macro>
   <macro name="format-intext">
+    <!-- TODO: Add new item types -->
     <choose>
       <if variable="genre" match="any">
         <text variable="genre" text-case="capitalize-first"/>
@@ -1359,18 +1163,17 @@
         <text variable="medium" text-case="capitalize-first"/>
       </else-if>
       <!-- Generic labels for specific types -->
-      <!-- These should be localized when possible -->
+      <!-- TODO: Add terms for other types? -->
       <else-if type="dataset">
-        <text value="Data set"/>
+        <text term="dataset"/>
       </else-if>
-      <else-if type="book" variable="version" match="all">
-        <!-- Replace with type="software" and term="software" as that becomes available -->
-        <text value="Computer software"/>
+      <else-if type="software">
+        <text term="software" text-case="capitalize-first"/>
       </else-if>
       <else-if type="interview personal_communication" match="any">
         <choose>
           <if variable="archive container-title DOI publisher URL" match="none">
-            <text term="letter" text-case="capitalize-first"/>
+            <text term="personal-communication" text-case="capitalize-first"/>
           </if>
           <else-if type="interview">
             <text term="interview" text-case="capitalize-first"/>
@@ -1378,13 +1181,14 @@
         </choose>
       </else-if>
       <else-if type="map">
-        <text value="Map"/>
+        <text term="map"/>
       </else-if>
     </choose>
   </macro>
   <!-- APA 'source' element contains four parts:
        container, event, publisher, access -->
   <macro name="container">
+    <!-- TODO: Add new item types -->
     <choose>
       <if type="article-journal article-magazine article-newspaper post-weblog review review-book" match="any">
         <!-- Periodical items -->
@@ -1440,6 +1244,7 @@
         <if variable="issued">
           <choose>
             <if variable="issue page volume" match="none">
+              <!-- TODO: Should I print status as-is, or should I print the in-press term? -->
               <text variable="status" text-case="capitalize-first"/>
             </if>
           </choose>
@@ -1448,13 +1253,14 @@
     </group>
   </macro>
   <macro name="container-booklike">
+    <!-- TODO: Add new item types -->
     <choose>
       <if variable="container-title" match="any">
         <group delimiter=" ">
           <text term="in" text-case="capitalize-first"/>
           <group delimiter=", ">
             <names variable="editor translator" delimiter=", &amp; ">
-              <!-- Change to editortranslator and move editor to substitute as that becomes available -->
+              <!-- TODO: Change to editortranslator and move editor to substitute -->
               <name and="symbol" initialize-with=". " delimiter=", "/>
               <label form="short" text-case="title" prefix=" (" suffix=")"/>
               <substitute>
@@ -1465,7 +1271,7 @@
             </names>
             <group delimiter=": " font-style="italic">
               <text variable="container-title"/>
-              <!-- Replace with volume-title as that becomes available -->
+              <!-- TODO: Replace with volume-title -->
               <choose>
                 <if is-numeric="volume" match="none">
                   <group delimiter=" ">
@@ -1483,6 +1289,7 @@
     </choose>
   </macro>
   <macro name="publisher">
+    <!-- TODO: Add new item types -->
     <group delimiter="; ">
       <choose>
         <if type="thesis">
@@ -1517,7 +1324,7 @@
             <!-- With `archive-place`: physical archives. Without: online archives. -->
             <!-- For physical archives, print the location before the archive name.
                 For electronic archives, these are printed in macro="description". -->
-            <!-- Split "archive_location" into "archive_collection" and "archive_location" as that becomes available -->
+            <!-- TODO: Split "archive_location" into "archive_collection" and "archive_location" -->
             <!-- Must test for archive_collection:
                 With collection: archive_collection (archive_location), archive, archive-place
                 No collection: archive (archive_location), archive-place
@@ -1552,6 +1359,7 @@
     </choose>
   </macro>
   <macro name="event">
+    <!-- TODO: Add new item types (e.g., event, collection, performance) -->
     <choose>
       <if variable="event event-title" match="any">
         <!-- To prevent Zotero from printing event-place due to its double-mapping of all 'place' to
@@ -1584,6 +1392,7 @@
   </macro>
   <!-- After 'source', APA also prints publication history (original publication, reprint info, retraction info) -->
   <macro name="publication-history">
+    <!-- TODO: Add new item types -->
     <choose>
       <if type="patent" match="none">
         <group prefix="(" suffix=")">
@@ -1595,6 +1404,7 @@
               <text variable="references"/>
             </if>
             <else>
+              <!-- TODO: Replace these with terms -->
               <group delimiter=" ">
                 <text term="original-work-published" text-case="capitalize-first"/>
                 <choose>
@@ -1617,86 +1427,60 @@
   </macro>
   <!-- Legal citations have their own rules -->
   <macro name="legal-cites">
+    <!-- TODO: Add new item types -->
     <choose>
-      <if type="legal_case">
-        <group delimiter=". ">
-          <group delimiter=", ">
-            <text variable="title"/>
-            <group delimiter=" ">
-              <text macro="container-legal"/>
-              <text macro="date-legal"/>
-            </group>
-            <text variable="references"/>
-          </group>
+      <if type="treaty">
+        <!-- APA generally defers to Bluebook for legal citations, but diverges without
+             explanation for treaty items. The Bluebook format that was used in APA 6th
+             ed. is used here. -->
+        <group delimiter=", ">
+          <text variable="title" text-case="title"/>
+          <names variable="author">
+            <name initialize-with="." form="short" delimiter="-"/>
+          </names>
+          <text macro="date-legal"/>
+          <text macro="container-legal"/>
           <text macro="access"/>
         </group>
       </if>
-      <else-if type="bill">
-        <!-- Currently designed to handle bills, resolutions, hearings, rederal reports. -->
+      <else>
+        <!-- For `bill`: currently designed to handle bills, resolutions, federal reports. -->
+        <!-- For `legislation`: currently designed to handle statutes, codified regulations, executive orders. -->
         <group delimiter=". ">
           <group delimiter=", ">
             <choose>
-              <if variable="number container-title" match="none">
-                <!-- If no number or container-title, then assume it is a hearing -->
-                <text variable="title" font-style="italic"/>
-              </if>
-              <else>
+              <if type="bill legal_case legislation" match="any">
                 <text variable="title"/>
-              </else>
+              </if>
+              <else-if type="hearing">
+                <text variable="title" font-style="italic"/>
+              </else-if>
             </choose>
             <group delimiter=" ">
               <text macro="container-legal"/>
               <text macro="date-legal"/>
               <choose>
-                <if variable="number container-title" match="none">
-                  <!-- If no number or container-title, then assume it is a hearing -->
+                <if type="hearing">
                   <names variable="author" prefix="(testimony of " suffix=")">
+                    <!-- TODO: Localize this with the hearing term. -->
                     <name and="symbol" delimiter=", "/>
                   </names>
                 </if>
-                <else>
+                <else-if type="bill legislation" match="any">
+                  <!-- `legislation`: For uncodified regulations, assume future code section is in status. -->
                   <text variable="status" prefix="(" suffix=")"/>
-                </else>
+                </else-if>
               </choose>
             </group>
             <text variable="references"/>
           </group>
           <text macro="access"/>
         </group>
-      </else-if>
-      <else-if type="legislation">
-        <!-- Currently designed to handle statutes, codified regulations, executive orders.
-             For uncodified regulations, assume future code section is in status. -->
-        <group delimiter=". ">
-          <group delimiter=", ">
-            <text variable="title"/>
-            <group delimiter=" ">
-              <text macro="container-legal"/>
-              <text macro="date-legal"/>
-              <text variable="status" prefix="(" suffix=")"/>
-            </group>
-            <text variable="references"/>
-          </group>
-          <text macro="access"/>
-        </group>
-      </else-if>
-      <else-if type="treaty">
-        <!-- APA generally defers to Bluebook for legal citations, but diverges without
-             explanation for treaty items. The Bluebook format that was used in APA 6th
-             ed. is used here. -->
-        <group delimiter=", ">
-          <text variable="title" text-case="title"/>
-          <names variable="author">
-            <name initialize-with="." form="short" delimiter="-"/>
-          </names>
-          <text macro="date-legal"/>
-          <text macro="container-legal"/>
-          <text macro="access"/>
-        </group>
-      </else-if>
+      </else>
     </choose>
   </macro>
   <macro name="date-legal">
+    <!-- TODO: Add new item types -->
     <choose>
       <if type="legal_case">
         <group prefix="(" suffix=")" delimiter=" ">
@@ -1712,7 +1496,7 @@
           </choose>
         </group>
       </if>
-      <else-if type="bill legislation" match="any">
+      <else-if type="bill legislation hearing" match="any">
         <group prefix="(" suffix=")" delimiter=" ">
           <group delimiter=" ">
             <date variable="original-date">
@@ -1731,6 +1515,7 @@
     </choose>
   </macro>
   <macro name="container-legal">
+    <!-- TODO: Add new item types -->
     <!-- Expect legal item container-titles to be stored in short form -->
     <choose>
       <if type="legal_case">
@@ -1741,8 +1526,7 @@
                 <text variable="volume"/>
                 <text variable="container-title"/>
                 <group delimiter=" ">
-                  <!-- Change to label variable="section" as that becomes available -->
-                  <text term="section" form="symbol"/>
+                  <label variable="section" form="symbol"/>
                   <text variable="section"/>
                 </group>
                 <choose>
@@ -1759,8 +1543,7 @@
               <group delimiter=" ">
                 <choose>
                   <if is-numeric="number">
-                    <!-- Replace with label variable="number" if that becomes available -->
-                    <text term="issue" form="short" text-case="capitalize-first"/>
+                    <label variable="number" form="short" text-case="capitalize-first"/>
                   </if>
                 </choose>
                 <text variable="number"/>
@@ -1776,8 +1559,7 @@
             <group delimiter=" ">
               <choose>
                 <if variable="chapter-number container-title" match="none">
-                  <!-- Replace with label variable="number" as that becomes available -->
-                  <text term="issue" form="short"/>
+                  <label variable="number" form="short"/>
                 </if>
               </choose>
               <text variable="number"/>
@@ -1812,7 +1594,7 @@
               <choose>
                 <if variable="section">
                   <group delimiter=" ">
-                    <!-- Change to label variable="section" as that becomes available -->
+                    <!-- TODO: Change to label variable="section" -->
                     <text term="section" form="symbol"/>
                     <text variable="section"/>
                   </group>
@@ -1835,8 +1617,7 @@
             </if>
             <else>
               <group delimiter=" ">
-                <!-- Replace with label variable="number" if that becomes available -->
-                <text term="issue" form="short" text-case="capitalize-first"/>
+                <label variable="number" form="short" text-case="capitalize-first"/>
                 <text variable="number"/>
               </group>
             </else>
@@ -1846,6 +1627,7 @@
     </choose>
   </macro>
   <macro name="citation-locator">
+    <!-- TODO: Add new locator types? -->
     <group delimiter=" ">
       <choose>
         <if locator="chapter">
@@ -1883,6 +1665,7 @@
     </sort>
     <layout>
       <choose>
+        <!-- TODO: Add new item types -->
         <if type="bill legal_case legislation treaty" match="any">
           <!-- Legal items have different orders and delimiters -->
           <choose>
diff --git a/buildres/csl/csl-styles/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/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/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/haute-ecole-de-gestion-de-geneve-iso-690.csl b/buildres/csl/csl-styles/haute-ecole-de-gestion-de-geneve-iso-690.csl
index f5a262ffbb4..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
@@ -17,14 +17,14 @@
     </contributor>
     <category citation-format="author-date"/>
     <category field="generic-base"/>
-    <updated>2023-05-25T00:29:32+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="online">en&#160;ligne</term>
       <term name="accessed">consulté le</term>
       <term name="retrieved">disponible</term>
       <term name="from">à l'adresse</term>
@@ -39,7 +39,6 @@
   </locale>
   <locale xml:lang="en-US">
     <terms>
-      <term name="online">. Online</term>
       <term name="issue">no.</term>
     </terms>
   </locale>
@@ -77,7 +76,7 @@
     </choose>
   </macro>
   <macro name="author-citation">
-    <names variable="author">
+    <names variable="author director">
       <name form="short"/>
       <substitute>
         <names variable="editor"/>
@@ -215,7 +214,7 @@
       <if variable="DOI version" match="none">
         <choose>
           <if variable="URL">
-            <text term="online" prefix=" "/>
+            <text term="online" prefix=" [" suffix="]"/>
           </if>
           <else>
             <choose>
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/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-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/lethaia.csl b/buildres/csl/csl-styles/lethaia.csl
index 8c9d777c38e..c8043a0335f 100644
--- a/buildres/csl/csl-styles/lethaia.csl
+++ b/buildres/csl/csl-styles/lethaia.csl
@@ -11,22 +11,25 @@
       <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"/>
+    <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"/>
-      <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">
@@ -71,13 +74,23 @@
       <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=" ">
+      <group delimiter=", ">
         <group delimiter="">
           <group delimiter=" ">
             <text macro="author-short"/>
@@ -98,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">
@@ -156,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=" ">
@@ -175,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=". "/>
@@ -192,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/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/polish-archives-of-internal-medicine.csl b/buildres/csl/csl-styles/polish-archives-of-internal-medicine.csl
index 0021f8b00da..1f8198d3a71 100644
--- a/buildres/csl/csl-styles/polish-archives-of-internal-medicine.csl
+++ b/buildres/csl/csl-styles/polish-archives-of-internal-medicine.csl
@@ -16,6 +16,11 @@
     <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">
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/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/external-libraries.md b/external-libraries.md
index 4a75d8eccf3..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
@@ -127,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
@@ -148,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
@@ -162,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
@@ -176,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)
@@ -183,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)
@@ -323,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
@@ -396,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
@@ -508,6 +613,27 @@ 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`
@@ -515,121 +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.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 033e24c4cdf..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 c2447881d45..864d6c47512 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=03ec176d388f2aa99defcadc3ac6adf8dd2bce5145a129659537c0874dea5ad1
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
+distributionSha256Sum=591855b517fc635b9e04de1d05d5e76ada3f89f5fc76f87978d1b245b4f69225
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index fcb6fca147c..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
diff --git a/rewrite.yml b/rewrite.yml
index f6969e92426..69508f500c9 100644
--- a/rewrite.yml
+++ b/rewrite.yml
@@ -2,11 +2,6 @@
 type: specs.openrewrite.org/v1beta/recipe
 name: org.jabref.config.rewrite.cleanup
 recipeList:
-  # Rules available in the "old" namespace
-  - org.openrewrite.java.cleanup.SimplifyBooleanExpression
-  - org.openrewrite.java.cleanup.SimplifyBooleanReturn
-  - org.openrewrite.java.cleanup.UnnecessaryParentheses
-
   # 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
@@ -24,7 +19,7 @@ recipeList:
   # - org.openrewrite.staticanalysis.AvoidBoxedBooleanExpressions
   # Leads to exception
   # - org.openrewrite.staticanalysis.CombineSemanticallyEqualCatchBlocks
-  # Unreable code
+  # Unreadable code
   #   .ifPresent((Path selectedDirectory) -> {
   # - org.openrewrite.staticanalysis.ExplicitLambdaArgumentTypes
   # Unreable code (e.g., public final class BindingsHelper)
@@ -49,14 +44,12 @@ recipeList:
   #  - org.openrewrite.staticanalysis.MinimumSwitchCases
   # Leads to unreadable code
   #  - org.openrewrite.staticanalysis.NoFinalizedLocalVariables
-  # Contraticts JabRef's checkstyle
+  # 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
-  # Crashes with NPE
-  #  - org.openrewrite.staticanalysis.RemoveInstanceOfPatternMatch
   # We need that for our CLI
   #  - org.openrewrite.staticanalysis.RemoveSystemOutPrintln
   # Removes a field - and that wrong
@@ -83,19 +76,21 @@ recipeList:
   #  - 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
-  # "Upgradeds" too much, deletss fields
+  # "Upgrades" too much, deletes fields
   #  - org.openrewrite.staticanalysis.UseCollectionInterfaces
   # Does not work at TreeNode
   #  - org.openrewrite.staticanalysis.UseDiamondOperator
@@ -104,6 +99,8 @@ recipeList:
   # We voted against it
   #  - org.openrewrite.staticanalysis.ExplicitInitialization
 
+  - org.openrewrite.java.ShortenFullyQualifiedTypeReferences
+
   - org.openrewrite.staticanalysis.AtomicPrimitiveEqualsUsesGet
   - org.openrewrite.staticanalysis.BigDecimalRoundingConstantsToEnums
   - org.openrewrite.staticanalysis.BooleanChecksNotInverted
@@ -129,7 +126,7 @@ recipeList:
   - org.openrewrite.staticanalysis.IndexOfReplaceableByContains
 #  - org.openrewrite.staticanalysis.IndexOfShouldNotCompareGreaterThanZero
   - org.openrewrite.staticanalysis.InstanceOfPatternMatch
-#  - org.openrewrite.staticanalysis.IsEmptyCallOnCollections
+  - org.openrewrite.staticanalysis.IsEmptyCallOnCollections
 #  - org.openrewrite.staticanalysis.MissingOverrideAnnotation
 #  - org.openrewrite.staticanalysis.ModifierOrder
   - org.openrewrite.staticanalysis.MultipleVariableDeclarations
@@ -161,11 +158,14 @@ recipeList:
 #  - 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.StaticMethodNotFinal
   - org.openrewrite.staticanalysis.StringLiteralEquality
   - org.openrewrite.staticanalysis.TypecastParenPad
   - org.openrewrite.staticanalysis.UnwrapRepeatableAnnotations
@@ -175,7 +175,7 @@ recipeList:
 #  - org.openrewrite.staticanalysis.UseListSort
   - org.openrewrite.staticanalysis.UseObjectNotifyAll
   - org.openrewrite.staticanalysis.UseStandardCharset
-#  - org.openrewrite.staticanalysis.UseStringReplace
+  - 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 6b5589ed18e..8eae854642c 100644
--- a/src/jmh/java/org/jabref/benchmarks/Benchmarks.java
+++ b/src/jmh/java/org/jabref/benchmarks/Benchmarks.java
@@ -13,7 +13,7 @@
 import org.jabref.logic.citationkeypattern.CitationKeyPatternPreferences;
 import org.jabref.logic.exporter.BibWriter;
 import org.jabref.logic.exporter.BibtexDatabaseWriter;
-import org.jabref.logic.exporter.SaveConfiguration;
+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;
@@ -82,7 +82,7 @@ private StringWriter getOutputWriter() throws IOException {
         BibWriter bibWriter = new BibWriter(outputWriter, OS.NEWLINE);
         BibtexDatabaseWriter databaseWriter = new BibtexDatabaseWriter(
                 bibWriter,
-                mock(SaveConfiguration.class),
+                mock(SelfContainedSaveConfiguration.class),
                 mock(FieldPreferences.class),
                 mock(CitationKeyPatternPreferences.class),
                 new BibEntryTypesManager());
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
index 7248ee234ba..e286e123119 100644
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@@ -89,8 +89,8 @@
     requires org.antlr.antlr4.runtime;
     requires org.fxmisc.flowless;
 
-    requires pdfbox;
-    requires xmpbox;
+    requires org.apache.pdfbox;
+    requires org.apache.xmpbox;
     requires com.ibm.icu;
 
     requires flexmark;
diff --git a/src/main/java/org/jabref/cli/ArgumentProcessor.java b/src/main/java/org/jabref/cli/ArgumentProcessor.java
index b3bd9cf2603..5d5c2c025d6 100644
--- a/src/main/java/org/jabref/cli/ArgumentProcessor.java
+++ b/src/main/java/org/jabref/cli/ArgumentProcessor.java
@@ -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.SaveConfiguration;
+import org.jabref.logic.exporter.SelfContainedSaveConfiguration;
 import org.jabref.logic.exporter.XmpPdfExporter;
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.ImportException;
@@ -71,16 +71,19 @@ public class ArgumentProcessor {
     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,
-                             FileUpdateMonitor fileUpdateMonitor) throws org.apache.commons.cli.ParseException {
+                             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();
     }
@@ -187,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();
         }
@@ -295,13 +294,12 @@ private void writeMetadataToPdf(List<ParserResult> loaded,
         }
         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, fieldPreferences);
 
         if ("all".equals(filesAndCitekeys)) {
-            for (BibEntry entry : dataBase.getEntries()) {
+            for (BibEntry entry : databaseContext.getEntries()) {
                 writeMetadataToPDFsOfEntry(
                         databaseContext,
                         entry.getCitationKey().orElse("<no cite key defined>"),
@@ -328,7 +326,6 @@ private void writeMetadataToPdf(List<ParserResult> loaded,
 
         writeMetadataToPdfByCitekey(
                 databaseContext,
-                dataBase,
                 citeKeys,
                 filePreferences,
                 xmpPdfExporter,
@@ -338,7 +335,6 @@ private void writeMetadataToPdf(List<ParserResult> loaded,
                 embeddBibfile);
         writeMetadataToPdfByFileNames(
                 databaseContext,
-                dataBase,
                 pdfs,
                 filePreferences,
                 xmpPdfExporter,
@@ -378,7 +374,6 @@ private void writeMetadataToPDFsOfEntry(BibDatabaseContext databaseContext,
     }
 
     private void writeMetadataToPdfByCitekey(BibDatabaseContext databaseContext,
-                                             BibDatabase dataBase,
                                              List<String> citeKeys,
                                              FilePreferences filePreferences,
                                              XmpPdfExporter xmpPdfExporter,
@@ -387,7 +382,7 @@ private void writeMetadataToPdfByCitekey(BibDatabaseContext databaseContext,
                                              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;
@@ -399,7 +394,6 @@ private void writeMetadataToPdfByCitekey(BibDatabaseContext databaseContext,
     }
 
     private void writeMetadataToPdfByFileNames(BibDatabaseContext databaseContext,
-                                               BibDatabase dataBase,
                                                List<String> pdfs,
                                                FilePreferences filePreferences,
                                                XmpPdfExporter xmpPdfExporter,
@@ -415,14 +409,14 @@ private void writeMetadataToPdfByFileNames(BibDatabaseContext databaseContext,
             if (Files.exists(filePath)) {
                 try {
                     if (writeXMP) {
-                        if (xmpPdfExporter.exportToFileByPath(databaseContext, dataBase, filePreferences, filePath, abbreviationRepository)) {
+                        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, abbreviationRepository)) {
+                        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);
@@ -604,16 +598,14 @@ private void saveDatabase(BibDatabase newBase, String subName) {
             System.out.println(Localization.lang("Saving") + ": " + subName);
             try (AtomicFileWriter fileWriter = new AtomicFileWriter(Path.of(subName), StandardCharsets.UTF_8)) {
                 BibWriter bibWriter = new BibWriter(fileWriter, OS.NEWLINE);
-                SaveConfiguration saveConfiguration = new SaveConfiguration()
-                        .withMetadataSaveOrder(true)
+                SelfContainedSaveConfiguration saveConfiguration = (SelfContainedSaveConfiguration) new SelfContainedSaveConfiguration()
                         .withReformatOnSave(preferencesService.getLibraryPreferences().shouldAlwaysReformatOnSave());
-
                 BibDatabaseWriter databaseWriter = new BibtexDatabaseWriter(
                         bibWriter,
                         saveConfiguration,
                         preferencesService.getFieldPreferences(),
                         preferencesService.getCitationKeyPatternPreferences(),
-                        Globals.entryTypesManager);
+                        entryTypesManager);
                 databaseWriter.saveDatabase(new BibDatabaseContext(newBase));
 
                 // Show just a warning message if encoding did not work for all characters:
diff --git a/src/main/java/org/jabref/cli/Launcher.java b/src/main/java/org/jabref/cli/Launcher.java
index 1785216a75c..cec64dab373 100644
--- a/src/main/java/org/jabref/cli/Launcher.java
+++ b/src/main/java/org/jabref/cli/Launcher.java
@@ -23,6 +23,7 @@
 import org.jabref.logic.remote.client.RemoteClient;
 import org.jabref.logic.util.OS;
 import org.jabref.migrations.PreferencesMigrations;
+import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.util.FileUpdateMonitor;
 import org.jabref.preferences.JabRefPreferences;
 import org.jabref.preferences.PreferencesService;
@@ -42,16 +43,30 @@
 public class Launcher {
     private static Logger LOGGER;
     private static String[] ARGUMENTS;
+    private static boolean isDebugEnabled;
 
     public static void main(String[] args) {
         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(ARGUMENTS, preferences)) {
@@ -71,7 +86,8 @@ public static void main(String[] args) {
                 ArgumentProcessor argumentProcessor = new ArgumentProcessor(
                         ARGUMENTS, ArgumentProcessor.Mode.INITIAL_START,
                         preferences,
-                        fileUpdateMonitor);
+                        fileUpdateMonitor,
+                        entryTypesManager);
                 if (argumentProcessor.shouldShutDown()) {
                     LOGGER.debug("JabRef shut down after processing command line arguments");
                     return;
@@ -105,7 +121,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");
 
diff --git a/src/main/java/org/jabref/gui/ClipBoardManager.java b/src/main/java/org/jabref/gui/ClipBoardManager.java
index 8b80078c30c..8ff63a59374 100644
--- a/src/main/java/org/jabref/gui/ClipBoardManager.java
+++ b/src/main/java/org/jabref/gui/ClipBoardManager.java
@@ -20,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;
@@ -141,9 +142,9 @@ 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.getFieldPreferences()), Globals.entryTypesManager);
+        BibEntryWriter writer = new BibEntryWriter(new FieldWriter(preferencesService.getFieldPreferences()), entryTypesManager);
         String serializedEntries = writer.serializeAll(entries, BibDatabaseMode.BIBTEX);
         // 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
diff --git a/src/main/java/org/jabref/gui/EntryTypeViewModel.java b/src/main/java/org/jabref/gui/EntryTypeViewModel.java
index 5ec83f26aaf..892229d6b3e 100644
--- a/src/main/java/org/jabref/gui/EntryTypeViewModel.java
+++ b/src/main/java/org/jabref/gui/EntryTypeViewModel.java
@@ -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();
diff --git a/src/main/java/org/jabref/gui/Globals.java b/src/main/java/org/jabref/gui/Globals.java
index 1e3ca75f30d..117361bb72f 100644
--- a/src/main/java/org/jabref/gui/Globals.java
+++ b/src/main/java/org/jabref/gui/Globals.java
@@ -70,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;
@@ -123,7 +123,7 @@ public static void startBackgroundTasks() {
         } */
         RemotePreferences remotePreferences = prefs.getRemotePreferences();
         if (remotePreferences.useRemoteServer()) {
-            Globals.REMOTE_LISTENER.openAndStart(new CLIMessageHandler(prefs, fileUpdateMonitor), remotePreferences.getPort());
+            Globals.REMOTE_LISTENER.openAndStart(new CLIMessageHandler(prefs, fileUpdateMonitor, entryTypesManager), remotePreferences.getPort());
         }
     }
 
diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
index f6e5fb0ec2c..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,8 +120,6 @@
 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;
@@ -134,10 +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;
 
@@ -173,6 +175,7 @@ public class JabRefFrame extends BorderPane {
     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;
@@ -189,6 +192,7 @@ public JabRefFrame(Stage mainStage) {
         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());
@@ -413,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();
     }
 
     /**
@@ -492,12 +496,42 @@ public boolean quit() {
         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");
 
@@ -562,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, fileUpdateMonitor)),
+                        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,
@@ -602,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);
@@ -771,7 +805,7 @@ private MenuBar createMenu() {
                 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,
@@ -861,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(),
@@ -903,7 +937,7 @@ private MenuBar createMenu() {
 
                 new SeparatorMenuItem(),
 
-                factory.createMenuItem(StandardActions.WRITE_METADATA_TO_PDF, new WriteMetadataToPdfAction(stateManager, Globals.entryTypesManager, prefs.getFieldPreferences(), 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(),
@@ -943,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(),
 
@@ -952,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,7 +1191,7 @@ public void addTab(LibraryTab libraryTab, boolean raisePanel) {
     public LibraryTab addTab(BibDatabaseContext databaseContext, boolean raisePanel) {
         Objects.requireNonNull(databaseContext);
 
-        LibraryTab libraryTab = new LibraryTab(databaseContext, this, prefs, stateManager, fileUpdateMonitor);
+        LibraryTab libraryTab = new LibraryTab(databaseContext, this, prefs, stateManager, fileUpdateMonitor, entryTypesManager);
         addTab(libraryTab, raisePanel);
         return libraryTab;
     }
@@ -1275,7 +1309,7 @@ public void closeCurrentTab() {
     }
 
     public OpenDatabaseAction getOpenDatabaseAction() {
-        return new OpenDatabaseAction(this, prefs, dialogService, stateManager, fileUpdateMonitor);
+        return new OpenDatabaseAction(this, prefs, dialogService, stateManager, fileUpdateMonitor, entryTypesManager);
     }
 
     public GlobalSearchBar getGlobalSearchBar() {
@@ -1332,7 +1366,7 @@ private Menu createSendSubMenu(ActionFactory factory,
                                           PreferencesService preferencesService) {
         Menu sendMenu = factory.createMenu(StandardActions.SEND);
         sendMenu.getItems().addAll(
-                factory.createMenuItem(StandardActions.SEND_AS_EMAIL, new SendAsStandardEmailAction(dialogService, preferencesService, stateManager)),
+                factory.createMenuItem(StandardActions.SEND_AS_EMAIL, new SendAsStandardEmailAction(dialogService, preferencesService, stateManager, entryTypesManager)),
                 factory.createMenuItem(StandardActions.SEND_TO_KINDLE, new SendAsKindleEmailAction(dialogService, preferencesService, stateManager))
         );
 
@@ -1414,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 133df390b3f..f0497c11c28 100644
--- a/src/main/java/org/jabref/gui/JabRefGUI.java
+++ b/src/main/java/org/jabref/gui/JabRefGUI.java
@@ -32,6 +32,7 @@
 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;
@@ -67,11 +68,15 @@ public JabRefGUI(Stage mainStage,
 
         openWindow(mainStage);
 
-        new VersionWorker(Globals.BUILD_INFO.version,
-                mainFrame.getDialogService(),
-                Globals.TASK_EXECUTOR,
-                preferencesService.getInternalPreferences())
-                .checkForNewVersionDelayed();
+        EasyBind.subscribe(preferencesService.getInternalPreferences().versionCheckEnabledProperty(), enabled -> {
+            if (enabled) {
+                new VersionWorker(Globals.BUILD_INFO.version,
+                        mainFrame.getDialogService(),
+                        Globals.TASK_EXECUTOR,
+                        preferencesService)
+                        .checkForNewVersionDelayed();
+            }
+        });
 
         setupProxy();
     }
@@ -112,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);
@@ -151,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) {
@@ -271,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);
     }
 
diff --git a/src/main/java/org/jabref/gui/LibraryTab.java b/src/main/java/org/jabref/gui/LibraryTab.java
index 2f80b63ca54..fa02d937aa5 100644
--- a/src/main/java/org/jabref/gui/LibraryTab.java
+++ b/src/main/java/org/jabref/gui/LibraryTab.java
@@ -26,6 +26,8 @@
 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;
@@ -39,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;
@@ -59,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;
@@ -86,6 +87,7 @@ public class LibraryTab extends Tab {
     private final PreferencesService preferencesService;
     private final FileUpdateMonitor fileUpdateMonitor;
     private final StateManager stateManager;
+    private final BibEntryTypesManager entryTypesManager;
     private final BooleanProperty changedProperty = new SimpleBooleanProperty(false);
     private final BooleanProperty nonUndoableChangeProperty = new SimpleBooleanProperty(false);
 
@@ -122,7 +124,8 @@ public LibraryTab(BibDatabaseContext bibDatabaseContext,
                       JabRefFrame frame,
                       PreferencesService preferencesService,
                       StateManager stateManager,
-                      FileUpdateMonitor fileUpdateMonitor) {
+                      FileUpdateMonitor fileUpdateMonitor,
+                      BibEntryTypesManager entryTypesManager) {
         this.frame = Objects.requireNonNull(frame);
         this.bibDatabaseContext = Objects.requireNonNull(bibDatabaseContext);
         this.undoManager = frame.getUndoManager();
@@ -130,6 +133,7 @@ public LibraryTab(BibDatabaseContext bibDatabaseContext,
         this.preferencesService = Objects.requireNonNull(preferencesService);
         this.stateManager = Objects.requireNonNull(stateManager);
         this.fileUpdateMonitor = fileUpdateMonitor;
+        this.entryTypesManager = entryTypesManager;
 
         bibDatabaseContext.getDatabase().registerListener(this);
         bibDatabaseContext.getMetaData().registerListener(this);
@@ -287,10 +291,10 @@ 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) && preferencesService.getFilePreferences().shouldCreateBackup()) {
-            BackupManager.start(bibDatabaseContext, Globals.entryTypesManager, preferencesService);
+            BackupManager.start(this, bibDatabaseContext, Globals.entryTypesManager, preferencesService);
         }
     }
 
@@ -501,6 +505,7 @@ private void createMainTable() {
                 stateManager,
                 Globals.getKeyPrefs(),
                 Globals.getClipboardManager(),
+                entryTypesManager,
                 Globals.TASK_EXECUTOR,
                 fileUpdateMonitor);
 
@@ -824,11 +829,12 @@ public static LibraryTab createLibraryTab(BackgroundTask<ParserResult> dataLoadi
                                               PreferencesService preferencesService,
                                               StateManager stateManager,
                                               JabRefFrame frame,
-                                              FileUpdateMonitor fileUpdateMonitor) {
+                                              FileUpdateMonitor fileUpdateMonitor,
+                                              BibEntryTypesManager entryTypesManager) {
         BibDatabaseContext context = new BibDatabaseContext();
         context.setDatabasePath(file);
 
-        LibraryTab newTab = new LibraryTab(context, frame, preferencesService, stateManager, fileUpdateMonitor);
+        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/SendAsEMailAction.java b/src/main/java/org/jabref/gui/SendAsEMailAction.java
index 1cd721dc3db..f8a9bba6ad6 100644
--- a/src/main/java/org/jabref/gui/SendAsEMailAction.java
+++ b/src/main/java/org/jabref/gui/SendAsEMailAction.java
@@ -104,7 +104,7 @@ private List<String> getAttachments(List<BibEntry> entries) {
             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);
                 }
diff --git a/src/main/java/org/jabref/gui/SendAsStandardEmailAction.java b/src/main/java/org/jabref/gui/SendAsStandardEmailAction.java
index da0a229820d..0faf359b371 100644
--- a/src/main/java/org/jabref/gui/SendAsStandardEmailAction.java
+++ b/src/main/java/org/jabref/gui/SendAsStandardEmailAction.java
@@ -11,6 +11,7 @@
 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;
@@ -24,11 +25,13 @@ 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) {
+    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));
     }
 
@@ -49,7 +52,7 @@ protected String getBody() {
         StringWriter rawEntries = new StringWriter();
         BibWriter bibWriter = new BibWriter(rawEntries, OS.NEWLINE);
 
-        BibEntryWriter bibtexEntryWriter = new BibEntryWriter(new FieldWriter(preferencesService.getFieldPreferences()), Globals.entryTypesManager);
+        BibEntryWriter bibtexEntryWriter = new BibEntryWriter(new FieldWriter(preferencesService.getFieldPreferences()), entryTypesManager);
 
         for (BibEntry entry : entries) {
             try {
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 86%
rename from src/main/java/org/jabref/logic/autosaveandbackup/BackupManager.java
rename to src/main/java/org/jabref/gui/autosaveandbackup/BackupManager.java
index e4d9c3e29db..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,17 +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.SaveConfiguration;
+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.model.metadata.SaveOrder;
+import org.jabref.model.metadata.SelfContainedSaveOrder;
 import org.jabref.preferences.PreferencesService;
 
 import com.google.common.eventbus.Subscribe;
@@ -57,17 +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);
@@ -95,8 +104,8 @@ static Optional<Path> getLatestBackupPath(Path originalPath, Path backupDir) {
      *
      * @param bibDatabaseContext Associated {@link BibDatabaseContext}
      */
-    public static BackupManager start(BibDatabaseContext bibDatabaseContext, BibEntryTypesManager entryTypesManager, PreferencesService preferences) {
-        BackupManager backupManager = new BackupManager(bibDatabaseContext, entryTypesManager, preferences);
+    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;
@@ -214,18 +223,36 @@ 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
-        SaveConfiguration saveConfiguration = new SaveConfiguration()
+        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)
-                .withMetadataSaveOrder(true)
+                .withSaveOrder(saveOrder)
                 .withReformatOnSave(preferences.getLibraryPreferences().shouldAlwaysReformatOnSave());
 
         Charset encoding = bibDatabaseContext.getMetaData().getEncoding().orElse(StandardCharsets.UTF_8);
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 619aaa88770..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,7 +26,7 @@ public class BackupResolverDialog extends FXDialog {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(BackupResolverDialog.class);
 
-    public BackupResolverDialog(Path originalPath, Path backupDir) {
+    public BackupResolverDialog(Path originalPath, Path backupDir, ExternalApplicationsPreferences externalApplicationsPreferences) {
         super(AlertType.CONFIRMATION, Localization.lang("Backup found"), true);
         setHeaderText(null);
         getDialogPane().setMinHeight(180);
@@ -34,15 +34,9 @@ public BackupResolverDialog(Path originalPath, Path backupDir) {
 
         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);
@@ -55,7 +49,7 @@ public BackupResolverDialog(Path originalPath, Path backupDir) {
                 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/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/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/SaveOrderConfigPanelViewModel.java b/src/main/java/org/jabref/gui/commonfxcontrols/SaveOrderConfigPanelViewModel.java
index 5407edbcccd..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.SaveOrder;
 
 public class SaveOrderConfigPanelViewModel {
 
@@ -24,7 +23,7 @@ public SaveOrderConfigPanelViewModel() {
     }
 
     public void addCriterion() {
-        selectedSortCriteriaProperty.add(new SortCriterionViewModel(new SaveOrder.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 6d1d21a9ee5..19edca1f9d9 100644
--- a/src/main/java/org/jabref/gui/commonfxcontrols/SortCriterionViewModel.java
+++ b/src/main/java/org/jabref/gui/commonfxcontrols/SortCriterionViewModel.java
@@ -6,6 +6,7 @@
 import javafx.beans.property.SimpleObjectProperty;
 
 import org.jabref.model.entry.field.Field;
+import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.metadata.SaveOrder;
 
 public class SortCriterionViewModel {
@@ -18,6 +19,11 @@ public SortCriterionViewModel(SaveOrder.SortCriterion criterion) {
         this.descendingProperty.setValue(criterion.descending);
     }
 
+    public SortCriterionViewModel() {
+        this.fieldProperty.setValue(StandardField.AUTHOR);
+        this.descendingProperty.setValue(false);
+    }
+
     public ObjectProperty<Field> fieldProperty() {
         return fieldProperty;
     }
diff --git a/src/main/java/org/jabref/gui/desktop/JabRefDesktop.java b/src/main/java/org/jabref/gui/desktop/JabRefDesktop.java
index 669d3c7ca71..5c4b332a029 100644
--- a/src/main/java/org/jabref/gui/desktop/JabRefDesktop.java
+++ b/src/main/java/org/jabref/gui/desktop/JabRefDesktop.java
@@ -25,6 +25,8 @@
 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;
@@ -81,10 +83,10 @@ public static void openExternalViewer(BibDatabaseContext databaseContext,
                 }
             }
         } else if (StandardField.DOI == field) {
-            openDoi(link);
+            openDoi(link, preferencesService);
             return;
         } else if (StandardField.ISBN == field) {
-            openIsbn(link);
+            openIsbn(link, preferencesService);
             return;
         } else if (StandardField.EPRINT == field) {
             IdentifierParser identifierParser = new IdentifierParser(entry);
@@ -106,16 +108,16 @@ public static void openExternalViewer(BibDatabaseContext databaseContext,
         }
 
         if (StandardField.URL == field) {
-            openBrowser(link);
+            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 == 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,9 +126,9 @@ 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) {
@@ -134,16 +136,16 @@ public static void openCustomDoi(String link, PreferencesService preferences, Di
            .flatMap(doi -> doi.getExternalURIWithCustomBase(preferences.getDOIPreferences().getDefaultBaseURI()))
            .ifPresent(uri -> {
                try {
-                   JabRefDesktop.openBrowser(uri);
+                   JabRefDesktop.openBrowser(uri, preferences.getFilePreferences());
                } catch (IOException e) {
                    dialogService.showErrorDialogAndWait(Localization.lang("Unable to open link."), e);
                }
            });
     }
 
-    private static void openIsbn(String isbn) throws IOException {
+    private static void openIsbn(String isbn, PreferencesService preferencesService) throws IOException {
         String link = "https://openlibrary.org/isbn/" + isbn;
-        openBrowser(link);
+        openBrowser(link, preferencesService.getFilePreferences());
     }
 
     /**
@@ -154,40 +156,42 @@ private static void openIsbn(String isbn) throws IOException {
      * @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 {
         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);
+            openExternalFilePlatformIndependent(type, filePath, filePreferences);
             return true;
         }
 
         // No file matched the name, try to open it directly using the given app
-        openExternalFilePlatformIndependent(type, link);
+        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);
         }
     }
 
@@ -197,18 +201,20 @@ 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);
             return;
         }
         String absolutePath = fileLink.toAbsolutePath().getParent().toString();
-        String command = preferencesService.getExternalApplicationsPreferences().getCustomFileBrowserCommand();
+        String command = externalApplicationsPreferences.getCustomFileBrowserCommand();
         if (command.isEmpty()) {
             LOGGER.info("No custom file browser command defined");
             NATIVE_DESKTOP.openFolderAndSelectFile(fileLink);
@@ -271,13 +277,13 @@ private static void executeCommand(String command, String absolutePath, DialogSe
      *
      * @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(String url, FilePreferences filePreferences) throws IOException {
+        Optional<ExternalFileType> fileType = ExternalFileTypes.getExternalFileTypeByExt("html", filePreferences);
+        openExternalFilePlatformIndependent(fileType, url, filePreferences);
     }
 
-    public static void openBrowser(URI url) throws IOException {
-        openBrowser(url.toASCIIString());
+    public static void openBrowser(URI url, FilePreferences filePreferences) throws IOException {
+        openBrowser(url.toASCIIString(), filePreferences);
     }
 
     /**
@@ -285,9 +291,9 @@ public static void openBrowser(URI url) throws IOException {
      *
      * @param url the URL to open
      */
-    public static void openBrowserShowPopup(String url, DialogService dialogService) {
+    public static void openBrowserShowPopup(String url, DialogService dialogService, FilePreferences filePreferences) {
         try {
-            openBrowser(url);
+            openBrowser(url, filePreferences);
         } catch (IOException exception) {
             Globals.getClipboardManager().setContent(url);
             LOGGER.error("Could not open browser", exception);
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 02608d60f7b..7ab380efcb7 100644
--- a/src/main/java/org/jabref/gui/desktop/os/DefaultDesktop.java
+++ b/src/main/java/org/jabref/gui/desktop/os/DefaultDesktop.java
@@ -8,6 +8,7 @@
 import org.jabref.architecture.AllowedToUseAwt;
 import org.jabref.cli.Launcher;
 import org.jabref.gui.DialogService;
+import org.jabref.preferences.FilePreferences;
 
 import org.slf4j.LoggerFactory;
 
@@ -21,7 +22,7 @@
 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));
     }
 
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 7ff673136bd..eba3745c0e9 100644
--- a/src/main/java/org/jabref/gui/desktop/os/Linux.java
+++ b/src/main/java/org/jabref/gui/desktop/os/Linux.java
@@ -15,12 +15,12 @@
 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.LoggerFactory;
 
@@ -56,8 +56,8 @@ private void nativeOpenFile(String filePath) {
     }
 
     @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()) {
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 29842c772dd..7e6c4c8fae4 100644
--- a/src/main/java/org/jabref/gui/desktop/os/NativeDesktop.java
+++ b/src/main/java/org/jabref/gui/desktop/os/NativeDesktop.java
@@ -13,6 +13,7 @@
 import org.jabref.logic.util.OS;
 import org.jabref.model.pdf.search.SearchFieldConstants;
 import org.jabref.model.strings.StringUtil;
+import org.jabref.preferences.FilePreferences;
 
 import net.harawata.appdirs.AppDirsFactory;
 import org.slf4j.LoggerFactory;
@@ -29,7 +30,7 @@
  */
 public abstract class NativeDesktop {
 
-    public abstract void openFile(String filePath, String fileType) throws IOException;
+    public abstract void openFile(String filePath, String fileType, FilePreferences filePreferences) throws IOException;
 
     /**
      * Opens a file on an Operating System, using the given application.
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 84bad205b84..7adbd087927 100644
--- a/src/main/java/org/jabref/gui/desktop/os/OSX.java
+++ b/src/main/java/org/jabref/gui/desktop/os/OSX.java
@@ -7,9 +7,9 @@
 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>
@@ -21,8 +21,8 @@
 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 {
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 994bc785c90..bacf32f6406 100644
--- a/src/main/java/org/jabref/gui/desktop/os/Windows.java
+++ b/src/main/java/org/jabref/gui/desktop/os/Windows.java
@@ -8,9 +8,9 @@
 
 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;
@@ -29,8 +29,8 @@ 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());
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 6291f5b779a..05ba9755db4 100644
--- a/src/main/java/org/jabref/gui/dialogs/BackupUIManager.java
+++ b/src/main/java/org/jabref/gui/dialogs/BackupUIManager.java
@@ -8,13 +8,13 @@
 import javafx.scene.control.ButtonType;
 
 import org.jabref.gui.DialogService;
+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 +23,7 @@
 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;
@@ -41,7 +42,11 @@ public static Optional<ParserResult> showRestoreBackupDialog(DialogService dialo
                                                                  Path originalPath,
                                                                  PreferencesService preferencesService,
                                                                  FileUpdateMonitor fileUpdateMonitor) {
-        var actionOpt = showBackupResolverDialog(dialogService, originalPath, preferencesService.getFilePreferences().getBackupDirectory());
+        var actionOpt = showBackupResolverDialog(
+                dialogService,
+                preferencesService.getExternalApplicationsPreferences(),
+                originalPath,
+                preferencesService.getFilePreferences().getBackupDirectory());
         return actionOpt.flatMap(action -> {
             if (action == BackupResolverDialog.RESTORE_FROM_BACKUP) {
                 BackupManager.restoreBackup(originalPath, preferencesService.getFilePreferences().getBackupDirectory());
@@ -53,8 +58,12 @@ public static Optional<ParserResult> showRestoreBackupDialog(DialogService dialo
         });
     }
 
-    private static Optional<ButtonType> showBackupResolverDialog(DialogService dialogService, Path originalPath, Path backupDir) {
-        return DefaultTaskExecutor.runInJavaFXThread(() -> dialogService.showCustomDialogAndWait(new BackupResolverDialog(originalPath, backupDir)));
+    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(
@@ -73,7 +82,7 @@ private static Optional<ParserResult> showReviewBackupDialog(
             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);
diff --git a/src/main/java/org/jabref/gui/duplicationFinder/DuplicateResolverDialog.java b/src/main/java/org/jabref/gui/duplicationFinder/DuplicateResolverDialog.java
index 063cad00abb..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");
         }
@@ -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/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/entryeditor/EntryEditor.java b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
index a564858b979..349f01cded2 100644
--- a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
+++ b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
@@ -122,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;
@@ -147,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;
@@ -197,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:
@@ -291,6 +291,7 @@ private List<EntryEditorTab> createTabs() {
                 fileMonitor,
                 dialogService,
                 stateManager,
+                bibEntryTypesManager,
                 keyBindingRepository);
         entryEditorTabs.add(sourceTab);
 
diff --git a/src/main/java/org/jabref/gui/entryeditor/EntryEditorPreferences.java b/src/main/java/org/jabref/gui/entryeditor/EntryEditorPreferences.java
index 763d0e633d9..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,41 +18,59 @@
 
 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,
-                                  boolean autolinkFilesEnabled) {
+                                  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>> getEntryEditorTabs() {
@@ -93,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();
     }
@@ -176,4 +184,16 @@ public BooleanProperty autoLinkEnabledProperty() {
     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/RelatedArticlesTab.java b/src/main/java/org/jabref/gui/entryeditor/RelatedArticlesTab.java
index ec1faf68ca2..08047d1aae9 100644
--- a/src/main/java/org/jabref/gui/entryeditor/RelatedArticlesTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/RelatedArticlesTab.java
@@ -128,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);
@@ -192,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);
@@ -212,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());
@@ -237,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 9034a76f0c4..cfc530c9d08 100644
--- a/src/main/java/org/jabref/gui/entryeditor/RequiredFieldsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/RequiredFieldsTab.java
@@ -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 9bf912248e8..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;
@@ -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;
 
@@ -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,7 +99,15 @@ public void execute() {
         }
     }
 
-    public SourceTab(BibDatabaseContext bibDatabaseContext, CountingUndoManager undoManager, FieldPreferences fieldPreferences, 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())));
@@ -109,6 +118,7 @@ public SourceTab(BibDatabaseContext bibDatabaseContext, CountingUndoManager undo
         this.fileMonitor = fileMonitor;
         this.dialogService = dialogService;
         this.stateManager = stateManager;
+        this.entryTypesManager = entryTypesManager;
         this.keyBindingRepository = keyBindingRepository;
 
         stateManager.activeSearchQueryProperty().addListener((observable, oldValue, newValue) -> {
@@ -133,7 +143,7 @@ private String getSourceString(BibEntry entry, BibDatabaseMode type, FieldPrefer
         StringWriter writer = new StringWriter();
         BibWriter bibWriter = new BibWriter(writer, OS.NEWLINE);
         FieldWriter fieldWriter = FieldWriter.buildIgnoreHashes(fieldPreferences);
-        new BibEntryWriter(fieldWriter, Globals.entryTypesManager).write(entry, bibWriter, type);
+        new BibEntryWriter(fieldWriter, entryTypesManager).write(entry, bibWriter, type);
         return writer.toString();
     }
 
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 539307e3152..9732e15b3a4 100644
--- a/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FulltextSearchResultsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FulltextSearchResultsTab.java
@@ -99,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()) {
@@ -108,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()));
                 }
             }
@@ -127,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/exporter/CreateModifyExporterDialogViewModel.java b/src/main/java/org/jabref/gui/exporter/CreateModifyExporterDialogViewModel.java
index 0fcc7b12fde..78c808dad3c 100644
--- a/src/main/java/org/jabref/gui/exporter/CreateModifyExporterDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/exporter/CreateModifyExporterDialogViewModel.java
@@ -67,7 +67,7 @@ public ExporterViewModel saveExporter() {
                 layoutFile.get(),
                 extension.get(),
                 preferences.getLayoutFormatterPreferences(),
-                preferences.getExportConfiguration());
+                preferences.getSelfContainedExportConfiguration().getSelfContainedSaveOrder());
         format.setCustomExport(true);
         return new ExporterViewModel(format);
     }
diff --git a/src/main/java/org/jabref/gui/exporter/ExportCommand.java b/src/main/java/org/jabref/gui/exporter/ExportCommand.java
index b120ba1aed2..96eebc80160 100644
--- a/src/main/java/org/jabref/gui/exporter/ExportCommand.java
+++ b/src/main/java/org/jabref/gui/exporter/ExportCommand.java
@@ -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/SaveDatabaseAction.java b/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java
index 1a57b1f2bd5..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,22 +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.SaveConfiguration;
 import org.jabref.logic.exporter.SaveException;
+import org.jabref.logic.exporter.SelfContainedSaveConfiguration;
 import org.jabref.logic.l10n.Encodings;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.shared.DatabaseLocation;
@@ -37,6 +41,8 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.database.event.ChangePropagation;
 import org.jabref.model.entry.BibEntryTypesManager;
+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, BibDatabaseWriter.SaveType.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) {
@@ -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, BibDatabaseWriter.SaveType.ALL);
+            boolean success = saveDatabase(targetPath, false, encoding, BibDatabaseWriter.SaveType.WITH_JABREF_META_DATA, getSaveOrder());
 
             if (success) {
                 libraryTab.getUndoManager().markUnchanged();
@@ -228,13 +254,10 @@ private boolean save(Path targetPath, SaveDatabaseMode mode) {
         }
     }
 
-    private boolean saveDatabase(Path file, boolean selectedOnly, Charset encoding, BibDatabaseWriter.SaveType 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
-
-        SaveConfiguration saveConfiguration = new SaveConfiguration()
-                .withSaveType(saveType)
-                .withMetadataSaveOrder(true)
-                .withReformatOnSave(preferences.getLibraryPreferences().shouldAlwaysReformatOnSave());
+        SelfContainedSaveConfiguration saveConfiguration
+                = new SelfContainedSaveConfiguration(saveOrder, false, saveType, preferences.getLibraryPreferences().shouldAlwaysReformatOnSave());
         BibDatabaseContext bibDatabaseContext = libraryTab.getBibDatabaseContext();
         synchronized (bibDatabaseContext) {
             try (AtomicFileWriter fileWriter = new AtomicFileWriter(file, encoding, saveConfiguration.shouldMakeBackup())) {
@@ -255,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);
@@ -266,7 +289,7 @@ private boolean saveDatabase(Path file, boolean selectedOnly, Charset encoding,
         }
     }
 
-    private void saveWithDifferentEncoding(Path file, boolean selectedOnly, Charset encoding, Set<Character> encodingProblems, BibDatabaseWriter.SaveType 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(
@@ -288,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 44d1b56bf7c..6e579b4965a 100644
--- a/src/main/java/org/jabref/gui/exporter/WriteMetadataToPdfAction.java
+++ b/src/main/java/org/jabref/gui/exporter/WriteMetadataToPdfAction.java
@@ -21,13 +21,13 @@
 
 import org.jabref.gui.DialogService;
 import org.jabref.gui.FXDialog;
-import org.jabref.gui.Globals;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.gui.util.BackgroundTask;
 import org.jabref.gui.util.TaskExecutor;
 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;
@@ -49,6 +49,7 @@ public class WriteMetadataToPdfAction extends SimpleCommand {
     private final TaskExecutor taskExecutor;
     private final FilePreferences filePreferences;
     private final XmpPreferences xmpPreferences;
+    private final JournalAbbreviationRepository abbreviationRepository;
 
     private OptionsDialog optionsDialog;
 
@@ -60,7 +61,14 @@ public class WriteMetadataToPdfAction extends SimpleCommand {
     private int entriesChanged;
     private int errors;
 
-    public WriteMetadataToPdfAction(StateManager stateManager, BibEntryTypesManager entryTypesManager, FieldPreferences fieldPreferences, 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.fieldPreferences = fieldPreferences;
@@ -68,6 +76,7 @@ public WriteMetadataToPdfAction(StateManager stateManager, BibEntryTypesManager
         this.taskExecutor = taskExecutor;
         this.filePreferences = filePreferences;
         this.xmpPreferences = xmpPreferences;
+        this.abbreviationRepository = abbreviationRepository;
 
         this.executable.bind(needsDatabase(stateManager));
     }
@@ -197,7 +206,7 @@ synchronized private void writeMetadataToFile(Path file, BibEntry entry, BibData
         new XmpUtilWriter(xmpPreferences).writeXmp(file, entry, database);
 
         EmbeddedBibFilePdfExporter embeddedBibExporter = new EmbeddedBibFilePdfExporter(databaseContext.getMode(), entryTypesManager, fieldPreferences);
-        embeddedBibExporter.exportToFileByPath(databaseContext, database, filePreferences, file, Globals.journalAbbreviationRepository);
+        embeddedBibExporter.exportToFileByPath(databaseContext, filePreferences, file, abbreviationRepository);
     }
 
     class OptionsDialog extends FXDialog {
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/ImportHandler.java b/src/main/java/org/jabref/gui/externalfiles/ImportHandler.java
index e8ec24a805a..31edf671e97 100644
--- a/src/main/java/org/jabref/gui/externalfiles/ImportHandler.java
+++ b/src/main/java/org/jabref/gui/externalfiles/ImportHandler.java
@@ -83,7 +83,7 @@ public ImportHandler(BibDatabaseContext database,
         this.dialogService = dialogService;
         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;
     }
diff --git a/src/main/java/org/jabref/gui/fieldeditors/FieldEditors.java b/src/main/java/org/jabref/gui/fieldeditors/FieldEditors.java
index 90a2b1b2f93..1ff28bdbb55 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/FieldEditors.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/FieldEditors.java
@@ -62,7 +62,7 @@ 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) {
@@ -97,6 +97,8 @@ public static FieldEditorFX getForField(final Field 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/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/LinkedFileViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java
index 8124240b4a2..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,7 +113,7 @@ 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());
                     }
                 },
@@ -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,9 +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"));
                 }
@@ -258,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 {
@@ -295,13 +298,13 @@ 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());
+        Optional<Path> file = linkedFile.findIn(databaseContext, preferencesService.getFilePreferences());
         if (file.isPresent()) {
             // Found the linked file, so move it
             try {
@@ -337,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
@@ -352,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;
@@ -380,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());
@@ -421,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;
@@ -455,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.
@@ -472,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()))) {
@@ -512,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);
                 })
@@ -536,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() {
@@ -556,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.java b/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.java
index 7a44a9e758a..2f687be78e1 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.java
@@ -47,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;
@@ -71,6 +73,8 @@ public class LinkedFilesEditor extends HBox implements FieldEditorFX {
 
     @Inject private DialogService dialogService;
     @Inject private PreferencesService preferencesService;
+    @Inject private BibEntryTypesManager bibEntryTypesManager;
+    @Inject private JournalAbbreviationRepository abbreviationRepository;
     @Inject private TaskExecutor taskExecutor;
 
     private LinkedFilesEditorViewModel viewModel;
@@ -203,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 91c78c3d01d..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;
@@ -34,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;
@@ -43,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);
@@ -139,16 +145,41 @@ 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
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/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 a0e2c67a62d..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.getFieldPreferences());
-                        embeddedBibExporter.exportToFileByPath(databaseContext, databaseContext.getDatabase(), preferences.getFilePreferences(), file.get(), Globals.journalAbbreviationRepository);
+                        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/identifier/BaseIdentifierEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/identifier/BaseIdentifierEditorViewModel.java
index 9e6e42cd2be..457df38e15d 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/identifier/BaseIdentifierEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/identifier/BaseIdentifierEditorViewModel.java
@@ -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/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 84f9a79dfe1..b7b4b020f62 100644
--- a/src/main/java/org/jabref/gui/groups/GroupDialogView.java
+++ b/src/main/java/org/jabref/gui/groups/GroupDialogView.java
@@ -158,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) {
@@ -167,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 04b5e39c278..e18d431d0bd 100644
--- a/src/main/java/org/jabref/gui/groups/GroupDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/groups/GroupDialogViewModel.java
@@ -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);
@@ -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) {
@@ -453,7 +457,7 @@ public void texGroupBrowse() {
     }
 
     public void openHelpPage() {
-        new HelpAction(HelpFile.GROUPS, dialogService).execute();
+        new HelpAction(HelpFile.GROUPS, dialogService, preferencesService.getFilePreferences()).execute();
     }
 
     private List<Path> getFileDirectoriesAsPaths() {
diff --git a/src/main/java/org/jabref/gui/groups/GroupTreeView.java b/src/main/java/org/jabref/gui/groups/GroupTreeView.java
index 81c7327aa72..25c679c1254 100644
--- a/src/main/java/org/jabref/gui/groups/GroupTreeView.java
+++ b/src/main/java/org/jabref/gui/groups/GroupTreeView.java
@@ -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();
@@ -285,6 +285,9 @@ private StackPane createNumberCell(GroupNodeViewModel group) {
                     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");
@@ -322,7 +325,7 @@ private void handleOnDragDetected(TreeTableRow<GroupNodeViewModel> row, GroupNod
             }
         }
 
-        if (groupsToMove.size() > 0) {
+        if (!groupsToMove.isEmpty()) {
             localDragboard.clearAll();
         }
 
diff --git a/src/main/java/org/jabref/gui/help/AboutDialog.fxml b/src/main/java/org/jabref/gui/help/AboutDialog.fxml
index 494b3c5f537..bda361a6046 100644
--- a/src/main/java/org/jabref/gui/help/AboutDialog.fxml
+++ b/src/main/java/org/jabref/gui/help/AboutDialog.fxml
@@ -38,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"/>
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/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 c92fea5ac8e..9833e46049c 100644
--- a/src/main/java/org/jabref/gui/icon/IconTheme.java
+++ b/src/main/java/org/jabref/gui/icon/IconTheme.java
@@ -276,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),
@@ -317,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),
diff --git a/src/main/java/org/jabref/gui/icon/JabRefMaterialDesignIcon.java b/src/main/java/org/jabref/gui/icon/JabRefMaterialDesignIcon.java
index a5745132bbc..e6b63d609db 100644
--- a/src/main/java/org/jabref/gui/icon/JabRefMaterialDesignIcon.java
+++ b/src/main/java/org/jabref/gui/icon/JabRefMaterialDesignIcon.java
@@ -29,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/actions/OpenDatabaseAction.java b/src/main/java/org/jabref/gui/importer/actions/OpenDatabaseAction.java
index 63ba10bf3d1..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,13 +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.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;
@@ -31,6 +31,7 @@
 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;
 
@@ -56,17 +57,20 @@ public class OpenDatabaseAction extends SimpleCommand {
     private final StateManager stateManager;
     private final FileUpdateMonitor fileUpdateMonitor;
     private final DialogService dialogService;
+    private final BibEntryTypesManager entryTypesManager;
 
     public OpenDatabaseAction(JabRefFrame frame,
                               PreferencesService preferencesService,
                               DialogService dialogService,
                               StateManager stateManager,
-                              FileUpdateMonitor fileUpdateMonitor) {
+                              FileUpdateMonitor fileUpdateMonitor,
+                              BibEntryTypesManager entryTypesManager) {
         this.frame = frame;
         this.preferencesService = preferencesService;
         this.dialogService = dialogService;
         this.stateManager = stateManager;
         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, fileUpdateMonitor);
+        LibraryTab newTab = LibraryTab.createLibraryTab(backgroundTask, file, preferencesService, stateManager, frame, fileUpdateMonitor, entryTypesManager);
         backgroundTask.onFinished(() -> trackOpenNewDatabase(newTab));
     }
 
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 eab29987b4a..eefb0944c61 100644
--- a/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModel.java
+++ b/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModel.java
@@ -130,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"));
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/libraryproperties/constants/ConstantsPropertiesView.java b/src/main/java/org/jabref/gui/libraryproperties/constants/ConstantsPropertiesView.java
index 7e7ceaa022e..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")));
 
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 386323599e8..36f4ddeff07 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/constants/ConstantsPropertiesViewModel.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/constants/ConstantsPropertiesViewModel.java
@@ -20,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;
 
@@ -35,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);
@@ -101,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 a397170c92b..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;
     }
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 0c65d449942..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
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 15955183f52..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,6 +1,7 @@
 package org.jabref.gui.libraryproperties.saving;
 
 import java.util.ArrayList;
+import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 
@@ -18,6 +19,7 @@
 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.SaveOrder;
 import org.jabref.preferences.CleanupPreferences;
@@ -25,6 +27,14 @@
 
 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();
 
@@ -41,24 +51,23 @@ public class SavingPropertiesViewModel implements PropertiesTabViewModel {
 
     private final BibDatabaseContext databaseContext;
     private final MetaData initialMetaData;
-    private final SaveOrder exportSaveOrder;
+    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.exportSaveOrder = initialMetaData.getSaveOrderConfig()
-                                              .orElseGet(() -> preferencesService.getExportPreferences().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 (exportSaveOrder.getOrderType()) {
+        switch (saveOrder.getOrderType()) {
             case SPECIFIED -> saveInSpecifiedOrderProperty.setValue(true);
             case ORIGINAL -> saveInOriginalProperty.setValue(true);
             case TABLE -> saveInTableOrderProperty.setValue(true);
@@ -74,11 +83,11 @@ public void setValues() {
 
         sortableFieldsProperty.addAll(FieldFactory.getStandardFieldsWithCitationKey());
         sortCriteriaProperty.clear();
-        sortCriteriaProperty.addAll(exportSaveOrder.getSortCriteria().stream()
-                                                   .map(SortCriterionViewModel::new)
-                                                   .toList());
+        sortCriteriaProperty.addAll(saveOrder.getSortCriteria().stream()
+                                             .map(SortCriterionViewModel::new)
+                                             .toList());
 
-        // FieldFormatterCleanupsPanel
+        // FieldFormatterCleanupsPanel, included via <?import ...> in FXML
 
         Optional<FieldFormatterCleanups> saveActions = initialMetaData.getSaveActions();
         saveActions.ifPresentOrElse(value -> {
@@ -120,11 +129,11 @@ public void storeSettings() {
                 SaveOrder.OrderType.fromBooleans(saveInSpecifiedOrderProperty.getValue(), saveInOriginalProperty.getValue()),
                 sortCriteriaProperty.stream().map(SortCriterionViewModel::getCriterion).toList());
 
-        if (!newSaveOrder.equals(exportSaveOrder)) {
+        if (!newSaveOrder.equals(saveOrder)) {
             if (newSaveOrder.equals(SaveOrder.getDefaultSaveOrder())) {
-                newMetaData.clearSaveOrderConfig();
+                newMetaData.clearSaveOrder();
             } else {
-                newMetaData.setSaveOrderConfig(newSaveOrder);
+                newMetaData.setSaveOrder(newSaveOrder);
             }
         }
 
diff --git a/src/main/java/org/jabref/gui/maintable/MainTable.java b/src/main/java/org/jabref/gui/maintable/MainTable.java
index 05f18f3a6b9..10f9f68022e 100644
--- a/src/main/java/org/jabref/gui/maintable/MainTable.java
+++ b/src/main/java/org/jabref/gui/maintable/MainTable.java
@@ -49,6 +49,7 @@
 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;
 
@@ -69,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;
 
@@ -80,6 +82,7 @@ public MainTable(MainTableDataModel model,
                      StateManager stateManager,
                      KeyBindingRepository keyBindingRepository,
                      ClipBoardManager clipBoardManager,
+                     BibEntryTypesManager entryTypesManager,
                      TaskExecutor taskExecutor,
                      FileUpdateMonitor fileUpdateMonitor) {
         super();
@@ -90,6 +93,7 @@ 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();
 
@@ -144,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());
@@ -178,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);
 
@@ -198,6 +192,7 @@ public MainTable(MainTableDataModel model,
                 libraryTab.getUndoManager(),
                 dialogService,
                 stateManager);
+
         // Enable the header right-click menu.
         new MainTableHeaderContextMenu(this, rightClickMenuFactory).show(true);
     }
@@ -208,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;
@@ -253,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);
@@ -433,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
@@ -490,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/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 a375fdaed0d..fca260455dc 100644
--- a/src/main/java/org/jabref/gui/maintable/RightClickMenu.java
+++ b/src/main/java/org/jabref/gui/maintable/RightClickMenu.java
@@ -55,12 +55,12 @@ public static ContextMenu create(BibEntryTableViewModel entry,
                 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(),
 
-                createSendSubMenu(factory, dialogService, stateManager, preferencesService),
+                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),
@@ -128,10 +128,11 @@ private static Menu createCopySubMenu(ActionFactory factory,
     private static Menu createSendSubMenu(ActionFactory factory,
                                           DialogService dialogService,
                                           StateManager stateManager,
-                                          PreferencesService preferencesService) {
+                                          PreferencesService preferencesService,
+                                          BibEntryTypesManager entryTypesManager) {
         Menu sendMenu = factory.createMenu(StandardActions.SEND);
         sendMenu.getItems().addAll(
-                factory.createMenuItem(StandardActions.SEND_AS_EMAIL, new SendAsStandardEmailAction(dialogService, preferencesService, stateManager)),
+                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()
         );
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/mergeentries/FetchAndMergeEntry.java b/src/main/java/org/jabref/gui/mergeentries/FetchAndMergeEntry.java
index a63e55822dd..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()));
                                       }
@@ -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/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 2b2d03b4926..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() {
@@ -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 be47f545264..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;
 
@@ -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/OOBibBase.java b/src/main/java/org/jabref/gui/openoffice/OOBibBase.java
index f89fcde15ba..f66e353fef5 100644
--- a/src/main/java/org/jabref/gui/openoffice/OOBibBase.java
+++ b/src/main/java/org/jabref/gui/openoffice/OOBibBase.java
@@ -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);
diff --git a/src/main/java/org/jabref/gui/openoffice/OOBibBaseConnect.java b/src/main/java/org/jabref/gui/openoffice/OOBibBaseConnect.java
index e256793cb9b..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) {
diff --git a/src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java b/src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java
index a8b06a0b700..94c54289125 100644
--- a/src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java
+++ b/src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java
@@ -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();
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/autocompletion/AutoCompletionTab.fxml b/src/main/java/org/jabref/gui/preferences/autocompletion/AutoCompletionTab.fxml
index 39cce563121..d4f96a6178c 100644
--- a/src/main/java/org/jabref/gui/preferences/autocompletion/AutoCompletionTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/autocompletion/AutoCompletionTab.fxml
@@ -5,11 +5,16 @@
 <?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"/>
 
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 92ded437ac6..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,7 +60,7 @@ public void initialize() {
         bibtexKeyPatternTable.defaultKeyPatternProperty().bindBidirectional(viewModel.defaultKeyPatternProperty());
 
         ActionFactory actionFactory = new ActionFactory(Globals.getKeyPrefs());
-        actionFactory.configureIconButton(StandardActions.HELP_KEY_PATTERNS, new HelpAction(HelpFile.CITATION_KEY_PATTERN, dialogService), keyPatternHelp);
+        actionFactory.configureIconButton(StandardActions.HELP_KEY_PATTERNS, new HelpAction(HelpFile.CITATION_KEY_PATTERN, dialogService, preferencesService.getFilePreferences()), keyPatternHelp);
     }
 
     @Override
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 e2a27cea269..fea81d07b09 100644
--- a/src/main/java/org/jabref/gui/preferences/customexporter/CustomExporterTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/customexporter/CustomExporterTabViewModel.java
@@ -31,6 +31,7 @@ public CustomExporterTabViewModel(PreferencesService preferences, DialogService
     @Override
     public void setValues() {
         List<TemplateExporter> exportersLogic = preferences.getExportPreferences().getCustomExporters();
+        exporters.clear();
         for (TemplateExporter exporter : exportersLogic) {
             exporters.add(new ExporterViewModel(exporter));
         }
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 26b99e84107..f7f86004674 100644
--- a/src/main/java/org/jabref/gui/preferences/customimporter/CustomImporterTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/customimporter/CustomImporterTabViewModel.java
@@ -43,6 +43,7 @@ public CustomImporterTabViewModel(PreferencesService preferences, DialogService
     @Override
     public void setValues() {
         Set<CustomImporter> importersLogic = preferences.getImporterPreferences().getCustomImporters();
+        importers.clear();
         for (CustomImporter importer : importersLogic) {
             importers.add(new ImporterViewModel(importer));
         }
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 d3b81871b0f..f92088ad6ea 100644
--- a/src/main/java/org/jabref/gui/preferences/entry/EntryTab.java
+++ b/src/main/java/org/jabref/gui/preferences/entry/EntryTab.java
@@ -62,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/entryeditor/EntryEditorTab.fxml b/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTab.fxml
index 894e207fe17..373d531eb8d 100644
--- a/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTab.fxml
@@ -33,6 +33,7 @@
     <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="%Custom editor tabs"/>
     <HBox>
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 46f3573b569..121d44da00c 100644
--- a/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTab.java
+++ b/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTab.java
@@ -26,6 +26,7 @@ public class EntryEditorTab extends AbstractPreferenceTabView<EntryEditorTabView
     @FXML private CheckBox enableLatexCitationsTab;
     @FXML private CheckBox enableValidation;
     @FXML private CheckBox allowIntegerEdition;
+    @FXML private CheckBox journalPopupEnabled;
     @FXML private CheckBox autoLinkFilesEnabled;
 
     @FXML private Button generalFieldsHelp;
@@ -54,12 +55,13 @@ public void initialize() {
         enableLatexCitationsTab.selectedProperty().bindBidirectional(viewModel.enableLatexCitationsTabProperty());
         enableValidation.selectedProperty().bindBidirectional(viewModel.enableValidationProperty());
         allowIntegerEdition.selectedProperty().bindBidirectional(viewModel.allowIntegerEditionProperty());
+        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), generalFieldsHelp);
+        actionFactory.configureIconButton(StandardActions.HELP, new HelpAction(HelpFile.GENERAL_FIELDS, dialogService, preferencesService.getFilePreferences()), generalFieldsHelp);
     }
 
     @FXML
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 1f53eeabd3e..dfbd5847fb1 100644
--- a/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTabViewModel.java
@@ -16,6 +16,7 @@
 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 {
@@ -27,6 +28,7 @@ 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 journalPopupProperty = new SimpleBooleanProperty();
     private final BooleanProperty autoLinkEnabledProperty = new SimpleBooleanProperty();
 
     private final StringProperty fieldsProperty = new SimpleStringProperty();
@@ -34,11 +36,13 @@ public class EntryEditorTabViewModel implements PreferenceTabViewModel {
     private final DialogService dialogService;
     private final PreferencesService preferencesService;
     private final EntryEditorPreferences entryEditorPreferences;
+    private final MrDlibPreferences mrDlibPreferences;
 
     public EntryEditorTabViewModel(DialogService dialogService, PreferencesService preferencesService) {
         this.dialogService = dialogService;
         this.preferencesService = preferencesService;
         this.entryEditorPreferences = preferencesService.getEntryEditorPreferences();
+        this.mrDlibPreferences = preferencesService.getMrDlibPreferences();
     }
 
     @Override
@@ -49,10 +53,11 @@ 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());
 
         setFields(entryEditorPreferences.getEntryEditorTabs());
@@ -80,11 +85,14 @@ 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());
 
@@ -147,6 +155,10 @@ public BooleanProperty allowIntegerEditionProperty() {
         return this.allowIntegerEditionProperty;
     }
 
+    public BooleanProperty journalPopupProperty() {
+        return journalPopupProperty;
+    }
+
     public StringProperty fieldsProperty() {
         return fieldsProperty;
     }
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 f5fe61cbce3..3700f93b5e4 100644
--- a/src/main/java/org/jabref/gui/preferences/external/ExternalTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/external/ExternalTabViewModel.java
@@ -86,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());
@@ -104,6 +105,7 @@ public void setValues() {
         kindleEmailProperty.setValue(initialExternalApplicationPreferences.getKindleEmail());
     }
 
+    @Override
     public void storeSettings() {
         ExternalApplicationsPreferences externalPreferences = preferences.getExternalApplicationsPreferences();
         externalPreferences.setEMailSubject(eMailReferenceSubjectProperty.getValue());
@@ -130,6 +132,7 @@ public ValidationStatus fileBrowserCommandValidationStatus() {
         return fileBrowserCommandValidator.getValidationStatus();
     }
 
+    @Override
     public boolean validateSettings() {
         CompositeValidator validator = new CompositeValidator();
 
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/general/GeneralTab.java b/src/main/java/org/jabref/gui/preferences/general/GeneralTab.java
index ecd749be4ca..8cf5db7140d 100644
--- a/src/main/java/org/jabref/gui/preferences/general/GeneralTab.java
+++ b/src/main/java/org/jabref/gui/preferences/general/GeneralTab.java
@@ -121,7 +121,7 @@ public void initialize() {
         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);
+        actionFactory.configureIconButton(StandardActions.HELP, new HelpAction(HelpFile.AUTOSAVE, dialogService, preferencesService.getFilePreferences()), autosaveLocalLibrariesHelp);
 
         createBackup.selectedProperty().bindBidirectional(viewModel.createBackupProperty());
         backupDirectory.textProperty().bindBidirectional(viewModel.backupDirectoryProperty());
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/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 7817d437c75..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" />
-        <CheckBox fx:id="proxyPersistPassword" text="%Persist password between sessions" 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 19c3425edd0..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,6 +28,7 @@
 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;
@@ -36,6 +39,7 @@
 
 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;
@@ -52,6 +56,7 @@ public class NetworkTab extends AbstractPreferenceTabView<NetworkTabViewModel> i
     @FXML private CustomPasswordField proxyPassword;
     @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;
@@ -63,6 +68,7 @@ public class NetworkTab extends AbstractPreferenceTabView<NetworkTabViewModel> i
     @FXML private TableColumn<CustomCertificateViewModel, String> actionsColumn;
 
     @Inject private FileUpdateMonitor fileUpdateMonitor;
+    @Inject private BibEntryTypesManager entryTypesManager;
 
     private String proxyPasswordText = "";
     private int proxyPasswordCaretPosition = 0;
@@ -81,7 +87,9 @@ public String getTabName() {
     }
 
     public void initialize() {
-        this.viewModel = new NetworkTabViewModel(dialogService, preferencesService, fileUpdateMonitor);
+        this.viewModel = new NetworkTabViewModel(dialogService, preferencesService, fileUpdateMonitor, entryTypesManager);
+
+        versionCheck.selectedProperty().bindBidirectional(viewModel.versionCheckProperty());
 
         remoteLabel.setVisible(preferencesService.getWorkspacePreferences().shouldShowAdvancedHints());
         remoteServer.selectedProperty().bindBidirectional(viewModel.remoteServerProperty());
@@ -106,7 +114,15 @@ public void initialize() {
         proxyPassword.textProperty().bindBidirectional(viewModel.proxyPasswordProperty());
         proxyPassword.disableProperty().bind(proxyCustomAndAuthentication.not());
         proxyPersistPassword.selectedProperty().bindBidirectional(viewModel.proxyPersistPasswordProperty());
-        proxyPersistPassword.disableProperty().bind(proxyCustomAndAuthentication.not());
+        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);
@@ -114,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(() -> {
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 1379d5ebbe2..7991e86493e 100644
--- a/src/main/java/org/jabref/gui/preferences/network/NetworkTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/network/NetworkTabViewModel.java
@@ -9,6 +9,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.beans.property.SimpleStringProperty;
@@ -27,13 +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;
@@ -44,6 +47,7 @@
 import kong.unirest.UnirestException;
 
 public class NetworkTabViewModel implements PreferenceTabViewModel {
+    private final BooleanProperty versionCheckProperty = new SimpleBooleanProperty();
     private final BooleanProperty remoteServerProperty = new SimpleBooleanProperty();
     private final StringProperty remotePortProperty = new SimpleStringProperty("");
     private final BooleanProperty proxyUseProperty = new SimpleBooleanProperty();
@@ -53,6 +57,7 @@ public class NetworkTabViewModel implements PreferenceTabViewModel {
     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;
@@ -64,23 +69,28 @@ 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, FileUpdateMonitor fileUpdateMonitor) {
+    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(),
@@ -132,17 +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()));
 
@@ -158,6 +169,7 @@ private void setProxyValues() {
         proxyUsernameProperty.setValue(proxyPreferences.getUsername());
         proxyPasswordProperty.setValue(proxyPreferences.getPassword());
         proxyPersistPasswordProperty.setValue(proxyPreferences.shouldPersistPassword());
+        passwordPersistAvailable.setValue(OS.isKeyringAvailable());
     }
 
     private void setSSLValues() {
@@ -180,6 +192,8 @@ private void setSSLValues() {
 
     @Override
     public void storeSettings() {
+        internalPreferences.setVersionCheckEnabled(versionCheckProperty.getValue());
+
         getPortAsInt(remotePortProperty.getValue()).ifPresent(newPort -> {
             if (remotePreferences.isDifferentPort(newPort)) {
                 remotePreferences.setPort(newPort);
@@ -188,7 +202,7 @@ public void storeSettings() {
 
         if (remoteServerProperty.getValue()) {
             remotePreferences.setUseRemoteServer(true);
-            Globals.REMOTE_LISTENER.openAndStart(new CLIMessageHandler(preferences, fileUpdateMonitor), remotePreferences.getPort());
+            Globals.REMOTE_LISTENER.openAndStart(new CLIMessageHandler(preferences, fileUpdateMonitor, entryTypesManager), remotePreferences.getPort());
         } else {
             remotePreferences.setUseRemoteServer(false);
             Globals.REMOTE_LISTENER.stop();
@@ -307,6 +321,10 @@ public List<String> getRestartWarnings() {
         }
     }
 
+    public BooleanProperty versionCheckProperty() {
+        return versionCheckProperty;
+    }
+
     public BooleanProperty remoteServerProperty() {
         return remoteServerProperty;
     }
@@ -343,6 +361,10 @@ 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/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/websearch/WebSearchTab.fxml b/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTab.fxml
index 53a3d9c31f1..6bd19f653ca 100644
--- a/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTab.fxml
@@ -4,6 +4,7 @@
 <?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?>
@@ -14,6 +15,7 @@
     <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"/>
@@ -38,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/websearch/WebSearchTab.java b/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTab.java
index d2690a43d56..f7302a5696c 100644
--- a/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTab.java
+++ b/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTab.java
@@ -5,7 +5,9 @@
 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.preferences.AbstractPreferenceTabView;
 import org.jabref.gui.preferences.PreferencesTab;
@@ -14,9 +16,11 @@
 import org.jabref.logic.preferences.FetcherApiKey;
 
 import com.airhacks.afterburner.views.ViewLoader;
+import com.tobiasdiez.easybind.EasyBind;
 
 public class WebSearchTab extends AbstractPreferenceTabView<WebSearchTabViewModel> implements PreferencesTab {
 
+    @FXML private CheckBox enableWebSearch;
     @FXML private CheckBox generateNewKeyOnImport;
     @FXML private CheckBox warnAboutDuplicatesOnImport;
     @FXML private CheckBox downloadLinkedOnlineFiles;
@@ -32,6 +36,9 @@ public class WebSearchTab extends AbstractPreferenceTabView<WebSearchTabViewMode
     @FXML private CheckBox useCustomApiKey;
     @FXML private Button testCustomApiKey;
 
+    @FXML private CheckBox persistApiKeys;
+    @FXML private SplitPane persistentTooltipWrapper; // The disabled persistApiKeys control does not show tooltips
+
     public WebSearchTab() {
         ViewLoader.view(this)
                   .root(this)
@@ -46,6 +53,7 @@ public String getTabName() {
     public void initialize() {
         this.viewModel = new WebSearchTabViewModel(preferencesService, dialogService);
 
+        enableWebSearch.selectedProperty().bindBidirectional(viewModel.enableWebSearchProperty());
         generateNewKeyOnImport.selectedProperty().bindBidirectional(viewModel.generateKeyOnImportProperty());
         warnAboutDuplicatesOnImport.selectedProperty().bindBidirectional(viewModel.warnAboutDuplicatesOnImportProperty());
         downloadLinkedOnlineFiles.selectedProperty().bindBidirectional(viewModel.shouldDownloadLinkedOnlineFiles());
@@ -75,6 +83,16 @@ 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());
 
diff --git a/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTabViewModel.java b/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTabViewModel.java
index b623728413d..8be8c005e48 100644
--- a/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTabViewModel.java
@@ -11,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;
@@ -28,10 +29,12 @@
 import org.jabref.logic.net.URLDownload;
 import org.jabref.logic.preferences.DOIPreferences;
 import org.jabref.logic.preferences.FetcherApiKey;
+import org.jabref.logic.util.OS;
 import org.jabref.preferences.FilePreferences;
 import org.jabref.preferences.PreferencesService;
 
 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();
@@ -44,6 +47,8 @@ public class WebSearchTabViewModel implements PreferenceTabViewModel {
 
     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;
@@ -63,6 +68,7 @@ public WebSearchTabViewModel(PreferencesService preferencesService, DialogServic
 
     @Override
     public void setValues() {
+        enableWebSearchProperty.setValue(importerPreferences.areImporterEnabled());
         generateKeyOnImportProperty.setValue(importerPreferences.isGenerateNewKeyOnImport());
         warnAboutDuplicatesOnImportProperty.setValue(importerPreferences.shouldWarnAboutDuplicatesOnImport());
         shouldDownloadLinkedOnlineFiles.setValue(filePreferences.shouldDownloadLinkedFiles());
@@ -74,10 +80,13 @@ public void setValues() {
         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());
@@ -89,8 +98,15 @@ public void storeSettings() {
         doiPreferences.setUseCustom(useCustomDOIProperty.get());
         doiPreferences.setDefaultBaseURI(useCustomDOINameProperty.getValue().trim());
 
+        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() {
@@ -129,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/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 abec8fcab61..979c30a5049 100644
--- a/src/main/java/org/jabref/gui/preview/PreviewViewer.java
+++ b/src/main/java/org/jabref/gui/preview/PreviewViewer.java
@@ -30,6 +30,7 @@
 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) {
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/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 5b5330b7282..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,7 @@
 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;
 
@@ -20,10 +21,12 @@ public class CLIMessageHandler implements RemoteMessageHandler {
 
     private final PreferencesService preferencesService;
     private final FileUpdateMonitor fileUpdateMonitor;
+    private final BibEntryTypesManager entryTypesManager;
 
-    public CLIMessageHandler(PreferencesService preferencesService, FileUpdateMonitor fileUpdateMonitor) {
+    public CLIMessageHandler(PreferencesService preferencesService, FileUpdateMonitor fileUpdateMonitor, BibEntryTypesManager entryTypesManager) {
         this.preferencesService = preferencesService;
         this.fileUpdateMonitor = fileUpdateMonitor;
+        this.entryTypesManager = entryTypesManager;
     }
 
     @Override
@@ -33,7 +36,8 @@ public void handleCommandLineArguments(String[] message) {
                     message,
                     ArgumentProcessor.Mode.REMOTE_START,
                     preferencesService,
-                    fileUpdateMonitor);
+                    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 1a53f3fbfae..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;
@@ -108,8 +109,6 @@ public class GlobalSearchBar extends HBox {
     private final BooleanProperty globalSearchActive = new SimpleBooleanProperty(false);
     private GlobalSearchResultDialog globalSearchResultDialog;
 
-    private final JabRefFrame frame;
-
     public GlobalSearchBar(JabRefFrame frame, StateManager stateManager, PreferencesService preferencesService, CountingUndoManager undoManager, DialogService dialogService) {
         super();
         this.stateManager = stateManager;
@@ -117,7 +116,6 @@ public GlobalSearchBar(JabRefFrame frame, StateManager stateManager, Preferences
         this.searchPreferences = preferencesService.getSearchPreferences();
         this.undoManager = undoManager;
         this.dialogService = dialogService;
-        this.frame = frame;
 
         searchField.disableProperty().bind(needsDatabase(stateManager).not());
 
@@ -203,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(),
@@ -302,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()) {
diff --git a/src/main/java/org/jabref/gui/search/GlobalSearchResultDialog.java b/src/main/java/org/jabref/gui/search/GlobalSearchResultDialog.java
index 812125df5f3..14de1499f95 100644
--- a/src/main/java/org/jabref/gui/search/GlobalSearchResultDialog.java
+++ b/src/main/java/org/jabref/gui/search/GlobalSearchResultDialog.java
@@ -51,7 +51,7 @@ 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);
diff --git a/src/main/java/org/jabref/gui/search/SearchResultsTable.java b/src/main/java/org/jabref/gui/search/SearchResultsTable.java
index bfe8aa3d84d..5d839d2a4a1 100644
--- a/src/main/java/org/jabref/gui/search/SearchResultsTable.java
+++ b/src/main/java/org/jabref/gui/search/SearchResultsTable.java
@@ -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/shared/SharedDatabaseLoginDialogViewModel.java b/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogViewModel.java
index 32f844b1515..2430a8bbdae 100644
--- a/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogViewModel.java
@@ -190,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);
diff --git a/src/main/java/org/jabref/gui/shared/SharedDatabaseUIManager.java b/src/main/java/org/jabref/gui/shared/SharedDatabaseUIManager.java
index 1a31ac13a18..914c6899b19 100644
--- a/src/main/java/org/jabref/gui/shared/SharedDatabaseUIManager.java
+++ b/src/main/java/org/jabref/gui/shared/SharedDatabaseUIManager.java
@@ -98,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);
 
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/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/logic/bibtex/BibEntryWriter.java b/src/main/java/org/jabref/logic/bibtex/BibEntryWriter.java
index 7cec02d2a49..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);
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 d8d897eb1d3..42f86e0d78d 100644
--- a/src/main/java/org/jabref/logic/bibtex/comparator/FieldComparator.java
+++ b/src/main/java/org/jabref/logic/bibtex/comparator/FieldComparator.java
@@ -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 5f49073981a..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));
+        }
+    }
+
     /**
      * 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/citationkeypattern/BracketedPattern.java b/src/main/java/org/jabref/logic/citationkeypattern/BracketedPattern.java
index 1763695fb0d..4fd02d39c1f 100644
--- a/src/main/java/org/jabref/logic/citationkeypattern/BracketedPattern.java
+++ b/src/main/java/org/jabref/logic/citationkeypattern/BracketedPattern.java
@@ -756,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(" ", "");
     }
 
     /**
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/crawler/StudyRepository.java b/src/main/java/org/jabref/logic/crawler/StudyRepository.java
index eac8c5d11c9..dc490090339 100644
--- a/src/main/java/org/jabref/logic/crawler/StudyRepository.java
+++ b/src/main/java/org/jabref/logic/crawler/StudyRepository.java
@@ -16,8 +16,8 @@
 import org.jabref.logic.exporter.AtomicFileWriter;
 import org.jabref.logic.exporter.BibWriter;
 import org.jabref.logic.exporter.BibtexDatabaseWriter;
-import org.jabref.logic.exporter.SaveConfiguration;
 import org.jabref.logic.exporter.SaveException;
+import org.jabref.logic.exporter.SelfContainedSaveConfiguration;
 import org.jabref.logic.git.SlrGitHandler;
 import org.jabref.logic.importer.OpenDatabase;
 import org.jabref.logic.importer.SearchBasedFetcher;
@@ -27,6 +27,8 @@
 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;
@@ -75,7 +77,7 @@ 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,
@@ -398,21 +400,21 @@ 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);
     }
@@ -423,10 +425,10 @@ private void generateCiteKeys(BibDatabaseContext existingEntries, BibDatabase ta
         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)) {
-            SaveConfiguration saveConfiguration = new SaveConfiguration()
-                    .withMetadataSaveOrder(true)
+            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(
@@ -435,7 +437,7 @@ private void writeResultToFile(Path pathToFile, BibDatabase entries) throws Save
                     preferencesService.getFieldPreferences(),
                     preferencesService.getCitationKeyPatternPreferences(),
                     bibEntryTypesManager);
-            databaseWriter.saveDatabase(new BibDatabaseContext(entries));
+            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/exporter/BibDatabaseWriter.java b/src/main/java/org/jabref/logic/exporter/BibDatabaseWriter.java
index 37c447017fc..68df8656bf1 100644
--- a/src/main/java/org/jabref/logic/exporter/BibDatabaseWriter.java
+++ b/src/main/java/org/jabref/logic/exporter/BibDatabaseWriter.java
@@ -7,7 +7,6 @@
 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;
@@ -40,6 +39,7 @@
 import org.jabref.model.entry.field.InternalField;
 import org.jabref.model.metadata.MetaData;
 import org.jabref.model.metadata.SaveOrder;
+import org.jabref.model.metadata.SelfContainedSaveOrder;
 import org.jabref.model.strings.StringUtil;
 
 import org.jooq.lambda.Unchecked;
@@ -54,23 +54,24 @@
  */
 public abstract class BibDatabaseWriter {
 
-    public enum SaveType { ALL, PLAIN_BIBTEX }
+    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 SaveConfiguration saveConfiguration;
+    protected final SelfContainedSaveConfiguration saveConfiguration;
     protected final CitationKeyPatternPreferences keyPatternPreferences;
     protected final List<FieldChange> saveActionsFieldChanges = new ArrayList<>();
     protected final BibEntryTypesManager entryTypesManager;
 
     public BibDatabaseWriter(BibWriter bibWriter,
-                             SaveConfiguration saveConfiguration,
+                             SelfContainedSaveConfiguration saveConfiguration,
                              CitationKeyPatternPreferences keyPatternPreferences,
                              BibEntryTypesManager entryTypesManager) {
         this.bibWriter = Objects.requireNonNull(bibWriter);
         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) {
@@ -102,21 +103,19 @@ public static List<FieldChange> applySaveActions(BibEntry entry, MetaData metaDa
         return applySaveActions(Collections.singletonList(entry), metaData);
     }
 
-    private static List<Comparator<BibEntry>> getSaveComparators(MetaData metaData, SaveConfiguration preferences) {
+    private static List<Comparator<BibEntry>> getSaveComparators(SaveOrder saveOrder) {
         List<Comparator<BibEntry>> comparators = new ArrayList<>();
-        Optional<SaveOrder> 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() || saveOrder.get().getOrderType() == SaveOrder.OrderType.ORIGINAL) {
+        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)
                                                               .toList();
             comparators.addAll(fieldComparators);
@@ -127,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, SaveConfiguration 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);
@@ -148,23 +142,6 @@ public static List<BibEntry> getSortedEntries(BibDatabaseContext bibDatabaseCont
         return sorted;
     }
 
-    private static Optional<SaveOrder> getSaveOrder(MetaData metaData, SaveConfiguration saveConfiguration) {
-        /* two options:
-         * 1. order specified in metaData
-         * 2. original order
-         */
-
-        if (saveConfiguration.useMetadataSaveOrder()) {
-            return metaData.getSaveOrderConfig();
-        }
-
-        if (saveConfiguration.getSaveOrder().getOrderType() == SaveOrder.OrderType.ORIGINAL) {
-            return Optional.empty();
-        }
-
-        return Optional.ofNullable(saveConfiguration.getSaveOrder());
-    }
-
     public List<FieldChange> getSaveActionsFieldChanges() {
         return Collections.unmodifiableList(saveActionsFieldChanges);
     }
@@ -190,7 +167,7 @@ public void savePartOfDatabase(BibDatabaseContext bibDatabaseContext, List<BibEn
         sharedDatabaseIDOptional.ifPresent(Unchecked.consumer(id -> writeDatabaseID(id)));
 
         // Some file formats write something at the start of the file (like the encoding)
-        if (saveConfiguration.getSaveType() != SaveType.PLAIN_BIBTEX) {
+        if (saveConfiguration.getSaveType() == SaveType.WITH_JABREF_META_DATA) {
             Charset charset = bibDatabaseContext.getMetaData().getEncoding().orElse(StandardCharsets.UTF_8);
             writeProlog(bibDatabaseContext, charset);
         }
@@ -204,7 +181,7 @@ public void savePartOfDatabase(BibDatabaseContext bibDatabaseContext, List<BibEn
         writeStrings(bibDatabaseContext.getDatabase());
 
         // Write database entries.
-        List<BibEntry> sortedEntries = getSortedEntries(bibDatabaseContext, entries, saveConfiguration);
+        List<BibEntry> sortedEntries = getSortedEntries(entries, saveConfiguration.getSelfContainedSaveOrder());
         List<FieldChange> saveActionChanges = applySaveActions(sortedEntries, bibDatabaseContext.getMetaData());
         saveActionsFieldChanges.addAll(saveActionChanges);
         if (keyPatternPreferences.shouldGenerateCiteKeysBeforeSaving()) {
@@ -228,7 +205,7 @@ public void savePartOfDatabase(BibDatabaseContext bibDatabaseContext, List<BibEn
             writeEntry(entry, bibDatabaseContext.getMode());
         }
 
-        if (saveConfiguration.getSaveType() != SaveType.PLAIN_BIBTEX) {
+        if (saveConfiguration.getSaveType() == SaveType.WITH_JABREF_META_DATA) {
             // Write meta data.
             writeMetaData(bibDatabaseContext.getMetaData(), keyPatternPreferences.getKeyPattern());
 
diff --git a/src/main/java/org/jabref/logic/exporter/BibtexDatabaseWriter.java b/src/main/java/org/jabref/logic/exporter/BibtexDatabaseWriter.java
index 39fa27614bf..558687ca21d 100644
--- a/src/main/java/org/jabref/logic/exporter/BibtexDatabaseWriter.java
+++ b/src/main/java/org/jabref/logic/exporter/BibtexDatabaseWriter.java
@@ -35,7 +35,7 @@ public class BibtexDatabaseWriter extends BibDatabaseWriter {
     private final FieldPreferences fieldPreferences;
 
     public BibtexDatabaseWriter(BibWriter bibWriter,
-                                SaveConfiguration saveConfiguration,
+                                SelfContainedSaveConfiguration saveConfiguration,
                                 FieldPreferences fieldPreferences,
                                 CitationKeyPatternPreferences citationKeyPatternPreferences,
                                 BibEntryTypesManager entryTypesManager) {
@@ -49,7 +49,7 @@ public BibtexDatabaseWriter(BibWriter bibWriter,
 
     public BibtexDatabaseWriter(Writer writer,
                                 String newline,
-                                SaveConfiguration saveConfiguration,
+                                SelfContainedSaveConfiguration saveConfiguration,
                                 FieldPreferences fieldPreferences,
                                 CitationKeyPatternPreferences citationKeyPatternPreferences,
                                 BibEntryTypesManager entryTypesManager) {
diff --git a/src/main/java/org/jabref/logic/exporter/Exporter.java b/src/main/java/org/jabref/logic/exporter/Exporter.java
index 9bcbb9aa931..61e1c5751ae 100644
--- a/src/main/java/org/jabref/logic/exporter/Exporter.java
+++ b/src/main/java/org/jabref/logic/exporter/Exporter.java
@@ -8,7 +8,6 @@
 
 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;
@@ -103,7 +102,6 @@ public boolean exportToAllFilesOfEntry(BibDatabaseContext databaseContext,
      * 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 abbreviationRepository the opened repository of journal abbreviations
@@ -111,7 +109,6 @@ public boolean exportToAllFilesOfEntry(BibDatabaseContext databaseContext,
      * @throws Exception if the writing fails
      */
     public boolean exportToFileByPath(BibDatabaseContext databaseContext,
-                                      BibDatabase dataBase,
                                       FilePreferences filePreferences,
                                       Path filePath,
                                       JournalAbbreviationRepository abbreviationRepository) throws Exception {
@@ -119,7 +116,7 @@ public boolean exportToFileByPath(BibDatabaseContext databaseContext,
             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));
diff --git a/src/main/java/org/jabref/logic/exporter/ExporterFactory.java b/src/main/java/org/jabref/logic/exporter/ExporterFactory.java
index 7893a2455c0..4eaa28e4dea 100644
--- a/src/main/java/org/jabref/logic/exporter/ExporterFactory.java
+++ b/src/main/java/org/jabref/logic/exporter/ExporterFactory.java
@@ -13,6 +13,7 @@
 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 {
@@ -28,7 +29,7 @@ public static ExporterFactory create(PreferencesService preferencesService,
 
         List<TemplateExporter> customFormats = preferencesService.getExportPreferences().getCustomExporters();
         LayoutFormatterPreferences layoutPreferences = preferencesService.getLayoutFormatterPreferences();
-        SaveConfiguration saveConfiguration = preferencesService.getExportConfiguration();
+        SelfContainedSaveOrder saveOrder = SelfContainedSaveOrder.of(preferencesService.getSelfContainedExportConfiguration().getSaveOrder());
         XmpPreferences xmpPreferences = preferencesService.getXmpPreferences();
         FieldPreferences fieldPreferences = preferencesService.getFieldPreferences();
         BibDatabaseMode bibDatabaseMode = preferencesService.getLibraryPreferences().getDefaultBibDatabaseMode();
@@ -36,23 +37,23 @@ public static ExporterFactory create(PreferencesService preferencesService,
         List<Exporter> exporters = new ArrayList<>();
 
         // Initialize build-in exporters
-        exporters.add(new TemplateExporter("HTML", "html", "html", null, StandardFileType.HTML, layoutPreferences, saveConfiguration));
-        exporters.add(new TemplateExporter(Localization.lang("Simple HTML"), "simplehtml", "simplehtml", null, StandardFileType.HTML, layoutPreferences, saveConfiguration));
-        exporters.add(new TemplateExporter("DocBook 5.1", "docbook5", "docbook5", null, StandardFileType.XML, layoutPreferences, saveConfiguration));
-        exporters.add(new TemplateExporter("DocBook 4", "docbook4", "docbook4", null, StandardFileType.XML, layoutPreferences, saveConfiguration));
-        exporters.add(new TemplateExporter("DIN 1505", "din1505", "din1505winword", "din1505", StandardFileType.RTF, layoutPreferences, saveConfiguration));
-        exporters.add(new TemplateExporter("BibO RDF", "bibordf", "bibordf", null, StandardFileType.RDF, layoutPreferences, saveConfiguration));
-        exporters.add(new TemplateExporter(Localization.lang("HTML table"), "tablerefs", "tablerefs", "tablerefs", StandardFileType.HTML, layoutPreferences, saveConfiguration));
-        exporters.add(new TemplateExporter(Localization.lang("HTML list"), "listrefs", "listrefs", "listrefs", StandardFileType.HTML, layoutPreferences, saveConfiguration));
-        exporters.add(new TemplateExporter(Localization.lang("HTML table (with Abstract & BibTeX)"), "tablerefsabsbib", "tablerefsabsbib", "tablerefsabsbib", StandardFileType.HTML, layoutPreferences, saveConfiguration));
-        exporters.add(new TemplateExporter("Harvard RTF", "harvard", "harvard", "harvard", StandardFileType.RTF, layoutPreferences, saveConfiguration));
-        exporters.add(new TemplateExporter("ISO 690 RTF", "iso690rtf", "iso690RTF", "iso690rtf", StandardFileType.RTF, layoutPreferences, saveConfiguration));
-        exporters.add(new TemplateExporter("ISO 690", "iso690txt", "iso690", "iso690txt", StandardFileType.TXT, layoutPreferences, saveConfiguration));
-        exporters.add(new TemplateExporter("Endnote", "endnote", "EndNote", "endnote", StandardFileType.TXT, layoutPreferences, saveConfiguration));
-        exporters.add(new TemplateExporter("OpenOffice/LibreOffice CSV", "oocsv", "openoffice-csv", "openoffice", StandardFileType.CSV, layoutPreferences, saveConfiguration));
-        exporters.add(new TemplateExporter("RIS", "ris", "ris", "ris", StandardFileType.RIS, layoutPreferences, saveConfiguration, BlankLineBehaviour.DELETE_BLANKS));
-        exporters.add(new TemplateExporter("MIS Quarterly", "misq", "misq", "misq", StandardFileType.RTF, layoutPreferences, saveConfiguration));
-        exporters.add(new TemplateExporter("CSL YAML", "yaml", "yaml", null, StandardFileType.YAML, layoutPreferences, saveConfiguration, 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());
diff --git a/src/main/java/org/jabref/logic/exporter/MetaDataSerializer.java b/src/main/java/org/jabref/logic/exporter/MetaDataSerializer.java
index 150dab34e66..60c143dab88 100644
--- a/src/main/java/org/jabref/logic/exporter/MetaDataSerializer.java
+++ b/src/main/java/org/jabref/logic/exporter/MetaDataSerializer.java
@@ -42,7 +42,7 @@ public static Map<String, String> getSerializedStringMap(MetaData metaData,
         Map<String, List<String>> stringyMetaData = new HashMap<>();
 
         // First write all meta data except groups
-        metaData.getSaveOrderConfig().ifPresent(
+        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)));
diff --git a/src/main/java/org/jabref/logic/exporter/SaveConfiguration.java b/src/main/java/org/jabref/logic/exporter/SaveConfiguration.java
index 7e0bc84eb7b..358659113e5 100644
--- a/src/main/java/org/jabref/logic/exporter/SaveConfiguration.java
+++ b/src/main/java/org/jabref/logic/exporter/SaveConfiguration.java
@@ -1,5 +1,6 @@
 package org.jabref.logic.exporter;
 
+import org.jabref.gui.autosaveandbackup.BackupManager;
 import org.jabref.model.metadata.SaveOrder;
 
 public class SaveConfiguration {
@@ -11,37 +12,24 @@ public class SaveConfiguration {
     private SaveOrder saveOrder;
     private boolean makeBackup;
     private BibDatabaseWriter.SaveType saveType;
-    private boolean useMetadataSaveOrder;
 
     public SaveConfiguration(SaveOrder saveOrder,
                              Boolean makeBackup,
                              BibDatabaseWriter.SaveType saveType,
-                             Boolean useMetadataSaveOrder,
                              Boolean reformatFile) {
         this.saveOrder = saveOrder;
         this.makeBackup = makeBackup;
         this.saveType = saveType;
-        this.useMetadataSaveOrder = useMetadataSaveOrder;
         this.reformatFile = reformatFile;
     }
 
     public SaveConfiguration() {
         this(SaveOrder.getDefaultSaveOrder(),
                 false,
-                BibDatabaseWriter.SaveType.ALL,
-                true,
+                BibDatabaseWriter.SaveType.WITH_JABREF_META_DATA,
                 false);
     }
 
-    public boolean useMetadataSaveOrder() {
-        return useMetadataSaveOrder;
-    }
-
-    public SaveConfiguration withMetadataSaveOrder(boolean newTakeMetadataSaveOrderInAccount) {
-        this.useMetadataSaveOrder = newTakeMetadataSaveOrderInAccount;
-        return this;
-    }
-
     public SaveOrder getSaveOrder() {
         return saveOrder;
     }
@@ -56,7 +44,7 @@ public boolean shouldMakeBackup() {
     }
 
     /**
-     * Required by {@link org.jabref.logic.autosaveandbackup.BackupManager}. Should not be used in other settings
+     * Required by {@link BackupManager}. Should not be used in other settings
      *
      * @param newMakeBackup whether a backup (.bak file) should be made
      */
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 d05d99212a3..c2e0e7e6e1c 100644
--- a/src/main/java/org/jabref/logic/exporter/TemplateExporter.java
+++ b/src/main/java/org/jabref/logic/exporter/TemplateExporter.java
@@ -28,6 +28,8 @@
 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;
@@ -49,7 +51,7 @@ public class TemplateExporter extends Exporter {
     private final String lfFileName;
     private final String directory;
     private final LayoutFormatterPreferences layoutPreferences;
-    private final SaveConfiguration saveConfiguration;
+    private final SelfContainedSaveOrder saveOrder;
     private boolean customExport;
     private BlankLineBehaviour blankLineBehaviour;
 
@@ -76,21 +78,19 @@ public TemplateExporter(String displayName,
      * @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 saveConfiguration   Preferences for saving
      */
     public TemplateExporter(String name,
                             String lfFileName,
                             String extension,
                             LayoutFormatterPreferences layoutPreferences,
-                            SaveConfiguration saveConfiguration) {
+                            SelfContainedSaveOrder saveOrder) {
         this(name,
                 name,
                 lfFileName,
                 null,
                 StandardFileType.fromExtensions(extension),
                 layoutPreferences,
-                saveConfiguration);
+                saveOrder);
     }
 
     /**
@@ -101,8 +101,6 @@ public TemplateExporter(String name,
      * @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 saveConfiguration   Preferences for saving
      */
     public TemplateExporter(String displayName,
                             String consoleName,
@@ -110,16 +108,8 @@ public TemplateExporter(String displayName,
                             String directory,
                             FileType extension,
                             LayoutFormatterPreferences layoutPreferences,
-                            SaveConfiguration saveConfiguration) {
-        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.saveConfiguration = saveConfiguration;
+                            SelfContainedSaveOrder saveOrder) {
+        this(displayName, consoleName, lfFileName, directory, extension, layoutPreferences, saveOrder, null);
     }
 
     /**
@@ -131,7 +121,6 @@ public TemplateExporter(String displayName,
      * @param directory         Directory in which to find the layout file.
      * @param extension         Should contain the . (for instance .txt).
      * @param layoutPreferences Preferences for layout
-     * @param saveConfiguration   Preferences for saving
      * @param blankLineBehaviour how to behave regarding blank lines.
      */
     public TemplateExporter(String displayName,
@@ -140,7 +129,7 @@ public TemplateExporter(String displayName,
                             String directory,
                             FileType extension,
                             LayoutFormatterPreferences layoutPreferences,
-                            SaveConfiguration saveConfiguration,
+                            SelfContainedSaveOrder saveOrder,
                             BlankLineBehaviour blankLineBehaviour) {
         super(consoleName, displayName, extension);
         if (Objects.requireNonNull(lfFileName).endsWith(LAYOUT_EXTENSION)) {
@@ -150,7 +139,7 @@ public TemplateExporter(String displayName,
         }
         this.directory = directory;
         this.layoutPreferences = layoutPreferences;
-        this.saveConfiguration = saveConfiguration;
+        this.saveOrder = saveOrder == null ? SaveOrder.getDefaultSaveOrder() : saveOrder;
         this.blankLineBehaviour = blankLineBehaviour;
     }
 
@@ -247,12 +236,9 @@ 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, saveConfiguration);
+            List<BibEntry> sorted = BibDatabaseWriter.getSortedEntries(entries, saveOrder);
 
             // Load default layout
             Layout defLayout;
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/importer/AuthorListParser.java b/src/main/java/org/jabref/logic/importer/AuthorListParser.java
index 57bc5d2e3f0..08a4028c458 100644
--- a/src/main/java/org/jabref/logic/importer/AuthorListParser.java
+++ b/src/main/java/org/jabref/logic/importer/AuthorListParser.java
@@ -129,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
diff --git a/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java b/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java
index 0185a43ea56..83d939a3085 100644
--- a/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java
@@ -5,7 +5,6 @@
 
 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;
@@ -32,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());
         }
diff --git a/src/main/java/org/jabref/logic/importer/FetcherClientException.java b/src/main/java/org/jabref/logic/importer/FetcherClientException.java
index 8f74e23871e..ada85e02903 100644
--- a/src/main/java/org/jabref/logic/importer/FetcherClientException.java
+++ b/src/main/java/org/jabref/logic/importer/FetcherClientException.java
@@ -4,11 +4,17 @@
  * 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/ImporterPreferences.java b/src/main/java/org/jabref/logic/importer/ImporterPreferences.java
index a1b56c26b85..5923680af9e 100644
--- a/src/main/java/org/jabref/logic/importer/ImporterPreferences.java
+++ b/src/main/java/org/jabref/logic/importer/ImporterPreferences.java
@@ -15,22 +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> customImporters;
+    private final BooleanProperty persistCustomKeys;
 
-    public ImporterPreferences(boolean generateNewKeyOnImport,
+    public ImporterPreferences(boolean importerEnabled,
+                               boolean generateNewKeyOnImport,
                                Path importWorkingDirectory,
                                boolean warnAboutDuplicatesOnImport,
                                Set<CustomImporter> customImporters,
-                               Set<FetcherApiKey> apiKeys) {
+                               Set<FetcherApiKey> apiKeys,
+                               boolean persistCustomKeys) {
+        this.importerEnabled = new SimpleBooleanProperty(importerEnabled);
         this.generateNewKeyOnImport = new SimpleBooleanProperty(generateNewKeyOnImport);
         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() {
@@ -81,4 +99,16 @@ 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 6aaf9d67730..918eacd3a13 100644
--- a/src/main/java/org/jabref/logic/importer/WebFetchers.java
+++ b/src/main/java/org/jabref/logic/importer/WebFetchers.java
@@ -15,7 +15,6 @@
 import org.jabref.logic.importer.fetcher.BiodiversityLibrary;
 import org.jabref.logic.importer.fetcher.BvbFetcher;
 import org.jabref.logic.importer.fetcher.CiteSeer;
-import org.jabref.logic.importer.fetcher.CollectionOfComputerScienceBibliographiesFetcher;
 import org.jabref.logic.importer.fetcher.CompositeSearchBasedFetcher;
 import org.jabref.logic.importer.fetcher.CrossRef;
 import org.jabref.logic.importer.fetcher.CustomizableKeyFetcher;
@@ -42,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;
@@ -66,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);
@@ -100,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));
@@ -111,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());
@@ -132,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));
@@ -161,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());
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 b5053290b6a..b3abf1fd699 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/ArXivFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/ArXivFetcher.java
@@ -392,7 +392,7 @@ public String getIdentifierName() {
      */
     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";
 
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/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/MathSciNet.java b/src/main/java/org/jabref/logic/importer/fetcher/MathSciNet.java
index a44348a90ac..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;
@@ -30,15 +29,22 @@
 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.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) {
@@ -51,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
@@ -62,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);
-            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;
         };
@@ -124,3 +138,4 @@ public void doPostCleanup(BibEntry entry) {
         entry.setCommentsBeforeEntry("");
     }
 }
+
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/isbntobibtex/IsbnFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/isbntobibtex/IsbnFetcher.java
index 04062621325..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
@@ -14,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;
@@ -35,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
@@ -54,15 +58,14 @@ 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()) {
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/MarcXmlParser.java b/src/main/java/org/jabref/logic/importer/fileformat/MarcXmlParser.java
index da60ad1fdfa..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;
@@ -99,6 +100,9 @@ private BibEntry parseEntry(Element element) {
                 putIsbn(bibEntry, datafield);
             } else if ("100".equals(tag) || "700".equals(tag) || "710".equals(tag)) {
                 putPersonalName(bibEntry, datafield); // Author, Editor, Publisher
+            } 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 ("250".equals(tag)) {
@@ -109,10 +113,14 @@ private BibEntry parseEntry(Element element) {
                 putPhysicalDescription(bibEntry, datafield);
             } else if ("490".equals(tag) || "830".equals(tag)) {
                 putSeries(bibEntry, datafield);
+            } else if ("502".equals(tag)) {
+                putThesisDescription(bibEntry, datafield); // Master's thesis, PhD thesis, Thesis
             } else if ("520".equals(tag)) {
                 putSummary(bibEntry, datafield);
             } else if ("653".equals(tag)) {
                 putKeywords(bibEntry, datafield);
+            } else if ("773".equals(tag)) {
+                putIssue(bibEntry, datafield);
             } else if ("856".equals(tag)) {
                 putElectronicLocation(bibEntry, datafield);
             } else if ("966".equals(tag)) {
@@ -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;
     }
 
@@ -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);
@@ -251,7 +258,7 @@ private void putPublication(BibEntry bibEntry, Element 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,6 +308,20 @@ 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);
 
@@ -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);
@@ -406,9 +452,16 @@ private String getSubfield(String a, Element datafield) {
                 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 83427db651a..741f758d0e6 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/MedlineImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/MedlineImporter.java
@@ -1208,7 +1208,7 @@ private void parseAuthor(XMLStreamReader reader, List<String> authorNames) throw
             }
         }
 
-        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/PdfMergeMetadataImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/PdfMergeMetadataImporter.java
index c08ec05e53c..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) {
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 ba488552613..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,7 +445,7 @@ private String getSubfield(String a, Element datafield) {
         List<Element> liste = getChildren("subfield", datafield);
 
         for (Element subfield : liste) {
-            if (subfield.getAttribute("code").equals(a)) {
+            if (subfield.getAttribute("code").equalsIgnoreCase(a)) {
                 return subfield.getTextContent();
             }
         }
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 57c66e12889..b5b733f7973 100644
--- a/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java
+++ b/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java
@@ -120,7 +120,7 @@ public MetaData parse(MetaData metaData, Map<String, String> data, Character key
                     metaData.markAsNotProtected();
                 }
             } else if (entry.getKey().equals(MetaData.SAVE_ORDER_CONFIG)) {
-                metaData.setSaveOrderConfig(SaveOrder.parse(values));
+                metaData.setSaveOrder(SaveOrder.parse(values));
             } else if (entry.getKey().equals(MetaData.GROUPSTREE) || entry.getKey().equals(MetaData.GROUPSTREE_LEGACY)) {
                 metaData.setGroups(GroupsParser.importGroups(values, keywordSeparator, fileMonitor, metaData));
             } else if (entry.getKey().equals(MetaData.VERSION_DB_STRUCT)) {
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 e8d41389d6b..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"),
diff --git a/src/main/java/org/jabref/logic/l10n/Localization.java b/src/main/java/org/jabref/logic/l10n/Localization.java
index dc2dbe80a99..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);
         }
     }
@@ -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/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/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/openoffice/style/OOBibStyleGetCitationMarker.java b/src/main/java/org/jabref/logic/openoffice/style/OOBibStyleGetCitationMarker.java
index b3680b57b9b..278b05d9595 100644
--- a/src/main/java/org/jabref/logic/openoffice/style/OOBibStyleGetCitationMarker.java
+++ b/src/main/java/org/jabref/logic/openoffice/style/OOBibStyleGetCitationMarker.java
@@ -230,7 +230,7 @@ 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();
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 f5dfac6c94f..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
@@ -154,7 +154,7 @@ private void addContentIfNotEmpty(PDDocument pdfDocument, Document newDocument,
         }
         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) {
+        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/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/util/OS.java b/src/main/java/org/jabref/logic/util/OS.java
index 96ee5730712..6c951ce4aa6 100644
--- a/src/main/java/org/jabref/logic/util/OS.java
+++ b/src/main/java/org/jabref/logic/util/OS.java
@@ -8,6 +8,11 @@
 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
  *
@@ -42,4 +47,24 @@ public static NativeDesktop getNativeDesktop() {
         }
         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/io/BackupFileUtil.java b/src/main/java/org/jabref/logic/util/io/BackupFileUtil.java
index 0e499b5c51e..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,6 +9,7 @@
 import java.util.HexFormat;
 import java.util.Optional;
 
+import org.jabref.gui.autosaveandbackup.BackupManager;
 import org.jabref.logic.util.BackupFileType;
 
 import org.slf4j.Logger;
@@ -33,7 +34,7 @@ private BackupFileUtil() {
      *     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>
      */
diff --git a/src/main/java/org/jabref/logic/xmp/XmpUtilWriter.java b/src/main/java/org/jabref/logic/xmp/XmpUtilWriter.java
index d8f3728b474..023d2a66954 100644
--- a/src/main/java/org/jabref/logic/xmp/XmpUtilWriter.java
+++ b/src/main/java/org/jabref/logic/xmp/XmpUtilWriter.java
@@ -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 7a43a4a5e43..b9a1d6efae3 100644
--- a/src/main/java/org/jabref/migrations/PreferencesMigrations.java
+++ b/src/main/java/org/jabref/migrations/PreferencesMigrations.java
@@ -22,6 +22,7 @@
 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;
@@ -43,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);
@@ -51,7 +52,7 @@ 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);
         upgradePreviewStyle(preferences);
@@ -89,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);
         }
@@ -169,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.getLibraryPreferences().getDefaultBibDatabaseMode());
+                CustomEntryTypePreferenceMigration.upgradeStoredBibEntryTypes(
+                        prefs.getLibraryPreferences().getDefaultBibDatabaseMode(),
+                        prefs,
+                        entryTypesManager);
             }
         } catch (BackingStoreException ex) {
             LOGGER.error("Migrating old custom entry types failed.", ex);
@@ -527,7 +531,7 @@ static void moveApiKeysToKeyring(JabRefPreferences preferences) {
         List<String> names = preferences.getStringList(V5_9_FETCHER_CUSTOM_KEY_NAMES);
         List<String> keys = preferences.getStringList(V5_9_FETCHER_CUSTOM_KEYS);
 
-        if (keys.size() > 0 && names.size() == keys.size()) {
+        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(
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/AuthorList.java b/src/main/java/org/jabref/model/entry/AuthorList.java
index bd56f560bf5..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;
 
diff --git a/src/main/java/org/jabref/model/entry/BibEntry.java b/src/main/java/org/jabref/model/entry/BibEntry.java
index 3f6b82ae6b4..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;
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/field/FieldFactory.java b/src/main/java/org/jabref/model/entry/field/FieldFactory.java
index cac6bb3b2c7..645a1295221 100644
--- a/src/main/java/org/jabref/model/entry/field/FieldFactory.java
+++ b/src/main/java/org/jabref/model/entry/field/FieldFactory.java
@@ -31,7 +31,7 @@ public static String serializeOrFields(Field... fields) {
     }
 
     public static String serializeOrFields(OrFields fields) {
-        return fields.stream()
+        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
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/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/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 a8ddc4b3d74..faf537a59ef 100644
--- a/src/main/java/org/jabref/model/metadata/MetaData.java
+++ b/src/main/java/org/jabref/model/metadata/MetaData.java
@@ -81,11 +81,11 @@ public MetaData() {
         // Do nothing
     }
 
-    public Optional<SaveOrder> getSaveOrderConfig() {
+    public Optional<SaveOrder> getSaveOrder() {
         return Optional.ofNullable(saveOrder);
     }
 
-    public void setSaveOrderConfig(SaveOrder saveOrder) {
+    public void setSaveOrder(SaveOrder saveOrder) {
         this.saveOrder = saveOrder;
         postChange();
     }
@@ -270,7 +270,7 @@ public void clearSaveActions() {
         postChange();
     }
 
-    public void clearSaveOrderConfig() {
+    public void clearSaveOrder() {
         saveOrder = null;
         postChange();
     }
diff --git a/src/main/java/org/jabref/model/metadata/SaveOrder.java b/src/main/java/org/jabref/model/metadata/SaveOrder.java
index 499d9f5d161..8186a2514c3 100644
--- a/src/main/java/org/jabref/model/metadata/SaveOrder.java
+++ b/src/main/java/org/jabref/model/metadata/SaveOrder.java
@@ -11,51 +11,26 @@
 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 SaveOrder {
 
-    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;
-        }
-    }
-
     private static final Logger LOGGER = LoggerFactory.getLogger(SaveOrder.class);
 
-    private final List<SortCriterion> sortCriteria = new ArrayList<>();
-    private OrderType orderType;
-
-    private SaveOrder() {
-    }
+    private final OrderType orderType;
+    private final List<SortCriterion> sortCriteria;
 
     public SaveOrder(OrderType orderType, List<SortCriterion> sortCriteria) {
         this.orderType = orderType;
-        this.sortCriteria.addAll(sortCriteria);
+        this.sortCriteria = sortCriteria;
     }
 
     private SaveOrder(List<String> data) {
@@ -65,32 +40,35 @@ private SaveOrder(List<String> data) {
             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 SaveOrder parse(List<String> orderedData) {
         return new SaveOrder(orderedData);
     }
 
-    public static SaveOrder getDefaultSaveOrder() {
-        SaveOrder standard = new SaveOrder();
-        standard.orderType = OrderType.ORIGINAL;
-        return standard;
+    public static SelfContainedSaveOrder getDefaultSaveOrder() {
+        return new SelfContainedSaveOrder(OrderType.ORIGINAL, List.of());
     }
 
     public OrderType getOrderType() {
@@ -130,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());
@@ -146,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"
          */
@@ -165,9 +145,6 @@ public SortCriterion(Field field, boolean descending) {
             this.descending = descending;
         }
 
-        public SortCriterion() {
-        }
-
         @Override
         public String toString() {
             return "SortCriterion{" + "field='" + field + '\'' +
@@ -193,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/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/InternalPreferences.java b/src/main/java/org/jabref/preferences/InternalPreferences.java
index f7996473c5c..0276dc88ca0 100644
--- a/src/main/java/org/jabref/preferences/InternalPreferences.java
+++ b/src/main/java/org/jabref/preferences/InternalPreferences.java
@@ -14,15 +14,18 @@
 public class InternalPreferences {
 
     private final ObjectProperty<Version> ignoredVersion;
+    private final BooleanProperty versionCheckEnabled;
     private final ObjectProperty<Path> lastPreferencesExportPath;
     private final StringProperty userAndHost;
     private final BooleanProperty memoryStickMode;
 
     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.userAndHost = new SimpleStringProperty(userAndHost);
         this.memoryStickMode = new SimpleBooleanProperty(memoryStickMode);
@@ -40,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();
     }
diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java
index f97680c67d7..46f2aab1c96 100644
--- a/src/main/java/org/jabref/preferences/JabRefPreferences.java
+++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java
@@ -65,8 +65,9 @@
 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.SaveConfiguration;
+import org.jabref.logic.exporter.SelfContainedSaveConfiguration;
 import org.jabref.logic.exporter.TemplateExporter;
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.ImporterPreferences;
@@ -111,6 +112,7 @@
 import org.jabref.model.entry.types.EntryTypeFactory;
 import org.jabref.model.groups.GroupHierarchyType;
 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;
 
@@ -141,6 +143,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.
@@ -157,6 +160,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";
@@ -262,11 +266,15 @@ 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";
@@ -330,6 +338,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";
 
@@ -363,6 +372,7 @@ public class JabRefPreferences implements PreferencesService {
     // 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";
@@ -495,14 +505,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(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");
@@ -553,6 +567,7 @@ private JabRefPreferences() {
         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"
@@ -575,7 +590,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());
 
@@ -655,6 +670,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_KEY_PERSIST, Boolean.FALSE);
 
         defaults.put(USE_OWNER, Boolean.FALSE);
         defaults.put(OVERWRITE_OWNER, Boolean.FALSE);
@@ -738,6 +754,7 @@ private JabRefPreferences() {
 
         // version check defaults
         defaults.put(VERSION_IGNORED_UPDATE, "");
+        defaults.put(VERSION_CHECK_ENABLED, Boolean.TRUE);
 
         // preview
         defaults.put(CYCLE_PREVIEW, "Preview;" + CitationStyle.DEFAULT);
@@ -1411,25 +1428,25 @@ public EntryEditorPreferences getEntryEditorPreferences() {
                 getDefaultEntryEditorTabs(),
                 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),
-                getBoolean(AUTOLINK_FILES_ENABLED));
+                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.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()));
         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;
     }
@@ -1722,6 +1739,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),
@@ -1753,6 +1771,8 @@ private void storePushToApplicationPath(Map<String, String> commandPair) {
                         put(PUSH_VIM, value);
                 case PushToApplications.WIN_EDT ->
                         put(PUSH_WINEDT_PATH, value);
+                case PushToApplications.SUBLIME_TEXT ->
+                        put(PUSH_SUBLIME_TEXT_PATH, value);
             }
         });
     }
@@ -2009,12 +2029,15 @@ public InternalPreferences getInternalPreferences() {
 
         internalPreferences = new InternalPreferences(
                 Version.parse(get(VERSION_IGNORED_UPDATE)),
+                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
@@ -2234,37 +2257,33 @@ private void storeExportSaveOrder(SaveOrder saveOrder) {
         putBoolean(EXPORT_TERTIARY_SORT_DESCENDING, saveOrder.getSortCriteria().get(2).descending);
     }
 
-    private SaveOrder getTableSaveOrder() {
+    /**
+     * For the export configuration, generates the SelfContainedSaveOrder having the reference to TABLE resolved.
+     */
+    public SelfContainedSaveOrder getSelfContainedTableSaveOrder() {
         List<MainTableColumnModel> sortOrder = mainTableColumnPreferences.getColumnSortOrder();
-        List<SaveOrder.SortCriterion> criteria = new ArrayList<>();
-
-        for (var column : sortOrder) {
-            boolean descending = column.getSortType() == SortType.DESCENDING;
-            criteria.add(new SaveOrder.SortCriterion(
-                    FieldFactory.parseField(column.getQualifier()),
-                    descending));
-        }
-
-        return new SaveOrder(SaveOrder.OrderType.TABLE, criteria);
+        return new SelfContainedSaveOrder(
+                SaveOrder.OrderType.SPECIFIED,
+                sortOrder.stream().flatMap(model -> model.getSortCriteria().stream()).toList());
     }
 
     @Override
-    public SaveConfiguration getExportConfiguration() {
-        SaveOrder saveOrder = switch (getExportSaveOrder().getOrderType()) {
-            case TABLE -> this.getTableSaveOrder();
-            case SPECIFIED -> this.getExportSaveOrder();
+    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 SaveConfiguration()
-                .withSaveOrder(saveOrder)
-                .withMetadataSaveOrder(false)
-                .withReformatOnSave(getLibraryPreferences().shouldAlwaysReformatOnSave());
+        return new SelfContainedSaveConfiguration(
+                saveOrder, false, BibDatabaseWriter.SaveType.WITH_JABREF_META_DATA, getLibraryPreferences()
+                .shouldAlwaysReformatOnSave());
     }
 
     private List<TemplateExporter> getCustomExportFormats() {
         LayoutFormatterPreferences layoutPreferences = getLayoutFormatterPreferences();
-        SaveConfiguration saveConfiguration = getExportConfiguration();
+        SelfContainedSaveConfiguration saveConfiguration = getSelfContainedExportConfiguration();
         List<TemplateExporter> formats = new ArrayList<>();
 
         for (String toImport : getSeries(CUSTOM_EXPORT_FORMAT)) {
@@ -2274,7 +2293,7 @@ private List<TemplateExporter> getCustomExportFormats() {
                     formatData.get(EXPORTER_FILENAME_INDEX),
                     formatData.get(EXPORTER_EXTENSION_INDEX),
                     layoutPreferences,
-                    saveConfiguration);
+                    saveConfiguration.getSelfContainedSaveOrder());
             format.setCustomExport(true);
             formats.add(format);
         }
@@ -2511,6 +2530,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(),
@@ -2527,6 +2547,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);
@@ -2759,16 +2780,19 @@ 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.getCustomImporters().addListener((InvalidationListener) c -> storeCustomImportFormats(importerPreferences.getCustomImporters()));
 
@@ -2833,7 +2857,7 @@ private List<String> getFetcherKeysFromKeyring(List<String> names) {
                             getInternalPreferences().getUserAndHost())
                             .decrypt());
                 } catch (PasswordAccessException ex) {
-                    LOGGER.warn("No api key stored for {} fetcher", fetcher);
+                    LOGGER.debug("No api key stored for {} fetcher", fetcher);
                     keys.add("");
                 }
             }
@@ -2857,7 +2881,12 @@ private void storeFetcherKeys(Set<FetcherApiKey> fetcherApiKeys) {
 
         putStringList(FETCHER_CUSTOM_KEY_NAMES, names);
         putStringList(FETCHER_CUSTOM_KEY_USES, uses);
-        storeFetcherKeysToKeyring(names, keys);
+
+        if (getBoolean(FETCHER_CUSTOM_KEY_PERSIST)) {
+            storeFetcherKeysToKeyring(names, keys);
+        } else {
+            clearCustomFetcherKeys();
+        }
     }
 
     private void storeFetcherKeysToKeyring(List<String> names, List<String> keys) {
@@ -2910,7 +2939,7 @@ public GrobidPreferences getGrobidPreferences() {
         return grobidPreferences;
     }
 
-@Override
+    @Override
     public ImportFormatPreferences getImportFormatPreferences() {
         return new ImportFormatPreferences(
                 getBibEntryPreferences(),
diff --git a/src/main/java/org/jabref/preferences/PreferencesService.java b/src/main/java/org/jabref/preferences/PreferencesService.java
index 0150a4314d2..554bcf67d71 100644
--- a/src/main/java/org/jabref/preferences/PreferencesService.java
+++ b/src/main/java/org/jabref/preferences/PreferencesService.java
@@ -15,7 +15,7 @@
 import org.jabref.logic.JabRefException;
 import org.jabref.logic.bibtex.FieldPreferences;
 import org.jabref.logic.citationkeypattern.CitationKeyPatternPreferences;
-import org.jabref.logic.exporter.SaveConfiguration;
+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;
@@ -70,7 +70,10 @@ public interface PreferencesService {
 
     ImportFormatPreferences getImportFormatPreferences();
 
-    SaveConfiguration getExportConfiguration();
+    /**
+     * Returns the export configuration. The contained SaveConfiguration is a {@link org.jabref.model.metadata.SelfContainedSaveOrder}
+     */
+    SelfContainedSaveConfiguration getSelfContainedExportConfiguration();
 
     BibEntryTypesManager getCustomEntryTypesRepository();
 
diff --git a/src/main/resources/csl-styles/apa.csl b/src/main/resources/csl-styles/apa.csl
index 0d11d0702e8..772c25e3345 100644
--- a/src/main/resources/csl-styles/apa.csl
+++ b/src/main/resources/csl-styles/apa.csl
@@ -35,298 +35,88 @@
       <term name="circa" form="short">ca.</term>
       <term name="bc"> B.C.E.</term>
       <term name="ad"> C.E.</term>
-      <term name="letter">personal communication</term>
-      <term name="letter" form="short">letter</term>
       <term name="issue" form="long">
         <single>issue</single>
         <multiple>issues</multiple>
       </term>
-    </terms>
-  </locale>
-  <locale xml:lang="af">
-    <terms>
-      <term name="letter">persoonlike kommunikasie</term>
-      <term name="letter" form="short">brief</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ar">
-    <terms>
-      <term name="letter">اتصال شخصي</term>
-      <term name="letter" form="short">خطاب</term>
-    </terms>
-  </locale>
-  <locale xml:lang="bg">
-    <terms>
-      <term name="letter">лична комуникация</term>
-      <term name="letter" form="short">писмо</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ca">
-    <terms>
-      <term name="letter">comunicació personal</term>
-      <term name="letter" form="short">carta</term>
-    </terms>
-  </locale>
-  <locale xml:lang="cs">
-    <terms>
-      <term name="letter">osobní komunikace</term>
-      <term name="letter" form="short">dopis</term>
-    </terms>
-  </locale>
-  <locale xml:lang="cy">
-    <terms>
-      <term name="letter">cyfathrebu personol</term>
-      <term name="letter" form="short">llythyr</term>
+      <term name="software">computer software</term>
     </terms>
   </locale>
   <locale xml:lang="da">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikation</term>
-      <term name="letter" form="short">brev</term>
     </terms>
   </locale>
   <locale xml:lang="de">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">persönliche Kommunikation</term>
-      <term name="letter" form="short">Brief</term>
-    </terms>
-  </locale>
-  <locale xml:lang="el">
-    <terms>
-      <term name="letter">προσωπική επικοινωνία</term>
-      <term name="letter" form="short">επιστολή</term>
     </terms>
   </locale>
   <locale xml:lang="es">
     <terms>
       <term name="from">de</term>
-      <term name="letter">comunicación personal</term>
-      <term name="letter" form="short">carta</term>
-    </terms>
-  </locale>
-  <locale xml:lang="et">
-    <terms>
-      <term name="letter">isiklik suhtlus</term>
-      <term name="letter" form="short">kiri</term>
-    </terms>
-  </locale>
-  <locale xml:lang="eu">
-    <terms>
-      <term name="letter">komunikazio pertsonala</term>
-      <term name="letter" form="short">gutuna</term>
-    </terms>
-  </locale>
-  <locale xml:lang="fa">
-    <terms>
-      <term name="letter">ارتباط شخصی</term>
-      <term name="letter" form="short">نامه</term>
-    </terms>
-  </locale>
-  <locale xml:lang="fi">
-    <terms>
-      <term name="letter">henkilökohtainen viestintä</term>
-      <term name="letter" form="short">kirje</term>
     </terms>
   </locale>
   <locale xml:lang="fr">
     <terms>
-      <term name="letter">communication personnelle</term>
-      <term name="letter" form="short">lettre</term>
       <term name="editor" form="short">
         <single>éd.</single>
         <multiple>éds.</multiple>
       </term>
     </terms>
   </locale>
-  <locale xml:lang="he">
-    <terms>
-      <term name="letter">תקשורת אישית</term>
-      <term name="letter" form="short">מכתב</term>
-    </terms>
-  </locale>
-  <locale xml:lang="hr">
-    <terms>
-      <term name="letter">osobna komunikacija</term>
-      <term name="letter" form="short">pismo</term>
-    </terms>
-  </locale>
-  <locale xml:lang="hu">
-    <terms>
-      <term name="letter">személyes kommunikáció</term>
-      <term name="letter" form="short">levél</term>
-    </terms>
-  </locale>
-  <locale xml:lang="id">
-    <terms>
-      <term name="letter">komunikasi pribadi</term>
-      <term name="letter" form="short">surat</term>
-    </terms>
-  </locale>
-  <locale xml:lang="is">
-    <terms>
-      <term name="letter">persónuleg samskipti</term>
-      <term name="letter" form="short">bréf</term>
-    </terms>
-  </locale>
-  <locale xml:lang="it">
-    <terms>
-      <term name="letter">comunicazione personale</term>
-      <term name="letter" form="short">lettera</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ja">
-    <terms>
-      <term name="letter">個人的なやり取り</term>
-      <term name="letter" form="short">手紙</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ko">
-    <terms>
-      <term name="letter">개인 서신</term>
-      <term name="letter" form="short">편지</term>
-    </terms>
-  </locale>
-  <locale xml:lang="la">
-    <terms>
-      <term name="letter"/>
-      <term name="letter" form="short">epistula</term>
-    </terms>
-  </locale>
-  <locale xml:lang="lt">
-    <terms>
-      <term name="letter">communicationis personalis</term>
-      <term name="letter" form="short"/>
-    </terms>
-  </locale>
-  <locale xml:lang="lv">
-    <terms>
-      <term name="letter">personīga komunikācija</term>
-      <term name="letter" form="short">vēstule</term>
-    </terms>
-  </locale>
-  <locale xml:lang="mn">
-    <terms>
-      <term name="letter">хувийн харилцаа холбоо</term>
-      <term name="letter" form="short">захиа</term>
-    </terms>
-  </locale>
   <locale xml:lang="nb">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikasjon</term>
-      <term name="letter" form="short">brev</term>
     </terms>
   </locale>
   <locale xml:lang="nl">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">persoonlijke communicatie</term>
-      <term name="letter" form="short">brief</term>
     </terms>
   </locale>
   <locale xml:lang="nn">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikasjon</term>
-      <term name="letter" form="short">brev</term>
-    </terms>
-  </locale>
-  <locale xml:lang="pl">
-    <terms>
-      <term name="letter">osobista komunikacja</term>
-      <term name="letter" form="short">list</term>
-    </terms>
-  </locale>
-  <locale xml:lang="pt">
-    <terms>
-      <term name="letter">comunicação pessoal</term>
-      <term name="letter" form="short">carta</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ro">
-    <terms>
-      <term name="letter">comunicare personală</term>
-      <term name="letter" form="short">scrisoare</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ru">
-    <terms>
-      <term name="letter">личная переписка</term>
-      <term name="letter" form="short">письмо</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sk">
-    <terms>
-      <term name="letter">osobná komunikácia</term>
-      <term name="letter" form="short">list</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sl">
-    <terms>
-      <term name="letter">osebna komunikacija</term>
-      <term name="letter" form="short">pismo</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sr">
-    <terms>
-      <term name="letter">лична комуникација</term>
-      <term name="letter" form="short">писмо</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sv">
-    <terms>
-      <term name="letter">personlig kommunikation</term>
-      <term name="letter" form="short">brev</term>
-    </terms>
-  </locale>
-  <locale xml:lang="th">
-    <terms>
-      <term name="letter">การสื่อสารส่วนบุคคล</term>
-      <term name="letter" form="short">จดหมาย</term>
-    </terms>
-  </locale>
-  <locale xml:lang="tr">
-    <terms>
-      <term name="letter">kişisel iletişim</term>
-      <term name="letter" form="short">mektup</term>
-    </terms>
-  </locale>
-  <locale xml:lang="uk">
-    <terms>
-      <term name="letter">особисте спілкування</term>
-      <term name="letter" form="short">лист</term>
-    </terms>
-  </locale>
-  <locale xml:lang="vi">
-    <terms>
-      <term name="letter">giao tiếp cá nhân</term>
-      <term name="letter" form="short">thư</term>
-    </terms>
-  </locale>
-  <locale xml:lang="zh-CN">
-    <terms>
-      <term name="letter">的私人交流</term>
-      <term name="letter" form="short">信函</term>
-    </terms>
-  </locale>
-  <locale xml:lang="zh-TW">
-    <terms>
-      <term name="letter">私人通訊</term>
-      <term name="letter" form="short">信函</term>
     </terms>
   </locale>
+  <!-- TODO: New types: classic collection document event hearing performance periodical regulation -software- standard -->
+  <!-- TODO: New creator roles: chair compiler contributor curator executive-producer guest host narrator organizer performer producer script-writer series-creator -->
+  <!-- TODO: New variables:
+         available-date submitted
+         part-number printing-number supplement-number
+         part-title volume-title
+         archive_collection
+         division jurisdiction
+         event-title
+         language
+         license
+         reviewed-genre
+  -->
+  <!-- TODO: New terms:
+         advance-online-publication
+         album on audio-recording
+         original-work-published
+         personal-communication
+         preprint
+         review-of
+         item types
+  -->
+  <!-- TODO: Check Indigeneous Knowledge format -->
   <!-- General categories of item types:
        Periodical: article-journal article-magazine article-newspaper post-weblog review review-book
        Periodical or Booklike: paper-conference
-       Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure
+       Booklike: article book broadcast chapter classic collection dataset document
+                 entry entry-dictionary entry-encyclopedia event figure
                  graphic interview manuscript map motion_picture musical_score pamphlet patent
-                 personal_communication report song speech thesis post webpage
-       Legal: bill legal_case legislation treaty
+                 performance periodical personal_communication post report
+                 software song speech standard thesis webpage
+       Legal: bill hearing legal_case legislation regulation treaty
   -->
   <!-- APA references contain four parts: author, date, title, source -->
   <macro name="author-bib">
+    <!-- TODO: New creator roles (media, contributor) -->
+    <!-- TODO: Add new item types -->
     <names variable="composer" delimiter=", ">
       <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
       <substitute>
@@ -355,7 +145,7 @@
             </choose>
           </if>
         </choose>
-        <!-- Test for editortranslator and put that first as that becomes available -->
+        <!-- TODO: Test for editortranslator and put that first as that becomes available -->
         <names variable="editor" delimiter=", ">
           <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
           <label form="short" prefix=" (" suffix=")" text-case="title"/>
@@ -383,6 +173,8 @@
     </names>
   </macro>
   <macro name="author-intext">
+    <!-- TODO: New creator roles -->
+    <!-- TODO: Add new item types -->
     <choose>
       <if type="bill legal_case legislation treaty" match="any">
         <text macro="title-intext"/>
@@ -399,8 +191,7 @@
                   <text macro="title-intext"/>
                 </substitute>
               </names>
-              <!-- Replace with term="personal-communication" if that becomes available -->
-              <text term="letter"/>
+              <text term="personal-communication"/>
             </group>
           </if>
           <else>
@@ -438,6 +229,7 @@
     </choose>
   </macro>
   <macro name="date-bib">
+    <!-- TODO: Add new item types -->
     <group delimiter=" " prefix="(" suffix=")">
       <choose>
         <if is-uncertain-date="issued">
@@ -476,6 +268,7 @@
           </if>
           <else-if variable="status">
             <group>
+              <!-- TODO: Should I print status as-is, or should I print the in-press term? -->
               <text variable="status" text-case="lowercase"/>
               <text variable="year-suffix" prefix="-"/>
             </group>
@@ -503,6 +296,7 @@
     </choose>
   </macro>
   <macro name="date-intext">
+    <!-- TODO: Add new item types -->
     <choose>
       <if variable="issued">
         <group delimiter="/">
@@ -550,6 +344,7 @@
         </group>
       </if>
       <else-if variable="status">
+        <!-- TODO: Should I print status as-is, or should I print the in-press term? -->
         <text variable="status" text-case="lowercase"/>
         <text variable="year-suffix" prefix="-"/>
       </else-if>
@@ -579,6 +374,7 @@
     </choose>
   </macro>
   <macro name="title">
+    <!-- TODO: Add new item types -->
     <choose>
       <if type="post webpage" match="any">
         <!-- Webpages are always italicized -->
@@ -600,7 +396,7 @@
               <if variable="collection-editor editor editorial-director" match="any">
                 <group delimiter=": " font-style="italic">
                   <text variable="title"/>
-                  <!-- Replace with volume-title as that becomes available -->
+                  <!-- TODO: Replace with volume-title -->
                   <choose>
                     <if is-numeric="volume" match="none">
                       <group delimiter=" ">
@@ -619,7 +415,7 @@
           <else>
             <group delimiter=": " font-style="italic">
               <text variable="title"/>
-              <!-- Replace with volume-title as that becomes available -->
+              <!-- TODO: Replace with volume-title -->
               <choose>
                 <if is-numeric="volume" match="none">
                   <group delimiter=" ">
@@ -635,27 +431,28 @@
     </choose>
   </macro>
   <macro name="title-intext">
+    <!-- TODO: Add new item types -->
     <choose>
       <if variable="title" match="none">
         <text macro="bracketed-intext" prefix="[" suffix="]"/>
       </if>
+      <else-if type="hearing">
+        <!-- Hearings are italicized -->
+        <text variable="title" form="short" font-style="italic" text-case="title"/>
+      </else-if>
       <else-if type="bill">
-        <!-- If a bill has no number or container-title, assume it is a hearing; italic -->
+        <!-- Bills are not italicized and substitute bill number if no title. -->
         <choose>
-          <if variable="number container-title" match="none">
-            <text variable="title" form="short" font-style="italic" text-case="title"/>
-          </if>
-          <else-if variable="title">
+          <if variable="title">
             <text variable="title" form="short" text-case="title"/>
-          </else-if>
+          </if>
           <else>
             <group delimiter=" ">
               <text variable="genre"/>
               <group delimiter=" ">
                 <choose>
                   <if variable="chapter-number container-title" match="none">
-                    <!-- Replace with label variable="number" as that becomes available -->
-                    <text term="issue" form="short"/>
+                    <label variable="number" form="short"/>
                   </if>
                 </choose>
                 <text variable="number"/>
@@ -686,6 +483,7 @@
     </choose>
   </macro>
   <macro name="parenthetical">
+    <!-- TODO: Add new item types -->
     <!-- (Secondary contributors; Database location; Genre no. 123; Report Series 123, Version, Edition, Volume, Page) -->
     <group prefix="(" suffix=")">
       <choose>
@@ -698,13 +496,11 @@
                 <text variable="genre" text-case="capitalize-first"/>
               </if>
               <else>
-                <!-- This should be localized -->
-                <text value="patent" text-case="capitalize-first"/>
+                <text term="patent" text-case="capitalize-first"/>
               </else>
             </choose>
             <group delimiter=" ">
-              <!-- Replace with label variable="number" if that becomes available -->
-              <text term="issue" form="short" text-case="capitalize-first"/>
+              <label variable="number" form="short" text-case="capitalize-first"/>
               <text variable="number"/>
             </group>
           </group>
@@ -741,6 +537,7 @@
     </group>
   </macro>
   <macro name="parenthetical-container">
+    <!-- TODO: Add new item types -->
     <choose>
       <if variable="container-title" match="any">
         <group prefix="(" suffix=")">
@@ -759,6 +556,7 @@
     </choose>
   </macro>
   <macro name="bracketed">
+    <!-- TODO: Add new item types -->
     <!-- [Descriptive information] -->
     <!-- If there is a number, genre is already printed in macro="number" -->
     <group prefix="[" suffix="]">
@@ -779,7 +577,9 @@
                         <text variable="medium" text-case="capitalize-first"/>
                       </else-if>
                       <else>
-                        <!-- Replace with term="review" as that becomes available -->
+                        <!-- TODO: Replace with term="review" -->
+                        <!-- TODO: Handle review vs review-of depending on presence of reviewed-title -->
+                        <!-- TODO: Add reviewed-genre -->
                         <text value="Review of"/>
                       </else>
                     </choose>
@@ -790,7 +590,9 @@
                         <text variable="medium" text-case="capitalize-first"/>
                       </if>
                       <else>
-                        <!-- Replace with term="review" as that becomes available -->
+                        <!-- TODO: Replace with term="review" -->
+                        <!-- TODO: Handle review vs review-of depending on presence of reviewed-title -->
+                        <!-- TODO: Add reviewed-genre -->
                         <text value="Review of"/>
                       </else>
                     </choose>
@@ -882,7 +684,7 @@
                           <text variable="medium" text-case="capitalize-first"/>
                         </else-if>
                         <else>
-                          <text term="letter" form="short" text-case="capitalize-first"/>
+                          <text term="letter" text-case="capitalize-first"/>
                         </else>
                       </choose>
                     </if>
@@ -892,7 +694,7 @@
                           <text variable="medium" text-case="capitalize-first"/>
                         </if>
                         <else>
-                          <text term="letter" form="short" text-case="capitalize-first"/>
+                          <text term="letter" text-case="capitalize-first"/>
                         </else>
                       </choose>
                     </else>
@@ -927,20 +729,20 @@
                   <choose>
                     <if variable="genre">
                       <text variable="genre" text-case="capitalize-first"/>
-                      <!-- Replace prefix with performer label as that becomes available -->
+                      <!-- TODO: Replace prefix with performer label -->
                       <names variable="author" prefix="recorded by ">
                         <name and="symbol" initialize-with=". " delimiter=", "/>
                       </names>
                     </if>
                     <else-if variable="medium">
                       <text variable="medium" text-case="capitalize-first"/>
-                      <!-- Replace prefix with performer label as that becomes available -->
+                      <!-- TODO: Replace prefix with performer label -->
                       <names variable="author" prefix="recorded by ">
                         <name and="symbol" initialize-with=". " delimiter=", "/>
                       </names>
                     </else-if>
                     <else>
-                      <!-- Replace prefix with performer label as that becomes available -->
+                      <!-- TODO: Replace prefix with performer label -->
                       <names variable="author" prefix="Recorded by ">
                         <name and="symbol" initialize-with=". " delimiter=", "/>
                       </names>
@@ -953,13 +755,13 @@
                   <choose>
                     <if variable="medium">
                       <text variable="medium" text-case="capitalize-first"/>
-                      <!-- Replace prefix with performer label as that becomes available -->
+                      <!-- TODO: Replace prefix with performer label -->
                       <names variable="author" prefix="recorded by ">
                         <name and="symbol" initialize-with=". " delimiter=", "/>
                       </names>
                     </if>
                     <else>
-                      <!-- Replace prefix with performer label as that becomes available -->
+                      <!-- TODO: Replace prefix with performer label -->
                       <names variable="author" prefix="Recorded by ">
                         <name and="symbol" initialize-with=". " delimiter=", "/>
                       </names>
@@ -993,14 +795,7 @@
                 </if>
               </choose>
             </if>
-            <else-if type="book">
-              <choose>
-                <if variable="version" match="none">
-                  <text macro="format"/>
-                </if>
-              </choose>
-            </else-if>
-            <else-if type="report" match="none">
+            <else-if type="report software" match="none">
               <text macro="format"/>
             </else-if>
           </choose>
@@ -1009,11 +804,14 @@
     </group>
   </macro>
   <macro name="bracketed-intext">
+    <!-- TODO: Add new item types -->
     <group prefix="[" suffix="]">
       <choose>
         <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
-          <!-- This should be localized -->
-          <text macro="reviewed-title-intext" prefix="Review of "/>
+          <group delimiter=" ">
+            <text term="review-of" text-case="capitalize-first"/>
+            <text macro="reviewed-title-intext"/>
+          </group>
         </if>
         <else-if variable="interviewer" type="interview" match="any">
           <names variable="interviewer">
@@ -1034,7 +832,7 @@
                     <text variable="genre" text-case="capitalize-first"/>
                   </if>
                   <else>
-                    <text term="letter" form="short" text-case="capitalize-first"/>
+                    <text term="letter" text-case="capitalize-first"/>
                   </else>
                 </choose>
                 <names variable="recipient" delimiter=", ">
@@ -1055,6 +853,7 @@
     </group>
   </macro>
   <macro name="bracketed-container">
+    <!-- TODO: Add new item types -->
     <group prefix="[" suffix="]">
       <choose>
         <if type="paper-conference speech" match="any">
@@ -1065,7 +864,7 @@
             </if>
           </choose>
         </if>
-        <else-if type="book" variable="version" match="all">
+        <else-if type="software" match="all">
           <!-- For entries in mobile app reference works, place bracketed after the container-title -->
           <text macro="format"/>
         </else-if>
@@ -1077,6 +876,8 @@
     </group>
   </macro>
   <macro name="secondary-contributors">
+    <!-- TODO: Add new item types -->
+    <!-- TODO: Add new creator roles -->
     <choose>
       <if type="article-journal article-magazine article-newspaper post-weblog review review-book" match="any">
         <text macro="secondary-contributors-periodical"/>
@@ -1113,6 +914,7 @@
     </group>
   </macro>
   <macro name="secondary-contributors-booklike">
+    <!-- TODO: Add new item types -->
     <group delimiter="; ">
       <choose>
         <if variable="title">
@@ -1122,7 +924,7 @@
           </names>
         </if>
       </choose>
-      <!-- When editortranslator becomes available, add a test: variable="editortranslator" match="none"; then print translator -->
+      <!-- TODO: When editortranslator becomes available, add a test: variable="editortranslator" match="none"; then print translator -->
       <choose>
         <if type="post webpage" match="none">
           <!-- Webpages treat container-title like publisher -->
@@ -1160,12 +962,13 @@
     <choose>
       <if variable="archive-place" match="none">
         <!-- With `archive-place`: physical archives. Without: online archives. -->
-        <!-- Add archive_collection as that becomes available -->
+        <!-- TODO: Add archive_collection -->
         <text variable="archive_location"/>
       </if>
     </choose>
   </macro>
   <macro name="number">
+    <!-- TODO: Add new item types -->
     <choose>
       <if variable="number">
         <group delimiter=", ">
@@ -1173,8 +976,7 @@
             <text variable="genre" text-case="title"/>
             <choose>
               <if is-numeric="number">
-                <!-- Replace with label variable="number" if that becomes available -->
-                <text term="issue" form="short" text-case="capitalize-first"/>
+                <label variable="number" form="short" text-case="capitalize-first"/>
                 <text variable="number"/>
               </if>
               <else>
@@ -1197,6 +999,7 @@
     </choose>
   </macro>
   <macro name="locators-booklike">
+    <!-- TODO: Add new item types -->
     <choose>
       <if type="article-journal article-magazine article-newspaper broadcast interview patent post post-weblog review review-book speech webpage" match="any"/>
       <else-if type="paper-conference">
@@ -1223,8 +1026,7 @@
     <choose>
       <if is-numeric="version">
         <group delimiter=" ">
-          <!-- replace with label variable="version" if that becomes available -->
-          <text term="version" text-case="capitalize-first"/>
+          <label variable="version" text-case="capitalize-first"/>
           <text variable="version"/>
         </group>
       </if>
@@ -1247,6 +1049,7 @@
     </choose>
   </macro>
   <macro name="volume-booklike">
+    <!-- TODO: Add new item types -->
     <group delimiter=", ">
       <!-- Report series [ex. 52] -->
       <choose>
@@ -1259,6 +1062,7 @@
       </choose>
       <choose>
         <if variable="volume" match="any">
+          <!-- TODO: Update using volume-title -->
           <choose>
             <!-- Non-numeric volumes are already printed as part of the book title -->
             <if is-numeric="volume" match="none"/>
@@ -1272,8 +1076,7 @@
         </if>
         <else>
           <group>
-            <!-- Replace with label variable="number-of-volumes" if that becomes available -->
-            <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+            <label variable="number-of-volumes" form="short" text-case="capitalize-first" suffix=" "/>
             <text term="page-range-delimiter" prefix="1"/>
             <number variable="number-of-volumes" form="numeric"/>
           </group>
@@ -1315,6 +1118,7 @@
     </choose>
   </macro>
   <macro name="format">
+    <!-- TODO: Add new item types -->
     <choose>
       <if variable="genre medium" match="any">
         <group delimiter="; ">
@@ -1327,18 +1131,17 @@
         </group>
       </if>
       <!-- Generic labels for specific types -->
-      <!-- These should be localized when possible -->
+      <!-- TODO: Add terms for other types? -->
       <else-if type="dataset">
-        <text value="Data set"/>
+        <text term="dataset"/>
       </else-if>
-      <else-if type="book" variable="version" match="all">
-        <!-- Replace with type="software" and term="software" as that becomes available -->
-        <text value="Computer software"/>
+      <else-if type="software">
+        <text term="software" text-case="capitalize-first"/>
       </else-if>
       <else-if type="interview personal_communication" match="any">
         <choose>
           <if variable="archive container-title DOI publisher URL" match="none">
-            <text term="letter" text-case="capitalize-first"/>
+            <text term="personal-communication" text-case="capitalize-first"/>
           </if>
           <else-if type="interview">
             <text term="interview" text-case="capitalize-first"/>
@@ -1346,11 +1149,12 @@
         </choose>
       </else-if>
       <else-if type="map">
-        <text value="Map"/>
+        <text term="map" text-case="capitalize-first"/>
       </else-if>
     </choose>
   </macro>
   <macro name="format-intext">
+    <!-- TODO: Add new item types -->
     <choose>
       <if variable="genre" match="any">
         <text variable="genre" text-case="capitalize-first"/>
@@ -1359,18 +1163,17 @@
         <text variable="medium" text-case="capitalize-first"/>
       </else-if>
       <!-- Generic labels for specific types -->
-      <!-- These should be localized when possible -->
+      <!-- TODO: Add terms for other types? -->
       <else-if type="dataset">
-        <text value="Data set"/>
+        <text term="dataset"/>
       </else-if>
-      <else-if type="book" variable="version" match="all">
-        <!-- Replace with type="software" and term="software" as that becomes available -->
-        <text value="Computer software"/>
+      <else-if type="software">
+        <text term="software" text-case="capitalize-first"/>
       </else-if>
       <else-if type="interview personal_communication" match="any">
         <choose>
           <if variable="archive container-title DOI publisher URL" match="none">
-            <text term="letter" text-case="capitalize-first"/>
+            <text term="personal-communication" text-case="capitalize-first"/>
           </if>
           <else-if type="interview">
             <text term="interview" text-case="capitalize-first"/>
@@ -1378,13 +1181,14 @@
         </choose>
       </else-if>
       <else-if type="map">
-        <text value="Map"/>
+        <text term="map"/>
       </else-if>
     </choose>
   </macro>
   <!-- APA 'source' element contains four parts:
        container, event, publisher, access -->
   <macro name="container">
+    <!-- TODO: Add new item types -->
     <choose>
       <if type="article-journal article-magazine article-newspaper post-weblog review review-book" match="any">
         <!-- Periodical items -->
@@ -1440,6 +1244,7 @@
         <if variable="issued">
           <choose>
             <if variable="issue page volume" match="none">
+              <!-- TODO: Should I print status as-is, or should I print the in-press term? -->
               <text variable="status" text-case="capitalize-first"/>
             </if>
           </choose>
@@ -1448,13 +1253,14 @@
     </group>
   </macro>
   <macro name="container-booklike">
+    <!-- TODO: Add new item types -->
     <choose>
       <if variable="container-title" match="any">
         <group delimiter=" ">
           <text term="in" text-case="capitalize-first"/>
           <group delimiter=", ">
             <names variable="editor translator" delimiter=", &amp; ">
-              <!-- Change to editortranslator and move editor to substitute as that becomes available -->
+              <!-- TODO: Change to editortranslator and move editor to substitute -->
               <name and="symbol" initialize-with=". " delimiter=", "/>
               <label form="short" text-case="title" prefix=" (" suffix=")"/>
               <substitute>
@@ -1465,7 +1271,7 @@
             </names>
             <group delimiter=": " font-style="italic">
               <text variable="container-title"/>
-              <!-- Replace with volume-title as that becomes available -->
+              <!-- TODO: Replace with volume-title -->
               <choose>
                 <if is-numeric="volume" match="none">
                   <group delimiter=" ">
@@ -1483,6 +1289,7 @@
     </choose>
   </macro>
   <macro name="publisher">
+    <!-- TODO: Add new item types -->
     <group delimiter="; ">
       <choose>
         <if type="thesis">
@@ -1517,7 +1324,7 @@
             <!-- With `archive-place`: physical archives. Without: online archives. -->
             <!-- For physical archives, print the location before the archive name.
                 For electronic archives, these are printed in macro="description". -->
-            <!-- Split "archive_location" into "archive_collection" and "archive_location" as that becomes available -->
+            <!-- TODO: Split "archive_location" into "archive_collection" and "archive_location" -->
             <!-- Must test for archive_collection:
                 With collection: archive_collection (archive_location), archive, archive-place
                 No collection: archive (archive_location), archive-place
@@ -1552,6 +1359,7 @@
     </choose>
   </macro>
   <macro name="event">
+    <!-- TODO: Add new item types (e.g., event, collection, performance) -->
     <choose>
       <if variable="event event-title" match="any">
         <!-- To prevent Zotero from printing event-place due to its double-mapping of all 'place' to
@@ -1584,6 +1392,7 @@
   </macro>
   <!-- After 'source', APA also prints publication history (original publication, reprint info, retraction info) -->
   <macro name="publication-history">
+    <!-- TODO: Add new item types -->
     <choose>
       <if type="patent" match="none">
         <group prefix="(" suffix=")">
@@ -1595,6 +1404,7 @@
               <text variable="references"/>
             </if>
             <else>
+              <!-- TODO: Replace these with terms -->
               <group delimiter=" ">
                 <text term="original-work-published" text-case="capitalize-first"/>
                 <choose>
@@ -1617,86 +1427,60 @@
   </macro>
   <!-- Legal citations have their own rules -->
   <macro name="legal-cites">
+    <!-- TODO: Add new item types -->
     <choose>
-      <if type="legal_case">
-        <group delimiter=". ">
-          <group delimiter=", ">
-            <text variable="title"/>
-            <group delimiter=" ">
-              <text macro="container-legal"/>
-              <text macro="date-legal"/>
-            </group>
-            <text variable="references"/>
-          </group>
+      <if type="treaty">
+        <!-- APA generally defers to Bluebook for legal citations, but diverges without
+             explanation for treaty items. The Bluebook format that was used in APA 6th
+             ed. is used here. -->
+        <group delimiter=", ">
+          <text variable="title" text-case="title"/>
+          <names variable="author">
+            <name initialize-with="." form="short" delimiter="-"/>
+          </names>
+          <text macro="date-legal"/>
+          <text macro="container-legal"/>
           <text macro="access"/>
         </group>
       </if>
-      <else-if type="bill">
-        <!-- Currently designed to handle bills, resolutions, hearings, rederal reports. -->
+      <else>
+        <!-- For `bill`: currently designed to handle bills, resolutions, federal reports. -->
+        <!-- For `legislation`: currently designed to handle statutes, codified regulations, executive orders. -->
         <group delimiter=". ">
           <group delimiter=", ">
             <choose>
-              <if variable="number container-title" match="none">
-                <!-- If no number or container-title, then assume it is a hearing -->
-                <text variable="title" font-style="italic"/>
-              </if>
-              <else>
+              <if type="bill legal_case legislation" match="any">
                 <text variable="title"/>
-              </else>
+              </if>
+              <else-if type="hearing">
+                <text variable="title" font-style="italic"/>
+              </else-if>
             </choose>
             <group delimiter=" ">
               <text macro="container-legal"/>
               <text macro="date-legal"/>
               <choose>
-                <if variable="number container-title" match="none">
-                  <!-- If no number or container-title, then assume it is a hearing -->
+                <if type="hearing">
                   <names variable="author" prefix="(testimony of " suffix=")">
+                    <!-- TODO: Localize this with the hearing term. -->
                     <name and="symbol" delimiter=", "/>
                   </names>
                 </if>
-                <else>
+                <else-if type="bill legislation" match="any">
+                  <!-- `legislation`: For uncodified regulations, assume future code section is in status. -->
                   <text variable="status" prefix="(" suffix=")"/>
-                </else>
+                </else-if>
               </choose>
             </group>
             <text variable="references"/>
           </group>
           <text macro="access"/>
         </group>
-      </else-if>
-      <else-if type="legislation">
-        <!-- Currently designed to handle statutes, codified regulations, executive orders.
-             For uncodified regulations, assume future code section is in status. -->
-        <group delimiter=". ">
-          <group delimiter=", ">
-            <text variable="title"/>
-            <group delimiter=" ">
-              <text macro="container-legal"/>
-              <text macro="date-legal"/>
-              <text variable="status" prefix="(" suffix=")"/>
-            </group>
-            <text variable="references"/>
-          </group>
-          <text macro="access"/>
-        </group>
-      </else-if>
-      <else-if type="treaty">
-        <!-- APA generally defers to Bluebook for legal citations, but diverges without
-             explanation for treaty items. The Bluebook format that was used in APA 6th
-             ed. is used here. -->
-        <group delimiter=", ">
-          <text variable="title" text-case="title"/>
-          <names variable="author">
-            <name initialize-with="." form="short" delimiter="-"/>
-          </names>
-          <text macro="date-legal"/>
-          <text macro="container-legal"/>
-          <text macro="access"/>
-        </group>
-      </else-if>
+      </else>
     </choose>
   </macro>
   <macro name="date-legal">
+    <!-- TODO: Add new item types -->
     <choose>
       <if type="legal_case">
         <group prefix="(" suffix=")" delimiter=" ">
@@ -1712,7 +1496,7 @@
           </choose>
         </group>
       </if>
-      <else-if type="bill legislation" match="any">
+      <else-if type="bill legislation hearing" match="any">
         <group prefix="(" suffix=")" delimiter=" ">
           <group delimiter=" ">
             <date variable="original-date">
@@ -1731,6 +1515,7 @@
     </choose>
   </macro>
   <macro name="container-legal">
+    <!-- TODO: Add new item types -->
     <!-- Expect legal item container-titles to be stored in short form -->
     <choose>
       <if type="legal_case">
@@ -1741,8 +1526,7 @@
                 <text variable="volume"/>
                 <text variable="container-title"/>
                 <group delimiter=" ">
-                  <!-- Change to label variable="section" as that becomes available -->
-                  <text term="section" form="symbol"/>
+                  <label variable="section" form="symbol"/>
                   <text variable="section"/>
                 </group>
                 <choose>
@@ -1759,8 +1543,7 @@
               <group delimiter=" ">
                 <choose>
                   <if is-numeric="number">
-                    <!-- Replace with label variable="number" if that becomes available -->
-                    <text term="issue" form="short" text-case="capitalize-first"/>
+                    <label variable="number" form="short" text-case="capitalize-first"/>
                   </if>
                 </choose>
                 <text variable="number"/>
@@ -1776,8 +1559,7 @@
             <group delimiter=" ">
               <choose>
                 <if variable="chapter-number container-title" match="none">
-                  <!-- Replace with label variable="number" as that becomes available -->
-                  <text term="issue" form="short"/>
+                  <label variable="number" form="short"/>
                 </if>
               </choose>
               <text variable="number"/>
@@ -1812,7 +1594,7 @@
               <choose>
                 <if variable="section">
                   <group delimiter=" ">
-                    <!-- Change to label variable="section" as that becomes available -->
+                    <!-- TODO: Change to label variable="section" -->
                     <text term="section" form="symbol"/>
                     <text variable="section"/>
                   </group>
@@ -1835,8 +1617,7 @@
             </if>
             <else>
               <group delimiter=" ">
-                <!-- Replace with label variable="number" if that becomes available -->
-                <text term="issue" form="short" text-case="capitalize-first"/>
+                <label variable="number" form="short" text-case="capitalize-first"/>
                 <text variable="number"/>
               </group>
             </else>
@@ -1846,6 +1627,7 @@
     </choose>
   </macro>
   <macro name="citation-locator">
+    <!-- TODO: Add new locator types? -->
     <group delimiter=" ">
       <choose>
         <if locator="chapter">
@@ -1883,6 +1665,7 @@
     </sort>
     <layout>
       <choose>
+        <!-- TODO: Add new item types -->
         <if type="bill legal_case legislation treaty" match="any">
           <!-- Legal items have different orders and delimiters -->
           <choose>
diff --git a/src/main/resources/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 00f97a02305..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/l10n/JabRef_ar.properties b/src/main/resources/l10n/JabRef_ar.properties
index 817522affb7..4767e591146 100644
--- a/src/main/resources/l10n/JabRef_ar.properties
+++ b/src/main/resources/l10n/JabRef_ar.properties
@@ -314,6 +314,8 @@ JabRef\ preferences=إعدادات JabRef
 
 
 
+
+
 
 
 
@@ -432,6 +434,9 @@ Please\ enter\ a\ field\ name\ to\ search\ for\ a\ keyword.=الرجاء إدخ
 
 
 
+
+
+
 Show\ optional\ fields=إظهار الحقول الاختيارية
 
 Show\ required\ fields=إظهار الحقول المطلوبة
@@ -488,6 +493,7 @@ the\ field\ <b>%0</b>=الحقل <b>%0</b>
 
 
 
+
 
 
 Rename\ field=إعادة تسمية الحقل
@@ -728,3 +734,5 @@ 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 51c8287b117..9619ad12c2a 100644
--- a/src/main/resources/l10n/JabRef_da.properties
+++ b/src/main/resources/l10n/JabRef_da.properties
@@ -371,6 +371,8 @@ JabRef\ preferences=JabRef-indstillinger
 
 Journal\ abbreviations=Tidsskriftsforkortelser
 
+
+
 Keep\ both=Behold begge
 
 
@@ -629,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
@@ -700,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
@@ -770,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
@@ -829,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
@@ -1055,6 +1059,8 @@ Default\ pattern=Standardmønster
 
 
 
+
+
 
 
 
diff --git a/src/main/resources/l10n/JabRef_de.properties b/src/main/resources/l10n/JabRef_de.properties
index 262eab4d2d3..88f637b4a13 100644
--- a/src/main/resources/l10n/JabRef_de.properties
+++ b/src/main/resources/l10n/JabRef_de.properties
@@ -261,6 +261,7 @@ Do\ not\ abbreviate\ names=Namen nicht abkürzen
 
 Do\ not\ open\ any\ files\ at\ startup=Keine Dateien beim Start öffnen
 
+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
 
@@ -274,6 +275,7 @@ 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
 
@@ -474,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
@@ -500,6 +524,7 @@ LaTeX\ AUX\ file\:=LaTeX AUX-Datei\:
 
 Link=Link
 Listen\ for\ remote\ operation\ on\ port=Port nach externem Zugriff abhören
+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)
 
@@ -734,6 +759,7 @@ Replaces\ Unicode\ ligatures\ with\ their\ expanded\ form=Unicode-Ligaturen durc
 
 Required\ fields=Benötigte Felder
 
+Resolve\ BibTeX\ strings=BibTeX-Zeichenketten auflösen
 
 resolved=davon aufgelöst
 
@@ -770,6 +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\ 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
@@ -835,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
@@ -916,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
 
@@ -928,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
@@ -1028,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
@@ -1106,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
@@ -1133,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
@@ -1241,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
-Password\ kept\ for\ this\ session\ only.=Passwort nur für diese Sitzung speichern.
 Clear\ connection\ settings=Verbindungseinstellungen zurücksetzen
 Check\ Proxy\ Setting=Überprüfe Proxy-Einstellungen
 Check\ connection=Verbindung prüfen
@@ -1258,6 +1297,7 @@ Open\ folder=Ordner öffnen
 Export\ sort\ order=Sortierreihenfolge exportieren
 Save\ sort\ order=Sortierung speichern
 
+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
@@ -1293,6 +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\ 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.
@@ -1367,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
@@ -1377,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
@@ -1448,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.
@@ -1494,6 +1535,8 @@ Clears\ the\ field\ completely.=Löscht das Feld komplett
 Directory\ not\ found=Verzeichnis nicht gefunden
 
 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
@@ -1570,6 +1613,7 @@ Message=Nachricht
 
 
 MathSciNet\ Review=MathSciNet Review
+Reset\ all=Alles zurücksetzen
 
 Decryption\ not\ supported.=Entschlüsselung wird nicht unterstützt.
 
@@ -1616,6 +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\ 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
@@ -1630,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
@@ -1681,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
@@ -1780,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
 
@@ -1908,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
@@ -2030,11 +2079,15 @@ Add\ formatter\ to\ list=Formatierer zur Liste hinzufügen
 Filter\ List=Filterliste
 Open\ files...=Dateien öffnen...
 
+Affected\ fields=Betroffene Felder
 Show\ preview\ as\ a\ tab\ in\ entry\ editor=Vorschau als Tab im Eintragseditor anzeigen
 Visual\ theme=Visuelles Theme
 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
@@ -2259,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
@@ -2274,6 +2326,7 @@ 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
@@ -2322,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.
 
@@ -2366,6 +2419,9 @@ Others=Andere
 Recommended=Empfohlen
 
 Authors\ and\ Title=Autoren und Titel
+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\:
@@ -2471,6 +2527,7 @@ Edit\ file\ link=Datei-Verknüpfung bearbeiten
 Assign=Zuweisen
 Do\ not\ assign=Nicht zuweisen
 
+Error\ occurred\ %0=Fehler %0 aufgetreten
 Left\ Entry=Linker Eintrag
 Merge\ %0=%0 zusammenführen
 Right\ Entry=Rechter Eintrag
@@ -2494,17 +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 digitale Ausgabe zu öffnen. Bitte setzen Sie das eprinttype-Feld
+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...=Im Verlauf suchen...
-your\ search\ history\ is\ empty=Der Verlauf ist leer
+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 verlinkte Dateien.
+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 d5ae93b3bf6..3a8b8a66390 100644
--- a/src/main/resources/l10n/JabRef_el.properties
+++ b/src/main/resources/l10n/JabRef_el.properties
@@ -466,6 +466,8 @@ Journal\ abbreviations=Συντομογραφίες περιοδικών
 Journal\ lists\:=Λίστες περιοδικών\:
 Remove\ journal\ '%0'=Αφαίρεση περιοδικού '%0'
 
+
+
 Keep\ both=Κρατήστε και τα δύο
 
 Keep\ subgroups=Διατήρηση υποομάδων
@@ -826,6 +828,9 @@ Show\ BibTeX\ source\ by\ default=Εμφάνιση πηγής BibTeX από πρ
 
 Show\ confirmation\ dialog\ when\ deleting\ entries=Εμφάνιση παραθύρου διαλόγου επιβεβαίωσης κατά τη διαγραφή καταχωρήσεων
 
+
+
+
 Show\ last\ names\ only=Εμφάνιση μόνο επωνύμων
 
 Show\ names\ unchanged=Εμφάνιση ονομάτων χωρίς αλλαγές
@@ -919,6 +924,7 @@ Verify\ that\ LyX\ is\ running\ and\ that\ the\ lyxpipe\ is\ valid.=Βεβαιω
 View=Προβολή
 Vim\ server\ name=Όνομα διακομιστή Vim
 
+
 Warn\ about\ unresolved\ duplicates\ when\ closing\ inspection\ window=Προειδοποίηση για διπλότυπα που δεν έχουν επιλυθεί κατά το κλείσιμο του παραθύρου επιθεώρησης
 
 Warn\ before\ overwriting\ existing\ keys=Προειδοποίηση πριν την αντικατάσταση υπαρχόντων κλειδιών
@@ -1019,7 +1025,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=Αποστολή ως email
 References=Παραπομπές
 Sending\ of\ emails=Πραγματοποιείται αποστολή των email
 Subject\ for\ sending\ an\ email\ with\ references=Θέμα αποστολής ενός email με παραπομπές
@@ -1091,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=Επιλογή στυλ
@@ -1325,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=Αποθήκευση όλων
@@ -1386,7 +1389,6 @@ Reload=Επαναφόρτωση
 
 Capitalize=Κεφαλαιοποίηση
 Capitalize\ the\ first\ word,\ changes\ other\ words\ to\ lower\ case.=Μετατρέπει την πρώτη λέξη σε κεφαλαία γράμματα και όλες τις υπόλοιπες σε πεζούς χαρακτήρες.
-CHANGES\ ALL\ LETTER\ TO\ UPPER\ CASE.=ΑΛΛΑΖΕΙ ΟΛΑ ΤΑ ΓΡΑΜΜΑΤΑ ΣΕ ΚΕΦΑΛΑΙΑ.
 Cleans\ up\ LaTeX\ code.=Εκκαθαρίζει των κώδικα LaTeX.
 Converts\ HTML\ code\ to\ LaTeX\ code.=Μετατρέπει τον κώδικα HTML σε κώδικα LaTeX.
 HTML\ to\ Unicode=HTML σε Unicode
@@ -1832,7 +1834,6 @@ Escape\ dollar\ sign=Αποφυγή συμβόλου δολαρίου
 
 
 
-I\ cannot\ insert\ to\ the\ cursors\ current\ location.=Δεν μπορώ να εισάγω στην τρέχουσα τοποθεσία του δρομέα.
 
 
 
@@ -1888,3 +1889,5 @@ Use\ the\ field\ FJournal\ to\ store\ the\ full\ journal\ name\ for\ (un)abbrevi
 
 
 
+
+
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 39ac7c28624..653c4f08dbf 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -476,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
@@ -842,6 +865,10 @@ Show\ confirmation\ dialog\ when\ deleting\ entries=Show confirmation dialog whe
 
 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
@@ -936,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
@@ -1461,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.
@@ -1635,6 +1664,7 @@ Note\:\ Use\ the\ placeholder\ %DIR%\ for\ the\ location\ of\ the\ opened\ libra
 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
@@ -2347,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.
 
@@ -2523,6 +2553,9 @@ 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
@@ -2539,3 +2572,14 @@ This\ operation\ requires\ selected\ linked\ files.=This operation requires sele
 
 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 c4491bf23bc..690ace61d0a 100644
--- a/src/main/resources/l10n/JabRef_es.properties
+++ b/src/main/resources/l10n/JabRef_es.properties
@@ -20,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
@@ -31,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
 
@@ -258,6 +261,7 @@ Do\ not\ abbreviate\ names=No abreviar nombres
 
 Do\ not\ open\ any\ files\ at\ startup=No abrir ningún archivo al arrancar
 
+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
 
@@ -271,6 +275,7 @@ 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
 
@@ -325,6 +330,7 @@ Export\ to\ text\ file.=Exportar a un archivo de texto.
 Exporting=Exportando
 Extension=Extensión
 
+External\ Changes\ Resolver=Resolver cambios externos
 
 External\ programs=Programas externos
 
@@ -470,6 +476,26 @@ Journal\ abbreviations=Abreviaturas de publicaciones
 Journal\ lists\:=Listados de revistas\:
 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
 
 Keep\ subgroups=Mantener subgrupos
@@ -496,6 +522,7 @@ LaTeX\ AUX\ file\:=Archivo AUX de LaTeX\:
 
 Link=Enlace
 Listen\ for\ remote\ operation\ on\ port=Escuchar para operación remota en el puerto
+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)
 
@@ -710,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\:
@@ -729,6 +757,7 @@ Replaces\ Unicode\ ligatures\ with\ their\ expanded\ form=Reemplaza las ligadura
 
 Required\ fields=Campos requeridos
 
+Resolve\ BibTeX\ strings=Resolver cadenas BibTeX
 
 resolved=resuelto
 
@@ -759,11 +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\ 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
@@ -829,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
@@ -854,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
@@ -909,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
 
@@ -921,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
@@ -1021,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\:
@@ -1099,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
@@ -1126,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
@@ -1234,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
-Password\ kept\ for\ this\ session\ only.=La contraseña se conserva solo durante esta sesión.
 Clear\ connection\ settings=Limpiar ajustes de conexión
 Check\ Proxy\ Setting=Comprobar configuración de «proxy»
 Check\ connection=Comprobar conexión
@@ -1251,6 +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\ 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
@@ -1258,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
@@ -1282,6 +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\ 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
@@ -1308,6 +1356,7 @@ 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
 
@@ -1355,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
@@ -1365,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
@@ -1436,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
@@ -1481,6 +1531,7 @@ Clears\ the\ field\ completely.=Limpia el campo completamente.
 Directory\ not\ found=Directorio no encontrado
 
 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
@@ -2242,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
@@ -2299,7 +2349,6 @@ 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.
 
@@ -2435,6 +2484,7 @@ 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
@@ -2444,3 +2494,4 @@ Delete\ %0\ files\ permanently\ from\ disk,\ or\ just\ remove\ the\ files\ from\
 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 93f92f4831a..d279790ed50 100644
--- a/src/main/resources/l10n/JabRef_fa.properties
+++ b/src/main/resources/l10n/JabRef_fa.properties
@@ -287,6 +287,8 @@ Entry\ editor=ویرایشگر ورودی
 
 
 
+
+
 
 
 
@@ -418,6 +420,10 @@ Search\ results\ from\ open\ libraries=جستجوی نتایج از کتابخا
 
 
 
+
+
+
+
 
 
 
@@ -659,6 +665,8 @@ 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 2d104e93832..986f6a19a86 100644
--- a/src/main/resources/l10n/JabRef_fr.properties
+++ b/src/main/resources/l10n/JabRef_fr.properties
@@ -261,6 +261,7 @@ 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\ 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
 
@@ -274,6 +275,7 @@ 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
 
@@ -474,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
@@ -500,6 +525,7 @@ LaTeX\ AUX\ file\:=Fichier AUX de LaTeX \:
 
 Link=Lien
 Listen\ for\ remote\ operation\ on\ port=Écouter le port pour des opérations à distance
+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)
 
@@ -534,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
 
@@ -639,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
@@ -734,6 +760,7 @@ Replaces\ Unicode\ ligatures\ with\ their\ expanded\ form=Remplace les ligatures
 
 Required\ fields=Champs requis
 
+Resolve\ BibTeX\ strings=Traiter les chaînes BibTeX
 
 resolved=résolu
 
@@ -753,9 +780,9 @@ 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.
@@ -770,6 +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\ 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
@@ -835,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é
@@ -916,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
 
@@ -928,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
@@ -961,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
 
@@ -975,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).
@@ -1028,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
@@ -1044,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
@@ -1106,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
@@ -1133,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
@@ -1241,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
-Password\ kept\ for\ this\ session\ only.=Mot de passe conservé seulement pour cette session.
 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
@@ -1258,6 +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\ 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
@@ -1293,6 +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\ 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
@@ -1343,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
@@ -1367,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
@@ -1377,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
@@ -1387,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
@@ -1413,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
 
@@ -1448,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.
@@ -1494,6 +1536,8 @@ Clears\ the\ field\ completely.=Vide entièrement le champ.
 Directory\ not\ found=Répertoire non trouvé
 
 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
@@ -1570,6 +1614,7 @@ Message=Message
 
 
 MathSciNet\ Review=Review MathSciNet
+Reset\ all=Tout réinitialiser
 
 Decryption\ not\ supported.=Déchiffrement non pris en charge.
 
@@ -1616,6 +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\ 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
@@ -1630,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
@@ -1681,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
@@ -1749,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
@@ -1760,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
@@ -1771,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.
@@ -1780,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
 
@@ -1908,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
@@ -1982,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
 
@@ -2030,11 +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
 Show\ preview\ as\ a\ tab\ in\ entry\ editor=Afficher l'aperçu dans un onglet de l'éditeur d'entrée
 Visual\ theme=Thème visuel
 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
@@ -2259,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
@@ -2274,6 +2327,7 @@ 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
@@ -2322,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.
 
@@ -2366,6 +2420,9 @@ Others=Autres
 Recommended=Usuels
 
 Authors\ and\ Title=Auteurs et titre
+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 \:
@@ -2402,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é
@@ -2428,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.
@@ -2458,8 +2515,8 @@ 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
@@ -2471,6 +2528,7 @@ Edit\ file\ link=Éditer le lien de fichier
 Assign=Assigner
 Do\ not\ assign=Ne pas assigner
 
+Error\ occurred\ %0=Une erreur est survenue %0
 Left\ Entry=Entrée de gauche
 Merge\ %0=Fusionner %0
 Right\ Entry=Entrée de droite
@@ -2494,6 +2552,9 @@ 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
@@ -2508,3 +2569,9 @@ Delete\ %0\ files\ permanently\ from\ disk,\ or\ just\ remove\ the\ files\ from\
 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 0eb6a0aa4b0..1ec340228f1 100644
--- a/src/main/resources/l10n/JabRef_id.properties
+++ b/src/main/resources/l10n/JabRef_id.properties
@@ -1,3 +1,4 @@
+Proxy\ requires\ password=Proxy membutuhkan password
 
 %0\ contains\ the\ regular\ expression\ <b>%1</b>=%0 mengandung Ekspresi Reguler <b>%1</b>
 
@@ -87,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
 
@@ -139,6 +142,7 @@ Copied=Disalin
 Copy=Salin
 
 Copy\ title=Kopi judul
+Copy\ citation\ (html)=Salin kutipan (html)
 
 Copy\ to\ clipboard=Salin ke papan klip
 
@@ -384,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
 
@@ -403,6 +410,7 @@ 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
@@ -429,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.
 
 
 
@@ -537,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
@@ -584,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".
 
@@ -631,6 +643,7 @@ Character\ encoding\ '%0'\ is\ not\ supported.=Enkoding karakter '%0' tidak didu
 
 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...
@@ -671,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
@@ -743,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
@@ -815,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
@@ -875,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
@@ -1084,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
@@ -1170,6 +1184,7 @@ 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.
@@ -1480,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
@@ -1507,6 +1523,7 @@ Executing\ command\ "%0"...=Perintah pelaksana "%0"...
 
 
 
+Group\ color=Warna kelompok
 
 
 
@@ -1520,6 +1537,7 @@ Default\ pattern=Pola bawaan
 
 
 
+Delete\ text=Hapus teks
 
 
 
@@ -1588,3 +1606,5 @@ 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 f7d4bf378f0..1ddd6d3f7e1 100644
--- a/src/main/resources/l10n/JabRef_it.properties
+++ b/src/main/resources/l10n/JabRef_it.properties
@@ -261,6 +261,7 @@ Do\ not\ abbreviate\ names=Non abbreviare i nomi
 
 Do\ not\ open\ any\ files\ at\ startup=Non aprire nessun file all'avvio
 
+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
 
@@ -274,6 +275,7 @@ 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
 
@@ -474,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
@@ -500,6 +525,7 @@ LaTeX\ AUX\ file\:=File AUX LaTeX\:
 
 Link=Collegamento
 Listen\ for\ remote\ operation\ on\ port=Porta in ascolto per operazioni remote
+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)
 
@@ -734,6 +760,7 @@ Replaces\ Unicode\ ligatures\ with\ their\ expanded\ form=Sostituisce le legatur
 
 Required\ fields=Campo obbligatorio
 
+Resolve\ BibTeX\ strings=Risolvi le stringhe BibTeX
 
 resolved=risolto
 
@@ -770,6 +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\ 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
@@ -835,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
@@ -916,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
 
@@ -928,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
@@ -1028,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
@@ -1106,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
@@ -1133,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
@@ -1241,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
-Password\ kept\ for\ this\ session\ only.=Password mantenuta solo per questa sessione.
 Clear\ connection\ settings=Reinizializza i parametri di connessione
 Check\ Proxy\ Setting=Controlla Impostazioni Proxy
 Check\ connection=Controlla la connessione
@@ -1258,6 +1298,7 @@ Open\ folder=Apri cartella
 Export\ sort\ order=Esporta il modo di ordinamento
 Save\ sort\ order=Salva ordine
 
+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
@@ -1293,6 +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\ 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
@@ -1367,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
@@ -1377,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
@@ -1448,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.
@@ -1494,6 +1536,8 @@ Clears\ the\ field\ completely.=Azzera completamente il campo.
 Directory\ not\ found=Cartella non trovata
 
 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
@@ -1570,6 +1614,7 @@ Message=Messaggio
 
 
 MathSciNet\ Review=Recensione MathSciNet
+Reset\ all=Reimposta tutto
 
 Decryption\ not\ supported.=Decrittografazione non supportata.
 
@@ -1616,6 +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\ 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
@@ -1630,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
@@ -1681,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
@@ -1780,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
 
@@ -1908,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
@@ -2030,11 +2080,15 @@ Add\ formatter\ to\ list=Aggiungi formattatore alla lista
 Filter\ List=Elenco filtri
 Open\ files...=Apri file...
 
+Affected\ fields=Campi interessati
 Show\ preview\ as\ a\ tab\ in\ entry\ editor=Visualizza l'anteprima come scheda nell'editor della voce
 Visual\ theme=Tema visivo
 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
@@ -2259,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
@@ -2274,6 +2327,7 @@ 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
@@ -2322,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.
 
@@ -2366,6 +2420,9 @@ Others=Altri
 Recommended=Consigliato
 
 Authors\ and\ Title=Autori e Titolo
+Catalog=Catalogo
+Catalogs=Cataloghi
+Select\ Catalogs\:=Seleziona i Cataoghi\:
 Add\ Author\:=Aggiungi Autore\:
 Add\ Query\:=Aggiungi Query\:
 Add\ Research\ Question\:=Aggiungi Domanda Di Ricerca\:
@@ -2471,6 +2528,7 @@ Edit\ file\ link=Modifica collegamento file
 Assign=Assegna
 Do\ not\ assign=Non assegnare
 
+Error\ occurred\ %0=Errore verificato %0
 Left\ Entry=Voce Sinistra
 Merge\ %0=Unisci %0
 Right\ Entry=Voce Destra
@@ -2494,6 +2552,9 @@ 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
@@ -2508,3 +2569,9 @@ Delete\ %0\ files\ permanently\ from\ disk,\ or\ just\ remove\ the\ files\ from\
 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 924643f69d1..bed3222eb41 100644
--- a/src/main/resources/l10n/JabRef_ja.properties
+++ b/src/main/resources/l10n/JabRef_ja.properties
@@ -472,6 +472,8 @@ Journal\ abbreviations=誌名短縮形
 Journal\ lists\:=学術誌一覧：
 Remove\ journal\ '%0'=学術誌「%0」を削除
 
+
+
 Keep\ both=両側を維持
 
 Keep\ subgroups=下層グループを保持
@@ -823,6 +825,9 @@ Show\ BibTeX\ source\ by\ default=既定でBibTeXソースを表示
 
 Show\ confirmation\ dialog\ when\ deleting\ entries=項目を削除する際に確認ダイアログを表示する
 
+
+
+
 Show\ last\ names\ only=姓のみを表示する
 
 Show\ names\ unchanged=氏名をそのまま表示
@@ -913,6 +918,7 @@ Value\ cleared\ externally=外部から値が消去されました
 View=表示
 Vim\ server\ name=Vimサーバー名
 
+
 Warn\ about\ unresolved\ duplicates\ when\ closing\ inspection\ window=精査ウィンドウを閉じる際に解消されていない重複項目に対して警告する
 
 Warn\ before\ overwriting\ existing\ keys=既存キーを上書きする前に警告する
@@ -1013,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=書誌情報を添付した電子メールの件名
@@ -1091,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=様式の選択
@@ -1349,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=重複した文献キーを解消する
@@ -2219,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=他のライブラリを閉じる
@@ -2278,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.=新しい引用箇所にカーソルを移動してください．
 
@@ -2421,3 +2422,5 @@ 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 f93c5415ea5..e3e7af01801 100644
--- a/src/main/resources/l10n/JabRef_ko.properties
+++ b/src/main/resources/l10n/JabRef_ko.properties
@@ -454,6 +454,8 @@ Journal\ abbreviations=저널 약어
 Journal\ lists\:=저널 목록\:
 Remove\ journal\ '%0'=저널 '%0' 제거
 
+
+
 Keep\ both=둘 다 유지
 
 Keep\ subgroups=하위 그룹 유지
@@ -791,6 +793,9 @@ Show\ BibTeX\ source\ by\ default=기본적으로 BibTeX 소스 표시
 
 Show\ confirmation\ dialog\ when\ deleting\ entries=항목을 삭제할 때 확인 대화 상자 표시
 
+
+
+
 Show\ last\ names\ only=성만 표시
 
 Show\ names\ unchanged=변경되지 않은 이름 표시
@@ -875,6 +880,7 @@ Value\ cleared\ externally=외부에서 값이 지워짐
 View=보기
 Vim\ server\ name=Vim 서버 이름
 
+
 Warn\ about\ unresolved\ duplicates\ when\ closing\ inspection\ window=검사 창을 닫을 때 해결되지 않은 중복에 대해 경고
 
 Warn\ before\ overwriting\ existing\ keys=기존 키를 덮어쓰기 전에 경고 띄우기
@@ -972,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=참조를 포함한 이메일 전송 대상
@@ -1039,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=스타일 선택
@@ -1291,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=중복 인용 키 해결
@@ -2144,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=다른 라이브러리 닫기
@@ -2296,3 +2298,5 @@ 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 7cf7592e4d6..baa0926494d 100644
--- a/src/main/resources/l10n/JabRef_nl.properties
+++ b/src/main/resources/l10n/JabRef_nl.properties
@@ -1,29 +1,39 @@
+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
 
@@ -42,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
 
@@ -74,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
 
@@ -124,6 +140,7 @@ Change\ of\ Grouping\ Method=Wijzig groepering methode
 
 change\ preamble=wijzig inleiding
 
+Changed\ language=Gewijzigde taal
 
 Changed\ preamble=Gewijzigde inleiding
 
@@ -131,6 +148,7 @@ Cite\ command=Citeer opdracht
 
 Clear=Wissen
 
+Open\ /\ close\ entry\ editor=Editor openen / sluiten
 
 Close\ dialog=Sluit dialoog
 
@@ -150,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
 
@@ -175,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
 
@@ -189,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
 
@@ -215,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
@@ -228,26 +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\ 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
 
@@ -264,39 +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\ 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
 
@@ -313,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.
 
@@ -325,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
 
@@ -400,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
 
@@ -427,18 +516,23 @@ 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
+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)
 
 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
 
@@ -450,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
 
@@ -457,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
 
@@ -484,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.
 
@@ -510,6 +611,7 @@ Open\ editor\ when\ a\ new\ entry\ is\ created=Open editor wanneer een nieuwe en
 
 Open\ file=Open bestand
 
+Open\ last\ edited\ libraries\ on\ startup=Open laatst bewerkte bibliotheken bij het opstarten
 
 Connect\ to\ shared\ database=Verbinding maken met de gedeelde database
 
@@ -520,6 +622,7 @@ 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
 
@@ -537,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
 
@@ -570,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
 
@@ -604,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\:
@@ -641,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
 
@@ -648,6 +768,7 @@ Restart=Herstarten
 
 Restart\ required=Herstart vereist
 
+Return\ to\ dialog=Terug naar dialoogvenster
 
 Review=Herzien
 Review\ changes=Wijzigingen herzien
@@ -662,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'.
@@ -669,35 +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\ 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
@@ -720,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
@@ -738,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.
 
@@ -761,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.
@@ -776,6 +937,7 @@ Try\ different\ encoding=Probeer een andere encodering
 
 Undo=Ongedaan maken
 
+Unknown\ BibTeX\ entries\:=Onbekende BibTeX vermeldingen\:
 
 unknown\ edit=onbekende aanpassing
 
@@ -786,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
@@ -805,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
@@ -831,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
@@ -845,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
@@ -860,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
@@ -888,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
@@ -902,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
@@ -918,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
@@ -930,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.
 
@@ -949,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
@@ -964,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.
@@ -973,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
@@ -984,9 +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
+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
@@ -1001,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.
@@ -1013,51 +1249,79 @@ If\ a\ pasted\ or\ imported\ entry\ already\ has\ the\ field\ set,\ overwrite.=A
 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.
 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
 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
@@ -1070,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
@@ -1087,23 +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
@@ -1111,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
@@ -1131,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
@@ -1141,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
@@ -1151,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
@@ -1169,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
@@ -1179,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
@@ -1196,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
@@ -1212,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
@@ -1224,24 +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
@@ -1292,10 +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'
@@ -1304,10 +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\ all=Alles resetten
 
 Decryption\ not\ supported.=Decodering niet ondersteund.
 
@@ -1330,30 +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
 
+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
@@ -1361,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
 
@@ -1391,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.
@@ -1411,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
@@ -1432,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
@@ -1441,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?
@@ -1477,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
 
@@ -1505,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
@@ -1512,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
@@ -1524,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.
@@ -1537,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
 
@@ -1548,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
@@ -1561,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
 
@@ -1568,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
@@ -1607,97 +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
 
+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 dc048c3789a..54905fd451a 100644
--- a/src/main/resources/l10n/JabRef_no.properties
+++ b/src/main/resources/l10n/JabRef_no.properties
@@ -389,6 +389,8 @@ JabRef\ preferences=JabRef-oppsett
 
 Journal\ abbreviations=Journalforkortelser
 
+
+
 Keep\ both=Behold begge
 
 
@@ -670,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
@@ -742,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
@@ -812,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
@@ -872,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
@@ -1169,6 +1173,8 @@ Default\ pattern=Standardmønster
 
 
 
+
+
 
 
 
diff --git a/src/main/resources/l10n/JabRef_pl.properties b/src/main/resources/l10n/JabRef_pl.properties
index 61564027a45..fd73f489351 100644
--- a/src/main/resources/l10n/JabRef_pl.properties
+++ b/src/main/resources/l10n/JabRef_pl.properties
@@ -1,18 +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
 
@@ -20,6 +40,7 @@ Abstract=Abstrakt
 
 Accept=Akceptuj
 
+Accept\ recommendations\ from\ Mr.\ DLib=Zaakceptuj rekomendacje Mr. DLib
 
 Action=Akcja
 
@@ -27,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
@@ -75,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
 
@@ -109,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ń
 
@@ -153,37 +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
 
@@ -191,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
 
@@ -209,30 +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
 
@@ -242,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
 
 
@@ -272,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
@@ -295,50 +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
 
@@ -346,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
 
 
 
@@ -372,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
 
@@ -382,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
 
@@ -400,6 +597,7 @@ or=lub
 
 Overwrite=Zastąp
 
+Overwrite\ keys=Nadpisz klucze
 
 Password=Hasło
 
@@ -407,6 +605,7 @@ Paste=Wklej
 
 paste\ entries=wklej wpisy
 
+paste\ entry\ %0=wklej wpis %0
 
 
 
@@ -424,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
 
@@ -436,6 +642,7 @@ Read\ only=Tylko do odczytu
 Redo=Przywróć
 
 
+regular\ expression=wyrażenie regularne
 
 Related\ articles=Powiązane artykuły
 
@@ -445,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
 
@@ -484,31 +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
 
@@ -518,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
 
@@ -542,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
 
@@ -588,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...
 
 
 
@@ -596,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
@@ -639,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
@@ -684,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
 
@@ -705,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
 
@@ -716,31 +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
@@ -770,14 +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ę
@@ -793,6 +1216,7 @@ Compiler=Kompilator
 Editor=Redaktor
 Founder=Założyciel
 Line=Linia
+Master's\ thesis=Praca magisterska
 Page=Strona
 Paragraph=Akapit
 Patent=Patent
@@ -810,6 +1234,7 @@ License=Licencja
 Message=Wiadomość
 
 
+Reset\ all=Zresetuj wszystko
 
 
 
@@ -820,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ę
@@ -847,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
@@ -882,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
 
 
 
@@ -936,20 +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
+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
@@ -961,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ę
@@ -978,6 +1438,9 @@ Add\ custom\ column=Dodaj niestandardową kolumnę
 
 Open\ files...=Otwieranie plików...
 
+Font\ settings=Ustawienia czcionki
+Dark=Ciemny
+Light=Jasny
 Default\ pattern=Domyślny wzór
 Library\ mode=Tryb biblioteki
 Remove\ all=Usuń wszystkie
@@ -986,19 +1449,26 @@ 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
 
 
@@ -1007,14 +1477,20 @@ Close\ others=Zamknij pozostałe
 
 
 
+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.
 
 
 
@@ -1028,33 +1504,59 @@ Close\ others=Zamknij pozostałe
 
 
 
+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 d3ffe2db9df..29b7eaa49e8 100644
--- a/src/main/resources/l10n/JabRef_pt.properties
+++ b/src/main/resources/l10n/JabRef_pt.properties
@@ -273,6 +273,7 @@ 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
 
@@ -329,11 +330,19 @@ Extension=Extensão
 
 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
 
@@ -348,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.
 
@@ -365,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
@@ -432,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
 
@@ -445,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
 
@@ -458,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
@@ -473,6 +502,7 @@ Show\ advanced\ hints\ (i.e.\ helpful\ tooltips,\ suggestions\ and\ explanation)
 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
 
@@ -484,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
 
@@ -491,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.
 
@@ -547,6 +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\ on\ startup=Abrir as últimas bibliotecas editadas na inicialização
 
 Connect\ to\ shared\ database=Conectar à base de dados partilhada
 
@@ -575,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
 
@@ -612,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
 
@@ -625,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
 
@@ -634,29 +675,42 @@ 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\:
@@ -674,6 +728,7 @@ Replace\ string=Substituir string
 
 Required\ fields=Campos obrigatórios
 
+Resolve\ BibTeX\ strings=Resolver strings BibTeX
 
 resolved=resolvido
 
@@ -730,12 +785,26 @@ 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
 
@@ -757,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
@@ -828,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
@@ -898,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
@@ -956,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
@@ -1161,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
@@ -1377,3 +1447,5 @@ 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 31cdf223a7e..c6b2f434357 100644
--- a/src/main/resources/l10n/JabRef_pt_BR.properties
+++ b/src/main/resources/l10n/JabRef_pt_BR.properties
@@ -261,6 +261,7 @@ Do\ not\ abbreviate\ names=Não abreviar nomes
 
 Do\ not\ open\ any\ files\ at\ startup=Não abrir arquivos ao iniciar
 
+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
 
@@ -274,6 +275,7 @@ 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
 
@@ -474,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
@@ -500,6 +525,7 @@ LaTeX\ AUX\ file\:=Arquivo AUX LaTeX\:
 
 Link=Linkar
 Listen\ for\ remote\ operation\ on\ port=Escutar operações remotas na porta
+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)
 
@@ -734,6 +760,7 @@ Replaces\ Unicode\ ligatures\ with\ their\ expanded\ form=Substitui caracteres e
 
 Required\ fields=Campos obrigatórios
 
+Resolve\ BibTeX\ strings=Resolver textos BibTeX
 
 resolved=resolvido
 
@@ -770,6 +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\ 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
@@ -835,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
@@ -916,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
 
@@ -928,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
@@ -1028,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
@@ -1106,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
@@ -1133,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
@@ -1241,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
-Password\ kept\ for\ this\ session\ only.=Senha mantida somente para esta sessão.
 Clear\ connection\ settings=Limpar configurações da conexão
 Check\ Proxy\ Setting=Verificar Configuração de Proxy
 Check\ connection=Verificar conexão
@@ -1258,6 +1298,7 @@ Open\ folder=Abrir diretório
 Export\ sort\ order=Exportar ordenação
 Save\ sort\ order=Salvar ordenação
 
+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
@@ -1293,6 +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\ 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
@@ -1367,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
@@ -1377,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
@@ -1448,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.
@@ -1494,6 +1536,8 @@ Clears\ the\ field\ completely.=Limpa completamente o campo.
 Directory\ not\ found=Diretório não encontrado
 
 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
@@ -1570,6 +1614,7 @@ Message=Mensagem
 
 
 MathSciNet\ Review=Revisão MathSciNet
+Reset\ all=Redefinir tudo
 
 Decryption\ not\ supported.=Descriptografia não suportada.
 
@@ -1616,6 +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\ 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
@@ -1630,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
@@ -1681,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
@@ -1780,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
 
@@ -1908,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
@@ -2030,11 +2080,15 @@ Add\ formatter\ to\ list=Adicionar formatador à lista
 Filter\ List=Lista de filtros
 Open\ files...=Abrir arquivos...
 
+Affected\ fields=Campos afetados
 Show\ preview\ as\ a\ tab\ in\ entry\ editor=Mostrar preview em uma guia no editor de referências
 Visual\ theme=Tema visual
 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
@@ -2259,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
@@ -2274,6 +2327,7 @@ 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
@@ -2322,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.
 
@@ -2366,6 +2420,9 @@ Others=Outros
 Recommended=Recomendado
 
 Authors\ and\ Title=Autores e Título
+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\:
@@ -2471,6 +2528,7 @@ Edit\ file\ link=Editar link do arquivo
 Assign=Atribuir
 Do\ not\ assign=Não atribuir
 
+Error\ occurred\ %0=Ocorreu um erro %0
 Left\ Entry=Entrada esquerda
 Merge\ %0=Mesclar %0
 Right\ Entry=Entrada direita
@@ -2494,6 +2552,9 @@ 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
@@ -2508,3 +2569,9 @@ Delete\ %0\ files\ permanently\ from\ disk,\ or\ just\ remove\ the\ files\ from\
 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 37034416725..4489dca9e57 100644
--- a/src/main/resources/l10n/JabRef_ru.properties
+++ b/src/main/resources/l10n/JabRef_ru.properties
@@ -466,6 +466,8 @@ Journal\ abbreviations=Сокращения для журналов
 Journal\ lists\:=Список журналов\:
 Remove\ journal\ '%0'=Удалить журнал '%0'
 
+
+
 Keep\ both=Оставить оба
 
 Keep\ subgroups=Сохранить подгруппы
@@ -815,6 +817,9 @@ Show\ BibTeX\ source\ by\ default=Показать источник BibTeX по
 
 Show\ confirmation\ dialog\ when\ deleting\ entries=Запрос подтверждения при удалении записей
 
+
+
+
 Show\ last\ names\ only=Показать только фамилии
 
 Show\ names\ unchanged=Показать имена без изменений
@@ -905,6 +910,7 @@ Value\ cleared\ externally=Значение создано внешними ср
 View=Вид
 Vim\ server\ name=Имя сервера Vim
 
+
 Warn\ about\ unresolved\ duplicates\ when\ closing\ inspection\ window=Выдать предупреждение о неразрешенных дубликатах при закрытии окна контроля
 
 Warn\ before\ overwriting\ existing\ keys=Выдать предупреждение при перезаписи текущих ключей
@@ -1005,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=Тема письма эл.почты со ссылками
@@ -1083,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=Выбор стиля
@@ -1341,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=Разрешить дубликаты ключей цитат
@@ -2211,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=Закрыть другие библиотеки
@@ -2270,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.=Пожалуйста, переместите курсор в положение нового цитирования.
 
@@ -2400,3 +2401,5 @@ 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 8c93af1f0df..677fcc24ba2 100644
--- a/src/main/resources/l10n/JabRef_sv.properties
+++ b/src/main/resources/l10n/JabRef_sv.properties
@@ -1,3 +1,4 @@
+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>
 
@@ -122,6 +123,7 @@ Change\ entry\ type=Ändra posttyp
 
 change\ preamble=ändra preamble
 
+Changed\ language=Ändrat språk
 
 Changed\ preamble=Ändrad ingress
 
@@ -175,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
 
@@ -189,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
@@ -215,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
 
@@ -236,10 +245,13 @@ 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
 
@@ -282,17 +294,27 @@ 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\ 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
@@ -397,6 +419,8 @@ JabRef\ preferences=Inställningar för JabRef
 
 Journal\ abbreviations=Tidskriftsförkortningar
 
+
+
 Keep\ both=Behåll bägge
 
 
@@ -546,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
@@ -558,6 +584,7 @@ Push\ applications=Push-program
 
 Quit\ JabRef=Avsluta JabRef
 
+Read\ only=Skrivskyddad
 
 Redo=Gör igen
 
@@ -677,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
@@ -748,6 +778,7 @@ View=Visa
 Vim\ server\ name=Vim-servernamn
 
 
+
 Warn\ before\ overwriting\ existing\ keys=Varna innan befintliga nycklar skrivs över
 
 Warning=Varning
@@ -817,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
@@ -1069,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
@@ -1515,3 +1544,5 @@ plain\ text=klartext
 
 
 
+
+
diff --git a/src/main/resources/l10n/JabRef_tl.properties b/src/main/resources/l10n/JabRef_tl.properties
index 5eb960e73f7..baac3468816 100644
--- a/src/main/resources/l10n/JabRef_tl.properties
+++ b/src/main/resources/l10n/JabRef_tl.properties
@@ -384,6 +384,8 @@ JabRef\ preferences=Ang preferences ng JabRef
 
 Journal\ abbreviations=Mga journal ng pagpapa-ikli
 
+
+
 Keep\ both=Panatilihing pareho
 
 
@@ -668,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
@@ -742,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
@@ -814,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
@@ -873,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
@@ -1075,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
@@ -1317,3 +1320,5 @@ plain\ text=plain na teksto
 
 
 
+
+
diff --git a/src/main/resources/l10n/JabRef_tr.properties b/src/main/resources/l10n/JabRef_tr.properties
index 56541c584f9..0f1c93943b8 100644
--- a/src/main/resources/l10n/JabRef_tr.properties
+++ b/src/main/resources/l10n/JabRef_tr.properties
@@ -1,3 +1,4 @@
+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>
@@ -260,6 +261,7 @@ 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\ when\ saving=Kaydederken sarmalama
 
 Do\ not\ write\ the\ following\ fields\ to\ XMP\ Metadata=Aşağıdaki alanları XMP Metadata'ya yazma
 
@@ -273,6 +275,7 @@ 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ı
 
@@ -473,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
@@ -499,6 +522,7 @@ LaTeX\ AUX\ file\:=LaTeX AUX dosyası\:
 
 Link=Bağlantı
 Listen\ for\ remote\ operation\ on\ port=Bağlantı noktasındaki uzak işlemi dinle
+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)
 
@@ -584,6 +608,7 @@ Open\ editor\ when\ a\ new\ entry\ is\ created=Yeni bir girdi oluşturulduğunda
 
 Open\ file=Dosya 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ç
 
@@ -732,6 +757,7 @@ Replaces\ Unicode\ ligatures\ with\ their\ expanded\ form=Unicode bitişik harfl
 
 Required\ fields=Zorunlu alanlar
 
+Resolve\ BibTeX\ strings=BibTeX dizgelerini çözümle
 
 resolved=çözümlendi
 
@@ -768,6 +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\ 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
@@ -833,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
@@ -914,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ı
 
@@ -926,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
@@ -1026,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
@@ -1104,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
@@ -1131,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
@@ -1141,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.
@@ -1254,6 +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\ 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
@@ -1289,6 +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\ 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ı
@@ -1327,6 +1368,8 @@ 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
@@ -1361,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
@@ -1371,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
@@ -1442,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.
@@ -1488,6 +1531,8 @@ Clears\ the\ field\ completely.=Alanı tamamen temizler.
 Directory\ not\ found=Dizin bulunamadı
 
 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
@@ -1543,6 +1588,7 @@ 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
@@ -1563,6 +1609,7 @@ Message=Mesaj
 
 
 MathSciNet\ Review=MathSciNet İncelemesi
+Reset\ all=Tümünü sıfırla
 
 Decryption\ not\ supported.=Şifre çözme desteklenmiyor.
 
@@ -1609,6 +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\ 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
@@ -1623,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
@@ -1674,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ı
@@ -1702,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ı
@@ -1772,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
 
@@ -1824,7 +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'ı başarıyla %2'ye kopyalandı
+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)
@@ -1900,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
@@ -2022,11 +2075,15 @@ Add\ formatter\ to\ list=Biçimleyiciyi listeye ekle
 Filter\ List=Süzgeç listesi
 Open\ files...=Dosyaları aç...
 
+Affected\ fields=Etkilenmiş alanlar
 Show\ preview\ as\ a\ tab\ in\ entry\ editor=Ön izleyiciyi, girdi düzenleyicide bir sekme olarak göster
 Visual\ theme=Görsel 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
@@ -2251,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
@@ -2266,6 +2322,7 @@ 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
@@ -2314,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.
 
@@ -2358,6 +2415,9 @@ Others=Diğerleri
 Recommended=Önerilen
 
 Authors\ and\ Title=Yazarlar ve Başlık
+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\:
@@ -2455,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
 
@@ -2462,6 +2523,7 @@ Edit\ file\ link=Dosya bağlantısını düzenle
 Assign=Ata
 Do\ not\ assign=Atama
 
+Error\ occurred\ %0=Hata oluştu %0
 Left\ Entry=Sol Girdi
 Merge\ %0=Birleştir %0
 Right\ Entry=Sağ Girdi
@@ -2483,10 +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=İçe aktarılan kütüphane
+Library\ to\ import\ into=İçine aktarılacak kütüphane
+
+
+Multiline=Çoksatırlı
 
-Multiline=Çoklusatır
+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 fc70bcf51f1..4c389cbf1e1 100644
--- a/src/main/resources/l10n/JabRef_uk.properties
+++ b/src/main/resources/l10n/JabRef_uk.properties
@@ -1,29 +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 ab3fab10619..2911a51a890 100644
--- a/src/main/resources/l10n/JabRef_vi.properties
+++ b/src/main/resources/l10n/JabRef_vi.properties
@@ -396,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ả
 
 
@@ -666,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
@@ -738,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ó
@@ -807,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...
 
 
@@ -1102,3 +1107,5 @@ 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 1468e11bb40..1ffaabefb97 100644
--- a/src/main/resources/l10n/JabRef_zh_CN.properties
+++ b/src/main/resources/l10n/JabRef_zh_CN.properties
@@ -261,6 +261,7 @@ Do\ not\ abbreviate\ names=不缩写名（John Smith）
 
 Do\ not\ open\ any\ files\ at\ startup=启动时不打开任何文件
 
+Do\ not\ wrap\ when\ saving=保存这些字段时不换行
 
 Do\ not\ write\ the\ following\ fields\ to\ XMP\ Metadata=不要将下列字段写入XMP元数据
 
@@ -274,6 +275,7 @@ duplicate\ removal=移除重复
 
 Duplicate\ fields=重复字段
 
+Unable\ to\ change\ field\ name.\ "%0"\ already\ in\ use.=无法更改字段名称："%0"已在使用中
 
 Duplicate\ string\ name=重复的简写字串名称
 
@@ -474,6 +476,9 @@ Journal\ abbreviations=期刊缩写
 Journal\ lists\:=期刊列表：
 Remove\ journal\ '%0'=删除期刊“%0”
 
+ISSN=ISSN
+
+
 Keep\ both=保留全部
 
 Keep\ subgroups=保留子组
@@ -500,6 +505,7 @@ LaTeX\ AUX\ file\:=LaTeX AUX 文件\:
 
 Link=链接
 Listen\ for\ remote\ operation\ on\ port=监听端口
+Memory\ stick\ mode\ -\ Store\ preferences\ in\ 'jabref.xml'\ in\ the\ app\ folder.=记忆棒模式：将 jabref.xml 保存到程序所在目录
 
 Show\ advanced\ hints\ (i.e.\ helpful\ tooltips,\ suggestions\ and\ explanation)=显示高级建议（如浮动提示、建议、解释说明）
 
@@ -734,6 +740,7 @@ Replaces\ Unicode\ ligatures\ with\ their\ expanded\ form=将Unicode连字替换
 
 Required\ fields=必选字段
 
+Resolve\ BibTeX\ strings=解析 BibTeX 字符串
 
 resolved=已解决
 
@@ -770,6 +777,7 @@ Refuse\ to\ save\ the\ library\ before\ external\ changes\ have\ been\ reviewed.
 Library\ protection=文献库保护
 Unable\ to\ save\ library=无法保存文献库
 
+Always\ reformat\ library\ on\ save\ and\ export=在保存和导出文献库时整理格式
 Character\ encoding\ '%0'\ is\ not\ supported.=，不支持编码 '%0'。
 
 Search=查找
@@ -835,6 +843,9 @@ Show\ BibTeX\ source\ by\ default=默认显示 BibTeX 源代码
 
 Show\ confirmation\ dialog\ when\ deleting\ entries=删除多个条目时提示
 
+
+
+
 Show\ last\ names\ only=仅显示姓（Smith）
 
 Show\ names\ unchanged=显示原始姓名字串
@@ -916,6 +927,7 @@ Upgrade\ external\ PDF/PS\ links\ to\ use\ the\ '%0'\ field.=升级外部PDF/PS
 usage=用法
 Use\ autocompletion=开启自动补全
 
+User\ interface=用户界面
 
 Username=用户名
 
@@ -928,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 时提示
@@ -1028,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=发送参考文献邮件时的主题
@@ -1106,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=引用样式选择
@@ -1133,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
@@ -1241,7 +1253,6 @@ Please\ specify\ a\ password=请指定密码
 Proxy\ configuration=代理服务器设置
 Use\ custom\ proxy\ configuration=使用自定义 HTTP 代理
 Proxy\ requires\ authentication=代理服务器需要密码
-Password\ kept\ for\ this\ session\ only.=仅在当前窗口记住密码
 Clear\ connection\ settings=清除连接设置
 Check\ Proxy\ Setting=检查代理设置
 Check\ connection=检查连接
@@ -1258,6 +1269,7 @@ Open\ folder=打开文件夹
 Export\ sort\ order=导出顺序
 Save\ sort\ order=保存时排序
 
+Keep\ original\ order\ and\ add\ new\ entries\ at\ the\ end=保持原始顺序，并将新条目添加到末尾
 Use\ current\ table\ sort\ order=当前顺序
 Use\ specified\ order=指定顺序
 Show\ extra\ columns=显示额外的列
@@ -1293,6 +1305,7 @@ Please\ open\ %0\ manually.=请手动打开 %0。
 The\ link\ has\ been\ copied\ to\ the\ clipboard.=链接已复制到剪贴板
 
 Open\ %0\ file=打开文件 %0
+Could\ not\ detect\ terminal\ automatically\ using\ '%0'.\ Please\ define\ a\ custom\ terminal\ in\ the\ preferences.=无法使用 '%0' 检测到终端，请在首选项中自定义一个终端。
 
 Cannot\ delete\ file=无法删除文件
 File\ permission\ error=文件权限错误
@@ -1377,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
@@ -1448,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 代码。
@@ -1494,6 +1505,8 @@ Clears\ the\ field\ completely.=完全清除这个字段。
 Directory\ not\ found=目录未找到
 
 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=打开大量文件
@@ -1570,6 +1583,7 @@ Message=消息
 
 
 MathSciNet\ Review=MathSciNet 评论
+Reset\ all=全部重置
 
 Decryption\ not\ supported.=不支持解码
 
@@ -1616,6 +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\ occurred\ while\ executing\ the\ command\ "%0".=执行 "%0" 命令时出错
 Reformat\ ISSN=重新格式化 ISSN
 
 Countries\ and\ territories\ in\ English=英语国家和区域
@@ -1630,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
@@ -1681,6 +1697,7 @@ Check\ the\ event\ log\ to\ see\ all\ notifications=在事件日志中查看所
 Host=主机
 Port=端口
 Library=库
+Libraries=库
 User=用户
 Connect=连接
 Connection\ error=连接错误
@@ -2030,11 +2047,15 @@ Add\ formatter\ to\ list=Add formatter to list
 Filter\ List=Filter List
 Open\ files...=打开文件...
 
+Affected\ fields=受影响的字段
 Show\ preview\ as\ a\ tab\ in\ entry\ editor=在条目编辑器中以标签形式显示预览
 Visual\ 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 添加字母后缀
@@ -2081,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
@@ -2259,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=关闭其他库
@@ -2274,6 +2294,7 @@ Custom\ import\ formats=自定义导入格式
 
 No\ list\ enabled=未启用列表
 Protect\ selection=保护所选文本
+Unprotect\ selection=取消保护
 
 Customized\ preview\ style=自定义预览样式
 Next\ preview\ style=下一个预览样式
@@ -2322,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.
 
@@ -2366,6 +2386,9 @@ Others=其他
 Recommended=推荐
 
 Authors\ and\ Title=作者和标题
+Catalog=分类
+Catalogs=分类
+Select\ Catalogs\:=选择分类
 Add\ Author\:=添加作者：
 Add\ Query\:=添加查询：
 Add\ Research\ Question\:=添加研究问题：
@@ -2471,6 +2494,7 @@ Edit\ file\ link=Edit file link
 Assign=Assign
 Do\ not\ assign=Do not assign
 
+Error\ occurred\ %0=出现错误 %0
 Left\ Entry=Left Entry
 Merge\ %0=Merge %0
 Right\ Entry=Right Entry
@@ -2494,6 +2518,7 @@ Use\ the\ field\ FJournal\ to\ store\ the\ full\ journal\ name\ for\ (un)abbrevi
 
 Library\ to\ import\ into=要导入的目标库
 
+
 Multiline=多行
 
 Unable\ to\ open\ linked\ eprint.\ Please\ set\ the\ eprinttype\ field=无法打开eprint链接，请设置eprint字段
@@ -2508,3 +2533,6 @@ Delete\ %0\ files\ permanently\ from\ disk,\ or\ just\ remove\ the\ files\ from\
 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 5fe1dda3c5c..000f3989724 100644
--- a/src/main/resources/l10n/JabRef_zh_TW.properties
+++ b/src/main/resources/l10n/JabRef_zh_TW.properties
@@ -1,3 +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>
@@ -10,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>
 
@@ -397,6 +400,8 @@ JabRef\ Version\ (Required\ to\ ensure\ backwards\ compatibility\ with\ Mr.\ DLi
 
 Journal\ abbreviations=期刊縮寫
 
+
+
 Keep\ both=保留全部
 
 
@@ -616,6 +621,9 @@ Show\ 'Lastname,\ Firstname'=顯示「姓（Lastname）, 名（Firstname） 」
 
 
 
+
+
+
 Show\ last\ names\ only=僅顯示「姓（Lastname）」
 
 
@@ -672,6 +680,7 @@ Vim\ server\ name=Vim 伺服器名稱
 
 
 
+
 Warning=警告
 
 Warnings=警告
@@ -712,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=自訂程式
@@ -995,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=在檔案總管中顯示
 
@@ -1074,6 +1081,8 @@ 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 b4340fa32e9..9eecb7934bd 100644
--- a/src/main/resources/tinylog.properties
+++ b/src/main/resources/tinylog.properties
@@ -7,3 +7,4 @@ writerAzure = application insights
 exception = strip: jdk.internal
 
 #level@org.jabref.model.entry.BibEntry = debug
+level@org.jabref.gui.maintable.PersistenceVisualStateTable = debug
diff --git a/src/test/java/org/jabref/cli/ArgumentProcessorTest.java b/src/test/java/org/jabref/cli/ArgumentProcessorTest.java
index 5538a3dba81..78dcb77f755 100644
--- a/src/test/java/org/jabref/cli/ArgumentProcessorTest.java
+++ b/src/test/java/org/jabref/cli/ArgumentProcessorTest.java
@@ -14,6 +14,7 @@
 import org.jabref.logic.importer.ImporterPreferences;
 import org.jabref.logic.importer.fileformat.BibtexImporter;
 import org.jabref.model.entry.BibEntry;
+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;
@@ -34,6 +35,7 @@ class ArgumentProcessorTest {
     private ArgumentProcessor processor;
     private BibtexImporter bibtexImporter;
     private final PreferencesService preferencesService = mock(PreferencesService.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);
 
@@ -62,7 +64,8 @@ void testAuxImport(@TempDir Path tempDir) throws Exception {
                 args.toArray(String[]::new),
                 Mode.INITIAL_START,
                 preferencesService,
-                mock(FileUpdateMonitor.class));
+                mock(FileUpdateMonitor.class),
+                entryTypesManager);
 
         assertTrue(Files.exists(outputBib));
     }
@@ -87,7 +90,8 @@ void testExportMatches(@TempDir Path tempDir) throws Exception {
                 args.toArray(String[]::new),
                 Mode.INITIAL_START,
                 preferencesService,
-                mock(FileUpdateMonitor.class));
+                mock(FileUpdateMonitor.class),
+                entryTypesManager);
 
         assertTrue(Files.exists(outputBib));
         BibEntryAssert.assertEquals(expectedEntries, outputBib, bibtexImporter);
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 84%
rename from src/test/java/org/jabref/logic/autosaveandbackup/BackupManagerDiscardedTest.java
rename to src/test/java/org/jabref/gui/autosaveandbackup/BackupManagerDiscardedTest.java
index ee60abcc067..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,10 +6,12 @@
 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.SaveConfiguration;
+import org.jabref.logic.exporter.SelfContainedSaveConfiguration;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
@@ -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,7 +37,7 @@ class BackupManagerDiscardedTest {
     private BibDatabaseContext bibDatabaseContext;
     private BackupManager backupManager;
     private Path testBib;
-    private SaveConfiguration saveConfiguration;
+    private SelfContainedSaveConfiguration saveConfiguration;
     private PreferencesService preferencesService;
     private BibEntryTypesManager bibEntryTypesManager;
     private Path backupDir;
@@ -53,17 +53,13 @@ public void setup(@TempDir Path tempDir) throws Exception {
         bibDatabaseContext.setDatabasePath(testBib);
 
         bibEntryTypesManager = new BibEntryTypesManager();
-
-        saveConfiguration = mock(SaveConfiguration.class);
-        when(saveConfiguration.shouldMakeBackup()).thenReturn(false);
-        when(saveConfiguration.getSaveOrder()).thenReturn(SaveOrder.getDefaultSaveOrder());
-        when(saveConfiguration.withMakeBackup(anyBoolean())).thenReturn(saveConfiguration);
-
+        saveConfiguration = new SelfContainedSaveConfiguration(SaveOrder.getDefaultSaveOrder(), false, BibDatabaseWriter.SaveType.WITH_JABREF_META_DATA, false);
         preferencesService = mock(PreferencesService.class, Answers.RETURNS_DEEP_STUBS);
 
         saveDatabase();
 
-        backupManager = new BackupManager(bibDatabaseContext, bibEntryTypesManager, preferencesService);
+        backupManager = new BackupManager(mock(LibraryTab.class), bibDatabaseContext, bibEntryTypesManager, preferencesService);
+
         makeBackup();
     }
 
diff --git a/src/test/java/org/jabref/logic/autosaveandbackup/BackupManagerTest.java b/src/test/java/org/jabref/gui/autosaveandbackup/BackupManagerTest.java
similarity index 93%
rename from src/test/java/org/jabref/logic/autosaveandbackup/BackupManagerTest.java
rename to src/test/java/org/jabref/gui/autosaveandbackup/BackupManagerTest.java
index 3573bd7aa8b..c1a0caf267d 100644
--- a/src/test/java/org/jabref/logic/autosaveandbackup/BackupManagerTest.java
+++ b/src/test/java/org/jabref/gui/autosaveandbackup/BackupManagerTest.java
@@ -1,4 +1,4 @@
-package org.jabref.logic.autosaveandbackup;
+package org.jabref.gui.autosaveandbackup;
 
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -8,6 +8,7 @@
 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;
@@ -141,7 +142,11 @@ public void shouldNotCreateABackup(@TempDir Path customDir) throws Exception {
         when(preferences.getFilePreferences()).thenReturn(filePreferences);
         when(filePreferences.getBackupDirectory()).thenReturn(backupDir);
 
-        BackupManager manager = BackupManager.start(database, mock(BibEntryTypesManager.class, Answers.RETURNS_DEEP_STUBS), preferences);
+        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);
@@ -164,7 +169,11 @@ public void shouldCreateABackup(@TempDir Path customDir) throws Exception {
         when(filePreferences.getBackupDirectory()).thenReturn(backupDir);
         when(filePreferences.shouldCreateBackup()).thenReturn(true);
 
-        BackupManager manager = BackupManager.start(database, mock(BibEntryTypesManager.class, Answers.RETURNS_DEEP_STUBS), preferences);
+        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);
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/SourceTabTest.java b/src/test/java/org/jabref/gui/entryeditor/SourceTabTest.java
index a2ae4666810..f9f41a73ab4 100644
--- a/src/test/java/org/jabref/gui/entryeditor/SourceTabTest.java
+++ b/src/test/java/org/jabref/gui/entryeditor/SourceTabTest.java
@@ -18,6 +18,7 @@
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
+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;
@@ -63,6 +64,7 @@ public void onStart(Stage stage) {
                 new DummyFileUpdateMonitor(),
                 mock(DialogService.class),
                 stateManager,
+                mock(BibEntryTypesManager.class),
                 keyBindingRepository);
         pane = new TabPane(
                 new Tab("main area", area),
diff --git a/src/test/java/org/jabref/gui/exporter/ExportToClipboardActionTest.java b/src/test/java/org/jabref/gui/exporter/ExportToClipboardActionTest.java
index 5321fe1ae7c..973247fe8f0 100644
--- a/src/test/java/org/jabref/gui/exporter/ExportToClipboardActionTest.java
+++ b/src/test/java/org/jabref/gui/exporter/ExportToClipboardActionTest.java
@@ -14,7 +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.SaveConfiguration;
+import org.jabref.logic.exporter.SelfContainedSaveConfiguration;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.logic.xmp.XmpPreferences;
@@ -23,6 +23,7 @@
 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.LibraryPreferences;
 import org.jabref.preferences.PreferencesService;
@@ -66,7 +67,7 @@ public void setUp() {
 
         taskExecutor = new CurrentThreadTaskExecutor();
         when(preferences.getExportPreferences().getCustomExporters()).thenReturn(FXCollections.observableList(List.of()));
-        when(preferences.getExportConfiguration()).thenReturn(mock(SaveConfiguration.class));
+        when(preferences.getSelfContainedExportConfiguration()).thenReturn(mock(SelfContainedSaveConfiguration.class));
         when(preferences.getXmpPreferences()).thenReturn(mock(XmpPreferences.class));
         exportToClipboardAction = new ExportToClipboardAction(dialogService, stateManager, clipBoardManager, taskExecutor, preferences);
     }
@@ -92,6 +93,7 @@ public void export(BibDatabaseContext databaseContext, Path file, List<BibEntry>
         when(preferences.getFilePreferences()).thenReturn(filePreferences);
         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/libraryproperties/constants/ConstantsPropertiesViewModelTest.java b/src/test/java/org/jabref/gui/libraryproperties/constants/ConstantsPropertiesViewModelTest.java
index cc057020e4f..7280c3e33e1 100644
--- a/src/test/java/org/jabref/gui/libraryproperties/constants/ConstantsPropertiesViewModelTest.java
+++ b/src/test/java/org/jabref/gui/libraryproperties/constants/ConstantsPropertiesViewModelTest.java
@@ -8,7 +8,9 @@
 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;
 
@@ -17,6 +19,15 @@
 
 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() {
@@ -25,10 +36,9 @@ void testStringsListPropertySorting() {
         BibDatabase db = new BibDatabase();
         db.setStrings(List.of(string1, string2));
         BibDatabaseContext context = new BibDatabaseContext(db);
-        DialogService service = mock(DialogService.class);
         List<String> expected = List.of(string2.getName(), string1.getName()); // ICSE before TSE
 
-        ConstantsPropertiesViewModel model = new ConstantsPropertiesViewModel(context, service);
+        ConstantsPropertiesViewModel model = new ConstantsPropertiesViewModel(context, service, filePreferences);
         model.setValues();
 
         List<String> actual = model.stringsListProperty().stream()
@@ -44,10 +54,9 @@ void testStringsListPropertySorting() {
     void testStringsListPropertyResorting() {
         BibDatabase db = new BibDatabase();
         BibDatabaseContext context = new BibDatabaseContext(db);
-        DialogService service = mock(DialogService.class);
         List<String> expected = List.of("ICSE", "TSE");
 
-        ConstantsPropertiesViewModel model = new ConstantsPropertiesViewModel(context, service);
+        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"));
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/slr/ManageStudyDefinitionViewModelTest.java b/src/test/java/org/jabref/gui/slr/ManageStudyDefinitionViewModelTest.java
index a314a877401..2e28e83c7c6 100644
--- a/src/test/java/org/jabref/gui/slr/ManageStudyDefinitionViewModelTest.java
+++ b/src/test/java/org/jabref/gui/slr/ManageStudyDefinitionViewModelTest.java
@@ -39,7 +39,6 @@ public void emptyStudyConstructorFillsDatabasesCorrectly() {
                 new StudyCatalogItem("Bibliotheksverbund Bayern (Experimental)", false),
                 new StudyCatalogItem("Biodiversity Heritage", false),
                 new StudyCatalogItem("CiteSeerX", false),
-                new StudyCatalogItem("Collection of Computer Science Bibliographies", false),
                 new StudyCatalogItem("Crossref", false),
                 new StudyCatalogItem("DBLP", true),
                 new StudyCatalogItem("DOAB", false),
@@ -80,7 +79,6 @@ public void studyConstructorFillsDatabasesCorrectly(@TempDir Path tempDir) {
                 new StudyCatalogItem("Bibliotheksverbund Bayern (Experimental)", false),
                 new StudyCatalogItem("Biodiversity Heritage", false),
                 new StudyCatalogItem("CiteSeerX", false),
-                new StudyCatalogItem("Collection of Computer Science Bibliographies", false),
                 new StudyCatalogItem("Crossref", false),
                 new StudyCatalogItem("DBLP", false),
                 new StudyCatalogItem("DOAB", false),
diff --git a/src/test/java/org/jabref/logic/bibtex/BibEntryWriterTest.java b/src/test/java/org/jabref/logic/bibtex/BibEntryWriterTest.java
index c34afad17ec..69a9695bbd3 100644
--- a/src/test/java/org/jabref/logic/bibtex/BibEntryWriterTest.java
+++ b/src/test/java/org/jabref/logic/bibtex/BibEntryWriterTest.java
@@ -72,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());
@@ -84,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");
@@ -106,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
@@ -129,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());
@@ -157,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());
@@ -169,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"));
@@ -189,7 +189,7 @@ 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).parse(new StringReader(bibtexEntry));
@@ -208,7 +208,7 @@ 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).parse(new StringReader(bibtexEntry));
@@ -227,7 +227,7 @@ 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).parse(new StringReader(bibtexEntry));
@@ -246,7 +246,7 @@ void roundTripKeepsFilePathEndingWithBackslash() throws IOException {
                 @Article{,
                   file = {dir\\},
                 }
-                """.replaceAll("\n", OS.NEWLINE);
+                """.replace("\n", OS.NEWLINE);
 
         // read in bibtex string
         ParserResult result = new BibtexParser(importFormatPreferences).parse(new StringReader(bibtexEntry));
@@ -339,7 +339,7 @@ void roundTripWithModification() throws IOException {
                   Note                     = {some note},
                   Number                   = {1},
                 }
-                """.replaceAll("\n", OS.NEWLINE);
+                """.replace("\n", OS.NEWLINE);
         // @formatter:on
 
         // read in bibtex string
@@ -361,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());
     }
@@ -377,7 +377,7 @@ void roundTripWithCamelCasingInTheOriginalEntryAndResultInLowerCase() throws IOE
                   Note                     = {some note},
                   HowPublished             = {asdf},
                 }
-                """.replaceAll("\n", OS.NEWLINE);
+                """.replace("\n", OS.NEWLINE);
         // @formatter:on
 
         // read in bibtex string
@@ -400,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());
     }
@@ -417,7 +417,7 @@ void testEntryTypeChange() throws IOException {
                   note         = {some note},
                   howpublished = {asdf},
                 }
-                """.replaceAll("\n", OS.NEWLINE);
+                """.replace("\n", OS.NEWLINE);
         // @formatter:on
 
         // read in bibtex string
@@ -440,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());
     }
@@ -509,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);
@@ -544,7 +544,7 @@ void monthFieldSpecialSyntax() throws IOException {
                   Month                    = mar,
                   Number                   = {1}
                 }
-                """.replaceAll("\n", OS.NEWLINE);
+                """.replace("\n", OS.NEWLINE);
         // @formatter:on
 
         // read in bibtex string
@@ -607,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());
     }
@@ -625,7 +625,7 @@ void constantMonthApril() throws Exception {
                         @Misc{,
                           month = apr,
                         }
-                        """.replaceAll("\n", OS.NEWLINE),
+                        """.replace("\n", OS.NEWLINE),
                 stringWriter.toString());
     }
 
@@ -642,7 +642,7 @@ void monthApril() throws Exception {
                         @Misc{,
                           month = {apr},
                         }
-                        """.replaceAll("\n", OS.NEWLINE),
+                        """.replace("\n", OS.NEWLINE),
                 stringWriter.toString());
     }
 
@@ -659,7 +659,7 @@ 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).parse(new StringReader(bibtexEntry));
@@ -740,7 +740,7 @@ void roundTripWithPrecedingCommentTest() throws IOException {
                   Note                     = {some note},
                   Number                   = {1}
                 }
-                """.replaceAll("\n", OS.NEWLINE);
+                """.replace("\n", OS.NEWLINE);
         // @formatter:on
 
         // read in bibtex string
@@ -765,7 +765,7 @@ void roundTripWithPrecedingCommentAndModificationTest() throws IOException {
                   Number                   = {1},
                   Note                     = {some note}
                 }
-                """.replaceAll("\n", OS.NEWLINE);
+                """.replace("\n", OS.NEWLINE);
         // @formatter:on
 
         // read in bibtex string
@@ -788,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());
@@ -823,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());
@@ -873,7 +873,7 @@ void testSerializeAll() throws IOException {
                   chapter      = {chapter},
                   year         = {2019},
                 }
-                """.replaceAll("\n", OS.NEWLINE);
+                """.replace("\n", OS.NEWLINE);
         // @formatter:on
 
         // @formatter:off
@@ -888,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/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/crawler/CrawlerTest.java b/src/test/java/org/jabref/logic/crawler/CrawlerTest.java
index fe63cc22dba..3bb915cf568 100644
--- a/src/test/java/org/jabref/logic/crawler/CrawlerTest.java
+++ b/src/test/java/org/jabref/logic/crawler/CrawlerTest.java
@@ -72,7 +72,6 @@ public void setUp() throws Exception {
         importerPreferences = mock(ImporterPreferences.class);
         saveConfiguration = mock(SaveConfiguration.class, Answers.RETURNS_DEEP_STUBS);
         when(saveConfiguration.getSaveOrder()).thenReturn(SaveOrder.getDefaultSaveOrder());
-        when(saveConfiguration.useMetadataSaveOrder()).thenReturn(true);
         when(importerPreferences.getApiKeys()).thenReturn(FXCollections.emptyObservableSet());
         when(importFormatPreferences.bibEntryPreferences().getKeywordSeparator()).thenReturn(',');
 
diff --git a/src/test/java/org/jabref/logic/crawler/StudyCatalogToFetcherConverterTest.java b/src/test/java/org/jabref/logic/crawler/StudyCatalogToFetcherConverterTest.java
index 9b73a8ad2d9..e3bee090ebf 100644
--- a/src/test/java/org/jabref/logic/crawler/StudyCatalogToFetcherConverterTest.java
+++ b/src/test/java/org/jabref/logic/crawler/StudyCatalogToFetcherConverterTest.java
@@ -40,7 +40,6 @@ void setUpMocks() {
         preferencesService = mock(PreferencesService.class, Answers.RETURNS_DEEP_STUBS);
         saveConfiguration = mock(SaveConfiguration.class, Answers.RETURNS_DEEP_STUBS);
         when(saveConfiguration.getSaveOrder()).thenReturn(SaveOrder.getDefaultSaveOrder());
-        when(saveConfiguration.useMetadataSaveOrder()).thenReturn(true);
         when(preferencesService.getBibEntryPreferences().getKeywordSeparator()).thenReturn(',');
         when(preferencesService.getImporterPreferences().getApiKeys()).thenReturn(FXCollections.emptyObservableSet());
 
diff --git a/src/test/java/org/jabref/logic/exporter/BibtexDatabaseWriterTest.java b/src/test/java/org/jabref/logic/exporter/BibtexDatabaseWriterTest.java
index dd765793e33..be277db4e5b 100644
--- a/src/test/java/org/jabref/logic/exporter/BibtexDatabaseWriterTest.java
+++ b/src/test/java/org/jabref/logic/exporter/BibtexDatabaseWriterTest.java
@@ -72,7 +72,7 @@ public class BibtexDatabaseWriterTest {
     private MetaData metaData;
     private BibDatabaseContext bibtexContext;
     private ImportFormatPreferences importFormatPreferences;
-    private SaveConfiguration saveConfiguration;
+    private SelfContainedSaveConfiguration saveConfiguration;
     private FieldPreferences fieldPreferences;
     private CitationKeyPatternPreferences citationKeyPatternPreferences;
     private BibEntryTypesManager entryTypesManager;
@@ -82,25 +82,26 @@ public class BibtexDatabaseWriterTest {
     @BeforeEach
     void setUp() {
         fieldPreferences = new FieldPreferences(true, Collections.emptyList(), Collections.emptyList());
-        saveConfiguration = mock(SaveConfiguration.class, Answers.RETURNS_DEEP_STUBS);
-        when(saveConfiguration.getSaveOrder()).thenReturn(SaveOrder.getDefaultSaveOrder());
-        when(saveConfiguration.useMetadataSaveOrder()).thenReturn(true);
+        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);
+        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);
-
-        database = new BibDatabase();
-        metaData = new MetaData();
-        bibtexContext = new BibDatabaseContext(database, metaData);
-        importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        when(importFormatPreferences.fieldPreferences()).thenReturn(fieldPreferences);
     }
 
     @Test
@@ -673,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(saveConfiguration.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 + "}"
@@ -705,7 +706,8 @@ void reformatStringIfAskedToDoSo() throws Exception {
         string.setParsedSerialization("wrong serialization");
         database.addString(string);
 
-        when(saveConfiguration.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());
@@ -738,7 +740,7 @@ void writeSaveOrderConfig() throws Exception {
                 List.of(new SaveOrder.SortCriterion(StandardField.AUTHOR, false),
                         new SaveOrder.SortCriterion(StandardField.YEAR, true),
                         new SaveOrder.SortCriterion(StandardField.ABSTRACT, false)));
-        metaData.setSaveOrderConfig(saveOrder);
+        metaData.setSaveOrder(saveOrder);
 
         databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
 
@@ -799,7 +801,7 @@ void writeEntriesSorted() throws Exception {
                 List.of(new SaveOrder.SortCriterion(StandardField.AUTHOR, false),
                         new SaveOrder.SortCriterion(StandardField.YEAR, true),
                         new SaveOrder.SortCriterion(StandardField.ABSTRACT, false)));
-        metaData.setSaveOrderConfig(saveOrder);
+        metaData.setSaveOrder(saveOrder);
 
         BibEntry firstEntry = new BibEntry(StandardEntryType.Article)
                 .withField(StandardField.AUTHOR, "A")
diff --git a/src/test/java/org/jabref/logic/exporter/CsvExportFormatTest.java b/src/test/java/org/jabref/logic/exporter/CsvExportFormatTest.java
index f551cdec9b0..53342e7d7fa 100644
--- a/src/test/java/org/jabref/logic/exporter/CsvExportFormatTest.java
+++ b/src/test/java/org/jabref/logic/exporter/CsvExportFormatTest.java
@@ -20,7 +20,6 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
 
 public class CsvExportFormatTest {
 
@@ -29,9 +28,6 @@ public class CsvExportFormatTest {
 
     @BeforeEach
     public void setUp() {
-        SaveConfiguration saveConfiguration = mock(SaveConfiguration.class);
-        when(saveConfiguration.getSaveOrder()).thenReturn(SaveOrder.getDefaultSaveOrder());
-
         exportFormat = new TemplateExporter(
                 "OpenOffice/LibreOffice CSV",
                 "oocsv",
@@ -39,7 +35,7 @@ public void setUp() {
                 "openoffice",
                 StandardFileType.CSV,
                 mock(LayoutFormatterPreferences.class, Answers.RETURNS_DEEP_STUBS),
-                saveConfiguration);
+                SaveOrder.getDefaultSaveOrder());
 
         databaseContext = new BibDatabaseContext();
     }
@@ -101,8 +97,8 @@ 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");
+        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 b46b12c7fdf..07877f9c255 100644
--- a/src/test/java/org/jabref/logic/exporter/DocBook5ExporterTest.java
+++ b/src/test/java/org/jabref/logic/exporter/DocBook5ExporterTest.java
@@ -13,6 +13,7 @@
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.Date;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.model.metadata.SaveOrder;
@@ -29,7 +30,6 @@
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
 
 public class DocBook5ExporterTest {
 
@@ -42,9 +42,6 @@ public class DocBook5ExporterTest {
 
     @BeforeEach
     void setUp() throws URISyntaxException {
-        SaveConfiguration saveConfiguration = mock(SaveConfiguration.class);
-        when(saveConfiguration.getSaveOrder()).thenReturn(SaveOrder.getDefaultSaveOrder());
-
         exporter = new TemplateExporter(
                 "DocBook 5.1",
                 "docbook5",
@@ -52,19 +49,19 @@ void setUp() throws URISyntaxException {
                 null,
                 StandardFileType.XML,
                 mock(LayoutFormatterPreferences.class, Answers.RETURNS_DEEP_STUBS),
-                saveConfiguration);
+                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 e3b38e8918f..23221d0311a 100644
--- a/src/test/java/org/jabref/logic/exporter/DocbookExporterTest.java
+++ b/src/test/java/org/jabref/logic/exporter/DocbookExporterTest.java
@@ -21,7 +21,6 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
 
 public class DocbookExporterTest {
 
@@ -32,9 +31,6 @@ public class DocbookExporterTest {
 
     @BeforeEach
     public void setUp() {
-        SaveConfiguration saveConfiguration = mock(SaveConfiguration.class);
-        when(saveConfiguration.getSaveOrder()).thenReturn(SaveOrder.getDefaultSaveOrder());
-
         exportFormat = new TemplateExporter(
                 "DocBook 4",
                 "docbook4",
@@ -42,7 +38,7 @@ public void setUp() {
                 null,
                 StandardFileType.XML,
                 mock(LayoutFormatterPreferences.class, Answers.RETURNS_DEEP_STUBS),
-                saveConfiguration);
+                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 0bf78d73c2b..dc669e07dac 100644
--- a/src/test/java/org/jabref/logic/exporter/EmbeddedBibFilePdfExporterTest.java
+++ b/src/test/java/org/jabref/logic/exporter/EmbeddedBibFilePdfExporterTest.java
@@ -43,7 +43,6 @@ class EmbeddedBibFilePdfExporterTest {
     private EmbeddedBibFilePdfExporter exporter;
 
     private BibDatabaseContext databaseContext;
-    private BibDatabase dataBase;
     private JournalAbbreviationRepository abbreviationRepository;
     private FilePreferences filePreferences;
 
@@ -111,7 +110,7 @@ void setUp() throws IOException {
         exporter = new EmbeddedBibFilePdfExporter(bibDatabaseMode, bibEntryTypesManager, fieldPreferences);
 
         databaseContext = new BibDatabaseContext();
-        dataBase = databaseContext.getDatabase();
+        BibDatabase dataBase = databaseContext.getDatabase();
 
         initBibEntries();
         dataBase.insertEntry(olly2018);
@@ -142,13 +141,13 @@ public static Stream<Arguments> provideBibEntriesWithInvalidPdfFileLinks() {
     @ParameterizedTest
     @MethodSource("providePathsToValidPDFs")
     void successfulExportToFileByPath(Path path) throws Exception {
-        assertTrue(exporter.exportToFileByPath(databaseContext, dataBase, filePreferences, path, abbreviationRepository));
+        assertTrue(exporter.exportToFileByPath(databaseContext, filePreferences, path, abbreviationRepository));
     }
 
     @ParameterizedTest
     @MethodSource("providePathsToInvalidPDFs")
     void unsuccessfulExportToFileByPath(Path path) throws Exception {
-        assertFalse(exporter.exportToFileByPath(databaseContext, dataBase, filePreferences, path, abbreviationRepository));
+        assertFalse(exporter.exportToFileByPath(databaseContext, filePreferences, path, abbreviationRepository));
     }
 
     public static Stream<Arguments> providePathsToValidPDFs() {
diff --git a/src/test/java/org/jabref/logic/exporter/HtmlExportFormatTest.java b/src/test/java/org/jabref/logic/exporter/HtmlExportFormatTest.java
index 3f18d4704b1..b684e84a2e4 100644
--- a/src/test/java/org/jabref/logic/exporter/HtmlExportFormatTest.java
+++ b/src/test/java/org/jabref/logic/exporter/HtmlExportFormatTest.java
@@ -21,7 +21,6 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
 
 public class HtmlExportFormatTest {
     public BibDatabaseContext databaseContext;
@@ -31,16 +30,13 @@ public class HtmlExportFormatTest {
 
     @BeforeEach
     public void setUp() {
-        SaveConfiguration saveConfiguration = mock(SaveConfiguration.class);
-        when(saveConfiguration.getSaveOrder()).thenReturn(SaveOrder.getDefaultSaveOrder());
-
         exportFormat = new TemplateExporter("HTML",
                 "html",
                 "html",
                 null,
                 StandardFileType.HTML,
                 mock(LayoutFormatterPreferences.class, Answers.RETURNS_DEEP_STUBS),
-                saveConfiguration);
+                SaveOrder.getDefaultSaveOrder());
 
         databaseContext = new BibDatabaseContext();
         charset = StandardCharsets.UTF_8;
diff --git a/src/test/java/org/jabref/logic/exporter/XmpPdfExporterTest.java b/src/test/java/org/jabref/logic/exporter/XmpPdfExporterTest.java
index 2e630f3ae27..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,6 @@
 
 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;
@@ -42,13 +40,9 @@ 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;
 
@@ -101,20 +95,15 @@ private static void initBibEntries() throws IOException {
     @BeforeEach
     void setUp() throws IOException {
         abbreviationRepository = mock(JournalAbbreviationRepository.class);
-
-        xmpPreferences = new XmpPreferences(false, Collections.emptySet(), new SimpleObjectProperty<>(','));
-
-        encoding = Charset.defaultCharset();
-
         filePreferences = mock(FilePreferences.class);
         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);
@@ -145,13 +134,13 @@ public static Stream<Arguments> provideBibEntriesWithInvalidPdfFileLinks() {
     @ParameterizedTest
     @MethodSource("providePathsToValidPDFs")
     void successfulExportToFileByPath(Path path) throws Exception {
-        assertTrue(exporter.exportToFileByPath(databaseContext, dataBase, filePreferences, path, abbreviationRepository));
+        assertTrue(exporter.exportToFileByPath(databaseContext, filePreferences, path, abbreviationRepository));
     }
 
     @ParameterizedTest
     @MethodSource("providePathsToInvalidPDFs")
     void unsuccessfulExportToFileByPath(Path path) throws Exception {
-        assertFalse(exporter.exportToFileByPath(databaseContext, dataBase, filePreferences, path, abbreviationRepository));
+        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 36f9665b094..db42e79dbbc 100644
--- a/src/test/java/org/jabref/logic/exporter/YamlExporterTest.java
+++ b/src/test/java/org/jabref/logic/exporter/YamlExporterTest.java
@@ -20,7 +20,6 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
 
 public class YamlExporterTest {
 
@@ -29,9 +28,6 @@ public class YamlExporterTest {
 
     @BeforeAll
     static void setUp() {
-        SaveConfiguration saveConfiguration = mock(SaveConfiguration.class);
-        when(saveConfiguration.getSaveOrder()).thenReturn(SaveOrder.getDefaultSaveOrder());
-
         yamlExporter = new TemplateExporter(
                 "CSL YAML",
                 "yaml",
@@ -39,7 +35,7 @@ static void setUp() {
                 null,
                 StandardFileType.YAML,
                 mock(LayoutFormatterPreferences.class, Answers.RETURNS_DEEP_STUBS),
-                saveConfiguration,
+                SaveOrder.getDefaultSaveOrder(),
                 BlankLineBehaviour.DELETE_BLANKS);
 
         databaseContext = new BibDatabaseContext();
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/WebFetchersTest.java b/src/test/java/org/jabref/logic/importer/WebFetchersTest.java
index acd70190b6e..ffa6314fff7 100644
--- a/src/test/java/org/jabref/logic/importer/WebFetchersTest.java
+++ b/src/test/java/org/jabref/logic/importer/WebFetchersTest.java
@@ -7,8 +7,10 @@
 import java.util.stream.Collectors;
 
 import org.jabref.logic.importer.fetcher.AbstractIsbnFetcher;
+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;
@@ -74,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));
         }
@@ -118,6 +121,7 @@ void getSearchBasedFetchersReturnsAllFetcherDerivingFromSearchBasedFetcher() {
             // Remove the following, because they don't work atm
             expected.remove(JstorFetcher.class);
             expected.remove(GoogleScholar.class);
+            expected.remove(CollectionOfComputerScienceBibliographiesFetcher.class);
 
             expected.remove(PagedSearchBasedParserFetcher.class);
             expected.remove(PagedSearchBasedFetcher.class);
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/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 991e6ed91f9..27b781014fb 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/CompositeSearchBasedFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/CompositeSearchBasedFetcherTest.java
@@ -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/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/isbntobibtex/EbookDeIsbnFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/isbntobibtex/EbookDeIsbnFetcherTest.java
index 6943a720b94..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 {
 
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/fileformat/ACMPortalParserTest.java b/src/test/java/org/jabref/logic/importer/fileformat/ACMPortalParserTest.java
index ec1b8670e27..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")
@@ -74,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
@@ -112,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/BibtexParserTest.java b/src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java
index 3017bb603a8..bdfc7a8718c 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java
@@ -1322,7 +1322,7 @@ void integrationTestSaveOrderConfig() throws IOException {
                 new StringReader(
                         "@Comment{jabref-meta: saveOrderConfig:specified;author;false;year;true;abstract;false;}"));
 
-        Optional<SaveOrder> saveOrderConfig = result.getMetaData().getSaveOrderConfig();
+        Optional<SaveOrder> saveOrderConfig = result.getMetaData().getSaveOrder();
 
         assertEquals(new SaveOrder(SaveOrder.OrderType.SPECIFIED, List.of(
                         new SaveOrder.SortCriterion(StandardField.AUTHOR, false),
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/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/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 66ce19de38f..442e9d3a3c1 100644
--- a/src/test/java/org/jabref/logic/journals/JournalAbbreviationRepositoryTest.java
+++ b/src/test/java/org/jabref/logic/journals/JournalAbbreviationRepositoryTest.java
@@ -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/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/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/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>