diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index e754e4fd43e..dbc1b61775b 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -12,7 +12,7 @@ body:
     attributes:
       label: JabRef version
       options:
-        - "5.11 (latest release)"
+        - "5.12 (latest release)"
         - Latest development branch build (please note build date below)
         - Other (please describe below)
       description: The version as shown in the about dialog.
diff --git a/.github/workflows/check-links.yml b/.github/workflows/check-links.yml
index a121d295643..0fa9a5f1670 100644
--- a/.github/workflows/check-links.yml
+++ b/.github/workflows/check-links.yml
@@ -11,7 +11,7 @@ on:
   workflow_dispatch:
 
 concurrency:
-  group: "${{ github.workflow }}-${{ github.head_ref }}"
+  group: "${{ github.workflow }}-${{ github.head_ref || github.ref }}"
   cancel-in-progress: true
 
 jobs:
@@ -29,7 +29,7 @@ jobs:
           restore-keys: cache-lychee-
       - name: Link Checker
         id: lychee
-        uses: lycheeverse/lychee-action@v1.8.0
+        uses: lycheeverse/lychee-action@v1.9.0
         with:
           fail: true
-          args: --max-concurrency 1 --cache --no-progress --exclude-all-private './**/*.md'
+          args: --accept '200,201,202,203,204,429,500' --max-concurrency 1 --cache --no-progress --exclude-all-private './**/*.md'
diff --git a/.github/workflows/cleanup-pr.yml b/.github/workflows/cleanup-pr.yml
index 77a8874bc6b..9444fd882b6 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@v1.0.0
+        uses: appleboy/ssh-action@v1.0.3
         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 b5cb0cf4bc0..02967c123ea 100644
--- a/.github/workflows/deployment-arm64.yml
+++ b/.github/workflows/deployment-arm64.yml
@@ -22,7 +22,7 @@ env:
   JAVA_OPTS: -Xmx4g
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  group: "${{ github.workflow }}-${{ github.head_ref || github.ref }}"
   cancel-in-progress: true
 
 jobs:
@@ -59,11 +59,10 @@ jobs:
         id: gitversion
         uses: gittools/actions/gitversion/execute@v0.10.2
       - name: Setup JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 21.0.1
           distribution: 'liberica'
-          cache: 'gradle'
       - name: Clean up keychain
         run: |
          security delete-keychain signing_temp.keychain ${{runner.temp}}/keychain/notarization.keychain || true
@@ -85,6 +84,8 @@ jobs:
           mkdir ${{runner.temp}}/keychain
           security create-keychain -p jabref ${{runner.temp}}/keychain/notarization.keychain
           security set-keychain-settings ${{runner.temp}}/keychain/notarization.keychain
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
       - name: Prepare merged jars and modules dir (macOS)
         run: ./gradlew -i -PprojVersion="${{ steps.gitversion.outputs.AssemblySemVer }}" -PprojVersionInfo="${{ steps.gitversion.outputs.InformationalVersion }}" prepareModulesDir
       - name: Build dmg (macOS)
@@ -161,7 +162,7 @@ jobs:
           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
+        uses: actions/upload-artifact@v4
         with:
           name: JabRef-${{ matrix.displayName }}
           path: build/distribution
diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml
index c23f0ccf516..d4e176743f6 100644
--- a/.github/workflows/deployment.yml
+++ b/.github/workflows/deployment.yml
@@ -31,7 +31,7 @@ env:
   JDK21: ""
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  group: "${{ github.workflow }}-${{ github.head_ref || github.ref }}"
   cancel-in-progress: true
 
 jobs:
@@ -90,11 +90,12 @@ jobs:
         id: gitversion
         uses: gittools/actions/gitversion/execute@v0.10.2
       - name: Setup JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 21.0.1
           distribution: 'liberica'
-          cache: 'gradle'
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
       - name: Prepare merged jars and modules dir (macOS)
         if: (matrix.os == 'macos-latest') || (steps.checksecrets.outputs.secretspresent == 'NO')
         run: ./gradlew -i -PprojVersion="${{ steps.gitversion.outputs.AssemblySemVer }}" -PprojVersionInfo="${{ steps.gitversion.outputs.InformationalVersion }}" prepareModulesDir
@@ -219,14 +220,14 @@ jobs:
           rsync -rt --chmod=Du=rwx,Dg=rx,Do=rx,Fu=rw,Fg=r,Fo=r --itemize-changes --stats --rsync-path="mkdir -p /var/www/builds.jabref.org/www/${{ steps.gitversion.outputs.branchName }} && rsync" -e 'ssh -p 9922 -i sshkey -o StrictHostKeyChecking=no' build/distribution/ jrrsync@build-upload.jabref.org:/var/www/builds.jabref.org/www/${{ steps.gitversion.outputs.branchName }}/
       - name: Upload to GitHub workflow artifacts store (macOS)
         if: (matrix.os == 'macos-latest') && (steps.checksecrets.outputs.secretspresent == 'YES') && (startsWith(github.ref, 'refs/tags/') || inputs.notarization == true)
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           # tbn = to-be-notarized
           name: JabRef-macOS-tbn
           path: build/distribution
       - name: Upload to GitHub workflow artifacts store
         if: (steps.checksecrets.outputs.secretspresent != 'YES')
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           # tbn = to-be-notarized
           name: JabRef-${{ matrix.os }}
diff --git a/.github/workflows/gource.yml b/.github/workflows/gource.yml
index ccde09af4f9..a1cb073f6f8 100644
--- a/.github/workflows/gource.yml
+++ b/.github/workflows/gource.yml
@@ -64,7 +64,7 @@ jobs:
         run: |
           mv gource/gource.mp4 gource-videos/jabref-complete.mp4
       - name: 'Upload gource video'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Gource
           path: gource-videos/
diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml
index cf662647b3e..761626a85ce 100644
--- a/.github/workflows/pages.yml
+++ b/.github/workflows/pages.yml
@@ -39,13 +39,13 @@ jobs:
           working-directory: docs/
       - name: Setup Pages
         id: pages
-        uses: actions/configure-pages@v3
+        uses: actions/configure-pages@v4
       - name: Build with Jekyll
         run: |
           cd docs
           bundle exec jekyll build
       - name: Upload artifact
-        uses: actions/upload-pages-artifact@v2
+        uses: actions/upload-pages-artifact@v3
         with:
           path: docs/_site/
 
@@ -59,4 +59,4 @@ jobs:
     steps:
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v2
+        uses: actions/deploy-pages@v4
diff --git a/.github/workflows/refresh-csl-subtrees.yml b/.github/workflows/refresh-csl-subtrees.yml
index 3e86ac97267..789bd4b6ba0 100644
--- a/.github/workflows/refresh-csl-subtrees.yml
+++ b/.github/workflows/refresh-csl-subtrees.yml
@@ -31,6 +31,11 @@ jobs:
           cd src/main/resources/csl-locales
           git checkout master
           git pull
+      - name: Persist changes
+        run: |
+          git add -f src/main/resources/csl-styles
+          git add -f src/main/resources/csl-locales
+          git diff-index --quiet HEAD || git commit -m 'Update CSL styles'
       - uses: peter-evans/create-pull-request@v5
         with:
           token: ${{ secrets.GH_TOKEN_UPDATE_GRADLE_WRAPPER }}
diff --git a/.github/workflows/refresh-journal-lists.yml b/.github/workflows/refresh-journal-lists.yml
index 88f43f673c1..367c905031c 100644
--- a/.github/workflows/refresh-journal-lists.yml
+++ b/.github/workflows/refresh-journal-lists.yml
@@ -28,14 +28,19 @@ jobs:
           git checkout main
           git pull
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 21.0.1
           distribution: 'liberica'
-          cache: 'gradle'
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
       - name: Check whether journal-list.mv can be generated (the "real" generation is done inside JabRef's build process)
         run: |
           ./gradlew generateJournalListMV
+      - name: Persist changes
+        run: |
+          git add -f buildres/abbrv.jabref.org
+          git diff-index --quiet HEAD || git commit -m 'Update journal abbreviation lists'
       - uses: peter-evans/create-pull-request@v5
         with:
           token: ${{ secrets.GH_TOKEN_UPDATE_GRADLE_WRAPPER }}
diff --git a/.github/workflows/tests-fetchers.yml b/.github/workflows/tests-fetchers.yml
index ee155b0c243..f107721e328 100644
--- a/.github/workflows/tests-fetchers.yml
+++ b/.github/workflows/tests-fetchers.yml
@@ -29,7 +29,7 @@ env:
   BiodiversityHeritageApiKey: ${{ secrets.BiodiversityHeritageApiKey_FOR_TESTS}}
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  group: "${{ github.workflow }}-${{ github.head_ref || github.ref }}"
   cancel-in-progress: true
 
 permissions:
@@ -46,11 +46,12 @@ jobs:
           submodules: 'true'
           show-progress: 'false'
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 21.0.1
           distribution: 'liberica'
-          cache: 'gradle'
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
       - name: Run fetcher tests
         run: ./gradlew fetcherTest
         env:
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 86ae1543a1a..af7f28c8fc0 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -18,7 +18,7 @@ env:
   JAVA_OPTS: -Xmx4g
 
 concurrency:
-  group: tests-${{ github.head_ref }}
+  group: "${{ github.workflow }}-${{ github.head_ref || github.ref }}"
   cancel-in-progress: true
 
 permissions:
@@ -35,11 +35,10 @@ jobs:
           submodules: 'true'
           show-progress: 'false'
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 21.0.1
           distribution: 'liberica'
-          cache: 'gradle'
       - name: Run checkstyle reporter
         uses: nikitasavinov/checkstyle-action@master
         with:
@@ -47,6 +46,8 @@ jobs:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           checkstyle_config: 'config/checkstyle/checkstyle_reviewdog.xml'
           checkstyle_version: '10.3'
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
       - name: Run checkstyle using gradle
         run: ./gradlew checkstyleMain checkstyleTest checkstyleJmh
   openrewrite:
@@ -59,11 +60,12 @@ jobs:
           submodules: 'true'
           show-progress: 'false'
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 21.0.1
           distribution: 'liberica'
-          cache: 'gradle'
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
       - name: Run OpenRewrite
         run: |
           ./gradlew rewriteDryRun
@@ -77,11 +79,12 @@ jobs:
           submodules: 'true'
           show-progress: 'false'
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 21.0.1
           distribution: 'liberica'
-          cache: 'gradle'
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
       - name: Run modernizer
         run: |
           # enable failing of this task if modernizer complains
@@ -97,7 +100,7 @@ jobs:
           submodules: 'false'
           show-progress: 'false'
       - name: markdownlint-cli2-action
-        uses: DavidAnson/markdownlint-cli2-action@v13
+        uses: DavidAnson/markdownlint-cli2-action@v14
         with:
           globs: |
             *.md
@@ -158,11 +161,12 @@ jobs:
           submodules: 'true'
           show-progress: 'false'
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 21.0.1
           distribution: 'liberica'
-          cache: 'gradle'
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
       - name: Run tests
         run: xvfb-run --auto-servernum ./gradlew check -x checkstyleJmh -x checkstyleMain -x checkstyleTest -x modernizer
         env:
@@ -193,11 +197,12 @@ jobs:
           submodules: 'true'
           show-progress: 'false'
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 21.0.1
           distribution: 'liberica'
-          cache: 'gradle'
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
       - name: Run tests on PostgreSQL
         run: ./gradlew databaseTest --rerun-tasks
         env:
@@ -230,11 +235,12 @@ jobs:
           submodules: 'true'
           show-progress: 'false'
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 21.0.1
           distribution: 'liberica'
-          cache: 'gradle'
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
       - name: Run GUI tests
         run: xvfb-run --auto-servernum ./gradlew guiTest
         env:
@@ -274,11 +280,12 @@ jobs:
           show-progress: 'false'
       - name: Set up JDK
         if: github.ref == 'refs/heads/main'
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 21.0.1
           distribution: 'liberica'
-          cache: 'gradle'
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
       - name: Update test coverage metrics
         if: (github.ref == 'refs/heads/main') && (steps.checksecrets.outputs.secretspresent == 'YES')
         run: xvfb-run --auto-servernum ./gradlew jacocoTestReport
diff --git a/.github/workflows/update-gradle-wrapper.yml b/.github/workflows/update-gradle-wrapper.yml
index afa016cb262..1cce0bab119 100644
--- a/.github/workflows/update-gradle-wrapper.yml
+++ b/.github/workflows/update-gradle-wrapper.yml
@@ -8,9 +8,14 @@ on:
 jobs:
   update-gradle-wrapper:
     runs-on: ubuntu-latest
-
+   
     steps:
       - uses: actions/checkout@v4
+      - name: Setup JDK
+        uses: actions/setup-java@v4
+        with:
+          java-version: 21.0.1
+          distribution: 'liberica'
 
       - name: Update Gradle Wrapper
         uses: gradle-update/update-gradle-wrapper-action@v1
diff --git a/.gitmodules b/.gitmodules
index 39f867d9511..10944a3d5a0 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,15 @@
-[submodule "buildres/abbrv.jabref.org"]
+[submodule "abbrv.jabref.org"]
   path = buildres/abbrv.jabref.org
   url = https://github.com/JabRef/abbrv.jabref.org.git
-[submodule "buildres/csl-styles"]
+  ignore = all
+  shallow = true
+[submodule "csl-styles"]
   path = src/main/resources/csl-styles
   url = https://github.com/citation-style-language/styles.git
-[submodule "buildres/csl-locales"]
+  ignore = all
+  shallow = true
+[submodule "csl-locales"]
   path = src/main/resources/csl-locales
   url = https://github.com/citation-style-language/locales.git
+  ignore = all
+  shallow = true
diff --git a/.lycheeignore b/.lycheeignore
index 8d3f2072f17..801ddc56e23 100644
--- a/.lycheeignore
+++ b/.lycheeignore
@@ -2,6 +2,7 @@ https://arxiv.org/
 https://contribute.jabref.org/
 https://donations.jabref.org/
 https://pubs.acs.org/
+https://scholar.archive.org/
 https://web.archive.org/
 https://www.researchgate.net/privacy-policy
 https://www.sciencedirect.com/
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ffaa0b80b05..744c6d801b0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,11 +11,38 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv
 
 ### Added
 
+- When importing entries form the "Citation relations" tab, the field [cites](https://docs.jabref.org/advanced/entryeditor/entrylinks) is now filled according to the relationship between the entries. [#10572](https://github.com/JabRef/jabref/pull/10752)
+
+### Changed
+
+- The "Automatically open folders of attached files" preference default status has been changed to enabled on Windows. [koppor#56](https://github.com/koppor/jabref/issues/56)
+- The Custom export format now uses the custom DOI base URI in the preferences for the `DOICheck`, if activated [forum#4084](https://discourse.jabref.org/t/export-html-disregards-custom-doi-base-uri/4084)
+- The index directories for full text search have now more readable names to increase debugging possibilities using Apache Lucense's Lurk. [#10193](https://github.com/JabRef/jabref/issues/10193)
+- The fulltext search also indexes files ending with .pdf (but do not having an explicit file type set). [#10193](https://github.com/JabRef/jabref/issues/10193)
+- We changed the order of the lists in the "Citation relations" tab. `Cites` are now on the left and `Cited by` on the right [#10572](https://github.com/JabRef/jabref/pull/10752)
+
+### Fixed
+
+- We fixed an issue where attempting to cancel the importing/generation of an entry from id is ignored. [#10508](https://github.com/JabRef/jabref/issues/10508)
+- We fixed an issue where the preview panel showing the wrong entry (an entry that is not selected in the entry table). [#9172](https://github.com/JabRef/jabref/issues/9172)
+- The last page of a PDF is now indexed by the full text search. [#10193](https://github.com/JabRef/jabref/issues/10193)
+- We fixed an issue where the duplicate check did not take umlauts or other LaTeX-encoded characters into account. [#10744](https://github.com/JabRef/jabref/pull/10744)
+- We fixed the colors of the icon on hover for unset special fields. [#10431](https://github.com/JabRef/jabref/issues/10431)
+
+### Removed
+
+## [5.12] – 2023-12-24
+
+### Added
+
 - We added a scite.ai tab in the entry editor that retrieves 'Smart Citation' tallies for citations that have a DOI. [koppor#375](https://github.com/koppor/jabref/issues/375)  
 - We added a dropdown menu to let users change the reference library during AUX file import. [#10472](https://github.com/JabRef/jabref/issues/10472)
 - We added a button to let users reset the cite command to the default value. [#10569](https://github.com/JabRef/jabref/issues/10569)
 - We added the option to use System Preference for Light/Dark Theme [#8729](https://github.com/JabRef/jabref/issues/8729).
 - We added [scholar.archive.org](https://scholar.archive.org/) as a new fetcher. [#10498](https://github.com/JabRef/jabref/issues/10498)
+- We integrated predatory journal checking as part of the Integrity Checker based on the [check-bib-for-predatory](https://github.com/CfKu/check-bib-for-predatory). [koppor#348](https://github.com/koppor/jabref/issues/348)
+- We added a 'More options' section in the main table right click menu opening the preferences dialog. [#9432](https://github.com/JabRef/jabref/issues/9432)
+- When creating a new group, it inherits the icon of the parent group. [#10521](https://github.com/JabRef/jabref/pull/10521)
 
 ### Changed
 
@@ -25,21 +52,23 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv
 - We replaced "SearchAll" in Web Search by "Search Selected". [#10556](https://github.com/JabRef/jabref/issues/10556)
 - Short DOI formatter now checks, if the value is already formatted. If so, it returns the value instead of calling the ShortDOIService again. [#10589](https://github.com/JabRef/jabref/issues/10589)
 - We upgraded to JavaFX 21.0.1. As a consequence JabRef requires now macOS 11 or later and GTK 3.8 or later on Linux [10627](https://github.com/JabRef/jabref/pull/10627).
+- A user-specific comment fields is not enabled by default, but can be enabled using the "Add" button. [#10424](https://github.com/JabRef/jabref/issues/10424)
+- We upgraded to Lucene 9.9 for the fulltext search. The search index will be rebuild. [#10686](https://github.com/JabRef/jabref/pull/10686)
+- When using "Copy..." -> "Copy citation key", the delimiter configured at "Push applications" is respected. [#10707](https://github.com/JabRef/jabref/pull/10707)
 
 ### Fixed
 
 - We fixed an issue where the added protected term has unwanted leading and trailing whitespaces, where the formatted text has unwanted empty brackets and where the word at the cursor in the textbox can be added to the list. [#10415](https://github.com/JabRef/jabref/issues/10415)
 - We fixed an issue where in the merge dialog the file field of entries was not correctly merged when the first and second entry both contained values inside the file field. [#10572](https://github.com/JabRef/jabref/issues/10572)
-- We fixed some small inconsistencies in the user interface. [#10507](https://github.com/JabRef/jabref/issues/10507) [#10458](https://github.com/JabRef/jabref/issues/10458)
+- We fixed some small inconsistencies in the user interface. [#10507](https://github.com/JabRef/jabref/issues/10507) [#10458](https://github.com/JabRef/jabref/issues/10458) [#10660](https://github.com/JabRef/jabref/issues/10660)
 - We fixed the issue where the Hayagriva YAML exporter would not include a parent field for the publisher/series. [#10596](https://github.com/JabRef/jabref/issues/10596)
+- We fixed issues in the external file type dialog w.r.t. duplicate entries in the case of a language switch. [#10271](https://github.com/JabRef/jabref/issues/10271)
+- We fixed an issue where the right-click action "Copy cite..." did not respect the configured citation command under "External Programs" -> "[Push Applications](https://docs.jabref.org/cite/pushtoapplications)" [#10615](https://github.com/JabRef/jabref/issues/10615)
 
 ### Removed
 
 - We removed duplicate filtering and sorting operations in the MainTable when editing BibEntries. [#10619](https://github.com/JabRef/jabref/pull/10619)
 
-
-
-
 ## [5.11] – 2023-10-22
 
 ### Added
@@ -1194,7 +1223,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.11...HEAD
+[Unreleased]: https://github.com/JabRef/jabref/compare/v5.12...HEAD
+[5.12]: https://github.com/JabRef/jabref/compare/v5.11...v5.12
 [5.11]: https://github.com/JabRef/jabref/compare/v5.10...v5.11
 [5.10]: https://github.com/JabRef/jabref/compare/v5.9...v5.10
 [5.9]: https://github.com/JabRef/jabref/compare/v5.8...v5.9
diff --git a/CITATION.cff b/CITATION.cff
new file mode 100644
index 00000000000..570a4e57b0c
--- /dev/null
+++ b/CITATION.cff
@@ -0,0 +1,58 @@
+# This CITATION.cff file was generated with cffinit.
+# Visit https://bit.ly/cffinit to generate yours today!
+
+cff-version: 1.2.0
+title: JabRef
+message: >-
+  If you use this software, please cite it using the
+  metadata from this file.
+type: software
+authors:
+  - given-names: Oliver
+    family-names: Kopp
+    orcid: 'https://orcid.org/0000-0001-6962-4290'
+  - given-names: Tobias
+    family-names: Diez
+    orcid: 'https://orcid.org/0000-0002-1407-7696'
+  - given-names: Christoph
+    family-names: Schwentker
+  - given-names: Carl Christian
+    family-names: Snethlage
+  - given-names: Jonatan
+    family-names: Asketorp
+  - given-names: Benedikt
+    family-names: Tutzer
+  - given-names: Thilo
+    family-names: Ertel
+  - given-names: Houssem
+    family-names: Nasri
+repository-code: 'https://github.com/jabref/jabref/'
+url: 'https://www.jabref.org'
+abstract: >-
+  JabRef is an open-source, cross-platform citation and
+  reference management tool.
+keywords:
+  - reference manager
+  - bibtex
+  - biblatex
+license: MIT
+preferred-citation:
+  type: article
+  authors:
+  - family-names: "Kopp"
+    given-names: "Oliver"
+    orcid: "https://orcid.org/0000-0001-6962-4290"
+  - family-names: "Snethlage"
+    given-names: "Carl Christian"
+  - family-names: "Schwentker"
+    given-names: "Christoph"
+  doi: "10.47397/tb/44-3/tb138kopp-jabref"
+  journal: "TUGboat"
+  month: 11
+  start: 441
+  end: 447
+  title: "JabRef: BibTeX-based literature management software"
+  issue: 138
+  volume: 44
+  number: 3
+  year: 2023
diff --git a/build.gradle b/build.gradle
index 800fa9fe067..256b3d85bee 100644
--- a/build.gradle
+++ b/build.gradle
@@ -27,7 +27,7 @@ plugins {
 
     id 'idea'
 
-    id 'org.openrewrite.rewrite' version '6.5.4'
+    id 'org.openrewrite.rewrite' version '6.6.3'
 }
 
 // Enable following for debugging
@@ -101,7 +101,7 @@ dependencyLocking {
 }
 
 javafx {
-    version = "21.0.1"
+    version = "20"
     modules = [ 'javafx.controls', 'javafx.fxml', 'javafx.web', 'javafx.swing' ]
 }
 
@@ -113,27 +113,29 @@ 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'
-    implementation 'org.apache.pdfbox:fontbox:3.0.0'
-    implementation 'org.apache.pdfbox:xmpbox:3.0.0'
+    implementation 'org.apache.pdfbox:pdfbox:3.0.1'
+    implementation 'org.apache.pdfbox:fontbox:3.0.1'
+    implementation ('org.apache.pdfbox:xmpbox:3.0.1') {
+        exclude group: 'org.junit.jupiter'
+    }
 
-    implementation 'org.apache.lucene:lucene-core:9.8.0'
-    implementation 'org.apache.lucene:lucene-queryparser:9.8.0'
-    implementation 'org.apache.lucene:lucene-queries:9.8.0'
-    implementation 'org.apache.lucene:lucene-analysis-common:9.8.0'
-    implementation 'org.apache.lucene:lucene-highlighter:9.8.0'
+    implementation 'org.apache.lucene:lucene-core:9.9.1'
+    implementation 'org.apache.lucene:lucene-queryparser:9.9.1'
+    implementation 'org.apache.lucene:lucene-queries:9.9.0'
+    implementation 'org.apache.lucene:lucene-analysis-common:9.9.1'
+    implementation 'org.apache.lucene:lucene-highlighter:9.9.1'
 
     implementation group: 'org.apache.commons', name: 'commons-csv', version: '1.10.0'
-    implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.13.0'
+    implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.14.0'
     implementation 'com.h2database:h2-mvstore:2.2.224'
 
     // required for reading write-protected PDFs - see https://github.com/JabRef/jabref/pull/942#issuecomment-209252635
-    implementation 'org.bouncycastle:bcprov-jdk18on:1.76'
+    implementation 'org.bouncycastle:bcprov-jdk18on:1.77'
 
     implementation 'commons-cli:commons-cli:1.6.0'
 
-    implementation 'org.libreoffice:unoloader:7.6.1'
-    implementation 'org.libreoffice:libreoffice:7.6.1'
+    implementation 'org.libreoffice:unoloader:7.6.4'
+    implementation 'org.libreoffice:libreoffice:7.6.4'
 
     implementation 'io.github.java-diff-utils:java-diff-utils:4.12'
     implementation 'info.debatty:java-string-similarity:2.0.0'
@@ -142,16 +144,16 @@ dependencies {
     antlr4 'org.antlr:antlr4:4.13.1'
     implementation 'org.antlr:antlr4-runtime:4.13.1'
 
-    implementation group: 'org.eclipse.jgit', name: 'org.eclipse.jgit', version: '6.7.0.202309050840-r'
+    implementation group: 'org.eclipse.jgit', name: 'org.eclipse.jgit', version: '6.8.0.202311291450-r'
 
-    implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: '2.16.0'
-    implementation group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: '2.15.3'
+    implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: '2.16.1'
+    implementation group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: '2.16.1'
 
     implementation 'com.fasterxml:aalto-xml:1.3.2'
 
     implementation group: 'org.mariadb.jdbc', name: 'mariadb-java-client', version: '2.7.9'
 
-    implementation 'org.postgresql:postgresql:42.6.0'
+    implementation 'org.postgresql:postgresql:42.7.1'
 
     implementation ('com.oracle.ojdbc:ojdbc10:19.3.0.0') {
         // causing module issues
@@ -182,7 +184,7 @@ dependencies {
     implementation 'org.controlsfx:controlsfx:11.2.0'
     implementation 'com.github.Dansoftowner:jSystemThemeDetector:3.8'
 
-    implementation 'org.jsoup:jsoup:1.16.2'
+    implementation 'org.jsoup:jsoup:1.17.2'
     implementation 'com.konghq:unirest-java:3.14.5'
 
     implementation 'org.slf4j:slf4j-api:2.0.9'
@@ -221,29 +223,32 @@ dependencies {
     // API
     implementation 'jakarta.ws.rs:jakarta.ws.rs-api:3.1.0'
     // Implementation of the API
-    implementation 'org.glassfish.jersey.core:jersey-server:3.1.3'
+    implementation 'org.glassfish.jersey.core:jersey-server:3.1.5'
     // injection framework
-    implementation 'org.glassfish.jersey.inject:jersey-hk2:3.1.3'
+    implementation 'org.glassfish.jersey.inject:jersey-hk2:3.1.5'
     implementation 'org.glassfish.hk2:hk2-api:3.0.5'
     // testImplementation 'org.glassfish.hk2:hk2-testing:3.0.4'
     // implementation 'org.glassfish.hk2:hk2-testing-jersey:3.0.4'
     // testImplementation 'org.glassfish.hk2:hk2-junitrunner:3.0.4'
     // HTTP server
     // implementation 'org.glassfish.jersey.containers:jersey-container-netty-http:3.1.1'
-    implementation 'org.glassfish.jersey.containers:jersey-container-grizzly2-http:3.1.3'
-    testImplementation 'org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-grizzly2:3.1.3'
+    implementation 'org.glassfish.jersey.containers:jersey-container-grizzly2-http:3.1.5'
+    testImplementation 'org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-grizzly2:3.1.5'
     // Allow objects "magically" to be mapped to JSON using GSON
     // implementation 'org.glassfish.jersey.media:jersey-media-json-gson:3.1.1'
 
-    testImplementation 'io.github.classgraph:classgraph:4.8.164'
+    // Because of GraalVM quirks, we need to ship that. See https://github.com/jspecify/jspecify/issues/389#issuecomment-1661130973 for details
+    implementation 'org.jspecify:jspecify:0.3.0'
+
+    testImplementation 'io.github.classgraph:classgraph:4.8.165'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
     testImplementation 'org.junit.platform:junit-platform-launcher:1.10.1'
 
-    testImplementation 'org.mockito:mockito-core:5.7.0'
+    testImplementation 'org.mockito:mockito-core:5.8.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.2.0'
-    testImplementation 'com.tngtech.archunit:archunit-junit5-api:1.2.0'
+    testRuntimeOnly 'com.tngtech.archunit:archunit-junit5-engine:1.2.1'
+    testImplementation 'com.tngtech.archunit:archunit-junit5-api:1.2.1'
     testImplementation "org.testfx:testfx-core:4.0.16-alpha"
     testImplementation "org.testfx:testfx-junit5:4.0.16-alpha"
     testImplementation "org.hamcrest:hamcrest-library:2.2"
@@ -253,7 +258,7 @@ dependencies {
     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.5.0"))
+    rewrite(platform("org.openrewrite.recipe:rewrite-recipe-bom:2.5.4"))
     rewrite("org.openrewrite.recipe:rewrite-static-analysis")
     rewrite("org.openrewrite.recipe:rewrite-logging-frameworks")
     rewrite("org.openrewrite.recipe:rewrite-testing-frameworks")
@@ -277,7 +282,8 @@ processResources {
                 "astrophysicsDataSystemAPIKey": System.getenv('AstrophysicsDataSystemAPIKey') ? System.getenv('AstrophysicsDataSystemAPIKey') : '',
                 "ieeeAPIKey": System.getenv('IEEEAPIKey') ? System.getenv('IEEEAPIKey') : '',
                 "scienceDirectApiKey": System.getenv('SCIENCEDIRECTAPIKEY') ? System.getenv('SCIENCEDIRECTAPIKEY') : '',
-                "biodiversityHeritageApiKey": System.getenv('BiodiversityHeritageApiKey') ? System.getenv('BiodiversityHeritageApiKey') : ''
+                "biodiversityHeritageApiKey": System.getenv('BiodiversityHeritageApiKey') ? System.getenv('BiodiversityHeritageApiKey') : '',
+                "semanticScholarApiKey": System.getenv('SemanticScholarApiKey') ? System.getenv("SemanticScholarApiKey") : ''
         )
         filteringCharset = 'UTF-8'
     }
@@ -326,8 +332,19 @@ tasks.register("generateJournalListMV", JavaExec) {
         !file("build/resources/main/journals/journal-list.mv").exists()
     }
 }
-jar.dependsOn "generateJournalListMV"
-compileTestJava.dependsOn "generateJournalListMV"
+
+tasks.register("generatePredatoryJournalListMV", JavaExec) {
+        group = "JabRef"
+        description = "Load predatory journal information from online sources to a H2 MVStore"
+        classpath = sourceSets.main.runtimeClasspath
+        mainClass = "org.jabref.cli.PredatoryJournalsMvGenerator"
+        onlyIf {
+            !file("build/resources/main/journals/predatory-journals.mv").exists()
+        }
+}
+
+jar.dependsOn("generateJournalListMV", "generatePredatoryJournalListMV")
+compileTestJava.dependsOn("generateJournalListMV","generatePredatoryJournalListMV")
 
 tasks.register('generateCitaviSource', XjcTask) {
     group = 'JabRef'
@@ -591,6 +608,7 @@ jlink {
         requires 'com.google.gson'
         requires 'org.slf4j'
         requires 'jakarta.xml.bind'
+        requires 'org.apache.commons.lang3'
         uses 'org.mariadb.jdbc.credential.CredentialPlugin'
         uses 'org.mariadb.jdbc.authentication.AuthenticationPlugin'
         uses 'org.mariadb.jdbc.tls.TlsSocketPlugin'
diff --git a/docs/code-howtos/fetchers.md b/docs/code-howtos/fetchers.md
index 3c540014bf7..a0be55e912d 100644
--- a/docs/code-howtos/fetchers.md
+++ b/docs/code-howtos/fetchers.md
@@ -5,15 +5,16 @@ parent: Code Howtos
 
 Fetchers are the implementation of the [search using online services](https://docs.jabref.org/collect/import-using-online-bibliographic-database). Some fetchers require API keys to get them working. To get the fetchers running in a JabRef development setup, the keys need to be placed in the respective environment variable. The following table lists the respective fetchers, where to get the key from and the environment variable where the key has to be placed.
 
-| Service                                                                                                                                              | Key Source                                                                                                     | Environment Variable           | Rate Limit                       |
-|:-----------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------|--------------------------------|----------------------------------|
-| [IEEEXplore](https://docs.jabref.org/collect/import-using-online-bibliographic-database#ieeexplore)                                                  | [IEEE Xplore API portal](https://developer.ieee.org)                                                           | `IEEEAPIKey`                   | 200 calls/day                    |
-| [MathSciNet](http://www.ams.org/mathscinet)                                                                                                          | (none)                                                                                                         | (none)                         | Depending on the current network |
-| [SAO/NASA Astrophysics Data System](https://docs.jabref.org/collect/import-using-online-bibliographic-database#sao-nasa-astrophysics-data-system)    | [ADS UI](https://ui.adsabs.harvard.edu/user/settings/token)                                                    | `AstrophysicsDataSystemAPIKey` | 5000 calls/day                   |
-| [ScienceDirect](https://www.sciencedirect.com)                                                                                                       |                                                                                                                | `ScienceDirectApiKey`          |                                  |
-| [Springer Nature](https://docs.jabref.org/collect/import-using-online-bibliographic-database#springer)                                               | [Springer Nature API Portal](https://dev.springernature.com)                                                   | `SpringerNatureAPIKey`         | 5000 calls/day                   |
-| [Zentralblatt Math](https://www.zbmath.org)                                                                                                          | (none)                                                                                                         | (none)                         | Depending on the current network |
-| [Biodiversity Heritage Library](https://www.biodiversitylibrary.org/)                                                                                | [Biodiversitylibrary](https://about.biodiversitylibrary.org/tools-and-services/developer-and-data-tools/#APIs) | `BiodiversityHeritageApiKey`   |  -                               |
+| Service                                                                                                                                           | Key Source                                                                                                     | Environment Variable           | Rate Limit                       |
+|:--------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------|--------------------------------|----------------------------------|
+| [IEEEXplore](https://docs.jabref.org/collect/import-using-online-bibliographic-database#ieeexplore)                                               | [IEEE Xplore API portal](https://developer.ieee.org)                                                           | `IEEEAPIKey`                   | 200 calls/day                    |
+| [MathSciNet](http://www.ams.org/mathscinet)                                                                                                       | (none)                                                                                                         | (none)                         | Depending on the current network |
+| [SAO/NASA Astrophysics Data System](https://docs.jabref.org/collect/import-using-online-bibliographic-database#sao-nasa-astrophysics-data-system) | [ADS UI](https://ui.adsabs.harvard.edu/user/settings/token)                                                    | `AstrophysicsDataSystemAPIKey` | 5000 calls/day                   |
+| [ScienceDirect](https://www.sciencedirect.com)                                                                                                    |                                                                                                                | `ScienceDirectApiKey`          |                                  |
+| [SemanticScholar](https://www.semanticscholar.org/)                                                                                               | <https://www.semanticscholar.org/product/api#api-key-form>                                                     | `SemanticScholarApiKey`        |                                  |
+| [Springer Nature](https://docs.jabref.org/collect/import-using-online-bibliographic-database#springer)                                            | [Springer Nature API Portal](https://dev.springernature.com)                                                   | `SpringerNatureAPIKey`         | 5000 calls/day                   |
+| [Zentralblatt Math](https://www.zbmath.org)                                                                                                       | (none)                                                                                                         | (none)                         | Depending on the current network |
+| [Biodiversity Heritage Library](https://www.biodiversitylibrary.org/)                                                                             | [Biodiversitylibrary](https://about.biodiversitylibrary.org/tools-and-services/developer-and-data-tools/#APIs) | `BiodiversityHeritageApiKey`   | -                                |
 
 "Depending on the current network" means that it depends on whether your request is routed through a network having paid access. For instance, some universities have subscriptions to MathSciNet.
 
@@ -72,7 +73,7 @@ springerNatureAPIKey=${springerNatureAPIKey}
 In `build.gradle`, these variables are filled:
 
 ```groovy
-"springerNatureAPIKey": System.getenv('SpringerNatureAPIKey')
+"springerNatureAPIKey" : System.getenv('SpringerNatureAPIKey')
 ```
 
 The `BuildInfo` class reads from that file.
diff --git a/docs/code-howtos/tools.md b/docs/code-howtos/tools.md
index f2b344da05a..a21bf399add 100644
--- a/docs/code-howtos/tools.md
+++ b/docs/code-howtos/tools.md
@@ -70,10 +70,3 @@ Then, each weak do `choco upgrade all` to ensure all tooling is kept updated.
 ### Tools for working with XMP
 
 * Validate XMP: [https://www.pdflib.com/pdf-knowledge-base/xmp/free-xmp-validator/](https://www.pdflib.com/pdf-knowledge-base/xmp/free-xmp-validator/)
-
-### Some useful keyboard shortcuts
-
-* [AutoHotkey](http://autohotkey.com) - Preparation for the next step
-* [https://github.com/koppor/autohotkey-scripts](https://github.com/koppor/autohotkey-scripts) - Aim: Have Win+C opening ConEmu
-  1. Clone the repository locally.
-  2. Then link `ConEmu.ahk` and `WindowsExplorer.ahk` at the startup menu (Link creation works with drag'n'drop using the right mouse key and then choosing "Create link" when dropping). Hint: Startup is in the folder `Startup` (German: `Autostart`) at `%APPDATA%\Microsoft\Windows\Start Menu\Programs\` - accessible via <kbd>Win</kbd>+<kbd>R</kbd>: `shell:startup`
diff --git a/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/intellij-89-run-with-intellij.md b/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/intellij-89-run-with-intellij.md
index b0897e95a65..67240227082 100644
--- a/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/intellij-89-run-with-intellij.md
+++ b/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/intellij-89-run-with-intellij.md
@@ -11,17 +11,19 @@ It is also possible to use IntelliJ's internal build and run system to launch Ja
 Due to [IDEA-119280](https://youtrack.jetbrains.com/issue/IDEA-119280), it is a bit more work.
 
 1. Navigate to **File > Settings... > Build, Execution, Deployment > Build Tools > Gradle**.
-2. Change the setting "Build an run using:" to "IntelliJ IDEA".
+2. Change the setting "Build and run using:" to "IntelliJ IDEA".
 3. Navigate to **File > Settings... > Build, Execution, Deployment > Compiler > Java Compiler**.
 4. Uncheck `--Use 'release' option for cross-compilation`.
 5. **Build > Build Project**
 6. Open the project view (<kbd>Alt</kbd>+<kbd>1</kbd> , on mac <kbd>cmd><kbd>+<kbd>1</kbd>)
 7. Copy all build resources to the folder of the build classes
-   1. Navigate to the folder `out/production/resources`
-   2. Select all folders below (`bst`, `csl-locales`, ...)
-   3. Press <kbd>Ctrl</kbd>+<kbd>C</kbd> to mark them for copying
-   4. Select the folder `classes`
-   5. Press <kbd>Ctrl</kbd>+<kbd>V</kbd> to start the copy process
+   1. Navigate to the folder `build/resoruces/main`
+   1. Right click -> "Open In" -> "Explorer (Finder on macOS)"
+   1. Navigate into directory "main"
+   1. Select the folder `out/production/classes`
+   1. Right click -> "Open In" -> "Explorer (Finder on macOS)"
+   1. Navigate into directory "classes"
+   1. Now you have two Explorer windows opened. Copy all files and directories from the first one to the second one.
 8. Locate the class `Launcher` (e.g., by <kbd>ctrl</kbd>+<kbd>N</kbd> and then typing `Launcher`). Press <kbd>Enter</kbd> to jump to that class.
    <figure>
      <img src="intellij-search-for-launcher.png" alt="IntelliJ search for class “Launcher”">
diff --git a/external-libraries.md b/external-libraries.md
index 2f06c5cdcf1..d5d4867024b 100644
--- a/external-libraries.md
+++ b/external-libraries.md
@@ -84,6 +84,13 @@ URL:     https://github.com/FasterXML/jackson
 License: Apache-2.0
 ```
 
+```yaml
+Id:      com.github.Dansoftowner:jSystemThemeDetector
+Project: jSystemThemeDetector
+URL:     https://github.com/Dansoftowner/jSystemThemeDetector
+License: Apache-2.0
+```
+
 ```yaml
 Id:      com.github.hypfvieh.dbus-java
 Project: dbus-java
@@ -119,6 +126,13 @@ URL:     https://github.com/tomtung/latex2unicode
 License: Apache-2.0
 ```
 
+```yaml
+Id:      com.github.weisj:jsvg
+Project: JSVG - A Java SVG implementation
+URL:     https://github.com/weisJ/jsvg
+License: MIT
+```
+
 ```yaml
 Id:      com.google.code.gson:gson
 Project: Google Guava
@@ -514,6 +528,13 @@ URL:     https://github.com/jhy/jsoup/
 License: MIT
 ```
 
+```yaml
+Id:      org.jspecify:jspecify
+Project: jspecify
+URL:     https://jspecify.dev/
+License: Apache-2.0
+```
+
 ```yaml
 Id:      org.kordamp.ikonli
 Project: Ikonli
@@ -647,22 +668,26 @@ License: BSD-3-Clause
 3. (on WSL) `sed 's/[^a-z]*//' < build/dependencies.txt | sed "s/\(.*\) .*/\1/" | grep -v "\->" | sort | uniq > build/dependencies-for-external-libraries.txt`
 
 ```text
+
 at.favre.lib:hkdf:1.1.0
-com.dlsc.gemsfx:gemsfx:1.82.0
+com.dlsc.gemsfx:gemsfx:1.90.0
 com.dlsc.pickerfx:pickerfx:1.2.0
 com.dlsc.unitfx:unitfx:1.0.10
-com.fasterxml.jackson.core:jackson-annotations:2.15.3
-com.fasterxml.jackson.core:jackson-core:2.15.3
-com.fasterxml.jackson.core:jackson-databind:2.15.3
-com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.15.3
+com.fasterxml.jackson.core:jackson-annotations:2.16.0
+com.fasterxml.jackson.core:jackson-core:2.16.0
+com.fasterxml.jackson.core:jackson-databind:2.16.0
+com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.16.0
 com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.15.3
-com.fasterxml.jackson:jackson-bom:2.15.3
-com.fasterxml:aalto-xml:1.3.1
+com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.16.0
+com.fasterxml.jackson:jackson-bom:2.16.0
+com.fasterxml:aalto-xml:1.3.2
+com.github.Dansoftowner:jSystemThemeDetector:3.8
 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.github.weisj:jsvg:1.2.0
 com.google.code.gson:gson:2.10
 com.google.errorprone:error_prone_annotations:2.21.1
 com.google.guava:failureaccess:1.0.1
@@ -695,7 +720,7 @@ com.vladsch.flexmark:flexmark-util-sequence:0.64.8
 com.vladsch.flexmark:flexmark-util-visitor:0.64.8
 com.vladsch.flexmark:flexmark:0.64.8
 commons-beanutils:commons-beanutils:1.9.4
-commons-cli:commons-cli:1.5.0
+commons-cli:commons-cli:1.6.0
 commons-codec:commons-codec:1.16.0
 commons-collections:commons-collections:3.2.2
 commons-digester:commons-digester:2.1
@@ -726,71 +751,74 @@ net.jodah:typetools:0.6.1
 one.jpro.jproutils:tree-showing:0.2.2
 org.antlr:antlr4-runtime:4.13.1
 org.apache.commons:commons-csv:1.10.0
-org.apache.commons:commons-lang3:3.13.0
+org.apache.commons:commons-lang3:3.14.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:httpmime:4.5.13
-org.apache.logging.log4j:log4j-api:2.20.0
-org.apache.logging.log4j:log4j-to-slf4j:2.20.0
-org.apache.lucene:lucene-analysis-common:9.8.0
-org.apache.lucene:lucene-core:9.8.0
-org.apache.lucene:lucene-highlighter:9.8.0
-org.apache.lucene:lucene-queries:9.8.0
-org.apache.lucene:lucene-queryparser:9.8.0
-org.apache.lucene:lucene-sandbox:9.8.0
+org.apache.logging.log4j:log4j-api:2.21.1
+org.apache.logging.log4j:log4j-to-slf4j:2.21.1
+org.apache.lucene:lucene-analysis-common:9.9.1
+org.apache.lucene:lucene-core:9.9.0
+org.apache.lucene:lucene-core:9.9.1
+org.apache.lucene:lucene-highlighter:9.9.0
+org.apache.lucene:lucene-queries:9.9.0
+org.apache.lucene:lucene-queries:9.9.1
+org.apache.lucene:lucene-queryparser:9.9.1
+org.apache.lucene:lucene-sandbox:9.9.1
 org.apache.pdfbox:fontbox:3.0.0
 org.apache.pdfbox:pdfbox-io:3.0.0
 org.apache.pdfbox:pdfbox:3.0.0
-org.apache.pdfbox:xmpbox:3.0.0
-org.bouncycastle:bcprov-jdk18on:1.76
+org.apache.pdfbox:xmpbox:3.0.1
+org.bouncycastle:bcprov-jdk18on:1.77
 org.checkerframework:checker-qual:3.37.0
 org.codehaus.woodstox:stax2-api:4.2
-org.controlsfx:controlsfx:11.1.2
+org.controlsfx:controlsfx:11.2.0
 org.eclipse.jgit:org.eclipse.jgit:6.7.0.202309050840-r
-org.fxmisc.flowless:flowless:0.7.1
-org.fxmisc.richtext:richtextfx:0.11.1
+org.fxmisc.flowless:flowless:0.7.2
+org.fxmisc.richtext:richtextfx:0.11.2
 org.fxmisc.undo:undofx:2.1.1
 org.fxmisc.wellbehaved:wellbehavedfx:0.3.3
-org.glassfish.grizzly:grizzly-framework:4.0.0
-org.glassfish.grizzly:grizzly-http-server:4.0.0
-org.glassfish.grizzly:grizzly-http:4.0.0
-org.glassfish.hk2.external:aopalliance-repackaged:3.0.4
-org.glassfish.hk2:hk2-api:3.0.4
-org.glassfish.hk2:hk2-locator:3.0.4
-org.glassfish.hk2:hk2-utils:3.0.4
+org.glassfish.grizzly:grizzly-framework:4.0.1
+org.glassfish.grizzly:grizzly-http-server:4.0.1
+org.glassfish.grizzly:grizzly-http:4.0.1
+org.glassfish.hk2.external:aopalliance-repackaged:3.0.5
+org.glassfish.hk2:hk2-api:3.0.5
+org.glassfish.hk2:hk2-locator:3.0.5
+org.glassfish.hk2:hk2-utils:3.0.5
 org.glassfish.hk2:osgi-resource-locator:1.0.3
 org.glassfish.jaxb:jaxb-core:4.0.3
 org.glassfish.jaxb:jaxb-runtime:4.0.3
 org.glassfish.jaxb:txw2:4.0.3
-org.glassfish.jersey.containers:jersey-container-grizzly2-http:3.1.3
-org.glassfish.jersey.core:jersey-client:3.1.3
-org.glassfish.jersey.core:jersey-common:3.1.3
-org.glassfish.jersey.core:jersey-server:3.1.3
-org.glassfish.jersey.inject:jersey-hk2:3.1.3
+org.glassfish.jersey.containers:jersey-container-grizzly2-http:3.1.4
+org.glassfish.jersey.core:jersey-client:3.1.4
+org.glassfish.jersey.core:jersey-common:3.1.5
+org.glassfish.jersey.core:jersey-server:3.1.4
+org.glassfish.jersey.inject:jersey-hk2:3.1.5
 org.jabref:afterburner.fx:2.0.0
 org.javassist:javassist:3.29.2-GA
 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.jsoup:jsoup:1.16.2
+org.jspecify:jspecify:0.3.0
 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-material-pack:12.3.1
 org.kordamp.ikonli:ikonli-materialdesign-pack:12.3.1
 org.kordamp.ikonli:ikonli-materialdesign2-pack:12.3.1
-org.libreoffice:libreoffice:7.6.1
-org.libreoffice:unoloader:7.6.1
+org.libreoffice:libreoffice:7.6.4
+org.libreoffice:unoloader:7.6.4
 org.mariadb.jdbc:mariadb-java-client:2.7.9
-org.openjfx:javafx-base:20.0.2
-org.openjfx:javafx-controls:20.0.2
-org.openjfx:javafx-fxml:20.0.2
-org.openjfx:javafx-graphics:20.0.2
-org.openjfx:javafx-media:20.0.2
-org.openjfx:javafx-swing:20.0.2
-org.openjfx:javafx-web:20.0.2
+org.openjfx:javafx-base:21.0.1
+org.openjfx:javafx-controls:21.0.1
+org.openjfx:javafx-fxml:21.0.1
+org.openjfx:javafx-graphics:21.0.1
+org.openjfx:javafx-media:21.0.1
+org.openjfx:javafx-swing:21.0.1
+org.openjfx:javafx-web:21.0.1
 org.postgresql:postgresql:42.6.0
 org.reactfx:reactfx:2.0-M5
 org.scala-lang:scala-library:2.13.8
@@ -799,7 +827,7 @@ org.slf4j:slf4j-api:2.0.9
 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.1
+org.yaml:snakeyaml:2.2
 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 7f93135c49b..d64cd491770 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 46671acb6e1..db8c3baafe3 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=3e1af3ae886920c3ac87f7a91f816c0c7c436f276a6eefdb3da152100fef72ae
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionSha256Sum=9d926787066a081739e8200858338b4a69e837c3a821a33aca9db09dd4a41026
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/rewrite.yml b/rewrite.yml
index 9d0c5502679..a5be80970e3 100644
--- a/rewrite.yml
+++ b/rewrite.yml
@@ -195,7 +195,5 @@ recipeList:
   - org.openrewrite.staticanalysis.UseSystemLineSeparator
   - org.openrewrite.staticanalysis.WhileInsteadOfFor
 #  - org.openrewrite.staticanalysis.WriteOctalValuesAsDecimal
-
-#  - org.openrewrite.java.testing.junit5.JUnit5BestPractices
+  - org.openrewrite.java.testing.junit5.CleanupAssertions
   - org.openrewrite.java.testing.junit5.JUnit5BestPractices
-
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 98e805bf7c0..3f094b255fe 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -58,7 +58,7 @@ environment:
 parts:
   jabref:
     plugin: dump
-    source: https://builds.jabref.org/main/JabRef-5.12-portable_linux.tar.gz
+    source: https://builds.jabref.org/main/JabRef-5.13-portable_linux.tar.gz
     stage-packages:
       - x11-utils
     override-build: |
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
index 70eb10b2914..48267ada078 100644
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@@ -61,7 +61,7 @@
     // http server and client exchange
     requires java.net.http;
     requires jakarta.ws.rs;
-    requires grizzly.framework;
+    requires org.glassfish.grizzly;
 
     // data mapping
     requires jakarta.xml.bind;
@@ -121,7 +121,7 @@
     // fulltext search
     requires org.apache.lucene.core;
     // In case the version is updated, please also adapt SearchFieldConstants#VERSION to the newly used version
-    uses org.apache.lucene.codecs.lucene95.Lucene95Codec;
+    uses org.apache.lucene.codecs.lucene99.Lucene99Codec;
 
     requires org.apache.lucene.queryparser;
     uses org.apache.lucene.queryparser.classic.MultiFieldQueryParser;
@@ -136,6 +136,8 @@
     uses org.eclipse.jgit.transport.SshSessionFactory;
     uses org.eclipse.jgit.lib.GpgSigner;
 
+    requires transitive org.jspecify;
+
     // other libraries
     requires org.antlr.antlr4.runtime;
     requires org.libreoffice.uno;
diff --git a/src/main/java/org/jabref/cli/JournalListMvGenerator.java b/src/main/java/org/jabref/cli/JournalListMvGenerator.java
index 9a4fd3d67c6..dad187dc81a 100644
--- a/src/main/java/org/jabref/cli/JournalListMvGenerator.java
+++ b/src/main/java/org/jabref/cli/JournalListMvGenerator.java
@@ -37,15 +37,15 @@ public static void main(String[] args) throws IOException {
 
                 // we currently do not have good support for BibTeX strings
                 "journal_abbreviations_ieee_strings.csv"
-                );
+        );
 
         Files.createDirectories(journalListMvFile.getParent());
 
         try (DirectoryStream<Path> stream = Files.newDirectoryStream(abbreviationsDirectory, "*.csv");
              MVStore store = new MVStore.Builder().
-                fileName(journalListMvFile.toString()).
-                compressHigh().
-                open()) {
+                     fileName(journalListMvFile.toString()).
+                     compressHigh().
+                     open()) {
             MVMap<String, Abbreviation> fullToAbbreviation = store.openMap("FullToAbbreviation");
             stream.forEach(Unchecked.consumer(path -> {
                 String fileName = path.getFileName().toString();
diff --git a/src/main/java/org/jabref/cli/Launcher.java b/src/main/java/org/jabref/cli/Launcher.java
index a49ea92e865..2e8033267d6 100644
--- a/src/main/java/org/jabref/cli/Launcher.java
+++ b/src/main/java/org/jabref/cli/Launcher.java
@@ -12,6 +12,7 @@
 import org.jabref.gui.Globals;
 import org.jabref.gui.MainApplication;
 import org.jabref.logic.journals.JournalAbbreviationLoader;
+import org.jabref.logic.journals.predatory.PredatoryJournalListLoader;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.net.ProxyAuthenticator;
 import org.jabref.logic.net.ProxyPreferences;
@@ -169,6 +170,8 @@ private static void initGlobals(PreferencesService preferences) {
         // Read list(s) of journal names and abbreviations
         Globals.journalAbbreviationRepository = JournalAbbreviationLoader
                 .loadRepository(preferences.getJournalAbbreviationPreferences());
+        Globals.predatoryJournalRepository = PredatoryJournalListLoader
+                .loadRepository();
 
         Globals.entryTypesManager = preferences.getCustomEntryTypesRepository();
         Globals.protectedTermsLoader = new ProtectedTermsLoader(preferences.getProtectedTermsPreferences());
diff --git a/src/main/java/org/jabref/cli/PredatoryJournalsMvGenerator.java b/src/main/java/org/jabref/cli/PredatoryJournalsMvGenerator.java
new file mode 100644
index 00000000000..574e287abf8
--- /dev/null
+++ b/src/main/java/org/jabref/cli/PredatoryJournalsMvGenerator.java
@@ -0,0 +1,47 @@
+package org.jabref.cli;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Set;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+import org.jabref.logic.journals.predatory.PredatoryJournalInformation;
+import org.jabref.logic.journals.predatory.PredatoryJournalListCrawler;
+
+import org.h2.mvstore.MVMap;
+import org.h2.mvstore.MVStore;
+
+public class PredatoryJournalsMvGenerator {
+    public static void main(String[] args) throws IOException {
+        boolean verbose = (args.length == 1) && ("--verbose".equals(args[0]));
+
+        Path predatoryJournalsMvFile = Path.of("build", "resources", "main", "journals", "predatory-journals.mv");
+        Files.createDirectories(predatoryJournalsMvFile.getParent());
+
+        try (MVStore store = new MVStore.Builder()
+                .fileName(predatoryJournalsMvFile.toString())
+                .compressHigh()
+                .backgroundExceptionHandler((t, e) -> {
+                    System.err.println("Exception occurred in Thread " + t + "with exception " + e);
+                    e.printStackTrace();
+                })
+                .open()) {
+            MVMap<String, PredatoryJournalInformation> predatoryJournalsMap = store.openMap("PredatoryJournals");
+
+            PredatoryJournalListCrawler loader = new PredatoryJournalListCrawler();
+            Set<PredatoryJournalInformation> predatoryJournals = loader.loadFromOnlineSources();
+
+            var resultMap = predatoryJournals.stream().collect(Collectors.toMap(PredatoryJournalInformation::name, Function.identity(),
+                    (predatoryJournalInformation, predatoryJournalInformation2) -> {
+                        if (verbose) {
+                            System.out.println("Double entry " + predatoryJournalInformation.name());
+                        }
+                        return predatoryJournalInformation2;
+                    }));
+
+            predatoryJournalsMap.putAll(resultMap);
+        }
+    }
+}
diff --git a/src/main/java/org/jabref/gui/EntryTypeView.java b/src/main/java/org/jabref/gui/EntryTypeView.java
index 238d80d7d17..3b10205a547 100644
--- a/src/main/java/org/jabref/gui/EntryTypeView.java
+++ b/src/main/java/org/jabref/gui/EntryTypeView.java
@@ -81,6 +81,7 @@ public EntryTypeView(LibraryTab libraryTab, DialogService dialogService, Prefere
                   .setAsDialogPane(this);
 
         ControlHelper.setAction(generateButton, this.getDialogPane(), event -> viewModel.runFetcherWorker());
+        setOnCloseRequest(e -> viewModel.cancelFetcherWorker());
 
         setResultConverter(button -> {
             // The buttonType will always be "cancel", even if we pressed one of the entry type buttons
diff --git a/src/main/java/org/jabref/gui/EntryTypeViewModel.java b/src/main/java/org/jabref/gui/EntryTypeViewModel.java
index a197348997a..b63718edeaf 100644
--- a/src/main/java/org/jabref/gui/EntryTypeViewModel.java
+++ b/src/main/java/org/jabref/gui/EntryTypeViewModel.java
@@ -196,7 +196,7 @@ public void runFetcherWorker() {
                         Localization.lang("Return to dialog"));
                 if (addEntryFlag) {
                     new NewEntryAction(
-                            libraryTab.frame(),
+                            () -> libraryTab,
                             StandardEntryType.Article,
                             dialogService,
                             preferencesService,
@@ -211,4 +211,8 @@ public void runFetcherWorker() {
         });
         taskExecutor.execute(fetcherWorker);
     }
+
+    public void cancelFetcherWorker() {
+        fetcherWorker.cancel();
+    }
 }
diff --git a/src/main/java/org/jabref/gui/Globals.java b/src/main/java/org/jabref/gui/Globals.java
index 04ead50bf63..06437d7f6c9 100644
--- a/src/main/java/org/jabref/gui/Globals.java
+++ b/src/main/java/org/jabref/gui/Globals.java
@@ -9,6 +9,7 @@
 import org.jabref.gui.util.DefaultTaskExecutor;
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
+import org.jabref.logic.journals.predatory.PredatoryJournalRepository;
 import org.jabref.logic.protectedterms.ProtectedTermsLoader;
 import org.jabref.logic.remote.RemotePreferences;
 import org.jabref.logic.remote.server.RemoteListenerServerManager;
@@ -51,6 +52,7 @@ public class Globals {
      * Only GUI code is allowed to access it, logic code should use dependency injection.
      */
     public static JournalAbbreviationRepository journalAbbreviationRepository;
+    public static PredatoryJournalRepository predatoryJournalRepository;
 
     /**
      * This field is initialized upon startup.
diff --git a/src/main/java/org/jabref/gui/JabRefDialogService.java b/src/main/java/org/jabref/gui/JabRefDialogService.java
index 6f3c333db13..6b595654d31 100644
--- a/src/main/java/org/jabref/gui/JabRefDialogService.java
+++ b/src/main/java/org/jabref/gui/JabRefDialogService.java
@@ -25,6 +25,7 @@
 import javafx.scene.control.ChoiceDialog;
 import javafx.scene.control.DialogPane;
 import javafx.scene.control.Label;
+import javafx.scene.control.TextArea;
 import javafx.scene.control.TextInputDialog;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Region;
@@ -79,8 +80,12 @@ public JabRefDialogService(Window mainWindow) {
     private FXDialog createDialog(AlertType type, String title, String content) {
         FXDialog alert = new FXDialog(type, title, true);
         alert.setHeaderText(null);
-        alert.setContentText(content);
         alert.getDialogPane().setMinHeight(Region.USE_PREF_SIZE);
+        alert.setResizable(true);
+
+        TextArea area = new TextArea(content);
+
+        alert.getDialogPane().setContent(area);
         alert.initOwner(mainWindow);
         return alert;
     }
diff --git a/src/main/java/org/jabref/gui/JabRefExecutorService.java b/src/main/java/org/jabref/gui/JabRefExecutorService.java
index b23beeb8d2c..90c3b31bdae 100644
--- a/src/main/java/org/jabref/gui/JabRefExecutorService.java
+++ b/src/main/java/org/jabref/gui/JabRefExecutorService.java
@@ -13,6 +13,8 @@
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 
+import org.jabref.logic.pdf.search.PdfIndexerManager;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -146,6 +148,8 @@ public void shutdownEverything() {
         gracefullyShutdown(this.executorService);
         gracefullyShutdown(this.lowPriorityExecutorService);
 
+        PdfIndexerManager.shutdownAllIndexers();
+
         timer.cancel();
     }
 
diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
index 8a829134b96..0631c7fedc5 100644
--- a/src/main/java/org/jabref/gui/JabRefFrame.java
+++ b/src/main/java/org/jabref/gui/JabRefFrame.java
@@ -61,6 +61,7 @@
 import org.jabref.logic.importer.ImportCleanup;
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.logic.l10n.Localization;
+import org.jabref.logic.pdf.search.PdfIndexerManager;
 import org.jabref.logic.shared.DatabaseLocation;
 import org.jabref.logic.undo.AddUndoableActionEvent;
 import org.jabref.logic.undo.UndoChangeEvent;
@@ -267,31 +268,31 @@ private void initKeyBindings() {
                         getGlobalSearchBar().focus();
                         break;
                     case NEW_ARTICLE:
-                        new NewEntryAction(this, StandardEntryType.Article, dialogService, prefs, stateManager).execute();
+                        new NewEntryAction(this::getCurrentLibraryTab, StandardEntryType.Article, dialogService, prefs, stateManager).execute();
                         break;
                     case NEW_BOOK:
-                        new NewEntryAction(this, StandardEntryType.Book, dialogService, prefs, stateManager).execute();
+                        new NewEntryAction(this::getCurrentLibraryTab, StandardEntryType.Book, dialogService, prefs, stateManager).execute();
                         break;
                     case NEW_INBOOK:
-                        new NewEntryAction(this, StandardEntryType.InBook, dialogService, prefs, stateManager).execute();
+                        new NewEntryAction(this::getCurrentLibraryTab, StandardEntryType.InBook, dialogService, prefs, stateManager).execute();
                         break;
                     case NEW_MASTERSTHESIS:
-                        new NewEntryAction(this, StandardEntryType.MastersThesis, dialogService, prefs, stateManager).execute();
+                        new NewEntryAction(this::getCurrentLibraryTab, StandardEntryType.MastersThesis, dialogService, prefs, stateManager).execute();
                         break;
                     case NEW_PHDTHESIS:
-                        new NewEntryAction(this, StandardEntryType.PhdThesis, dialogService, prefs, stateManager).execute();
+                        new NewEntryAction(this::getCurrentLibraryTab, StandardEntryType.PhdThesis, dialogService, prefs, stateManager).execute();
                         break;
                     case NEW_PROCEEDINGS:
-                        new NewEntryAction(this, StandardEntryType.Proceedings, dialogService, prefs, stateManager).execute();
+                        new NewEntryAction(this::getCurrentLibraryTab, StandardEntryType.Proceedings, dialogService, prefs, stateManager).execute();
                         break;
                     case NEW_TECHREPORT:
-                        new NewEntryAction(this, StandardEntryType.TechReport, dialogService, prefs, stateManager).execute();
+                        new NewEntryAction(this::getCurrentLibraryTab, StandardEntryType.TechReport, dialogService, prefs, stateManager).execute();
                         break;
                     case NEW_UNPUBLISHED:
-                        new NewEntryAction(this, StandardEntryType.Unpublished, dialogService, prefs, stateManager).execute();
+                        new NewEntryAction(this::getCurrentLibraryTab, StandardEntryType.Unpublished, dialogService, prefs, stateManager).execute();
                         break;
                     case NEW_INPROCEEDINGS:
-                        new NewEntryAction(this, StandardEntryType.InProceedings, dialogService, prefs, stateManager).execute();
+                        new NewEntryAction(this::getCurrentLibraryTab, StandardEntryType.InProceedings, dialogService, prefs, stateManager).execute();
                         break;
                     case PASTE:
                         if (OS.OS_X) { // Workaround for a jdk issue that executes paste twice when using cmd+v in a TextField
@@ -406,11 +407,11 @@ public boolean quit() {
 
         // Then ask if the user really wants to close, if the library has not been saved since last save.
         List<String> filenames = new ArrayList<>();
-        for (int i = 0; i < tabbedPane.getTabs().size(); i++) {
-            LibraryTab libraryTab = getLibraryTabAt(i);
+        for (LibraryTab libraryTab : getLibraryTabs()) {
             final BibDatabaseContext context = libraryTab.getBibDatabaseContext();
+
             if (libraryTab.isModified() && (context.getLocation() == DatabaseLocation.LOCAL)) {
-                tabbedPane.getSelectionModel().select(i);
+                showLibraryTab(libraryTab);
                 if (!confirmClose(libraryTab)) {
                     return false;
                 }
@@ -419,6 +420,7 @@ public boolean quit() {
                 context.getDBMSSynchronizer().closeSharedDatabase();
                 context.clearDBMSSynchronizer();
             }
+
             AutosaveManager.shutdown(context);
             BackupManager.shutdown(context, prefs.getFilePreferences().getBackupDirectory(), prefs.getFilePreferences().shouldCreateBackup());
             context.getDatabasePath().map(Path::toAbsolutePath).map(Path::toString).ifPresent(filenames::add);
@@ -488,6 +490,7 @@ private void initLayout() {
                 taskExecutor,
                 dialogService,
                 Globals.journalAbbreviationRepository,
+                Globals.predatoryJournalRepository,
                 entryTypesManager,
                 undoManager,
                 Globals.getClipboardManager());
@@ -539,15 +542,6 @@ private void setDividerPosition() {
         }
     }
 
-    /**
-     * Returns the indexed LibraryTab.
-     *
-     * @param i Index of base
-     */
-    public LibraryTab getLibraryTabAt(int i) {
-        return (LibraryTab) tabbedPane.getTabs().get(i);
-    }
-
     /**
      * Returns a list of all LibraryTabs in this frame.
      */
@@ -558,6 +552,7 @@ public List<LibraryTab> getLibraryTabs() {
                          .collect(Collectors.toList());
     }
 
+    @Deprecated
     public void showLibraryTabAt(int i) {
         tabbedPane.getSelectionModel().select(i);
     }
@@ -646,7 +641,7 @@ public void init() {
             }
 
             // Update search autocompleter with information for the correct database:
-            libraryTab.updateSearchManager();
+            globalSearchBar.setAutoCompleter(libraryTab.getAutoCompleter());
 
             libraryTab.getUndoManager().postUndoRedoEvent();
             libraryTab.getMainTable().requestFocus();
@@ -670,21 +665,6 @@ public LibraryTab getCurrentLibraryTab() {
         return (LibraryTab) tabbedPane.getSelectionModel().getSelectedItem();
     }
 
-    /**
-     * @return the BasePanel count.
-     */
-    public int getBasePanelCount() {
-        return tabbedPane.getTabs().size();
-    }
-
-    /**
-     * @deprecated do not operate on tabs but on BibDatabaseContexts
-     */
-    @Deprecated
-    public TabPane getTabbedPane() {
-        return tabbedPane;
-    }
-
     /**
      * This method causes all open LibraryTabs to set up their tables anew. When called from PreferencesDialogViewModel,
      * this updates to the new settings. We need to notify all tabs about the changes to avoid problems when changing
@@ -883,6 +863,7 @@ public void closeTab(LibraryTab libraryTab) {
         }
         AutosaveManager.shutdown(context);
         BackupManager.shutdown(context, prefs.getFilePreferences().getBackupDirectory(), prefs.getFilePreferences().shouldCreateBackup());
+        PdfIndexerManager.shutdownAllIndexers();
     }
 
     private void removeTab(LibraryTab libraryTab) {
@@ -960,6 +941,15 @@ public Stage getMainStage() {
         return mainStage;
     }
 
+    /**
+     * Refreshes the ui after preferences changes
+     */
+        public void refresh() {
+        globalSearchBar.updateHintVisibility();
+        setupAllTables();
+        getLibraryTabs().forEach(panel -> panel.getMainTable().getTableModel().refresh());
+    }
+
     /**
      * The action concerned with closing the window.
      */
diff --git a/src/main/java/org/jabref/gui/JabRefGUI.java b/src/main/java/org/jabref/gui/JabRefGUI.java
index 9a402703619..657429b2e3c 100644
--- a/src/main/java/org/jabref/gui/JabRefGUI.java
+++ b/src/main/java/org/jabref/gui/JabRefGUI.java
@@ -51,11 +51,11 @@ public class JabRefGUI {
     private final List<ParserResult> toOpenTab = new ArrayList<>();
 
     public JabRefGUI(Stage mainStage,
-                     List<ParserResult> databases,
+                     List<ParserResult> parserResults,
                      boolean isBlank,
                      PreferencesService preferencesService,
                      FileUpdateMonitor fileUpdateMonitor) {
-        this.parserResults = databases;
+        this.parserResults = parserResults;
         this.isBlank = isBlank;
         this.preferencesService = preferencesService;
         this.fileUpdateMonitor = fileUpdateMonitor;
@@ -259,9 +259,15 @@ private void openDatabases() {
         }
 
         // Display warnings, if any
-        int tabNumber = 0;
-        for (ParserResult pr : parserResults) {
-            ParserResultWarningDialog.showParserResultWarningDialog(pr, mainFrame, tabNumber++);
+        for (int tabNumber = 0; tabNumber < parserResults.size(); tabNumber++) {
+            // ToDo: Method needs to be rewritten, because the index of the parser result and of the libraryTab may not
+            //  be identical, if there are also other tabs opened, that are not libraryTabs. Currently there are none,
+            //  therefore for now this ok.
+            ParserResult pr = parserResults.get(tabNumber);
+            if (pr.hasWarnings()) {
+                ParserResultWarningDialog.showParserResultWarningDialog(pr, mainFrame.getDialogService());
+                mainFrame.showLibraryTabAt(tabNumber);
+            }
         }
 
         // After adding the databases, go through each and see if
@@ -269,16 +275,7 @@ private void openDatabases() {
         // if we found new entry types that can be imported, or checking
         // if the database contents should be modified due to new features
         // in this version of JabRef.
-        // Note that we have to check whether i does not go over getBasePanelCount().
-        // This is because importToOpen might have been used, which adds to
-        // loadedDatabases, but not to getBasePanelCount()
-
-        for (int i = 0; (i < parserResults.size()) && (i < mainFrame.getBasePanelCount()); i++) {
-            ParserResult pr = parserResults.get(i);
-            LibraryTab libraryTab = mainFrame.getLibraryTabAt(i);
-
-            OpenDatabaseAction.performPostOpenActions(libraryTab, pr);
-        }
+        parserResults.forEach(pr -> OpenDatabaseAction.performPostOpenActions(pr, mainFrame.getDialogService()));
 
         LOGGER.debug("Finished adding panels");
     }
diff --git a/src/main/java/org/jabref/gui/LibraryTab.java b/src/main/java/org/jabref/gui/LibraryTab.java
index 137a9548678..658117d8483 100644
--- a/src/main/java/org/jabref/gui/LibraryTab.java
+++ b/src/main/java/org/jabref/gui/LibraryTab.java
@@ -27,6 +27,7 @@
 
 import org.jabref.gui.autocompleter.AutoCompletePreferences;
 import org.jabref.gui.autocompleter.PersonNameSuggestionProvider;
+import org.jabref.gui.autocompleter.SuggestionProvider;
 import org.jabref.gui.autocompleter.SuggestionProviders;
 import org.jabref.gui.autosaveandbackup.AutosaveManager;
 import org.jabref.gui.autosaveandbackup.BackupManager;
@@ -50,8 +51,9 @@
 import org.jabref.logic.importer.util.FileFieldParser;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.pdf.FileAnnotationCache;
-import org.jabref.logic.pdf.search.indexing.IndexingTaskManager;
-import org.jabref.logic.pdf.search.indexing.PdfIndexer;
+import org.jabref.logic.pdf.search.IndexingTaskManager;
+import org.jabref.logic.pdf.search.PdfIndexer;
+import org.jabref.logic.pdf.search.PdfIndexerManager;
 import org.jabref.logic.search.SearchQuery;
 import org.jabref.logic.shared.DatabaseLocation;
 import org.jabref.logic.util.UpdateField;
@@ -62,6 +64,7 @@
 import org.jabref.model.database.event.BibDatabaseContextChangedEvent;
 import org.jabref.model.database.event.EntriesAddedEvent;
 import org.jabref.model.database.event.EntriesRemovedEvent;
+import org.jabref.model.entry.Author;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.entry.LinkedFile;
@@ -84,7 +87,7 @@
 public class LibraryTab extends Tab {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(LibraryTab.class);
-    private final JabRefFrame frame;
+    private final LibraryTabContainer tabContainer;
     private final CountingUndoManager undoManager;
     private final DialogService dialogService;
     private final PreferencesService preferencesService;
@@ -125,7 +128,7 @@ public class LibraryTab extends Tab {
     private final TaskExecutor taskExecutor;
 
     public LibraryTab(BibDatabaseContext bibDatabaseContext,
-                      JabRefFrame frame,
+                      LibraryTabContainer tabContainer,
                       DialogService dialogService,
                       PreferencesService preferencesService,
                       StateManager stateManager,
@@ -133,7 +136,7 @@ public LibraryTab(BibDatabaseContext bibDatabaseContext,
                       BibEntryTypesManager entryTypesManager,
                       CountingUndoManager undoManager,
                       TaskExecutor taskExecutor) {
-        this.frame = Objects.requireNonNull(frame);
+        this.tabContainer = Objects.requireNonNull(tabContainer);
         this.bibDatabaseContext = Objects.requireNonNull(bibDatabaseContext);
         this.undoManager = undoManager;
         this.dialogService = dialogService;
@@ -220,18 +223,18 @@ public Node createLoadingAnimationLayout() {
     public void onDatabaseLoadingStarted() {
         Node loadingLayout = createLoadingAnimationLayout();
         getMainTable().placeholderProperty().setValue(loadingLayout);
-        frame.addTab(this, true);
+        tabContainer.addTab(this, true);
     }
 
     public void onDatabaseLoadingSucceed(ParserResult result) {
         BibDatabaseContext context = result.getDatabaseContext();
-        OpenDatabaseAction.performPostOpenActions(this, result);
+        OpenDatabaseAction.performPostOpenActions(result, dialogService);
 
         feedData(context);
 
         if (preferencesService.getFilePreferences().shouldFulltextIndexLinkedFiles()) {
             try {
-                indexingTaskManager.updateIndex(PdfIndexer.of(bibDatabaseContext, preferencesService.getFilePreferences()), bibDatabaseContext);
+                indexingTaskManager.updateIndex(PdfIndexerManager.getIndexer(bibDatabaseContext, preferencesService.getFilePreferences()), bibDatabaseContext);
             } catch (IOException e) {
                 LOGGER.error("Cannot access lucene index", e);
             }
@@ -411,10 +414,6 @@ public void setMode(BasePanelMode mode) {
         this.mode = mode;
     }
 
-    public JabRefFrame frame() {
-        return frame;
-    }
-
     /**
      * Removes the selected entries from the database
      *
@@ -469,12 +468,6 @@ public void insertEntry(final BibEntry bibEntry) {
         }
     }
 
-    /**
-     * This method is called from JabRefFrame when the user wants to create a new entry or entries. It is necessary when the user would expect the added entry or one of the added entries to be selected in the entry editor
-     *
-     * @param entries The new entries.
-     */
-
     public void insertEntries(final List<BibEntry> entries) {
         if (!entries.isEmpty()) {
             bibDatabaseContext.getDatabase().insertEntries(entries);
@@ -488,9 +481,9 @@ public void insertEntries(final List<BibEntry> entries) {
 
             this.changedProperty.setValue(true); // The database just changed.
             if (preferencesService.getEntryEditorPreferences().shouldOpenOnNewEntry()) {
-                showAndEdit(entries.get(0));
+                showAndEdit(entries.getFirst());
             }
-            clearAndSelect(entries.get(0));
+            clearAndSelect(entries.getFirst());
         }
     }
 
@@ -506,6 +499,7 @@ public void editEntryAndFocusField(BibEntry entry, Field field) {
     private void createMainTable() {
         mainTable = new MainTable(tableModel,
                 this,
+                tabContainer,
                 bibDatabaseContext,
                 preferencesService,
                 dialogService,
@@ -558,21 +552,21 @@ public void setupMainPanel() {
     }
 
     /**
-     * Set up auto completion for this database
+     * Set up autocompletion for this database
      */
     private void setupAutoCompletion() {
         AutoCompletePreferences autoCompletePreferences = preferencesService.getAutoCompletePreferences();
         if (autoCompletePreferences.shouldAutoComplete()) {
             suggestionProviders = new SuggestionProviders(getDatabase(), Globals.journalAbbreviationRepository, autoCompletePreferences);
         } else {
-            // Create empty suggestion providers if auto completion is deactivated
+            // Create empty suggestion providers if auto-completion is deactivated
             suggestionProviders = new SuggestionProviders();
         }
         searchAutoCompleter = new PersonNameSuggestionProvider(FieldFactory.getPersonNameFields(), getDatabase());
     }
 
-    public void updateSearchManager() {
-        frame.getGlobalSearchBar().setAutoCompleter(searchAutoCompleter);
+    public SuggestionProvider<Author> getAutoCompleter() {
+        return searchAutoCompleter;
     }
 
     public EntryEditor getEntryEditor() {
@@ -837,7 +831,7 @@ public static LibraryTab createLibraryTab(BackgroundTask<ParserResult> dataLoadi
                                               DialogService dialogService,
                                               PreferencesService preferencesService,
                                               StateManager stateManager,
-                                              JabRefFrame frame,
+                                              LibraryTabContainer tabContainer,
                                               FileUpdateMonitor fileUpdateMonitor,
                                               BibEntryTypesManager entryTypesManager,
                                               CountingUndoManager undoManager,
@@ -847,7 +841,7 @@ public static LibraryTab createLibraryTab(BackgroundTask<ParserResult> dataLoadi
 
         LibraryTab newTab = new LibraryTab(
                 context,
-                frame,
+                tabContainer,
                 dialogService,
                 preferencesService,
                 stateManager,
@@ -866,7 +860,7 @@ public static LibraryTab createLibraryTab(BackgroundTask<ParserResult> dataLoadi
     }
 
     public static LibraryTab createLibraryTab(BibDatabaseContext databaseContext,
-                                              JabRefFrame frame,
+                                              LibraryTabContainer tabContainer,
                                               DialogService dialogService,
                                               PreferencesService preferencesService,
                                               StateManager stateManager,
@@ -876,9 +870,9 @@ public static LibraryTab createLibraryTab(BibDatabaseContext databaseContext,
                                               TaskExecutor taskExecutor) {
         Objects.requireNonNull(databaseContext);
 
-        LibraryTab libraryTab = new LibraryTab(
+        return new LibraryTab(
                 databaseContext,
-                frame,
+                tabContainer,
                 dialogService,
                 preferencesService,
                 stateManager,
@@ -886,8 +880,6 @@ public static LibraryTab createLibraryTab(BibDatabaseContext databaseContext,
                 entryTypesManager,
                 (CountingUndoManager) undoManager,
                 taskExecutor);
-
-        return libraryTab;
     }
 
     private class GroupTreeListener {
@@ -921,10 +913,8 @@ private class IndexUpdateListener {
         public void listen(EntriesAddedEvent addedEntryEvent) {
             if (preferencesService.getFilePreferences().shouldFulltextIndexLinkedFiles()) {
                 try {
-                    PdfIndexer pdfIndexer = PdfIndexer.of(bibDatabaseContext, preferencesService.getFilePreferences());
-                    for (BibEntry addedEntry : addedEntryEvent.getBibEntries()) {
-                        indexingTaskManager.addToIndex(pdfIndexer, addedEntry, bibDatabaseContext);
-                    }
+                    PdfIndexer pdfIndexer = PdfIndexerManager.getIndexer(bibDatabaseContext, preferencesService.getFilePreferences());
+                    indexingTaskManager.addToIndex(pdfIndexer, addedEntryEvent.getBibEntries());
                 } catch (IOException e) {
                     LOGGER.error("Cannot access lucene index", e);
                 }
@@ -935,7 +925,7 @@ public void listen(EntriesAddedEvent addedEntryEvent) {
         public void listen(EntriesRemovedEvent removedEntriesEvent) {
             if (preferencesService.getFilePreferences().shouldFulltextIndexLinkedFiles()) {
                 try {
-                    PdfIndexer pdfIndexer = PdfIndexer.of(bibDatabaseContext, preferencesService.getFilePreferences());
+                    PdfIndexer pdfIndexer = PdfIndexerManager.getIndexer(bibDatabaseContext, preferencesService.getFilePreferences());
                     for (BibEntry removedEntry : removedEntriesEvent.getBibEntries()) {
                         indexingTaskManager.removeFromIndex(pdfIndexer, removedEntry);
                     }
@@ -958,8 +948,9 @@ public void listen(FieldChangedEvent fieldChangedEvent) {
                     removedFiles.remove(newFileList);
 
                     try {
-                        indexingTaskManager.addToIndex(PdfIndexer.of(bibDatabaseContext, preferencesService.getFilePreferences()), fieldChangedEvent.getBibEntry(), addedFiles, bibDatabaseContext);
-                        indexingTaskManager.removeFromIndex(PdfIndexer.of(bibDatabaseContext, preferencesService.getFilePreferences()), fieldChangedEvent.getBibEntry(), removedFiles);
+                        PdfIndexer indexer = PdfIndexerManager.getIndexer(bibDatabaseContext, preferencesService.getFilePreferences());
+                        indexingTaskManager.addToIndex(indexer, fieldChangedEvent.getBibEntry(), addedFiles);
+                        indexingTaskManager.removeFromIndex(indexer, removedFiles);
                     } catch (IOException e) {
                         LOGGER.warn("I/O error when writing lucene index", e);
                     }
diff --git a/src/main/java/org/jabref/gui/LibraryTabContainer.java b/src/main/java/org/jabref/gui/LibraryTabContainer.java
index 4d3c504d503..c823e5c8892 100644
--- a/src/main/java/org/jabref/gui/LibraryTabContainer.java
+++ b/src/main/java/org/jabref/gui/LibraryTabContainer.java
@@ -5,8 +5,6 @@
 import org.jabref.model.database.BibDatabaseContext;
 
 public interface LibraryTabContainer {
-    LibraryTab getLibraryTabAt(int i);
-
     List<LibraryTab> getLibraryTabs();
 
     LibraryTab getCurrentLibraryTab();
@@ -20,4 +18,9 @@ public interface LibraryTabContainer {
     void closeTab(LibraryTab libraryTab);
 
     void closeCurrentTab();
+
+    /**
+     * Refreshes the ui after changes to the preferences
+     */
+    void refresh();
 }
diff --git a/src/main/java/org/jabref/gui/MainApplication.java b/src/main/java/org/jabref/gui/MainApplication.java
index a187843977d..76a33eb6f24 100644
--- a/src/main/java/org/jabref/gui/MainApplication.java
+++ b/src/main/java/org/jabref/gui/MainApplication.java
@@ -10,10 +10,15 @@
 import org.jabref.model.util.FileUpdateMonitor;
 import org.jabref.preferences.JabRefPreferences;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  * JabRef's main class to process command line options and to start the UI
  */
 public class MainApplication extends Application {
+    private static final Logger LOGGER = LoggerFactory.getLogger(MainApplication.class);
+
     private static List<ParserResult> parserResults;
     private static boolean isBlank;
     private static JabRefPreferences preferences;
@@ -43,5 +48,10 @@ public void stop() {
         OOBibBaseConnect.closeOfficeConnection();
         Globals.stopBackgroundTasks();
         Globals.shutdownThreadPools();
+        try {
+            Globals.predatoryJournalRepository.close();
+        } catch (Exception e) {
+            LOGGER.warn("Cloud not shut down predatoryJournalRepository", e);
+        }
     }
 }
diff --git a/src/main/java/org/jabref/gui/MainMenu.java b/src/main/java/org/jabref/gui/MainMenu.java
index 28a08a31a0d..c898417b927 100644
--- a/src/main/java/org/jabref/gui/MainMenu.java
+++ b/src/main/java/org/jabref/gui/MainMenu.java
@@ -65,6 +65,7 @@
 import org.jabref.logic.importer.IdFetcher;
 import org.jabref.logic.importer.WebFetchers;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
+import org.jabref.logic.journals.predatory.PredatoryJournalRepository;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.OS;
 import org.jabref.model.entry.BibEntryTypesManager;
@@ -82,6 +83,7 @@ public class MainMenu extends MenuBar {
     private final TaskExecutor taskExecutor;
     private final DialogService dialogService;
     private final JournalAbbreviationRepository abbreviationRepository;
+    private final PredatoryJournalRepository predatoryJournalRepository;
     private final BibEntryTypesManager entryTypesManager;
     private final UndoManager undoManager;
     private final ClipBoardManager clipBoardManager;
@@ -95,6 +97,7 @@ public MainMenu(JabRefFrame frame,
                     TaskExecutor taskExecutor,
                     DialogService dialogService,
                     JournalAbbreviationRepository abbreviationRepository,
+                    PredatoryJournalRepository predatoryJournalRepository,
                     BibEntryTypesManager entryTypesManager,
                     UndoManager undoManager,
                     ClipBoardManager clipBoardManager) {
@@ -107,6 +110,7 @@ public MainMenu(JabRefFrame frame,
         this.taskExecutor = taskExecutor;
         this.dialogService = dialogService;
         this.abbreviationRepository = abbreviationRepository;
+        this.predatoryJournalRepository = predatoryJournalRepository;
         this.entryTypesManager = entryTypesManager;
         this.undoManager = undoManager;
         this.clipBoardManager = clipBoardManager;
@@ -129,9 +133,9 @@ private void createMenu() {
                 factory.createMenuItem(StandardActions.NEW_LIBRARY, new NewDatabaseAction(frame, preferencesService)),
                 factory.createMenuItem(StandardActions.OPEN_LIBRARY, frame.getOpenDatabaseAction()),
                 frame.getFileHistory(),
-                factory.createMenuItem(StandardActions.SAVE_LIBRARY, new SaveAction(SaveAction.SaveMethod.SAVE, frame, dialogService, preferencesService, stateManager)),
-                factory.createMenuItem(StandardActions.SAVE_LIBRARY_AS, new SaveAction(SaveAction.SaveMethod.SAVE_AS, frame, dialogService, preferencesService, stateManager)),
-                factory.createMenuItem(StandardActions.SAVE_ALL, new SaveAllAction(frame, preferencesService)),
+                factory.createMenuItem(StandardActions.SAVE_LIBRARY, new SaveAction(SaveAction.SaveMethod.SAVE, frame::getCurrentLibraryTab, dialogService, preferencesService, stateManager)),
+                factory.createMenuItem(StandardActions.SAVE_LIBRARY_AS, new SaveAction(SaveAction.SaveMethod.SAVE_AS, frame::getCurrentLibraryTab, dialogService, preferencesService, stateManager)),
+                factory.createMenuItem(StandardActions.SAVE_ALL, new SaveAllAction(frame::getLibraryTabs, preferencesService, dialogService)),
                 factory.createMenuItem(StandardActions.CLOSE_LIBRARY, new JabRefFrame.CloseDatabaseAction(frame)),
 
                 new SeparatorMenuItem(),
@@ -141,19 +145,19 @@ private void createMenu() {
                         factory.createMenuItem(StandardActions.IMPORT_INTO_NEW_LIBRARY, new ImportCommand(frame, ImportCommand.ImportMethod.AS_NEW, preferencesService, stateManager, fileUpdateMonitor, taskExecutor, dialogService))),
 
                 factory.createSubMenu(StandardActions.EXPORT,
-                        factory.createMenuItem(StandardActions.EXPORT_ALL, new ExportCommand(ExportCommand.ExportMethod.EXPORT_ALL, frame, stateManager, dialogService, preferencesService, entryTypesManager, abbreviationRepository, taskExecutor)),
-                        factory.createMenuItem(StandardActions.EXPORT_SELECTED, new ExportCommand(ExportCommand.ExportMethod.EXPORT_SELECTED, frame, stateManager, dialogService, preferencesService, entryTypesManager, abbreviationRepository, taskExecutor)),
-                        factory.createMenuItem(StandardActions.SAVE_SELECTED_AS_PLAIN_BIBTEX, new SaveAction(SaveAction.SaveMethod.SAVE_SELECTED, frame, dialogService, preferencesService, stateManager))),
+                        factory.createMenuItem(StandardActions.EXPORT_ALL, new ExportCommand(ExportCommand.ExportMethod.EXPORT_ALL, frame::getCurrentLibraryTab, stateManager, dialogService, preferencesService, entryTypesManager, abbreviationRepository, taskExecutor)),
+                        factory.createMenuItem(StandardActions.EXPORT_SELECTED, new ExportCommand(ExportCommand.ExportMethod.EXPORT_SELECTED, frame::getCurrentLibraryTab, stateManager, dialogService, preferencesService, entryTypesManager, abbreviationRepository, taskExecutor)),
+                        factory.createMenuItem(StandardActions.SAVE_SELECTED_AS_PLAIN_BIBTEX, new SaveAction(SaveAction.SaveMethod.SAVE_SELECTED, frame::getCurrentLibraryTab, dialogService, preferencesService, stateManager))),
 
                 new SeparatorMenuItem(),
 
                 factory.createSubMenu(StandardActions.REMOTE_DB,
-                        factory.createMenuItem(StandardActions.CONNECT_TO_SHARED_DB, new ConnectToSharedDatabaseCommand(frame)),
+                        factory.createMenuItem(StandardActions.CONNECT_TO_SHARED_DB, new ConnectToSharedDatabaseCommand(frame, dialogService)),
                         factory.createMenuItem(StandardActions.PULL_CHANGES_FROM_SHARED_DB, new PullChangesFromSharedAction(stateManager))),
 
                 new SeparatorMenuItem(),
 
-                factory.createMenuItem(StandardActions.SHOW_PREFS, new ShowPreferencesAction(frame, taskExecutor)),
+                factory.createMenuItem(StandardActions.SHOW_PREFS, new ShowPreferencesAction(frame, dialogService)),
 
                 new SeparatorMenuItem(),
 
@@ -161,14 +165,14 @@ private void createMenu() {
         );
 
         edit.getItems().addAll(
-                factory.createMenuItem(StandardActions.UNDO, new UndoRedoAction(StandardActions.UNDO, frame, dialogService, stateManager)),
-                factory.createMenuItem(StandardActions.REDO, new UndoRedoAction(StandardActions.REDO, frame, dialogService, stateManager)),
+                factory.createMenuItem(StandardActions.UNDO, new UndoRedoAction(StandardActions.UNDO, frame::getCurrentLibraryTab, dialogService, stateManager)),
+                factory.createMenuItem(StandardActions.REDO, new UndoRedoAction(StandardActions.REDO, frame::getCurrentLibraryTab, dialogService, stateManager)),
 
                 new SeparatorMenuItem(),
 
-                factory.createMenuItem(StandardActions.CUT, new EditAction(StandardActions.CUT, frame, stateManager)),
+                factory.createMenuItem(StandardActions.CUT, new EditAction(StandardActions.CUT, frame::getCurrentLibraryTab, stateManager, undoManager)),
 
-                factory.createMenuItem(StandardActions.COPY, new EditAction(StandardActions.COPY, frame, stateManager)),
+                factory.createMenuItem(StandardActions.COPY, new EditAction(StandardActions.COPY, frame::getCurrentLibraryTab, stateManager, undoManager)),
                 factory.createSubMenu(StandardActions.COPY_MORE,
                         factory.createMenuItem(StandardActions.COPY_TITLE, new CopyMoreAction(StandardActions.COPY_TITLE, dialogService, stateManager, clipBoardManager, preferencesService, abbreviationRepository)),
                         factory.createMenuItem(StandardActions.COPY_KEY, new CopyMoreAction(StandardActions.COPY_KEY, dialogService, stateManager, clipBoardManager, preferencesService, abbreviationRepository)),
@@ -178,12 +182,12 @@ private void createMenu() {
                         factory.createMenuItem(StandardActions.COPY_CITATION_PREVIEW, new CopyCitationAction(CitationStyleOutputFormat.HTML, dialogService, stateManager, clipBoardManager, taskExecutor, preferencesService, abbreviationRepository)),
                         factory.createMenuItem(StandardActions.EXPORT_SELECTED_TO_CLIPBOARD, new ExportToClipboardAction(dialogService, stateManager, clipBoardManager, taskExecutor, preferencesService))),
 
-                factory.createMenuItem(StandardActions.PASTE, new EditAction(StandardActions.PASTE, frame, stateManager)),
+                factory.createMenuItem(StandardActions.PASTE, new EditAction(StandardActions.PASTE, frame::getCurrentLibraryTab, stateManager, undoManager)),
 
                 new SeparatorMenuItem(),
 
-                factory.createMenuItem(StandardActions.REPLACE_ALL, new ReplaceStringAction(frame, stateManager)),
-                factory.createMenuItem(StandardActions.GENERATE_CITE_KEYS, new GenerateCitationKeyAction(frame, dialogService, stateManager, taskExecutor, preferencesService)),
+                factory.createMenuItem(StandardActions.REPLACE_ALL, new ReplaceStringAction(frame::getCurrentLibraryTab, stateManager, dialogService)),
+                factory.createMenuItem(StandardActions.GENERATE_CITE_KEYS, new GenerateCitationKeyAction(frame::getCurrentLibraryTab, dialogService, stateManager, taskExecutor, preferencesService, undoManager)),
 
                 new SeparatorMenuItem(),
 
@@ -196,12 +200,12 @@ private void createMenu() {
                 specialFieldsSeparator,
                 // ToDo: SpecialField needs the active BasePanel to mark it as changed.
                 //  Refactor BasePanel, should mark the BibDatabaseContext or the UndoManager as dirty instead!
-                SpecialFieldMenuItemFactory.createSpecialFieldMenu(SpecialField.RANKING, factory, frame, dialogService, preferencesService, undoManager, stateManager),
-                SpecialFieldMenuItemFactory.getSpecialFieldSingleItem(SpecialField.RELEVANCE, factory, frame, dialogService, preferencesService, undoManager, stateManager),
-                SpecialFieldMenuItemFactory.getSpecialFieldSingleItem(SpecialField.QUALITY, factory, frame, dialogService, preferencesService, undoManager, stateManager),
-                SpecialFieldMenuItemFactory.getSpecialFieldSingleItem(SpecialField.PRINTED, factory, frame, dialogService, preferencesService, undoManager, stateManager),
-                SpecialFieldMenuItemFactory.createSpecialFieldMenu(SpecialField.PRIORITY, factory, frame, dialogService, preferencesService, undoManager, stateManager),
-                SpecialFieldMenuItemFactory.createSpecialFieldMenu(SpecialField.READ_STATUS, factory, frame, dialogService, preferencesService, undoManager, stateManager));
+                SpecialFieldMenuItemFactory.createSpecialFieldMenu(SpecialField.RANKING, factory, frame::getCurrentLibraryTab, dialogService, preferencesService, undoManager, stateManager),
+                SpecialFieldMenuItemFactory.getSpecialFieldSingleItem(SpecialField.RELEVANCE, factory, frame::getCurrentLibraryTab, dialogService, preferencesService, undoManager, stateManager),
+                SpecialFieldMenuItemFactory.getSpecialFieldSingleItem(SpecialField.QUALITY, factory, frame::getCurrentLibraryTab, dialogService, preferencesService, undoManager, stateManager),
+                SpecialFieldMenuItemFactory.getSpecialFieldSingleItem(SpecialField.PRINTED, factory, frame::getCurrentLibraryTab, dialogService, preferencesService, undoManager, stateManager),
+                SpecialFieldMenuItemFactory.createSpecialFieldMenu(SpecialField.PRIORITY, factory, frame::getCurrentLibraryTab, dialogService, preferencesService, undoManager, stateManager),
+                SpecialFieldMenuItemFactory.createSpecialFieldMenu(SpecialField.READ_STATUS, factory, frame::getCurrentLibraryTab, dialogService, preferencesService, undoManager, stateManager));
         edit.addEventHandler(ActionEvent.ACTION, event -> {
             // Work around for mac only issue, where cmd+v on a dialogue triggers the paste action of menu item, resulting in addition of the pasted content in the MainTable.
             // If the mainscreen is not focused, the actions captured by menu are consumed.
@@ -212,9 +216,9 @@ private void createMenu() {
 
         // @formatter:off
         library.getItems().addAll(
-                factory.createMenuItem(StandardActions.NEW_ENTRY, new NewEntryAction(frame, dialogService, preferencesService, stateManager)),
+                factory.createMenuItem(StandardActions.NEW_ENTRY, new NewEntryAction(frame::getCurrentLibraryTab, dialogService, preferencesService, stateManager)),
                 factory.createMenuItem(StandardActions.NEW_ENTRY_FROM_PLAIN_TEXT, new ExtractBibtexAction(dialogService, preferencesService, stateManager)),
-                factory.createMenuItem(StandardActions.DELETE_ENTRY, new EditAction(StandardActions.DELETE_ENTRY, frame, stateManager)),
+                factory.createMenuItem(StandardActions.DELETE_ENTRY, new EditAction(StandardActions.DELETE_ENTRY, frame::getCurrentLibraryTab, stateManager, undoManager)),
 
                 new SeparatorMenuItem(),
 
@@ -222,10 +226,10 @@ private void createMenu() {
         );
 
         quality.getItems().addAll(
-                factory.createMenuItem(StandardActions.FIND_DUPLICATES, new DuplicateSearch(frame, dialogService, stateManager, preferencesService, entryTypesManager, taskExecutor)),
+                factory.createMenuItem(StandardActions.FIND_DUPLICATES, new DuplicateSearch(frame::getCurrentLibraryTab, dialogService, stateManager, preferencesService, entryTypesManager, taskExecutor)),
                 factory.createMenuItem(StandardActions.MERGE_ENTRIES, new MergeEntriesAction(dialogService, stateManager, preferencesService)),
-                factory.createMenuItem(StandardActions.CHECK_INTEGRITY, new IntegrityCheckAction(frame, preferencesService, dialogService, stateManager, taskExecutor, abbreviationRepository)),
-                factory.createMenuItem(StandardActions.CLEANUP_ENTRIES, new CleanupAction(frame, preferencesService, dialogService, stateManager, taskExecutor)),
+                factory.createMenuItem(StandardActions.CHECK_INTEGRITY, new IntegrityCheckAction(frame::getCurrentLibraryTab, preferencesService, dialogService, stateManager, taskExecutor, abbreviationRepository, predatoryJournalRepository)),
+                factory.createMenuItem(StandardActions.CLEANUP_ENTRIES, new CleanupAction(frame::getCurrentLibraryTab, preferencesService, dialogService, stateManager, taskExecutor, undoManager)),
 
                 new SeparatorMenuItem(),
 
@@ -234,16 +238,16 @@ private void createMenu() {
                 new SeparatorMenuItem(),
 
                 factory.createSubMenu(StandardActions.ABBREVIATE,
-                        factory.createMenuItem(StandardActions.ABBREVIATE_DEFAULT, new AbbreviateAction(StandardActions.ABBREVIATE_DEFAULT, frame, dialogService, stateManager, preferencesService.getJournalAbbreviationPreferences(), abbreviationRepository, taskExecutor)),
-                        factory.createMenuItem(StandardActions.ABBREVIATE_DOTLESS, new AbbreviateAction(StandardActions.ABBREVIATE_DOTLESS, frame, dialogService, stateManager, preferencesService.getJournalAbbreviationPreferences(), abbreviationRepository, taskExecutor)),
-                        factory.createMenuItem(StandardActions.ABBREVIATE_SHORTEST_UNIQUE, new AbbreviateAction(StandardActions.ABBREVIATE_SHORTEST_UNIQUE, frame, dialogService, stateManager, preferencesService.getJournalAbbreviationPreferences(), abbreviationRepository, taskExecutor))),
+                        factory.createMenuItem(StandardActions.ABBREVIATE_DEFAULT, new AbbreviateAction(StandardActions.ABBREVIATE_DEFAULT, frame::getCurrentLibraryTab, dialogService, stateManager, preferencesService.getJournalAbbreviationPreferences(), abbreviationRepository, taskExecutor, undoManager)),
+                        factory.createMenuItem(StandardActions.ABBREVIATE_DOTLESS, new AbbreviateAction(StandardActions.ABBREVIATE_DOTLESS, frame::getCurrentLibraryTab, dialogService, stateManager, preferencesService.getJournalAbbreviationPreferences(), abbreviationRepository, taskExecutor, undoManager)),
+                        factory.createMenuItem(StandardActions.ABBREVIATE_SHORTEST_UNIQUE, new AbbreviateAction(StandardActions.ABBREVIATE_SHORTEST_UNIQUE, frame::getCurrentLibraryTab, dialogService, stateManager, preferencesService.getJournalAbbreviationPreferences(), abbreviationRepository, taskExecutor, undoManager))),
 
-                factory.createMenuItem(StandardActions.UNABBREVIATE, new AbbreviateAction(StandardActions.UNABBREVIATE, frame, dialogService, stateManager, preferencesService.getJournalAbbreviationPreferences(), abbreviationRepository, taskExecutor))
+                factory.createMenuItem(StandardActions.UNABBREVIATE, new AbbreviateAction(StandardActions.UNABBREVIATE, frame::getCurrentLibraryTab, dialogService, stateManager, preferencesService.getJournalAbbreviationPreferences(), abbreviationRepository, taskExecutor, undoManager))
         );
 
         Menu lookupIdentifiers = factory.createSubMenu(StandardActions.LOOKUP_DOC_IDENTIFIER);
         for (IdFetcher<?> fetcher : WebFetchers.getIdFetchers(preferencesService.getImportFormatPreferences())) {
-            LookupIdentifierAction<?> identifierAction = new LookupIdentifierAction<>(frame, fetcher, stateManager, undoManager, taskExecutor);
+            LookupIdentifierAction<?> identifierAction = new LookupIdentifierAction<>(fetcher, stateManager, undoManager, dialogService, taskExecutor);
             lookupIdentifiers.getItems().add(factory.createMenuItem(identifierAction.getAction(), identifierAction));
         }
 
@@ -261,7 +265,7 @@ private void createMenu() {
 
         tools.getItems().addAll(
                 factory.createMenuItem(StandardActions.PARSE_LATEX, new ParseLatexAction(stateManager)),
-                factory.createMenuItem(StandardActions.NEW_SUB_LIBRARY_FROM_AUX, new NewSubLibraryAction(frame, stateManager)),
+                factory.createMenuItem(StandardActions.NEW_SUB_LIBRARY_FROM_AUX, new NewSubLibraryAction(frame, stateManager, dialogService)),
 
                 new SeparatorMenuItem(),
 
@@ -277,7 +281,7 @@ private void createMenu() {
                 new SeparatorMenuItem(),
 
                 // Systematic Literature Review (SLR)
-                factory.createMenuItem(StandardActions.START_NEW_STUDY, new StartNewStudyAction(frame, fileUpdateMonitor, taskExecutor, preferencesService, stateManager)),
+                factory.createMenuItem(StandardActions.START_NEW_STUDY, new StartNewStudyAction(frame, frame::getOpenDatabaseAction, fileUpdateMonitor, taskExecutor, preferencesService, stateManager, dialogService)),
                 factory.createMenuItem(StandardActions.EDIT_EXISTING_STUDY, new EditExistingStudyAction(dialogService, stateManager)),
                 factory.createMenuItem(StandardActions.UPDATE_SEARCH_RESULTS_OF_STUDY, new ExistingStudySearchAction(frame, frame.getOpenDatabaseAction(), dialogService, fileUpdateMonitor, taskExecutor, preferencesService, stateManager)),
 
@@ -295,13 +299,13 @@ private void createMenu() {
 
                 new SeparatorMenuItem(),
 
-                factory.createMenuItem(StandardActions.NEXT_PREVIEW_STYLE, new PreviewSwitchAction(PreviewSwitchAction.Direction.NEXT, frame, stateManager)),
-                factory.createMenuItem(StandardActions.PREVIOUS_PREVIEW_STYLE, new PreviewSwitchAction(PreviewSwitchAction.Direction.PREVIOUS, frame, stateManager)),
+                factory.createMenuItem(StandardActions.NEXT_PREVIEW_STYLE, new PreviewSwitchAction(PreviewSwitchAction.Direction.NEXT, frame::getCurrentLibraryTab, stateManager)),
+                factory.createMenuItem(StandardActions.PREVIOUS_PREVIEW_STYLE, new PreviewSwitchAction(PreviewSwitchAction.Direction.PREVIOUS, frame::getCurrentLibraryTab, stateManager)),
 
                 new SeparatorMenuItem(),
 
                 factory.createMenuItem(StandardActions.SHOW_PDF_VIEWER, new ShowDocumentViewerAction(stateManager, preferencesService)),
-                factory.createMenuItem(StandardActions.EDIT_ENTRY, new OpenEntryEditorAction(frame, stateManager)),
+                factory.createMenuItem(StandardActions.EDIT_ENTRY, new OpenEntryEditorAction(frame::getCurrentLibraryTab, stateManager)),
                 factory.createMenuItem(StandardActions.OPEN_CONSOLE, new OpenConsoleAction(stateManager, preferencesService, dialogService))
         );
 
diff --git a/src/main/java/org/jabref/gui/MainToolBar.java b/src/main/java/org/jabref/gui/MainToolBar.java
index 1e89db1b724..1882b6a4ecf 100644
--- a/src/main/java/org/jabref/gui/MainToolBar.java
+++ b/src/main/java/org/jabref/gui/MainToolBar.java
@@ -44,7 +44,7 @@
 import org.controlsfx.control.TaskProgressView;
 
 public class MainToolBar extends ToolBar {
-    private final JabRefFrame frame;
+    private final LibraryTabContainer frame;
     private final PushToApplicationCommand pushToApplicationCommand;
     private final GlobalSearchBar globalSearchBar;
     private final DialogService dialogService;
@@ -58,7 +58,7 @@ public class MainToolBar extends ToolBar {
     private PopOver entryFromIdPopOver;
     private PopOver progressViewPopOver;
 
-    public MainToolBar(JabRefFrame frame,
+    public MainToolBar(LibraryTabContainer tabContainer,
                        PushToApplicationCommand pushToApplicationCommand,
                        GlobalSearchBar globalSearchBar,
                        DialogService dialogService,
@@ -68,7 +68,7 @@ public MainToolBar(JabRefFrame frame,
                        TaskExecutor taskExecutor,
                        BibEntryTypesManager entryTypesManager,
                        CountingUndoManager undoManager) {
-        this.frame = frame;
+        this.frame = tabContainer;
         this.pushToApplicationCommand = pushToApplicationCommand;
         this.globalSearchBar = globalSearchBar;
         this.dialogService = dialogService;
@@ -97,7 +97,7 @@ private void createToolBar() {
                 new HBox(
                         factory.createIconButton(StandardActions.NEW_LIBRARY, new NewDatabaseAction(frame, preferencesService)),
                         factory.createIconButton(StandardActions.OPEN_LIBRARY, new OpenDatabaseAction(frame, preferencesService, dialogService, stateManager, fileUpdateMonitor, entryTypesManager, undoManager, taskExecutor)),
-                        factory.createIconButton(StandardActions.SAVE_LIBRARY, new SaveAction(SaveAction.SaveMethod.SAVE, frame, dialogService, preferencesService, stateManager))),
+                        factory.createIconButton(StandardActions.SAVE_LIBRARY, new SaveAction(SaveAction.SaveMethod.SAVE, frame::getCurrentLibraryTab, dialogService, preferencesService, stateManager))),
 
                 leftSpacer,
 
@@ -106,27 +106,27 @@ private void createToolBar() {
                 rightSpacer,
 
                 new HBox(
-                        factory.createIconButton(StandardActions.NEW_ARTICLE, new NewEntryAction(frame, StandardEntryType.Article, dialogService, preferencesService, stateManager)),
-                        factory.createIconButton(StandardActions.NEW_ENTRY, new NewEntryAction(frame, dialogService, preferencesService, stateManager)),
+                        factory.createIconButton(StandardActions.NEW_ARTICLE, new NewEntryAction(frame::getCurrentLibraryTab, StandardEntryType.Article, dialogService, preferencesService, stateManager)),
+                        factory.createIconButton(StandardActions.NEW_ENTRY, new NewEntryAction(frame::getCurrentLibraryTab, dialogService, preferencesService, stateManager)),
                         createNewEntryFromIdButton(),
                         factory.createIconButton(StandardActions.NEW_ENTRY_FROM_PLAIN_TEXT, new ExtractBibtexAction(dialogService, preferencesService, stateManager)),
-                        factory.createIconButton(StandardActions.DELETE_ENTRY, new EditAction(StandardActions.DELETE_ENTRY, frame, stateManager))),
+                        factory.createIconButton(StandardActions.DELETE_ENTRY, new EditAction(StandardActions.DELETE_ENTRY, frame::getCurrentLibraryTab, stateManager, undoManager))),
 
                 new Separator(Orientation.VERTICAL),
 
                 new HBox(
-                        factory.createIconButton(StandardActions.UNDO, new UndoRedoAction(StandardActions.UNDO, frame, dialogService, stateManager)),
-                        factory.createIconButton(StandardActions.REDO, new UndoRedoAction(StandardActions.REDO, frame, dialogService, stateManager)),
-                        factory.createIconButton(StandardActions.CUT, new EditAction(StandardActions.CUT, frame, stateManager)),
-                        factory.createIconButton(StandardActions.COPY, new EditAction(StandardActions.COPY, frame, stateManager)),
-                        factory.createIconButton(StandardActions.PASTE, new EditAction(StandardActions.PASTE, frame, stateManager))),
+                        factory.createIconButton(StandardActions.UNDO, new UndoRedoAction(StandardActions.UNDO, frame::getCurrentLibraryTab, dialogService, stateManager)),
+                        factory.createIconButton(StandardActions.REDO, new UndoRedoAction(StandardActions.REDO, frame::getCurrentLibraryTab, dialogService, stateManager)),
+                        factory.createIconButton(StandardActions.CUT, new EditAction(StandardActions.CUT, frame::getCurrentLibraryTab, stateManager, undoManager)),
+                        factory.createIconButton(StandardActions.COPY, new EditAction(StandardActions.COPY, frame::getCurrentLibraryTab, stateManager, undoManager)),
+                        factory.createIconButton(StandardActions.PASTE, new EditAction(StandardActions.PASTE, frame::getCurrentLibraryTab, stateManager, undoManager))),
 
                 new Separator(Orientation.VERTICAL),
 
                 new HBox(
                         pushToApplicationButton,
-                        factory.createIconButton(StandardActions.GENERATE_CITE_KEYS, new GenerateCitationKeyAction(frame, dialogService, stateManager, taskExecutor, preferencesService)),
-                        factory.createIconButton(StandardActions.CLEANUP_ENTRIES, new CleanupAction(frame, preferencesService, dialogService, stateManager, taskExecutor))),
+                        factory.createIconButton(StandardActions.GENERATE_CITE_KEYS, new GenerateCitationKeyAction(frame::getCurrentLibraryTab, dialogService, stateManager, taskExecutor, preferencesService, undoManager)),
+                        factory.createIconButton(StandardActions.CLEANUP_ENTRIES, new CleanupAction(frame::getCurrentLibraryTab, preferencesService, dialogService, stateManager, taskExecutor, undoManager))),
 
                 new Separator(Orientation.VERTICAL),
 
diff --git a/src/main/java/org/jabref/gui/StateManager.java b/src/main/java/org/jabref/gui/StateManager.java
index f1ff42c5785..743ad0ef473 100644
--- a/src/main/java/org/jabref/gui/StateManager.java
+++ b/src/main/java/org/jabref/gui/StateManager.java
@@ -4,7 +4,6 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
-import java.util.stream.Collectors;
 
 import javafx.beans.Observable;
 import javafx.beans.binding.Bindings;
@@ -31,7 +30,6 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.groups.GroupTreeNode;
-import org.jabref.model.util.OptionalUtil;
 
 import com.tobiasdiez.easybind.EasyBind;
 import com.tobiasdiez.easybind.EasyBinding;
@@ -144,11 +142,6 @@ public void setActiveDatabase(BibDatabaseContext database) {
         }
     }
 
-    public List<BibEntry> getEntriesInCurrentDatabase() {
-        return OptionalUtil.flatMap(activeDatabase.get(), BibDatabaseContext::getEntries)
-                           .collect(Collectors.toList());
-    }
-
     public void clearSearchQuery() {
         activeSearchQuery.setValue(Optional.empty());
     }
diff --git a/src/main/java/org/jabref/gui/actions/StandardActions.java b/src/main/java/org/jabref/gui/actions/StandardActions.java
index 4053cdc7ea1..7c3429d2a4e 100644
--- a/src/main/java/org/jabref/gui/actions/StandardActions.java
+++ b/src/main/java/org/jabref/gui/actions/StandardActions.java
@@ -1,5 +1,6 @@
 package org.jabref.gui.actions;
 
+import java.util.Objects;
 import java.util.Optional;
 
 import org.jabref.gui.icon.IconTheme;
@@ -12,7 +13,7 @@ public enum StandardActions implements Action {
     COPY_MORE(Localization.lang("Copy") + "..."),
     COPY_TITLE(Localization.lang("Copy title"), KeyBinding.COPY_TITLE),
     COPY_KEY(Localization.lang("Copy citation key"), KeyBinding.COPY_CITATION_KEY),
-    COPY_CITE_KEY(Localization.lang("Copy \\cite{citation key}"), KeyBinding.COPY_CITE_CITATION_KEY),
+    COPY_CITE_KEY(Localization.lang("Copy citation key with configured cite command"), KeyBinding.COPY_CITE_CITATION_KEY),
     COPY_KEY_AND_TITLE(Localization.lang("Copy citation key and title"), KeyBinding.COPY_CITATION_KEY_AND_TITLE),
     COPY_KEY_AND_LINK(Localization.lang("Copy citation key and link"), KeyBinding.COPY_CITATION_KEY_AND_LINK),
     COPY_CITATION_HTML(Localization.lang("Copy citation (html)"), KeyBinding.COPY_PREVIEW),
@@ -84,7 +85,7 @@ public enum StandardActions implements Action {
 
     AUTOMATIC_FIELD_EDITOR(Localization.lang("Automatic field editor")),
     TOGGLE_GROUPS(Localization.lang("Groups"), IconTheme.JabRefIcons.TOGGLE_GROUPS, KeyBinding.TOGGLE_GROUPS_INTERFACE),
-    TOOGLE_OO(Localization.lang("OpenOffice/LibreOffice"), IconTheme.JabRefIcons.FILE_OPENOFFICE, KeyBinding.OPEN_OPEN_OFFICE_LIBRE_OFFICE_CONNECTION),
+    TOGGLE_OO(Localization.lang("OpenOffice/LibreOffice"), IconTheme.JabRefIcons.FILE_OPENOFFICE, KeyBinding.OPEN_OPEN_OFFICE_LIBRE_OFFICE_CONNECTION),
     TOGGLE_WEB_SEARCH(Localization.lang("Web search"), Localization.lang("Toggle web search interface"), IconTheme.JabRefIcons.WWW, KeyBinding.WEB_SEARCH),
 
     PARSE_LATEX(Localization.lang("Search for citations in LaTeX files..."), IconTheme.JabRefIcons.LATEX_CITATIONS),
@@ -157,6 +158,7 @@ public enum StandardActions implements Action {
     DELETE_FILE(Localization.lang("Permanently delete local file"), IconTheme.JabRefIcons.DELETE_FILE, KeyBinding.DELETE_ENTRY),
 
     HELP(Localization.lang("Online help"), IconTheme.JabRefIcons.HELP, KeyBinding.HELP),
+    HELP_GROUPS(Localization.lang("Open Help page"), IconTheme.JabRefIcons.HELP, KeyBinding.HELP),
     HELP_KEY_PATTERNS(Localization.lang("Help on key patterns"), IconTheme.JabRefIcons.HELP, KeyBinding.HELP),
     HELP_REGEX_SEARCH(Localization.lang("Help on regular expression search"), IconTheme.JabRefIcons.HELP, KeyBinding.HELP),
     HELP_NAME_FORMATTER(Localization.lang("Help on Name Formatting"), IconTheme.JabRefIcons.HELP, KeyBinding.HELP),
@@ -194,7 +196,7 @@ public enum StandardActions implements Action {
     GROUP_ENTRIES_ADD(Localization.lang("Add selected entries to this group")),
     GROUP_ENTRIES_REMOVE(Localization.lang("Remove selected entries from this group"));
 
-    private final String text;
+    private String text;
     private final String description;
     private final Optional<JabRefIcon> icon;
     private final Optional<KeyBinding> keyBinding;
@@ -271,4 +273,9 @@ public String getText() {
     public String getDescription() {
         return description;
     }
+
+    public Action withText(String text) {
+        this.text = Objects.requireNonNull(text);
+        return this;
+    }
 }
diff --git a/src/main/java/org/jabref/gui/auximport/NewSubLibraryAction.java b/src/main/java/org/jabref/gui/auximport/NewSubLibraryAction.java
index 65cc37abfd9..2af0171b5da 100644
--- a/src/main/java/org/jabref/gui/auximport/NewSubLibraryAction.java
+++ b/src/main/java/org/jabref/gui/auximport/NewSubLibraryAction.java
@@ -1,12 +1,10 @@
 package org.jabref.gui.auximport;
 
 import org.jabref.gui.DialogService;
-import org.jabref.gui.JabRefFrame;
+import org.jabref.gui.LibraryTabContainer;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.SimpleCommand;
 
-import com.airhacks.afterburner.injection.Injector;
-
 import static org.jabref.gui.actions.ActionHelper.needsDatabase;
 
 /**
@@ -16,17 +14,18 @@
  */
 public class NewSubLibraryAction extends SimpleCommand {
 
-    private final JabRefFrame jabRefFrame;
+    private final LibraryTabContainer tabContainer;
+    private final DialogService dialogService;
 
-    public NewSubLibraryAction(JabRefFrame jabRefFrame, StateManager stateManager) {
-        this.jabRefFrame = jabRefFrame;
+    public NewSubLibraryAction(LibraryTabContainer tabContainer, StateManager stateManager, DialogService dialogService) {
+        this.tabContainer = tabContainer;
+        this.dialogService = dialogService;
 
         this.executable.bind(needsDatabase(stateManager));
     }
 
     @Override
     public void execute() {
-        DialogService dialogService = Injector.instantiateModelOrService(DialogService.class);
-        dialogService.showCustomDialogAndWait(new FromAuxDialog(jabRefFrame));
+        dialogService.showCustomDialogAndWait(new FromAuxDialog(tabContainer));
     }
 }
diff --git a/src/main/java/org/jabref/gui/citationkeypattern/GenerateCitationKeyAction.java b/src/main/java/org/jabref/gui/citationkeypattern/GenerateCitationKeyAction.java
index 5cc07a31c71..b5fd088e9d1 100644
--- a/src/main/java/org/jabref/gui/citationkeypattern/GenerateCitationKeyAction.java
+++ b/src/main/java/org/jabref/gui/citationkeypattern/GenerateCitationKeyAction.java
@@ -2,9 +2,12 @@
 
 import java.util.List;
 import java.util.function.Consumer;
+import java.util.function.Supplier;
+
+import javax.swing.undo.UndoManager;
 
 import org.jabref.gui.DialogService;
-import org.jabref.gui.JabRefFrame;
+import org.jabref.gui.LibraryTab;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.ActionHelper;
 import org.jabref.gui.actions.SimpleCommand;
@@ -20,7 +23,7 @@
 
 public class GenerateCitationKeyAction extends SimpleCommand {
 
-    private final JabRefFrame frame;
+    private final Supplier<LibraryTab> tabSupplier;
     private final DialogService dialogService;
     private final StateManager stateManager;
 
@@ -29,13 +32,20 @@ public class GenerateCitationKeyAction extends SimpleCommand {
 
     private final TaskExecutor taskExecutor;
     private final PreferencesService preferencesService;
-
-    public GenerateCitationKeyAction(JabRefFrame frame, DialogService dialogService, StateManager stateManager, TaskExecutor taskExecutor, PreferencesService preferencesService) {
-        this.frame = frame;
+    private final UndoManager undoManager;
+
+    public GenerateCitationKeyAction(Supplier<LibraryTab> tabSupplier,
+                                     DialogService dialogService,
+                                     StateManager stateManager,
+                                     TaskExecutor taskExecutor,
+                                     PreferencesService preferencesService,
+                                     UndoManager undoManager) {
+        this.tabSupplier = tabSupplier;
         this.dialogService = dialogService;
         this.stateManager = stateManager;
         this.taskExecutor = taskExecutor;
         this.preferencesService = preferencesService;
+        this.undoManager = undoManager;
 
         this.executable.bind(ActionHelper.needsEntriesSelected(stateManager));
     }
@@ -131,10 +141,10 @@ protected Void call() {
             public BackgroundTask<Void> onSuccess(Consumer<Void> onSuccess) {
                 // register the undo event only if new citation keys were generated
                 if (compound.hasEdits()) {
-                    frame.getUndoManager().addEdit(compound);
+                    undoManager.addEdit(compound);
                 }
 
-                frame.getCurrentLibraryTab().markBaseChanged();
+                tabSupplier.get().markBaseChanged();
                 dialogService.notify(formatOutputMessage(Localization.lang("Generated citation key for"), entries.size()));
                 return super.onSuccess(onSuccess);
             }
diff --git a/src/main/java/org/jabref/gui/cleanup/CleanupAction.java b/src/main/java/org/jabref/gui/cleanup/CleanupAction.java
index 5cf61dceaee..f4f75a2ad74 100644
--- a/src/main/java/org/jabref/gui/cleanup/CleanupAction.java
+++ b/src/main/java/org/jabref/gui/cleanup/CleanupAction.java
@@ -2,9 +2,12 @@
 
 import java.util.List;
 import java.util.Optional;
+import java.util.function.Supplier;
+
+import javax.swing.undo.UndoManager;
 
 import org.jabref.gui.DialogService;
-import org.jabref.gui.JabRefFrame;
+import org.jabref.gui.LibraryTab;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.ActionHelper;
 import org.jabref.gui.actions.SimpleCommand;
@@ -22,25 +25,28 @@
 
 public class CleanupAction extends SimpleCommand {
 
-    private final JabRefFrame frame;
+    private final Supplier<LibraryTab> tabSupplier;
     private final PreferencesService preferences;
     private final DialogService dialogService;
     private final StateManager stateManager;
     private final TaskExecutor taskExecutor;
+    private final UndoManager undoManager;
 
     private boolean isCanceled;
     private int modifiedEntriesCount;
 
-    public CleanupAction(JabRefFrame frame,
+    public CleanupAction(Supplier<LibraryTab> tabSupplier,
                          PreferencesService preferences,
                          DialogService dialogService,
                          StateManager stateManager,
-                         TaskExecutor taskExecutor) {
-        this.frame = frame;
+                         TaskExecutor taskExecutor,
+                         UndoManager undoManager) {
+        this.tabSupplier = tabSupplier;
         this.preferences = preferences;
         this.dialogService = dialogService;
         this.stateManager = stateManager;
         this.taskExecutor = taskExecutor;
+        this.undoManager = undoManager;
 
         this.executable.bind(ActionHelper.needsEntriesSelected(stateManager));
     }
@@ -118,8 +124,8 @@ private void showResults() {
         }
 
         if (modifiedEntriesCount > 0) {
-            frame.getCurrentLibraryTab().updateEntryEditorIfShowing();
-            frame.getCurrentLibraryTab().markBaseChanged();
+            tabSupplier.get().updateEntryEditorIfShowing();
+            tabSupplier.get().markBaseChanged();
         }
 
         if (modifiedEntriesCount == 0) {
@@ -141,7 +147,7 @@ private void cleanup(BibDatabaseContext databaseContext, CleanupPreferences clea
             ce.end();
             if (ce.hasEdits()) {
                 modifiedEntriesCount++;
-                frame.getUndoManager().addEdit(ce);
+                undoManager.addEdit(ce);
             }
         }
     }
diff --git a/src/main/java/org/jabref/gui/duplicationFinder/DuplicateSearch.java b/src/main/java/org/jabref/gui/duplicationFinder/DuplicateSearch.java
index 0beda09fdf5..a6bb39a936f 100644
--- a/src/main/java/org/jabref/gui/duplicationFinder/DuplicateSearch.java
+++ b/src/main/java/org/jabref/gui/duplicationFinder/DuplicateSearch.java
@@ -10,6 +10,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Supplier;
 
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.SimpleIntegerProperty;
@@ -17,7 +18,6 @@
 
 import org.jabref.gui.DialogService;
 import org.jabref.gui.JabRefExecutorService;
-import org.jabref.gui.JabRefFrame;
 import org.jabref.gui.LibraryTab;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.SimpleCommand;
@@ -41,7 +41,7 @@
 
 public class DuplicateSearch extends SimpleCommand {
 
-    private final JabRefFrame frame;
+    private final Supplier<LibraryTab> tabSupplier;
     private final BlockingQueue<List<BibEntry>> duplicates = new LinkedBlockingQueue<>();
 
     private final AtomicBoolean libraryAnalyzed = new AtomicBoolean();
@@ -57,13 +57,13 @@ public class DuplicateSearch extends SimpleCommand {
     private final BibEntryTypesManager entryTypesManager;
     private final TaskExecutor taskExecutor;
 
-    public DuplicateSearch(JabRefFrame frame,
+    public DuplicateSearch(Supplier<LibraryTab> tabSupplier,
                            DialogService dialogService,
                            StateManager stateManager,
                            PreferencesService prefs,
                            BibEntryTypesManager entryTypesManager,
                            TaskExecutor taskExecutor) {
-        this.frame = frame;
+        this.tabSupplier = tabSupplier;
         this.dialogService = dialogService;
         this.stateManager = stateManager;
         this.prefs = prefs;
@@ -156,7 +156,7 @@ private DuplicateSearchResult verifyDuplicates() {
     }
 
     private void askResolveStrategy(DuplicateSearchResult result, BibEntry first, BibEntry second, DuplicateResolverType resolverType) {
-        DuplicateResolverDialog dialog = new DuplicateResolverDialog(first, second, resolverType, frame.getCurrentLibraryTab().getBibDatabaseContext(), stateManager, dialogService, prefs);
+        DuplicateResolverDialog dialog = new DuplicateResolverDialog(first, second, resolverType, tabSupplier.get().getBibDatabaseContext(), stateManager, dialogService, prefs);
 
         dialog.titleProperty().bind(Bindings.concat(dialog.getTitle()).concat(" (").concat(duplicateProgress.getValue()).concat("/").concat(duplicateTotal).concat(")"));
 
@@ -189,7 +189,7 @@ private void handleDuplicates(DuplicateSearchResult result) {
             return;
         }
 
-        LibraryTab libraryTab = frame.getCurrentLibraryTab();
+        LibraryTab libraryTab = tabSupplier.get();
         final NamedCompound compoundEdit = new NamedCompound(Localization.lang("duplicate removal"));
         // Now, do the actual removal:
         if (!result.getToRemove().isEmpty()) {
diff --git a/src/main/java/org/jabref/gui/edit/CopyMoreAction.java b/src/main/java/org/jabref/gui/edit/CopyMoreAction.java
index 0f9bbe3c103..36a770b4422 100644
--- a/src/main/java/org/jabref/gui/edit/CopyMoreAction.java
+++ b/src/main/java/org/jabref/gui/edit/CopyMoreAction.java
@@ -3,7 +3,7 @@
 import java.io.IOException;
 import java.io.StringReader;
 import java.util.List;
-import java.util.Optional;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 import org.jabref.gui.ClipBoardManager;
@@ -17,7 +17,9 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.layout.Layout;
 import org.jabref.logic.layout.LayoutHelper;
+import org.jabref.logic.push.CitationCommandString;
 import org.jabref.logic.util.OS;
+import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.preferences.PreferencesService;
@@ -58,13 +60,20 @@ public void execute() {
         }
 
         switch (action) {
-            case COPY_TITLE -> copyTitle();
-            case COPY_KEY -> copyKey();
-            case COPY_CITE_KEY -> copyCiteKey();
-            case COPY_KEY_AND_TITLE -> copyKeyAndTitle();
-            case COPY_KEY_AND_LINK -> copyKeyAndLink();
-            case COPY_DOI, COPY_DOI_URL -> copyDoi();
-            default -> LOGGER.info("Unknown copy command.");
+            case COPY_TITLE ->
+                    copyTitle();
+            case COPY_KEY ->
+                    copyKey();
+            case COPY_CITE_KEY ->
+                    copyCiteKey();
+            case COPY_KEY_AND_TITLE ->
+                    copyKeyAndTitle();
+            case COPY_KEY_AND_LINK ->
+                    copyKeyAndLink();
+            case COPY_DOI, COPY_DOI_URL ->
+                    copyDoi();
+            default ->
+                    LOGGER.info("Unknown copy command.");
         }
     }
 
@@ -94,47 +103,20 @@ private void copyTitle() {
         }
     }
 
-    private void copyKey() {
-        List<BibEntry> entries = stateManager.getSelectedEntries();
-
-        // Collect all non-null keys.
-        List<String> keys = entries.stream()
-                                   .filter(entry -> entry.getCitationKey().isPresent())
-                                   .map(entry -> entry.getCitationKey().get())
-                                   .collect(Collectors.toList());
-
-        if (keys.isEmpty()) {
-            dialogService.notify(Localization.lang("None of the selected entries have citation keys."));
-            return;
-        }
-
-        final String copiedKeys = String.join(",", keys);
-        clipBoardManager.setContent(copiedKeys);
-
-        if (keys.size() == entries.size()) {
-            // All entries had keys.
-            dialogService.notify(Localization.lang("Copied '%0' to clipboard.",
-                    JabRefDialogService.shortenDialogMessage(copiedKeys)));
-        } else {
-            dialogService.notify(Localization.lang("Warning: %0 out of %1 entries have undefined citation key.",
-                    Integer.toString(entries.size() - keys.size()), Integer.toString(entries.size())));
-        }
-    }
-
     private void copyDoi() {
         List<BibEntry> entries = stateManager.getSelectedEntries();
 
         // Collect all non-null DOI or DOI urls
         if (action == StandardActions.COPY_DOI_URL) {
             copyDoiList(entries.stream()
-                    .filter(entry -> entry.getDOI().isPresent())
-                    .map(entry -> entry.getDOI().get().getURIAsASCIIString())
-                    .collect(Collectors.toList()), entries.size());
+                               .filter(entry -> entry.getDOI().isPresent())
+                               .map(entry -> entry.getDOI().get().getURIAsASCIIString())
+                               .collect(Collectors.toList()), entries.size());
         } else {
             copyDoiList(entries.stream()
-                    .filter(entry -> entry.getDOI().isPresent())
-                    .map(entry -> entry.getDOI().get().getDOI())
-                    .collect(Collectors.toList()), entries.size());
+                               .filter(entry -> entry.getDOI().isPresent())
+                               .map(entry -> entry.getDOI().get().getDOI())
+                               .collect(Collectors.toList()), entries.size());
         }
     }
 
@@ -157,7 +139,7 @@ private void copyDoiList(List<String> dois, int size) {
         }
     }
 
-    private void copyCiteKey() {
+    private void doCopyKey(Function<List<String>, String> mapKeyList) {
         List<BibEntry> entries = stateManager.getSelectedEntries();
 
         // Collect all non-null keys.
@@ -171,23 +153,31 @@ private void copyCiteKey() {
             return;
         }
 
-        String citeCommand = Optional.ofNullable(preferencesService.getExternalApplicationsPreferences().getCiteCommand())
-                                     .filter(cite -> cite.contains("\\")) // must contain \
-                                     .orElse("\\cite");
+        String clipBoardContent = mapKeyList.apply(keys);
 
-        final String copiedCiteCommand = citeCommand + "{" + String.join(",", keys) + '}';
-        clipBoardManager.setContent(copiedCiteCommand);
+        clipBoardManager.setContent(clipBoardContent);
 
         if (keys.size() == entries.size()) {
             // All entries had keys.
             dialogService.notify(Localization.lang("Copied '%0' to clipboard.",
-                    JabRefDialogService.shortenDialogMessage(copiedCiteCommand)));
+                    JabRefDialogService.shortenDialogMessage(clipBoardContent)));
         } else {
             dialogService.notify(Localization.lang("Warning: %0 out of %1 entries have undefined citation key.",
                     Integer.toString(entries.size() - keys.size()), Integer.toString(entries.size())));
         }
     }
 
+    private void copyCiteKey() {
+        doCopyKey(keys -> {
+            CitationCommandString citeCommand = preferencesService.getExternalApplicationsPreferences().getCiteCommand();
+            return citeCommand.prefix() + String.join(citeCommand.delimiter(), keys) + citeCommand.suffix();
+        });
+    }
+
+    private void copyKey() {
+        doCopyKey(keys -> String.join(preferencesService.getExternalApplicationsPreferences().getCiteCommand().delimiter(), keys));
+    }
+
     private void copyKeyAndTitle() {
         List<BibEntry> entries = stateManager.getSelectedEntries();
 
@@ -208,7 +198,9 @@ private void copyKeyAndTitle() {
         for (BibEntry entry : entries) {
             if (entry.hasCitationKey()) {
                 entriesWithKeys++;
-                keyAndTitle.append(layout.doLayout(entry, stateManager.getActiveDatabase().get().getDatabase()));
+                stateManager.getActiveDatabase()
+                            .map(BibDatabaseContext::getDatabase)
+                            .ifPresent(bibDatabase -> keyAndTitle.append(layout.doLayout(entry, bibDatabase)));
             }
         }
 
@@ -242,7 +234,7 @@ private void copyKeyAndLink() {
 
         List<BibEntry> entriesWithKey = entries.stream()
                                                .filter(BibEntry::hasCitationKey)
-                                               .collect(Collectors.toList());
+                                               .toList();
 
         if (entriesWithKey.isEmpty()) {
             dialogService.notify(Localization.lang("None of the selected entries have citation keys."));
@@ -250,7 +242,10 @@ private void copyKeyAndLink() {
         }
 
         for (BibEntry entry : entriesWithKey) {
-            String key = entry.getCitationKey().get();
+            String key = entry.getCitationKey().orElse("");
+            if (LOGGER.isDebugEnabled() && key.isEmpty()) {
+                LOGGER.debug("entry {} had no citation key, but it should have had one", entry);
+            }
             String url = entry.getField(StandardField.URL).orElse("");
             keyAndLink.append(url.isEmpty() ? key : String.format("<a href=\"%s\">%s</a>", url, key));
             keyAndLink.append(OS.NEWLINE);
diff --git a/src/main/java/org/jabref/gui/edit/EditAction.java b/src/main/java/org/jabref/gui/edit/EditAction.java
index b0daa482cb0..be8472a1585 100644
--- a/src/main/java/org/jabref/gui/edit/EditAction.java
+++ b/src/main/java/org/jabref/gui/edit/EditAction.java
@@ -1,9 +1,13 @@
 package org.jabref.gui.edit;
 
+import java.util.function.Supplier;
+
+import javax.swing.undo.UndoManager;
+
 import javafx.scene.control.TextInputControl;
 import javafx.scene.web.WebView;
 
-import org.jabref.gui.JabRefFrame;
+import org.jabref.gui.LibraryTab;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.ActionHelper;
 import org.jabref.gui.actions.SimpleCommand;
@@ -21,14 +25,16 @@ public class EditAction extends SimpleCommand {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(EditAction.class);
 
-    private final JabRefFrame frame;
+    private final Supplier<LibraryTab> tabSupplier;
     private final StandardActions action;
     private final StateManager stateManager;
+    private final UndoManager undoManager;
 
-    public EditAction(StandardActions action, JabRefFrame frame, StateManager stateManager) {
+    public EditAction(StandardActions action, Supplier<LibraryTab> tabSupplier, StateManager stateManager, UndoManager undoManager) {
         this.action = action;
-        this.frame = frame;
+        this.tabSupplier = tabSupplier;
         this.stateManager = stateManager;
+        this.undoManager = undoManager;
 
         if (action == StandardActions.PASTE) {
             this.executable.bind(ActionHelper.needsDatabase(stateManager));
@@ -72,18 +78,18 @@ public void execute() {
                 // Not sure what is selected -> copy/paste/cut selected entries except for Preview and CodeArea
 
                 switch (action) {
-                    case COPY -> frame.getCurrentLibraryTab().copy();
-                    case CUT -> frame.getCurrentLibraryTab().cut();
-                    case PASTE -> frame.getCurrentLibraryTab().paste();
-                    case DELETE_ENTRY -> frame.getCurrentLibraryTab().delete(false);
+                    case COPY -> tabSupplier.get().copy();
+                    case CUT -> tabSupplier.get().cut();
+                    case PASTE -> tabSupplier.get().paste();
+                    case DELETE_ENTRY -> tabSupplier.get().delete(false);
                     case UNDO -> {
-                        if (frame.getUndoManager().canUndo()) {
-                            frame.getUndoManager().undo();
+                        if (undoManager.canUndo()) {
+                            undoManager.undo();
                         }
                     }
                     case REDO -> {
-                        if (frame.getUndoManager().canRedo()) {
-                            frame.getUndoManager().redo();
+                        if (undoManager.canRedo()) {
+                            undoManager.redo();
                         }
                     }
                     default -> LOGGER.debug("Only cut/copy/paste/deleteEntry supported but got: {} and focus owner {}", action, focusOwner);
diff --git a/src/main/java/org/jabref/gui/edit/ReplaceStringAction.java b/src/main/java/org/jabref/gui/edit/ReplaceStringAction.java
index bf7b7e579d0..8339b5db7f3 100644
--- a/src/main/java/org/jabref/gui/edit/ReplaceStringAction.java
+++ b/src/main/java/org/jabref/gui/edit/ReplaceStringAction.java
@@ -1,25 +1,26 @@
 package org.jabref.gui.edit;
 
+import java.util.function.Supplier;
+
 import org.jabref.gui.DialogService;
-import org.jabref.gui.JabRefFrame;
+import org.jabref.gui.LibraryTab;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.ActionHelper;
 import org.jabref.gui.actions.SimpleCommand;
 
-import com.airhacks.afterburner.injection.Injector;
-
 public class ReplaceStringAction extends SimpleCommand {
-    private final JabRefFrame frame;
+    private final Supplier<LibraryTab> tabSupplier;
+    private final DialogService dialogService;
 
-    public ReplaceStringAction(JabRefFrame frame, StateManager stateManager) {
-        this.frame = frame;
+    public ReplaceStringAction(Supplier<LibraryTab> tabSupplier, StateManager stateManager, DialogService dialogService) {
+        this.tabSupplier = tabSupplier;
+        this.dialogService = dialogService;
 
         this.executable.bind(ActionHelper.needsDatabase(stateManager));
     }
 
     @Override
     public void execute() {
-        DialogService dialogService = Injector.instantiateModelOrService(DialogService.class);
-        dialogService.showCustomDialogAndWait(new ReplaceStringView(frame.getCurrentLibraryTab()));
+        dialogService.showCustomDialogAndWait(new ReplaceStringView(tabSupplier.get()));
     }
 }
diff --git a/src/main/java/org/jabref/gui/entryeditor/CommentsTab.java b/src/main/java/org/jabref/gui/entryeditor/CommentsTab.java
index 269ab381a83..4aa92a3520d 100644
--- a/src/main/java/org/jabref/gui/entryeditor/CommentsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/CommentsTab.java
@@ -1,22 +1,31 @@
 package org.jabref.gui.entryeditor;
 
+import java.util.Comparator;
 import java.util.LinkedHashSet;
 import java.util.Map;
-import java.util.Set;
+import java.util.Optional;
+import java.util.SequencedSet;
 import java.util.stream.Collectors;
 
 import javax.swing.undo.UndoManager;
 
+import javafx.collections.ObservableList;
+import javafx.geometry.VPos;
+import javafx.scene.control.Button;
+import javafx.scene.layout.Priority;
+import javafx.scene.layout.RowConstraints;
+
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.autocompleter.SuggestionProviders;
 import org.jabref.gui.fieldeditors.FieldEditorFX;
+import org.jabref.gui.fieldeditors.FieldNameLabel;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.theme.ThemeManager;
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.logic.pdf.search.indexing.IndexingTaskManager;
+import org.jabref.logic.pdf.search.IndexingTaskManager;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
@@ -28,6 +37,10 @@ public class CommentsTab extends FieldsEditorTab {
     public static final String NAME = "Comments";
 
     private final String defaultOwner;
+    private final UserSpecificCommentField userSpecificCommentField;
+
+    private final EntryEditorPreferences entryEditorPreferences;
+
     public CommentsTab(PreferencesService preferences,
                        BibDatabaseContext databaseContext,
                        SuggestionProviders suggestionProviders,
@@ -54,38 +67,89 @@ public CommentsTab(PreferencesService preferences,
         this.defaultOwner = preferences.getOwnerPreferences().getDefaultOwner();
         setText(Localization.lang("Comments"));
         setGraphic(IconTheme.JabRefIcons.COMMENT.getGraphicNode());
+
+        userSpecificCommentField = new UserSpecificCommentField(defaultOwner);
+        entryEditorPreferences = preferences.getEntryEditorPreferences();
     }
 
     @Override
-    protected Set<Field> determineFieldsToShow(BibEntry entry) {
-        UserSpecificCommentField defaultCommentField = new UserSpecificCommentField(defaultOwner);
+    protected SequencedSet<Field> determineFieldsToShow(BibEntry entry) {
+        SequencedSet<Field> comments = new LinkedHashSet<>();
 
-        // As default: Show BibTeX comment field and the user-specific comment field of the default owner
-        Set<Field> comments = new LinkedHashSet<>(Set.of(defaultCommentField, StandardField.COMMENT));
+        // First comes the standard comment field
+        comments.add(StandardField.COMMENT);
 
-        comments.addAll(entry.getFields().stream()
-                             .filter(field -> field instanceof UserSpecificCommentField ||
-                                     field.getName().toLowerCase().contains("comment"))
-                             .collect(Collectors.toSet()));
+        // Also show comment field of the current user (if enabled in the preferences)
+        if (entry.hasField(userSpecificCommentField) || entryEditorPreferences.shouldShowUserCommentsFields()) {
+            comments.add(userSpecificCommentField);
+        }
 
+        // Show all non-empty comment fields (otherwise, they are completely hidden)
+        comments.addAll(entry.getFields().stream()
+                .filter(field -> (field instanceof UserSpecificCommentField && !field.equals(userSpecificCommentField))
+                        || field.getName().toLowerCase().contains("comment"))
+                .sorted(Comparator.comparing(Field::getName))
+                .collect(Collectors.toCollection(LinkedHashSet::new)));
         return comments;
     }
 
+    /**
+     * Comment editors: three times size of button
+     */
+    private void setCompressedRowLayout() {
+        int numberOfComments = gridPane.getRowCount() - 1;
+        double totalWeight = numberOfComments * 3 + 1;
+
+        RowConstraints commentConstraint = new RowConstraints();
+        commentConstraint.setVgrow(Priority.ALWAYS);
+        commentConstraint.setValignment(VPos.TOP);
+        double commentHeightPercent = 3.0 / totalWeight * 100.0;
+        commentConstraint.setPercentHeight(commentHeightPercent);
+
+        RowConstraints buttonConstraint = new RowConstraints();
+        buttonConstraint.setVgrow(Priority.ALWAYS);
+        buttonConstraint.setValignment(VPos.TOP);
+        double addButtonHeightPercent = 1.0 / totalWeight * 100.0;
+        buttonConstraint.setPercentHeight(addButtonHeightPercent);
+
+        ObservableList<RowConstraints> rowConstraints = gridPane.getRowConstraints();
+        rowConstraints.clear();
+        for (int i = 1; i <= numberOfComments; i++) {
+            rowConstraints.add(commentConstraint);
+        }
+        rowConstraints.add(buttonConstraint);
+    }
+
     @Override
     protected void setupPanel(BibEntry entry, boolean compressed) {
         super.setupPanel(entry, compressed);
 
+        Optional<FieldEditorFX> fieldEditorForUserDefinedComment = editors.entrySet().stream().filter(f -> f.getKey().getName().contains(defaultOwner)).map(Map.Entry::getValue).findFirst();
         for (Map.Entry<Field, FieldEditorFX> fieldEditorEntry : editors.entrySet()) {
             Field field = fieldEditorEntry.getKey();
             FieldEditorFX editor = fieldEditorEntry.getValue();
 
-            if (field instanceof UserSpecificCommentField) {
-                if (field.getName().contains(defaultOwner)) {
-                    editor.getNode().setDisable(false);
-                }
-            } else {
-                editor.getNode().setDisable(!field.getName().equals(StandardField.COMMENT.getName()));
-            }
+            boolean isStandardBibtexComment = field == StandardField.COMMENT;
+            boolean isDefaultOwnerComment = field.equals(userSpecificCommentField);
+            boolean shouldBeEnabled = isStandardBibtexComment || isDefaultOwnerComment;
+            editor.getNode().setDisable(!shouldBeEnabled);
+        }
+
+        // Show "Hide" button only if user-specific comment field is empty. Otherwise, it is a strange UI, because the
+        // button would just disappear and no change **in the current** editor would be made
+        if (entryEditorPreferences.shouldShowUserCommentsFields() && !entry.hasField(userSpecificCommentField)) {
+            Button hideDefaultOwnerCommentButton = new Button(Localization.lang("Hide user comments"));
+            hideDefaultOwnerCommentButton.setOnAction(e -> {
+                var labelForField = gridPane.getChildren().stream().filter(s -> s instanceof FieldNameLabel).filter(x -> ((FieldNameLabel) x).getText().equals(userSpecificCommentField.getDisplayName())).findFirst();
+                labelForField.ifPresent(label -> gridPane.getChildren().remove(label));
+                fieldEditorForUserDefinedComment.ifPresent(f -> gridPane.getChildren().remove(f.getNode()));
+                editors.remove(userSpecificCommentField);
+
+                entryEditorPreferences.setShowUserCommentsFields(false);
+                setupPanel(entry, false);
+            });
+            gridPane.add(hideDefaultOwnerCommentButton, 1, gridPane.getRowCount(), 2, 1);
+            setCompressedRowLayout();
         }
     }
 }
diff --git a/src/main/java/org/jabref/gui/entryeditor/DeprecatedFieldsTab.java b/src/main/java/org/jabref/gui/entryeditor/DeprecatedFieldsTab.java
index a40302d54c6..a66339ea7b6 100644
--- a/src/main/java/org/jabref/gui/entryeditor/DeprecatedFieldsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/DeprecatedFieldsTab.java
@@ -1,8 +1,8 @@
 package org.jabref.gui.entryeditor;
 
-import java.util.Collections;
+import java.util.LinkedHashSet;
 import java.util.Optional;
-import java.util.Set;
+import java.util.SequencedSet;
 import java.util.stream.Collectors;
 
 import javax.swing.undo.UndoManager;
@@ -17,7 +17,7 @@
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.logic.pdf.search.indexing.IndexingTaskManager;
+import org.jabref.logic.pdf.search.IndexingTaskManager;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.model.entry.BibEntry;
@@ -59,14 +59,14 @@ public DeprecatedFieldsTab(BibDatabaseContext databaseContext,
     }
 
     @Override
-    protected Set<Field> determineFieldsToShow(BibEntry entry) {
+    protected SequencedSet<Field> determineFieldsToShow(BibEntry entry) {
         BibDatabaseMode mode = databaseContext.getMode();
         Optional<BibEntryType> entryType = entryTypesManager.enrich(entry.getType(), mode);
         if (entryType.isPresent()) {
-            return entryType.get().getDeprecatedFields(mode).stream().filter(field -> !entry.getField(field).isEmpty()).collect(Collectors.toSet());
+            return entryType.get().getDeprecatedFields(mode).stream().filter(field -> !entry.getField(field).isEmpty()).collect(Collectors.toCollection(LinkedHashSet::new));
         } else {
-            // Entry type unknown -> treat all fields as required
-            return Collections.emptySet();
+            // Entry type unknown -> treat all fields as required (thus no optional fields)
+            return new LinkedHashSet<>();
         }
     }
 }
diff --git a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
index 7ee6f1b6968..802c04194b4 100644
--- a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
+++ b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
@@ -285,7 +285,7 @@ private List<EntryEditorTab> createTabs() {
         entryEditorTabs.add(new FileAnnotationTab(libraryTab.getAnnotationCache()));
         entryEditorTabs.add(new RelatedArticlesTab(entryEditorPreferences, preferencesService, dialogService, taskExecutor));
         entryEditorTabs.add(new CitationRelationsTab(entryEditorPreferences, dialogService, databaseContext,
-                undoManager, stateManager, fileMonitor, preferencesService, libraryTab));
+                undoManager, stateManager, fileMonitor, preferencesService, libraryTab, taskExecutor));
 
         sourceTab = new SourceTab(
                 databaseContext,
diff --git a/src/main/java/org/jabref/gui/entryeditor/EntryEditorPreferences.java b/src/main/java/org/jabref/gui/entryeditor/EntryEditorPreferences.java
index c2afea3b0af..ae0fda0194c 100644
--- a/src/main/java/org/jabref/gui/entryeditor/EntryEditorPreferences.java
+++ b/src/main/java/org/jabref/gui/entryeditor/EntryEditorPreferences.java
@@ -48,6 +48,7 @@ public static JournalPopupEnabled fromString(String status) {
     private final BooleanProperty autoLinkFiles;
     private final ObjectProperty<JournalPopupEnabled> enablementStatus;
     private final BooleanProperty shouldShowSciteTab;
+    private final BooleanProperty showUserCommentsFields;
 
     public EntryEditorPreferences(Map<String, Set<Field>> entryEditorTabList,
                                   Map<String, Set<Field>> defaultEntryEditorTabList,
@@ -60,7 +61,8 @@ public EntryEditorPreferences(Map<String, Set<Field>> entryEditorTabList,
                                   double dividerPosition,
                                   boolean autolinkFilesEnabled,
                                   JournalPopupEnabled journalPopupEnabled,
-                                  boolean showSciteTab) {
+                                  boolean showSciteTab,
+                                  boolean showUserCommentsFields) {
 
         this.entryEditorTabList = new SimpleMapProperty<>(FXCollections.observableMap(entryEditorTabList));
         this.defaultEntryEditorTabList = new SimpleMapProperty<>(FXCollections.observableMap(defaultEntryEditorTabList));
@@ -74,6 +76,7 @@ public EntryEditorPreferences(Map<String, Set<Field>> entryEditorTabList,
         this.autoLinkFiles = new SimpleBooleanProperty(autolinkFilesEnabled);
         this.enablementStatus = new SimpleObjectProperty<>(journalPopupEnabled);
         this.shouldShowSciteTab = new SimpleBooleanProperty(showSciteTab);
+        this.showUserCommentsFields = new SimpleBooleanProperty(showUserCommentsFields);
     }
 
     public ObservableMap<String, Set<Field>> getEntryEditorTabs() {
@@ -211,4 +214,16 @@ public BooleanProperty shouldShowLSciteTabProperty() {
     public void setShouldShowSciteTab(boolean shouldShowSciteTab) {
         this.shouldShowSciteTab.set(shouldShowSciteTab);
     }
+
+    public boolean shouldShowUserCommentsFields() {
+        return showUserCommentsFields.get();
+    }
+
+    public BooleanProperty showUserCommentsFieldsProperty() {
+        return showUserCommentsFields;
+    }
+
+    public void setShowUserCommentsFields(boolean showUserCommentsFields) {
+        this.showUserCommentsFields.set(showUserCommentsFields);
+    }
 }
diff --git a/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java b/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java
index 780af05c3c4..20e54396bfe 100644
--- a/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java
@@ -6,11 +6,12 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.Set;
+import java.util.SequencedSet;
 import java.util.stream.Stream;
 
 import javax.swing.undo.UndoManager;
 
+import javafx.collections.ObservableList;
 import javafx.geometry.VPos;
 import javafx.scene.Node;
 import javafx.scene.Parent;
@@ -33,7 +34,7 @@
 import org.jabref.gui.theme.ThemeManager;
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
-import org.jabref.logic.pdf.search.indexing.IndexingTaskManager;
+import org.jabref.logic.pdf.search.IndexingTaskManager;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
@@ -47,6 +48,7 @@
 abstract class FieldsEditorTab extends EntryEditorTab {
     protected final BibDatabaseContext databaseContext;
     protected final Map<Field, FieldEditorFX> editors = new LinkedHashMap<>();
+    protected GridPane gridPane;
     private final boolean isCompressed;
     private final SuggestionProviders suggestionProviders;
     private final DialogService dialogService;
@@ -59,7 +61,6 @@ abstract class FieldsEditorTab extends EntryEditorTab {
     private PreviewPanel previewPanel;
     private final UndoManager undoManager;
     private Collection<Field> fields = new ArrayList<>();
-    private GridPane gridPane;
 
     public FieldsEditorTab(boolean compressed,
                            BibDatabaseContext databaseContext,
@@ -107,36 +108,22 @@ protected void setupPanel(BibEntry entry, boolean compressed) {
 
         fields = determineFieldsToShow(entry);
 
-        List<Label> labels = new ArrayList<>();
-        for (Field field : fields) {
-            FieldEditorFX fieldEditor = FieldEditors.getForField(
-                    field,
-                    taskExecutor,
-                    dialogService,
-                    journalAbbreviationRepository,
-                    preferences,
-                    databaseContext,
-                    entry.getType(),
-                    suggestionProviders,
-                    undoManager);
-            fieldEditor.bindToEntry(entry);
-
-            editors.put(field, fieldEditor);
-            labels.add(new FieldNameLabel(field));
-        }
+        List<Label> labels = fields
+                .stream()
+                .map(field -> createLabelAndEditor(entry, field))
+                .toList();
 
         ColumnConstraints columnExpand = new ColumnConstraints();
         columnExpand.setHgrow(Priority.ALWAYS);
 
         ColumnConstraints columnDoNotContract = new ColumnConstraints();
         columnDoNotContract.setMinWidth(Region.USE_PREF_SIZE);
-        int rows;
         if (compressed) {
-            rows = (int) Math.ceil((double) fields.size() / 2);
+            int rows = (int) Math.ceil((double) fields.size() / 2);
 
             addColumn(gridPane, 0, labels.subList(0, rows));
-            addColumn(gridPane, 3, labels.subList(rows, labels.size()));
             addColumn(gridPane, 1, editors.values().stream().map(FieldEditorFX::getNode).limit(rows));
+            addColumn(gridPane, 3, labels.subList(rows, labels.size()));
             addColumn(gridPane, 4, editors.values().stream().map(FieldEditorFX::getNode).skip(rows));
 
             columnExpand.setPercentWidth(40);
@@ -154,23 +141,39 @@ protected void setupPanel(BibEntry entry, boolean compressed) {
         }
     }
 
+    protected Label createLabelAndEditor(BibEntry entry, Field field) {
+        FieldEditorFX fieldEditor = FieldEditors.getForField(
+                field,
+                taskExecutor,
+                dialogService,
+                journalAbbreviationRepository,
+                preferences,
+                databaseContext,
+                entry.getType(),
+                suggestionProviders,
+                undoManager);
+        fieldEditor.bindToEntry(entry);
+        editors.put(field, fieldEditor);
+        return new FieldNameLabel(field);
+    }
+
     private void setRegularRowLayout(GridPane gridPane) {
         double totalWeight = fields.stream()
                                    .mapToDouble(field -> editors.get(field).getWeight())
                                    .sum();
-
-        List<RowConstraints> constraints = new ArrayList<>();
-        for (Field field : fields) {
-            RowConstraints rowExpand = new RowConstraints();
-            rowExpand.setVgrow(Priority.ALWAYS);
-            rowExpand.setValignment(VPos.TOP);
-            rowExpand.setPercentHeight(100 * editors.get(field).getWeight() / totalWeight);
-            constraints.add(rowExpand);
-        }
+        List<RowConstraints> constraints = fields
+                .stream()
+                .map(field -> {
+                    RowConstraints rowExpand = new RowConstraints();
+                    rowExpand.setVgrow(Priority.ALWAYS);
+                    rowExpand.setValignment(VPos.TOP);
+                    rowExpand.setPercentHeight(100 * editors.get(field).getWeight() / totalWeight);
+                    return rowExpand;
+                }).toList();
         gridPane.getRowConstraints().addAll(constraints);
     }
 
-    private void setCompressedRowLayout(GridPane gridPane, int rows) {
+    protected static void setCompressedRowLayout(GridPane gridPane, int rows) {
         RowConstraints rowExpand = new RowConstraints();
         rowExpand.setVgrow(Priority.ALWAYS);
         rowExpand.setValignment(VPos.TOP);
@@ -179,8 +182,11 @@ private void setCompressedRowLayout(GridPane gridPane, int rows) {
         } else {
             rowExpand.setPercentHeight(100 / (double) rows);
         }
+
+        ObservableList<RowConstraints> rowConstraints = gridPane.getRowConstraints();
+        rowConstraints.clear();
         for (int i = 0; i < rows; i++) {
-            gridPane.getRowConstraints().add(rowExpand);
+            rowConstraints.add(rowExpand);
         }
     }
 
@@ -218,7 +224,7 @@ protected void previousPreviewStyle() {
         }
     }
 
-    protected abstract Set<Field> determineFieldsToShow(BibEntry entry);
+    protected abstract SequencedSet<Field> determineFieldsToShow(BibEntry entry);
 
     public Collection<Field> getShownFields() {
         return fields;
@@ -229,7 +235,7 @@ private void initPanel() {
             gridPane = new GridPane();
             gridPane.getStyleClass().add("editorPane");
 
-            // Warp everything in a scroll-pane
+            // Wrap everything in a scroll-pane
             ScrollPane scrollPane = new ScrollPane();
             scrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.NEVER);
             scrollPane.setVbarPolicy(ScrollPane.ScrollBarPolicy.AS_NEEDED);
diff --git a/src/main/java/org/jabref/gui/entryeditor/OpenEntryEditorAction.java b/src/main/java/org/jabref/gui/entryeditor/OpenEntryEditorAction.java
index 4fe0a8101b4..36758215401 100644
--- a/src/main/java/org/jabref/gui/entryeditor/OpenEntryEditorAction.java
+++ b/src/main/java/org/jabref/gui/entryeditor/OpenEntryEditorAction.java
@@ -1,17 +1,19 @@
 package org.jabref.gui.entryeditor;
 
-import org.jabref.gui.JabRefFrame;
+import java.util.function.Supplier;
+
+import org.jabref.gui.LibraryTab;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.ActionHelper;
 import org.jabref.gui.actions.SimpleCommand;
 
 public class OpenEntryEditorAction extends SimpleCommand {
 
-    private final JabRefFrame frame;
+    private final Supplier<LibraryTab> tabSupplier;
     private final StateManager stateManager;
 
-    public OpenEntryEditorAction(JabRefFrame frame, StateManager stateManager) {
-        this.frame = frame;
+    public OpenEntryEditorAction(Supplier<LibraryTab> tabSupplier, StateManager stateManager) {
+        this.tabSupplier = tabSupplier;
         this.stateManager = stateManager;
 
         this.executable.bind(ActionHelper.needsEntriesSelected(stateManager));
@@ -19,7 +21,7 @@ public OpenEntryEditorAction(JabRefFrame frame, StateManager stateManager) {
 
     public void execute() {
         if (!stateManager.getSelectedEntries().isEmpty()) {
-            frame.getCurrentLibraryTab().showAndEdit(stateManager.getSelectedEntries().get(0));
+            tabSupplier.get().showAndEdit(stateManager.getSelectedEntries().getFirst());
         }
     }
 }
diff --git a/src/main/java/org/jabref/gui/entryeditor/OptionalFields2Tab.java b/src/main/java/org/jabref/gui/entryeditor/OptionalFields2Tab.java
index da37540e513..c63c145cfba 100644
--- a/src/main/java/org/jabref/gui/entryeditor/OptionalFields2Tab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/OptionalFields2Tab.java
@@ -9,7 +9,7 @@
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.logic.pdf.search.indexing.IndexingTaskManager;
+import org.jabref.logic.pdf.search.IndexingTaskManager;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.preferences.PreferencesService;
diff --git a/src/main/java/org/jabref/gui/entryeditor/OptionalFieldsTab.java b/src/main/java/org/jabref/gui/entryeditor/OptionalFieldsTab.java
index d511ef268cf..ad522d2411f 100644
--- a/src/main/java/org/jabref/gui/entryeditor/OptionalFieldsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/OptionalFieldsTab.java
@@ -9,7 +9,7 @@
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.logic.pdf.search.indexing.IndexingTaskManager;
+import org.jabref.logic.pdf.search.IndexingTaskManager;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.preferences.PreferencesService;
diff --git a/src/main/java/org/jabref/gui/entryeditor/OptionalFieldsTabBase.java b/src/main/java/org/jabref/gui/entryeditor/OptionalFieldsTabBase.java
index edb22834ff2..5f61a0279ab 100644
--- a/src/main/java/org/jabref/gui/entryeditor/OptionalFieldsTabBase.java
+++ b/src/main/java/org/jabref/gui/entryeditor/OptionalFieldsTabBase.java
@@ -1,8 +1,8 @@
 package org.jabref.gui.entryeditor;
 
-import java.util.Collections;
+import java.util.LinkedHashSet;
 import java.util.Optional;
-import java.util.Set;
+import java.util.SequencedSet;
 
 import javax.swing.undo.UndoManager;
 
@@ -16,7 +16,7 @@
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.logic.pdf.search.indexing.IndexingTaskManager;
+import org.jabref.logic.pdf.search.IndexingTaskManager;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.model.entry.BibEntry;
@@ -61,7 +61,7 @@ public OptionalFieldsTabBase(String title,
     }
 
     @Override
-    protected Set<Field> determineFieldsToShow(BibEntry entry) {
+    protected SequencedSet<Field> determineFieldsToShow(BibEntry entry) {
         BibDatabaseMode mode = databaseContext.getMode();
         Optional<BibEntryType> entryType = entryTypesManager.enrich(entry.getType(), mode);
         if (entryType.isPresent()) {
@@ -71,8 +71,8 @@ protected Set<Field> determineFieldsToShow(BibEntry entry) {
                 return entryType.get().getSecondaryOptionalNotDeprecatedFields(mode);
             }
         } else {
-            // Entry type unknown -> treat all fields as required
-            return Collections.emptySet();
+            // Entry type unknown -> treat all fields as required (thus no optional fields)
+            return new LinkedHashSet<>();
         }
     }
 }
diff --git a/src/main/java/org/jabref/gui/entryeditor/OtherFieldsTab.java b/src/main/java/org/jabref/gui/entryeditor/OtherFieldsTab.java
index dae09c7a2a3..4ed6b1434ad 100644
--- a/src/main/java/org/jabref/gui/entryeditor/OtherFieldsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/OtherFieldsTab.java
@@ -1,10 +1,10 @@
 package org.jabref.gui.entryeditor;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Optional;
+import java.util.SequencedSet;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -20,7 +20,7 @@
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.logic.pdf.search.indexing.IndexingTaskManager;
+import org.jabref.logic.pdf.search.IndexingTaskManager;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.model.entry.BibEntry;
@@ -72,23 +72,23 @@ public OtherFieldsTab(BibDatabaseContext databaseContext,
     }
 
     @Override
-    protected Set<Field> determineFieldsToShow(BibEntry entry) {
+    protected SequencedSet<Field> determineFieldsToShow(BibEntry entry) {
         BibDatabaseMode mode = databaseContext.getMode();
         Optional<BibEntryType> entryType = entryTypesManager.enrich(entry.getType(), mode);
         if (entryType.isPresent()) {
             Set<Field> allKnownFields = entryType.get().getAllFields();
-            Set<Field> otherFields = entry.getFields().stream()
+            SequencedSet<Field> otherFields = entry.getFields().stream()
                                           .filter(field -> !allKnownFields.contains(field) &&
                                                   !(field.equals(StandardField.COMMENT) || field instanceof UserSpecificCommentField))
                                           .collect(Collectors.toCollection(LinkedHashSet::new));
             otherFields.removeAll(entryType.get().getDeprecatedFields(mode));
-            otherFields.removeAll(entryType.get().getOptionalFields().stream().map(BibField::field).collect(Collectors.toSet()));
+            otherFields.removeAll(entryType.get().getOptionalFields().stream().map(BibField::field).toList());
             otherFields.remove(InternalField.KEY_FIELD);
             customTabFieldNames.forEach(otherFields::remove);
             return otherFields;
         } else {
-            // Entry type unknown -> treat all fields as required
-            return Collections.emptySet();
+            // Entry type unknown -> treat all fields as required (thus no other fields)
+            return new LinkedHashSet<>();
         }
     }
 }
diff --git a/src/main/java/org/jabref/gui/entryeditor/PreviewSwitchAction.java b/src/main/java/org/jabref/gui/entryeditor/PreviewSwitchAction.java
index 366adcc70f8..aa98a5b7e24 100644
--- a/src/main/java/org/jabref/gui/entryeditor/PreviewSwitchAction.java
+++ b/src/main/java/org/jabref/gui/entryeditor/PreviewSwitchAction.java
@@ -1,6 +1,8 @@
 package org.jabref.gui.entryeditor;
 
-import org.jabref.gui.JabRefFrame;
+import java.util.function.Supplier;
+
+import org.jabref.gui.LibraryTab;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.SimpleCommand;
 
@@ -10,11 +12,11 @@ public class PreviewSwitchAction extends SimpleCommand {
 
     public enum Direction { PREVIOUS, NEXT }
 
-    private final JabRefFrame frame;
+    private final Supplier<LibraryTab> tabSupplier;
     private final Direction direction;
 
-    public PreviewSwitchAction(Direction direction, JabRefFrame frame, StateManager stateManager) {
-        this.frame = frame;
+    public PreviewSwitchAction(Direction direction, Supplier<LibraryTab> tabSupplier, StateManager stateManager) {
+        this.tabSupplier = tabSupplier;
         this.direction = direction;
 
         this.executable.bind(needsDatabase(stateManager));
@@ -23,9 +25,9 @@ public PreviewSwitchAction(Direction direction, JabRefFrame frame, StateManager
     @Override
     public void execute() {
         if (direction == Direction.NEXT) {
-            frame.getCurrentLibraryTab().getEntryEditor().nextPreviewStyle();
+            tabSupplier.get().getEntryEditor().nextPreviewStyle();
         } else {
-            frame.getCurrentLibraryTab().getEntryEditor().previousPreviewStyle();
+            tabSupplier.get().getEntryEditor().previousPreviewStyle();
         }
     }
 }
diff --git a/src/main/java/org/jabref/gui/entryeditor/PreviewTab.java b/src/main/java/org/jabref/gui/entryeditor/PreviewTab.java
index 1555f577c45..648cbe003a8 100644
--- a/src/main/java/org/jabref/gui/entryeditor/PreviewTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/PreviewTab.java
@@ -7,7 +7,7 @@
 import org.jabref.gui.theme.ThemeManager;
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.logic.pdf.search.indexing.IndexingTaskManager;
+import org.jabref.logic.pdf.search.IndexingTaskManager;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.preferences.PreferencesService;
diff --git a/src/main/java/org/jabref/gui/entryeditor/RequiredFieldsTab.java b/src/main/java/org/jabref/gui/entryeditor/RequiredFieldsTab.java
index cfc530c9d08..9e7d03eae64 100644
--- a/src/main/java/org/jabref/gui/entryeditor/RequiredFieldsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/RequiredFieldsTab.java
@@ -2,7 +2,7 @@
 
 import java.util.LinkedHashSet;
 import java.util.Optional;
-import java.util.Set;
+import java.util.SequencedSet;
 
 import javax.swing.undo.UndoManager;
 
@@ -16,7 +16,7 @@
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.logic.pdf.search.indexing.IndexingTaskManager;
+import org.jabref.logic.pdf.search.IndexingTaskManager;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.BibEntryType;
@@ -51,9 +51,9 @@ public RequiredFieldsTab(BibDatabaseContext databaseContext,
     }
 
     @Override
-    protected Set<Field> determineFieldsToShow(BibEntry entry) {
+    protected SequencedSet<Field> determineFieldsToShow(BibEntry entry) {
         Optional<BibEntryType> entryType = entryTypesManager.enrich(entry.getType(), databaseContext.getMode());
-        Set<Field> fields = new LinkedHashSet<>();
+        SequencedSet<Field> fields = new LinkedHashSet<>();
         if (entryType.isPresent()) {
             for (OrFields orFields : entryType.get().getRequiredFields()) {
                 fields.addAll(orFields.getFields());
diff --git a/src/main/java/org/jabref/gui/entryeditor/UserDefinedFieldsTab.java b/src/main/java/org/jabref/gui/entryeditor/UserDefinedFieldsTab.java
index aa4e65b48e3..064855d593d 100644
--- a/src/main/java/org/jabref/gui/entryeditor/UserDefinedFieldsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/UserDefinedFieldsTab.java
@@ -1,6 +1,7 @@
 package org.jabref.gui.entryeditor;
 
 import java.util.LinkedHashSet;
+import java.util.SequencedSet;
 import java.util.Set;
 
 import javax.swing.undo.UndoManager;
@@ -12,7 +13,7 @@
 import org.jabref.gui.theme.ThemeManager;
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
-import org.jabref.logic.pdf.search.indexing.IndexingTaskManager;
+import org.jabref.logic.pdf.search.IndexingTaskManager;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
@@ -42,7 +43,7 @@ public UserDefinedFieldsTab(String name,
     }
 
     @Override
-    protected Set<Field> determineFieldsToShow(BibEntry entry) {
+    protected SequencedSet<Field> determineFieldsToShow(BibEntry entry) {
         return fields;
     }
 }
diff --git a/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/CitationRelationItem.java b/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/CitationRelationItem.java
index aacbc90cc5f..0b0fe6acbd6 100644
--- a/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/CitationRelationItem.java
+++ b/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/CitationRelationItem.java
@@ -5,20 +5,7 @@
 /**
  * Class to hold a BibEntry and a boolean value whether it is already in the current database or not.
  */
-public class CitationRelationItem {
-    private final BibEntry entry;
-    private final boolean isLocal;
-
-    public CitationRelationItem(BibEntry entry, boolean isLocal) {
-        this.entry = entry;
-        this.isLocal = isLocal;
-    }
-
-    public BibEntry getEntry() {
-        return entry;
-    }
-
-    public boolean isLocal() {
-        return isLocal;
-    }
+public record CitationRelationItem(
+        BibEntry entry,
+        boolean isLocal) {
 }
diff --git a/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/CitationRelationsTab.java b/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/CitationRelationsTab.java
index d3c6862aaf6..6be605c61c1 100644
--- a/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/CitationRelationsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/CitationRelationsTab.java
@@ -32,10 +32,10 @@
 import org.jabref.gui.entryeditor.EntryEditorTab;
 import org.jabref.gui.entryeditor.citationrelationtab.semanticscholar.CitationFetcher;
 import org.jabref.gui.entryeditor.citationrelationtab.semanticscholar.SemanticScholarFetcher;
-import org.jabref.gui.externalfiles.ImportHandler;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.util.BackgroundTask;
 import org.jabref.gui.util.NoSelectionModel;
+import org.jabref.gui.util.TaskExecutor;
 import org.jabref.gui.util.ViewModelListCellFactory;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
@@ -66,12 +66,14 @@ public class CitationRelationsTab extends EntryEditorTab {
     private final FileUpdateMonitor fileUpdateMonitor;
     private final PreferencesService preferencesService;
     private final LibraryTab libraryTab;
+    private final TaskExecutor taskExecutor;
     private final BibEntryRelationsRepository bibEntryRelationsRepository;
+    private final CitationsRelationsTabViewModel citationsRelationsTabViewModel;
 
     public CitationRelationsTab(EntryEditorPreferences preferences, DialogService dialogService,
                                 BibDatabaseContext databaseContext, UndoManager undoManager,
                                 StateManager stateManager, FileUpdateMonitor fileUpdateMonitor,
-                                PreferencesService preferencesService, LibraryTab lTab) {
+                                PreferencesService preferencesService, LibraryTab lTab, TaskExecutor taskExecutor) {
         this.preferences = preferences;
         this.dialogService = dialogService;
         this.databaseContext = databaseContext;
@@ -80,11 +82,13 @@ public CitationRelationsTab(EntryEditorPreferences preferences, DialogService di
         this.fileUpdateMonitor = fileUpdateMonitor;
         this.preferencesService = preferencesService;
         this.libraryTab = lTab;
+        this.taskExecutor = taskExecutor;
         setText(Localization.lang("Citation relations"));
         setTooltip(new Tooltip(Localization.lang("Show articles related by citation")));
 
-        this.bibEntryRelationsRepository = new BibEntryRelationsRepository(new SemanticScholarFetcher(),
+        this.bibEntryRelationsRepository = new BibEntryRelationsRepository(new SemanticScholarFetcher(preferencesService.getImporterPreferences()),
                 new BibEntryRelationsCache());
+        citationsRelationsTabViewModel = new CitationsRelationsTabViewModel(databaseContext, preferencesService, undoManager, stateManager, dialogService, fileUpdateMonitor, Globals.TASK_EXECUTOR);
     }
 
     /**
@@ -107,7 +111,7 @@ private SplitPane getPaneAndStartSearch(BibEntry entry) {
         citedByHBox.setPrefHeight(40);
 
         // Create Heading Lab
-        Label citingLabel = new Label(Localization.lang("Citing"));
+        Label citingLabel = new Label(Localization.lang("Cites"));
         styleLabel(citingLabel);
         Label citedByLabel = new Label(Localization.lang("Cited By"));
         styleLabel(citedByLabel);
@@ -160,20 +164,19 @@ private SplitPane getPaneAndStartSearch(BibEntry entry) {
 
         refreshCitingButton.setOnMouseClicked(event -> {
             searchForRelations(entry, citingListView, abortCitingButton,
-                    refreshCitingButton, CitationFetcher.SearchType.CITING, importCitingButton, citingProgress, true);
+                    refreshCitingButton, CitationFetcher.SearchType.CITES, importCitingButton, citingProgress, true);
         });
 
         refreshCitedByButton.setOnMouseClicked(event -> searchForRelations(entry, citedByListView, abortCitedButton,
                 refreshCitedByButton, CitationFetcher.SearchType.CITED_BY, importCitedByButton, citedByProgress, true));
 
         // Create SplitPane to hold all nodes above
-        SplitPane container = new SplitPane(citedByVBox, citingVBox);
-
-        styleFetchedListView(citingListView);
+        SplitPane container = new SplitPane(citingVBox, citedByVBox);
         styleFetchedListView(citedByListView);
+        styleFetchedListView(citingListView);
 
         searchForRelations(entry, citingListView, abortCitingButton, refreshCitingButton,
-                CitationFetcher.SearchType.CITING, importCitingButton, citingProgress, false);
+                CitationFetcher.SearchType.CITES, importCitingButton, citingProgress, false);
 
         searchForRelations(entry, citedByListView, abortCitedButton, refreshCitedByButton,
                 CitationFetcher.SearchType.CITED_BY, importCitedByButton, citedByProgress, false);
@@ -193,7 +196,7 @@ private void styleFetchedListView(CheckListView<CitationRelationItem> listView)
 
                     HBox separator = new HBox();
                     HBox.setHgrow(separator, Priority.SOMETIMES);
-                    Node entryNode = BibEntryView.getEntryNode(entry.getEntry());
+                    Node entryNode = BibEntryView.getEntryNode(entry.entry());
                     HBox.setHgrow(entryNode, Priority.ALWAYS);
                     HBox hContainer = new HBox();
                     hContainer.prefWidthProperty().bind(listView.widthProperty().subtract(25));
@@ -203,8 +206,8 @@ private void styleFetchedListView(CheckListView<CitationRelationItem> listView)
                         jumpTo.setTooltip(new Tooltip(Localization.lang("Jump to entry in database")));
                         jumpTo.getStyleClass().add("addEntryButton");
                         jumpTo.setOnMouseClicked(event -> {
-                            libraryTab.showAndEdit(entry.getEntry());
-                            libraryTab.clearAndSelect(entry.getEntry());
+                            libraryTab.showAndEdit(entry.entry());
+                            libraryTab.clearAndSelect(entry.entry());
                             citingTask.cancel();
                             citedByTask.cancel();
                         });
@@ -285,7 +288,7 @@ protected void bindToEntry(BibEntry entry) {
      *
      * @param entry         BibEntry currently selected in Jabref Database
      * @param listView      ListView to use
-     * @param abortButton         Button to stop the search
+     * @param abortButton   Button to stop the search
      * @param refreshButton refresh Button to use
      * @param searchType    type of search (CITING / CITEDBY)
      */
@@ -305,7 +308,7 @@ private void searchForRelations(BibEntry entry, CheckListView<CitationRelationIt
 
         listView.setItems(observableList);
 
-        if (citingTask != null && !citingTask.isCanceled() && searchType == CitationFetcher.SearchType.CITING) {
+        if (citingTask != null && !citingTask.isCanceled() && searchType == CitationFetcher.SearchType.CITES) {
             citingTask.cancel();
         } else if (citedByTask != null && !citedByTask.isCanceled() && searchType == CitationFetcher.SearchType.CITED_BY) {
             citedByTask.cancel();
@@ -313,7 +316,7 @@ private void searchForRelations(BibEntry entry, CheckListView<CitationRelationIt
 
         BackgroundTask<List<BibEntry>> task;
 
-        if (searchType == CitationFetcher.SearchType.CITING) {
+        if (searchType == CitationFetcher.SearchType.CITES) {
             task = BackgroundTask.wrap(() -> {
                 if (shouldRefresh) {
                     bibEntryRelationsRepository.forceRefreshReferences(entry);
@@ -332,18 +335,18 @@ private void searchForRelations(BibEntry entry, CheckListView<CitationRelationIt
         }
 
         task.onRunning(() -> prepareToSearchForRelations(abortButton, refreshButton, importButton, progress, task))
-                .onSuccess(fetchedList -> onSearchForRelationsSucceed(entry, listView, abortButton, refreshButton,
-                        searchType, importButton, progress, fetchedList, observableList))
-                .onFailure(exception -> {
-                    LOGGER.error("Error while fetching citing Articles", exception);
-                    hideNodes(abortButton, progress, importButton);
-                    listView.setPlaceholder(new Label(Localization.lang("Error while fetching citing entries: %0",
-                            exception.getMessage())));
-
-                    refreshButton.setVisible(true);
-                    dialogService.notify(exception.getMessage());
-                })
-                .executeWith(Globals.TASK_EXECUTOR);
+            .onSuccess(fetchedList -> onSearchForRelationsSucceed(entry, listView, abortButton, refreshButton,
+                    searchType, importButton, progress, fetchedList, observableList))
+            .onFailure(exception -> {
+                LOGGER.error("Error while fetching citing Articles", exception);
+                hideNodes(abortButton, progress, importButton);
+                listView.setPlaceholder(new Label(Localization.lang("Error while fetching citing entries: %0",
+                        exception.getMessage())));
+
+                refreshButton.setVisible(true);
+                dialogService.notify(exception.getMessage());
+            })
+            .executeWith(taskExecutor);
     }
 
     private void onSearchForRelationsSucceed(BibEntry entry, CheckListView<CitationRelationItem> listView,
@@ -354,7 +357,7 @@ private void onSearchForRelationsSucceed(BibEntry entry, CheckListView<CitationR
         hideNodes(abortButton, progress);
 
         observableList.setAll(fetchedList.stream().map(entr -> new CitationRelationItem(entr, false))
-                .collect(Collectors.toList()));
+                                         .collect(Collectors.toList()));
 
         if (!observableList.isEmpty()) {
             listView.refresh();
@@ -396,19 +399,11 @@ private void showNodes(Node... nodes) {
      *
      * @param entriesToImport entries to import
      */
-    private void importEntries(List<CitationRelationItem> entriesToImport, CitationFetcher.SearchType searchType, BibEntry entry) {
+    private void importEntries(List<CitationRelationItem> entriesToImport, CitationFetcher.SearchType searchType, BibEntry existingEntry) {
         citingTask.cancel();
         citedByTask.cancel();
-        List<BibEntry> entries = entriesToImport.stream().map(CitationRelationItem::getEntry).collect(Collectors.toList());
-        ImportHandler importHandler = new ImportHandler(
-                databaseContext,
-                preferencesService,
-                fileUpdateMonitor,
-                undoManager,
-                stateManager,
-                dialogService,
-                Globals.TASK_EXECUTOR);
-        importHandler.importEntries(entries);
+
+        citationsRelationsTabViewModel.importEntries(entriesToImport, searchType, existingEntry);
 
         dialogService.notify(Localization.lang("Number of entries successfully imported") + ": " + entriesToImport.size());
     }
diff --git a/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/CitationsRelationsTabViewModel.java b/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/CitationsRelationsTabViewModel.java
new file mode 100644
index 00000000000..dd53b44ef58
--- /dev/null
+++ b/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/CitationsRelationsTabViewModel.java
@@ -0,0 +1,115 @@
+package org.jabref.gui.entryeditor.citationrelationtab;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import javax.swing.undo.UndoManager;
+
+import org.jabref.gui.DialogService;
+import org.jabref.gui.StateManager;
+import org.jabref.gui.entryeditor.citationrelationtab.semanticscholar.CitationFetcher;
+import org.jabref.gui.externalfiles.ImportHandler;
+import org.jabref.gui.util.TaskExecutor;
+import org.jabref.logic.citationkeypattern.CitationKeyGenerator;
+import org.jabref.logic.citationkeypattern.CitationKeyPatternPreferences;
+import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.field.StandardField;
+import org.jabref.model.util.FileUpdateMonitor;
+import org.jabref.preferences.PreferencesService;
+
+public class CitationsRelationsTabViewModel {
+
+    private final BibDatabaseContext databaseContext;
+    private final PreferencesService preferencesService;
+    private final UndoManager undoManager;
+    private final StateManager stateManager;
+    private final DialogService dialogService;
+    private final FileUpdateMonitor fileUpdateMonitor;
+    private final TaskExecutor taskExecutor;
+
+    public CitationsRelationsTabViewModel(BibDatabaseContext databaseContext, PreferencesService preferencesService, UndoManager undoManager, StateManager stateManager, DialogService dialogService, FileUpdateMonitor fileUpdateMonitor, TaskExecutor taskExecutor) {
+        this.databaseContext = databaseContext;
+        this.preferencesService = preferencesService;
+        this.undoManager = undoManager;
+        this.stateManager = stateManager;
+        this.dialogService = dialogService;
+        this.fileUpdateMonitor = fileUpdateMonitor;
+        this.taskExecutor = taskExecutor;
+    }
+
+    public void importEntries(List<CitationRelationItem> entriesToImport, CitationFetcher.SearchType searchType, BibEntry existingEntry) {
+        List<BibEntry> entries = entriesToImport.stream().map(CitationRelationItem::entry).toList();
+
+        ImportHandler importHandler = new ImportHandler(
+                databaseContext,
+                preferencesService,
+                fileUpdateMonitor,
+                undoManager,
+                stateManager,
+                dialogService,
+                taskExecutor);
+
+        switch (searchType) {
+            case CITES -> importCites(entries, existingEntry, importHandler);
+            case CITED_BY -> importCitedBy(entries, existingEntry, importHandler);
+        }
+    }
+
+    private void importCites(List<BibEntry> entries, BibEntry existingEntry, ImportHandler importHandler) {
+        CitationKeyPatternPreferences citationKeyPatternPreferences = preferencesService.getCitationKeyPatternPreferences();
+        CitationKeyGenerator generator = new CitationKeyGenerator(databaseContext, citationKeyPatternPreferences);
+        boolean generateNewKeyOnImport = preferencesService.getImporterPreferences().generateNewKeyOnImportProperty().get();
+
+        List<String> citeKeys = getExistingEntriesFromCiteField(existingEntry);
+        citeKeys.removeIf(String::isEmpty);
+        for (BibEntry entryToCite : entries) {
+            if (generateNewKeyOnImport || entryToCite.getCitationKey().isEmpty()) {
+                String key = generator.generateKey(entryToCite);
+                entryToCite.setCitationKey(key);
+                addToKeyToList(citeKeys, key);
+            } else {
+                addToKeyToList(citeKeys, entryToCite.getCitationKey().get());
+            }
+        }
+        existingEntry.setField(StandardField.CITES, toCommaSeparatedString(citeKeys));
+        importHandler.importEntries(entries);
+    }
+
+    private void importCitedBy(List<BibEntry> entries, BibEntry existingEntry, ImportHandler importHandler) {
+        CitationKeyPatternPreferences citationKeyPatternPreferences = preferencesService.getCitationKeyPatternPreferences();
+        CitationKeyGenerator generator = new CitationKeyGenerator(databaseContext, citationKeyPatternPreferences);
+        boolean generateNewKeyOnImport = preferencesService.getImporterPreferences().generateNewKeyOnImportProperty().get();
+
+        for (BibEntry entryThatCitesOurExistingEntry : entries) {
+            List<String> existingCites = getExistingEntriesFromCiteField(entryThatCitesOurExistingEntry);
+            existingCites.removeIf(String::isEmpty);
+            String key;
+            if (generateNewKeyOnImport || entryThatCitesOurExistingEntry.getCitationKey().isEmpty()) {
+                key = generator.generateKey(entryThatCitesOurExistingEntry);
+                entryThatCitesOurExistingEntry.setCitationKey(key);
+            } else {
+                key = existingEntry.getCitationKey().get();
+            }
+            addToKeyToList(existingCites, key);
+            entryThatCitesOurExistingEntry.setField(StandardField.CITES, toCommaSeparatedString(existingCites));
+        }
+
+        importHandler.importEntries(entries);
+    }
+
+    private void addToKeyToList(List<String> list, String key) {
+        if (!list.contains(key)) {
+            list.add(key);
+        }
+    }
+
+    private List<String> getExistingEntriesFromCiteField(BibEntry entry) {
+        return Arrays.stream(entry.getField(StandardField.CITES).orElse("").split(",")).collect(Collectors.toList());
+    }
+
+    private String toCommaSeparatedString(List<String> citeentries) {
+        return String.join(",", citeentries);
+    }
+}
diff --git a/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/semanticscholar/AuthorResponse.java b/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/semanticscholar/AuthorResponse.java
index f23ba10a54f..539b99cc39d 100644
--- a/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/semanticscholar/AuthorResponse.java
+++ b/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/semanticscholar/AuthorResponse.java
@@ -1,5 +1,8 @@
 package org.jabref.gui.entryeditor.citationrelationtab.semanticscholar;
 
+/**
+ * Used for GSON
+ */
 public class AuthorResponse {
     private String authorId;
     private String name;
diff --git a/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/semanticscholar/CitationDataItem.java b/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/semanticscholar/CitationDataItem.java
index 50a3143bf6c..684285b46df 100644
--- a/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/semanticscholar/CitationDataItem.java
+++ b/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/semanticscholar/CitationDataItem.java
@@ -1,5 +1,8 @@
 package org.jabref.gui.entryeditor.citationrelationtab.semanticscholar;
 
+/**
+ * Used for GSON
+ */
 public class CitationDataItem {
     private PaperDetails citingPaper;
 
diff --git a/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/semanticscholar/CitationFetcher.java b/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/semanticscholar/CitationFetcher.java
index 4b10cadce4f..1b87c7ab0bb 100644
--- a/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/semanticscholar/CitationFetcher.java
+++ b/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/semanticscholar/CitationFetcher.java
@@ -14,7 +14,7 @@ public interface CitationFetcher {
      * Possible search methods
      */
     enum SearchType {
-        CITING("reference"),
+        CITES("reference"),
         CITED_BY("citation");
 
         public final String label;
diff --git a/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/semanticscholar/CitationsResponse.java b/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/semanticscholar/CitationsResponse.java
index c87eb9346c2..999eb7eca2a 100644
--- a/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/semanticscholar/CitationsResponse.java
+++ b/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/semanticscholar/CitationsResponse.java
@@ -2,6 +2,9 @@
 
 import java.util.List;
 
+/**
+ * Used for GSON
+ */
 public class CitationsResponse {
     private int offset;
     private int next;
diff --git a/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/semanticscholar/ReferenceDataItem.java b/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/semanticscholar/ReferenceDataItem.java
index 4df4c64ea6a..b9c53c355e9 100644
--- a/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/semanticscholar/ReferenceDataItem.java
+++ b/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/semanticscholar/ReferenceDataItem.java
@@ -1,13 +1,12 @@
 package org.jabref.gui.entryeditor.citationrelationtab.semanticscholar;
 
+/**
+ * Used for GSON
+ */
 public class ReferenceDataItem {
     private PaperDetails citedPaper;
 
     public PaperDetails getCitedPaper() {
         return citedPaper;
     }
-
-    public void setCitedPaper(PaperDetails citedPaper) {
-        this.citedPaper = citedPaper;
-    }
 }
diff --git a/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/semanticscholar/ReferencesResponse.java b/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/semanticscholar/ReferencesResponse.java
index 8f5506d9cb6..0a6ac34af07 100644
--- a/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/semanticscholar/ReferencesResponse.java
+++ b/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/semanticscholar/ReferencesResponse.java
@@ -2,6 +2,9 @@
 
 import java.util.List;
 
+/**
+ * Used for GSON
+ */
 public class ReferencesResponse {
     private int offset;
     private int next;
diff --git a/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/semanticscholar/SemanticScholarFetcher.java b/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/semanticscholar/SemanticScholarFetcher.java
index 6699596a7be..0a5ca3b16a9 100644
--- a/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/semanticscholar/SemanticScholarFetcher.java
+++ b/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/semanticscholar/SemanticScholarFetcher.java
@@ -7,14 +7,25 @@
 import java.util.List;
 
 import org.jabref.logic.importer.FetcherException;
+import org.jabref.logic.importer.ImporterPreferences;
+import org.jabref.logic.importer.fetcher.CustomizableKeyFetcher;
 import org.jabref.logic.net.URLDownload;
+import org.jabref.logic.util.BuildInfo;
 import org.jabref.model.entry.BibEntry;
 
 import com.google.gson.Gson;
 
-public class SemanticScholarFetcher implements CitationFetcher {
+public class SemanticScholarFetcher implements CitationFetcher, CustomizableKeyFetcher {
     private static final String SEMANTIC_SCHOLAR_API = "https://api.semanticscholar.org/graph/v1/";
 
+    private static final String API_KEY = new BuildInfo().semanticScholarApiKey;
+
+    private final ImporterPreferences importerPreferences;
+
+    public SemanticScholarFetcher(ImporterPreferences importerPreferences) {
+        this.importerPreferences = importerPreferences;
+    }
+
     @Override
     public List<BibEntry> searchCitedBy(BibEntry entry) throws FetcherException {
         if (entry.getDOI().isPresent()) {
@@ -24,17 +35,20 @@ public List<BibEntry> searchCitedBy(BibEntry entry) throws FetcherException {
                     .append("/citations")
                     .append("?fields=").append("title,authors,year,citationCount,referenceCount")
                     .append("&limit=1000");
-
             try {
                 URL citationsUrl = URI.create(urlBuilder.toString()).toURL();
-
                 URLDownload urlDownload = new URLDownload(citationsUrl);
+
+                String apiKey = getApiKey();
+                if (!apiKey.isEmpty()) {
+                    urlDownload.addHeader("x-api-key", apiKey);
+                }
                 CitationsResponse citationsResponse = new Gson()
                         .fromJson(urlDownload.asString(), CitationsResponse.class);
 
                 return citationsResponse.getData()
-                            .stream().filter(citationDataItem -> citationDataItem.getCitingPaper() != null)
-                            .map(citationDataItem -> citationDataItem.getCitingPaper().toBibEntry()).toList();
+                                        .stream().filter(citationDataItem -> citationDataItem.getCitingPaper() != null)
+                                        .map(citationDataItem -> citationDataItem.getCitingPaper().toBibEntry()).toList();
             } catch (IOException e) {
                 throw new RuntimeException(e);
             }
@@ -50,19 +64,23 @@ public List<BibEntry> searchCiting(BibEntry entry) {
                     .append("paper/")
                     .append("DOI:").append(entry.getDOI().get().getDOI())
                     .append("/references")
-                    .append("?fields=").append("title,authors,year,citationCount,referenceCount")
+                    .append("?fields=")
+                    .append("title,authors,year,citationCount,referenceCount")
                     .append("&limit=1000");
             try {
                 URL referencesUrl = URI.create(urlBuilder.toString()).toURL();
-
                 URLDownload urlDownload = new URLDownload(referencesUrl);
+                String apiKey = getApiKey();
+                if (!apiKey.isEmpty()) {
+                    urlDownload.addHeader("x-api-key", apiKey);
+                }
                 ReferencesResponse referencesResponse = new Gson()
                         .fromJson(urlDownload.asString(), ReferencesResponse.class);
 
                 return referencesResponse.getData()
-                             .stream()
-                             .filter(citationDataItem -> citationDataItem.getCitedPaper() != null)
-                             .map(referenceDataItem -> referenceDataItem.getCitedPaper().toBibEntry()).toList();
+                                         .stream()
+                                         .filter(citationDataItem -> citationDataItem.getCitedPaper() != null)
+                                         .map(referenceDataItem -> referenceDataItem.getCitedPaper().toBibEntry()).toList();
             } catch (IOException e) {
                 throw new RuntimeException(e);
             }
@@ -75,4 +93,8 @@ public List<BibEntry> searchCiting(BibEntry entry) {
     public String getName() {
         return "Semantic Scholar Citations Fetcher";
     }
+
+    private String getApiKey() {
+        return importerPreferences.getApiKey(getName()).orElse(API_KEY);
+    }
 }
diff --git a/src/main/java/org/jabref/gui/exporter/CreateModifyExporterDialogViewModel.java b/src/main/java/org/jabref/gui/exporter/CreateModifyExporterDialogViewModel.java
index 78c808dad3c..d9e0c1bc69c 100644
--- a/src/main/java/org/jabref/gui/exporter/CreateModifyExporterDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/exporter/CreateModifyExporterDialogViewModel.java
@@ -57,7 +57,7 @@ public ExporterViewModel saveExporter() {
         // Check that there are no empty strings.
         if (layoutFile.get().isEmpty() || name.get().isEmpty() || extension.get().isEmpty()
                 || !layoutFile.get().endsWith(".layout")) {
-            LOGGER.info("One of the fields is empty or invalid!");
+            LOGGER.info("One of the fields is empty or invalid.");
             return null;
         }
 
diff --git a/src/main/java/org/jabref/gui/exporter/ExportCommand.java b/src/main/java/org/jabref/gui/exporter/ExportCommand.java
index 02e034ae763..ccf81b353ff 100644
--- a/src/main/java/org/jabref/gui/exporter/ExportCommand.java
+++ b/src/main/java/org/jabref/gui/exporter/ExportCommand.java
@@ -5,13 +5,13 @@
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
+import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
 import javafx.stage.FileChooser;
 import javafx.util.Duration;
 
 import org.jabref.gui.DialogService;
-import org.jabref.gui.JabRefFrame;
 import org.jabref.gui.LibraryTab;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.ActionHelper;
@@ -46,7 +46,7 @@ public enum ExportMethod { EXPORT_ALL, EXPORT_SELECTED }
     private static final Logger LOGGER = LoggerFactory.getLogger(ExportCommand.class);
 
     private final ExportMethod exportMethod;
-    private final JabRefFrame frame;
+    private final Supplier<LibraryTab> tabSupplier;
     private final StateManager stateManager;
     private final PreferencesService preferences;
     private final DialogService dialogService;
@@ -55,7 +55,7 @@ public enum ExportMethod { EXPORT_ALL, EXPORT_SELECTED }
     private final TaskExecutor taskExecutor;
 
     public ExportCommand(ExportMethod exportMethod,
-                         JabRefFrame frame,
+                         Supplier<LibraryTab> tabSupplier,
                          StateManager stateManager,
                          DialogService dialogService,
                          PreferencesService preferences,
@@ -63,7 +63,7 @@ public ExportCommand(ExportMethod exportMethod,
                          JournalAbbreviationRepository abbreviationRepository,
                          TaskExecutor taskExecutor) {
         this.exportMethod = exportMethod;
-        this.frame = frame;
+        this.tabSupplier = tabSupplier;
         this.stateManager = stateManager;
         this.preferences = preferences;
         this.dialogService = dialogService;
@@ -96,7 +96,7 @@ public void execute() {
     }
 
     private void export(Path file, FileChooser.ExtensionFilter selectedExtensionFilter, List<Exporter> exporters) {
-        String selectedExtension = selectedExtensionFilter.getExtensions().get(0).replace("*", "");
+        String selectedExtension = selectedExtensionFilter.getExtensions().getFirst().replace("*", "");
         if (!file.endsWith(selectedExtension)) {
             FileUtil.addExtension(file, selectedExtension);
         }
@@ -135,7 +135,7 @@ private void export(Path file, FileChooser.ExtensionFilter selectedExtensionFilt
                     return null; // can not use BackgroundTask.wrap(Runnable) because Runnable.run() can't throw Exceptions
                 })
                 .onSuccess(save -> {
-                    LibraryTab.DatabaseNotification notificationPane = frame.getCurrentLibraryTab().getNotificationPane();
+                    LibraryTab.DatabaseNotification notificationPane = tabSupplier.get().getNotificationPane();
                     notificationPane.notify(
                             IconTheme.JabRefIcons.FOLDER.getGraphicNode(),
                             Localization.lang("Export operation finished successfully."),
diff --git a/src/main/java/org/jabref/gui/exporter/SaveAction.java b/src/main/java/org/jabref/gui/exporter/SaveAction.java
index 6f726729034..d4fe785f229 100644
--- a/src/main/java/org/jabref/gui/exporter/SaveAction.java
+++ b/src/main/java/org/jabref/gui/exporter/SaveAction.java
@@ -1,8 +1,10 @@
 package org.jabref.gui.exporter;
 
+import java.util.function.Supplier;
+
 import org.jabref.gui.DialogService;
 import org.jabref.gui.Globals;
-import org.jabref.gui.LibraryTabContainer;
+import org.jabref.gui.LibraryTab;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.ActionHelper;
 import org.jabref.gui.actions.SimpleCommand;
@@ -16,18 +18,18 @@ public class SaveAction extends SimpleCommand {
     public enum SaveMethod { SAVE, SAVE_AS, SAVE_SELECTED }
 
     private final SaveMethod saveMethod;
-    private final LibraryTabContainer tabContainer;
+    private final Supplier<LibraryTab> tabSupplier;
 
     private final DialogService dialogService;
     private final PreferencesService preferencesService;
 
     public SaveAction(SaveMethod saveMethod,
-                      LibraryTabContainer tabContainer,
+                      Supplier<LibraryTab> tabSupplier,
                       DialogService dialogService,
                       PreferencesService preferencesService,
                       StateManager stateManager) {
         this.saveMethod = saveMethod;
-        this.tabContainer = tabContainer;
+        this.tabSupplier = tabSupplier;
         this.dialogService = dialogService;
         this.preferencesService = preferencesService;
 
@@ -41,7 +43,7 @@ public SaveAction(SaveMethod saveMethod,
     @Override
     public void execute() {
         SaveDatabaseAction saveDatabaseAction = new SaveDatabaseAction(
-                tabContainer.getCurrentLibraryTab(),
+                tabSupplier.get(),
                 dialogService,
                 preferencesService,
                 Globals.entryTypesManager);
diff --git a/src/main/java/org/jabref/gui/exporter/SaveAllAction.java b/src/main/java/org/jabref/gui/exporter/SaveAllAction.java
index eb86c5df658..173de40ed0b 100644
--- a/src/main/java/org/jabref/gui/exporter/SaveAllAction.java
+++ b/src/main/java/org/jabref/gui/exporter/SaveAllAction.java
@@ -1,8 +1,10 @@
 package org.jabref.gui.exporter;
 
+import java.util.List;
+import java.util.function.Supplier;
+
 import org.jabref.gui.DialogService;
 import org.jabref.gui.Globals;
-import org.jabref.gui.JabRefFrame;
 import org.jabref.gui.LibraryTab;
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.logic.l10n.Localization;
@@ -10,13 +12,13 @@
 
 public class SaveAllAction extends SimpleCommand {
 
-    private final JabRefFrame frame;
+    private final Supplier<List<LibraryTab>> tabsSupplier;
     private final DialogService dialogService;
     private final PreferencesService preferencesService;
 
-    public SaveAllAction(JabRefFrame frame, PreferencesService preferencesService) {
-        this.frame = frame;
-        this.dialogService = frame.getDialogService();
+    public SaveAllAction(Supplier<List<LibraryTab>> tabsSupplier, PreferencesService preferencesService, DialogService dialogService) {
+        this.tabsSupplier = tabsSupplier;
+        this.dialogService = dialogService;
         this.preferencesService = preferencesService;
     }
 
@@ -24,7 +26,7 @@ public SaveAllAction(JabRefFrame frame, PreferencesService preferencesService) {
     public void execute() {
         dialogService.notify(Localization.lang("Saving all libraries..."));
 
-        for (LibraryTab libraryTab : frame.getLibraryTabs()) {
+        for (LibraryTab libraryTab : tabsSupplier.get()) {
             SaveDatabaseAction saveDatabaseAction = new SaveDatabaseAction(libraryTab, dialogService, preferencesService, Globals.entryTypesManager);
             boolean saveResult = saveDatabaseAction.save();
             if (!saveResult) {
diff --git a/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java b/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java
index 87cb097b734..954fabcf47f 100644
--- a/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java
+++ b/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java
@@ -34,6 +34,7 @@
 import org.jabref.logic.exporter.SelfContainedSaveConfiguration;
 import org.jabref.logic.l10n.Encodings;
 import org.jabref.logic.l10n.Localization;
+import org.jabref.logic.pdf.search.PdfIndexerManager;
 import org.jabref.logic.shared.DatabaseLocation;
 import org.jabref.logic.shared.prefs.SharedDatabasePreferences;
 import org.jabref.logic.util.StandardFileType;
@@ -137,13 +138,12 @@ public void saveSelectedAsPlain() {
     boolean saveAs(Path file, SaveDatabaseMode mode) {
         BibDatabaseContext context = libraryTab.getBibDatabaseContext();
 
-        // Close AutosaveManager and BackupManager for original library
         Optional<Path> databasePath = context.getDatabasePath();
         if (databasePath.isPresent()) {
-            final Path oldFile = databasePath.get();
-            context.setDatabasePath(oldFile);
+            // Close AutosaveManager, BackupManager, and PdfIndexer for original library
             AutosaveManager.shutdown(context);
             BackupManager.shutdown(context, this.preferences.getFilePreferences().getBackupDirectory(), preferences.getFilePreferences().shouldCreateBackup());
+            PdfIndexerManager.shutdownIndexer(context);
         }
 
         // Set new location
@@ -164,6 +164,7 @@ boolean saveAs(Path file, SaveDatabaseMode mode) {
             // Reset (here: uninstall and install again) AutosaveManager and BackupManager for the new file name
             libraryTab.resetChangeMonitor();
             libraryTab.installAutosaveManagerAndBackupManager();
+            // PdfIndexerManager does not need to be called; the method {@link org.jabref.logic.pdf.search.PdfIndexerManager.get()} is called if a new indexer is needed
 
             preferences.getGuiPreferences().getFileHistory().newFile(file);
         }
diff --git a/src/main/java/org/jabref/gui/externalfiles/ExternalFilesEntryLinker.java b/src/main/java/org/jabref/gui/externalfiles/ExternalFilesEntryLinker.java
index 57df1e395c8..8e15ff4c474 100644
--- a/src/main/java/org/jabref/gui/externalfiles/ExternalFilesEntryLinker.java
+++ b/src/main/java/org/jabref/gui/externalfiles/ExternalFilesEntryLinker.java
@@ -15,8 +15,8 @@
 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.pdf.search.IndexingTaskManager;
+import org.jabref.logic.pdf.search.PdfIndexerManager;
 import org.jabref.logic.util.io.FileNameCleaner;
 import org.jabref.logic.util.io.FileUtil;
 import org.jabref.model.database.BibDatabaseContext;
@@ -87,7 +87,7 @@ public void moveFilesToFileDirRenameAndAddToEntry(BibEntry entry, List<Path> fil
         }
 
         try {
-            indexingTaskManager.addToIndex(PdfIndexer.of(bibDatabaseContext, filePreferences), entry, bibDatabaseContext);
+            indexingTaskManager.addToIndex(PdfIndexerManager.getIndexer(bibDatabaseContext, filePreferences), entry);
         } catch (IOException e) {
             LOGGER.error("Could not access Fulltext-Index", e);
         }
@@ -105,9 +105,9 @@ public void copyFilesToFileDirAndAddToEntry(BibEntry entry, List<Path> files, In
         }
 
         try {
-            indexingTaskManager.addToIndex(PdfIndexer.of(bibDatabaseContext, filePreferences), entry, bibDatabaseContext);
+            indexingTaskManager.addToIndex(PdfIndexerManager.getIndexer(bibDatabaseContext, filePreferences), entry);
         } catch (IOException e) {
-            LOGGER.error("Could not access Fulltext-Index", e);
+            LOGGER.error("Could not access fulltext index", e);
         }
     }
 
diff --git a/src/main/java/org/jabref/gui/externalfiletype/ExternalFileTypes.java b/src/main/java/org/jabref/gui/externalfiletype/ExternalFileTypes.java
index c3a7ebf3d46..25e2bfaa088 100644
--- a/src/main/java/org/jabref/gui/externalfiletype/ExternalFileTypes.java
+++ b/src/main/java/org/jabref/gui/externalfiletype/ExternalFileTypes.java
@@ -148,10 +148,10 @@ public static String toStringList(Collection<ExternalFileType> fileTypes) {
 
         for (ExternalFileType type : fileTypes) {
             results.add(type);
-            // See if we can find a type with matching name in the default type list:
+            // See if we can find a type with matching extension in the default type list:
             ExternalFileType found = null;
             for (ExternalFileType defType : defTypes) {
-                if (defType.getName().equals(type.getName())) {
+                if (defType.getExtension().equals(type.getExtension())) {
                     found = defType;
                     break;
                 }
@@ -221,11 +221,11 @@ public static Set<ExternalFileType> fromString(String storedFileTypes) {
             } else {
                 // A new or modified entry type. Construct it from the string array:
                 ExternalFileType type = CustomExternalFileType.buildFromArgs(val);
-                // Check if there is a default type with the same name. If so, this is a
+                // Check if there is a default type with the same extension. If so, this is a
                 // modification of that type, so remove the default one:
                 ExternalFileType toRemove = null;
                 for (ExternalFileType defType : types) {
-                    if (type.getName().equals(defType.getName())) {
+                    if (type.getExtension().equals(defType.getExtension())) {
                         toRemove = defType;
                         break;
                     }
diff --git a/src/main/java/org/jabref/gui/groups/GroupColorPicker.java b/src/main/java/org/jabref/gui/groups/GroupColorPicker.java
new file mode 100644
index 00000000000..78fcafe65cf
--- /dev/null
+++ b/src/main/java/org/jabref/gui/groups/GroupColorPicker.java
@@ -0,0 +1,62 @@
+package org.jabref.gui.groups;
+
+import java.util.List;
+
+import javafx.scene.paint.Color;
+
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
+
+@NullMarked
+public class GroupColorPicker {
+
+    // Generate color for top groups
+    public static Color generateColor(List<Color> siblingColors) {
+        return generateColor(siblingColors, null);
+    }
+
+    /**
+     * Algorithm optimized for colors, not for gray-scale (where it does not work)
+     */
+    public static Color generateColor(List<Color> siblingColors, @Nullable Color parentColor) {
+        if (siblingColors.isEmpty()) {
+            if (parentColor == null) {
+                // We need something colorful to derive other colors based on the color
+                return Color.hsb(Math.random() * 360.0, .50, .75);
+            }
+            return generateSubGroupColor(parentColor);
+        }
+
+        double sumSin = 0;
+        double sumCos = 0;
+
+        // Calculate the mean angle
+        for (Color color : siblingColors) {
+            double hue = color.getHue();
+            sumSin += Math.sin(Math.toRadians(hue));
+            sumCos += Math.cos(Math.toRadians(hue));
+        }
+
+        double meanAngle = Math.toDegrees(Math.atan2(sumSin, sumCos));
+        meanAngle = (meanAngle + 360) % 360;
+
+        // The opposite angle is potentially the point of maximum average distance
+        double newHue = (meanAngle + 180) % 360;
+
+        double sumSaturation = 0;
+        double sumBrightness = 0;
+        for (Color color : siblingColors) {
+            sumSaturation += color.getSaturation();
+            sumBrightness += color.getBrightness();
+        }
+
+        double averageSaturation = sumSaturation / siblingColors.size();
+        double averageBrightness = sumBrightness / siblingColors.size();
+
+        return Color.hsb(newHue, averageSaturation, averageBrightness);
+    }
+
+    private static Color generateSubGroupColor(Color baseColor) {
+        return baseColor.deriveColor(0.0, 1.0, .9, 1.0);
+    }
+}
diff --git a/src/main/java/org/jabref/gui/groups/GroupDialog.fxml b/src/main/java/org/jabref/gui/groups/GroupDialog.fxml
index 3d12f80abbc..02b19876250 100644
--- a/src/main/java/org/jabref/gui/groups/GroupDialog.fxml
+++ b/src/main/java/org/jabref/gui/groups/GroupDialog.fxml
@@ -37,7 +37,7 @@
                 <TextField fx:id="descriptionField"/>
             </VBox>
             <HBox spacing="10.0">
-                <VBox HBox.hgrow="ALWAYS">
+                <VBox HBox.hgrow="SOMETIMES">
                     <Label text="%Icon"/>
                     <HBox>
                         <TextField fx:id="iconField"/>
@@ -48,27 +48,25 @@
                         </Button>
                     </HBox>
                 </VBox>
-                <VBox layoutX="10.0" layoutY="10.0" minWidth="130.0" maxWidth="130.0" prefWidth="130.0">
-                    <Label text="%Color"/>
-                    <ColorPicker fx:id="colorField"/>
-                </VBox>
-                <VBox>
+                <VBox HBox.hgrow="SOMETIMES">
                     <Label text="%Hierarchical context"/>
                     <ComboBox fx:id="hierarchicalContextCombo" minWidth="130.0" maxWidth="130.0" prefWidth="130.0"/>
                 </VBox>
+                <VBox HBox.hgrow="SOMETIMES"
+                      layoutX="10.0" layoutY="10.0"
+                      minWidth="130.0" maxWidth="130.0"
+                      prefWidth="130.0" spacing="10.0">
+                    <CheckBox fx:id="colorUseCheckbox" text="%Color"/>
+                    <VBox disable="${!colorUseCheckbox.selected}">
+                        <ColorPicker fx:id="colorField" minHeight="25.0"/>
+                        <CheckBox fx:id="autoColorCheckbox" text="Auto Color"/>
+                        <padding>
+                            <Insets left="20.0"/>
+                        </padding>
+                    </VBox>
+                </VBox>
             </HBox>
-            <HBox alignment="BOTTOM_LEFT">
-                <Label text="%Collect by" styleClass="sectionHeader"/>
-                <HBox HBox.hgrow="ALWAYS"/>
-                <Button styleClass="icon-button,narrow" onAction="#openHelp">
-                    <graphic>
-                        <JabRefIconView glyph="HELP"/>
-                    </graphic>
-                    <tooltip>
-                        <Tooltip text="%Open Help page"/>
-                    </tooltip>
-                </Button>
-            </HBox>
+            <Label text="%Collect by" styleClass="sectionHeader" style="-fx-padding: 0 10 0 0;"/>
             <HBox>
                 <VBox spacing="10.0">
                     <RadioButton fx:id="explicitRadioButton" toggleGroup="$type" wrapText="true"
@@ -181,4 +179,7 @@
             </HBox>
         </VBox>
     </content>
+    <padding>
+        <Insets bottom="10.0" left="15.0" right="10.0" top="10.0" />
+    </padding>
 </DialogPane>
diff --git a/src/main/java/org/jabref/gui/groups/GroupDialogView.java b/src/main/java/org/jabref/gui/groups/GroupDialogView.java
index 0a7c76d0fe4..8693ca8a954 100644
--- a/src/main/java/org/jabref/gui/groups/GroupDialogView.java
+++ b/src/main/java/org/jabref/gui/groups/GroupDialogView.java
@@ -2,6 +2,8 @@
 
 import java.util.EnumMap;
 import java.util.EnumSet;
+import java.util.List;
+import java.util.Optional;
 import java.util.ServiceLoader;
 
 import javafx.application.Platform;
@@ -13,6 +15,7 @@
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.control.Button;
+import javafx.scene.control.ButtonBar;
 import javafx.scene.control.ButtonType;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.ColorPicker;
@@ -27,15 +30,21 @@
 import javafx.scene.paint.Color;
 
 import org.jabref.gui.DialogService;
+import org.jabref.gui.Globals;
+import org.jabref.gui.actions.ActionFactory;
+import org.jabref.gui.actions.StandardActions;
+import org.jabref.gui.help.HelpAction;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.icon.JabrefIconProvider;
 import org.jabref.gui.util.BaseDialog;
 import org.jabref.gui.util.IconValidationDecorator;
 import org.jabref.gui.util.ViewModelListCellFactory;
+import org.jabref.logic.help.HelpFile;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.groups.AbstractGroup;
 import org.jabref.model.groups.GroupHierarchyType;
+import org.jabref.model.groups.GroupTreeNode;
 import org.jabref.model.search.rules.SearchRules;
 import org.jabref.model.search.rules.SearchRules.SearchFlags;
 import org.jabref.model.util.FileUpdateMonitor;
@@ -48,19 +57,24 @@
 import org.controlsfx.control.GridView;
 import org.controlsfx.control.PopOver;
 import org.controlsfx.control.textfield.CustomTextField;
+import org.jspecify.annotations.Nullable;
 import org.kordamp.ikonli.Ikon;
 import org.kordamp.ikonli.IkonProvider;
 import org.kordamp.ikonli.javafx.FontIcon;
 
 public class GroupDialogView extends BaseDialog<AbstractGroup> {
 
+    private static boolean useAutoColoring = false;
+
     // Basic Settings
     @FXML private TextField nameField;
     @FXML private TextField descriptionField;
     @FXML private TextField iconField;
     @FXML private Button iconPickerButton;
+    @FXML private CheckBox colorUseCheckbox;
     @FXML private ColorPicker colorField;
     @FXML private ComboBox<GroupHierarchyType> hierarchicalContextCombo;
+    @FXML private CheckBox autoColorCheckbox;
 
     // Type
     @FXML private RadioButton explicitRadioButton;
@@ -94,16 +108,21 @@ public class GroupDialogView extends BaseDialog<AbstractGroup> {
     private final ControlsFxVisualizer validationVisualizer = new ControlsFxVisualizer();
 
     private final BibDatabaseContext currentDatabase;
-    private final AbstractGroup editedGroup;
+    private final @Nullable GroupTreeNode parentNode;
+    private final @Nullable AbstractGroup editedGroup;
+
     private GroupDialogViewModel viewModel;
+
     @Inject private FileUpdateMonitor fileUpdateMonitor;
     @Inject private DialogService dialogService;
     @Inject private PreferencesService preferencesService;
 
     public GroupDialogView(BibDatabaseContext currentDatabase,
-                           AbstractGroup editedGroup,
+                           @Nullable GroupTreeNode parentNode,
+                           @Nullable AbstractGroup editedGroup,
                            GroupDialogHeader groupDialogHeader) {
         this.currentDatabase = currentDatabase;
+        this.parentNode = parentNode;
         this.editedGroup = editedGroup;
 
         ViewLoader.view(this)
@@ -120,17 +139,41 @@ public GroupDialogView(BibDatabaseContext currentDatabase,
             this.setTitle(Localization.lang("Edit group") + " " + editedGroup.getName());
         }
 
-        getDialogPane().getButtonTypes().setAll(ButtonType.OK, ButtonType.CANCEL);
+        ButtonType helpButtonType = new ButtonType("", ButtonBar.ButtonData.HELP_2);
+        getDialogPane().getButtonTypes().setAll(helpButtonType, ButtonType.OK, ButtonType.CANCEL);
 
         final Button confirmDialogButton = (Button) getDialogPane().lookupButton(ButtonType.OK);
+        final Button helpButton = (Button) getDialogPane().lookupButton(helpButtonType);
+
+        ActionFactory actionFactory = new ActionFactory(Globals.getKeyPrefs());
+        HelpAction helpAction = new HelpAction(HelpFile.GROUPS, dialogService, preferencesService.getFilePreferences());
+        actionFactory.configureIconButton(
+                StandardActions.HELP_GROUPS,
+                helpAction,
+                helpButton);
+
+        // Consume the dialog close event, but execute the help action
+        helpButton.addEventFilter(ActionEvent.ACTION, event -> {
+            helpAction.execute();
+            event.consume();
+        });
+
         confirmDialogButton.disableProperty().bind(viewModel.validationStatus().validProperty().not());
         // handle validation before closing dialog and calling resultConverter
         confirmDialogButton.addEventFilter(ActionEvent.ACTION, viewModel::validationHandler);
     }
 
+    private @Nullable AbstractGroup parentGroup() {
+        if (parentNode == null) {
+            return null;
+        } else {
+            return parentNode.getGroup();
+        }
+    }
+
     @FXML
     public void initialize() {
-        viewModel = new GroupDialogViewModel(dialogService, currentDatabase, preferencesService, editedGroup, fileUpdateMonitor);
+        viewModel = new GroupDialogViewModel(dialogService, currentDatabase, preferencesService, editedGroup, parentNode, fileUpdateMonitor);
 
         setResultConverter(viewModel::resultConverter);
 
@@ -144,6 +187,7 @@ public void initialize() {
         nameField.textProperty().bindBidirectional(viewModel.nameProperty());
         descriptionField.textProperty().bindBidirectional(viewModel.descriptionProperty());
         iconField.textProperty().bindBidirectional(viewModel.iconProperty());
+        colorUseCheckbox.selectedProperty().bindBidirectional(viewModel.colorUseProperty());
         colorField.valueProperty().bindBidirectional(viewModel.colorFieldProperty());
         hierarchicalContextCombo.itemsProperty().bind(viewModel.groupHierarchyListProperty());
         new ViewModelListCellFactory<GroupHierarchyType>()
@@ -207,6 +251,29 @@ public void initialize() {
             validationVisualizer.initVisualization(viewModel.texGroupFilePathValidatonStatus(), texGroupFilePath);
             nameField.requestFocus();
         });
+
+        autoColorCheckbox.setSelected(useAutoColoring);
+        autoColorCheckbox.setOnAction(event -> {
+            useAutoColoring = autoColorCheckbox.isSelected();
+            if (!autoColorCheckbox.isSelected()) {
+                return;
+            }
+            if (parentNode == null) {
+                viewModel.colorFieldProperty().setValue(IconTheme.getDefaultGroupColor());
+                return;
+            }
+            List<Color> colorsOfSiblings = parentNode.getChildren().stream().map(child -> child.getGroup().getColor())
+                                                     .flatMap(Optional::stream)
+                                                     .toList();
+            Optional<Color> parentColor = parentGroup().getColor();
+            Color color;
+            if (parentColor.isEmpty()) {
+                color = GroupColorPicker.generateColor(colorsOfSiblings);
+            } else {
+                color = GroupColorPicker.generateColor(colorsOfSiblings, parentColor.get());
+            }
+            viewModel.colorFieldProperty().setValue(color);
+        });
     }
 
     @FXML
@@ -214,11 +281,6 @@ private void texGroupBrowse() {
         viewModel.texGroupBrowse();
     }
 
-    @FXML
-    private void openHelp() {
-        viewModel.openHelpPage();
-    }
-
     @FXML
     private void openIconPicker() {
         ObservableList<Ikon> ikonList = FXCollections.observableArrayList();
@@ -249,6 +311,7 @@ private void openIconPicker() {
 
         // Necessary because of a bug in controlsfx GridView
         // https://github.com/controlsfx/controlsfx/issues/1400
+        // The issue is closed, but still appears here
         Platform.runLater(() -> {
             ikonGridView.setItems(filteredList);
         });
diff --git a/src/main/java/org/jabref/gui/groups/GroupDialogViewModel.java b/src/main/java/org/jabref/gui/groups/GroupDialogViewModel.java
index 72f98979fc0..6c025778890 100644
--- a/src/main/java/org/jabref/gui/groups/GroupDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/groups/GroupDialogViewModel.java
@@ -24,11 +24,10 @@
 import javafx.scene.paint.Color;
 
 import org.jabref.gui.DialogService;
-import org.jabref.gui.help.HelpAction;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.util.FileDialogConfiguration;
 import org.jabref.logic.auxparser.DefaultAuxParser;
-import org.jabref.logic.help.HelpFile;
+import org.jabref.logic.groups.DefaultGroupsFactory;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.logic.util.io.FileUtil;
@@ -59,12 +58,14 @@
 import de.saxsys.mvvmfx.utils.validation.ValidationMessage;
 import de.saxsys.mvvmfx.utils.validation.ValidationStatus;
 import de.saxsys.mvvmfx.utils.validation.Validator;
+import org.jspecify.annotations.Nullable;
 
 public class GroupDialogViewModel {
     // Basic Settings
     private final StringProperty nameProperty = new SimpleStringProperty("");
     private final StringProperty descriptionProperty = new SimpleStringProperty("");
     private final StringProperty iconProperty = new SimpleStringProperty("");
+    private final BooleanProperty colorUseProperty = new SimpleBooleanProperty();
     private final ObjectProperty<Color> colorProperty = new SimpleObjectProperty<>();
     private final ListProperty<GroupHierarchyType> groupHierarchyListProperty = new SimpleListProperty<>();
     private final ObjectProperty<GroupHierarchyType> groupHierarchySelectedProperty = new SimpleObjectProperty<>();
@@ -109,17 +110,20 @@ public class GroupDialogViewModel {
     private final PreferencesService preferencesService;
     private final BibDatabaseContext currentDatabase;
     private final AbstractGroup editedGroup;
+    private final GroupTreeNode parentNode;
     private final FileUpdateMonitor fileUpdateMonitor;
 
     public GroupDialogViewModel(DialogService dialogService,
                                 BibDatabaseContext currentDatabase,
                                 PreferencesService preferencesService,
-                                AbstractGroup editedGroup,
+                                @Nullable AbstractGroup editedGroup,
+                                @Nullable GroupTreeNode parentNode,
                                 FileUpdateMonitor fileUpdateMonitor) {
         this.dialogService = dialogService;
         this.preferencesService = preferencesService;
         this.currentDatabase = currentDatabase;
         this.editedGroup = editedGroup;
+        this.parentNode = parentNode;
         this.fileUpdateMonitor = fileUpdateMonitor;
 
         setupValidation();
@@ -160,8 +164,7 @@ private void setupValidation() {
                     return true;
                 },
                 ValidationMessage.warning(
-                    Localization.lang("There exists already a group with the same name.") + "\n" +
-                    Localization.lang("If you use it, it will inherit all entries from this other group.")
+                        Localization.lang("There already exists a group with the same name.\nIf you use it, it will inherit all entries from this other group.")
                 )
         );
 
@@ -373,7 +376,7 @@ public AbstractGroup resultConverter(ButtonType button) {
             if (resultingGroup != null) {
                 preferencesService.getGroupsPreferences().setDefaultHierarchicalContext(groupHierarchySelectedProperty.getValue());
 
-                resultingGroup.setColor(colorProperty.getValue());
+                resultingGroup.setColor(colorUseProperty.getValue() ? colorProperty.getValue() : null);
                 resultingGroup.setDescription(descriptionProperty.getValue());
                 resultingGroup.setIconName(iconProperty.getValue());
                 return resultingGroup;
@@ -391,12 +394,23 @@ public void setValues() {
 
         if (editedGroup == null) {
             // creating new group -> defaults!
-            colorProperty.setValue(IconTheme.getDefaultGroupColor());
+            // TODO: Create default group (via org.jabref.logic.groups.DefaultGroupsFactory) and use values
+
+            colorUseProperty.setValue(false);
+            colorProperty.setValue(determineColor());
+            if (parentNode != null) {
+                parentNode.getGroup()
+                          .getIconName()
+                          .filter(iconName -> !iconName.equals(DefaultGroupsFactory.ALL_ENTRIES_GROUP_DEFAULT_ICON))
+                          .ifPresent(iconProperty::setValue);
+                parentNode.getGroup().getColor().ifPresent(color -> colorUseProperty.setValue(true));
+            }
             typeExplicitProperty.setValue(true);
             groupHierarchySelectedProperty.setValue(preferencesService.getGroupsPreferences().getDefaultHierarchicalContext());
             autoGroupKeywordsOptionProperty.setValue(Boolean.TRUE);
         } else {
             nameProperty.setValue(editedGroup.getName());
+            colorUseProperty.setValue(editedGroup.getColor().isPresent());
             colorProperty.setValue(editedGroup.getColor().orElse(IconTheme.getDefaultGroupColor()));
             descriptionProperty.setValue(editedGroup.getDescription().orElse(""));
             iconProperty.setValue(editedGroup.getIconName().orElse(""));
@@ -449,6 +463,21 @@ public void setValues() {
         }
     }
 
+    private Color determineColor() {
+        Color color;
+        if (parentNode == null) {
+            color = GroupColorPicker.generateColor(List.of());
+        } else {
+            List<Color> colorsOfSiblings = parentNode.getChildren().stream().map(child -> child.getGroup().getColor())
+                                                     .flatMap(Optional::stream)
+                                                     .toList();
+            Optional<Color> parentColor = parentNode.getGroup().getColor();
+            color = parentColor.map(value -> GroupColorPicker.generateColor(colorsOfSiblings, value))
+                               .orElseGet(() -> GroupColorPicker.generateColor(colorsOfSiblings));
+        }
+        return color;
+    }
+
     public void texGroupBrowse() {
         FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
                 .addExtensionFilter(StandardFileType.AUX)
@@ -462,10 +491,6 @@ public void texGroupBrowse() {
                      ));
     }
 
-    public void openHelpPage() {
-        new HelpAction(HelpFile.GROUPS, dialogService, preferencesService.getFilePreferences()).execute();
-    }
-
     private List<Path> getFileDirectoriesAsPaths() {
         List<Path> fileDirs = new ArrayList<>();
         MetaData metaData = currentDatabase.getMetaData();
@@ -526,6 +551,10 @@ public StringProperty iconProperty() {
         return iconProperty;
     }
 
+    public BooleanProperty colorUseProperty() {
+        return colorUseProperty;
+    }
+
     public ObjectProperty<Color> colorFieldProperty() {
         return colorProperty;
     }
diff --git a/src/main/java/org/jabref/gui/groups/GroupTreeViewModel.java b/src/main/java/org/jabref/gui/groups/GroupTreeViewModel.java
index 1c720457053..4efab42033b 100644
--- a/src/main/java/org/jabref/gui/groups/GroupTreeViewModel.java
+++ b/src/main/java/org/jabref/gui/groups/GroupTreeViewModel.java
@@ -173,6 +173,7 @@ public void addNewSubgroup(GroupNodeViewModel parent, GroupDialogHeader groupDia
         currentDatabase.ifPresent(database -> {
             Optional<AbstractGroup> newGroup = dialogService.showCustomDialogAndWait(new GroupDialogView(
                     database,
+                    parent.getGroupNode(),
                     null,
                     groupDialogHeader));
 
@@ -257,6 +258,7 @@ public void editGroup(GroupNodeViewModel oldGroup) {
         currentDatabase.ifPresent(database -> {
             Optional<AbstractGroup> newGroup = dialogService.showCustomDialogAndWait(new GroupDialogView(
                     database,
+                    oldGroup.getGroupNode().getParent().orElse(null),
                     oldGroup.getGroupNode().getGroup(),
                     GroupDialogHeader.SUBGROUP));
             newGroup.ifPresent(group -> {
diff --git a/src/main/java/org/jabref/gui/icon/InternalMaterialDesignIcon.java b/src/main/java/org/jabref/gui/icon/InternalMaterialDesignIcon.java
index 7beb065f7c2..669469dd6fc 100644
--- a/src/main/java/org/jabref/gui/icon/InternalMaterialDesignIcon.java
+++ b/src/main/java/org/jabref/gui/icon/InternalMaterialDesignIcon.java
@@ -44,7 +44,7 @@ public Node getGraphicNode() {
         FontIcon fontIcon = FontIcon.of(icon);
         fontIcon.getStyleClass().add("glyph-icon");
 
-//      Override the default color from the css files
+        // Override the default color from the css files
         color.ifPresent(color -> fontIcon.setStyle(fontIcon.getStyle() +
                 String.format("-fx-fill: %s;", ColorUtil.toRGBCode(color)) +
                 String.format("-fx-icon-color: %s;", ColorUtil.toRGBCode(color))));
diff --git a/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdAction.java b/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdAction.java
index d6e36a5d1eb..22e520231b7 100644
--- a/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdAction.java
+++ b/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdAction.java
@@ -78,12 +78,11 @@ public void execute() {
 
             if (dialogService.showConfirmationDialogAndWait(Localization.lang("Failed to import by ID"), msg, Localization.lang("Add entry manually"))) {
                 // add entry manually
-                new NewEntryAction(libraryTab.frame(), StandardEntryType.Article, dialogService,
+                new NewEntryAction(() -> libraryTab, StandardEntryType.Article, dialogService,
                                    preferencesService, stateManager).execute();
             }
         });
-        backgroundTask.onSuccess(bibEntry -> {
-            Optional<BibEntry> result = bibEntry;
+        backgroundTask.onSuccess(result -> {
             if (result.isPresent()) {
                 final BibEntry entry = result.get();
                 ImportHandler handler = new ImportHandler(
diff --git a/src/main/java/org/jabref/gui/importer/ImportCommand.java b/src/main/java/org/jabref/gui/importer/ImportCommand.java
index fd74e7a5199..14159adb9e5 100644
--- a/src/main/java/org/jabref/gui/importer/ImportCommand.java
+++ b/src/main/java/org/jabref/gui/importer/ImportCommand.java
@@ -12,8 +12,8 @@
 import javafx.stage.FileChooser;
 
 import org.jabref.gui.DialogService;
-import org.jabref.gui.JabRefFrame;
 import org.jabref.gui.LibraryTab;
+import org.jabref.gui.LibraryTabContainer;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.gui.util.BackgroundTask;
@@ -48,7 +48,7 @@ public class ImportCommand extends SimpleCommand {
 
     public enum ImportMethod { AS_NEW, TO_EXISTING }
 
-    private final JabRefFrame frame;
+    private final LibraryTabContainer tabContainer;
     private final ImportMethod importMethod;
 
     private final DialogService dialogService;
@@ -56,14 +56,14 @@ public enum ImportMethod { AS_NEW, TO_EXISTING }
     private final FileUpdateMonitor fileUpdateMonitor;
     private final TaskExecutor taskExecutor;
 
-    public ImportCommand(JabRefFrame frame,
+    public ImportCommand(LibraryTabContainer tabContainer,
                          ImportMethod importMethod,
                          PreferencesService preferencesService,
                          StateManager stateManager,
                          FileUpdateMonitor fileUpdateMonitor,
                          TaskExecutor taskExecutor,
                          DialogService dialogService) {
-        this.frame = frame;
+        this.tabContainer = tabContainer;
         this.importMethod = importMethod;
         this.preferencesService = preferencesService;
         this.fileUpdateMonitor = fileUpdateMonitor;
@@ -107,7 +107,7 @@ private void importSingleFile(Path file, SortedSet<Importer> importers, FileChoo
 
         if (importMethod == ImportMethod.AS_NEW) {
             task.onSuccess(parserResult -> {
-                    frame.addTab(parserResult.getDatabaseContext(), true);
+                    tabContainer.addTab(parserResult.getDatabaseContext(), true);
                     dialogService.notify(Localization.lang("Imported entries") + ": " + parserResult.getDatabase().getEntries().size());
                 })
                 .onFailure(ex -> {
@@ -116,7 +116,7 @@ private void importSingleFile(Path file, SortedSet<Importer> importers, FileChoo
                 })
                 .executeWith(taskExecutor);
         } else {
-            final LibraryTab libraryTab = frame.getCurrentLibraryTab();
+            final LibraryTab libraryTab = tabContainer.getCurrentLibraryTab();
 
             ImportEntriesDialog dialog = new ImportEntriesDialog(libraryTab.getBibDatabaseContext(), task);
             dialog.setTitle(Localization.lang("Import"));
diff --git a/src/main/java/org/jabref/gui/importer/NewDatabaseAction.java b/src/main/java/org/jabref/gui/importer/NewDatabaseAction.java
index f45cbbd2a70..d38a335ec3d 100644
--- a/src/main/java/org/jabref/gui/importer/NewDatabaseAction.java
+++ b/src/main/java/org/jabref/gui/importer/NewDatabaseAction.java
@@ -1,6 +1,6 @@
 package org.jabref.gui.importer;
 
-import org.jabref.gui.JabRefFrame;
+import org.jabref.gui.LibraryTabContainer;
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.preferences.PreferencesService;
@@ -10,17 +10,17 @@
  */
 public class NewDatabaseAction extends SimpleCommand {
 
-    private final JabRefFrame jabRefFrame;
+    private final LibraryTabContainer tabContainer;
     private final PreferencesService preferencesService;
 
     /**
      * Constructs a command to create a new library of the default type
      *
-     * @param jabRefFrame        the application frame of JabRef
+     * @param tabContainer       the ui container for libraries
      * @param preferencesService the preferencesService of JabRef
      */
-    public NewDatabaseAction(JabRefFrame jabRefFrame, PreferencesService preferencesService) {
-        this.jabRefFrame = jabRefFrame;
+    public NewDatabaseAction(LibraryTabContainer tabContainer, PreferencesService preferencesService) {
+        this.tabContainer = tabContainer;
         this.preferencesService = preferencesService;
     }
 
@@ -28,6 +28,6 @@ public NewDatabaseAction(JabRefFrame jabRefFrame, PreferencesService preferences
     public void execute() {
         BibDatabaseContext bibDatabaseContext = new BibDatabaseContext();
         bibDatabaseContext.setMode(preferencesService.getLibraryPreferences().getDefaultBibDatabaseMode());
-        jabRefFrame.addTab(bibDatabaseContext, true);
+        tabContainer.addTab(bibDatabaseContext, true);
     }
 }
diff --git a/src/main/java/org/jabref/gui/importer/NewEntryAction.java b/src/main/java/org/jabref/gui/importer/NewEntryAction.java
index 4086cec912f..4737211f7fb 100644
--- a/src/main/java/org/jabref/gui/importer/NewEntryAction.java
+++ b/src/main/java/org/jabref/gui/importer/NewEntryAction.java
@@ -3,12 +3,14 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
+import java.util.function.Supplier;
 
 import org.jabref.gui.DialogService;
 import org.jabref.gui.EntryTypeView;
-import org.jabref.gui.JabRefFrame;
+import org.jabref.gui.LibraryTab;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.Telemetry;
+import org.jabref.gui.actions.ActionHelper;
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.types.EntryType;
@@ -17,13 +19,11 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static org.jabref.gui.actions.ActionHelper.needsDatabase;
-
 public class NewEntryAction extends SimpleCommand {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(NewEntryAction.class);
 
-    private final JabRefFrame jabRefFrame;
+    private final Supplier<LibraryTab> tabSupplier;
 
     /**
      * The type of the entry to create.
@@ -34,39 +34,39 @@ public class NewEntryAction extends SimpleCommand {
 
     private final PreferencesService preferences;
 
-    public NewEntryAction(JabRefFrame jabRefFrame, DialogService dialogService, PreferencesService preferences, StateManager stateManager) {
-        this.jabRefFrame = jabRefFrame;
+    public NewEntryAction(Supplier<LibraryTab> tabSupplier, DialogService dialogService, PreferencesService preferences, StateManager stateManager) {
+        this.tabSupplier = tabSupplier;
         this.dialogService = dialogService;
         this.preferences = preferences;
 
         this.type = Optional.empty();
 
-        this.executable.bind(needsDatabase(stateManager));
+        this.executable.bind(ActionHelper.needsDatabase(stateManager));
     }
 
-    public NewEntryAction(JabRefFrame jabRefFrame, EntryType type, DialogService dialogService, PreferencesService preferences, StateManager stateManager) {
-        this(jabRefFrame, dialogService, preferences, stateManager);
+    public NewEntryAction(Supplier<LibraryTab> tabSupplier, EntryType type, DialogService dialogService, PreferencesService preferences, StateManager stateManager) {
+        this(tabSupplier, dialogService, preferences, stateManager);
         this.type = Optional.of(type);
     }
 
     @Override
     public void execute() {
-        if (jabRefFrame.getBasePanelCount() <= 0) {
+        if (tabSupplier.get() == null) {
             LOGGER.error("Action 'New entry' must be disabled when no database is open.");
             return;
         }
 
         if (type.isPresent()) {
-            jabRefFrame.getCurrentLibraryTab().insertEntry(new BibEntry(type.get()));
+            tabSupplier.get().insertEntry(new BibEntry(type.get()));
         } else {
-            EntryTypeView typeChoiceDialog = new EntryTypeView(jabRefFrame.getCurrentLibraryTab(), dialogService, preferences);
+            EntryTypeView typeChoiceDialog = new EntryTypeView(tabSupplier.get(), dialogService, preferences);
             EntryType selectedType = dialogService.showCustomDialogAndWait(typeChoiceDialog).orElse(null);
             if (selectedType == null) {
                 return;
             }
 
             trackNewEntry(selectedType);
-            jabRefFrame.getCurrentLibraryTab().insertEntry(new BibEntry(selectedType));
+            tabSupplier.get().insertEntry(new BibEntry(selectedType));
         }
     }
 
diff --git a/src/main/java/org/jabref/gui/importer/ParserResultWarningDialog.java b/src/main/java/org/jabref/gui/importer/ParserResultWarningDialog.java
index ec07cbc93b4..9605654a7e3 100644
--- a/src/main/java/org/jabref/gui/importer/ParserResultWarningDialog.java
+++ b/src/main/java/org/jabref/gui/importer/ParserResultWarningDialog.java
@@ -3,7 +3,7 @@
 import java.util.List;
 import java.util.Objects;
 
-import org.jabref.gui.JabRefFrame;
+import org.jabref.gui.DialogService;
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.logic.l10n.Localization;
 
@@ -15,39 +15,19 @@ public class ParserResultWarningDialog {
     private ParserResultWarningDialog() {
     }
 
-    /**
-     * Shows a dialog with the warnings from an import or open of a file
-     *
-     * @param parserResult - ParserResult for the current import/open
-     * @param jabRefFrame  - the JabRefFrame
-     */
-    public static void showParserResultWarningDialog(final ParserResult parserResult, final JabRefFrame jabRefFrame) {
-        Objects.requireNonNull(parserResult);
-        Objects.requireNonNull(jabRefFrame);
-        showParserResultWarningDialog(parserResult, jabRefFrame, -1);
-    }
-
     /**
      * Shows a dialog with the warnings from an import or open of a file
      *
      * @param parserResult   - ParserResult for the current import/open
-     * @param jabRefFrame    - the JabRefFrame
-     * @param dataBaseNumber - Database tab number to activate when showing the warning dialog
      */
-    public static void showParserResultWarningDialog(final ParserResult parserResult, final JabRefFrame jabRefFrame,
-                                                     final int dataBaseNumber) {
+    public static void showParserResultWarningDialog(final ParserResult parserResult,
+                                                     final DialogService dialogService) {
         Objects.requireNonNull(parserResult);
-        Objects.requireNonNull(jabRefFrame);
         // Return if no warnings
         if (!(parserResult.hasWarnings())) {
             return;
         }
 
-        // Switch tab if asked to do so
-        if (dataBaseNumber >= 0) {
-            jabRefFrame.showLibraryTabAt(dataBaseNumber);
-        }
-
         // Generate string with warning texts
         final List<String> warnings = parserResult.warnings();
         final StringBuilder dialogContent = new StringBuilder();
@@ -59,13 +39,13 @@ public static void showParserResultWarningDialog(final ParserResult parserResult
 
         // Generate dialog title
         String dialogTitle;
-        if (dataBaseNumber < 0 || parserResult.getPath().isEmpty()) {
+        if (parserResult.getPath().isEmpty()) {
             dialogTitle = Localization.lang("Warnings");
         } else {
             dialogTitle = Localization.lang("Warnings") + " (" + parserResult.getPath().get().getFileName() + ")";
         }
 
         // Show dialog
-        jabRefFrame.getDialogService().showWarningDialogAndWait(dialogTitle, dialogContent.toString());
+        dialogService.showWarningDialogAndWait(dialogTitle, dialogContent.toString());
     }
 }
diff --git a/src/main/java/org/jabref/gui/importer/actions/CheckForNewEntryTypesAction.java b/src/main/java/org/jabref/gui/importer/actions/CheckForNewEntryTypesAction.java
index c1e0208a65e..56da949dcc6 100644
--- a/src/main/java/org/jabref/gui/importer/actions/CheckForNewEntryTypesAction.java
+++ b/src/main/java/org/jabref/gui/importer/actions/CheckForNewEntryTypesAction.java
@@ -5,14 +5,11 @@
 
 import org.jabref.gui.DialogService;
 import org.jabref.gui.Globals;
-import org.jabref.gui.LibraryTab;
 import org.jabref.gui.importer.ImportCustomEntryTypesDialog;
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.model.entry.BibEntryType;
 
-import com.airhacks.afterburner.injection.Injector;
-
 /**
  * This action checks whether any new custom entry types were loaded from this
  * BIB file. If so, an offer to remember these entry types is given.
@@ -25,9 +22,8 @@ public boolean isActionNecessary(ParserResult parserResult) {
     }
 
     @Override
-    public void performAction(LibraryTab libraryTab, ParserResult parserResult) {
+    public void performAction(ParserResult parserResult, DialogService dialogService) {
         BibDatabaseMode mode = getBibDatabaseModeFromParserResult(parserResult);
-        DialogService dialogService = Injector.instantiateModelOrService(DialogService.class);
         dialogService.showCustomDialogAndWait(new ImportCustomEntryTypesDialog(mode, getListOfUnknownAndUnequalCustomizations(parserResult)));
     }
 
diff --git a/src/main/java/org/jabref/gui/importer/actions/GUIPostOpenAction.java b/src/main/java/org/jabref/gui/importer/actions/GUIPostOpenAction.java
index cc943956861..cc73f61c92c 100644
--- a/src/main/java/org/jabref/gui/importer/actions/GUIPostOpenAction.java
+++ b/src/main/java/org/jabref/gui/importer/actions/GUIPostOpenAction.java
@@ -1,6 +1,6 @@
 package org.jabref.gui.importer.actions;
 
-import org.jabref.gui.LibraryTab;
+import org.jabref.gui.DialogService;
 import org.jabref.logic.importer.ParserResult;
 
 /**
@@ -31,8 +31,7 @@ public interface GUIPostOpenAction {
      *       important that all implementations of this method do not return
      *       until the operation is finished.
      *
-     * @param panel The BasePanel where the database is shown.
      * @param pr    The result of the BIB parse operation.
      */
-    void performAction(LibraryTab panel, ParserResult pr);
+    void performAction(ParserResult pr, DialogService dialogService);
 }
diff --git a/src/main/java/org/jabref/gui/importer/actions/MergeReviewIntoCommentAction.java b/src/main/java/org/jabref/gui/importer/actions/MergeReviewIntoCommentAction.java
index a8bb0a453f1..638692e9d1a 100644
--- a/src/main/java/org/jabref/gui/importer/actions/MergeReviewIntoCommentAction.java
+++ b/src/main/java/org/jabref/gui/importer/actions/MergeReviewIntoCommentAction.java
@@ -2,7 +2,7 @@
 
 import java.util.List;
 
-import org.jabref.gui.LibraryTab;
+import org.jabref.gui.DialogService;
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.migrations.MergeReviewIntoCommentMigration;
 import org.jabref.model.entry.BibEntry;
@@ -15,12 +15,12 @@ public boolean isActionNecessary(ParserResult parserResult) {
     }
 
     @Override
-    public void performAction(LibraryTab libraryTab, ParserResult parserResult) {
+    public void performAction(ParserResult parserResult, DialogService dialogService) {
         MergeReviewIntoCommentMigration migration = new MergeReviewIntoCommentMigration();
 
         migration.performMigration(parserResult);
         List<BibEntry> conflicts = MergeReviewIntoCommentMigration.collectConflicts(parserResult);
-        if (!conflicts.isEmpty() && new MergeReviewIntoCommentConfirmationDialog(libraryTab.frame().getDialogService()).askUserForMerge(conflicts)) {
+        if (!conflicts.isEmpty() && new MergeReviewIntoCommentConfirmationDialog(dialogService).askUserForMerge(conflicts)) {
             migration.performConflictingMigration(parserResult);
         }
     }
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 4e2854ba764..af295f03a19 100644
--- a/src/main/java/org/jabref/gui/importer/actions/OpenDatabaseAction.java
+++ b/src/main/java/org/jabref/gui/importer/actions/OpenDatabaseAction.java
@@ -14,8 +14,8 @@
 import javax.swing.undo.UndoManager;
 
 import org.jabref.gui.DialogService;
-import org.jabref.gui.JabRefFrame;
 import org.jabref.gui.LibraryTab;
+import org.jabref.gui.LibraryTabContainer;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.Telemetry;
 import org.jabref.gui.actions.SimpleCommand;
@@ -56,7 +56,7 @@ public class OpenDatabaseAction extends SimpleCommand {
             // Check for new custom entry types loaded from the BIB file:
             new CheckForNewEntryTypesAction());
 
-    private final JabRefFrame frame;
+    private final LibraryTabContainer tabContainer;
     private final PreferencesService preferencesService;
     private final StateManager stateManager;
     private final FileUpdateMonitor fileUpdateMonitor;
@@ -65,7 +65,7 @@ public class OpenDatabaseAction extends SimpleCommand {
     private final CountingUndoManager undoManager;
     private final TaskExecutor taskExecutor;
 
-    public OpenDatabaseAction(JabRefFrame frame,
+    public OpenDatabaseAction(LibraryTabContainer tabContainer,
                               PreferencesService preferencesService,
                               DialogService dialogService,
                               StateManager stateManager,
@@ -73,7 +73,7 @@ public OpenDatabaseAction(JabRefFrame frame,
                               BibEntryTypesManager entryTypesManager,
                               CountingUndoManager undoManager,
                               TaskExecutor taskExecutor) {
-        this.frame = frame;
+        this.tabContainer = tabContainer;
         this.preferencesService = preferencesService;
         this.dialogService = dialogService;
         this.stateManager = stateManager;
@@ -86,14 +86,12 @@ public OpenDatabaseAction(JabRefFrame frame,
     /**
      * Go through the list of post open actions, and perform those that need to be performed.
      *
-     * @param libraryTab The BasePanel where the database is shown.
      * @param result     The result of the BIB file parse operation.
      */
-    public static void performPostOpenActions(LibraryTab libraryTab, ParserResult result) {
+    public static void performPostOpenActions(ParserResult result, DialogService dialogService) {
         for (GUIPostOpenAction action : OpenDatabaseAction.POST_OPEN_ACTIONS) {
             if (action.isActionNecessary(result)) {
-                action.performAction(libraryTab, result);
-                libraryTab.frame().showLibraryTab(libraryTab);
+                action.performAction(result, dialogService);
             }
         }
     }
@@ -114,10 +112,10 @@ public void execute() {
      * @return Path of current panel database directory or the working directory
      */
     private Path getInitialDirectory() {
-        if (frame.getLibraryTabs().isEmpty()) {
+        if (tabContainer.getLibraryTabs().isEmpty()) {
             return preferencesService.getFilePreferences().getWorkingDirectory();
         } else {
-            Optional<Path> databasePath = frame.getCurrentLibraryTab().getBibDatabaseContext().getDatabasePath();
+            Optional<Path> databasePath = tabContainer.getCurrentLibraryTab().getBibDatabaseContext().getDatabasePath();
             return databasePath.map(Path::getParent).orElse(preferencesService.getFilePreferences().getWorkingDirectory());
         }
     }
@@ -146,8 +144,7 @@ public void openFiles(List<Path> filesToOpen) {
         // Check if any of the files are already open:
         for (Iterator<Path> iterator = filesToOpen.iterator(); iterator.hasNext(); ) {
             Path file = iterator.next();
-            for (int i = 0; i < frame.getLibraryTabs().size(); i++) {
-                LibraryTab libraryTab = frame.getLibraryTabAt(i);
+            for (LibraryTab libraryTab : tabContainer.getLibraryTabs()) {
                 if ((libraryTab.getBibDatabaseContext().getDatabasePath().isPresent())
                         && libraryTab.getBibDatabaseContext().getDatabasePath().get().equals(file)) {
                     iterator.remove();
@@ -175,7 +172,7 @@ public void openFiles(List<Path> filesToOpen) {
         } else if (toRaise != null) {
             // If no files are remaining to open, this could mean that a file was
             // already open. If so, we may have to raise the correct tab:
-            frame.showLibraryTab(toRaise);
+            tabContainer.showLibraryTab(toRaise);
         }
     }
 
@@ -198,7 +195,7 @@ private void openTheFile(Path file) {
                 dialogService,
                 preferencesService,
                 stateManager,
-                frame,
+                tabContainer,
                 fileUpdateMonitor,
                 entryTypesManager,
                 undoManager,
@@ -244,7 +241,7 @@ private ParserResult loadDatabase(Path file) throws Exception {
         if (parserResult.getDatabase().isShared()) {
                          openSharedDatabase(
                                  parserResult,
-                                 frame,
+                                 tabContainer,
                                  dialogService,
                                  preferencesService,
                                  stateManager,
@@ -264,7 +261,7 @@ private void trackOpenNewDatabase(LibraryTab libraryTab) {
     }
 
     public static void openSharedDatabase(ParserResult parserResult,
-                                          JabRefFrame frame,
+                                          LibraryTabContainer tabContainer,
                                           DialogService dialogService,
                                           PreferencesService preferencesService,
                                           StateManager stateManager,
@@ -275,7 +272,7 @@ public static void openSharedDatabase(ParserResult parserResult,
             throws SQLException, DatabaseNotSupportedException, InvalidDBMSConnectionPropertiesException, NotASharedDatabaseException {
         try {
             new SharedDatabaseUIManager(
-                    frame,
+                    tabContainer,
                     dialogService,
                     preferencesService,
                     stateManager,
diff --git a/src/main/java/org/jabref/gui/importer/fetcher/LookupIdentifierAction.java b/src/main/java/org/jabref/gui/importer/fetcher/LookupIdentifierAction.java
index 745006517fa..f3a0242c915 100644
--- a/src/main/java/org/jabref/gui/importer/fetcher/LookupIdentifierAction.java
+++ b/src/main/java/org/jabref/gui/importer/fetcher/LookupIdentifierAction.java
@@ -5,7 +5,7 @@
 
 import javax.swing.undo.UndoManager;
 
-import org.jabref.gui.JabRefFrame;
+import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.Action;
 import org.jabref.gui.actions.SimpleCommand;
@@ -32,22 +32,21 @@ public class LookupIdentifierAction<T extends Identifier> extends SimpleCommand
 
     private static final Logger LOGGER = LoggerFactory.getLogger(LookupIdentifierAction.class);
 
-    private final JabRefFrame frame;
-
     private final IdFetcher<T> fetcher;
     private final StateManager stateManager;
     private final UndoManager undoManager;
+    private final DialogService dialogService;
     private final TaskExecutor taskExecutor;
 
-    public LookupIdentifierAction(JabRefFrame frame,
-                                  IdFetcher<T> fetcher,
+    public LookupIdentifierAction(IdFetcher<T> fetcher,
                                   StateManager stateManager,
                                   UndoManager undoManager,
+                                  DialogService dialogService,
                                   TaskExecutor taskExecutor) {
-        this.frame = frame;
         this.fetcher = fetcher;
         this.stateManager = stateManager;
         this.undoManager = undoManager;
+        this.dialogService = dialogService;
         this.taskExecutor = taskExecutor;
 
         this.executable.bind(needsDatabase(this.stateManager).and(needsEntriesSelected(this.stateManager)));
@@ -58,7 +57,7 @@ public LookupIdentifierAction(JabRefFrame frame,
     public void execute() {
         try {
             BackgroundTask.wrap(() -> lookupIdentifiers(stateManager.getSelectedEntries()))
-                          .onSuccess(frame.getDialogService()::notify)
+                          .onSuccess(dialogService::notify)
                           .executeWith(taskExecutor);
         } catch (Exception e) {
             LOGGER.error("Problem running ID Worker", e);
@@ -78,7 +77,7 @@ private String lookupIdentifiers(List<BibEntry> bibEntries) {
             count++;
             final String statusMessage = Localization.lang("Looking up %0... - entry %1 out of %2 - found %3",
                     fetcher.getIdentifierName(), Integer.toString(count), totalCount, Integer.toString(foundCount));
-            DefaultTaskExecutor.runInJavaFXThread(() -> frame.getDialogService().notify(statusMessage));
+            DefaultTaskExecutor.runInJavaFXThread(() -> dialogService.notify(statusMessage));
             Optional<T> identifier = Optional.empty();
             try {
                 identifier = fetcher.findIdentifier(bibEntry);
@@ -92,7 +91,7 @@ private String lookupIdentifiers(List<BibEntry> bibEntries) {
                     foundCount++;
                     final String nextStatusMessage = Localization.lang("Looking up %0... - entry %1 out of %2 - found %3",
                             fetcher.getIdentifierName(), Integer.toString(count), totalCount, Integer.toString(foundCount));
-                    DefaultTaskExecutor.runInJavaFXThread(() -> frame.getDialogService().notify(nextStatusMessage));
+                    DefaultTaskExecutor.runInJavaFXThread(() -> dialogService.notify(nextStatusMessage));
                 }
             }
         }
diff --git a/src/main/java/org/jabref/gui/integrity/IntegrityCheckAction.java b/src/main/java/org/jabref/gui/integrity/IntegrityCheckAction.java
index 5e6e2df5a37..472efce865e 100644
--- a/src/main/java/org/jabref/gui/integrity/IntegrityCheckAction.java
+++ b/src/main/java/org/jabref/gui/integrity/IntegrityCheckAction.java
@@ -2,18 +2,20 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.function.Supplier;
 
 import javafx.collections.ObservableList;
 import javafx.concurrent.Task;
 
 import org.jabref.gui.DialogService;
-import org.jabref.gui.JabRefFrame;
+import org.jabref.gui.LibraryTab;
 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.journals.predatory.PredatoryJournalRepository;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
@@ -25,23 +27,26 @@ public class IntegrityCheckAction extends SimpleCommand {
 
     private final TaskExecutor taskExecutor;
     private final DialogService dialogService;
-    private final JabRefFrame frame;
+    private final Supplier<LibraryTab> tabSupplier;
     private final PreferencesService preferencesService;
     private final StateManager stateManager;
     private final JournalAbbreviationRepository abbreviationRepository;
+    private final PredatoryJournalRepository predatoryJournalRepository;
 
-    public IntegrityCheckAction(JabRefFrame frame,
+    public IntegrityCheckAction(Supplier<LibraryTab> tabSupplier,
                                 PreferencesService preferencesService,
                                 DialogService dialogService,
                                 StateManager stateManager,
                                 TaskExecutor taskExecutor,
-                                JournalAbbreviationRepository abbreviationRepository) {
-        this.frame = frame;
+                                JournalAbbreviationRepository abbreviationRepository,
+                                PredatoryJournalRepository predatoryJournalRepository) {
+        this.tabSupplier = tabSupplier;
         this.stateManager = stateManager;
         this.taskExecutor = taskExecutor;
         this.preferencesService = preferencesService;
         this.dialogService = dialogService;
         this.abbreviationRepository = abbreviationRepository;
+        this.predatoryJournalRepository = predatoryJournalRepository;
 
         this.executable.bind(needsDatabase(this.stateManager));
     }
@@ -53,6 +58,7 @@ public void execute() {
                 preferencesService.getFilePreferences(),
                 preferencesService.getCitationKeyPatternPreferences(),
                 abbreviationRepository,
+                predatoryJournalRepository,
                 preferencesService.getEntryEditorPreferences().shouldAllowIntegerEditionBibtex());
 
         Task<List<IntegrityMessage>> task = new Task<>() {
@@ -78,7 +84,7 @@ protected List<IntegrityMessage> call() {
             if (messages.isEmpty()) {
                 dialogService.notify(Localization.lang("No problems found."));
             } else {
-                dialogService.showCustomDialogAndWait(new IntegrityCheckDialog(messages, frame.getCurrentLibraryTab()));
+                dialogService.showCustomDialogAndWait(new IntegrityCheckDialog(messages, tabSupplier.get()));
             }
         });
         task.setOnFailed(event -> dialogService.showErrorDialogAndWait("Integrity check failed.", task.getException()));
diff --git a/src/main/java/org/jabref/gui/journals/AbbreviateAction.java b/src/main/java/org/jabref/gui/journals/AbbreviateAction.java
index a1a723287d9..c876418fc4e 100644
--- a/src/main/java/org/jabref/gui/journals/AbbreviateAction.java
+++ b/src/main/java/org/jabref/gui/journals/AbbreviateAction.java
@@ -5,12 +5,15 @@
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
+import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
+import javax.swing.undo.UndoManager;
+
 import org.jabref.gui.DialogService;
 import org.jabref.gui.Globals;
 import org.jabref.gui.JabRefExecutorService;
-import org.jabref.gui.JabRefFrame;
+import org.jabref.gui.LibraryTab;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.ActionHelper;
 import org.jabref.gui.actions.SimpleCommand;
@@ -36,29 +39,32 @@ public class AbbreviateAction extends SimpleCommand {
     private static final Logger LOGGER = LoggerFactory.getLogger(AbbreviateAction.class);
 
     private final StandardActions action;
-    private final JabRefFrame frame;
+    private final Supplier<LibraryTab> tabSupplier;
     private final DialogService dialogService;
     private final StateManager stateManager;
     private final JournalAbbreviationPreferences journalAbbreviationPreferences;
     private final JournalAbbreviationRepository abbreviationRepository;
     private final TaskExecutor taskExecutor;
+    private final UndoManager undoManager;
 
     private AbbreviationType abbreviationType;
 
     public AbbreviateAction(StandardActions action,
-                            JabRefFrame frame,
+                            Supplier<LibraryTab> tabSupplier,
                             DialogService dialogService,
                             StateManager stateManager,
                             JournalAbbreviationPreferences abbreviationPreferences,
                             JournalAbbreviationRepository abbreviationRepository,
-                            TaskExecutor taskExecutor) {
+                            TaskExecutor taskExecutor,
+                            UndoManager undoManager) {
         this.action = action;
-        this.frame = frame;
+        this.tabSupplier = tabSupplier;
         this.dialogService = dialogService;
         this.stateManager = stateManager;
         this.journalAbbreviationPreferences = abbreviationPreferences;
         this.abbreviationRepository = abbreviationRepository;
         this.taskExecutor = taskExecutor;
+        this.undoManager = undoManager;
 
         switch (action) {
             case ABBREVIATE_DEFAULT -> abbreviationType = AbbreviationType.DEFAULT;
@@ -123,8 +129,8 @@ private String abbreviate(BibDatabaseContext databaseContext, List<BibEntry> ent
         }
 
         ce.end();
-        frame.getUndoManager().addEdit(ce);
-        frame.getCurrentLibraryTab().markBaseChanged();
+        undoManager.addEdit(ce);
+        tabSupplier.get().markBaseChanged();
         return Localization.lang("Abbreviated %0 journal names.", String.valueOf(count));
     }
 
@@ -140,8 +146,8 @@ private String unabbreviate(BibDatabaseContext databaseContext, List<BibEntry> e
         }
 
         ce.end();
-        frame.getUndoManager().addEdit(ce);
-        frame.getCurrentLibraryTab().markBaseChanged();
+        undoManager.addEdit(ce);
+        tabSupplier.get().markBaseChanged();
         return Localization.lang("Unabbreviated %0 journal names.", String.valueOf(count));
     }
 }
diff --git a/src/main/java/org/jabref/gui/keyboard/KeyBinding.java b/src/main/java/org/jabref/gui/keyboard/KeyBinding.java
index 5706d55cc7b..506d3fc40e4 100644
--- a/src/main/java/org/jabref/gui/keyboard/KeyBinding.java
+++ b/src/main/java/org/jabref/gui/keyboard/KeyBinding.java
@@ -32,7 +32,10 @@ public enum KeyBinding {
     CLOSE("Close dialog", Localization.lang("Close dialog"), "Esc", KeyBindingCategory.VIEW),
     COPY("Copy", Localization.lang("Copy"), "ctrl+C", KeyBindingCategory.EDIT),
     COPY_TITLE("Copy title", Localization.lang("Copy title"), "ctrl+shift+alt+T", KeyBindingCategory.EDIT),
-    COPY_CITE_CITATION_KEY("Copy \\cite{citation key}", Localization.lang("Copy \\cite{citation key}"), "ctrl+K", KeyBindingCategory.EDIT),
+
+    // We migrated from "Copy \\cite{citation key}" to "Copy citation key with configured cite command", therefore we keep the "old string" for backwards comppatibility
+    COPY_CITE_CITATION_KEY("Copy \\cite{citation key}", Localization.lang("Copy citation key with configured cite command"), "ctrl+K", KeyBindingCategory.EDIT),
+
     COPY_CITATION_KEY("Copy citation key", Localization.lang("Copy citation key"), "ctrl+shift+K", KeyBindingCategory.EDIT),
     COPY_CITATION_KEY_AND_TITLE("Copy citation key and title", Localization.lang("Copy citation key and title"), "ctrl+shift+alt+K", KeyBindingCategory.EDIT),
     COPY_CITATION_KEY_AND_LINK("Copy citation key and link", Localization.lang("Copy citation key and link"), "ctrl+alt+K", KeyBindingCategory.EDIT),
diff --git a/src/main/java/org/jabref/gui/maintable/MainTable.css b/src/main/java/org/jabref/gui/maintable/MainTable.css
index 51059819604..b52b7ef79c8 100644
--- a/src/main/java/org/jabref/gui/maintable/MainTable.css
+++ b/src/main/java/org/jabref/gui/maintable/MainTable.css
@@ -14,6 +14,7 @@
 
 .table-row-cell:hover .empty-special-field {
     visibility: visible;
+    -fx-icon-color: -jr-gray-2;
     -fx-fill: -jr-gray-2;
 }
 
diff --git a/src/main/java/org/jabref/gui/maintable/MainTable.java b/src/main/java/org/jabref/gui/maintable/MainTable.java
index 7c4e2b2e329..439146b78a6 100644
--- a/src/main/java/org/jabref/gui/maintable/MainTable.java
+++ b/src/main/java/org/jabref/gui/maintable/MainTable.java
@@ -29,6 +29,7 @@
 import org.jabref.gui.DragAndDropDataFormats;
 import org.jabref.gui.Globals;
 import org.jabref.gui.LibraryTab;
+import org.jabref.gui.LibraryTabContainer;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.StandardActions;
 import org.jabref.gui.edit.EditAction;
@@ -72,11 +73,13 @@ public class MainTable extends TableView<BibEntryTableViewModel> {
     private final ClipBoardManager clipBoardManager;
     private final BibEntryTypesManager entryTypesManager;
     private final TaskExecutor taskExecutor;
+    private final UndoManager undoManager;
     private long lastKeyPressTime;
     private String columnSearchTerm;
 
     public MainTable(MainTableDataModel model,
                      LibraryTab libraryTab,
+                     LibraryTabContainer tabContainer,
                      BibDatabaseContext database,
                      PreferencesService preferencesService,
                      DialogService dialogService,
@@ -96,7 +99,7 @@ public MainTable(MainTableDataModel model,
         this.clipBoardManager = clipBoardManager;
         this.entryTypesManager = entryTypesManager;
         this.taskExecutor = taskExecutor;
-        UndoManager undoManager = libraryTab.getUndoManager();
+        this.undoManager = libraryTab.getUndoManager();
         MainTablePreferences mainTablePreferences = preferencesService.getMainTablePreferences();
 
         importHandler = new ImportHandler(
@@ -118,7 +121,7 @@ public MainTable(MainTableDataModel model,
                         database,
                         preferencesService,
                         preferencesService.getMainTableColumnPreferences(),
-                        libraryTab.getUndoManager(),
+                        undoManager,
                         dialogService,
                         stateManager,
                         taskExecutor).createColumns());
@@ -192,13 +195,13 @@ public MainTable(MainTableDataModel model,
                 database,
                 preferencesService,
                 preferencesService.getMainTableColumnPreferences(),
-                libraryTab.getUndoManager(),
+                undoManager,
                 dialogService,
                 stateManager,
                 taskExecutor);
 
         // Enable the header right-click menu.
-        new MainTableHeaderContextMenu(this, rightClickMenuFactory).show(true);
+        new MainTableHeaderContextMenu(this, rightClickMenuFactory, tabContainer, keyBindingRepository, dialogService).show(true);
     }
 
     /**
@@ -265,10 +268,10 @@ public void cut() {
     }
 
     private void setupKeyBindings(KeyBindingRepository keyBindings) {
-        EditAction pasteAction = new EditAction(StandardActions.PASTE, libraryTab.frame(), stateManager);
-        EditAction copyAction = new EditAction(StandardActions.COPY, libraryTab.frame(), stateManager);
-        EditAction cutAction = new EditAction(StandardActions.CUT, libraryTab.frame(), stateManager);
-        EditAction deleteAction = new EditAction(StandardActions.DELETE_ENTRY, libraryTab.frame(), stateManager);
+        EditAction pasteAction = new EditAction(StandardActions.PASTE, () -> libraryTab, stateManager, undoManager);
+        EditAction copyAction = new EditAction(StandardActions.COPY, () -> libraryTab, stateManager, undoManager);
+        EditAction cutAction = new EditAction(StandardActions.CUT, () -> libraryTab, stateManager, undoManager);
+        EditAction deleteAction = new EditAction(StandardActions.DELETE_ENTRY, () -> libraryTab, stateManager, undoManager);
 
         this.addEventFilter(KeyEvent.KEY_PRESSED, event -> {
             if (event.getCode() == KeyCode.ENTER) {
diff --git a/src/main/java/org/jabref/gui/maintable/MainTableHeaderContextMenu.java b/src/main/java/org/jabref/gui/maintable/MainTableHeaderContextMenu.java
index 37b628ed5cd..2b2c1376dbc 100644
--- a/src/main/java/org/jabref/gui/maintable/MainTableHeaderContextMenu.java
+++ b/src/main/java/org/jabref/gui/maintable/MainTableHeaderContextMenu.java
@@ -5,28 +5,44 @@
 
 import javafx.collections.ObservableList;
 import javafx.scene.control.ContextMenu;
+import javafx.scene.control.MenuItem;
 import javafx.scene.control.RadioMenuItem;
 import javafx.scene.control.SeparatorMenuItem;
 import javafx.scene.control.TableColumn;
 import javafx.scene.layout.StackPane;
 
+import org.jabref.gui.DialogService;
+import org.jabref.gui.LibraryTabContainer;
+import org.jabref.gui.actions.ActionFactory;
+import org.jabref.gui.actions.StandardActions;
+import org.jabref.gui.keyboard.KeyBindingRepository;
 import org.jabref.gui.maintable.columns.MainTableColumn;
+import org.jabref.gui.preferences.ShowPreferencesAction;
+import org.jabref.gui.preferences.table.TableTab;
+import org.jabref.logic.l10n.Localization;
 
 public class MainTableHeaderContextMenu extends ContextMenu {
 
     private static final int OUT_OF_BOUNDS = -1;
     MainTable mainTable;
     MainTableColumnFactory factory;
-
-    /**
-     * Constructor for the right click menu
-     *
-     */
-    public MainTableHeaderContextMenu(MainTable mainTable, MainTableColumnFactory factory) {
+    private final LibraryTabContainer tabContainer;
+    private final KeyBindingRepository keyBindingRepository;
+    private final DialogService dialogService;
+
+    public MainTableHeaderContextMenu(MainTable mainTable,
+                                      MainTableColumnFactory factory,
+                                      LibraryTabContainer tabContainer,
+                                      KeyBindingRepository keyBindingRepository,
+                                      DialogService dialogService) {
         super();
+        this.tabContainer = tabContainer;
         this.mainTable = mainTable;
         this.factory = factory;
-        constructItems(mainTable);
+        this.keyBindingRepository = keyBindingRepository;
+        this.dialogService = dialogService;
+
+        constructItems();
     }
 
     /**
@@ -48,7 +64,7 @@ public void show(boolean show) {
     /**
      * Constructs the items for the list and places them in the menu.
      */
-    private void constructItems(MainTable mainTable) {
+    private void constructItems() {
         // Reset the right-click menu
         this.getItems().clear();
         List<TableColumn<BibEntryTableViewModel, ?>> commonColumns = commonColumns();
@@ -60,44 +76,48 @@ private void constructItems(MainTable mainTable) {
             this.getItems().add(itemToAdd);
 
             // Remove from remaining common columns pool
-            MainTableColumn searchCol = (MainTableColumn<?>) column;
+            MainTableColumn<?> searchCol = (MainTableColumn<?>) column;
             if (isACommonColumn(searchCol)) {
-                commonColumns.removeIf(tableCol -> ((MainTableColumn) tableCol).getModel().equals(searchCol.getModel()));
+                commonColumns.removeIf(tableCol -> ((MainTableColumn<?>) tableCol).getModel().equals(searchCol.getModel()));
             }
         }
 
-        SeparatorMenuItem separator = new SeparatorMenuItem();
-        this.getItems().add(separator);
+        if (!commonColumns.isEmpty()) {
+            this.getItems().add(new SeparatorMenuItem());
 
-        // Append to the menu the current remaining columns in the common columns.
-
-        for (TableColumn<BibEntryTableViewModel, ?> tableColumn : commonColumns) {
-            RightClickMenuItem itemToAdd = createMenuItem(tableColumn, false);
-            this.getItems().add(itemToAdd);
+            // Append to the menu the current remaining columns in the common columns.
+            for (TableColumn<BibEntryTableViewModel, ?> tableColumn : commonColumns) {
+                RightClickMenuItem itemToAdd = createMenuItem(tableColumn, false);
+                this.getItems().add(itemToAdd);
+            }
         }
+
+        this.getItems().add(new SeparatorMenuItem());
+        ActionFactory actionfactory = new ActionFactory(this.keyBindingRepository);
+        MenuItem showMoreItem = actionfactory.createMenuItem(
+                StandardActions.SHOW_PREFS.withText(Localization.lang("More options...")),
+                new ShowPreferencesAction(tabContainer, TableTab.class, dialogService));
+        this.getItems().add(showMoreItem);
     }
 
     /**
      * Creates an item for the menu constructed with the name/visibility of the table column.
-     *
      */
-    @SuppressWarnings("rawtypes")
     private RightClickMenuItem createMenuItem(TableColumn<BibEntryTableViewModel, ?> column, boolean isDisplaying) {
         // Gets display name and constructs Radio Menu Item.
-        MainTableColumn tableColumn = (MainTableColumn) column;
+        MainTableColumn<?> tableColumn = (MainTableColumn<?>) column;
         String displayName = tableColumn.getDisplayName();
         return new RightClickMenuItem(displayName, tableColumn, isDisplaying);
     }
 
     /**
      * Returns the current position of the inputted column in the table (index).
-     *
      */
-    private int obtainIndexOfColumn(MainTableColumn searchColumn) {
+    private int obtainIndexOfColumn(MainTableColumn<?> searchColumn) {
         ObservableList<TableColumn<BibEntryTableViewModel, ?>> columns = mainTable.getColumns();
         for (int i = 0; i < columns.size(); i++) {
             TableColumn<BibEntryTableViewModel, ?> column = columns.get(i);
-            MainTableColumnModel model = ((MainTableColumn) column).getModel();
+            MainTableColumnModel model = ((MainTableColumn<?>) column).getModel();
             if (model.equals(searchColumn.getModel())) {
                 return i;
             }
@@ -108,9 +128,8 @@ private int obtainIndexOfColumn(MainTableColumn searchColumn) {
     /**
      * Adds the column into the MainTable for display.
      */
-    @SuppressWarnings("rawtypes")
-    private void addColumn(MainTableColumn tableColumn, int index) {
-        if (index <= OUT_OF_BOUNDS || index >= mainTable.getColumns().size()) {
+    private void addColumn(MainTableColumn<?> tableColumn, int index) {
+        if ((index <= OUT_OF_BOUNDS) || (index >= mainTable.getColumns().size())) {
             mainTable.getColumns().add(tableColumn);
         } else {
             mainTable.getColumns().add(index, tableColumn);
@@ -120,25 +139,24 @@ private void addColumn(MainTableColumn tableColumn, int index) {
     /**
      * Removes the column from the MainTable to remove visibility.
      */
-    @SuppressWarnings("rawtypes")
-    private void removeColumn(MainTableColumn tableColumn) {
-        mainTable.getColumns().removeIf(tableCol -> ((MainTableColumn) tableCol).getModel().equals(tableColumn.getModel()));
+    private void removeColumn(MainTableColumn<?> tableColumn) {
+        mainTable.getColumns().removeIf(tableCol -> ((MainTableColumn<?>) tableCol).getModel().equals(tableColumn.getModel()));
     }
 
     /**
      * Checks if a column is one of the commonly used columns.
      */
-    private boolean isACommonColumn(MainTableColumn tableColumn) {
+    private boolean isACommonColumn(MainTableColumn<?> tableColumn) {
         return isColumnInList(tableColumn, commonColumns());
     }
 
     /**
      * Determines if a list of TableColumns contains the searched column.
      */
-    private boolean isColumnInList(MainTableColumn searchColumn, List<TableColumn<BibEntryTableViewModel, ?>> tableColumns) {
+    private boolean isColumnInList(MainTableColumn<?> searchColumn, List<TableColumn<BibEntryTableViewModel, ?>> tableColumns) {
         for (TableColumn<BibEntryTableViewModel, ?> column:
         tableColumns) {
-            MainTableColumnModel model = ((MainTableColumn) column).getModel();
+            MainTableColumnModel model = ((MainTableColumn<?>) column).getModel();
             if (model.equals(searchColumn.getModel())) {
                 return true;
             }
@@ -185,13 +203,12 @@ private boolean isColumnInList(MainTableColumn searchColumn, List<TableColumn<Bi
 
     /**
      * RightClickMenuItem: RadioMenuItem holding position in MainTable and its visibility.
-     *
      */
     private class RightClickMenuItem extends RadioMenuItem {
         private int index;
         private boolean visibleInTable;
 
-        RightClickMenuItem(String displayName, MainTableColumn column, boolean isVisible) {
+        RightClickMenuItem(String displayName, MainTableColumn<?> column, boolean isVisible) {
             super(displayName);
             setVisibleInTable(isVisible);
             // Flag item as selected if the item is already in the main table.
diff --git a/src/main/java/org/jabref/gui/maintable/RightClickMenu.java b/src/main/java/org/jabref/gui/maintable/RightClickMenu.java
index 42686574b3e..6e65da6ab13 100644
--- a/src/main/java/org/jabref/gui/maintable/RightClickMenu.java
+++ b/src/main/java/org/jabref/gui/maintable/RightClickMenu.java
@@ -51,23 +51,23 @@ public static ContextMenu create(BibEntryTableViewModel entry,
         ContextMenu contextMenu = new ContextMenu();
 
         contextMenu.getItems().addAll(
-                factory.createMenuItem(StandardActions.COPY, new EditAction(StandardActions.COPY, libraryTab.frame(), stateManager)),
+                factory.createMenuItem(StandardActions.COPY, new EditAction(StandardActions.COPY, () -> libraryTab, stateManager, undoManager)),
                 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.PASTE, new EditAction(StandardActions.PASTE, () -> libraryTab, stateManager, undoManager)),
+                factory.createMenuItem(StandardActions.CUT, new EditAction(StandardActions.CUT, () -> libraryTab, stateManager, undoManager)),
                 factory.createMenuItem(StandardActions.MERGE_ENTRIES, new MergeEntriesAction(dialogService, stateManager, preferencesService)),
-                factory.createMenuItem(StandardActions.DELETE_ENTRY, new EditAction(StandardActions.DELETE_ENTRY, libraryTab.frame(), stateManager)),
+                factory.createMenuItem(StandardActions.DELETE_ENTRY, new EditAction(StandardActions.DELETE_ENTRY, () -> libraryTab, stateManager, undoManager)),
 
                 new SeparatorMenuItem(),
 
                 createSendSubMenu(factory, dialogService, stateManager, preferencesService, entryTypesManager, taskExecutor),
 
-                SpecialFieldMenuItemFactory.createSpecialFieldMenu(SpecialField.RANKING, factory, libraryTab.frame(), dialogService, preferencesService, undoManager, stateManager),
-                SpecialFieldMenuItemFactory.getSpecialFieldSingleItem(SpecialField.RELEVANCE, factory, libraryTab.frame(), dialogService, preferencesService, undoManager, stateManager),
-                SpecialFieldMenuItemFactory.getSpecialFieldSingleItem(SpecialField.QUALITY, factory, libraryTab.frame(), dialogService, preferencesService, undoManager, stateManager),
-                SpecialFieldMenuItemFactory.getSpecialFieldSingleItem(SpecialField.PRINTED, factory, libraryTab.frame(), dialogService, preferencesService, undoManager, stateManager),
-                SpecialFieldMenuItemFactory.createSpecialFieldMenu(SpecialField.PRIORITY, factory, libraryTab.frame(), dialogService, preferencesService, undoManager, stateManager),
-                SpecialFieldMenuItemFactory.createSpecialFieldMenu(SpecialField.READ_STATUS, factory, libraryTab.frame(), dialogService, preferencesService, undoManager, stateManager),
+                SpecialFieldMenuItemFactory.createSpecialFieldMenu(SpecialField.RANKING, factory, () -> libraryTab, dialogService, preferencesService, undoManager, stateManager),
+                SpecialFieldMenuItemFactory.getSpecialFieldSingleItem(SpecialField.RELEVANCE, factory, () -> libraryTab, dialogService, preferencesService, undoManager, stateManager),
+                SpecialFieldMenuItemFactory.getSpecialFieldSingleItem(SpecialField.QUALITY, factory, () -> libraryTab, dialogService, preferencesService, undoManager, stateManager),
+                SpecialFieldMenuItemFactory.getSpecialFieldSingleItem(SpecialField.PRINTED, factory, () -> libraryTab, dialogService, preferencesService, undoManager, stateManager),
+                SpecialFieldMenuItemFactory.createSpecialFieldMenu(SpecialField.PRIORITY, factory, () -> libraryTab, dialogService, preferencesService, undoManager, stateManager),
+                SpecialFieldMenuItemFactory.createSpecialFieldMenu(SpecialField.READ_STATUS, factory, () -> libraryTab, dialogService, preferencesService, undoManager, stateManager),
 
                 new SeparatorMenuItem(),
 
diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesDialogView.java b/src/main/java/org/jabref/gui/preferences/PreferencesDialogView.java
index 1de0bdd99f0..864e1a76ad7 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferencesDialogView.java
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesDialogView.java
@@ -1,6 +1,7 @@
 package org.jabref.gui.preferences;
 
 import java.util.Locale;
+import java.util.Optional;
 
 import javafx.fxml.FXML;
 import javafx.scene.control.ButtonType;
@@ -10,7 +11,6 @@
 import javafx.scene.input.KeyCode;
 
 import org.jabref.gui.DialogService;
-import org.jabref.gui.JabRefFrame;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.keyboard.KeyBinding;
 import org.jabref.gui.theme.ThemeManager;
@@ -42,12 +42,12 @@ public class PreferencesDialogView extends BaseDialog<PreferencesDialogViewModel
     @Inject private PreferencesService preferencesService;
     @Inject private ThemeManager themeManager;
 
-    private final JabRefFrame frame;
     private PreferencesDialogViewModel viewModel;
+    private final Class<? extends PreferencesTab> preferencesTabToSelectClass;
 
-    public PreferencesDialogView(JabRefFrame frame) {
-        this.frame = frame;
+    public PreferencesDialogView(Class<? extends PreferencesTab> preferencesTabToSelectClass) {
         this.setTitle(Localization.lang("JabRef preferences"));
+        this.preferencesTabToSelectClass = preferencesTabToSelectClass;
 
         ViewLoader.view(this)
                   .load()
@@ -71,7 +71,7 @@ public PreferencesDialogViewModel getViewModel() {
 
     @FXML
     private void initialize() {
-        viewModel = new PreferencesDialogViewModel(dialogService, preferencesService, frame);
+        viewModel = new PreferencesDialogViewModel(dialogService, preferencesService);
 
         preferenceTabList.itemsProperty().setValue(viewModel.getPreferenceTabs());
 
@@ -102,7 +102,16 @@ private void initialize() {
             }
         });
 
-        preferenceTabList.getSelectionModel().selectFirst();
+        if (this.preferencesTabToSelectClass != null) {
+            Optional<PreferencesTab> tabToSelectIfExist = preferenceTabList.getItems()
+                                                                           .stream()
+                                                                           .filter(prefTab -> prefTab.getClass().equals(preferencesTabToSelectClass))
+                                                                           .findFirst();
+            tabToSelectIfExist.ifPresent(preferencesTab -> preferenceTabList.getSelectionModel().select(preferencesTab));
+        } else {
+            preferenceTabList.getSelectionModel().selectFirst();
+        }
+
         new ViewModelListCellFactory<PreferencesTab>()
                 .withText(PreferencesTab::getTabName)
                 .install(preferenceTabList);
diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java b/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java
index 35f6a9db00b..3647a845a61 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java
@@ -13,7 +13,6 @@
 import org.jabref.gui.AbstractViewModel;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.Globals;
-import org.jabref.gui.JabRefFrame;
 import org.jabref.gui.preferences.autocompletion.AutoCompletionTab;
 import org.jabref.gui.preferences.citationkeypattern.CitationKeyPatternTab;
 import org.jabref.gui.preferences.customentrytypes.CustomEntryTypesTab;
@@ -55,12 +54,10 @@ public class PreferencesDialogViewModel extends AbstractViewModel {
     private final DialogService dialogService;
     private final PreferencesService preferences;
     private final ObservableList<PreferencesTab> preferenceTabs;
-    private final JabRefFrame frame;
 
-    public PreferencesDialogViewModel(DialogService dialogService, PreferencesService preferences, JabRefFrame frame) {
+    public PreferencesDialogViewModel(DialogService dialogService, PreferencesService preferences) {
         this.dialogService = dialogService;
         this.preferences = preferences;
-        this.frame = frame;
 
         preferenceTabs = FXCollections.observableArrayList(
                 new GeneralTab(),
@@ -102,7 +99,7 @@ public void importPreferences() {
                      .ifPresent(file -> {
                          try {
                              preferences.importPreferences(file);
-                             updateAfterPreferenceChanges();
+                             setValues();
 
                              dialogService.showWarningDialogAndWait(Localization.lang("Import preferences"),
                                      Localization.lang("You must restart JabRef for this to come into effect."));
@@ -154,19 +151,10 @@ public void resetPreferences() {
                 dialogService.showErrorDialogAndWait(Localization.lang("Reset preferences"), ex);
             }
 
-            updateAfterPreferenceChanges();
+            setValues();
         }
     }
 
-    /**
-     * Reloads the preferences into the UI
-     */
-    private void updateAfterPreferenceChanges() {
-        setValues();
-
-        frame.getLibraryTabs().forEach(panel -> panel.getMainTable().getTableModel().refresh());
-    }
-
     /**
      * Checks if all tabs are valid
      */
@@ -203,12 +191,10 @@ public void storeAllSettings() {
                             + Localization.lang("You must restart JabRef for this to come into effect."));
         }
 
-        frame.setupAllTables();
-        frame.getGlobalSearchBar().updateHintVisibility();
         Globals.entryTypesManager = preferences.getCustomEntryTypesRepository();
         dialogService.notify(Localization.lang("Preferences recorded."));
 
-        updateAfterPreferenceChanges();
+        setValues();
     }
 
     /**
diff --git a/src/main/java/org/jabref/gui/preferences/ShowPreferencesAction.java b/src/main/java/org/jabref/gui/preferences/ShowPreferencesAction.java
index b070e914aea..ca1d59c6f8a 100644
--- a/src/main/java/org/jabref/gui/preferences/ShowPreferencesAction.java
+++ b/src/main/java/org/jabref/gui/preferences/ShowPreferencesAction.java
@@ -1,25 +1,29 @@
 package org.jabref.gui.preferences;
 
 import org.jabref.gui.DialogService;
-import org.jabref.gui.JabRefFrame;
+import org.jabref.gui.LibraryTabContainer;
 import org.jabref.gui.actions.SimpleCommand;
-import org.jabref.gui.util.TaskExecutor;
-
-import com.airhacks.afterburner.injection.Injector;
 
 public class ShowPreferencesAction extends SimpleCommand {
 
-    private final JabRefFrame jabRefFrame;
-    private final TaskExecutor taskExecutor;
+    private final LibraryTabContainer tabContainer;
+    private final Class<? extends PreferencesTab> preferencesTabToSelectClass;
+
+    private final DialogService dialogService;
+
+    public ShowPreferencesAction(LibraryTabContainer tabContainer, DialogService dialogService) {
+        this(tabContainer, null, dialogService);
+    }
 
-    public ShowPreferencesAction(JabRefFrame jabRefFrame, TaskExecutor taskExecutor) {
-        this.jabRefFrame = jabRefFrame;
-        this.taskExecutor = taskExecutor;
+    public ShowPreferencesAction(LibraryTabContainer tabContainer, Class<? extends PreferencesTab> preferencesTabToSelectClass, DialogService dialogService) {
+        this.tabContainer = tabContainer;
+        this.preferencesTabToSelectClass = preferencesTabToSelectClass;
+        this.dialogService = dialogService;
     }
 
     @Override
     public void execute() {
-        DialogService dialogService = Injector.instantiateModelOrService(DialogService.class);
-        dialogService.showCustomDialog(new PreferencesDialogView(jabRefFrame));
+        dialogService.showCustomDialog(new PreferencesDialogView(preferencesTabToSelectClass));
+        tabContainer.refresh();
     }
 }
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 85b787fd4cb..940f8cff5cc 100644
--- a/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTab.fxml
@@ -21,7 +21,9 @@
 
     <CheckBox fx:id="openOnNewEntry" text="%Open editor when a new entry is created"/>
     <CheckBox fx:id="defaultSource" text="%Show BibTeX source by default"/>
-    <CheckBox fx:id="autoLinkFilesEnabled" text="%Automatically search and show unlinked files in the entry editor"></CheckBox>
+    <CheckBox
+            fx:id="autoLinkFilesEnabled"
+            text="%Automatically search and show unlinked files in the entry editor"/>
 
     <CheckBox fx:id="enableRelatedArticlesTab" text="%Show 'Related Articles' tab"/>
     <CheckBox fx:id="acceptRecommendations" text="%Accept recommendations from Mr. DLib"
@@ -35,6 +37,7 @@
     <CheckBox fx:id="allowIntegerEdition" text="%Allow integers in 'edition' field in BibTeX mode"/>
     <CheckBox fx:id="journalPopupEnabled" text="%Fetch journal information online to show"/>
     <CheckBox fx:id="enableSciteTab" text="%Show 'Scite' tab"/>
+    <CheckBox fx:id="showUserCommentsField" text="%Show user comments field"/>
 
     <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 b2bf2b93d4d..5e5d35cf228 100644
--- a/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTab.java
+++ b/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTab.java
@@ -29,6 +29,7 @@ public class EntryEditorTab extends AbstractPreferenceTabView<EntryEditorTabView
     @FXML private CheckBox journalPopupEnabled;
     @FXML private CheckBox autoLinkFilesEnabled;
     @FXML private CheckBox enableSciteTab;
+    @FXML private CheckBox showUserCommentsField;
 
     @FXML private Button generalFieldsHelp;
     @FXML private TextArea fieldsTextArea;
@@ -59,6 +60,7 @@ public void initialize() {
         journalPopupEnabled.selectedProperty().bindBidirectional(viewModel.journalPopupProperty());
         autoLinkFilesEnabled.selectedProperty().bindBidirectional(viewModel.autoLinkFilesEnabledProperty());
         enableSciteTab.selectedProperty().bindBidirectional(viewModel.enableSciteTabProperty());
+        showUserCommentsField.selectedProperty().bindBidirectional(viewModel.showUserCommentsProperty());
 
         fieldsTextArea.textProperty().bindBidirectional(viewModel.fieldsProperty());
 
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 b31dcb12582..e520a4fdeb0 100644
--- a/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTabViewModel.java
@@ -32,6 +32,8 @@ public class EntryEditorTabViewModel implements PreferenceTabViewModel {
     private final BooleanProperty autoLinkEnabledProperty = new SimpleBooleanProperty();
     private final BooleanProperty enableSciteTabProperty = new SimpleBooleanProperty();
 
+    private final BooleanProperty showUserCommentsProperty = new SimpleBooleanProperty();
+
     private final StringProperty fieldsProperty = new SimpleStringProperty();
 
     private final DialogService dialogService;
@@ -61,6 +63,7 @@ public void setValues() {
         journalPopupProperty.setValue(entryEditorPreferences.shouldEnableJournalPopup() == EntryEditorPreferences.JournalPopupEnabled.ENABLED);
         autoLinkEnabledProperty.setValue(entryEditorPreferences.autoLinkFilesEnabled());
         enableSciteTabProperty.setValue(entryEditorPreferences.shouldShowSciteTab());
+        showUserCommentsProperty.setValue(entryEditorPreferences.shouldShowUserCommentsFields());
 
         setFields(entryEditorPreferences.getEntryEditorTabs());
     }
@@ -98,6 +101,7 @@ public void storeSettings() {
         // entryEditorPreferences.setDividerPosition();
         entryEditorPreferences.setAutoLinkFilesEnabled(autoLinkEnabledProperty.getValue());
         entryEditorPreferences.setShouldShowSciteTab(enableSciteTabProperty.getValue());
+        entryEditorPreferences.setShowUserCommentsFields(showUserCommentsProperty.getValue());
 
         Map<String, Set<Field>> customTabsMap = new LinkedHashMap<>();
         String[] lines = fieldsProperty.get().split("\n");
@@ -173,4 +177,8 @@ public BooleanProperty autoLinkFilesEnabledProperty() {
     public BooleanProperty enableSciteTabProperty() {
         return enableSciteTabProperty;
     }
+
+    public BooleanProperty showUserCommentsProperty() {
+        return this.showUserCommentsProperty;
+    }
 }
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 f8e7f96993c..365b7b694d0 100644
--- a/src/main/java/org/jabref/gui/preferences/external/ExternalTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/external/ExternalTabViewModel.java
@@ -22,6 +22,7 @@
 import org.jabref.gui.push.PushToEmacs;
 import org.jabref.gui.util.FileDialogConfiguration;
 import org.jabref.logic.l10n.Localization;
+import org.jabref.logic.push.CitationCommandString;
 import org.jabref.model.strings.StringUtil;
 import org.jabref.preferences.ExternalApplicationsPreferences;
 import org.jabref.preferences.PreferencesService;
@@ -97,7 +98,8 @@ public void setValues() {
                 PushToApplications.getApplicationByName(initialPushToApplicationPreferences.getActiveApplicationName(), dialogService, preferences)
                                   .orElse(new PushToEmacs(dialogService, preferences)));
 
-        citeCommandProperty.setValue(initialExternalApplicationPreferences.getCiteCommand());
+        citeCommandProperty.setValue(initialExternalApplicationPreferences.getCiteCommand().toString());
+
         useCustomTerminalProperty.setValue(initialExternalApplicationPreferences.useCustomTerminal());
         customTerminalCommandProperty.setValue(initialExternalApplicationPreferences.getCustomTerminalCommand());
         useCustomFileBrowserProperty.setValue(initialExternalApplicationPreferences.useCustomFileBrowser());
@@ -110,7 +112,7 @@ public void storeSettings() {
         ExternalApplicationsPreferences externalPreferences = preferences.getExternalApplicationsPreferences();
         externalPreferences.setEMailSubject(eMailReferenceSubjectProperty.getValue());
         externalPreferences.setAutoOpenEmailAttachmentsFolder(autoOpenAttachedFoldersProperty.getValue());
-        externalPreferences.setCiteCommand(citeCommandProperty.getValue());
+        externalPreferences.setCiteCommand(CitationCommandString.from(citeCommandProperty.getValue()));
         externalPreferences.setUseCustomTerminal(useCustomTerminalProperty.getValue());
         externalPreferences.setCustomTerminalCommand(customTerminalCommandProperty.getValue());
         externalPreferences.setUseCustomFileBrowser(useCustomFileBrowserProperty.getValue());
@@ -229,6 +231,6 @@ public StringProperty customFileBrowserCommandProperty() {
     }
 
     public void resetCiteCommandToDefault() {
-        this.citeCommandProperty.setValue(preferences.getExternalApplicationsPreferences().getDefaultCiteCommand());
+        this.citeCommandProperty.setValue(preferences.getExternalApplicationsPreferences().getDefaultCiteCommand().toString());
     }
 }
diff --git a/src/main/java/org/jabref/gui/preferences/externalfiletypes/EditExternalFileTypeEntryDialog.java b/src/main/java/org/jabref/gui/preferences/externalfiletypes/EditExternalFileTypeEntryDialog.java
index e5aa3e55c03..d0dc110b581 100644
--- a/src/main/java/org/jabref/gui/preferences/externalfiletypes/EditExternalFileTypeEntryDialog.java
+++ b/src/main/java/org/jabref/gui/preferences/externalfiletypes/EditExternalFileTypeEntryDialog.java
@@ -1,5 +1,7 @@
 package org.jabref.gui.preferences.externalfiletypes;
 
+import javafx.application.Platform;
+import javafx.collections.ObservableList;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
@@ -13,9 +15,11 @@
 import org.jabref.gui.desktop.os.NativeDesktop;
 import org.jabref.gui.util.BaseDialog;
 import org.jabref.gui.util.FileDialogConfiguration;
+import org.jabref.gui.util.IconValidationDecorator;
 import org.jabref.logic.util.OS;
 
 import com.airhacks.afterburner.views.ViewLoader;
+import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
 import jakarta.inject.Inject;
 
 public class EditExternalFileTypeEntryDialog extends BaseDialog<Void> {
@@ -33,20 +37,26 @@ public class EditExternalFileTypeEntryDialog extends BaseDialog<Void> {
 
     private final NativeDesktop nativeDesktop = OS.getNativeDesktop();
     private final FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder().withInitialDirectory(nativeDesktop.getApplicationDirectory()).build();
-
     private final ExternalFileTypeItemViewModel item;
 
+    private final ObservableList<ExternalFileTypeItemViewModel> fileTypes;
     private EditExternalFileTypeViewModel viewModel;
 
-    public EditExternalFileTypeEntryDialog(ExternalFileTypeItemViewModel item, String dialogTitle) {
-        this.item = item;
+    private final ControlsFxVisualizer visualizer = new ControlsFxVisualizer();
 
+    public EditExternalFileTypeEntryDialog(ExternalFileTypeItemViewModel item, String dialogTitle, ObservableList<ExternalFileTypeItemViewModel> fileTypes) {
+        this.item = item;
+        this.fileTypes = fileTypes;
         this.setTitle(dialogTitle);
 
         ViewLoader.view(this)
                   .load()
                   .setAsDialogPane(this);
 
+        getDialogPane().getButtonTypes().setAll(ButtonType.OK, ButtonType.CANCEL);
+
+        final Button confirmDialogButton = (Button) getDialogPane().lookupButton(ButtonType.OK);
+        confirmDialogButton.disableProperty().bind(viewModel.validationStatus().validProperty().not());
         this.setResultConverter(button -> {
             if (button == ButtonType.OK) {
                 viewModel.storeSettings();
@@ -57,7 +67,9 @@ public EditExternalFileTypeEntryDialog(ExternalFileTypeItemViewModel item, Strin
 
     @FXML
     public void initialize() {
-        viewModel = new EditExternalFileTypeViewModel(item);
+        visualizer.setDecoration(new IconValidationDecorator());
+
+        viewModel = new EditExternalFileTypeViewModel(item, fileTypes);
 
         icon.setGraphic(viewModel.getIcon());
 
@@ -65,11 +77,16 @@ public void initialize() {
         customApplication.selectedProperty().bindBidirectional(viewModel.customApplicationSelectedProperty());
         selectedApplication.disableProperty().bind(viewModel.defaultApplicationSelectedProperty());
         btnBrowse.disableProperty().bind(viewModel.defaultApplicationSelectedProperty());
-
         extension.textProperty().bindBidirectional(viewModel.extensionProperty());
         name.textProperty().bindBidirectional(viewModel.nameProperty());
         mimeType.textProperty().bindBidirectional(viewModel.mimeTypeProperty());
         selectedApplication.textProperty().bindBidirectional(viewModel.selectedApplicationProperty());
+
+        Platform.runLater(() -> {
+            visualizer.initVisualization(viewModel.extensionValidation(), extension, true);
+            visualizer.initVisualization(viewModel.nameValidation(), name, true);
+            visualizer.initVisualization(viewModel.mimeTypeValidation(), mimeType, true);
+        });
     }
 
     @FXML
diff --git a/src/main/java/org/jabref/gui/preferences/externalfiletypes/EditExternalFileTypeViewModel.java b/src/main/java/org/jabref/gui/preferences/externalfiletypes/EditExternalFileTypeViewModel.java
index 7a095e76b94..e56aa5e5114 100644
--- a/src/main/java/org/jabref/gui/preferences/externalfiletypes/EditExternalFileTypeViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/externalfiletypes/EditExternalFileTypeViewModel.java
@@ -4,21 +4,41 @@
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
+import javafx.collections.ObservableList;
 import javafx.scene.Node;
 
+import org.jabref.logic.l10n.Localization;
+import org.jabref.model.strings.StringUtil;
+
+import de.saxsys.mvvmfx.utils.validation.CompositeValidator;
+import de.saxsys.mvvmfx.utils.validation.FunctionBasedValidator;
+import de.saxsys.mvvmfx.utils.validation.ValidationMessage;
+import de.saxsys.mvvmfx.utils.validation.ValidationStatus;
+import de.saxsys.mvvmfx.utils.validation.Validator;
+
 public class EditExternalFileTypeViewModel {
     private final ExternalFileTypeItemViewModel fileTypeViewModel;
-
     private final StringProperty nameProperty = new SimpleStringProperty("");
     private final StringProperty mimeTypeProperty = new SimpleStringProperty("");
     private final StringProperty extensionProperty = new SimpleStringProperty("");
     private final StringProperty selectedApplicationProperty = new SimpleStringProperty("");
     private final BooleanProperty defaultApplicationSelectedProperty = new SimpleBooleanProperty(false);
     private final BooleanProperty customApplicationSelectedProperty = new SimpleBooleanProperty(false);
-
-    public EditExternalFileTypeViewModel(ExternalFileTypeItemViewModel fileTypeViewModel) {
+    private final ObservableList<ExternalFileTypeItemViewModel> fileTypes;
+    private final String originalExtension;
+    private final String originalName;
+    private final String originalMimeType;
+    private CompositeValidator extensionValidator;
+    private CompositeValidator nameValidator;
+    private CompositeValidator mimeTypeValidator;
+    private CompositeValidator validator;
+
+    public EditExternalFileTypeViewModel(ExternalFileTypeItemViewModel fileTypeViewModel, ObservableList<ExternalFileTypeItemViewModel> fileTypes) {
         this.fileTypeViewModel = fileTypeViewModel;
-
+        this.fileTypes = fileTypes;
+        this.originalExtension = fileTypeViewModel.extensionProperty().getValue();
+        this.originalName = fileTypeViewModel.nameProperty().getValue();
+        this.originalMimeType = fileTypeViewModel.mimetypeProperty().getValue();
         extensionProperty.setValue(fileTypeViewModel.extensionProperty().getValue());
         nameProperty.setValue(fileTypeViewModel.nameProperty().getValue());
         mimeTypeProperty.setValue(fileTypeViewModel.mimetypeProperty().getValue());
@@ -29,6 +49,92 @@ public EditExternalFileTypeViewModel(ExternalFileTypeItemViewModel fileTypeViewM
             customApplicationSelectedProperty.setValue(true);
             selectedApplicationProperty.setValue(fileTypeViewModel.applicationProperty().getValue());
         }
+
+        setupValidation();
+    }
+
+    private void setupValidation() {
+        validator = new CompositeValidator();
+        extensionValidator = new CompositeValidator();
+
+        Validator extensionisNotBlankValidator = new FunctionBasedValidator<>(
+                extensionProperty,
+                StringUtil::isNotBlank,
+                ValidationMessage.error(Localization.lang("Please enter a name for the extension."))
+        );
+        Validator sameExtensionValidator = new FunctionBasedValidator<>(
+                extensionProperty,
+                extension -> {
+                    for (ExternalFileTypeItemViewModel fileTypeItem : fileTypes) {
+                        if (extension.equalsIgnoreCase(fileTypeItem.extensionProperty().get()) && !extension.equalsIgnoreCase(originalExtension)) {
+                            return false;
+                        }
+                    }
+                    return true;
+                },
+                ValidationMessage.error(Localization.lang("There already exists an external file type with the same extension"))
+        );
+        extensionValidator.addValidators(sameExtensionValidator, extensionisNotBlankValidator);
+
+        nameValidator = new CompositeValidator();
+        Validator sameNameValidator = new FunctionBasedValidator<>(
+                nameProperty,
+                name -> {
+                    for (ExternalFileTypeItemViewModel fileTypeItem : fileTypes) {
+                        if (name.equalsIgnoreCase(fileTypeItem.nameProperty().get()) && !name.equalsIgnoreCase(originalName)) {
+                            return false;
+                        }
+                    }
+                    return true;
+                },
+                ValidationMessage.error(Localization.lang("There already exists an external file type with the same name"))
+        );
+
+        Validator nameIsNotBlankValidator = new FunctionBasedValidator<>(
+                nameProperty,
+                StringUtil::isNotBlank,
+                ValidationMessage.error(Localization.lang("Please enter a name."))
+        );
+        nameValidator.addValidators(sameNameValidator, nameIsNotBlankValidator);
+
+        mimeTypeValidator = new CompositeValidator();
+        Validator mimeTypeIsNotBlankValidator = new FunctionBasedValidator<>(
+                mimeTypeProperty,
+                StringUtil::isNotBlank,
+                ValidationMessage.error(Localization.lang("Please enter a name for the MIME type."))
+        );
+
+        Validator sameMimeTypeValidator = new FunctionBasedValidator<>(
+                mimeTypeProperty,
+                mimeType -> {
+                    for (ExternalFileTypeItemViewModel fileTypeItem : fileTypes) {
+                        if (mimeType.equalsIgnoreCase(fileTypeItem.mimetypeProperty().get()) && !mimeType.equalsIgnoreCase(originalMimeType)) {
+                            return false;
+                        }
+                    }
+                    return true;
+                },
+                ValidationMessage.error(Localization.lang("There already exists an external file type with the same MIME type"))
+        );
+        mimeTypeValidator.addValidators(sameMimeTypeValidator, mimeTypeIsNotBlankValidator);
+
+        validator.addValidators(extensionValidator, sameExtensionValidator, nameValidator, sameNameValidator, mimeTypeValidator, sameMimeTypeValidator);
+    }
+
+    public ValidationStatus validationStatus() {
+        return validator.getValidationStatus();
+    }
+
+    public ValidationStatus extensionValidation() {
+        return extensionValidator.getValidationStatus();
+    }
+
+    public ValidationStatus mimeTypeValidation() {
+        return mimeTypeValidator.getValidationStatus();
+    }
+
+    public ValidationStatus nameValidation() {
+        return nameValidator.getValidationStatus();
     }
 
     public Node getIcon() {
@@ -59,6 +165,10 @@ public BooleanProperty customApplicationSelectedProperty() {
         return customApplicationSelectedProperty;
     }
 
+    public BooleanProperty validExtensionTypeProperty() {
+        return defaultApplicationSelectedProperty;
+    }
+
     public void storeSettings() {
         fileTypeViewModel.nameProperty().setValue(nameProperty.getValue().trim());
         fileTypeViewModel.mimetypeProperty().setValue(mimeTypeProperty.getValue().trim());
diff --git a/src/main/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypesTab.java b/src/main/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypesTab.java
index b131484ddc3..4e5913c6d2a 100644
--- a/src/main/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypesTab.java
+++ b/src/main/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypesTab.java
@@ -78,7 +78,7 @@ public void initialize() {
                 .install(fileTypesTableIconColumn);
         new ValueTableCellFactory<ExternalFileTypeItemViewModel, Boolean>()
                 .withGraphic(none -> IconTheme.JabRefIcons.EDIT.getGraphicNode())
-                .withOnMouseClickedEvent((type, none) -> event -> viewModel.edit(type))
+                .withOnMouseClickedEvent((type, none) -> event -> editType(type))
                 .install(fileTypesTableEditColumn);
         new ValueTableCellFactory<ExternalFileTypeItemViewModel, Boolean>()
                 .withGraphic(none -> IconTheme.JabRefIcons.DELETE_ENTRY.getGraphicNode())
@@ -86,11 +86,19 @@ public void initialize() {
                 .install(fileTypesTableDeleteColumn);
     }
 
+    private void editType(ExternalFileTypeItemViewModel type) {
+        if (viewModel.edit(type)) {
+            fileTypesTable.getSelectionModel().selectLast();
+            fileTypesTable.scrollTo(viewModel.getFileTypes().size() - 1);
+        }
+    }
+
     @FXML
     private void addNewType() {
-        viewModel.addNewType();
-        fileTypesTable.getSelectionModel().selectLast();
-        fileTypesTable.scrollTo(viewModel.getFileTypes().size() - 1);
+        if (viewModel.addNewType()) {
+            fileTypesTable.getSelectionModel().selectLast();
+            fileTypesTable.scrollTo(viewModel.getFileTypes().size() - 1);
+        }
     }
 
     @FXML
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 b61818105f0..faacc66b978 100644
--- a/src/main/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypesTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypesTabViewModel.java
@@ -8,14 +8,19 @@
 import javafx.collections.ObservableList;
 
 import org.jabref.gui.DialogService;
+import org.jabref.gui.exporter.CreateModifyExporterDialogViewModel;
 import org.jabref.gui.externalfiletype.ExternalFileType;
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.preferences.PreferenceTabViewModel;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.preferences.FilePreferences;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 public class ExternalFileTypesTabViewModel implements PreferenceTabViewModel {
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(CreateModifyExporterDialogViewModel.class);
     private final ObservableList<ExternalFileTypeItemViewModel> fileTypes = FXCollections.observableArrayList();
 
     private final FilePreferences filePreferences;
@@ -54,25 +59,69 @@ public void resetToDefaults() {
         fileTypes.sort(Comparator.comparing(ExternalFileTypeItemViewModel::getName));
     }
 
-    public void addNewType() {
+    public boolean addNewType() {
         ExternalFileTypeItemViewModel item = new ExternalFileTypeItemViewModel();
-        fileTypes.add(item);
         showEditDialog(item, Localization.lang("Add new file type"));
+
+        if (!isValidExternalFileType(item)) {
+            return false;
+        }
+
+        fileTypes.add(item);
+        return true;
     }
 
     public ObservableList<ExternalFileTypeItemViewModel> getFileTypes() {
         return fileTypes;
     }
 
-    private void showEditDialog(ExternalFileTypeItemViewModel item, String dialogTitle) {
-        dialogService.showCustomDialogAndWait(new EditExternalFileTypeEntryDialog(item, dialogTitle));
+    protected void showEditDialog(ExternalFileTypeItemViewModel item, String dialogTitle) {
+        dialogService.showCustomDialogAndWait(new EditExternalFileTypeEntryDialog(item, dialogTitle, fileTypes));
     }
 
-    public void edit(ExternalFileTypeItemViewModel type) {
-        showEditDialog(type, Localization.lang("Edit file type"));
+    public boolean edit(ExternalFileTypeItemViewModel type) {
+        ExternalFileTypeItemViewModel typeToModify = new ExternalFileTypeItemViewModel(type.toExternalFileType());
+        showEditDialog(typeToModify, Localization.lang("Edit file type"));
+
+        if (!isValidExternalFileType(typeToModify)) {
+            return false;
+        }
+
+        fileTypes.remove(type);
+        fileTypes.add(typeToModify);
+        return true;
     }
 
     public void remove(ExternalFileTypeItemViewModel type) {
         fileTypes.remove(type);
     }
+
+    public boolean isValidExternalFileType(ExternalFileTypeItemViewModel item) {
+        if (withEmptyValue(item)) {
+            LOGGER.debug("One of the fields is empty or invalid.");
+            return false;
+        }
+
+        if (!isUniqueExtension(item)) {
+            LOGGER.debug("File Extension exists already.");
+            return false;
+        }
+
+        return true;
+    }
+
+    private boolean withEmptyValue(ExternalFileTypeItemViewModel item) {
+        return item.getName().isEmpty() || item.extensionProperty().get().isEmpty() || item.mimetypeProperty().get().isEmpty();
+    }
+
+    private boolean isUniqueExtension(ExternalFileTypeItemViewModel item) {
+        // check extension need to be unique in the list
+        String newExt = item.extensionProperty().get();
+        for (ExternalFileTypeItemViewModel fileTypeItem : fileTypes) {
+            if (newExt.equalsIgnoreCase(fileTypeItem.extensionProperty().get())) {
+                return false;
+            }
+        }
+        return true;
+    }
 }
diff --git a/src/main/java/org/jabref/gui/preferences/general/GeneralTabViewModel.java b/src/main/java/org/jabref/gui/preferences/general/GeneralTabViewModel.java
index d47bb33183f..810bfdc50e3 100644
--- a/src/main/java/org/jabref/gui/preferences/general/GeneralTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/general/GeneralTabViewModel.java
@@ -57,7 +57,7 @@ public class GeneralTabViewModel implements PreferenceTabViewModel {
             new SpinnerValueFactory.IntegerSpinnerValueFactory(9, Integer.MAX_VALUE);
 
     private final ReadOnlyListProperty<Language> languagesListProperty =
-            new ReadOnlyListWrapper<>(FXCollections.observableArrayList(Language.values()));
+            new ReadOnlyListWrapper<>(FXCollections.observableArrayList(Language.getSorted()));
     private final ObjectProperty<Language> selectedLanguageProperty = new SimpleObjectProperty<>();
 
     private final ReadOnlyListProperty<ThemeTypes> themesListProperty =
diff --git a/src/main/java/org/jabref/gui/preview/PreviewPanel.java b/src/main/java/org/jabref/gui/preview/PreviewPanel.java
index a2416d43098..e2c6d3c4ada 100644
--- a/src/main/java/org/jabref/gui/preview/PreviewPanel.java
+++ b/src/main/java/org/jabref/gui/preview/PreviewPanel.java
@@ -25,7 +25,7 @@
 import org.jabref.gui.theme.ThemeManager;
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.logic.pdf.search.indexing.IndexingTaskManager;
+import org.jabref.logic.pdf.search.IndexingTaskManager;
 import org.jabref.logic.preview.PreviewLayout;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
@@ -156,8 +156,8 @@ private ContextMenu createPopupMenu() {
 
     public void setEntry(BibEntry entry) {
         this.entry = entry;
-        previewView.setLayout(previewPreferences.getSelectedPreviewLayout());
         previewView.setEntry(entry);
+        previewView.setLayout(previewPreferences.getSelectedPreviewLayout());
     }
 
     public void print() {
diff --git a/src/main/java/org/jabref/gui/preview/PreviewViewer.java b/src/main/java/org/jabref/gui/preview/PreviewViewer.java
index 544275f741a..ebe6f5c08c4 100644
--- a/src/main/java/org/jabref/gui/preview/PreviewViewer.java
+++ b/src/main/java/org/jabref/gui/preview/PreviewViewer.java
@@ -1,6 +1,8 @@
 package org.jabref.gui.preview;
 
 import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
 import java.net.MalformedURLException;
 import java.util.Objects;
 import java.util.Optional;
@@ -257,13 +259,22 @@ private void update() {
 
         Number.serialExportNumber = 1; // Set entry number in case that is included in the preview layout.
 
+        final BibEntry theEntry = entry.get();
         BackgroundTask
-                .wrap(() -> layout.generatePreview(entry.get(), database))
+                .wrap(() -> layout.generatePreview(theEntry, database))
                 .onRunning(() -> setPreviewText("<i>" + Localization.lang("Processing %0", Localization.lang("Citation Style")) + ": " + layout.getDisplayName() + " ..." + "</i>"))
                 .onSuccess(this::setPreviewText)
                 .onFailure(exception -> {
                     LOGGER.error("Error while generating citation style", exception);
-                    setPreviewText(Localization.lang("Error while generating citation style"));
+
+                    // Convert stack trace to a string
+                    StringWriter stringWriter = new StringWriter();
+                    PrintWriter printWriter = new PrintWriter(stringWriter);
+                    exception.printStackTrace(printWriter);
+                    String stackTraceString = stringWriter.toString();
+
+                    // Set the preview text with the localized error message and the stack trace
+                    setPreviewText(Localization.lang("Error while generating citation style") + "\n\n" + exception.getLocalizedMessage() + "\n\nBibTeX (internal):\n" + theEntry + "\n\nStack Trace:\n" + stackTraceString);
                 })
                 .executeWith(taskExecutor);
     }
diff --git a/src/main/java/org/jabref/gui/push/AbstractPushToApplication.java b/src/main/java/org/jabref/gui/push/AbstractPushToApplication.java
index aa84c74d3e9..3de3e190432 100644
--- a/src/main/java/org/jabref/gui/push/AbstractPushToApplication.java
+++ b/src/main/java/org/jabref/gui/push/AbstractPushToApplication.java
@@ -26,9 +26,6 @@
 public abstract class AbstractPushToApplication implements PushToApplication {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(AbstractPushToApplication.class);
-    private static final String CITE_KEY1 = "key1";
-    private static final String CITE_KEY2 = "key2";
-
     protected boolean couldNotCall; // Set to true in case the command could not be executed, e.g., if the file is not found
     protected boolean couldNotPush; // Set to true in case the tunnel to the program (if one is used) does not operate
     protected boolean notDefined; // Set to true if the corresponding path is not defined in the preferences
@@ -38,36 +35,11 @@ public abstract class AbstractPushToApplication implements PushToApplication {
     protected final DialogService dialogService;
     protected final PreferencesService preferencesService;
 
-    private String cachedCiteCommand;
-    private String cachedCitePrefix;
-    private String cachedCiteSuffix;
-    private String cachedCiteDelimiter;
-
     public AbstractPushToApplication(DialogService dialogService, PreferencesService preferencesService) {
         this.dialogService = dialogService;
         this.preferencesService = preferencesService;
     }
 
-    private void dissectCiteCommand() {
-        String preferencesCiteCommand = preferencesService.getExternalApplicationsPreferences().getCiteCommand();
-
-        if (preferencesCiteCommand != null && preferencesCiteCommand.equals(cachedCiteCommand)) {
-            return;
-        }
-
-        cachedCiteCommand = preferencesCiteCommand;
-
-        int indexKey1 = cachedCiteCommand.indexOf(CITE_KEY1);
-        int indexKey2 = cachedCiteCommand.indexOf(CITE_KEY2);
-        if (indexKey1 < 0 || indexKey2 < 0 || indexKey2 < (indexKey1 + CITE_KEY1.length())) {
-            return;
-        }
-
-        cachedCitePrefix = preferencesCiteCommand.substring(0, indexKey1);
-        cachedCiteDelimiter = preferencesCiteCommand.substring(preferencesCiteCommand.lastIndexOf(CITE_KEY1) + CITE_KEY1.length(), indexKey2);
-        cachedCiteSuffix = preferencesCiteCommand.substring(preferencesCiteCommand.lastIndexOf(CITE_KEY2) + CITE_KEY2.length());
-    }
-
     @Override
     public JabRefIcon getApplicationIcon() {
         return IconTheme.JabRefIcons.APPLICATION_GENERIC;
@@ -170,18 +142,15 @@ protected String getCommandName() {
     }
 
     protected String getCitePrefix() {
-        dissectCiteCommand();
-        return cachedCitePrefix;
+        return preferencesService.getExternalApplicationsPreferences().getCiteCommand().prefix();
     }
 
     public String getDelimiter() {
-        dissectCiteCommand();
-        return cachedCiteDelimiter;
+        return preferencesService.getExternalApplicationsPreferences().getCiteCommand().delimiter();
     }
 
     protected String getCiteSuffix() {
-        dissectCiteCommand();
-        return cachedCiteSuffix;
+        return preferencesService.getExternalApplicationsPreferences().getCiteCommand().suffix();
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/search/GlobalSearchBar.java b/src/main/java/org/jabref/gui/search/GlobalSearchBar.java
index e419c97b827..8f0ce5a4a17 100644
--- a/src/main/java/org/jabref/gui/search/GlobalSearchBar.java
+++ b/src/main/java/org/jabref/gui/search/GlobalSearchBar.java
@@ -43,7 +43,7 @@
 
 import org.jabref.gui.ClipBoardManager;
 import org.jabref.gui.DialogService;
-import org.jabref.gui.JabRefFrame;
+import org.jabref.gui.LibraryTabContainer;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.autocompleter.AppendPersonNamesStrategy;
 import org.jabref.gui.autocompleter.AutoCompleteFirstNameMode;
@@ -109,7 +109,11 @@ public class GlobalSearchBar extends HBox {
     private final BooleanProperty globalSearchActive = new SimpleBooleanProperty(false);
     private GlobalSearchResultDialog globalSearchResultDialog;
 
-    public GlobalSearchBar(JabRefFrame frame, StateManager stateManager, PreferencesService preferencesService, CountingUndoManager undoManager, DialogService dialogService) {
+    public GlobalSearchBar(LibraryTabContainer tabContainer,
+                           StateManager stateManager,
+                           PreferencesService preferencesService,
+                           CountingUndoManager undoManager,
+                           DialogService dialogService) {
         super();
         this.stateManager = stateManager;
         this.preferencesService = preferencesService;
@@ -119,7 +123,7 @@ public GlobalSearchBar(JabRefFrame frame, StateManager stateManager, Preferences
 
         searchField.disableProperty().bind(needsDatabase(stateManager).not());
 
-        // fits the standard "found x entries"-message thus hinders the searchbar to jump around while searching if the frame width is too small
+        // fits the standard "found x entries"-message thus hinders the searchbar to jump around while searching if the tabContainer width is too small
         currentResults.setPrefWidth(150);
 
         searchField.setTooltip(searchFieldTooltip);
@@ -134,7 +138,7 @@ public GlobalSearchBar(JabRefFrame frame, StateManager stateManager, Preferences
                 if (keyBinding.get() == KeyBinding.CLOSE) {
                     // Clear search and select first entry, if available
                     searchField.setText("");
-                    frame.getCurrentLibraryTab().getMainTable().getSelectionModel().selectFirst();
+                    tabContainer.getCurrentLibraryTab().getMainTable().getSelectionModel().selectFirst();
                     event.consume();
                 }
             }
@@ -144,7 +148,8 @@ public GlobalSearchBar(JabRefFrame frame, StateManager stateManager, Preferences
                 keyBindingRepository,
                 stateManager,
                 searchField,
-                frame));
+                tabContainer,
+                undoManager));
 
         ObservableList<String> search = stateManager.getWholeSearchHistory();
         search.addListener((ListChangeListener.Change<? extends String> change) -> {
@@ -152,7 +157,8 @@ public GlobalSearchBar(JabRefFrame frame, StateManager stateManager, Preferences
                     keyBindingRepository,
                     stateManager,
                     searchField,
-                    frame));
+                    tabContainer,
+                    undoManager));
         });
 
         ClipBoardManager.addX11Support(searchField);
diff --git a/src/main/java/org/jabref/gui/search/RebuildFulltextSearchIndexAction.java b/src/main/java/org/jabref/gui/search/RebuildFulltextSearchIndexAction.java
index 4fb2a575ab6..3a686979b35 100644
--- a/src/main/java/org/jabref/gui/search/RebuildFulltextSearchIndexAction.java
+++ b/src/main/java/org/jabref/gui/search/RebuildFulltextSearchIndexAction.java
@@ -9,7 +9,8 @@
 import org.jabref.gui.util.BackgroundTask;
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.logic.pdf.search.indexing.PdfIndexer;
+import org.jabref.logic.pdf.search.PdfIndexer;
+import org.jabref.logic.pdf.search.PdfIndexerManager;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.preferences.FilePreferences;
 
@@ -74,8 +75,8 @@ private void rebuildIndex() {
             return;
         }
         try {
-            currentLibraryTab.get().getIndexingTaskManager().createIndex(PdfIndexer.of(databaseContext, filePreferences));
-            currentLibraryTab.get().getIndexingTaskManager().updateIndex(PdfIndexer.of(databaseContext, filePreferences), databaseContext);
+            PdfIndexer indexer = PdfIndexerManager.getIndexer(databaseContext, filePreferences);
+            currentLibraryTab.get().getIndexingTaskManager().rebuildIndex(indexer);
         } catch (IOException e) {
             dialogService.notify(Localization.lang("Failed to access fulltext search index"));
             LOGGER.error("Failed to access fulltext search index", e);
diff --git a/src/main/java/org/jabref/gui/search/SearchFieldRightClickMenu.java b/src/main/java/org/jabref/gui/search/SearchFieldRightClickMenu.java
index 5839619b881..68b5f58e6d3 100644
--- a/src/main/java/org/jabref/gui/search/SearchFieldRightClickMenu.java
+++ b/src/main/java/org/jabref/gui/search/SearchFieldRightClickMenu.java
@@ -1,11 +1,13 @@
 package org.jabref.gui.search;
 
+import javax.swing.undo.UndoManager;
+
 import javafx.scene.control.ContextMenu;
 import javafx.scene.control.Menu;
 import javafx.scene.control.MenuItem;
 import javafx.scene.control.SeparatorMenuItem;
 
-import org.jabref.gui.JabRefFrame;
+import org.jabref.gui.LibraryTabContainer;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.ActionFactory;
 import org.jabref.gui.actions.SimpleCommand;
@@ -20,21 +22,22 @@ public class SearchFieldRightClickMenu {
     public static ContextMenu create(KeyBindingRepository keyBindingRepository,
                                      StateManager stateManager,
                                      CustomTextField searchField,
-                                     JabRefFrame frame) {
+                                     LibraryTabContainer tabContainer,
+                                     UndoManager undoManager) {
         ActionFactory factory = new ActionFactory(keyBindingRepository);
         ContextMenu contextMenu = new ContextMenu();
 
         contextMenu.getItems().addAll(
-                factory.createMenuItem(StandardActions.UNDO, new EditAction(StandardActions.UNDO, frame, stateManager)),
-                factory.createMenuItem(StandardActions.REDO, new EditAction(StandardActions.REDO, frame, stateManager)),
-                factory.createMenuItem(StandardActions.CUT, new EditAction(StandardActions.CUT, frame, stateManager)),
-                factory.createMenuItem(StandardActions.COPY, new EditAction(StandardActions.COPY, frame, stateManager)),
-                factory.createMenuItem(StandardActions.PASTE, new EditAction(StandardActions.PASTE, frame, stateManager)),
-                factory.createMenuItem(StandardActions.DELETE, new EditAction(StandardActions.DELETE, frame, stateManager)),
+                factory.createMenuItem(StandardActions.UNDO, new EditAction(StandardActions.UNDO, tabContainer::getCurrentLibraryTab, stateManager, undoManager)),
+                factory.createMenuItem(StandardActions.REDO, new EditAction(StandardActions.REDO, tabContainer::getCurrentLibraryTab, stateManager, undoManager)),
+                factory.createMenuItem(StandardActions.CUT, new EditAction(StandardActions.CUT, tabContainer::getCurrentLibraryTab, stateManager, undoManager)),
+                factory.createMenuItem(StandardActions.COPY, new EditAction(StandardActions.COPY, tabContainer::getCurrentLibraryTab, stateManager, undoManager)),
+                factory.createMenuItem(StandardActions.PASTE, new EditAction(StandardActions.PASTE, tabContainer::getCurrentLibraryTab, stateManager, undoManager)),
+                factory.createMenuItem(StandardActions.DELETE, new EditAction(StandardActions.DELETE, tabContainer::getCurrentLibraryTab, stateManager, undoManager)),
 
                 new SeparatorMenuItem(),
 
-                factory.createMenuItem(StandardActions.SELECT_ALL, new EditAction(StandardActions.SELECT_ALL, null, stateManager)),
+                factory.createMenuItem(StandardActions.SELECT_ALL, new EditAction(StandardActions.SELECT_ALL, null, stateManager, undoManager)),
                 createSearchFromHistorySubMenu(factory, stateManager, searchField)
         );
 
diff --git a/src/main/java/org/jabref/gui/shared/ConnectToSharedDatabaseCommand.java b/src/main/java/org/jabref/gui/shared/ConnectToSharedDatabaseCommand.java
index 9a79e714a65..16b11a60cae 100644
--- a/src/main/java/org/jabref/gui/shared/ConnectToSharedDatabaseCommand.java
+++ b/src/main/java/org/jabref/gui/shared/ConnectToSharedDatabaseCommand.java
@@ -1,25 +1,24 @@
 package org.jabref.gui.shared;
 
 import org.jabref.gui.DialogService;
-import org.jabref.gui.JabRefFrame;
+import org.jabref.gui.LibraryTabContainer;
 import org.jabref.gui.actions.SimpleCommand;
 
-import com.airhacks.afterburner.injection.Injector;
-
 /**
  * Opens a shared database.
  */
 public class ConnectToSharedDatabaseCommand extends SimpleCommand {
 
-    private final JabRefFrame jabRefFrame;
+    private final LibraryTabContainer tabContainer;
+    private final DialogService dialogService;
 
-    public ConnectToSharedDatabaseCommand(JabRefFrame jabRefFrame) {
-        this.jabRefFrame = jabRefFrame;
+    public ConnectToSharedDatabaseCommand(LibraryTabContainer tabContainer, DialogService dialogService) {
+        this.tabContainer = tabContainer;
+        this.dialogService = dialogService;
     }
 
     @Override
     public void execute() {
-        DialogService dialogService = Injector.instantiateModelOrService(DialogService.class);
-        dialogService.showCustomDialogAndWait(new SharedDatabaseLoginDialogView(jabRefFrame));
+        dialogService.showCustomDialogAndWait(new SharedDatabaseLoginDialogView(tabContainer));
     }
 }
diff --git a/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogView.java b/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogView.java
index a3307e7dad4..b43c748cfc0 100644
--- a/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogView.java
+++ b/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogView.java
@@ -13,7 +13,7 @@
 import javafx.scene.control.TextField;
 
 import org.jabref.gui.DialogService;
-import org.jabref.gui.JabRefFrame;
+import org.jabref.gui.LibraryTabContainer;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.util.BaseDialog;
 import org.jabref.gui.util.ControlHelper;
@@ -56,12 +56,12 @@ public class SharedDatabaseLoginDialogView extends BaseDialog<Void> {
     @Inject private UndoManager undoManager;
     @Inject private TaskExecutor taskExecutor;
 
-    private final JabRefFrame frame;
+    private final LibraryTabContainer tabContainer;
     private SharedDatabaseLoginDialogViewModel viewModel;
     private final ControlsFxVisualizer visualizer = new ControlsFxVisualizer();
 
-    public SharedDatabaseLoginDialogView(JabRefFrame frame) {
-        this.frame = frame;
+    public SharedDatabaseLoginDialogView(LibraryTabContainer tabContainer) {
+        this.tabContainer = tabContainer;
         this.setTitle(Localization.lang("Connect to shared database"));
 
         ViewLoader.view(this)
@@ -89,7 +89,7 @@ private void initialize() {
         visualizer.setDecoration(new IconValidationDecorator());
 
         viewModel = new SharedDatabaseLoginDialogViewModel(
-                frame,
+                tabContainer,
                 dialogService,
                 preferencesService,
                 stateManager,
diff --git a/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogViewModel.java b/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogViewModel.java
index 0e13f6bd2a4..6505d7ca028 100644
--- a/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogViewModel.java
@@ -24,8 +24,8 @@
 import org.jabref.gui.AbstractViewModel;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.Globals;
-import org.jabref.gui.JabRefFrame;
 import org.jabref.gui.LibraryTab;
+import org.jabref.gui.LibraryTabContainer;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.exporter.SaveDatabaseAction;
 import org.jabref.gui.help.HelpAction;
@@ -77,7 +77,7 @@ public class SharedDatabaseLoginDialogViewModel extends AbstractViewModel {
     private final StringProperty keyStorePasswordProperty = new SimpleStringProperty("");
     private final StringProperty serverTimezone = new SimpleStringProperty("");
 
-    private final JabRefFrame frame;
+    private final LibraryTabContainer tabContainer;
     private final DialogService dialogService;
     private final PreferencesService preferencesService;
     private final SharedDatabasePreferences sharedDatabasePreferences = new SharedDatabasePreferences();
@@ -95,7 +95,7 @@ public class SharedDatabaseLoginDialogViewModel extends AbstractViewModel {
     private final Validator keystoreValidator;
     private final CompositeValidator formValidator;
 
-    public SharedDatabaseLoginDialogViewModel(JabRefFrame frame,
+    public SharedDatabaseLoginDialogViewModel(LibraryTabContainer tabContainer,
                                               DialogService dialogService,
                                               PreferencesService preferencesService,
                                               StateManager stateManager,
@@ -103,7 +103,7 @@ public SharedDatabaseLoginDialogViewModel(JabRefFrame frame,
                                               FileUpdateMonitor fileUpdateMonitor,
                                               UndoManager undoManager,
                                               TaskExecutor taskExecutor) {
-        this.frame = frame;
+        this.tabContainer = tabContainer;
         this.dialogService = dialogService;
         this.preferencesService = preferencesService;
         this.stateManager = stateManager;
@@ -181,7 +181,7 @@ private boolean openSharedDatabase(DBMSConnectionProperties connectionProperties
 
         try {
             SharedDatabaseUIManager manager = new SharedDatabaseUIManager(
-                    frame,
+                    tabContainer,
                     dialogService,
                     preferencesService,
                     stateManager,
@@ -290,7 +290,7 @@ private void applyPreferences() {
     }
 
     private boolean isSharedDatabaseAlreadyPresent(DBMSConnectionProperties connectionProperties) {
-        List<LibraryTab> libraryTabs = frame.getLibraryTabs();
+        List<LibraryTab> libraryTabs = tabContainer.getLibraryTabs();
         return libraryTabs.parallelStream().anyMatch(panel -> {
             BibDatabaseContext context = panel.getBibDatabaseContext();
 
diff --git a/src/main/java/org/jabref/gui/shared/SharedDatabaseUIManager.java b/src/main/java/org/jabref/gui/shared/SharedDatabaseUIManager.java
index 44d92e9c216..387b165f158 100644
--- a/src/main/java/org/jabref/gui/shared/SharedDatabaseUIManager.java
+++ b/src/main/java/org/jabref/gui/shared/SharedDatabaseUIManager.java
@@ -12,8 +12,8 @@
 import javafx.scene.control.ButtonType;
 
 import org.jabref.gui.DialogService;
-import org.jabref.gui.JabRefFrame;
 import org.jabref.gui.LibraryTab;
+import org.jabref.gui.LibraryTabContainer;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.entryeditor.EntryEditor;
 import org.jabref.gui.exporter.SaveDatabaseAction;
@@ -44,7 +44,7 @@
 
 public class SharedDatabaseUIManager {
 
-    private final JabRefFrame frame;
+    private final LibraryTabContainer tabContainer;
     private DatabaseSynchronizer dbmsSynchronizer;
     private final DialogService dialogService;
     private final PreferencesService preferencesService;
@@ -54,7 +54,7 @@ public class SharedDatabaseUIManager {
     private final UndoManager undoManager;
     private final TaskExecutor taskExecutor;
 
-    public SharedDatabaseUIManager(JabRefFrame frame,
+    public SharedDatabaseUIManager(LibraryTabContainer tabContainer,
                                    DialogService dialogService,
                                    PreferencesService preferencesService,
                                    StateManager stateManager,
@@ -62,7 +62,7 @@ public SharedDatabaseUIManager(JabRefFrame frame,
                                    FileUpdateMonitor fileUpdateMonitor,
                                    UndoManager undoManager,
                                    TaskExecutor taskExecutor) {
-        this.frame = frame;
+        this.tabContainer = tabContainer;
         this.dialogService = dialogService;
         this.preferencesService = preferencesService;
         this.stateManager = stateManager;
@@ -87,15 +87,15 @@ public void listen(ConnectionLostEvent connectionLostEvent) {
 
         if (answer.isPresent()) {
             if (answer.get().equals(reconnect)) {
-                frame.closeCurrentTab();
-                dialogService.showCustomDialogAndWait(new SharedDatabaseLoginDialogView(frame));
+                tabContainer.closeCurrentTab();
+                dialogService.showCustomDialogAndWait(new SharedDatabaseLoginDialogView(tabContainer));
             } else if (answer.get().equals(workOffline)) {
                 connectionLostEvent.getBibDatabaseContext().convertToLocalDatabase();
-                frame.getLibraryTabs().forEach(tab -> tab.updateTabTitle(tab.isModified()));
+                tabContainer.getLibraryTabs().forEach(tab -> tab.updateTabTitle(tab.isModified()));
                 dialogService.notify(Localization.lang("Working offline."));
             }
         } else {
-            frame.closeCurrentTab();
+            tabContainer.closeCurrentTab();
         }
     }
 
@@ -134,7 +134,7 @@ public void listen(UpdateRefusedEvent updateRefusedEvent) {
 
     @Subscribe
     public void listen(SharedEntriesNotPresentEvent event) {
-        LibraryTab libraryTab = frame.getCurrentLibraryTab();
+        LibraryTab libraryTab = tabContainer.getCurrentLibraryTab();
         EntryEditor entryEditor = libraryTab.getEntryEditor();
 
         libraryTab.getUndoManager().addEdit(new UndoableRemoveEntries(libraryTab.getDatabase(), event.getBibEntries()));
@@ -173,7 +173,7 @@ public LibraryTab openNewSharedDatabaseTab(DBMSConnectionProperties dbmsConnecti
 
         LibraryTab libraryTab = LibraryTab.createLibraryTab(
                 bibDatabaseContext,
-                frame,
+                tabContainer,
                 dialogService,
                 preferencesService,
                 stateManager,
@@ -181,7 +181,7 @@ public LibraryTab openNewSharedDatabaseTab(DBMSConnectionProperties dbmsConnecti
                 entryTypesManager,
                 undoManager,
                 taskExecutor);
-        frame.addTab(libraryTab, true);
+        tabContainer.addTab(libraryTab, true);
         return libraryTab;
     }
 
diff --git a/src/main/java/org/jabref/gui/sidepane/SidePaneType.java b/src/main/java/org/jabref/gui/sidepane/SidePaneType.java
index 494f936bbe9..ebfd8f0d8b7 100644
--- a/src/main/java/org/jabref/gui/sidepane/SidePaneType.java
+++ b/src/main/java/org/jabref/gui/sidepane/SidePaneType.java
@@ -10,7 +10,7 @@
  * Definition of all possible components in the side pane.
  */
 public enum SidePaneType {
-    OPEN_OFFICE("OpenOffice/LibreOffice", IconTheme.JabRefIcons.FILE_OPENOFFICE, StandardActions.TOOGLE_OO),
+    OPEN_OFFICE("OpenOffice/LibreOffice", IconTheme.JabRefIcons.FILE_OPENOFFICE, StandardActions.TOGGLE_OO),
     WEB_SEARCH(Localization.lang("Web search"), IconTheme.JabRefIcons.WWW, StandardActions.TOGGLE_WEB_SEARCH),
     GROUPS(Localization.lang("Groups"), IconTheme.JabRefIcons.TOGGLE_GROUPS, StandardActions.TOGGLE_GROUPS);
 
diff --git a/src/main/java/org/jabref/gui/slr/ExistingStudySearchAction.java b/src/main/java/org/jabref/gui/slr/ExistingStudySearchAction.java
index 827a25edc25..2d174f724a3 100644
--- a/src/main/java/org/jabref/gui/slr/ExistingStudySearchAction.java
+++ b/src/main/java/org/jabref/gui/slr/ExistingStudySearchAction.java
@@ -4,7 +4,7 @@
 import java.nio.file.Path;
 
 import org.jabref.gui.DialogService;
-import org.jabref.gui.JabRefFrame;
+import org.jabref.gui.LibraryTabContainer;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.ActionHelper;
 import org.jabref.gui.actions.SimpleCommand;
@@ -35,22 +35,22 @@ public class ExistingStudySearchAction extends SimpleCommand {
 
     private final FileUpdateMonitor fileUpdateMonitor;
     private final TaskExecutor taskExecutor;
-    private final JabRefFrame frame;
+    private final LibraryTabContainer tabContainer;
     private final OpenDatabaseAction openDatabaseAction;
 
     /**
-     * @param frame Required to close the tab before the study is updated
+     * @param tabContainer Required to close the tab before the study is updated
      * @param openDatabaseAction Required to open the tab after the study is exectued
      */
     public ExistingStudySearchAction(
-            JabRefFrame frame,
+            LibraryTabContainer tabContainer,
             OpenDatabaseAction openDatabaseAction,
             DialogService dialogService,
             FileUpdateMonitor fileUpdateMonitor,
             TaskExecutor taskExecutor,
             PreferencesService preferencesService,
             StateManager stateManager) {
-        this(frame,
+        this(tabContainer,
                 openDatabaseAction,
                 dialogService,
                 fileUpdateMonitor,
@@ -61,7 +61,7 @@ public ExistingStudySearchAction(
     }
 
     protected ExistingStudySearchAction(
-            JabRefFrame frame,
+            LibraryTabContainer tabContainer,
             OpenDatabaseAction openDatabaseAction,
             DialogService dialogService,
             FileUpdateMonitor fileUpdateMonitor,
@@ -69,7 +69,7 @@ protected ExistingStudySearchAction(
             PreferencesService preferencesService,
             StateManager stateManager,
             boolean isNew) {
-        this.frame = frame;
+        this.tabContainer = tabContainer;
         this.openDatabaseAction = openDatabaseAction;
         this.dialogService = dialogService;
         this.fileUpdateMonitor = fileUpdateMonitor;
@@ -146,6 +146,6 @@ protected void crawlPreparation(Path studyRepositoryRoot) throws IOException, Gi
         // The user focused an SLR
         // We hard close the tab
         // Future work: Properly close the tab (with saving, ...)
-        frame.closeCurrentTab();
+        tabContainer.closeCurrentTab();
     }
 }
diff --git a/src/main/java/org/jabref/gui/slr/StartNewStudyAction.java b/src/main/java/org/jabref/gui/slr/StartNewStudyAction.java
index 848d36d4cb5..a356c144989 100644
--- a/src/main/java/org/jabref/gui/slr/StartNewStudyAction.java
+++ b/src/main/java/org/jabref/gui/slr/StartNewStudyAction.java
@@ -3,9 +3,12 @@
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.Optional;
+import java.util.function.Supplier;
 
-import org.jabref.gui.JabRefFrame;
+import org.jabref.gui.DialogService;
+import org.jabref.gui.LibraryTabContainer;
 import org.jabref.gui.StateManager;
+import org.jabref.gui.importer.actions.OpenDatabaseAction;
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.crawler.StudyRepository;
 import org.jabref.logic.crawler.StudyYamlParser;
@@ -35,14 +38,16 @@ public class StartNewStudyAction extends ExistingStudySearchAction {
 
     Study newStudy;
 
-    public StartNewStudyAction(JabRefFrame frame,
+    public StartNewStudyAction(LibraryTabContainer tabContainer,
+                               Supplier<OpenDatabaseAction> openDatabaseActionSupplier,
                                FileUpdateMonitor fileUpdateMonitor,
                                TaskExecutor taskExecutor,
                                PreferencesService preferencesService,
-                               StateManager stateManager) {
-        super(frame,
-                frame.getOpenDatabaseAction(),
-                frame.getDialogService(),
+                               StateManager stateManager,
+                               DialogService dialogService) {
+        super(tabContainer,
+                openDatabaseActionSupplier.get(),
+                dialogService,
                 fileUpdateMonitor,
                 taskExecutor,
                 preferencesService,
diff --git a/src/main/java/org/jabref/gui/specialfields/SpecialFieldAction.java b/src/main/java/org/jabref/gui/specialfields/SpecialFieldAction.java
index d95cff66d47..fc256c69b56 100644
--- a/src/main/java/org/jabref/gui/specialfields/SpecialFieldAction.java
+++ b/src/main/java/org/jabref/gui/specialfields/SpecialFieldAction.java
@@ -4,11 +4,12 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.function.Supplier;
 
 import javax.swing.undo.UndoManager;
 
 import org.jabref.gui.DialogService;
-import org.jabref.gui.JabRefFrame;
+import org.jabref.gui.LibraryTab;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.ActionHelper;
 import org.jabref.gui.actions.SimpleCommand;
@@ -27,7 +28,7 @@
 public class SpecialFieldAction extends SimpleCommand {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(SpecialFieldAction.class);
-    private final JabRefFrame frame;
+    private final Supplier<LibraryTab> tabSupplier;
     private final SpecialField specialField;
     private final String value;
     private final boolean nullFieldIfValueIsTheSame;
@@ -40,7 +41,7 @@ public class SpecialFieldAction extends SimpleCommand {
     /**
      * @param nullFieldIfValueIsTheSame - false also causes that doneTextPattern has two place holders %0 for the value and %1 for the sum of entries
      */
-    public SpecialFieldAction(JabRefFrame frame,
+    public SpecialFieldAction(Supplier<LibraryTab> tabSupplier,
                               SpecialField specialField,
                               String value,
                               boolean nullFieldIfValueIsTheSame,
@@ -49,7 +50,7 @@ public SpecialFieldAction(JabRefFrame frame,
                               PreferencesService preferencesService,
                               UndoManager undoManager,
                               StateManager stateManager) {
-        this.frame = frame;
+        this.tabSupplier = tabSupplier;
         this.specialField = specialField;
         this.value = value;
         this.nullFieldIfValueIsTheSame = nullFieldIfValueIsTheSame;
@@ -79,9 +80,9 @@ public void execute() {
             }
             ce.end();
             if (ce.hasEdits()) {
-                frame.getCurrentLibraryTab().getUndoManager().addEdit(ce);
-                frame.getCurrentLibraryTab().markBaseChanged();
-                frame.getCurrentLibraryTab().updateEntryEditorIfShowing();
+                undoManager.addEdit(ce);
+                tabSupplier.get().markBaseChanged();
+                tabSupplier.get().updateEntryEditorIfShowing();
                 String outText;
                 if (nullFieldIfValueIsTheSame || value == null) {
                     outText = getTextDone(specialField, Integer.toString(bes.size()));
diff --git a/src/main/java/org/jabref/gui/specialfields/SpecialFieldMenuItemFactory.java b/src/main/java/org/jabref/gui/specialfields/SpecialFieldMenuItemFactory.java
index 2fa0a404799..47ec0ac27e4 100644
--- a/src/main/java/org/jabref/gui/specialfields/SpecialFieldMenuItemFactory.java
+++ b/src/main/java/org/jabref/gui/specialfields/SpecialFieldMenuItemFactory.java
@@ -1,6 +1,7 @@
 package org.jabref.gui.specialfields;
 
 import java.util.function.Function;
+import java.util.function.Supplier;
 
 import javax.swing.undo.UndoManager;
 
@@ -8,7 +9,7 @@
 import javafx.scene.control.MenuItem;
 
 import org.jabref.gui.DialogService;
-import org.jabref.gui.JabRefFrame;
+import org.jabref.gui.LibraryTab;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.ActionFactory;
 import org.jabref.model.entry.field.SpecialField;
@@ -20,22 +21,22 @@
 public class SpecialFieldMenuItemFactory {
     public static MenuItem getSpecialFieldSingleItem(SpecialField field,
                                                      ActionFactory factory,
-                                                     JabRefFrame frame,
+                                                     Supplier<LibraryTab> tabSupplier,
                                                      DialogService dialogService,
                                                      PreferencesService preferencesService,
                                                      UndoManager undoManager,
                                                      StateManager stateManager) {
-        SpecialFieldValueViewModel specialField = new SpecialFieldValueViewModel(field.getValues().get(0));
+        SpecialFieldValueViewModel specialField = new SpecialFieldValueViewModel(field.getValues().getFirst());
         MenuItem menuItem = factory.createMenuItem(specialField.getAction(),
                 new SpecialFieldViewModel(field, preferencesService, undoManager)
-                        .getSpecialFieldAction(field.getValues().get(0), frame, dialogService, stateManager));
+                        .getSpecialFieldAction(field.getValues().getFirst(), tabSupplier, dialogService, stateManager));
         menuItem.visibleProperty().bind(preferencesService.getSpecialFieldsPreferences().specialFieldsEnabledProperty());
         return menuItem;
     }
 
     public static Menu createSpecialFieldMenu(SpecialField field,
                                               ActionFactory factory,
-                                              JabRefFrame frame,
+                                              Supplier<LibraryTab> tabSupplier,
                                               DialogService dialogService,
                                               PreferencesService preferencesService,
                                               UndoManager undoManager,
@@ -43,7 +44,7 @@ public static Menu createSpecialFieldMenu(SpecialField field,
 
         return createSpecialFieldMenu(field, factory, preferencesService, undoManager, specialField ->
                 new SpecialFieldViewModel(field, preferencesService, undoManager)
-                        .getSpecialFieldAction(specialField.getValue(), frame, dialogService, stateManager));
+                        .getSpecialFieldAction(specialField.getValue(), tabSupplier, dialogService, stateManager));
     }
 
     public static Menu createSpecialFieldMenu(SpecialField field,
diff --git a/src/main/java/org/jabref/gui/specialfields/SpecialFieldViewModel.java b/src/main/java/org/jabref/gui/specialfields/SpecialFieldViewModel.java
index 596b1848a5a..ddda94ea1c6 100644
--- a/src/main/java/org/jabref/gui/specialfields/SpecialFieldViewModel.java
+++ b/src/main/java/org/jabref/gui/specialfields/SpecialFieldViewModel.java
@@ -3,12 +3,13 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
 import javax.swing.undo.UndoManager;
 
 import org.jabref.gui.DialogService;
-import org.jabref.gui.JabRefFrame;
+import org.jabref.gui.LibraryTab;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.Action;
 import org.jabref.gui.actions.StandardActions;
@@ -38,11 +39,11 @@ public SpecialField getField() {
     }
 
     public SpecialFieldAction getSpecialFieldAction(SpecialFieldValue value,
-                                                    JabRefFrame frame,
+                                                    Supplier<LibraryTab> tabSupplier,
                                                     DialogService dialogService,
                                                     StateManager stateManager) {
         return new SpecialFieldAction(
-                frame,
+                tabSupplier,
                 field,
                 value.getFieldValue().orElse(null),
                 // if field contains only one value, it has to be nulled, as another setting does not empty the field
@@ -55,7 +56,7 @@ public SpecialFieldAction getSpecialFieldAction(SpecialFieldValue value,
     }
 
     public JabRefIcon getIcon() {
-        return getAction().getIcon().orElse(null);
+        return getAction().getIcon().get();
     }
 
     public String getLocalization() {
diff --git a/src/main/java/org/jabref/gui/undo/UndoRedoAction.java b/src/main/java/org/jabref/gui/undo/UndoRedoAction.java
index 9515bda0654..53b68628221 100644
--- a/src/main/java/org/jabref/gui/undo/UndoRedoAction.java
+++ b/src/main/java/org/jabref/gui/undo/UndoRedoAction.java
@@ -1,10 +1,11 @@
 package org.jabref.gui.undo;
 
+import java.util.function.Supplier;
+
 import javax.swing.undo.CannotRedoException;
 import javax.swing.undo.CannotUndoException;
 
 import org.jabref.gui.DialogService;
-import org.jabref.gui.JabRefFrame;
 import org.jabref.gui.LibraryTab;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.ActionHelper;
@@ -20,12 +21,12 @@ public class UndoRedoAction extends SimpleCommand {
     private static final Logger LOGGER = LoggerFactory.getLogger(UndoRedoAction.class);
 
     private final StandardActions action;
-    private final JabRefFrame frame;
-    private DialogService dialogService;
+    private final Supplier<LibraryTab> tabSupplier;
+    private final DialogService dialogService;
 
-    public UndoRedoAction(StandardActions action, JabRefFrame frame, DialogService dialogService, StateManager stateManager) {
+    public UndoRedoAction(StandardActions action, Supplier<LibraryTab> tabSupplier, DialogService dialogService, StateManager stateManager) {
         this.action = action;
-        this.frame = frame;
+        this.tabSupplier = tabSupplier;
         this.dialogService = dialogService;
 
         // ToDo: Rework the UndoManager to something like the following, if it had a property.
@@ -35,7 +36,7 @@ public UndoRedoAction(StandardActions action, JabRefFrame frame, DialogService d
 
     @Override
     public void execute() {
-        LibraryTab libraryTab = frame.getCurrentLibraryTab();
+        LibraryTab libraryTab = this.tabSupplier.get();
         if (action == StandardActions.UNDO) {
             try {
                 libraryTab.getUndoManager().undo();
@@ -44,7 +45,7 @@ public void execute() {
             } catch (CannotUndoException ex) {
                 dialogService.notify(Localization.lang("Nothing to undo") + '.');
             }
-            frame.getCurrentLibraryTab().markChangedOrUnChanged();
+            this.tabSupplier.get().markChangedOrUnChanged();
         } else if (action == StandardActions.REDO) {
             try {
                 libraryTab.getUndoManager().redo();
diff --git a/src/main/java/org/jabref/logic/citationstyle/JabRefItemDataProvider.java b/src/main/java/org/jabref/logic/citationstyle/JabRefItemDataProvider.java
index 2310a7c6b25..85b20dd3eec 100644
--- a/src/main/java/org/jabref/logic/citationstyle/JabRefItemDataProvider.java
+++ b/src/main/java/org/jabref/logic/citationstyle/JabRefItemDataProvider.java
@@ -6,7 +6,7 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Optional;
-import java.util.Set;
+import java.util.SequencedCollection;
 import java.util.stream.Collectors;
 
 import org.jabref.logic.formatter.bibtexfields.RemoveNewlinesFormatter;
@@ -149,8 +149,13 @@ private CSLItemData bibEntryToCSLItemData(BibEntry originalBibEntry, BibDatabase
             }
         }
 
-        Set<Field> fields = new LinkedHashSet<>(entryType.map(BibEntryType::getAllFields).orElse(bibEntry.getFields()));
-        fields.addAll(bibEntry.getFields());
+        SequencedCollection<Field> fields;
+        if (entryType.isPresent()) {
+            fields = entryType.map(BibEntryType::getAllFields).map(LinkedHashSet::new).get();
+            fields.addAll(bibEntry.getFields());
+        } else {
+            fields = bibEntry.getFields();
+        }
         for (Field key : fields) {
             bibEntry.getResolvedFieldOrAlias(key, bibDatabaseContext.getDatabase())
                     .map(removeNewlinesFormatter::format)
diff --git a/src/main/java/org/jabref/logic/cleanup/FieldFormatterCleanups.java b/src/main/java/org/jabref/logic/cleanup/FieldFormatterCleanups.java
index bb9651f9145..e37274328c0 100644
--- a/src/main/java/org/jabref/logic/cleanup/FieldFormatterCleanups.java
+++ b/src/main/java/org/jabref/logic/cleanup/FieldFormatterCleanups.java
@@ -204,13 +204,16 @@ public static FieldFormatterCleanups parse(List<String> formatterMetaList) {
     }
 
     static Formatter getFormatterFromString(String formatterName) {
-        for (Formatter formatter : Formatters.getAll()) {
-            if (formatterName.equals(formatter.getKey())) {
-                return formatter;
-            }
-        }
-        LOGGER.info("Formatter {} not found.", formatterName);
-        return new IdentityFormatter();
+        return Formatters
+                .getFormatterForKey(formatterName)
+                .orElseGet(() -> {
+                    if (!"identity".equals(formatterName)) {
+                        // The identity formatter is not listed in the formatters list, but is still valid
+                        // Therefore, we log errors in other cases only
+                        LOGGER.info("Formatter {} not found.", formatterName);
+                    }
+                    return new IdentityFormatter();
+                });
     }
 
     @Override
diff --git a/src/main/java/org/jabref/logic/database/DuplicateCheck.java b/src/main/java/org/jabref/logic/database/DuplicateCheck.java
index 3090c9a8778..f2858bb46b7 100644
--- a/src/main/java/org/jabref/logic/database/DuplicateCheck.java
+++ b/src/main/java/org/jabref/logic/database/DuplicateCheck.java
@@ -154,14 +154,14 @@ private static double[] compareFieldSet(final Collection<Field> fields, final Bi
     }
 
     private static int compareSingleField(final Field field, final BibEntry one, final BibEntry two) {
-        final Optional<String> optionalStringOne = one.getField(field);
-        final Optional<String> optionalStringTwo = two.getField(field);
-        if (!optionalStringOne.isPresent()) {
-            if (!optionalStringTwo.isPresent()) {
+        final Optional<String> optionalStringOne = one.getFieldLatexFree(field);
+        final Optional<String> optionalStringTwo = two.getFieldLatexFree(field);
+        if (optionalStringOne.isEmpty()) {
+            if (optionalStringTwo.isEmpty()) {
                 return EMPTY_IN_BOTH;
             }
             return EMPTY_IN_ONE;
-        } else if (!optionalStringTwo.isPresent()) {
+        } else if (optionalStringTwo.isEmpty()) {
             return EMPTY_IN_TWO;
         }
 
diff --git a/src/main/java/org/jabref/logic/formatter/Formatters.java b/src/main/java/org/jabref/logic/formatter/Formatters.java
index ad57b7f6202..82fb14932e8 100644
--- a/src/main/java/org/jabref/logic/formatter/Formatters.java
+++ b/src/main/java/org/jabref/logic/formatter/Formatters.java
@@ -3,9 +3,11 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 import org.jabref.logic.cleanup.Formatter;
 import org.jabref.logic.formatter.bibtexfields.CleanupUrlFormatter;
@@ -40,6 +42,12 @@
 public class Formatters {
     private static final Pattern TRUNCATE_PATTERN = Pattern.compile("\\Atruncate\\d+\\z");
 
+    private static Map<String, Formatter> keyToFormatterMap;
+
+    static {
+        keyToFormatterMap = getAll().stream().collect(Collectors.toMap(Formatter::getKey, f -> f));
+    }
+
     private Formatters() {
     }
 
@@ -92,6 +100,11 @@ public static List<Formatter> getAll() {
         return all;
     }
 
+    public static Optional<Formatter> getFormatterForKey(String name) {
+        Objects.requireNonNull(name);
+        return keyToFormatterMap.containsKey(name) ? Optional.of(keyToFormatterMap.get(name)) : Optional.empty();
+    }
+
     public static Optional<Formatter> getFormatterForModifier(String modifier) {
         Objects.requireNonNull(modifier);
 
@@ -115,7 +128,7 @@ public static Optional<Formatter> getFormatterForModifier(String modifier) {
             int truncateAfter = Integer.parseInt(modifier.substring(8));
             return Optional.of(new TruncateFormatter(truncateAfter));
         } else {
-            return getAll().stream().filter(f -> f.getKey().equals(modifier)).findAny();
+            return getFormatterForKey(modifier);
         }
     }
 }
diff --git a/src/main/java/org/jabref/logic/groups/DefaultGroupsFactory.java b/src/main/java/org/jabref/logic/groups/DefaultGroupsFactory.java
index f544aff90d7..d59599165cc 100644
--- a/src/main/java/org/jabref/logic/groups/DefaultGroupsFactory.java
+++ b/src/main/java/org/jabref/logic/groups/DefaultGroupsFactory.java
@@ -3,9 +3,12 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.groups.AllEntriesGroup;
 
+/**
+ * This factory creates default groups. Currently only the allEntriesGroup is supported.
+ */
 public class DefaultGroupsFactory {
 
-    private static String ALL_ENTRIES_GROUP_DEFAULT_ICON = "ALL_ENTRIES_GROUP_ICON";
+    public static final String ALL_ENTRIES_GROUP_DEFAULT_ICON = "ALL_ENTRIES_GROUP_ICON";
 
     private DefaultGroupsFactory() {
     }
diff --git a/src/main/java/org/jabref/logic/importer/ParserResult.java b/src/main/java/org/jabref/logic/importer/ParserResult.java
index 2f134224562..c5f61ef3513 100644
--- a/src/main/java/org/jabref/logic/importer/ParserResult.java
+++ b/src/main/java/org/jabref/logic/importer/ParserResult.java
@@ -132,7 +132,7 @@ public void setInvalid(boolean invalid) {
     }
 
     public String getErrorMessage() {
-        return String.join(" ", warnings());
+        return String.join("\n", warnings());
     }
 
     public BibDatabaseContext getDatabaseContext() {
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/DoiFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/DoiFetcher.java
index 276b9883d4d..0c434ffc004 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/DoiFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/DoiFetcher.java
@@ -132,7 +132,7 @@ public Optional<BibEntry> performSearchById(String identifier) throws FetcherExc
                 URLConnection openConnection;
                 try {
                     openConnection = download.openConnection();
-                    bibtexString = URLDownload.asString(openConnection);
+                    bibtexString = URLDownload.asString(openConnection).trim();
                 } catch (IOException e) {
                     // an IOException with a nested FetcherException will be thrown when you encounter a 400x or 500x http status code
                     if (e.getCause() instanceof FetcherException fe) {
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/DoiResolution.java b/src/main/java/org/jabref/logic/importer/fetcher/DoiResolution.java
index db14fad1dc3..b7a63e3961f 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/DoiResolution.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/DoiResolution.java
@@ -40,7 +40,7 @@
 public class DoiResolution implements FulltextFetcher {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(DoiResolution.class);
-    private DOIPreferences doiPreferences;
+    private final DOIPreferences doiPreferences;
 
     public DoiResolution(DOIPreferences doiPreferences) {
         super();
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 e1b795c1062..c5c39d8136e 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/MathSciNet.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/MathSciNet.java
@@ -31,9 +31,9 @@
 import org.jabref.model.entry.field.UnknownField;
 import org.jabref.model.util.DummyFileUpdateMonitor;
 
+import kong.unirest.JsonNode;
 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;
@@ -82,22 +82,18 @@ public URL getURLForEntry(BibEntry entry) throws URISyntaxException, MalformedUR
 
     @Override
     public URL getURLForQuery(QueryNode luceneQuery) throws URISyntaxException, MalformedURLException, FetcherException {
-        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
-
+        URIBuilder uriBuilder = new URIBuilder("https://mathscinet.ams.org/mathscinet/api/publications/search");
+        uriBuilder.addParameter("query", new DefaultQueryTransformer().transformLuceneQuery(luceneQuery).orElse("")); // query
+        uriBuilder.addParameter("currentPage", "1"); // start index
+        uriBuilder.addParameter("pageSize", "100"); // page size
         return uriBuilder.build().toURL();
     }
 
     @Override
     public URL getUrlForIdentifier(String identifier) throws URISyntaxException, MalformedURLException, FetcherException {
-        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
+        URIBuilder uriBuilder = new URIBuilder("https://mathscinet.ams.org/mathscinet/api/publications/format");
+        uriBuilder.addParameter("formats", "bib");
+        uriBuilder.addParameter("ids", identifier); // identifier
 
         return uriBuilder.build().toURL();
     }
@@ -106,17 +102,25 @@ public URL getUrlForIdentifier(String identifier) throws URISyntaxException, Mal
     public Parser getParser() {
         return inputStream -> {
             String response = new BufferedReader(new InputStreamReader(inputStream)).lines().collect(Collectors.joining(OS.NEWLINE));
+            BibtexParser bibtexParser = new BibtexParser(preferences, new DummyFileUpdateMonitor());
 
             List<BibEntry> entries = new ArrayList<>();
             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));
+                // Depending on the type of query we might get either a json object or directly a json array
+                JsonNode node = new JsonNode(response);
+                if (node.isArray()) {
+                    JSONArray entriesArray = node.getArray();
+                    for (int i = 0; i < entriesArray.length(); i++) {
+                        String bibTexFormat = entriesArray.getJSONObject(i).getString("bib");
+                        entries.addAll(bibtexParser.parseEntries(bibTexFormat));
+                    }
+                } else {
+                    var element = node.getObject();
+                    JSONArray entriesArray = element.getJSONObject("all").getJSONArray("results");
+                    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);
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/SemanticScholar.java b/src/main/java/org/jabref/logic/importer/fetcher/SemanticScholar.java
index cde8ae98ece..b6f4aea83ab 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/SemanticScholar.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/SemanticScholar.java
@@ -27,6 +27,7 @@
 import org.jabref.model.entry.identifier.ArXivIdentifier;
 import org.jabref.model.entry.identifier.DOI;
 import org.jabref.model.entry.types.StandardEntryType;
+import org.jabref.model.strings.StringUtil;
 
 import kong.unirest.json.JSONArray;
 import kong.unirest.json.JSONException;
@@ -35,7 +36,6 @@
 import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
-import org.jsoup.select.Elements;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -75,13 +75,13 @@ public Optional<URL> findFullText(BibEntry entry) throws IOException, FetcherExc
                 String source = SOURCE_ID_SEARCH + doi.get().getDOI();
                 var jsoupRequest = Jsoup.connect(getURLBySource(source))
                                         .userAgent(URLDownload.USER_AGENT)
+                                        .header("Accept", "text/html; charset=utf-8")
                                         .referrer("https://www.google.com")
                                         .ignoreHttpErrors(true);
                 importerPreferences.getApiKey(getName()).ifPresent(
                         key -> jsoupRequest.header("x-api-key", key));
                 html = jsoupRequest.get();
-            } catch (
-                    IOException e) {
+            } catch (IOException e) {
                 LOGGER.info("Error for pdf lookup with DOI");
             }
         }
@@ -95,6 +95,7 @@ public Optional<URL> findFullText(BibEntry entry) throws IOException, FetcherExc
             var jsoupRequest = Jsoup.connect(getURLBySource(source))
                                     .userAgent(URLDownload.USER_AGENT)
                                     .referrer("https://www.google.com")
+                                    .header("Accept", "text/html; charset=utf-8")
                                     .ignoreHttpErrors(true);
             importerPreferences.getApiKey(getName()).ifPresent(
                     key -> jsoupRequest.header("x-api-key", key));
@@ -104,16 +105,12 @@ public Optional<URL> findFullText(BibEntry entry) throws IOException, FetcherExc
             return Optional.empty();
         }
 
-        // Retrieve PDF link from button on the webpage
-        // First checked is a drop-down menu, as it has the correct URL if present
-        // Else take the primary button
-        Elements metaLinks = html.getElementsByClass("flex-item alternate-sources__dropdown");
-        String link = metaLinks.select("a").attr("href");
-        if (link.length() < 10) {
-            metaLinks = html.getElementsByClass("flex-paper-actions__button--primary");
-            link = metaLinks.select("a").attr("href");
+        var metaTag = html.selectFirst("meta[name=citation_pdf_url]");
+        if (metaTag == null) {
+            return Optional.empty();
         }
-        if (link.isBlank()) {
+        String link = metaTag.attr("content");
+        if (StringUtil.isNullOrEmpty(link)) {
             return Optional.empty();
         }
         LOGGER.info("Fulltext PDF found @ SemanticScholar. Link: {}", link);
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/TitleFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/TitleFetcher.java
index 04bde616060..ce10b69b6da 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/TitleFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/TitleFetcher.java
@@ -36,8 +36,7 @@ public Optional<BibEntry> performSearchById(String identifier) throws FetcherExc
             return Optional.empty();
         }
 
-        BibEntry entry = new BibEntry();
-        entry.setField(StandardField.TITLE, identifier);
+        BibEntry entry = new BibEntry().withField(StandardField.TITLE, identifier);
 
         Optional<DOI> doi = WebFetchers.getIdFetcherForIdentifier(DOI.class).findIdentifier(entry);
         if (doi.isEmpty()) {
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/BibtexParser.java b/src/main/java/org/jabref/logic/importer/fileformat/BibtexParser.java
index a609d68ca8d..3057071e82a 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/BibtexParser.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/BibtexParser.java
@@ -301,6 +301,8 @@ private void parseJabRefComment(Map<String, String> meta) {
             return;
         }
 
+        // We remove all line breaks in the metadata
+        // These have been inserted to prevent too long lines when the file was saved, and are not part of the data.
         String comment = buffer.toString().replaceAll("[\\x0d\\x0a]", "");
         if (comment.substring(0, Math.min(comment.length(), MetaData.META_FLAG.length())).equals(MetaData.META_FLAG)) {
             if (comment.startsWith(MetaData.META_FLAG)) {
@@ -309,10 +311,6 @@ private void parseJabRefComment(Map<String, String> meta) {
                 int pos = rest.indexOf(':');
 
                 if (pos > 0) {
-                    // We remove all line breaks in the metadata - these
-                    // will have been inserted
-                    // to prevent too long lines when the file was
-                    // saved, and are not part of the data.
                     meta.put(rest.substring(0, pos), rest.substring(pos + 1));
 
                     // meta comments are always re-written by JabRef and not stored in the file
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 b5b733f7973..cccf64afe31 100644
--- a/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java
+++ b/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java
@@ -78,6 +78,8 @@ public MetaData parse(Map<String, String> data, Character keywordSeparator) thro
 
     /**
      * Parses the data map and changes the given {@link MetaData} instance respectively.
+     *
+     * @return the given metaData instance (which is modified, too)
      */
     public MetaData parse(MetaData metaData, Map<String, String> data, Character keywordSeparator) throws ParseException {
         List<String> defaultCiteKeyPattern = new ArrayList<>();
@@ -103,7 +105,7 @@ public MetaData parse(MetaData metaData, Map<String, String> data, Character key
                 String user = entry.getKey().substring(MetaData.FILE_DIRECTORY.length() + 1);
                 metaData.setUserFileDirectory(user, parseDirectory(entry.getValue()));
             } else if (entry.getKey().startsWith(MetaData.FILE_DIRECTORY_LATEX)) {
-                // The user name starts directly after FILE_DIRECTORY_LATEX" + '-'
+                // The user name starts directly after FILE_DIRECTORY_LATEX + '-'
                 String user = entry.getKey().substring(MetaData.FILE_DIRECTORY_LATEX.length() + 1);
                 Path path = Path.of(parseDirectory(entry.getValue())).normalize();
                 metaData.setLatexFileDirectory(user, path);
diff --git a/src/main/java/org/jabref/logic/integrity/IntegrityCheck.java b/src/main/java/org/jabref/logic/integrity/IntegrityCheck.java
index 1a4207c98c1..bcf87382a55 100644
--- a/src/main/java/org/jabref/logic/integrity/IntegrityCheck.java
+++ b/src/main/java/org/jabref/logic/integrity/IntegrityCheck.java
@@ -6,6 +6,7 @@
 
 import org.jabref.logic.citationkeypattern.CitationKeyPatternPreferences;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
+import org.jabref.logic.journals.predatory.PredatoryJournalRepository;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
@@ -22,6 +23,7 @@ public IntegrityCheck(BibDatabaseContext bibDatabaseContext,
                           FilePreferences filePreferences,
                           CitationKeyPatternPreferences citationKeyPatternPreferences,
                           JournalAbbreviationRepository journalAbbreviationRepository,
+                          PredatoryJournalRepository predatoryJournalRepository,
                           boolean allowIntegerEdition) {
         this.bibDatabaseContext = bibDatabaseContext;
 
@@ -40,7 +42,9 @@ public IntegrityCheck(BibDatabaseContext bibDatabaseContext,
                 new CitationKeyDuplicationChecker(bibDatabaseContext.getDatabase()),
                 new AmpersandChecker(),
                 new LatexIntegrityChecker(),
-                new JournalInAbbreviationListChecker(StandardField.JOURNAL, journalAbbreviationRepository)
+                new JournalInAbbreviationListChecker(StandardField.JOURNAL, journalAbbreviationRepository),
+                new PredatoryJournalChecker(predatoryJournalRepository,
+                        List.of(StandardField.JOURNAL, StandardField.PUBLISHER, StandardField.BOOKTITLE))
                 ));
         if (bibDatabaseContext.isBiblatexMode()) {
             entryCheckers.add(new UTF8Checker(bibDatabaseContext.getMetaData().getEncoding().orElse(StandardCharsets.UTF_8)));
diff --git a/src/main/java/org/jabref/logic/integrity/PredatoryJournalChecker.java b/src/main/java/org/jabref/logic/integrity/PredatoryJournalChecker.java
new file mode 100644
index 00000000000..eb4f7030ced
--- /dev/null
+++ b/src/main/java/org/jabref/logic/integrity/PredatoryJournalChecker.java
@@ -0,0 +1,29 @@
+package org.jabref.logic.integrity;
+
+import java.util.List;
+import java.util.Objects;
+
+import org.jabref.logic.journals.predatory.PredatoryJournalRepository;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.field.Field;
+
+public class PredatoryJournalChecker implements EntryChecker {
+
+    private final PredatoryJournalRepository predatoryJournalRepository;
+    private final List<Field> fieldNames;
+
+    public PredatoryJournalChecker(PredatoryJournalRepository predatoryJournalRepository, List<Field> fieldsToCheck) {
+        this.predatoryJournalRepository = Objects.requireNonNull(predatoryJournalRepository);
+        this.fieldNames = fieldsToCheck;
+    }
+
+    @Override
+    public List<IntegrityMessage> check(BibEntry entry) {
+        return entry.getFieldMap().entrySet().stream()
+                    .filter(field -> fieldNames.contains(field.getKey()))
+                    .filter(field -> predatoryJournalRepository.isKnownName(field.getValue()))
+                    .map(field -> new IntegrityMessage(Localization.lang("Predatory journal %0 found", field.getValue()), entry, field.getKey()))
+                    .toList();
+    }
+}
diff --git a/src/main/java/org/jabref/logic/journals/predatory/PredatoryJournalInformation.java b/src/main/java/org/jabref/logic/journals/predatory/PredatoryJournalInformation.java
new file mode 100644
index 00000000000..83c936f8748
--- /dev/null
+++ b/src/main/java/org/jabref/logic/journals/predatory/PredatoryJournalInformation.java
@@ -0,0 +1,16 @@
+package org.jabref.logic.journals.predatory;
+
+import java.io.Serializable;
+
+/**
+ * Represents predatory journal information
+ *
+ * @param name The full journal name
+ * @param abbr Abbreviation, if any
+ * @param url  Url of the journal
+ */
+public record PredatoryJournalInformation(
+        String name,
+        String abbr,
+        String url) implements Serializable {  // must implement @Serializable otherwise MVStore fails
+}
diff --git a/src/main/java/org/jabref/logic/journals/predatory/PredatoryJournalListCrawler.java b/src/main/java/org/jabref/logic/journals/predatory/PredatoryJournalListCrawler.java
new file mode 100644
index 00000000000..dfedda4eec5
--- /dev/null
+++ b/src/main/java/org/jabref/logic/journals/predatory/PredatoryJournalListCrawler.java
@@ -0,0 +1,160 @@
+package org.jabref.logic.journals.predatory;
+
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Optional;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.jabref.logic.net.URLDownload;
+import org.jabref.model.strings.StringUtil;
+
+import org.apache.commons.csv.CSVFormat;
+import org.apache.commons.csv.CSVParser;
+import org.apache.commons.csv.CSVRecord;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Converts (hard-coded) online resources to a set. {@link #loadFromOnlineSources} is the method containing the result.
+ */
+public class PredatoryJournalListCrawler {
+
+    private record PJSource(URL url, Optional<Pattern> elementPattern) {
+        PJSource(String url, String regex) {
+            this(createURL(url), Optional.of(Pattern.compile(regex)));
+        }
+
+        PJSource(String url) {
+            this(createURL(url), Optional.empty());
+        }
+
+        private static URL createURL(String urlString) {
+            try {
+                return new URI(urlString).toURL();
+            } catch (MalformedURLException | URISyntaxException ex) {
+                throw new IllegalArgumentException("Malformed URL has occurred in PJSource", ex);
+            }
+        }
+    }
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(PredatoryJournalListCrawler.class);
+    private static final Pattern PATTERN_NAME = Pattern.compile("(?<=\">).*?(?=<)");
+    private static final Pattern PATTERN_URL = Pattern.compile("http.*?(?=\")");
+    private static final Pattern PATTERN_ABBR = Pattern.compile("(?<=\\()[^ ]*(?=\\))");
+    private final List<PJSource> predatorySources = List.of(
+            new PJSource("https://raw.githubusercontent.com/stop-predatory-journals/stop-predatory-journals.github.io/master/_data/journals.csv"),
+            new PJSource("https://raw.githubusercontent.com/stop-predatory-journals/stop-predatory-journals.github.io/master/_data/publishers.csv"),
+            new PJSource("https://beallslist.net/",
+                    "<li>.*?</li>"),
+            new PJSource("https://beallslist.net/standalone-journals/",
+                    "<li>.*?</li>"),
+            new PJSource("https://beallslist.net/hijacked-journals/",
+                    "<tr>.*?</tr>")
+    );
+
+    private final List<String> linkElements = new ArrayList<>();
+
+    private final List<PredatoryJournalInformation> predatoryJournalInformation = new ArrayList<>();
+
+    /**
+     * Loads predatory journal information from online resources
+     * This method should be only called once when building JabRef
+     *
+     * @return the set of journal information
+     */
+    public HashSet<PredatoryJournalInformation> loadFromOnlineSources() {
+        predatorySources.forEach(this::crawl);
+        linkElements.forEach(this::clean);
+        return new HashSet<>(predatoryJournalInformation);
+    }
+
+    private void crawl(PJSource source) {
+        try {
+            URLDownload download = new URLDownload(source.url);
+
+            if (!download.canBeReached()) {
+                LOGGER.warn("Url {} is unreachable", source.url);
+            } else if (source.url.getPath().contains(".csv")) {
+                handleCSV(new InputStreamReader(download.asInputStream()));
+            } else {
+                if (source.elementPattern.isPresent()) {
+                    handleHTML(source.elementPattern.get(), download.asString());
+                }
+            }
+        } catch (IOException ex) {
+            LOGGER.error("Could not crawl source for predatory journals {}", source.url, ex);
+        }
+    }
+
+    private void handleCSV(Reader reader) throws IOException {
+        CSVFormat format = CSVFormat.EXCEL.builder().setSkipHeaderRecord(true).build();
+        CSVParser csvParser = new CSVParser(reader, format);
+
+        for (CSVRecord csvRecord : csvParser) {
+            String name = csvRecord.get(1);
+            String abbr = csvRecord.get(2);
+            String url = csvRecord.get(0);
+
+            if (StringUtil.isNullOrEmpty(name)) {
+                if (!abbr.isEmpty()) {
+                    name = abbr;
+                } else {
+                    continue;
+                }
+            }
+            // changes column order from CSV (source: url, name, abbr)
+            predatoryJournalInformation.add(new PredatoryJournalInformation(decode(name), decode(abbr), url));
+        }
+    }
+
+    private void handleHTML(Pattern pattern, String body) {
+        Matcher matcher = pattern.matcher(body);
+        while (matcher.find()) {
+            linkElements.add(matcher.group());
+        }
+    }
+
+    private void clean(String item) {
+        Matcher m_name = PATTERN_NAME.matcher(item);
+        Matcher m_url = PATTERN_URL.matcher(item);
+        Matcher m_abbr = PATTERN_ABBR.matcher(item);
+
+        // using `if` gets only first link in element, `while` gets all, but this may not be desirable
+        // e.g. this way only the hijacked journals are recorded and not the authentic originals
+        if (m_name.find() && m_url.find()) {
+            String name = m_name.group();
+            if (name != null) {
+                name = name.replace("\u200B", ""); // zero width space
+            }
+            String abbr = m_abbr.find() ? m_abbr.group() : "";
+            String url = m_url.group();
+
+            if (StringUtil.isNullOrEmpty(name)) {
+                if (!abbr.isEmpty()) {
+                    name = abbr;
+                } else {
+                    return;
+                }
+            }
+            predatoryJournalInformation.add(new PredatoryJournalInformation(decode(name), decode(abbr), url));
+        }
+    }
+
+    private String decode(String s) {
+        return Optional.ofNullable(s)
+                       .orElse("")
+                       .replace(",", "")
+                       .replace("&amp;", "&")
+                       .replace("&#8217;", "'")
+                       .replace("&#8211;", "-");
+    }
+}
diff --git a/src/main/java/org/jabref/logic/journals/predatory/PredatoryJournalListLoader.java b/src/main/java/org/jabref/logic/journals/predatory/PredatoryJournalListLoader.java
new file mode 100644
index 00000000000..011f6e38fd8
--- /dev/null
+++ b/src/main/java/org/jabref/logic/journals/predatory/PredatoryJournalListLoader.java
@@ -0,0 +1,37 @@
+package org.jabref.logic.journals.predatory;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class PredatoryJournalListLoader {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(PredatoryJournalListLoader.class);
+
+    public static PredatoryJournalRepository loadRepository() {
+        PredatoryJournalRepository repository = new PredatoryJournalRepository();
+        // Initialize with built-in list
+        // We cannot use PredatoryJournalRepository.class.getResource, because this is null in JPackage, thus we need "getResourceAsStream"
+        try (InputStream resourceAsStream = PredatoryJournalListLoader.class.getResourceAsStream("/journals/predatory-journals.mv")) {
+            if (resourceAsStream == null) {
+                LOGGER.warn("There is no predatory-journal.mv. We use a default predatory dummy list");
+                repository = new PredatoryJournalRepository();
+            } else {
+                // MVStore does not support loading from stream. Thus, we need to have a file copy of the stream.
+                Path tempDir = Files.createTempDirectory("jabref-journal");
+                Path tempJournalList = tempDir.resolve("predatory-journals.mv");
+                Files.copy(resourceAsStream, tempJournalList);
+                repository = new PredatoryJournalRepository(tempJournalList);
+                tempDir.toFile().deleteOnExit();
+                tempJournalList.toFile().deleteOnExit();
+            }
+        } catch (IOException e) {
+            LOGGER.error("Error while copying journal list", e);
+        }
+        return repository;
+    }
+}
diff --git a/src/main/java/org/jabref/logic/journals/predatory/PredatoryJournalRepository.java b/src/main/java/org/jabref/logic/journals/predatory/PredatoryJournalRepository.java
new file mode 100644
index 00000000000..2c73530daff
--- /dev/null
+++ b/src/main/java/org/jabref/logic/journals/predatory/PredatoryJournalRepository.java
@@ -0,0 +1,67 @@
+package org.jabref.logic.journals.predatory;
+
+import java.nio.file.Path;
+import java.util.Locale;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.stream.Collectors;
+
+import org.jabref.logic.util.strings.StringSimilarity;
+
+import org.h2.mvstore.MVMap;
+import org.h2.mvstore.MVStore;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * A repository for all predatory journals and publishers, including add and find methods.
+ */
+public class PredatoryJournalRepository implements AutoCloseable {
+    private final Logger LOGGER = LoggerFactory.getLogger(PredatoryJournalRepository.class);
+    private final Map<String, PredatoryJournalInformation> predatoryJournals;
+    private final StringSimilarity match = new StringSimilarity();
+    private final MVStore store;
+
+    /**
+     * Initializes the internal data based on the predatory journals found in the given MV file
+     */
+    public PredatoryJournalRepository(Path mvStore) {
+        MVMap<String, PredatoryJournalInformation> predatoryJournalsMap;
+        store = new MVStore.Builder().readOnly().fileName(mvStore.toAbsolutePath().toString()).open();
+        predatoryJournals = store.openMap("PredatoryJournals");
+    }
+
+    /**
+     * Initializes the repository with demonstration data. Used if no abbreviation file is found.
+     */
+    public PredatoryJournalRepository() {
+        store = null;
+        predatoryJournals = Map.of("Demo", new PredatoryJournalInformation("Demo", "Demo", ""));
+    }
+
+    /**
+     * Returns true if the given journal name is contained in the list in its full form
+     */
+    public boolean isKnownName(String journalName) {
+        String journal = journalName.trim().replaceAll(Matcher.quoteReplacement("\\&"), "&");
+
+        if (predatoryJournals.containsKey(journal)) {
+            LOGGER.debug("Found predatory journal {}", journal);
+            return true;
+        }
+
+        var matches = predatoryJournals.keySet().stream()
+                                       .filter(key -> match.isSimilar(journal.toLowerCase(Locale.ROOT), key.toLowerCase(Locale.ROOT)))
+                                       .collect(Collectors.toList());
+
+        LOGGER.info("Found multiple possible predatory journals {}", String.join(", ", matches));
+        return !matches.isEmpty();
+    }
+
+    @Override
+    public void close() throws Exception {
+        if (store != null) {
+            store.close();
+        }
+    }
+}
diff --git a/src/main/java/org/jabref/logic/l10n/Language.java b/src/main/java/org/jabref/logic/l10n/Language.java
index 2805b6b3ee5..9d3e9958fb8 100644
--- a/src/main/java/org/jabref/logic/l10n/Language.java
+++ b/src/main/java/org/jabref/logic/l10n/Language.java
@@ -1,8 +1,12 @@
 package org.jabref.logic.l10n;
 
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.List;
 import java.util.Locale;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.regex.Pattern;
 
 /**
  * Contains all supported languages.
@@ -35,9 +39,9 @@ public enum Language {
     UKRAINIAN("украї́нська (Ukrainian)", "uk"),
     VIETNAMESE("Vietnamese", "vi");
 
+    private static final Pattern IS_NOT_LATIN = Pattern.compile("[^\\p{IsLatin}]");
     private final String displayName;
     private final String id;
-
     /**
      * @param id Typically as 639-1 code
      */
@@ -70,4 +74,14 @@ public String getDisplayName() {
     public String getId() {
         return id;
     }
+
+    public static List<Language> getSorted() {
+        return Arrays.stream(values())
+                .sorted(Comparator.comparing(language -> removeNonLatinCharacters(language.getDisplayName())))
+                .toList();
+    }
+
+    private static String removeNonLatinCharacters(String input) {
+       return IS_NOT_LATIN.matcher(input).replaceAll("");
+    }
 }
diff --git a/src/main/java/org/jabref/logic/layout/LayoutEntry.java b/src/main/java/org/jabref/logic/layout/LayoutEntry.java
index b739393a982..cf4fd8e1c7f 100644
--- a/src/main/java/org/jabref/logic/layout/LayoutEntry.java
+++ b/src/main/java/org/jabref/logic/layout/LayoutEntry.java
@@ -443,7 +443,7 @@ private LayoutFormatter getLayoutFormatterByName(String name) {
             case "CreateDocBook5Editors" -> new CreateDocBook5Editors();
             case "CurrentDate" -> new CurrentDate();
             case "DateFormatter" -> new DateFormatter();
-            case "DOICheck" -> new DOICheck();
+            case "DOICheck" -> new DOICheck(preferences.getDoiPreferences());
             case "DOIStrip" -> new DOIStrip();
             case "EntryTypeFormatter" -> new EntryTypeFormatter();
             case "FirstPage" -> new FirstPage();
diff --git a/src/main/java/org/jabref/logic/layout/LayoutFormatterPreferences.java b/src/main/java/org/jabref/logic/layout/LayoutFormatterPreferences.java
index b2177cbd543..8aecd278608 100644
--- a/src/main/java/org/jabref/logic/layout/LayoutFormatterPreferences.java
+++ b/src/main/java/org/jabref/logic/layout/LayoutFormatterPreferences.java
@@ -7,17 +7,22 @@
 import javafx.beans.property.StringProperty;
 
 import org.jabref.logic.layout.format.NameFormatterPreferences;
+import org.jabref.logic.preferences.DOIPreferences;
 
 public class LayoutFormatterPreferences {
 
     private final NameFormatterPreferences nameFormatterPreferences;
+
+    private final DOIPreferences doiPreferences;
     private final StringProperty mainFileDirectoryProperty;
     private final Map<String, String> customExportNameFormatters = new HashMap<>();
 
     public LayoutFormatterPreferences(NameFormatterPreferences nameFormatterPreferences,
+                                      DOIPreferences doiPreferences,
                                       StringProperty mainFileDirectoryProperty) {
         this.nameFormatterPreferences = nameFormatterPreferences;
         this.mainFileDirectoryProperty = mainFileDirectoryProperty;
+        this.doiPreferences = doiPreferences;
     }
 
     public NameFormatterPreferences getNameFormatterPreferences() {
@@ -39,4 +44,8 @@ public void clearCustomExportNameFormatters() {
     public void putCustomExportNameFormatter(String formatterName, String contents) {
         customExportNameFormatters.put(formatterName, contents);
     }
+
+    public DOIPreferences getDoiPreferences() {
+        return doiPreferences;
+    }
 }
diff --git a/src/main/java/org/jabref/logic/layout/format/DOICheck.java b/src/main/java/org/jabref/logic/layout/format/DOICheck.java
index 0ae0483c698..ed9f2a6fd7b 100644
--- a/src/main/java/org/jabref/logic/layout/format/DOICheck.java
+++ b/src/main/java/org/jabref/logic/layout/format/DOICheck.java
@@ -1,14 +1,25 @@
 package org.jabref.logic.layout.format;
 
+import java.net.URI;
+
 import org.jabref.logic.layout.LayoutFormatter;
+import org.jabref.logic.preferences.DOIPreferences;
 import org.jabref.model.entry.identifier.DOI;
 
 /**
  * Used to fix [ 1588028 ] export HTML table DOI URL.
  * <p>
- * Will prepend "http://doi.org/" if only DOI and not an URL is given.
+ * Will prepend "<a href="http://doi.org/">http://doi.org/</a>" or the DOI url with a custom base URL defined in the {@link DOIPreferences}
+ * if only DOI and not an URL is given.
  */
 public class DOICheck implements LayoutFormatter {
+
+    private final DOIPreferences doiPreferences;
+
+    public DOICheck(DOIPreferences doiPreferences) {
+        this.doiPreferences = doiPreferences;
+    }
+
     @Override
     public String format(String fieldText) {
         if (fieldText == null) {
@@ -18,6 +29,14 @@ public String format(String fieldText) {
         if (result.startsWith("/")) {
             result = result.substring(1);
         }
+
+        if (doiPreferences.isUseCustom()) {
+            var base = URI.create(doiPreferences.getDefaultBaseURI());
+            return DOI.parse(result).flatMap(doi -> doi.getExternalURIFromBase(base))
+                      .map(URI::toASCIIString)
+                      .orElse(result);
+        }
+
         return DOI.parse(result).map(DOI::getURIAsASCIIString).orElse(result);
     }
 }
diff --git a/src/main/java/org/jabref/logic/pdf/search/indexing/DocumentReader.java b/src/main/java/org/jabref/logic/pdf/search/DocumentReader.java
similarity index 87%
rename from src/main/java/org/jabref/logic/pdf/search/indexing/DocumentReader.java
rename to src/main/java/org/jabref/logic/pdf/search/DocumentReader.java
index e2e1c0f5b7e..8431db88b52 100644
--- a/src/main/java/org/jabref/logic/pdf/search/indexing/DocumentReader.java
+++ b/src/main/java/org/jabref/logic/pdf/search/DocumentReader.java
@@ -1,4 +1,4 @@
-package org.jabref.logic.pdf.search.indexing;
+package org.jabref.logic.pdf.search;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -57,7 +57,7 @@ public final class DocumentReader {
     public DocumentReader(BibEntry bibEntry, FilePreferences filePreferences) {
         this.filePreferences = filePreferences;
         if (bibEntry.getFiles().isEmpty()) {
-            throw new IllegalStateException("There are no linked PDF files to this BibEntry!");
+            throw new IllegalStateException("There are no linked PDF files to this BibEntry.");
         }
 
         this.entry = bibEntry;
@@ -93,17 +93,17 @@ public List<Document> readLinkedPdfs(BibDatabaseContext databaseContext) {
     private List<Document> readPdfContents(LinkedFile pdf, Path resolvedPdfPath) {
         List<Document> pages = new ArrayList<>();
         try (PDDocument pdfDocument = Loader.loadPDF(resolvedPdfPath.toFile())) {
-                for (int pageNumber = 0; pageNumber < pdfDocument.getNumberOfPages(); pageNumber++) {
-                    Document newDocument = new Document();
-                    addIdentifiers(newDocument, pdf.getLink());
-                    addMetaData(newDocument, resolvedPdfPath, pageNumber);
-                    try {
-                        addContentIfNotEmpty(pdfDocument, newDocument, pageNumber);
-                    } catch (IOException e) {
-                        LOGGER.warn("Could not read page {} of  {}", pageNumber, resolvedPdfPath.toAbsolutePath(), e);
-                    }
-                    pages.add(newDocument);
+            for (int pageNumber = 0; pageNumber < pdfDocument.getNumberOfPages(); pageNumber++) {
+                Document newDocument = new Document();
+                addIdentifiers(newDocument, pdf.getLink());
+                addMetaData(newDocument, resolvedPdfPath, pageNumber);
+                try {
+                    addContentIfNotEmpty(pdfDocument, newDocument, pageNumber);
+                } catch (IOException e) {
+                    LOGGER.warn("Could not read page {} of  {}", pageNumber, resolvedPdfPath.toAbsolutePath(), e);
                 }
+                pages.add(newDocument);
+            }
         } catch (IOException e) {
             LOGGER.warn("Could not read {}", resolvedPdfPath.toAbsolutePath(), e);
         }
@@ -145,8 +145,9 @@ public static String mergeLines(String text) {
     private void addContentIfNotEmpty(PDDocument pdfDocument, Document newDocument, int pageNumber) throws IOException {
         PDFTextStripper pdfTextStripper = new PDFTextStripper();
         pdfTextStripper.setLineSeparator("\n");
-        pdfTextStripper.setStartPage(pageNumber);
-        pdfTextStripper.setEndPage(pageNumber);
+        // Apache PDFTextStripper is 1-based. See {@link org.apache.pdfbox.text.PDFTextStripper.processPages}
+        pdfTextStripper.setStartPage(pageNumber + 1);
+        pdfTextStripper.setEndPage(pageNumber + 1);
 
         String pdfContent = pdfTextStripper.getText(pdfDocument);
         if (StringUtil.isNotBlank(pdfContent)) {
diff --git a/src/main/java/org/jabref/logic/pdf/search/indexing/IndexingTaskManager.java b/src/main/java/org/jabref/logic/pdf/search/IndexingTaskManager.java
similarity index 63%
rename from src/main/java/org/jabref/logic/pdf/search/indexing/IndexingTaskManager.java
rename to src/main/java/org/jabref/logic/pdf/search/IndexingTaskManager.java
index ba8bc5e5d12..8ae4117e72d 100644
--- a/src/main/java/org/jabref/logic/pdf/search/indexing/IndexingTaskManager.java
+++ b/src/main/java/org/jabref/logic/pdf/search/IndexingTaskManager.java
@@ -1,9 +1,11 @@
-package org.jabref.logic.pdf.search.indexing;
+package org.jabref.logic.pdf.search;
 
 import java.util.List;
 import java.util.Queue;
 import java.util.Set;
 import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
 
 import org.jabref.gui.util.BackgroundTask;
 import org.jabref.gui.util.DefaultTaskExecutor;
@@ -85,41 +87,47 @@ public AutoCloseable blockNewTasks() {
         };
     }
 
-    public void createIndex(PdfIndexer indexer) {
-        enqueueTask(indexer::createIndex);
+    public void rebuildIndex(PdfIndexer indexer) {
+        enqueueTask(indexer::rebuildIndex);
     }
 
+    /**
+     * Updates the index by performing a delta analysis of the files already existing in the index and the files in the library.
+     */
     public void updateIndex(PdfIndexer indexer, BibDatabaseContext databaseContext) {
         Set<String> pathsToRemove = indexer.getListOfFilePaths();
-        for (BibEntry entry : databaseContext.getEntries()) {
-            for (LinkedFile file : entry.getFiles()) {
-                enqueueTask(() -> indexer.addToIndex(entry, file, databaseContext));
-                pathsToRemove.remove(file.getLink());
-            }
-        }
-        for (String pathToRemove : pathsToRemove) {
-            enqueueTask(() -> indexer.removeFromIndex(pathToRemove));
-        }
+        databaseContext.getEntries().stream()
+                       .flatMap(entry -> entry.getFiles().stream())
+                       .map(LinkedFile::getLink)
+                       .forEach(pathsToRemove::remove);
+        // The indexer checks the attached PDFs for modifications (based on the timestamp of the PDF) and reindexes the PDF if it is newer than the index. Therefore, we need to pass the whole library to the indexer for re-indexing.
+        addToIndex(indexer, databaseContext.getEntries());
+        enqueueTask(() -> indexer.removePathsFromIndex(pathsToRemove));
     }
 
-    public void addToIndex(PdfIndexer indexer, BibEntry entry, BibDatabaseContext databaseContext) {
-        addToIndex(indexer, entry, entry.getFiles(), databaseContext);
+    public void addToIndex(PdfIndexer indexer, List<BibEntry> entries) {
+        AtomicInteger counter = new AtomicInteger();
+        // To enable seeing progress in the UI, we group the entries in chunks of 50
+        // Solution inspired by https://stackoverflow.com/a/27595803/873282
+        entries.stream().collect(Collectors.groupingBy(x -> counter.getAndIncrement() / 50))
+               .values()
+               .forEach(list -> enqueueTask(() -> indexer.addToIndex(list)));
     }
 
-    public void addToIndex(PdfIndexer indexer, BibEntry entry, List<LinkedFile> linkedFiles, BibDatabaseContext databaseContext) {
-        for (LinkedFile file : linkedFiles) {
-            enqueueTask(() -> indexer.addToIndex(entry, file, databaseContext));
-        }
+    public void addToIndex(PdfIndexer indexer, BibEntry entry) {
+        enqueueTask(() -> indexer.addToIndex(entry));
     }
 
-    public void removeFromIndex(PdfIndexer indexer, BibEntry entry, List<LinkedFile> linkedFiles) {
-        for (LinkedFile file : linkedFiles) {
-            enqueueTask(() -> indexer.removeFromIndex(file.getLink()));
-        }
+    public void addToIndex(PdfIndexer indexer, BibEntry entry, List<LinkedFile> linkedFiles) {
+        enqueueTask(() -> indexer.addToIndex(entry, linkedFiles));
     }
 
     public void removeFromIndex(PdfIndexer indexer, BibEntry entry) {
-        enqueueTask(() -> removeFromIndex(indexer, entry, entry.getFiles()));
+        enqueueTask(() -> indexer.removeFromIndex(entry));
+    }
+
+    public void removeFromIndex(PdfIndexer indexer, List<LinkedFile> linkedFiles) {
+        enqueueTask(() -> indexer.removeFromIndex(linkedFiles));
     }
 
     public void updateDatabaseName(String name) {
diff --git a/src/main/java/org/jabref/logic/pdf/search/indexing/PdfIndexer.java b/src/main/java/org/jabref/logic/pdf/search/PdfIndexer.java
similarity index 50%
rename from src/main/java/org/jabref/logic/pdf/search/indexing/PdfIndexer.java
rename to src/main/java/org/jabref/logic/pdf/search/PdfIndexer.java
index d10a6c0221a..a973831e134 100644
--- a/src/main/java/org/jabref/logic/pdf/search/indexing/PdfIndexer.java
+++ b/src/main/java/org/jabref/logic/pdf/search/PdfIndexer.java
@@ -1,16 +1,16 @@
-package org.jabref.logic.pdf.search.indexing;
+package org.jabref.logic.pdf.search;
 
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.attribute.BasicFileAttributes;
+import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
-import org.jabref.gui.LibraryTab;
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
@@ -19,6 +19,7 @@
 import org.jabref.model.pdf.search.SearchFieldConstants;
 import org.jabref.preferences.FilePreferences;
 
+import com.google.common.annotations.VisibleForTesting;
 import org.apache.lucene.document.Document;
 import org.apache.lucene.index.DirectoryReader;
 import org.apache.lucene.index.IndexNotFoundException;
@@ -41,75 +42,138 @@
  */
 public class PdfIndexer {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(LibraryTab.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(PdfIndexer.class);
 
-    private final Directory directoryToIndex;
-    private BibDatabaseContext databaseContext;
+    @VisibleForTesting
+    IndexWriter indexWriter;
 
+    private final BibDatabaseContext databaseContext;
     private final FilePreferences filePreferences;
+    private final Directory indexDirectory;
+    private IndexReader reader;
 
-    public PdfIndexer(Directory indexDirectory, FilePreferences filePreferences) {
-        this.directoryToIndex = indexDirectory;
+    private PdfIndexer(BibDatabaseContext databaseContext, Directory indexDirectory, FilePreferences filePreferences) {
+        this.databaseContext = databaseContext;
+        this.indexDirectory = indexDirectory;
         this.filePreferences = filePreferences;
     }
 
+    /**
+     * Method is public, because DatabaseSearcherWithBibFilesTest resides in another package
+     */
+    @VisibleForTesting
+    public static PdfIndexer of(BibDatabaseContext databaseContext, Path indexDirectory, FilePreferences filePreferences) throws IOException {
+        return new PdfIndexer(databaseContext, new NIOFSDirectory(indexDirectory), filePreferences);
+    }
+
+    /**
+     * Method is public, because DatabaseSearcherWithBibFilesTest resides in another package
+     */
+    @VisibleForTesting
     public static PdfIndexer of(BibDatabaseContext databaseContext, FilePreferences filePreferences) throws IOException {
-        return new PdfIndexer(new NIOFSDirectory(databaseContext.getFulltextIndexPath()), filePreferences);
+        return new PdfIndexer(databaseContext, new NIOFSDirectory(databaseContext.getFulltextIndexPath()), filePreferences);
     }
 
     /**
-     * Adds all PDF files linked to an entry in the database to new Lucene search index. Any previous state of the
-     * Lucene search index will be deleted!
+     * Creates (and thus resets) the PDF index. No re-indexing will be done.
+     * Any previous state of the Lucene search is deleted.
      */
     public void createIndex() {
-        // Create new index by creating IndexWriter but not writing anything.
-        try (IndexWriter indexWriter = new IndexWriter(directoryToIndex, new IndexWriterConfig(new EnglishStemAnalyzer()).setOpenMode(IndexWriterConfig.OpenMode.CREATE))) {
-            // empty comment for checkstyle
+        LOGGER.debug("Creating new index for directory {}.", indexDirectory);
+        initializeIndexWriterAndReader(IndexWriterConfig.OpenMode.CREATE);
+    }
+
+    /**
+     * Needs to be accessed by {@link PdfSearcher}
+     */
+    IndexWriter getIndexWriter() {
+        LOGGER.trace("Getting the index writer");
+        if (indexWriter == null) {
+            LOGGER.trace("Initializing the index writer");
+            initializeIndexWriterAndReader(IndexWriterConfig.OpenMode.CREATE_OR_APPEND);
+        } else {
+            LOGGER.trace("Using existing index writer");
+        }
+        return indexWriter;
+    }
+
+    private void initializeIndexWriterAndReader(IndexWriterConfig.OpenMode mode) {
+        try {
+            indexWriter = new IndexWriter(
+                    indexDirectory,
+                    new IndexWriterConfig(
+                            new EnglishStemAnalyzer()).setOpenMode(mode));
+        } catch (IOException e) {
+            LOGGER.error("Could not initialize the IndexWriter", e);
+        }
+        try {
+            reader = DirectoryReader.open(indexWriter);
         } catch (IOException e) {
-            LOGGER.warn("Could not create new Index!", e);
+            LOGGER.error("Could not initialize the IndexReader", e);
         }
     }
 
-    public void addToIndex(BibDatabaseContext databaseContext) {
-        for (BibEntry entry : databaseContext.getEntries()) {
-            addToIndex(entry, databaseContext);
+    /**
+     * Rebuilds the PDF index. All PDF files linked to entries in the database will be re-indexed.
+     */
+    public void rebuildIndex() {
+        LOGGER.debug("Rebuilding index.");
+        createIndex();
+        addToIndex(databaseContext.getEntries());
+    }
+
+    public void addToIndex(List<BibEntry> entries) {
+        int count = 0;
+        for (BibEntry entry : entries) {
+            addToIndex(entry, false);
+            count++;
+            if (count % 100 == 0) {
+                doCommit();
+            }
         }
+        doCommit();
+        LOGGER.debug("Added {} documents to the index.", count);
     }
 
     /**
-     * Adds all the pdf files linked to one entry in the database to an existing (or new) Lucene search index
+     * Adds all PDF files linked to one entry in the database to an existing (or new) Lucene search index
      *
      * @param entry a bibtex entry to link the pdf files to
-     * @param databaseContext the associated BibDatabaseContext
      */
-    public void addToIndex(BibEntry entry, BibDatabaseContext databaseContext) {
-        addToIndex(entry, entry.getFiles(), databaseContext);
+    public void addToIndex(BibEntry entry) {
+        addToIndex(entry, entry.getFiles(), true);
+    }
+
+    private void addToIndex(BibEntry entry, boolean shouldCommit) {
+        addToIndex(entry, entry.getFiles(), false);
+        if (shouldCommit) {
+            doCommit();
+        }
     }
 
     /**
      * Adds a list of pdf files linked to one entry in the database to an existing (or new) Lucene search index
      *
      * @param entry a bibtex entry to link the pdf files to
-     * @param databaseContext the associated BibDatabaseContext
      */
-    public void addToIndex(BibEntry entry, List<LinkedFile> linkedFiles, BibDatabaseContext databaseContext) {
+    public void addToIndex(BibEntry entry, Collection<LinkedFile> linkedFiles) {
+        addToIndex(entry, linkedFiles, true);
+    }
+
+    public void addToIndex(BibEntry entry, Collection<LinkedFile> linkedFiles, boolean shouldCommit) {
         for (LinkedFile linkedFile : linkedFiles) {
-            addToIndex(entry, linkedFile, databaseContext);
+            addToIndex(entry, linkedFile, false);
+        }
+        if (shouldCommit) {
+            doCommit();
         }
     }
 
-    /**
-     * Adds a pdf file linked to one entry in the database to an existing (or new) Lucene search index
-     *
-     * @param entry a bibtex entry
-     * @param linkedFile the link to the pdf files
-     */
-    public void addToIndex(BibEntry entry, LinkedFile linkedFile, BibDatabaseContext databaseContext) {
-        if (databaseContext != null) {
-            this.databaseContext = databaseContext;
-        }
-        if (!entry.getFiles().isEmpty()) {
-            addToIndex(entry, linkedFile);
+    private void doCommit() {
+        try {
+            getIndexWriter().commit();
+        } catch (IOException e) {
+            LOGGER.warn("Could not commit changes to the index.", e);
         }
     }
 
@@ -119,14 +183,11 @@ public void addToIndex(BibEntry entry, LinkedFile linkedFile, BibDatabaseContext
      * @param linkedFilePath the path to the file to be removed
      */
     public void removeFromIndex(String linkedFilePath) {
-        try (IndexWriter indexWriter = new IndexWriter(
-                directoryToIndex,
-                new IndexWriterConfig(
-                        new EnglishStemAnalyzer()).setOpenMode(IndexWriterConfig.OpenMode.CREATE_OR_APPEND))) {
-            indexWriter.deleteDocuments(new Term(SearchFieldConstants.PATH, linkedFilePath));
-            indexWriter.commit();
+        try {
+            getIndexWriter().deleteDocuments(new Term(SearchFieldConstants.PATH, linkedFilePath));
+            getIndexWriter().commit();
         } catch (IOException e) {
-            LOGGER.warn("Could not initialize the IndexWriter!", e);
+            LOGGER.debug("Could not remove document {} from the index.", linkedFilePath, e);
         }
     }
 
@@ -136,30 +197,21 @@ public void removeFromIndex(String linkedFilePath) {
      * @param entry the entry documents are linked to
      */
     public void removeFromIndex(BibEntry entry) {
-        removeFromIndex(entry, entry.getFiles());
+        removeFromIndex(entry.getFiles());
     }
 
     /**
      * Removes a list of files linked to a bib-entry from the index
-     *
-     * @param entry the entry documents are linked to
      */
-    public void removeFromIndex(BibEntry entry, List<LinkedFile> linkedFiles) {
+    public void removeFromIndex(Collection<LinkedFile> linkedFiles) {
         for (LinkedFile linkedFile : linkedFiles) {
             removeFromIndex(linkedFile.getLink());
         }
     }
 
-    /**
-     * Deletes all entries from the Lucene search index.
-     */
-    public void flushIndex() {
-        IndexWriterConfig config = new IndexWriterConfig();
-        config.setOpenMode(IndexWriterConfig.OpenMode.CREATE);
-        try (IndexWriter deleter = new IndexWriter(directoryToIndex, config)) {
-            // Do nothing. Index is deleted.
-        } catch (IOException e) {
-            LOGGER.warn("The IndexWriter could not be initialized", e);
+    public void removePathsFromIndex(Collection<String> linkedFiles) {
+        for (String linkedFile : linkedFiles) {
+            removeFromIndex(linkedFile);
         }
     }
 
@@ -170,8 +222,15 @@ public void flushIndex() {
      * @param entry the entry associated with the file
      * @param linkedFile the file to write to the index
      */
-    private void addToIndex(BibEntry entry, LinkedFile linkedFile) {
-        if (linkedFile.isOnlineLink() || !StandardFileType.PDF.getName().equals(linkedFile.getFileType())) {
+    public void addToIndex(BibEntry entry, LinkedFile linkedFile) {
+        this.addToIndex(entry, linkedFile, true);
+    }
+
+    private void addToIndex(BibEntry entry, LinkedFile linkedFile, boolean shouldCommit) {
+        if (linkedFile.isOnlineLink() ||
+                (!StandardFileType.PDF.getName().equals(linkedFile.getFileType()) &&
+                        // We do not require the file type to be set
+                        (!linkedFile.getLink().endsWith(".pdf") && !linkedFile.getLink().endsWith(".PDF")))) {
             return;
         }
         Optional<Path> resolvedPath = linkedFile.findIn(databaseContext, filePreferences);
@@ -182,7 +241,7 @@ private void addToIndex(BibEntry entry, LinkedFile linkedFile) {
         LOGGER.debug("Adding {} to index", linkedFile.getLink());
         try {
             // Check if a document with this path is already in the index
-            try (IndexReader reader = DirectoryReader.open(directoryToIndex)) {
+            try {
                 IndexSearcher searcher = new IndexSearcher(reader);
                 TermQuery query = new TermQuery(new Term(SearchFieldConstants.PATH, linkedFile.getLink()));
                 TopDocs topDocs = searcher.search(query, 1);
@@ -190,28 +249,27 @@ private void addToIndex(BibEntry entry, LinkedFile linkedFile) {
                 if (topDocs.scoreDocs.length > 0) {
                     Document doc = reader.document(topDocs.scoreDocs[0].doc);
                     long indexModificationTime = Long.parseLong(doc.getField(SearchFieldConstants.MODIFIED).stringValue());
-
                     BasicFileAttributes attributes = Files.readAttributes(resolvedPath.get(), BasicFileAttributes.class);
-
                     if (indexModificationTime >= attributes.lastModifiedTime().to(TimeUnit.SECONDS)) {
+                        LOGGER.debug("File {} is already indexed", linkedFile.getLink());
                         return;
                     }
                 }
             } catch (IndexNotFoundException e) {
-                // if there is no index yet, don't need to check anything!
+                LOGGER.debug("Index not found. Continuing.", e);
             }
             // If no document was found, add the new one
             Optional<List<Document>> pages = new DocumentReader(entry, filePreferences).readLinkedPdf(this.databaseContext, linkedFile);
             if (pages.isPresent()) {
-                try (IndexWriter indexWriter = new IndexWriter(directoryToIndex,
-                                                               new IndexWriterConfig(
-                                                                                     new EnglishStemAnalyzer()).setOpenMode(IndexWriterConfig.OpenMode.CREATE_OR_APPEND))) {
-                    indexWriter.addDocuments(pages.get());
-                    indexWriter.commit();
+                getIndexWriter().addDocuments(pages.get());
+                if (shouldCommit) {
+                    getIndexWriter().commit();
                 }
+            } else {
+                LOGGER.debug("No content found in file {}", linkedFile.getLink());
             }
         } catch (IOException e) {
-            LOGGER.warn("Could not add the document {} to the index!", linkedFile.getLink(), e);
+            LOGGER.warn("Could not add document {} to the index.", linkedFile.getLink(), e);
         }
     }
 
@@ -222,7 +280,7 @@ private void addToIndex(BibEntry entry, LinkedFile linkedFile) {
      */
     public Set<String> getListOfFilePaths() {
         Set<String> paths = new HashSet<>();
-        try (IndexReader reader = DirectoryReader.open(directoryToIndex)) {
+        try (IndexReader reader = DirectoryReader.open(indexWriter)) {
             IndexSearcher searcher = new IndexSearcher(reader);
             MatchAllDocsQuery query = new MatchAllDocsQuery();
             TopDocs allDocs = searcher.search(query, Integer.MAX_VALUE);
@@ -231,8 +289,13 @@ public Set<String> getListOfFilePaths() {
                 paths.add(doc.getField(SearchFieldConstants.PATH).stringValue());
             }
         } catch (IOException e) {
+            LOGGER.debug("Could not read from index. Returning intermediate result.", e);
             return paths;
         }
         return paths;
     }
+
+    public void close() throws IOException {
+        indexWriter.close();
+    }
 }
diff --git a/src/main/java/org/jabref/logic/pdf/search/PdfIndexerManager.java b/src/main/java/org/jabref/logic/pdf/search/PdfIndexerManager.java
new file mode 100644
index 00000000000..3f4bca38c49
--- /dev/null
+++ b/src/main/java/org/jabref/logic/pdf/search/PdfIndexerManager.java
@@ -0,0 +1,79 @@
+package org.jabref.logic.pdf.search;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.preferences.FilePreferences;
+
+import org.jspecify.annotations.NonNull;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * A PdfIndexer takes a long time to build. Caching it speeds up.
+ * <p>
+ * The PdfIndexer is related to the BibDatabaseContext and the FilePreferences. If the user changes the path of the library
+ * or the file preferences, we need to create a new PdfIndexer. Otherwise, we can reuse the existing one.
+ * <p>
+ * This manager implements a <a href="https://www.neatcode.org/object-pool/">Object Pool pattern</a> for {@link PdfIndexer}.
+ */
+public class PdfIndexerManager {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(PdfIndexerManager.class);
+
+    // Map from the path of the library index to the respective indexer
+    private static Map<Path, PdfIndexer> indexerMap = new HashMap<>();
+
+    // We store the file preferences for each path, so that we can update the indexer when the preferences change
+    private static Map<Path, FilePreferences> pathFilePreferencesMap = new HashMap<>();
+
+    public static @NonNull PdfIndexer getIndexer(BibDatabaseContext context, FilePreferences filePreferences) throws IOException {
+        Path fulltextIndexPath = context.getFulltextIndexPath();
+        PdfIndexer indexer = indexerMap.get(fulltextIndexPath);
+        if (indexer != null) {
+            // Check if the file preferences have changed
+            FilePreferences storedFilePreferences = pathFilePreferencesMap.get(fulltextIndexPath);
+            if (storedFilePreferences.equals(filePreferences)) {
+                LOGGER.trace("Found existing indexer for context {}", context);
+                return indexer;
+            }
+            LOGGER.debug("File preferences have changed, updating indexer");
+            indexer.close();
+            indexer = PdfIndexer.of(context, filePreferences);
+            indexerMap.put(fulltextIndexPath, indexer);
+            pathFilePreferencesMap.put(fulltextIndexPath, filePreferences);
+            return indexer;
+        }
+        LOGGER.debug("No indexer found for context {}, creating new one", context);
+        indexer = PdfIndexer.of(context, filePreferences);
+        indexerMap.put(fulltextIndexPath, indexer);
+        pathFilePreferencesMap.put(fulltextIndexPath, filePreferences);
+        return indexer;
+    }
+
+    public static void shutdownAllIndexers() {
+        indexerMap.values().forEach(indexer -> {
+            try {
+                indexer.close();
+            } catch (Exception e) {
+                LOGGER.debug("Problem closing PDF indexer", e);
+            }
+        });
+    }
+
+    public static void shutdownIndexer(BibDatabaseContext context) {
+        PdfIndexer indexer = indexerMap.get(context.getFulltextIndexPath());
+        if (indexer != null) {
+            try {
+                indexer.close();
+            } catch (IOException e) {
+                LOGGER.debug("Could not close indexer", e);
+            }
+        } else {
+            LOGGER.debug("No indexer found for context {}", context);
+        }
+    }
+}
diff --git a/src/main/java/org/jabref/logic/pdf/search/retrieval/PdfSearcher.java b/src/main/java/org/jabref/logic/pdf/search/PdfSearcher.java
similarity index 64%
rename from src/main/java/org/jabref/logic/pdf/search/retrieval/PdfSearcher.java
rename to src/main/java/org/jabref/logic/pdf/search/PdfSearcher.java
index 2fd7e54e5b0..3906341ecb5 100644
--- a/src/main/java/org/jabref/logic/pdf/search/retrieval/PdfSearcher.java
+++ b/src/main/java/org/jabref/logic/pdf/search/PdfSearcher.java
@@ -1,12 +1,11 @@
-package org.jabref.logic.pdf.search.retrieval;
+package org.jabref.logic.pdf.search;
 
 import java.io.IOException;
-import java.util.LinkedList;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
 import org.jabref.gui.LibraryTab;
-import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.pdf.search.EnglishStemAnalyzer;
 import org.jabref.model.pdf.search.PdfSearchResults;
 import org.jabref.model.pdf.search.SearchResult;
@@ -20,8 +19,6 @@
 import org.apache.lucene.search.Query;
 import org.apache.lucene.search.ScoreDoc;
 import org.apache.lucene.search.TopDocs;
-import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.NIOFSDirectory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -31,14 +28,15 @@ public final class PdfSearcher {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(LibraryTab.class);
 
-    private final Directory indexDirectory;
+    private final PdfIndexer indexer;
+    private EnglishStemAnalyzer englishStemAnalyzer = new EnglishStemAnalyzer();
 
-    private PdfSearcher(Directory indexDirectory) {
-        this.indexDirectory = indexDirectory;
+    private PdfSearcher(PdfIndexer indexer) {
+        this.indexer = indexer;
     }
 
-    public static PdfSearcher of(BibDatabaseContext databaseContext) throws IOException {
-        return new PdfSearcher(new NIOFSDirectory(databaseContext.getFulltextIndexPath()));
+    public static PdfSearcher of(PdfIndexer indexer) throws IOException {
+        return new PdfSearcher(indexer);
     }
 
     /**
@@ -48,32 +46,27 @@ public static PdfSearcher of(BibDatabaseContext databaseContext) throws IOExcept
      * @param maxHits      number of maximum search results, must be positive
      * @return a result set of all documents that have matches in any fields
      */
-    public PdfSearchResults search(final String searchString, final int maxHits)
-        throws IOException {
-        if (StringUtil.isBlank(Objects.requireNonNull(searchString, "The search string was null!"))) {
+    public PdfSearchResults search(final String searchString, final int maxHits) throws IOException {
+        if (StringUtil.isBlank(Objects.requireNonNull(searchString, "The search string was null."))) {
             return new PdfSearchResults();
         }
         if (maxHits <= 0) {
-            throw new IllegalArgumentException("Must be called with at least 1 maxHits, was" + maxHits);
+            throw new IllegalArgumentException("Must be called with at least 1 maxHits, was " + maxHits);
         }
 
-        List<SearchResult> resultDocs = new LinkedList<>();
-
-        if (!DirectoryReader.indexExists(indexDirectory)) {
-            LOGGER.debug("Index directory {} does not yet exist", indexDirectory);
-            return new PdfSearchResults();
-        }
-
-        try (IndexReader reader = DirectoryReader.open(indexDirectory)) {
+        List<SearchResult> resultDocs = new ArrayList<>();
+        // We need to point the DirectoryReader to the indexer, because we get errors otherwise
+        // Hint from https://stackoverflow.com/a/63673753/873282.
+        try (IndexReader reader = DirectoryReader.open(indexer.getIndexWriter())) {
+            Query query = new MultiFieldQueryParser(PDF_FIELDS, englishStemAnalyzer).parse(searchString);
             IndexSearcher searcher = new IndexSearcher(reader);
-            Query query = new MultiFieldQueryParser(PDF_FIELDS, new EnglishStemAnalyzer()).parse(searchString);
             TopDocs results = searcher.search(query, maxHits);
             for (ScoreDoc scoreDoc : results.scoreDocs) {
                 resultDocs.add(new SearchResult(searcher, query, scoreDoc));
             }
             return new PdfSearchResults(resultDocs);
         } catch (ParseException e) {
-            LOGGER.warn("Could not parse query: '{}'!\n{}", searchString, e.getMessage());
+            LOGGER.warn("Could not parse query: '{}'", searchString, e);
             return new PdfSearchResults();
         }
     }
diff --git a/src/main/java/org/jabref/logic/push/CitationCommandString.java b/src/main/java/org/jabref/logic/push/CitationCommandString.java
new file mode 100644
index 00000000000..8a645e51fba
--- /dev/null
+++ b/src/main/java/org/jabref/logic/push/CitationCommandString.java
@@ -0,0 +1,34 @@
+package org.jabref.logic.push;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public record CitationCommandString(String prefix, String delimiter, String suffix) {
+    private static final Logger LOGGER = LoggerFactory.getLogger(CitationCommandString.class);
+    private static final String CITE_KEY1 = "key1";
+    private static final String CITE_KEY2 = "key2";
+
+    @Override
+    public String toString() {
+        return prefix + CITE_KEY1 + delimiter + CITE_KEY2 + suffix;
+    }
+
+    public static CitationCommandString from(String completeCiteCommand) {
+        int indexKey1 = completeCiteCommand.indexOf(CITE_KEY1);
+        int indexKey2 = completeCiteCommand.indexOf(CITE_KEY2);
+        if (indexKey1 < 0 || indexKey2 < 0 || indexKey2 < (indexKey1 + CITE_KEY1.length())) {
+            LOGGER.info("Wrong indexes {} {} for completeCiteCommand {}. Using default delimiter and suffix.", indexKey1, indexKey2, completeCiteCommand);
+            if (completeCiteCommand.isEmpty()) {
+                completeCiteCommand = "\\cite{";
+            } else if (!completeCiteCommand.endsWith("{")) {
+                completeCiteCommand += "{";
+            }
+            return new CitationCommandString(completeCiteCommand, ",", "}");
+        }
+
+        String prefix = completeCiteCommand.substring(0, indexKey1);
+        String delim = completeCiteCommand.substring(completeCiteCommand.lastIndexOf(CITE_KEY1) + CITE_KEY1.length(), indexKey2);
+        String suffix = completeCiteCommand.substring(completeCiteCommand.lastIndexOf(CITE_KEY2) + CITE_KEY2.length());
+        return new CitationCommandString(prefix, delim, suffix);
+    }
+}
diff --git a/src/main/java/org/jabref/logic/search/DatabaseSearcher.java b/src/main/java/org/jabref/logic/search/DatabaseSearcher.java
index 422d8d4d35c..d5db1b6309f 100644
--- a/src/main/java/org/jabref/logic/search/DatabaseSearcher.java
+++ b/src/main/java/org/jabref/logic/search/DatabaseSearcher.java
@@ -3,7 +3,6 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
-import java.util.stream.Collectors;
 
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.database.BibDatabases;
@@ -24,15 +23,18 @@ public DatabaseSearcher(SearchQuery query, BibDatabase database) {
         this.database = Objects.requireNonNull(database);
     }
 
+    /**
+     * @return The matches in the order they appear in the library.
+     */
     public List<BibEntry> getMatches() {
-        LOGGER.debug("Search term: " + query);
+        LOGGER.debug("Search term: {}", query);
 
         if (!query.isValid()) {
-            LOGGER.warn("Search failed: illegal search expression");
+            LOGGER.warn("Search failed: invalid search expression");
             return Collections.emptyList();
         }
 
-        List<BibEntry> matchEntries = database.getEntries().stream().filter(query::isMatch).collect(Collectors.toList());
+        List<BibEntry> matchEntries = database.getEntries().stream().filter(query::isMatch).toList();
         return BibDatabases.purgeEmptyEntries(matchEntries);
     }
 }
diff --git a/src/main/java/org/jabref/logic/search/SearchQuery.java b/src/main/java/org/jabref/logic/search/SearchQuery.java
index 4dc9fd40a58..ef1bb0479c3 100644
--- a/src/main/java/org/jabref/logic/search/SearchQuery.java
+++ b/src/main/java/org/jabref/logic/search/SearchQuery.java
@@ -69,7 +69,7 @@ public SearchQuery(String query, EnumSet<SearchRules.SearchFlags> searchFlags) {
 
     @Override
     public String toString() {
-        return String.format("\"%s\" (%s, %s)", getQuery(), getCaseSensitiveDescription(), getRegularExpressionDescription());
+        return String.format("\"%s\" (%s, %s) %s", getQuery(), getCaseSensitiveDescription(), getRegularExpressionDescription(), searchFlags);
     }
 
     @Override
diff --git a/src/main/java/org/jabref/logic/util/BuildInfo.java b/src/main/java/org/jabref/logic/util/BuildInfo.java
index 245e90b1d2e..352d4531a4a 100644
--- a/src/main/java/org/jabref/logic/util/BuildInfo.java
+++ b/src/main/java/org/jabref/logic/util/BuildInfo.java
@@ -28,6 +28,7 @@ public final class BuildInfo {
     public final String minRequiredJavaVersion;
     public final boolean allowJava9;
     public final String biodiversityHeritageApiKey;
+    public final String semanticScholarApiKey;
 
     public BuildInfo() {
         this("/build.properties");
@@ -57,6 +58,7 @@ public BuildInfo(String path) {
         minRequiredJavaVersion = properties.getProperty("minRequiredJavaVersion", "1.8");
         allowJava9 = "true".equals(properties.getProperty("allowJava9", "true"));
         biodiversityHeritageApiKey = BuildInfo.getValue(properties, "biodiversityHeritageApiKey", "36b910b6-2eb3-46f2-b64c-9abc149925ba");
+        semanticScholarApiKey = BuildInfo.getValue(properties, "semanticScholarApiKey", "");
     }
 
     private static String getValue(Properties properties, String key, String defaultValue) {
@@ -64,7 +66,7 @@ private static String getValue(Properties properties, String key, String default
                                 // workaround unprocessed build.properties file --> just remove the reference to some variable used in build.gradle
                                 .map(value -> value.replaceAll("\\$\\{.*\\}", ""))
                                 .orElse("");
-        if (!"".equals(result)) {
+        if (!result.isEmpty()) {
             return result;
         }
         return defaultValue;
diff --git a/src/main/java/org/jabref/logic/util/StandardFileType.java b/src/main/java/org/jabref/logic/util/StandardFileType.java
index d71f5b50dec..904212a5d2a 100644
--- a/src/main/java/org/jabref/logic/util/StandardFileType.java
+++ b/src/main/java/org/jabref/logic/util/StandardFileType.java
@@ -47,9 +47,6 @@ public enum StandardFileType implements FileType {
     CITAVI("Citavi", "ctv6bak", "ctv5bak"),
     MARKDOWN("Markdown", "md");
 
-
-
-
     private final List<String> extensions;
     private final String name;
 
diff --git a/src/main/java/org/jabref/model/database/BibDatabase.java b/src/main/java/org/jabref/model/database/BibDatabase.java
index d8ab4556482..d1bb17b098d 100644
--- a/src/main/java/org/jabref/model/database/BibDatabase.java
+++ b/src/main/java/org/jabref/model/database/BibDatabase.java
@@ -148,12 +148,7 @@ public Set<Field> getAllVisibleFields() {
      * Returns the entry with the given citation key.
      */
     public synchronized Optional<BibEntry> getEntryByCitationKey(String key) {
-        for (BibEntry entry : entries) {
-            if (key.equals(entry.getCitationKey().orElse(null))) {
-                return Optional.of(entry);
-            }
-        }
-        return Optional.empty();
+        return entries.stream().filter(entry -> Objects.equals(entry.getCitationKey().orElse(null), key)).findFirst();
     }
 
     /**
@@ -402,9 +397,9 @@ public Collection<BibtexString> getUsedStrings(Collection<BibEntry> entries) {
      * references.
      *
      * @param entriesToResolve A collection of BibtexEntries in which all strings of the form
-     *                #xxx# will be resolved against the hash map of string
-     *                references stored in the database.
-     * @param inPlace If inPlace is true then the given BibtexEntries will be modified, if false then copies of the BibtexEntries are made before resolving the strings.
+     *                         #xxx# will be resolved against the hash map of string
+     *                         references stored in the database.
+     * @param inPlace          If inPlace is true then the given BibtexEntries will be modified, if false then copies of the BibtexEntries are made before resolving the strings.
      * @return a list of bibtexentries, with all strings resolved. It is dependent on the value of inPlace whether copies are made or the given BibtexEntries are modified.
      */
     public List<BibEntry> resolveForStrings(Collection<BibEntry> entriesToResolve, boolean inPlace) {
@@ -548,7 +543,7 @@ public void setEpilog(String epilog) {
     /**
      * Registers a listener object (subscriber) to the internal event bus.
      * The following events are posted:
-     *
+     * <p>
      * - {@link EntriesAddedEvent}
      * - {@link EntryChangedEvent}
      * - {@link EntriesRemovedEvent}
diff --git a/src/main/java/org/jabref/model/database/BibDatabaseContext.java b/src/main/java/org/jabref/model/database/BibDatabaseContext.java
index 12d67a71a2f..55869680353 100644
--- a/src/main/java/org/jabref/model/database/BibDatabaseContext.java
+++ b/src/main/java/org/jabref/model/database/BibDatabaseContext.java
@@ -16,6 +16,7 @@
 import org.jabref.logic.shared.DatabaseSynchronizer;
 import org.jabref.logic.util.CoarseChangeFilter;
 import org.jabref.logic.util.OS;
+import org.jabref.logic.util.io.BackupFileUtil;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.metadata.MetaData;
 import org.jabref.model.study.Study;
@@ -161,7 +162,7 @@ public List<Path> getFileDirectories(FilePreferences preferences) {
         metaData.getDefaultFileDirectory()
                 .ifPresent(metaDataDirectory -> fileDirs.add(getFileDirectoryPath(metaDataDirectory)));
 
-        // 3. BIB file directory or Main file directory
+        // 3. BIB file directory or main file directory
         // fileDirs.isEmpty in the case, 1) no user-specific file directory and 2) no general file directory is set
         // (in the metadata of the bib file)
         if (fileDirs.isEmpty() && preferences.shouldStoreFilesRelativeToBibFile()) {
@@ -237,12 +238,17 @@ public List<BibEntry> getEntries() {
         return database.getEntries();
     }
 
+    /**
+     * @return The path to store the lucene index files. One directory for each library.
+     */
     public Path getFulltextIndexPath() {
         Path appData = OS.getNativeDesktop().getFulltextIndexBaseDirectory();
         Path indexPath;
 
         if (getDatabasePath().isPresent()) {
-            indexPath = appData.resolve(String.valueOf(this.getDatabasePath().get().hashCode()));
+            Path databaseFileName = getDatabasePath().get().getFileName();
+            String fileName = BackupFileUtil.getUniqueFilePrefix(databaseFileName) + "--" + databaseFileName;
+            indexPath = appData.resolve(fileName);
             LOGGER.debug("Index path for {} is {}", getDatabasePath().get(), indexPath);
             return indexPath;
         }
diff --git a/src/main/java/org/jabref/model/database/BibDatabases.java b/src/main/java/org/jabref/model/database/BibDatabases.java
index 750454c84d1..6ca03178637 100644
--- a/src/main/java/org/jabref/model/database/BibDatabases.java
+++ b/src/main/java/org/jabref/model/database/BibDatabases.java
@@ -14,7 +14,7 @@ private BibDatabases() {
     /**
      * Receives a Collection of BibEntry instances, iterates through them, and
      * removes all entries that have no fields set. This is useful for rooting out
-     * an unsucessful import (wrong format) that returns a number of empty entries.
+     * an unsuccessful import (wrong format) that returns a number of empty entries.
      */
     public static List<BibEntry> purgeEmptyEntries(Collection<BibEntry> entries) {
         return entries.stream()
diff --git a/src/main/java/org/jabref/model/entry/BibEntry.java b/src/main/java/org/jabref/model/entry/BibEntry.java
index c5590a1348a..8a61da21ca4 100644
--- a/src/main/java/org/jabref/model/entry/BibEntry.java
+++ b/src/main/java/org/jabref/model/entry/BibEntry.java
@@ -6,10 +6,12 @@
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.SequencedSet;
 import java.util.Set;
 import java.util.TreeSet;
 import java.util.concurrent.ConcurrentHashMap;
@@ -52,25 +54,23 @@
 /**
  * Represents a Bib(La)TeX entry, which can be BibTeX or BibLaTeX.
  * <p>
- *     Example:
+ * Example:
  *
- *     <pre>{@code
+ * <pre>{@code
  * Some commment
  * @misc{key,
  *   fieldName = {fieldValue},
- *   otherFieldName = {otherVieldValue}
+ *   otherFieldName = {otherFieldValue}
  * }
- *     }</pre>
- *
- *     Then,
+ * }</pre>
+ * <p>
+ * Then,
  *     <ul>
  *         <li>"Some comment" is the comment before the entry,</li>
  *         <li>"misc" is the entry type</li>
  *         <li>"key" the citation key</li>
  *         <li>"fieldName" and "otherFieldName" the fields of the BibEntry</li>
  *     </ul>
- * </p>
- * <p>
  * A BibTeX entry has following properties:
  * <ul>
  *     <li>comments before entry</li>
@@ -87,7 +87,7 @@
  * </ul>
  * </p>
  * <p>
- * In case you search for a builder as described in Item 2 of the book "Effective Java", you won't find one. Please use the methods {@link #withCitationKey(String)} and {@link #withField(Field, String)}.
+ * In case you search for a builder as described in Item 2 of the book "Effective Java", you won't find one. Please use the methods {@link #withCitationKey(String)} and {@link #withField(Field, String)}. All these methods set {@link #hasChanged()} to <code>false</code>. In case <code>changed</code>, use {@link #withChanged(boolean)}.
  * </p>
  */
 @AllowedToUseLogic("because it needs access to parser and writers")
@@ -434,12 +434,10 @@ public Optional<FieldChange> setType(EntryType newType, EntriesEventSource event
     }
 
     /**
-     * Returns an {@link Collections#unmodifiableSet(Set)} containing the names of all fields that are set for this particular entry.
-     *
-     * @return a set of existing field names
+     * Returns an unmodifiable sequence containing the names of all fields that are set for this particular entry.
      */
-    public Set<Field> getFields() {
-        return Collections.unmodifiableSet(fields.keySet());
+    public SequencedSet<Field> getFields() {
+        return new LinkedHashSet<>(fields.keySet());
     }
 
     /**
@@ -945,6 +943,7 @@ public BibEntry withField(Field field, String value) {
      */
     public BibEntry withFields(Map<Field, String> content) {
         this.fields = FXCollections.observableMap(new HashMap<>(content));
+        this.setChanged(false);
         return this;
     }
 
@@ -969,6 +968,7 @@ public String getUserComments() {
 
     public BibEntry withUserComments(String commentsBeforeEntry) {
         this.commentsBeforeEntry = commentsBeforeEntry;
+        this.setChanged(false);
         return this;
     }
 
@@ -1039,6 +1039,12 @@ public Optional<FieldChange> setFiles(List<LinkedFile> files) {
         return this.setField(StandardField.FILE, newValue);
     }
 
+    public BibEntry withFiles(List<LinkedFile> files) {
+        setFiles(files);
+        this.setChanged(false);
+        return this;
+    }
+
     /**
      * Gets a list of linked files.
      *
diff --git a/src/main/java/org/jabref/model/entry/BibEntryType.java b/src/main/java/org/jabref/model/entry/BibEntryType.java
index 4908aec875c..b58a9e89098 100644
--- a/src/main/java/org/jabref/model/entry/BibEntryType.java
+++ b/src/main/java/org/jabref/model/entry/BibEntryType.java
@@ -4,6 +4,7 @@
 import java.util.Collections;
 import java.util.LinkedHashSet;
 import java.util.Objects;
+import java.util.SequencedSet;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -75,25 +76,25 @@ public Set<Field> getAllFields() {
         return fields.stream().map(BibField::field).collect(Collectors.toCollection(LinkedHashSet::new));
     }
 
-    public Set<Field> getPrimaryOptionalFields() {
+    public SequencedSet<Field> getPrimaryOptionalFields() {
         return getOptionalFields().stream()
                                   .filter(field -> field.priority() == FieldPriority.IMPORTANT)
                                   .map(BibField::field)
                                   .collect(Collectors.toCollection(LinkedHashSet::new));
     }
 
-    public Set<Field> getSecondaryOptionalFields() {
+    public SequencedSet<Field> getSecondaryOptionalFields() {
         return getOptionalFields().stream()
                                   .filter(field -> field.priority() == FieldPriority.DETAIL)
                                   .map(BibField::field)
                                   .collect(Collectors.toCollection(LinkedHashSet::new));
     }
 
-    public Set<Field> getDeprecatedFields(BibDatabaseMode mode) {
+    public SequencedSet<Field> getDeprecatedFields(BibDatabaseMode mode) {
         if (mode == BibDatabaseMode.BIBTEX) {
-            return Collections.emptySet();
+            return new LinkedHashSet<>();
         }
-        Set<Field> deprecatedFields = new LinkedHashSet<>(EntryConverter.FIELD_ALIASES_BIBTEX_TO_BIBLATEX.keySet());
+        SequencedSet<Field> deprecatedFields = new LinkedHashSet<>(EntryConverter.FIELD_ALIASES_BIBTEX_TO_BIBLATEX.keySet());
 
         // Only the optional fields which are mapped to another BibLaTeX name should be shown as "deprecated"
         deprecatedFields.retainAll(getOptionalFieldsAndAliases());
@@ -106,8 +107,8 @@ public Set<Field> getDeprecatedFields(BibDatabaseMode mode) {
         return deprecatedFields;
     }
 
-    public Set<Field> getSecondaryOptionalNotDeprecatedFields(BibDatabaseMode mode) {
-        Set<Field> optionalFieldsNotPrimaryOrDeprecated = new LinkedHashSet<>(getSecondaryOptionalFields());
+    public SequencedSet<Field> getSecondaryOptionalNotDeprecatedFields(BibDatabaseMode mode) {
+        SequencedSet<Field> optionalFieldsNotPrimaryOrDeprecated = new LinkedHashSet<>(getSecondaryOptionalFields());
         optionalFieldsNotPrimaryOrDeprecated.removeAll(getDeprecatedFields(mode));
         return optionalFieldsNotPrimaryOrDeprecated;
     }
@@ -115,8 +116,8 @@ public Set<Field> getSecondaryOptionalNotDeprecatedFields(BibDatabaseMode mode)
     /**
      * Get list of all optional fields of this entry and all fields being source for a BibTeX to BibLaTeX conversion.
      */
-    private Set<Field> getOptionalFieldsAndAliases() {
-        Set<Field> optionalFieldsAndAliases = new LinkedHashSet<>(getOptionalFields().size());
+    private SequencedSet<Field> getOptionalFieldsAndAliases() {
+        SequencedSet<Field> optionalFieldsAndAliases = new LinkedHashSet<>(getOptionalFields().size());
         for (BibField field : getOptionalFields()) {
             optionalFieldsAndAliases.add(field.field());
             if (EntryConverter.FIELD_ALIASES_BIBTEX_TO_BIBLATEX.containsKey(field.field())) {
diff --git a/src/main/java/org/jabref/model/entry/LinkedFile.java b/src/main/java/org/jabref/model/entry/LinkedFile.java
index e3c296f5c90..0eeb1c60bc0 100644
--- a/src/main/java/org/jabref/model/entry/LinkedFile.java
+++ b/src/main/java/org/jabref/model/entry/LinkedFile.java
@@ -18,15 +18,20 @@
 import javafx.beans.property.StringProperty;
 
 import org.jabref.architecture.AllowedToUseLogic;
+import org.jabref.logic.util.FileType;
 import org.jabref.logic.util.io.FileUtil;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.preferences.FilePreferences;
 
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
+
 /**
  * Represents the link to an external file (e.g. associated PDF file).
  * This class is {@link Serializable} which is needed for drag and drop in gui
  */
 @AllowedToUseLogic("Uses FileUtil from logic")
+@NullMarked
 public class LinkedFile implements Serializable {
 
     private static final String REGEX_URL = "^((?:https?\\:\\/\\/|www\\.)(?:[-a-z0-9]+\\.)*[-a-z0-9]+.*)";
@@ -43,8 +48,12 @@ public LinkedFile(String description, Path link, String fileType) {
         this(Objects.requireNonNull(description), Objects.requireNonNull(link).toString(), Objects.requireNonNull(fileType));
     }
 
+    public LinkedFile(String description, String link, FileType fileType) {
+        this(description, link, fileType.getName());
+    }
+
     /**
-     * Constructor for non-valid paths. We need to parse them, because the GUI needs to render it.
+     * Constructor can also be used for non-valid paths. We need to parse them, because the GUI needs to render it.
      */
     public LinkedFile(String description, String link, String fileType) {
         this.description.setValue(Objects.requireNonNull(description));
@@ -80,6 +89,10 @@ public void setFileType(String fileType) {
         this.fileType.setValue(fileType);
     }
 
+    public void setFileType(FileType fileType) {
+        this.setFileType(fileType.getName());
+    }
+
     public String getDescription() {
         return description.get();
     }
@@ -105,7 +118,7 @@ public Observable[] getObservables() {
     }
 
     @Override
-    public boolean equals(Object o) {
+    public boolean equals(@Nullable Object o) {
         if (this == o) {
             return true;
         }
@@ -128,7 +141,7 @@ private void writeObject(ObjectOutputStream out) throws IOException {
     }
 
     /**
-     * Reads serialized object from ObjectInputStreamm, automatically called
+     * Reads serialized object from {@link ObjectInputStream}, automatically called
      */
     private void readObject(ObjectInputStream in) throws IOException {
         fileType = new SimpleStringProperty(in.readUTF());
diff --git a/src/main/java/org/jabref/model/entry/field/StandardField.java b/src/main/java/org/jabref/model/entry/field/StandardField.java
index c286ca6ea3c..2d277de57b7 100644
--- a/src/main/java/org/jabref/model/entry/field/StandardField.java
+++ b/src/main/java/org/jabref/model/entry/field/StandardField.java
@@ -34,6 +34,7 @@ public enum StandardField implements Field {
     // Comments of users are handled at {@link org.jabref.model.entry.field.UserSpecificCommentField}
     COMMENT("comment", FieldProperty.COMMENT, FieldProperty.MULTILINE_TEXT, FieldProperty.VERBATIM),
     CROSSREF("crossref", FieldProperty.SINGLE_ENTRY_LINK),
+    CITES("cites", FieldProperty.MULTIPLE_ENTRY_LINK),
     DATE("date", FieldProperty.DATE),
     DAY("day"),
     DAYFILED("dayfiled"),
diff --git a/src/main/java/org/jabref/model/entry/field/UserSpecificCommentField.java b/src/main/java/org/jabref/model/entry/field/UserSpecificCommentField.java
index 56e45b7d11a..f56e61aceb1 100644
--- a/src/main/java/org/jabref/model/entry/field/UserSpecificCommentField.java
+++ b/src/main/java/org/jabref/model/entry/field/UserSpecificCommentField.java
@@ -32,10 +32,9 @@ public boolean equals(Object o) {
         if (this == o) {
             return true;
         }
-        if (!(o instanceof Field)) {
+        if (!(o instanceof Field other)) {
             return false;
         }
-        Field other = (Field) o;
         return name.equals(other.getName());
     }
 
diff --git a/src/main/java/org/jabref/model/entry/identifier/DOI.java b/src/main/java/org/jabref/model/entry/identifier/DOI.java
index b2fc250b739..aa7d2d2e66e 100644
--- a/src/main/java/org/jabref/model/entry/identifier/DOI.java
+++ b/src/main/java/org/jabref/model/entry/identifier/DOI.java
@@ -262,7 +262,7 @@ public Optional<URI> getExternalURIWithCustomBase(String customBase) {
         return getExternalURIFromBase(URI.create(customBase));
     }
 
-    private Optional<URI> getExternalURIFromBase(URI base) {
+    public Optional<URI> getExternalURIFromBase(URI base) {
         try {
             URI uri = new URI(base.getScheme(), base.getHost(), "/" + doi, null);
             return Optional.of(uri);
diff --git a/src/main/java/org/jabref/model/groups/AbstractGroup.java b/src/main/java/org/jabref/model/groups/AbstractGroup.java
index e61d3b30e52..5f0aa7cbcfe 100644
--- a/src/main/java/org/jabref/model/groups/AbstractGroup.java
+++ b/src/main/java/org/jabref/model/groups/AbstractGroup.java
@@ -70,7 +70,7 @@ public Optional<Color> getColor() {
     }
 
     public void setColor(Color color) {
-        this.color = Optional.of(color);
+        this.color = Optional.ofNullable(color);
     }
 
     public void setColor(String colorString) {
diff --git a/src/main/java/org/jabref/model/pdf/search/SearchFieldConstants.java b/src/main/java/org/jabref/model/pdf/search/SearchFieldConstants.java
index b4fa07c5d34..6d381a2b249 100644
--- a/src/main/java/org/jabref/model/pdf/search/SearchFieldConstants.java
+++ b/src/main/java/org/jabref/model/pdf/search/SearchFieldConstants.java
@@ -10,5 +10,5 @@ public class SearchFieldConstants {
 
     public static final String[] PDF_FIELDS = new String[]{PATH, CONTENT, PAGE_NUMBER, MODIFIED, ANNOTATIONS};
 
-    public static final String VERSION = "95";
+    public static final String VERSION = "99";
 }
diff --git a/src/main/java/org/jabref/model/search/rules/ContainsBasedSearchRule.java b/src/main/java/org/jabref/model/search/rules/ContainsBasedSearchRule.java
index 618d1771b95..8f4e7aad63c 100644
--- a/src/main/java/org/jabref/model/search/rules/ContainsBasedSearchRule.java
+++ b/src/main/java/org/jabref/model/search/rules/ContainsBasedSearchRule.java
@@ -54,6 +54,10 @@ public boolean applyRule(String query, BibEntry bibEntry) {
             }
         }
 
-        return getFulltextResults(query, bibEntry).numSearchResults() > 0; // Didn't match all words.
+        if (!searchFlags.contains(SearchRules.SearchFlags.FULLTEXT)) {
+            return false;
+        }
+
+        return getFulltextResults(query, bibEntry).numSearchResults() > 0;
     }
 }
diff --git a/src/main/java/org/jabref/model/search/rules/FullTextSearchRule.java b/src/main/java/org/jabref/model/search/rules/FullTextSearchRule.java
index 27cfbf65b8b..110d4128bb8 100644
--- a/src/main/java/org/jabref/model/search/rules/FullTextSearchRule.java
+++ b/src/main/java/org/jabref/model/search/rules/FullTextSearchRule.java
@@ -4,12 +4,12 @@
 import java.util.Collections;
 import java.util.EnumSet;
 import java.util.List;
-import java.util.stream.Collectors;
 
 import org.jabref.architecture.AllowedToUseLogic;
 import org.jabref.gui.Globals;
-import org.jabref.logic.pdf.search.retrieval.PdfSearcher;
-import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.logic.pdf.search.PdfIndexer;
+import org.jabref.logic.pdf.search.PdfIndexerManager;
+import org.jabref.logic.pdf.search.PdfSearcher;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.pdf.search.PdfSearchResults;
 import org.jabref.model.pdf.search.SearchResult;
@@ -30,16 +30,12 @@ public abstract class FullTextSearchRule implements SearchRule {
     protected final EnumSet<SearchRules.SearchFlags> searchFlags;
 
     protected String lastQuery;
-    protected List<SearchResult> lastSearchResults;
-
-    private final BibDatabaseContext databaseContext;
+    protected List<SearchResult> lastPdfSearchResults;
 
     public FullTextSearchRule(EnumSet<SearchRules.SearchFlags> searchFlags) {
         this.searchFlags = searchFlags;
         this.lastQuery = "";
-        lastSearchResults = Collections.emptyList();
-
-        databaseContext = Globals.stateManager.getActiveDatabase().orElse(null);
+        lastPdfSearchResults = Collections.emptyList();
     }
 
     public EnumSet<SearchRules.SearchFlags> getSearchFlags() {
@@ -48,24 +44,37 @@ public EnumSet<SearchRules.SearchFlags> getSearchFlags() {
 
     @Override
     public PdfSearchResults getFulltextResults(String query, BibEntry bibEntry) {
-        if (!searchFlags.contains(SearchRules.SearchFlags.FULLTEXT) || databaseContext == null) {
+        if (!searchFlags.contains(SearchRules.SearchFlags.FULLTEXT)) {
+            LOGGER.debug("Fulltext search results called even though fulltext search flag is missing.");
             return new PdfSearchResults();
         }
 
-        if (!query.equals(this.lastQuery)) {
+        if (query.equals(this.lastQuery)) {
+            LOGGER.trace("Reusing fulltext search results (query={}, lastQuery={}).", query, this.lastQuery);
+        } else {
+            LOGGER.trace("Performing full query {}.", query);
+            PdfIndexer pdfIndexer;
+            try {
+                pdfIndexer = PdfIndexerManager.getIndexer(Globals.stateManager.getActiveDatabase().get(), Globals.prefs.getFilePreferences());
+            } catch (IOException e) {
+                LOGGER.error("Could not access full text index.", e);
+                return new PdfSearchResults();
+            }
             this.lastQuery = query;
-            lastSearchResults = Collections.emptyList();
+            lastPdfSearchResults = Collections.emptyList();
             try {
-                PdfSearcher searcher = PdfSearcher.of(databaseContext);
+                PdfSearcher searcher = PdfSearcher.of(pdfIndexer);
                 PdfSearchResults results = searcher.search(query, 5);
-                lastSearchResults = results.getSortedByScore();
+                lastPdfSearchResults = results.getSortedByScore();
             } catch (IOException e) {
-                LOGGER.error("Could not retrieve search results!", e);
+                LOGGER.error("Could not retrieve search results.", e);
+                return new PdfSearchResults();
             }
         }
 
-        return new PdfSearchResults(lastSearchResults.stream()
-                                                     .filter(searchResult -> searchResult.isResultFor(bibEntry))
-                                                     .collect(Collectors.toList()));
+        // We found a number of PDF files, now we need to relate it to the current BibEntry
+        return new PdfSearchResults(lastPdfSearchResults.stream()
+                                                        .filter(searchResult -> searchResult.isResultFor(bibEntry))
+                                                        .toList());
     }
 }
diff --git a/src/main/java/org/jabref/model/search/rules/GrammarBasedSearchRule.java b/src/main/java/org/jabref/model/search/rules/GrammarBasedSearchRule.java
index fd281a11a0f..768c88f0303 100644
--- a/src/main/java/org/jabref/model/search/rules/GrammarBasedSearchRule.java
+++ b/src/main/java/org/jabref/model/search/rules/GrammarBasedSearchRule.java
@@ -1,6 +1,5 @@
 package org.jabref.model.search.rules;
 
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.EnumSet;
 import java.util.List;
@@ -13,14 +12,10 @@
 import java.util.stream.Collectors;
 
 import org.jabref.architecture.AllowedToUseLogic;
-import org.jabref.gui.Globals;
-import org.jabref.logic.pdf.search.retrieval.PdfSearcher;
-import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.Keyword;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.InternalField;
-import org.jabref.model.pdf.search.PdfSearchResults;
 import org.jabref.model.pdf.search.SearchResult;
 import org.jabref.model.search.rules.SearchRules.SearchFlags;
 import org.jabref.model.strings.StringUtil;
@@ -45,7 +40,7 @@
  * This class implements the "Advanced Search Mode" described in the help
  */
 @AllowedToUseLogic("Because access to the lucene index is needed")
-public class GrammarBasedSearchRule implements SearchRule {
+public class GrammarBasedSearchRule extends FullTextSearchRule {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(GrammarBasedSearchRule.class);
 
@@ -55,8 +50,6 @@ public class GrammarBasedSearchRule implements SearchRule {
     private String query;
     private List<SearchResult> searchResults = new ArrayList<>();
 
-    private final BibDatabaseContext databaseContext;
-
     public static class ThrowingErrorListener extends BaseErrorListener {
 
         public static final ThrowingErrorListener INSTANCE = new ThrowingErrorListener();
@@ -70,8 +63,8 @@ public void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol,
     }
 
     public GrammarBasedSearchRule(EnumSet<SearchFlags> searchFlags) throws RecognitionException {
+        super(searchFlags);
         this.searchFlags = searchFlags;
-        databaseContext = Globals.stateManager.getActiveDatabase().orElse(null);
     }
 
     public static boolean isValid(EnumSet<SearchFlags> searchFlags, String query) {
@@ -97,20 +90,9 @@ private void init(String query) throws ParseCancellationException {
         SearchParser parser = new SearchParser(new CommonTokenStream(lexer));
         parser.removeErrorListeners(); // no infos on file system
         parser.addErrorListener(ThrowingErrorListener.INSTANCE);
-        parser.setErrorHandler(new BailErrorStrategy()); // ParseCancelationException on parse errors
+        parser.setErrorHandler(new BailErrorStrategy()); // ParseCancellationException on parse errors
         tree = parser.start();
         this.query = query;
-
-        if (!searchFlags.contains(SearchRules.SearchFlags.FULLTEXT) || (databaseContext == null)) {
-            return;
-        }
-        try {
-            PdfSearcher searcher = PdfSearcher.of(databaseContext);
-            PdfSearchResults results = searcher.search(query, 5);
-            searchResults = results.getSortedByScore();
-        } catch (IOException e) {
-            LOGGER.error("Could not retrieve search results!", e);
-        }
     }
 
     @Override
@@ -118,16 +100,11 @@ public boolean applyRule(String query, BibEntry bibEntry) {
         try {
             return new BibtexSearchVisitor(searchFlags, bibEntry).visit(tree);
         } catch (Exception e) {
-            LOGGER.debug("Search failed", e);
-            return getFulltextResults(query, bibEntry).numSearchResults() > 0;
+            LOGGER.info("Search failed", e);
+            return false;
         }
     }
 
-    @Override
-    public PdfSearchResults getFulltextResults(String query, BibEntry bibEntry) {
-        return new PdfSearchResults(searchResults.stream().filter(searchResult -> searchResult.isResultFor(bibEntry)).collect(Collectors.toList()));
-    }
-
     @Override
     public boolean validateSearchStrings(String query) {
         try {
diff --git a/src/main/java/org/jabref/preferences/ExternalApplicationsPreferences.java b/src/main/java/org/jabref/preferences/ExternalApplicationsPreferences.java
index 45670b68a28..992038c80f3 100644
--- a/src/main/java/org/jabref/preferences/ExternalApplicationsPreferences.java
+++ b/src/main/java/org/jabref/preferences/ExternalApplicationsPreferences.java
@@ -1,17 +1,21 @@
 package org.jabref.preferences;
 
 import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 
+import org.jabref.logic.push.CitationCommandString;
+
 public class ExternalApplicationsPreferences {
 
     private final StringProperty eMailSubject;
     private final BooleanProperty shouldAutoOpenEmailAttachmentsFolder;
-    private final StringProperty citeCommand;
+    private final ObjectProperty<CitationCommandString> citeCommand;
 
-    private final StringProperty defaultCiteCommand;
+    private final ObjectProperty<CitationCommandString> defaultCiteCommand;
 
     private final BooleanProperty useCustomTerminal;
     private final StringProperty customTerminalCommand;
@@ -21,8 +25,8 @@ public class ExternalApplicationsPreferences {
 
     public ExternalApplicationsPreferences(String eMailSubject,
                                            boolean shouldAutoOpenEmailAttachmentsFolder,
-                                           String citeCommand,
-                                           String defaultCiteCommand,
+                                           CitationCommandString citeCommand,
+                                           CitationCommandString defaultCiteCommand,
                                            boolean useCustomTerminal,
                                            String customTerminalCommand,
                                            boolean useCustomFileBrowser,
@@ -31,8 +35,8 @@ public ExternalApplicationsPreferences(String eMailSubject,
 
         this.eMailSubject = new SimpleStringProperty(eMailSubject);
         this.shouldAutoOpenEmailAttachmentsFolder = new SimpleBooleanProperty(shouldAutoOpenEmailAttachmentsFolder);
-        this.citeCommand = new SimpleStringProperty(citeCommand);
-        this.defaultCiteCommand = new SimpleStringProperty(defaultCiteCommand);
+        this.citeCommand = new SimpleObjectProperty<>(citeCommand);
+        this.defaultCiteCommand = new SimpleObjectProperty<>(defaultCiteCommand);
         this.useCustomTerminal = new SimpleBooleanProperty(useCustomTerminal);
         this.customTerminalCommand = new SimpleStringProperty(customTerminalCommand);
         this.useCustomFileBrowser = new SimpleBooleanProperty(useCustomFileBrowser);
@@ -64,15 +68,15 @@ public void setAutoOpenEmailAttachmentsFolder(boolean shouldAutoOpenEmailAttachm
         this.shouldAutoOpenEmailAttachmentsFolder.set(shouldAutoOpenEmailAttachmentsFolder);
     }
 
-    public String getCiteCommand() {
+    public CitationCommandString getCiteCommand() {
         return citeCommand.get();
     }
 
-    public StringProperty citeCommandProperty() {
+    public ObjectProperty<CitationCommandString> citeCommandProperty() {
         return citeCommand;
     }
 
-    public void setCiteCommand(String citeCommand) {
+    public void setCiteCommand(CitationCommandString citeCommand) {
         this.citeCommand.set(citeCommand);
     }
 
@@ -136,7 +140,7 @@ public void setKindleEmail(String kindleEmail) {
         this.kindleEmail.set(kindleEmail);
     }
 
-    public String getDefaultCiteCommand() {
+    public CitationCommandString getDefaultCiteCommand() {
         return defaultCiteCommand.getValue();
     }
 }
diff --git a/src/main/java/org/jabref/preferences/GuiPreferences.java b/src/main/java/org/jabref/preferences/GuiPreferences.java
index 06a948741a1..479889efdc0 100644
--- a/src/main/java/org/jabref/preferences/GuiPreferences.java
+++ b/src/main/java/org/jabref/preferences/GuiPreferences.java
@@ -246,12 +246,4 @@ public void setSidePaneWidth(double sidePaneWidth) {
     public BooleanProperty mergeShowChangedFieldOnlyProperty() {
         return mergeShowChangedFieldsOnly;
     }
-
-    public boolean isMergeShowChangedFieldsOnly() {
-        return mergeShowChangedFieldsOnly.getValue();
-    }
-
-    public void setIsMergedShowChangedFielsOnly(boolean showChangedFieldsOnly) {
-        mergeShowChangedFieldsOnly.setValue(showChangedFieldsOnly);
-    }
 }
diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java
index e76d61223ff..30670250f62 100644
--- a/src/main/java/org/jabref/preferences/JabRefPreferences.java
+++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java
@@ -97,6 +97,7 @@
 import org.jabref.logic.preview.PreviewLayout;
 import org.jabref.logic.protectedterms.ProtectedTermsLoader;
 import org.jabref.logic.protectedterms.ProtectedTermsPreferences;
+import org.jabref.logic.push.CitationCommandString;
 import org.jabref.logic.remote.RemotePreferences;
 import org.jabref.logic.shared.prefs.SharedDatabasePreferences;
 import org.jabref.logic.shared.security.Password;
@@ -257,6 +258,8 @@ public class JabRefPreferences implements PreferencesService {
 
     public static final String MERGE_SHOW_ONLY_CHANGED_FIELDS = "mergeShowOnlyChangedFields";
 
+    public static final String SHOW_USER_COMMENTS_FIELDS = "showUserCommentsFields";
+
     public static final String CUSTOM_EXPORT_FORMAT = "customExportFormat";
     public static final String CUSTOM_IMPORT_FORMAT = "customImportFormat";
     public static final String KEY_PATTERN_REGEX = "KeyPatternRegex";
@@ -638,6 +641,8 @@ private JabRefPreferences() {
         defaults.put(MERGE_ENTRIES_HIGHLIGHT_WORDS, Boolean.TRUE);
         defaults.put(MERGE_SHOW_ONLY_CHANGED_FIELDS, Boolean.FALSE);
 
+        defaults.put(SHOW_USER_COMMENTS_FIELDS, Boolean.TRUE);
+
         defaults.put(SHOW_RECOMMENDATIONS, Boolean.TRUE);
         defaults.put(ACCEPT_RECOMMENDATIONS, Boolean.FALSE);
         defaults.put(SHOW_LATEX_CITATIONS, Boolean.TRUE);
@@ -732,7 +737,13 @@ private JabRefPreferences() {
         defaults.put(KEY_GEN_ALWAYS_ADD_LETTER, Boolean.FALSE);
         defaults.put(EMAIL_SUBJECT, Localization.lang("References"));
         defaults.put(KINDLE_EMAIL, "");
-        defaults.put(OPEN_FOLDERS_OF_ATTACHED_FILES, Boolean.FALSE);
+
+        if (OS.WINDOWS) {
+            defaults.put(OPEN_FOLDERS_OF_ATTACHED_FILES, Boolean.TRUE);
+        } else {
+            defaults.put(OPEN_FOLDERS_OF_ATTACHED_FILES, Boolean.FALSE);
+        }
+
         defaults.put(WEB_SEARCH_VISIBLE, Boolean.TRUE);
         defaults.put(GROUP_SIDEPANE_VISIBLE, Boolean.TRUE);
         defaults.put(SELECTED_FETCHER_INDEX, 0);
@@ -891,7 +902,7 @@ private static Optional<String> getNextUnit(Reader data) throws IOException {
                 escape = false;
             }
         }
-        if (res.length() > 0) {
+        if (!res.isEmpty()) {
             return Optional.of(res.toString());
         } else if (c == -1) {
             // end of stream
@@ -1173,6 +1184,7 @@ public void importPreferences(Path file) throws JabRefException {
     public LayoutFormatterPreferences getLayoutFormatterPreferences() {
         return new LayoutFormatterPreferences(
                 getNameFormatterPreferences(),
+                getDOIPreferences(),
                 getFilePreferences().mainFileDirectoryProperty());
     }
 
@@ -1452,7 +1464,8 @@ public EntryEditorPreferences getEntryEditorPreferences() {
                 getDouble(ENTRY_EDITOR_HEIGHT),
                 getBoolean(AUTOLINK_FILES_ENABLED),
                 EntryEditorPreferences.JournalPopupEnabled.fromString(get(JOURNAL_POPUP)),
-                getBoolean(SHOW_SCITE_TAB));
+                getBoolean(SHOW_SCITE_TAB),
+                getBoolean(SHOW_USER_COMMENTS_FIELDS));
 
         EasyBind.listen(entryEditorPreferences.entryEditorTabs(), (obs, oldValue, newValue) -> storeEntryEditorTabs(newValue));
         // defaultEntryEditorTabs are read-only
@@ -1466,6 +1479,7 @@ public EntryEditorPreferences getEntryEditorPreferences() {
         EasyBind.listen(entryEditorPreferences.autoLinkEnabledProperty(), (obs, oldValue, newValue) -> putBoolean(AUTOLINK_FILES_ENABLED, newValue));
         EasyBind.listen(entryEditorPreferences.enableJournalPopupProperty(), (obs, oldValue, newValue) -> put(JOURNAL_POPUP, newValue.toString()));
         EasyBind.listen(entryEditorPreferences.shouldShowLSciteTabProperty(), (obs, oldValue, newValue) -> putBoolean(SHOW_SCITE_TAB, newValue));
+        EasyBind.listen(entryEditorPreferences.showUserCommentsFieldsProperty(), (obs, oldValue, newValue) -> putBoolean(SHOW_USER_COMMENTS_FIELDS, newValue));
 
         return entryEditorPreferences;
     }
@@ -1664,7 +1678,7 @@ public void storeGlobalCitationKeyPattern(GlobalCitationKeyPattern pattern) {
                 || pattern.getDefaultValue().isEmpty()) {
             put(DEFAULT_CITATION_KEY_PATTERN, "");
         } else {
-            put(DEFAULT_CITATION_KEY_PATTERN, pattern.getDefaultValue().get(0));
+            put(DEFAULT_CITATION_KEY_PATTERN, pattern.getDefaultValue().getFirst());
         }
 
         // Store overridden definitions to Preferences.
@@ -1679,7 +1693,7 @@ public void storeGlobalCitationKeyPattern(GlobalCitationKeyPattern pattern) {
         for (EntryType entryType : pattern.getAllKeys()) {
             if (!pattern.isDefaultValue(entryType)) {
                 // first entry in the map is the full pattern
-                preferences.put(entryType.getName(), pattern.getValue(entryType).get(0));
+                preferences.put(entryType.getName(), pattern.getValue(entryType).getFirst());
             }
         }
     }
@@ -1804,8 +1818,8 @@ public ExternalApplicationsPreferences getExternalApplicationsPreferences() {
         externalApplicationsPreferences = new ExternalApplicationsPreferences(
                 get(EMAIL_SUBJECT),
                 getBoolean(OPEN_FOLDERS_OF_ATTACHED_FILES),
-                get(CITE_COMMAND),
-                (String) defaults.get(CITE_COMMAND),
+                CitationCommandString.from(get(CITE_COMMAND)),
+                CitationCommandString.from((String) defaults.get(CITE_COMMAND)),
                 !getBoolean(USE_DEFAULT_CONSOLE_APPLICATION), // mind the !
                 get(CONSOLE_COMMAND),
                 !getBoolean(USE_DEFAULT_FILE_BROWSER_APPLICATION), // mind the !
@@ -1817,7 +1831,7 @@ public ExternalApplicationsPreferences getExternalApplicationsPreferences() {
         EasyBind.listen(externalApplicationsPreferences.autoOpenEmailAttachmentsFolderProperty(),
                 (obs, oldValue, newValue) -> putBoolean(OPEN_FOLDERS_OF_ATTACHED_FILES, newValue));
         EasyBind.listen(externalApplicationsPreferences.citeCommandProperty(),
-                (obs, oldValue, newValue) -> put(CITE_COMMAND, newValue));
+                (obs, oldValue, newValue) -> put(CITE_COMMAND, newValue.toString()));
         EasyBind.listen(externalApplicationsPreferences.useCustomTerminalProperty(),
                 (obs, oldValue, newValue) -> putBoolean(USE_DEFAULT_CONSOLE_APPLICATION, !newValue)); // mind the !
         EasyBind.listen(externalApplicationsPreferences.customTerminalCommandProperty(),
@@ -1832,6 +1846,7 @@ public ExternalApplicationsPreferences getExternalApplicationsPreferences() {
         return externalApplicationsPreferences;
     }
 
+
     //*************************************************************************************************************
     // Main table and search dialog preferences
     //*************************************************************************************************************
@@ -2277,8 +2292,8 @@ private void storeExportSaveOrder(SaveOrder saveOrder) {
 
         long saveOrderCount = saveOrder.getSortCriteria().size();
         if (saveOrderCount >= 1) {
-            put(EXPORT_PRIMARY_SORT_FIELD, saveOrder.getSortCriteria().get(0).field.getName());
-            putBoolean(EXPORT_PRIMARY_SORT_DESCENDING, saveOrder.getSortCriteria().get(0).descending);
+            put(EXPORT_PRIMARY_SORT_FIELD, saveOrder.getSortCriteria().getFirst().field.getName());
+            putBoolean(EXPORT_PRIMARY_SORT_DESCENDING, saveOrder.getSortCriteria().getFirst().descending);
         } else {
             put(EXPORT_PRIMARY_SORT_FIELD, "");
             putBoolean(EXPORT_PRIMARY_SORT_DESCENDING, false);
@@ -2331,7 +2346,7 @@ private List<TemplateExporter> getCustomExportFormats() {
         for (String toImport : getSeries(CUSTOM_EXPORT_FORMAT)) {
             List<String> formatData = convertStringToList(toImport);
             TemplateExporter format = new TemplateExporter(
-                    formatData.get(EXPORTER_NAME_INDEX),
+                    formatData.getFirst(),
                     formatData.get(EXPORTER_FILENAME_INDEX),
                     formatData.get(EXPORTER_EXTENSION_INDEX),
                     layoutPreferences,
@@ -2348,10 +2363,10 @@ private void storeCustomExportFormats(List<TemplateExporter> exporters) {
         } else {
             for (int i = 0; i < exporters.size(); i++) {
                 List<String> exporterData = new ArrayList<>();
-                exporterData.add(EXPORTER_NAME_INDEX, exporters.get(i).getName());
+                exporterData.addFirst(exporters.get(i).getName());
                 exporterData.add(EXPORTER_FILENAME_INDEX, exporters.get(i).getLayoutFileName());
                 // Only stores the first extension associated with FileType
-                exporterData.add(EXPORTER_EXTENSION_INDEX, exporters.get(i).getFileType().getExtensions().get(0));
+                exporterData.add(EXPORTER_EXTENSION_INDEX, exporters.get(i).getFileType().getExtensions().getFirst());
                 putStringList(CUSTOM_EXPORT_FORMAT + i, exporterData);
             }
             purgeSeries(CUSTOM_EXPORT_FORMAT, exporters.size());
@@ -2612,7 +2627,6 @@ public GuiPreferences getGuiPreferences() {
         EasyBind.listen(guiPreferences.mergeHighlightWordsProperty(), (obs, oldValue, newValue) -> putBoolean(MERGE_ENTRIES_HIGHLIGHT_WORDS, newValue));
         EasyBind.listen(guiPreferences.sidePaneWidthProperty(), (obs, oldValue, newValue) -> putDouble(SIDE_PANE_WIDTH, newValue.doubleValue()));
         EasyBind.listen(guiPreferences.mergeShowChangedFieldOnlyProperty(), (obs, oldValue, newValue) -> putBoolean(MERGE_SHOW_ONLY_CHANGED_FIELDS, newValue));
-
         return guiPreferences;
     }
 
@@ -2856,7 +2870,7 @@ private Set<CustomImporter> getCustomImportFormats() {
                     importers.add(new CustomImporter(importerString.get(3), importerString.get(2)));
                 }
             } catch (Exception e) {
-                LOGGER.warn("Could not load {} from preferences. Will ignore.", importerString.get(0), e);
+                LOGGER.warn("Could not load {} from preferences. Will ignore.", importerString.getFirst(), e);
             }
         }
 
diff --git a/src/main/resources/build.properties b/src/main/resources/build.properties
index 6e646dd0160..e875158b817 100644
--- a/src/main/resources/build.properties
+++ b/src/main/resources/build.properties
@@ -6,4 +6,4 @@ springerNatureAPIKey=${springerNatureAPIKey}
 astrophysicsDataSystemAPIKey=${astrophysicsDataSystemAPIKey}
 ieeeAPIKey=${ieeeAPIKey}
 biodiversityHeritageApiKey=${biodiversityHeritageApiKey}
-
+semanticScholarApiKey=${semanticScholarApiKey}
diff --git a/src/main/resources/csl-styles b/src/main/resources/csl-styles
index 5bea241e5a2..eedecef83f6 160000
--- a/src/main/resources/csl-styles
+++ b/src/main/resources/csl-styles
@@ -1 +1 @@
-Subproject commit 5bea241e5a2acacc29b947e21539be9cbe79c8bd
+Subproject commit eedecef83f6a02dfc2068fc382b561045653b4b2
diff --git a/src/main/resources/l10n/JabRef_ar.properties b/src/main/resources/l10n/JabRef_ar.properties
index e8ee52e3281..fe50ef76cab 100644
--- a/src/main/resources/l10n/JabRef_ar.properties
+++ b/src/main/resources/l10n/JabRef_ar.properties
@@ -89,6 +89,7 @@ Cancel=إلغاء
 
 
 
+
 Change\ case=غيّر حجم الأحرف
 
 Change\ entry\ type=تغيير نوع المرجع
@@ -654,6 +655,10 @@ Import\ preferences\ from\ a\ file=استيراد الإعدادات من ملف
 
 
 
+
+
+
+
 Add\ to\ current\ library=إضافة إلى المكتبة الحالية
 
 
@@ -729,6 +734,12 @@ 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 76c4ec3b2ea..042f435f82e 100644
--- a/src/main/resources/l10n/JabRef_da.properties
+++ b/src/main/resources/l10n/JabRef_da.properties
@@ -103,6 +103,7 @@ Case\ sensitive=Skeln mellem store og små bogstaver
 
 change\ assignment\ of\ entries=ændre tildeling af poster
 
+
 Change\ case=Ændre store/små bogstaver
 
 Change\ entry\ type=Ændre posttype
@@ -383,7 +384,6 @@ Language=Sprog
 
 Last\ modified=Sidst ændret
 
-Listen\ for\ remote\ operation\ on\ port=Lyt efter fjernoperationer på port
 
 
 Manage\ custom\ exports=Opsæt eksterne eksportfiltre
@@ -725,7 +725,6 @@ Error\ while\ fetching\ from\ %0=Fejl under hentning fra %0
 Unable\ to\ open\ link.=Kan ikke åbne link.
 MIME\ type=MIME-type
 
-This\ feature\ lets\ new\ files\ be\ opened\ or\ imported\ into\ an\ already\ running\ instance\ of\ JabRef\ instead\ of\ opening\ a\ new\ instance.\ For\ instance,\ this\ is\ useful\ when\ you\ open\ a\ file\ in\ JabRef\ from\ your\ web\ browser.\ Note\ that\ this\ will\ prevent\ you\ from\ running\ more\ than\ one\ instance\ of\ JabRef\ at\ a\ time.=Denne funktion tillader, at flere filer kan åbnes eller importeres i en allerede kørende JabRef i stedet for at åbne programmet påny. For eksempel er dette praktisk, når du åbner filer i JabRef fra din web browser. Bemærk at dette vil forhindre dig i at køre mere end en instans af JabRef ad gangen.
 
 Rename\ field=Omdøb felt
 
@@ -973,6 +972,10 @@ Find\ and\ replace=Søg og erstat
 
 
 
+
+
+
+
 Always\ add\ letter\ (a,\ b,\ ...)\ to\ generated\ keys=Tilføj altid bogstav (a, b, ...) til genererede nøgler
 Default\ pattern=Standardmønster
 
@@ -1047,6 +1050,12 @@ Default\ pattern=Standardmønster
 
 
 
+
+
+
+
+
+
 
 
 
diff --git a/src/main/resources/l10n/JabRef_de.properties b/src/main/resources/l10n/JabRef_de.properties
index 4ef754ae16d..a540673fdbe 100644
--- a/src/main/resources/l10n/JabRef_de.properties
+++ b/src/main/resources/l10n/JabRef_de.properties
@@ -131,6 +131,8 @@ Case\ sensitive=Groß-/Kleinschreibung
 
 change\ assignment\ of\ entries=Änderung der zugewiesenen Einträge
 
+Catalogues\ used\ for\ 'Search\ Selected'=Kataloge für 'In Ausgewählten suchen'
+
 Change\ case=Groß- und Kleinschreibung
 
 Change\ entry\ type=Eintragstyp ändern
@@ -168,12 +170,12 @@ Copied=Kopiert
 Copy=Kopieren
 
 Copy\ title=Kopiere Titel
-Copy\ \\cite{citation\ key}=Kopiere \\cite{citation key}
 Copy\ citation\ (html)=Zitat kopieren (html)
 Copy\ citation\ (text)=Zitat kopieren (Text)
 Copy\ citation\ key=Kopiere Zitationsschlüssel
 Copy\ citation\ key\ and\ link=Zitationscchlüssel und Titel kopieren
 Copy\ citation\ key\ and\ title=Zitationscchlüssel und Titel kopieren
+Copy\ citation\ key\ with\ configured\ cite\ command=Zitierschlüssel mit konfiguriertem Zitierbefehl kopieren
 
 Copy\ to\ clipboard=In die Zwischenablage kopieren
 
@@ -477,7 +479,6 @@ 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
@@ -520,7 +521,6 @@ Last\ modified=zuletzt geändert
 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)
@@ -839,6 +839,7 @@ Search\ results\ from\ open\ libraries=Suchergebnisse aus offenen Bibliotheken
 Select\ all=Alle auswählen
 Select\ new\ encoding=Neue Kodierung auswählen
 
+Select\ library=Bibliothek auswählen
 Select\ entry\ type=Eintragstyp auswählen
 
 Select\ file\ from\ ZIP-archive=Eintrag aus der ZIP-Archiv auswählen
@@ -1008,7 +1009,6 @@ Citation\ key\ generator=Zitationsschlüsselgenerator
 Unable\ to\ open\ link.=Öffnen des Links nicht möglich
 MIME\ type=MIME-Typ
 
-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.=Diese Funktion öffnet neue oder importierte Dateien in einer bereits laufenden Instanz von JabRef und nicht in einem neuen Fenster. Das ist beispielsweise nützlich, wenn Sie JabRef von einem Webbrowser aus starten. Beachten Sie, dass damit nicht mehr als eine Instanz von JabRef gestartet werden kann.
 Run\ fetcher=Fetcher ausführen
 
 Line\ %0\:\ Found\ corrupted\ citation\ key\ %1.=Zeile %0\: Beschädigter Zitationsschlüssel %1 gefunden.
@@ -1557,6 +1557,7 @@ Looking\ up\ %0...\ -\ entry\ %1\ out\ of\ %2\ -\ found\ %3=Schlage %0 nach... -
 Audio\ CD=Audio CD
 British\ patent=Britisches Patent
 British\ patent\ request=Britischer Patentantrag
+Bachelor's\ thesis=Bachelorarbeit
 Candidate\ thesis=Beliebige Abschlussarbeit
 Collaborator=Mitarbeiter
 Column=Spalte
@@ -2039,12 +2040,28 @@ Matching=Passend
 Same\ as\ --import,\ but\ will\ be\ imported\ to\ the\ opened\ tab=Wie --import, aber wird in den geöffneten Tab importiert
 Allow\ integers\ in\ 'edition'\ field\ in\ BibTeX\ mode=Ganzzahlen im Feld 'edition' im BibTeX-Modus erlauben
 
+Please\ enter\ a\ name\ for\ the\ MIME\ type.=Bitte geben Sie einen Namen für den MIME-Typ ein.
+Please\ enter\ a\ name\ for\ the\ extension.=Bitte geben Sie einen Namen für die Dateierweiterung ein.
+Please\ enter\ a\ name.=Bitte geben Sie einen Namen ein.
+
+There\ already\ exists\ an\ external\ file\ type\ with\ the\ same\ MIME\ type=Es existiert bereits ein externer Dateityp mit dem gleichen MIME-Typ
+There\ already\ exists\ an\ external\ file\ type\ with\ the\ same\ extension=Es existiert bereits ein externer Dateityp mit der gleichen Erweiterung
+There\ already\ exists\ an\ external\ file\ type\ with\ the\ same\ name=Es existiert bereits ein externer Dateityp mit dem gleichen Namen
+
+
 Search\ for\ citations\ in\ LaTeX\ files...=Suche nach Zitaten in LaTeX Dateien...
 LaTeX\ Citations\ Search\ Results=Suchergebnisse der Zitate aus LaTeX
 LaTeX\ files\ directory\:=LaTeX-Dateiverzeichnis\:
 LaTeX\ files\ found\:=LaTeX-Dateien gefunden\:
 files=Dateien
 Show\ 'LaTeX\ Citations'\ tab=Zeige 'LaTeX Zitate' Reiter
+Show\ 'Scite'\ tab=Zeige 'Scite' Reiter
+Search\ scite.ai\ for\ Smart\ Citations=Durchsuche scite.ai nach smarten Referenzen
+See\ full\ report\ at\ [%0]=Vollständigen Bericht unter [%0] ansehen
+No\ active\ entry=Kein aktiver Eintrag
+This\ entry\ does\ not\ have\ a\ DOI=Dieser Eintrag hat keine DOI
+Tallies\ for\ %0=Anzahl für %0
+
 LaTeX\ Citations=LaTeX-Zitate
 Search\ citations\ for\ this\ entry\ in\ LaTeX\ files=Zitate für diesen Eintrag in LaTeX-Dateien suchen
 No\ citations\ found=Keine Zitate gefunden
@@ -2084,6 +2101,7 @@ Font\ settings=Schrifteinstellungen
 Custom...=Benutzerdefiniert...
 Dark=Dunkel
 Light=Hell
+Use\ System\ Preference=Systemeinstellung verwenden
 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
@@ -2602,3 +2620,19 @@ Help\ on\ external\ applications=Hilfe zu externen Anwendungen
 Identifier-based\ Web\ Search=Identifikator-basierte Websuche
 
 Pushing\ citations\ to\ TeXShop\ is\ only\ possible\ on\ macOS\!=Zitate in TeXShop zu übertragen ist nur auf macOS möglich\!
+
+Single\ instance=Einzelne Instanz
+Enforce\ single\ JabRef\ instance\ (and\ allow\ remote\ operations)\ using\ port=Erzwinge eine einzige JabRef-Instanz (und erlaube Remote-Operationen) über Port
+
+
+Enable\ Journal\ Information\ Fetching?=Journalinformationen abrufen?
+Would\ you\ like\ to\ enable\ fetching\ of\ journal\ information?\ This\ can\ be\ changed\ later\ in\ %0\ >\ %1.=Möchten Sie das Abrufen von Journal-Informationen aktivieren? Dies kann später in %0 > %1 geändert werden.
+Enable=Aktivieren
+Keep\ disabled=Deaktiviert lassen
+
+Predatory\ journal\ %0\ found=Betrügerisches Journal %0 gefunden
+
+Hide\ user\ comments=Benutzerkommentare ausblenden
+Show\ user\ comments\ field=Benutzerkommentarfeld anzeigen
+
+More\ options...=Weitere Optionen...
diff --git a/src/main/resources/l10n/JabRef_el.properties b/src/main/resources/l10n/JabRef_el.properties
index cd5f95e3942..8b1e418848f 100644
--- a/src/main/resources/l10n/JabRef_el.properties
+++ b/src/main/resources/l10n/JabRef_el.properties
@@ -131,6 +131,7 @@ Case\ sensitive=Διάκριση πεζών - κεφαλαίων
 
 change\ assignment\ of\ entries=αλλαγή ανάθεσης των καταχωρήσεων
 
+
 Change\ case=Αλλαγή πεζών - κεφαλαίων
 
 Change\ entry\ type=Αλλαγή τύπου εγγραφής
@@ -168,7 +169,6 @@ Copied=Αντιγράφηκε
 Copy=Αντιγραφή
 
 Copy\ title=Αντιγραφή τίτλου
-Copy\ \\cite{citation\ key}=Αντιγραφή \\cite{citation key}
 Copy\ citation\ (html)=Αντιγραφή αναφοράς (σε μορφή HTML)
 Copy\ citation\ (text)=Αντιγραφή αναφοράς (σε μορφή κειμένου)
 Copy\ citation\ key=Αντιγραφή κλειδιού αναφοράς
@@ -483,7 +483,6 @@ Last\ modified=Τελευταία τροποποίηση
 LaTeX\ AUX\ file\:=Αρχείο LaTeX AUX\:
 
 Link=Σύνδεση
-Listen\ for\ remote\ operation\ on\ port=Αναμονή για απομακρυσμένη λειτουργία στη θύρα
 
 Show\ advanced\ hints\ (i.e.\ helpful\ tooltips,\ suggestions\ and\ explanation)=Εμφάνιση προηγμένων υποδείξεων (π.χ. χρήσιμες συμβουλές, προτάσεις και επεξήγηση)
 
@@ -958,7 +957,6 @@ Citation\ key\ generator=Δημιουργός κλειδιού αναφοράς
 Unable\ to\ open\ link.=Αδυναμία ανοίγματος συνδέσμου.
 MIME\ type=Τύπος MIME
 
-This\ feature\ lets\ new\ files\ be\ opened\ or\ imported\ into\ an\ already\ running\ instance\ of\ JabRef\ instead\ of\ opening\ a\ new\ instance.\ For\ instance,\ this\ is\ useful\ when\ you\ open\ a\ file\ in\ JabRef\ from\ your\ web\ browser.\ Note\ that\ this\ will\ prevent\ you\ from\ running\ more\ than\ one\ instance\ of\ JabRef\ at\ a\ time.=Το χαρακτηριστικό αυτό επιτρέπει το άνοιγμα ή την εισαγωγή νέων αρχείων σε ένα ήδη τρέχον παράθυρο JabRef αντί να ανοίγει νέο παράθυρο. Για παράδειγμα, αυτό είναι χρήσιμο όταν ανοίγετε ένα αρχείο JabRef από τον περιηγητή ιστού. Σημειώστε πως αυτό θα σας εμποδίσει από το να τρέξετε περισσότερα από ένα παράθυρα JabRef ταυτόχρονα.
 Run\ fetcher=Εκτέλεση ανακτήσεων
 
 Line\ %0\:\ Found\ corrupted\ citation\ key\ %1.=Γραμμή %0\: Βρέθηκε κατεστραμμένο κλειδί αναφοράς %1.
@@ -1778,6 +1776,10 @@ Executing\ command\ "%0"...=Πραγματοποιείται εκτέλεση ε
 
 
 
+
+
+
+
 Always\ add\ letter\ (a,\ b,\ ...)\ to\ generated\ keys=Πάντα να προστίθεται γράμμα (a, b, ...) στα κλειδιά που δημιουργούνται
 Default\ pattern=Προεπιλεγμένο μοτίβο
 
@@ -1874,3 +1876,9 @@ 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 e111db9d9b1..3e766da2048 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -170,12 +170,12 @@ Copied=Copied
 Copy=Copy
 
 Copy\ title=Copy title
-Copy\ \\cite{citation\ key}=Copy \\cite{citation key}
 Copy\ citation\ (html)=Copy citation (html)
 Copy\ citation\ (text)=Copy citation (text)
 Copy\ citation\ key=Copy citation key
 Copy\ citation\ key\ and\ link=Copy citation key and link
 Copy\ citation\ key\ and\ title=Copy citation key and title
+Copy\ citation\ key\ with\ configured\ cite\ command=Copy citation key with configured cite command
 
 Copy\ to\ clipboard=Copy to clipboard
 
@@ -1866,8 +1866,6 @@ Delete\ '%0'\ permanently\ from\ disk,\ or\ just\ remove\ the\ file\ from\ the\
 Delete\ '%0'=Delete '%0'
 Delete\ from\ disk=Delete from disk
 Remove\ from\ entry=Remove from entry
-There\ exists\ already\ a\ group\ with\ the\ same\ name.=There exists already a group with the same name.
-If\ you\ use\ it,\ it\ will\ inherit\ all\ entries\ from\ this\ other\ group.=If you use it, it will inherit all entries from this other group.
 
 Copy\ linked\ file=Copy linked file
 Copy\ linked\ file\ to\ folder...=Copy linked file to folder...
@@ -1899,6 +1897,7 @@ Invalid\ identifier\:\ '%0'.=Invalid identifier: '%0'.
 empty\ citation\ key=empty citation key
 Aux\ file=Aux file
 Group\ containing\ entries\ cited\ in\ a\ given\ TeX\ file=Group containing entries cited in a given TeX file
+There\ already\ exists\ a\ group\ with\ the\ same\ name.\nIf\ you\ use\ it,\ it\ will\ inherit\ all\ entries\ from\ this\ other\ group.=There already exists a group with the same name.\nIf you use it, it will inherit all entries from this other group.
 
 Any\ file=Any file
 
@@ -2040,6 +2039,15 @@ Matching=Matching
 Same\ as\ --import,\ but\ will\ be\ imported\ to\ the\ opened\ tab=Same as --import, but will be imported to the opened tab
 Allow\ integers\ in\ 'edition'\ field\ in\ BibTeX\ mode=Allow integers in 'edition' field in BibTeX mode
 
+Please\ enter\ a\ name\ for\ the\ MIME\ type.=Please enter a name for the MIME type.
+Please\ enter\ a\ name\ for\ the\ extension.=Please enter a name for the extension.
+Please\ enter\ a\ name.=Please enter a name.
+
+There\ already\ exists\ an\ external\ file\ type\ with\ the\ same\ MIME\ type=There already exists an external file type with the same MIME type
+There\ already\ exists\ an\ external\ file\ type\ with\ the\ same\ extension=There already exists an external file type with the same extension
+There\ already\ exists\ an\ external\ file\ type\ with\ the\ same\ name=There already exists an external file type with the same name
+
+
 Search\ for\ citations\ in\ LaTeX\ files...=Search for citations in LaTeX files...
 LaTeX\ Citations\ Search\ Results=LaTeX Citations Search Results
 LaTeX\ files\ directory\:=LaTeX files directory:
@@ -2597,7 +2605,7 @@ Get\ more\ themes...=Get more themes...
 Add\ selected\ entries\ to\ database=Add selected entries to database
 The\ selected\ entry\ doesn't\ have\ a\ DOI\ linked\ to\ it.\ Lookup\ a\ DOI\ and\ try\ again.=The selected entry doesn't have a DOI linked to it. Lookup a DOI and try again.
 Cited\ By=Cited By
-Citing=Citing
+Cites=Cites
 No\ articles\ found=No articles found
 Restart\ search=Restart search
 Cancel\ search=Cancel search
@@ -2621,3 +2629,9 @@ Would\ you\ like\ to\ enable\ fetching\ of\ journal\ information?\ This\ can\ be
 Enable=Enable
 Keep\ disabled=Keep disabled
 
+Predatory\ journal\ %0\ found=Predatory journal %0 found
+
+Hide\ user\ comments=Hide user comments
+Show\ user\ comments\ field=Show user comments field
+
+More\ options...=More options...
diff --git a/src/main/resources/l10n/JabRef_es.properties b/src/main/resources/l10n/JabRef_es.properties
index 55445300901..8be3bf81603 100644
--- a/src/main/resources/l10n/JabRef_es.properties
+++ b/src/main/resources/l10n/JabRef_es.properties
@@ -131,6 +131,7 @@ Case\ sensitive=Sensible al uso de mayúsculas/minúsculas
 
 change\ assignment\ of\ entries=Cambiar asignación de entradas
 
+
 Change\ case=Cambiar mayúsculas/minúsculas
 
 Change\ entry\ type=Cambiar tipo de entrada
@@ -168,7 +169,6 @@ Copied=Copiado
 Copy=Copiar
 
 Copy\ title=Copiar título
-Copy\ \\cite{citation\ key}=Copiar \\cite{citation key}
 Copy\ citation\ (html)=Copiar cita (html)
 Copy\ citation\ (text)=Copiar cita (texto)
 Copy\ citation\ key=Copiar clave de cita
@@ -322,7 +322,13 @@ Export\ preferences\ to\ file=Exportar preferencias a archivo
 Export\ to\ clipboard=Exportar al portapapeles
 Export\ to\ text\ file.=Exportar a un archivo de texto.
 
+Exporting\ %0=Exportando %0
+Could\ not\ export\ file\ '%0'\ (reason\:\ %1)=No se pudo exportar el archivo «%0» (motivo\: %1)
+Unknown\ export\ format\ %0=Formato de exportación %0 desconocido
 
+Importing\ %0=Importando %0
+Importing\ file\ %0\ as\ unknown\ format=Importando archivo %0 como formato desconocido
+Format\ used\:\ %0=Formato utilizado\: %0
 
 Extension=Extensión
 
@@ -471,7 +477,6 @@ 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
 Fetch\ journal\ information\ online\ to\ show=Obtenga información de la revista en línea para mostrarla
 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
@@ -513,7 +518,6 @@ Last\ modified=Modificado por última vez
 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)
@@ -831,6 +835,7 @@ Search\ results\ from\ open\ libraries=Resultados de la búsqueda en las bibliot
 Select\ all=Seleccionar todo
 Select\ new\ encoding=Seleccionar nueva codificación
 
+Select\ library=Seleccionar biblioteca
 Select\ entry\ type=Seleccionar tipo de entrada
 
 Select\ file\ from\ ZIP-archive=Seleccionar archivo desde archivo ZIP
@@ -876,6 +881,9 @@ 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
+Sort\ subgroups\ Z-A=Ordenar subgrupos de Z a A
+Sort\ subgroups\ by\ \#\ of\ entries\ (Descending)=Ordenar subgrupos por n.º de entradas (descendente)
+Sort\ subgroups\ by\ \#\ of\ entries\ (Ascending)=Ordenar subgrupos por n.º de entradas (ascendente)
 
 source\ edit=editar fuente
 Special\ name\ formatters=Formateadores con nombre especial
@@ -995,7 +1003,6 @@ Citation\ key\ generator=Generador de claves de cita
 Unable\ to\ open\ link.=No es posible abrir el enlace.
 MIME\ type=Tipo 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.=Esta función permite que los nuevos archivos sean abiertos o importados en una instancia de JabRef que ya se esté ejecutando, en lugar de abrir una nueva instancia. Esto es útil, por ejemplo, cuando se abre un archivo en JabRef desde el navegador de internet. Tenga en cuenta que esto le impedirá ejecutar más de una instancia de JabRef a la vez.
 Run\ fetcher=Ejecutar fetcher
 
 Line\ %0\:\ Found\ corrupted\ citation\ key\ %1.=Renglón %0\: se encontró la clave de cita dañada %1.
@@ -1010,6 +1017,7 @@ Cannot\ use\ port\ %0\ for\ remote\ operation;\ another\ application\ may\ be\ u
 Looking\ for\ full\ text\ document...=Buscando texto completo de documento...
 A\ local\ copy\ will\ be\ opened.=Se abrirá una copia local
 Error\ opening\ file=Error al abrir el archivo
+Error\ opening\ file\ '%0'=Error al abrir el archivo «%0»
 
 Formatter\ not\ found\:\ %0=Formateador no encontrado\: %0
 
@@ -1058,7 +1066,7 @@ Please\ specify\ a\ file\ browser.=Especifique un explorador de archivos.
 Please\ specify\ a\ terminal\ application.=Especifique una aplicación de terminal.
 Use\ custom\ file\ browser=Usar el explorador de archivos personalizado
 Use\ custom\ terminal\ emulator=Usar el emulador de terminal personalizado
-exportFormat=Formato de exportación
+exportFormat=Formato de exportación
 Output\ file\ missing=Fichero de salida no encontrado
 The\ output\ option\ depends\ on\ a\ valid\ input\ option.=La opción de salida depende de una opción de entrada válida.
 Linked\ file\ name\ conventions=Convenciones de nombres de archivos vinculados
@@ -1474,6 +1482,7 @@ changes\ all\ letters\ to\ lower\ case.=cambia todas las letras a minú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
+LaTeX\ Warning\:\ %0=Alerta de LaTeX\: %0
 Converts\ HTML\ code\ to\ LaTeX\ code.=Convierte código HTML a código LaTeX
 HTML\ to\ Unicode=HTML a Unicode
 Converts\ HTML\ code\ to\ Unicode.=Convierte HTML a Unicode
@@ -1516,6 +1525,7 @@ Identity=Identidad
 Clears\ the\ field\ completely.=Limpia el campo completamente.
 
 Main\ file\ directory=Carpeta del archivo principal
+No\ library\ selected=No se seleccionó ninguna biblioteca
 
 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
@@ -1592,6 +1602,7 @@ Message=Mensaje
 
 
 MathSciNet\ Review=Revisión MathSciNet
+Reset\ all=Restablecer todo
 
 Decryption\ not\ supported.=Desencriptación no soportada
 
@@ -1703,6 +1714,7 @@ Check\ the\ event\ log\ to\ see\ all\ notifications=Revisa el registro de evento
 Host=Host/Servidor
 Port=Puerto
 Library=Biblioteca
+Libraries=Bibliotecas
 User=Usuario
 Connect=Conectar
 Connection\ error=Error de conexión
@@ -2007,12 +2019,16 @@ Matching=Emparejamiento
 Same\ as\ --import,\ but\ will\ be\ imported\ to\ the\ opened\ tab=Igual que --import, pero se importará en la pestaña abierta
 Allow\ integers\ in\ 'edition'\ field\ in\ BibTeX\ mode=Permitir números enteros en el campo 'edition' en modo BibTeX
 
+
+
+
 Search\ for\ citations\ in\ LaTeX\ files...=Buscar citas en archivos LaTeX...
 LaTeX\ Citations\ Search\ Results=Resultados de búsqueda de citas en los archivos LaTeX
 LaTeX\ files\ directory\:=Directorio de archivos de LaTeX\:
 LaTeX\ files\ found\:=Archivos de LaTeX encontrados\:
 files=archivos
 Show\ 'LaTeX\ Citations'\ tab=Mostrar pestaña 'Citas LaTeX'
+
 LaTeX\ Citations=Citas LaTeX
 Search\ citations\ for\ this\ entry\ in\ LaTeX\ files=Buscar citas a esta entrada en archivos LaTeX
 No\ citations\ found=No se han encontrado citas
@@ -2043,11 +2059,15 @@ Add\ formatter\ to\ list=Añadir formateador a la lista
 Filter\ List=Lista de filtros
 Open\ files...=Abrir archivos...
 
+Affected\ fields=Campos afectados
 Show\ preview\ as\ a\ tab\ in\ entry\ editor=Mostrar la vista previa como una pestaña en el editor de entradas
 Visual\ theme=Tema visual
 Overwrite\ existing\ keys=Sobrescribir las claves existentes
 Key\ patterns=Patrones clave
 Font\ settings=La configuración de la fuente
+Custom...=Personalizado...
+Dark=Oscuro
+Light=Claro
 Please\ specify\ a\ css\ theme\ file.=Especifique un archivo CSS de tema.
 You\ must\ enter\ an\ integer\ value\ higher\ than\ 8.=Debe introducir un valor entero superior a 8.
 Letters\ after\ duplicate\ generated\ keys=Letras después de duplicar las claves generadas
@@ -2286,6 +2306,7 @@ Custom\ import\ formats=Formatos de importación personalizados
 
 No\ list\ enabled=No hay lista habilitada
 Protect\ selection=Proteger selección
+Unprotect\ selection=Selección no protegida
 
 Customized\ preview\ style=Estilo de previsualización personalizado
 Next\ preview\ style=Estilo de previsualización siguiente
@@ -2312,6 +2333,8 @@ Error\ importing.\ See\ the\ error\ log\ for\ details.=Error al importar. Consul
 
 Error\ from\ import\:\ %0=Error de importación\: %0
 Error\ reading\ PDF\ content\:\ %0=Error al leer el contenido PDF\: %0
+Bib\ entry\ was\ successfully\ imported=Se importó la entrada bibliográfica correctamente
+File\ was\ successfully\ imported\ as\ a\ new\ entry=El archivo se importó correctamente como una entrada nueva
 Processing\ file\ %0=Procesando archivo %0
 Export\ selected=Exportar seleccionados
 
@@ -2357,6 +2380,9 @@ Others=Otros
 Recommended=Recomendado
 
 Authors\ and\ Title=Autoría y título
+Catalog=Catálogo
+Catalogs=Catálogos
+Select\ Catalogs\:=Seleccionar catálogos\:
 Add\ Author\:=Añadir autor\:
 Add\ Query\:=Añadir consulta\:
 Add\ Research\ Question\:=Añadir pregunta de investigación\:
@@ -2407,6 +2433,7 @@ Error\ downloading=Error al descargar
 
 No\ data\ was\ found\ for\ the\ identifier=No se encontró ningún dato correspondiente al identificador
 Server\ not\ available=Servidor no disponible
+Look\ up\ identifier=Buscar identificador
 Identifier\ not\ found=Identificador no encontrado
 
 Custom\ API\ key=Clave API personalizada
@@ -2460,7 +2487,10 @@ Do\ you\ want\ to\ recover\ the\ library\ from\ the\ backup\ file?=¿Quiere recu
 This\ could\ indicate\ that\ JabRef\ did\ not\ shut\ down\ cleanly\ last\ time\ the\ file\ was\ used.=Esto puede indicar que JabRef no se cerró correctamente la última vez que se usó ese archivo.
 
 
+Library\ to\ import\ into=Biblioteca en la que importar
 
+Enable\ web\ search=Activar búsqueda en la web
+Web\ search\ disabled=Búsqueda en la web desactivada
 
 
 
@@ -2473,7 +2503,10 @@ 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.
 
+Create\ backup=Crear copia de respaldo
 
+File\ "%0"\ cannot\ be\ added\!=No se puede añadir el archivo «%0».
+Rename\ and\ add=Cambiar nombre y añadir
 
 Failed\ to\ download\ from\ URL=Error al descargar desde la URL
 
@@ -2484,11 +2517,24 @@ Writing\ metadata\ to\ %0=Escribiendo metadatos a %0
 Get\ more\ themes...=Obtener más temas...
 
 Add\ selected\ entries\ to\ database=Añadir entradas seleccionadas a la base de datos
+The\ selected\ entry\ doesn't\ have\ a\ DOI\ linked\ to\ it.\ Lookup\ a\ DOI\ and\ try\ again.=La entrada seleccionada no tiene ningún DOI enlazado. Busque un DOI e inténtelo de nuevo.
 Cited\ By=Citado por
 Citing=Citando
+No\ articles\ found=No se encontró ningún artículo
 Restart\ search=Reiniciar búsqueda
 Cancel\ search=Cancelar la búsqueda
 Select\ entry=Seleccionar entrada
-Search\ aborted\!=¡Búsqueda cancelada\!
+Search\ aborted\!=Se interrumpió la búsqueda.
+Citation\ relations=Relaciones entre citas
 Show\ articles\ related\ by\ citation=Mostrar artículos relacionados por cita
+Error\ while\ fetching\ citing\ entries\:\ %0=Error al recuperar las entradas de cita\: %0
+Jump\ to\ entry\ in\ database=Saltar a entrada en base de datos
+Help\ on\ external\ applications=Ayuda sobre aplicaciones externas
+Identifier-based\ Web\ Search=Búsqueda en la web basada en identificadores
+
+
+
+
+
+
 
diff --git a/src/main/resources/l10n/JabRef_fa.properties b/src/main/resources/l10n/JabRef_fa.properties
index 0e24b672115..16679d6e938 100644
--- a/src/main/resources/l10n/JabRef_fa.properties
+++ b/src/main/resources/l10n/JabRef_fa.properties
@@ -93,6 +93,7 @@ Case\ sensitive=حساس به کوچکی و بزرگی حروف
 
 
 
+
 Clear=پاکسازی
 
 
@@ -599,6 +600,10 @@ String\ constants=ثابت های رشته
 
 
 
+
+
+
+
 
 
 
@@ -666,6 +671,12 @@ Auto\ complete\ enabled.=تکمیل خودکار غیرفعال شد.
 
 
 
+
+
+
+
+
+
 
 
 
diff --git a/src/main/resources/l10n/JabRef_fi.properties b/src/main/resources/l10n/JabRef_fi.properties
index 7acb45cd084..9df2bd6d5d2 100644
--- a/src/main/resources/l10n/JabRef_fi.properties
+++ b/src/main/resources/l10n/JabRef_fi.properties
@@ -602,6 +602,17 @@ About\ JabRef=Tietoja JabRef
 
 
 
+
+
+
+
+
+
+
+
+
+
+
 
 
 
diff --git a/src/main/resources/l10n/JabRef_fr.properties b/src/main/resources/l10n/JabRef_fr.properties
index 6df2ca8b1aa..c6af7ef60be 100644
--- a/src/main/resources/l10n/JabRef_fr.properties
+++ b/src/main/resources/l10n/JabRef_fr.properties
@@ -131,6 +131,8 @@ Case\ sensitive=Sensible à la casse
 
 change\ assignment\ of\ entries=changer l'assignation des entrées
 
+Catalogues\ used\ for\ 'Search\ Selected'=Catalogues utilisés pour la 'Recherche sélectionnée'
+
 Change\ case=Changer la casse
 
 Change\ entry\ type=Changer le type d'entrée
@@ -168,12 +170,12 @@ Copied=Copié
 Copy=Copier
 
 Copy\ title=Copier le titre
-Copy\ \\cite{citation\ key}=Copier \\cite{citation key}
 Copy\ citation\ (html)=Copier la citation (html)
 Copy\ citation\ (text)=Copier la citation (texte)
 Copy\ citation\ key=Copier la clef de citation
 Copy\ citation\ key\ and\ link=Copier la clef de citation et le lien
 Copy\ citation\ key\ and\ title=Copier la clef de citation et le titre
+Copy\ citation\ key\ with\ configured\ cite\ command=Copier la clef de citation avec la commande de citation configurée
 
 Copy\ to\ clipboard=Copier dans le presse-papier
 
@@ -477,7 +479,6 @@ 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
@@ -520,7 +521,6 @@ Last\ modified=Dernier modifié
 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)
@@ -1009,7 +1009,6 @@ 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 collecte
 
 Line\ %0\:\ Found\ corrupted\ citation\ key\ %1.=Ligne %0 \: clef de citation corrompue %1.
@@ -2041,12 +2040,28 @@ Matching=Correspondant
 Same\ as\ --import,\ but\ will\ be\ imported\ to\ the\ opened\ tab=Comme --import, mais sera importé dans l'onglet ouvert
 Allow\ integers\ in\ 'edition'\ field\ in\ BibTeX\ mode=Autoriser les entiers dans le champ 'edition' en mode BibTeX
 
+Please\ enter\ a\ name\ for\ the\ MIME\ type.=Veuillez entrer un nom pour le type MIME.
+Please\ enter\ a\ name\ for\ the\ extension.=Veuillez entrer un nom pour l'extension.
+Please\ enter\ a\ name.=Veuillez entrer un nom.
+
+There\ already\ exists\ an\ external\ file\ type\ with\ the\ same\ MIME\ type=Il existe déjà un type de fichier externe avec le même type MIME
+There\ already\ exists\ an\ external\ file\ type\ with\ the\ same\ extension=Il existe déjà un type de fichier externe avec la même extension
+There\ already\ exists\ an\ external\ file\ type\ with\ the\ same\ name=Il existe déjà un type de fichier externe avec le même nom
+
+
 Search\ for\ citations\ in\ LaTeX\ files...=Recherche de citations dans les fichiers LaTeX...
 LaTeX\ Citations\ Search\ Results=Résultats de la recherche des appels à référence LaTeX
 LaTeX\ files\ directory\:=Répertoire des fichiers LaTeX \:
 LaTeX\ files\ found\:=Fichiers LaTeX trouvés \:
 files=fichiers
 Show\ 'LaTeX\ Citations'\ tab=Afficher l'onglet 'Appels à référence LaTeX'
+Show\ 'Scite'\ tab=Afficher l'onglet 'Scite'
+Search\ scite.ai\ for\ Smart\ Citations=Rechercher des Citations Intelligentes dans scite.ai
+See\ full\ report\ at\ [%0]=Voir le rapport complet à [%0]
+No\ active\ entry=Aucune entrée active
+This\ entry\ does\ not\ have\ a\ DOI=Cette entrée n'a pas de DOI
+Tallies\ for\ %0=Décomptes pour %0
+
 LaTeX\ Citations=Appels à référence LaTeX
 Search\ citations\ for\ this\ entry\ in\ LaTeX\ files=Rechercher des appels à référence de cette entrée dans les fichiers LaTeX
 No\ citations\ found=Aucun appel à référence trouvé
@@ -2086,6 +2101,7 @@ Font\ settings=Paramètres de police
 Custom...=Personnaliser...
 Dark=Sombre
 Light=Clair
+Use\ System\ Preference=Utiliser les préférences du système
 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
@@ -2604,3 +2620,19 @@ Help\ on\ external\ applications=Aide sur les logiciels externes
 Identifier-based\ Web\ Search=Recherche Web basée sur les identifiants
 
 Pushing\ citations\ to\ TeXShop\ is\ only\ possible\ on\ macOS\!=L'envoi des citations vers TeXShop n'est possible que sur macOS \!
+
+Single\ instance=Instance unique
+Enforce\ single\ JabRef\ instance\ (and\ allow\ remote\ operations)\ using\ port=Forcer une seule instance de JabRef (et autoriser les opérations à distance) en utilisant le port
+
+
+Enable\ Journal\ Information\ Fetching?=Activer la récupération des informations des journaux ?
+Would\ you\ like\ to\ enable\ fetching\ of\ journal\ information?\ This\ can\ be\ changed\ later\ in\ %0\ >\ %1.=Voulez-vous activer la récupération des informations des journaux ? Cela peut être modifié plus tard dans %0 > %1.
+Enable=Activer
+Keep\ disabled=Garder désactivé
+
+Predatory\ journal\ %0\ found=Journal prédateur %0 trouvé
+
+Hide\ user\ comments=Masquer les commentaires de l'utilisateur
+Show\ user\ comments\ field=Afficher le champ des commentaires de l'utilisateur
+
+More\ options...=Plus d'options...
diff --git a/src/main/resources/l10n/JabRef_id.properties b/src/main/resources/l10n/JabRef_id.properties
index 75aefb73a28..30863d1822c 100644
--- a/src/main/resources/l10n/JabRef_id.properties
+++ b/src/main/resources/l10n/JabRef_id.properties
@@ -1,5 +1,6 @@
 Proxy\ requires\ password=Proxy membutuhkan password
 
+Unable\ to\ monitor\ file\ changes.\ Please\ close\ files\ and\ processes\ and\ restart.\ You\ may\ encounter\ errors\ if\ you\ continue\ with\ this\ session.=Tidak dapat memantau perubahan file. Silakan tutup file dan proses dan mulai ulang program. Anda mungkin mengalami error/malfungsi jika melanjutkan sesi ini.
 %0\ contains\ the\ regular\ expression\ <b>%1</b>=%0 mengandung Ekspresi Reguler <b>%1</b>
 
 %0\ contains\ the\ term\ <b>%1</b>=% mengandung istilah <b>%1</b>
@@ -9,21 +10,29 @@ Proxy\ requires\ password=Proxy membutuhkan password
 %0\ doesn't\ contain\ the\ term\ <b>%1</b>=%0 tidak mengandung istilah <b>%1</b>
 
 
+Export\ operation\ finished\ successfully.=Operasi eksport file selesai dengan sukses.
 
+Reveal\ in\ File\ Explorer=Buka di File Explorer
 
 %0\ matches\ the\ regular\ expression\ <b>%1</b>=%0 sesuai dengan Ekspresi Reguler <b>%1</b>
 
 %0\ matches\ the\ term\ <b>%1</b>=%0 sesuai dengan istilah <b>%1</b>
 
+Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (DEFAULT\ abbreviation)=Buat singkatan nama jurnal dari entri pilihan (singkatan BAWAAN)
+Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (DOTLESS\ abbreviation)=Buat singkatan nama jurnal dari entri yang dipilih (singkatan DOTLESS)
+Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (SHORTEST\ UNIQUE\ abbreviation)=Buat singkatan nama jurnal dari entri yang dipilih (singkatan PALING SINGKAT dan UNIK)
 
 Abbreviate\ names=Singkat nama
 Abbreviated\ %0\ journal\ names.=Singkatan %0 nama jurnal.
 
 Abbreviation=Singkatan
+Abbreviations=Singkatan
 
 Unabbreviate\ journal\ names\ of\ the\ selected\ entries=Nama jurnal tidak disingkat dari entri pilihan
 Unabbreviated\ %0\ journal\ names.=%0 nama jurnal tidak disingkat.
 
+dotless=tanpa titik
+shortest\ unique=paling singkat dan unik
 
 About\ JabRef=Tentang JabRef
 
@@ -31,6 +40,7 @@ Abstract=Abstrak
 
 Accept=Terima
 
+Accept\ recommendations\ from\ Mr.\ DLib=Terima rekomendasi Mr. DLib
 
 Action=Aksi
 
@@ -41,6 +51,7 @@ The\ path\ need\ not\ be\ on\ the\ classpath\ of\ JabRef.=Lokasi tidak harus pad
 
 Add\ a\ regular\ expression\ for\ the\ key\ pattern.=Tambahkan ekspresi reguler untuk pola kunci.
 
+Add\ entry\ manually=Masukkan entri secara mandiri
 
 Add\ selected\ entries\ to\ this\ group=Pilih tambahkan di entri ke grup ini
 
@@ -48,10 +59,12 @@ Add\ subgroup=Tambah Anak Grup
 
 Added\ group\ "%0".=Grup ditambahkan "%0".
 
+Added\ string\:\ '%0'=String yang ditambahkan\: '%0'
 Added\ string=Ditambahkan string
 
 All\ entries=Semua entri
 
+Also\ remove\ subgroups=Juga Hapus sub-grup
 
 and=dan
 
@@ -61,6 +74,7 @@ Appearance=Penampilan
 
 Application=Aplikasi
 
+Application\ to\ push\ entries\ to=Aplikasi untuk memasukkan entri
 
 Apply=Terapkan
 
@@ -72,8 +86,11 @@ Assigned\ %0\ entries\ to\ group\ "%1".=Diterapkan %0 entri ke grup "%1".
 
 Assigned\ 1\ entry\ to\ group\ "%0".=Diterapkan 1 entri ke grup "%0".
 
+Autogenerate\ citation\ keys=Buat kunci sitasi secara otomatis
 
+Autolink\ files\ with\ names\ starting\ with\ the\ citation\ key=Tautkan otomatis file dengan nama yang dimulai dengan kunci kutipan
 
+Autolink\ only\ files\ that\ match\ the\ citation\ key=Tautkan otomatis file dengan nama yang persis dengan kunci kutipan
 
 Automatically\ create\ groups=Otomatis membuat grup
 
@@ -87,6 +104,7 @@ Available\ import\ formats=Format impor yang dikenal
 
 %0\ source=Sumber %0
 
+Background\ Tasks=Tugas Latar Belakang
 
 Background\ Tasks\ are\ running=Tugas latarbelakang sedang berjalan
 
@@ -95,10 +113,14 @@ Background\ Tasks\ are\ done=Tugas Latarbelakang telah selesai
 Browse=Jelajah
 
 by=oleh
+The\ conflicting\ fields\ of\ these\ entries\ will\ be\ merged\ into\ the\ 'Comment'\ field.=Entri yang bertentangan pada entri ini akan digabungkan ke dalam entri 'Komentar'.
 
 Cancel=Batal
+Cannot\ create\ group=Tidak dapat membuat grup
 
+Cannot\ create\ group.\ Please\ create\ a\ library\ first.=Tidak dapat membuat grup, Tolong buat pustaka terlebih dahulu.
 
+Cannot\ open\ folder\ as\ the\ file\ is\ an\ online\ link.=Tidak dapat membuka folder karena file tersebut adalah tautan online.
 
 case\ insensitive=huruf besar kecil tidak penting
 
@@ -108,6 +130,7 @@ Case\ sensitive=Huruf besar kecil tidak penting
 
 change\ assignment\ of\ entries=merubah penugasan entri
 
+
 Change\ case=Merubah huruf besar/kecil
 
 Change\ entry\ type=Merubah tipe entri
@@ -117,6 +140,7 @@ Change\ of\ Grouping\ Method=Metubah Metode Grup
 
 change\ preamble=merubah preamble
 
+Changed\ language=Bahasa yang di ubah
 
 Changed\ preamble=Preamble berubah
 
@@ -124,6 +148,7 @@ Cite\ command=Perintah acuan
 
 Clear=Bersihkan
 
+Open\ /\ close\ entry\ editor=Buka / tutup editor entri
 
 Close\ dialog=Tutup dialog
 
@@ -131,6 +156,7 @@ Close\ the\ current\ library=Tutup basisdata yang sekarang
 
 Close\ window=Tutup jendela
 
+Comments=Komentar
 
 Contained\ in=Terkandung di
 
@@ -143,6 +169,7 @@ Copy=Salin
 
 Copy\ title=Kopi judul
 Copy\ citation\ (html)=Salin kutipan (html)
+Copy\ citation\ (text)=Salin sitasi(text)
 
 Copy\ to\ clipboard=Salin ke papan klip
 
@@ -404,7 +431,6 @@ Last\ modified=Terakhir diubah
 LaTeX\ AUX\ file\:=File LaTeX AUX\:
 
 Link=Tautan
-Listen\ for\ remote\ operation\ on\ port=Menggunakan operasi jarak jauh pada port
 
 
 Manage\ custom\ exports=Mengatur ekspor atursendiri
@@ -778,7 +804,6 @@ Error\ while\ fetching\ from\ %0=Kesalahan ketika mengambil dari %0
 Unable\ to\ open\ link.=Tidak bisa membuka tautan.
 MIME\ type=Tipe 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.=Fitur ini memungkinkan berkas baru atau impor ke jendela JabRef yang aktifbukan membuat baru. Hal ini berguna ketika anda membuka berkas di JabRef dari halaman web. Hal ini akan menghindari anda membuka beberapa JabRef pada saat yang sama.
 
 Download\ from\ URL=Unduh dari URL
 Rename\ field=Ganti nama bidang
@@ -1505,6 +1530,10 @@ Executing\ command\ "%0"...=Perintah pelaksana "%0"...
 
 
 
+
+
+
+
 Group\ color=Warna kelompok
 
 
@@ -1595,3 +1624,9 @@ This\ could\ indicate\ that\ JabRef\ did\ not\ shut\ down\ cleanly\ last\ time\
 
 
 
+
+
+
+
+
+
diff --git a/src/main/resources/l10n/JabRef_it.properties b/src/main/resources/l10n/JabRef_it.properties
index 73d93d639a1..7cec81fef68 100644
--- a/src/main/resources/l10n/JabRef_it.properties
+++ b/src/main/resources/l10n/JabRef_it.properties
@@ -131,6 +131,8 @@ Case\ sensitive=Distingue maiuscole e minuscole
 
 change\ assignment\ of\ entries=modifica l'assegnazione delle voci
 
+Catalogues\ used\ for\ 'Search\ Selected'=Cataloghi usati per 'Ricerca selezionata'
+
 Change\ case=Inverti maiuscolo/minuscolo
 
 Change\ entry\ type=Cambia tipo di voce
@@ -168,12 +170,12 @@ Copied=Copiato
 Copy=Copia
 
 Copy\ title=Copia titolo
-Copy\ \\cite{citation\ key}=Copia \\cite{citation key}
 Copy\ citation\ (html)=Copia citazione (html)
 Copy\ citation\ (text)=Copia citazione (testo)
 Copy\ citation\ key=Copia la chiave BibTeX
 Copy\ citation\ key\ and\ link=Copia la chiave BibTeX ed il collegamento
 Copy\ citation\ key\ and\ title=Copia la chiave BibTeX ed il titolo
+Copy\ citation\ key\ with\ configured\ cite\ command=Copia la chiave citazione con il comando di citazione configurato
 
 Copy\ to\ clipboard=Copia negli appunti
 
@@ -477,7 +479,6 @@ 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
@@ -520,7 +521,6 @@ Last\ modified=Ultimo modificato
 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)
@@ -1009,7 +1009,6 @@ Citation\ key\ generator=Generatore di chiavi BibTeX
 Unable\ to\ open\ link.=Impossibile aprire il collegamento.
 MIME\ type=Tipo 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.=Questa funzione permette l'apertura o l'importazione di nuovi file in una istanza di JabRef già aperta invece di aprirne una nuova. Per esempio, ciò è utile quando un file viene aperto in JabRef da un browser web. Questo tuttavia impedisce di aprire più sessioni di JabRef contemporaneamente.
 Run\ fetcher=Esegui fetcher
 
 Line\ %0\:\ Found\ corrupted\ citation\ key\ %1.=Riga %0\: Trovata chiave BibTeX corrotta %1.
@@ -2041,12 +2040,28 @@ Matching=Corrispondenza
 Same\ as\ --import,\ but\ will\ be\ imported\ to\ the\ opened\ tab=Come --importa, ma verrà importato nella scheda aperta
 Allow\ integers\ in\ 'edition'\ field\ in\ BibTeX\ mode=Permetti interi nel campo 'edizione' in modalità BibTeX
 
+Please\ enter\ a\ name\ for\ the\ MIME\ type.=Inserire un nome per il tipo MIME.
+Please\ enter\ a\ name\ for\ the\ extension.=Inserisci un nome per l'estensione.
+Please\ enter\ a\ name.=Inserisci un nome.
+
+There\ already\ exists\ an\ external\ file\ type\ with\ the\ same\ MIME\ type=Esiste già un tipo di file esterno con lo stesso tipo MIME
+There\ already\ exists\ an\ external\ file\ type\ with\ the\ same\ extension=Esiste già un tipo di file esterno con la stessa estensione
+There\ already\ exists\ an\ external\ file\ type\ with\ the\ same\ name=Esiste già un tipo di file esterno con lo stesso nome
+
+
 Search\ for\ citations\ in\ LaTeX\ files...=Cerca citazioni nei file LaTeX...
 LaTeX\ Citations\ Search\ Results=Risultati della ricerca delle citazioni LaTeX
 LaTeX\ files\ directory\:=Cartella dei file LaTeX\:
 LaTeX\ files\ found\:=File LaTeX trovati\:
 files=files
 Show\ 'LaTeX\ Citations'\ tab=Mostra scheda 'Citazioni LaTeX'
+Show\ 'Scite'\ tab=Mostra la tab 'Scite'
+Search\ scite.ai\ for\ Smart\ Citations=Cerca scite.ai per Smart Citations
+See\ full\ report\ at\ [%0]=Vedi la relazione completa alla sezione [%0]
+No\ active\ entry=Nessuna voce attiva
+This\ entry\ does\ not\ have\ a\ DOI=Questa voce non ha un DOI
+Tallies\ for\ %0=Conteggi per %0
+
 LaTeX\ Citations=Citazioni LaTeX
 Search\ citations\ for\ this\ entry\ in\ LaTeX\ files=Cerca citazioni per questa voce nei file LaTeX
 No\ citations\ found=Nessuna citazione trovata
@@ -2086,6 +2101,7 @@ Font\ settings=Impostazioni carattere
 Custom...=Personalizzato...
 Dark=Scuro
 Light=Chiaro
+Use\ System\ Preference=Usa le preferenze di sistema
 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
@@ -2604,3 +2620,19 @@ Help\ on\ external\ applications=Aiuto su applicazioni esterne
 Identifier-based\ Web\ Search=Ricerca Web basata sull'Identificatore
 
 Pushing\ citations\ to\ TeXShop\ is\ only\ possible\ on\ macOS\!=Inviare le citazioni a TeXShop è possibile solo su macOS\!
+
+Single\ instance=Singola istanza
+Enforce\ single\ JabRef\ instance\ (and\ allow\ remote\ operations)\ using\ port=Forza singola istanza JabRef (e permetti operazioni remote) usando la porta
+
+
+Enable\ Journal\ Information\ Fetching?=Abilitare il recupero delle informazioni della rivista?
+Would\ you\ like\ to\ enable\ fetching\ of\ journal\ information?\ This\ can\ be\ changed\ later\ in\ %0\ >\ %1.=Vuoi abilitare il recupero delle informazioni della rivista? Questo può essere modificato in seguito in %0 > %1.
+Enable=Abilita
+Keep\ disabled=Mantieni disabilitato
+
+Predatory\ journal\ %0\ found=Trovata la rivista predatoria %0
+
+Hide\ user\ comments=Nascondi commenti utente
+Show\ user\ comments\ field=Mostra il campo commenti utente
+
+More\ options...=Altre opzioni...
diff --git a/src/main/resources/l10n/JabRef_ja.properties b/src/main/resources/l10n/JabRef_ja.properties
index c60fb546fc8..a28aaafbe24 100644
--- a/src/main/resources/l10n/JabRef_ja.properties
+++ b/src/main/resources/l10n/JabRef_ja.properties
@@ -131,6 +131,7 @@ Case\ sensitive=大小文字を区別
 
 change\ assignment\ of\ entries=項目の割り当てを変更
 
+
 Change\ case=大小文字を切り替え
 
 Change\ entry\ type=項目型を変更
@@ -168,7 +169,6 @@ Copied=コピーしました
 Copy=コピー
 
 Copy\ title=タイトルをコピー
-Copy\ \\cite{citation\ key}=\\cite{citation key} をコピー
 Copy\ citation\ (html)=文献をコピー (html)
 Copy\ citation\ (text)=文献をコピー (テキスト)
 Copy\ citation\ key=文献キーをコピー
@@ -496,7 +496,6 @@ Last\ modified=最終修正日時
 LaTeX\ AUX\ file\:=LaTeX AUXファイル：
 
 Link=リンク
-Listen\ for\ remote\ operation\ on\ port=以下のポートでリモート操作を待ち受ける
 
 Show\ advanced\ hints\ (i.e.\ helpful\ tooltips,\ suggestions\ and\ explanation)=詳細なヒントを表示する (詳しいツールチップやおすすめ，説明など)
 
@@ -962,7 +961,6 @@ Citation\ key\ generator=文献キーの生成
 Unable\ to\ open\ link.=リンクを開くことができませんでした．
 MIME\ type=MIME型
 
-This\ feature\ lets\ new\ files\ be\ opened\ or\ imported\ into\ an\ already\ running\ instance\ of\ JabRef\ instead\ of\ opening\ a\ new\ instance.\ For\ instance,\ this\ is\ useful\ when\ you\ open\ a\ file\ in\ JabRef\ from\ your\ web\ browser.\ Note\ that\ this\ will\ prevent\ you\ from\ running\ more\ than\ one\ instance\ of\ JabRef\ at\ a\ time.=この機能は，新規ファイルを，新しいJabRefインスタンスを開かないで，すでに実行されているインスタンスに開いたり 読み込んだりするものです．たとえば，これは，ウェブブラウザからJabRefにファイルを開かせたい時に便利です．これによって，一度にJabRefのインスタンスを一つしか開けなくなることに注意してください
 Run\ fetcher=取得子を実行
 
 Line\ %0\:\ Found\ corrupted\ citation\ key\ %1.=第%0行：破損した文献キー%1を検出しました．
@@ -1959,12 +1957,16 @@ Matching=一致
 Same\ as\ --import,\ but\ will\ be\ imported\ to\ the\ opened\ tab=--importと同じですが，開かれているタブに読み込みます
 Allow\ integers\ in\ 'edition'\ field\ in\ BibTeX\ mode=BibTeXモードの「edition」フィールドを整数にすることを許可する
 
+
+
+
 Search\ for\ citations\ in\ LaTeX\ files...=LaTeXファイルから引用を検索...
 LaTeX\ Citations\ Search\ Results=「LaTeXでの引用」の検索結果
 LaTeX\ files\ directory\:=LaTeXファイルディレクトリ：
 LaTeX\ files\ found\:=検出されたLaTeXファイル：
 files=ファイル
 Show\ 'LaTeX\ Citations'\ tab=「LaTeXでの引用」タブを表示
+
 LaTeX\ Citations=LaTeXでの引用
 Search\ citations\ for\ this\ entry\ in\ LaTeX\ files=この項目を含む引用が他のLaTeXファイル中にないか検索
 No\ citations\ found=引用はありません
@@ -2455,3 +2457,9 @@ Processing...=処理中...
 
 
 
+
+
+
+
+
+
diff --git a/src/main/resources/l10n/JabRef_ko.properties b/src/main/resources/l10n/JabRef_ko.properties
index fb8e7e63f0c..6c3d70168f3 100644
--- a/src/main/resources/l10n/JabRef_ko.properties
+++ b/src/main/resources/l10n/JabRef_ko.properties
@@ -128,6 +128,7 @@ Case\ sensitive=대/소문자 구분
 
 change\ assignment\ of\ entries=항목 할당 변경
 
+
 Change\ case=대소문자 변경
 
 Change\ entry\ type=입력 유형 변경
@@ -165,7 +166,6 @@ Copied=복사 완료
 Copy=복사
 
 Copy\ title=제목 복사
-Copy\ \\cite{citation\ key}=\\cite{citation key} 복사
 Copy\ citation\ key=인용 키 복사
 Copy\ citation\ key\ and\ link=인용 키와 링크 복사
 Copy\ citation\ key\ and\ title=인용 키와 제목 복사
@@ -473,7 +473,6 @@ Last\ modified=마지막으로 수정됨
 LaTeX\ AUX\ file\:=LaTeX AUX 파일\:
 
 Link=링크
-Listen\ for\ remote\ operation\ on\ port=포트에서 원격 작업 수신
 
 Show\ advanced\ hints\ (i.e.\ helpful\ tooltips,\ suggestions\ and\ explanation)=상급 힌트 표시(예\: 유용한 툴팁, 제안 및 설명)
 
@@ -916,7 +915,6 @@ Citation\ key\ generator=인용 키 생성기
 Unable\ to\ open\ link.=링크를 열 수 없습니다.
 MIME\ type=MIME 유형
 
-This\ feature\ lets\ new\ files\ be\ opened\ or\ imported\ into\ an\ already\ running\ instance\ of\ JabRef\ instead\ of\ opening\ a\ new\ instance.\ For\ instance,\ this\ is\ useful\ when\ you\ open\ a\ file\ in\ JabRef\ from\ your\ web\ browser.\ Note\ that\ this\ will\ prevent\ you\ from\ running\ more\ than\ one\ instance\ of\ JabRef\ at\ a\ time.=이 기능을 사용하면 새 인스턴스를 열지 않고 이미 실행 중인 인스턴스에 새 파일을 열거나 가져올 수 있습니다. 예를 들어, 웹 브라우저에서 JabRef의 파일을 열 때 유용합니다. 이렇게 하면 한 번에 둘 이상의 JabRef 인스턴스를 실행할 수 없습니다.
 Run\ fetcher=가져오기 실행
 
 Line\ %0\:\ Found\ corrupted\ citation\ key\ %1.=%0행\: 손상된 인용 키 %1을 찾았습니다.
@@ -1866,12 +1864,16 @@ Matching=어울리는
 Same\ as\ --import,\ but\ will\ be\ imported\ to\ the\ opened\ tab=--import와 동일하지만 열린 탭으로 가져옵니다.
 Allow\ integers\ in\ 'edition'\ field\ in\ BibTeX\ mode=BibTeX 모드의 '에디션' 필드에 정수 허용
 
+
+
+
 Search\ for\ citations\ in\ LaTeX\ files...=LaTeX 파일에서 인용 검색...
 LaTeX\ Citations\ Search\ Results=LaTeX 인용 검색 결과
 LaTeX\ files\ directory\:=LaTeX 파일 디렉토리\:
 LaTeX\ files\ found\:=찾은 LaTeX 파일\:
 files=파일
 Show\ 'LaTeX\ Citations'\ tab='LaTeX 인용' 탭 표시
+
 LaTeX\ Citations=LaTeX 인용
 Search\ citations\ for\ this\ entry\ in\ LaTeX\ files=LaTeX 파일에서 이 항목에 대한 인용 검색
 No\ citations\ found=검색된 인용이 없습니다
@@ -2288,3 +2290,9 @@ This\ could\ indicate\ that\ JabRef\ did\ not\ shut\ down\ cleanly\ last\ time\
 
 
 
+
+
+
+
+
+
diff --git a/src/main/resources/l10n/JabRef_nl.properties b/src/main/resources/l10n/JabRef_nl.properties
index 123253e9cfb..05141702e2a 100644
--- a/src/main/resources/l10n/JabRef_nl.properties
+++ b/src/main/resources/l10n/JabRef_nl.properties
@@ -131,6 +131,7 @@ Case\ sensitive=Hoofdlettergevoelig
 
 change\ assignment\ of\ entries=verandering toewijzing van invoergegevens
 
+
 Change\ case=Hoofdlettergebruik wijzigen
 
 Change\ entry\ type=Invoertype wijzigen
@@ -168,7 +169,6 @@ 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
@@ -471,7 +471,6 @@ 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
@@ -513,7 +512,6 @@ 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.=Geheugenstick modus - Sla instellingen 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)
@@ -997,7 +995,6 @@ 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.
@@ -2025,12 +2022,16 @@ 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
@@ -2570,3 +2571,9 @@ Processing...=Verwerken...
 
 
 
+
+
+
+
+
+
diff --git a/src/main/resources/l10n/JabRef_no.properties b/src/main/resources/l10n/JabRef_no.properties
index 4c746b486ff..63b50deb7fc 100644
--- a/src/main/resources/l10n/JabRef_no.properties
+++ b/src/main/resources/l10n/JabRef_no.properties
@@ -107,6 +107,7 @@ Case\ sensitive=Skill store og små bokstaver
 
 change\ assignment\ of\ entries=endre tilordning av oppføringer
 
+
 Change\ case=Endre store/små bokstaver
 
 Change\ entry\ type=Endre enhetstype
@@ -402,7 +403,6 @@ Language=Språk
 Last\ modified=Sist endret
 
 Link=Lenke
-Listen\ for\ remote\ operation\ on\ port=Lytt etter fjernoperasjoner på port
 
 
 Manage\ custom\ exports=Sett opp eksterne eksportfiltre
@@ -766,7 +766,6 @@ Error\ while\ fetching\ from\ %0=Feil ved henting fra %0
 Unable\ to\ open\ link.=Kan ikke åpne link.
 MIME\ type=MIME-type
 
-This\ feature\ lets\ new\ files\ be\ opened\ or\ imported\ into\ an\ already\ running\ instance\ of\ JabRef\ instead\ of\ opening\ a\ new\ instance.\ For\ instance,\ this\ is\ useful\ when\ you\ open\ a\ file\ in\ JabRef\ from\ your\ web\ browser.\ Note\ that\ this\ will\ prevent\ you\ from\ running\ more\ than\ one\ instance\ of\ JabRef\ at\ a\ time.=Denne funksjonen lar deg åpne eller importere nye filer til en allerede kjørende instans av JabRef fra nettleseren din. Merk at dette vil hindre deg i å kjøre mer enn en instans av JabRef av gangen.
 
 Download\ from\ URL=Last ned fra URL
 Rename\ field=Endre navn på felt
@@ -1086,6 +1085,10 @@ Import\ BibTeX=Importer BibTeX
 
 
 
+
+
+
+
 Always\ add\ letter\ (a,\ b,\ ...)\ to\ generated\ keys=Legg alltid til en bokstav (a, b, ...) til genererte nøkler
 Default\ pattern=Standardmønster
 
@@ -1160,6 +1163,12 @@ Default\ pattern=Standardmønster
 
 
 
+
+
+
+
+
+
 
 
 
diff --git a/src/main/resources/l10n/JabRef_pl.properties b/src/main/resources/l10n/JabRef_pl.properties
index 5bfc22fc4f3..37353b0716c 100644
--- a/src/main/resources/l10n/JabRef_pl.properties
+++ b/src/main/resources/l10n/JabRef_pl.properties
@@ -127,6 +127,7 @@ 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
@@ -164,7 +165,6 @@ 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
@@ -456,7 +456,6 @@ 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
@@ -499,7 +498,6 @@ 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)
@@ -966,7 +964,6 @@ 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.
@@ -1596,7 +1593,11 @@ 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
@@ -1751,3 +1752,9 @@ Cancel\ search=Anuluj wyszukiwanie
 Select\ entry=Wybierz wpis
 Search\ aborted\!=Wyszukiwanie przerwane\!
 
+
+
+
+
+
+
diff --git a/src/main/resources/l10n/JabRef_pt.properties b/src/main/resources/l10n/JabRef_pt.properties
index 8f6f66a959e..eef2cff09e3 100644
--- a/src/main/resources/l10n/JabRef_pt.properties
+++ b/src/main/resources/l10n/JabRef_pt.properties
@@ -130,6 +130,7 @@ Case\ sensitive=Sensível ao caso
 
 change\ assignment\ of\ entries=Alterar atribuição de referências
 
+
 Change\ case=Modificar caso
 
 Change\ entry\ type=Modificar tipo de referência
@@ -167,7 +168,6 @@ Copied=Copiado
 Copy=Copiar
 
 Copy\ title=Copiar título
-Copy\ \\cite{citation\ key}=Copiar \\cite{citation key}
 Copy\ citation\ (html)=Copiar citação (html)
 Copy\ citation\ (text)=Copiar citação (texto)
 Copy\ citation\ key=Copiar chave de citação
@@ -485,7 +485,6 @@ Last\ modified=Última modificação
 LaTeX\ AUX\ file\:=Arquivo AUX LaTeX\:
 
 Link=Linkar
-Listen\ for\ remote\ operation\ on\ port=Escutar operações remotas na porta
 
 Show\ advanced\ hints\ (i.e.\ helpful\ tooltips,\ suggestions\ and\ explanation)=Mostrar dicas avançadas (ou seja, dicas úteis, sugestões e explicações)
 
@@ -917,7 +916,6 @@ Error\ while\ fetching\ from\ %0=Erro ao recuperar do %0
 
 Unable\ to\ open\ link.=Não foi possível abrir link.
 
-This\ feature\ lets\ new\ files\ be\ opened\ or\ imported\ into\ an\ already\ running\ instance\ of\ JabRef\ instead\ of\ opening\ a\ new\ instance.\ For\ instance,\ this\ is\ useful\ when\ you\ open\ a\ file\ in\ JabRef\ from\ your\ web\ browser.\ Note\ that\ this\ will\ prevent\ you\ from\ running\ more\ than\ one\ instance\ of\ JabRef\ at\ a\ time.=Esta funcionalidade permite que novos arquivos sejam abertos ou importados para uma instância do JabRef já aberta ao invés de abrir uma nova instância. Por exemplo, isto é útil quando você abre um arquivo no JabRef a partir de ser navegador web. Note que isto irá previnir que você execute uma ou mais instâncias do JabRef ao mesmo tempo.
 
 Rename\ field=Renomear campo
 
@@ -1350,11 +1348,15 @@ Main\ layout\ file=Arquivo de leiaute principal
 
 
 
+
+
+
 files=arquivos
 
 
 
 
+
 Always\ add\ letter\ (a,\ b,\ ...)\ to\ generated\ keys=Sempre adicionar uma letra (a, b, ...)às chaves geradas
 Default\ pattern=Ppadrão predefinido
 
@@ -1433,6 +1435,12 @@ 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 8efbf0f319c..8ab46c8ca1f 100644
--- a/src/main/resources/l10n/JabRef_pt_BR.properties
+++ b/src/main/resources/l10n/JabRef_pt_BR.properties
@@ -131,6 +131,7 @@ Case\ sensitive=Sensível ao caso
 
 change\ assignment\ of\ entries=Alterar atribuição de referências
 
+
 Change\ case=Modificar caso
 
 Change\ entry\ type=Modificar tipo de referência
@@ -168,7 +169,6 @@ Copied=Copiado
 Copy=Copiar
 
 Copy\ title=Copiar título
-Copy\ \\cite{citation\ key}=Copiar \\cite{citation key}
 Copy\ citation\ (html)=Copiar citação (html)
 Copy\ citation\ (text)=Copiar citação (texto)
 Copy\ citation\ key=Copiar chave de citação
@@ -477,7 +477,6 @@ 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
@@ -520,7 +519,6 @@ Last\ modified=Última modificação
 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)
@@ -1009,7 +1007,6 @@ Citation\ key\ generator=Gerador de chaves de citação
 Unable\ to\ open\ link.=Não foi possível abrir link.
 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.=Esta funcionalidade permite que novos arquivos sejam abertos ou importados para uma instância do JabRef já aberta ao invés de abrir uma nova instância. Por exemplo, isto é útil quando você abre um arquivo no JabRef a partir de ser navegador web. Note que isto irá previnir que você execute uma ou mais instâncias do JabRef ao mesmo tempo.
 Run\ fetcher=Executar o fetcher
 
 Line\ %0\:\ Found\ corrupted\ citation\ key\ %1.=Linha %0\: Chave de citação corrompida encontrada %1.
@@ -2041,12 +2038,16 @@ Matching=Comparando
 Same\ as\ --import,\ but\ will\ be\ imported\ to\ the\ opened\ tab=Mesmo que o --import, mas será importado para a aba aberta
 Allow\ integers\ in\ 'edition'\ field\ in\ BibTeX\ mode=Permitir números inteiros no campo 'edition' no modo BibTeX
 
+
+
+
 Search\ for\ citations\ in\ LaTeX\ files...=Procure por citações nos arquivos LaTeX...
 LaTeX\ Citations\ Search\ Results=Resultados da Pesquisa de Citações LaTeX
 LaTeX\ files\ directory\:=Diretório de arquivos LaTeX\:
 LaTeX\ files\ found\:=Arquivos LaTeX encontrados\:
 files=arquivos
 Show\ 'LaTeX\ Citations'\ tab=Mostrar aba 'Citações LaTeX'
+
 LaTeX\ Citations=Citações LaTeX
 Search\ citations\ for\ this\ entry\ in\ LaTeX\ files=Pesquisar citações a essa referência nos arquivos LaTeX
 No\ citations\ found=Nenhuma citação encontrada
@@ -2604,3 +2605,9 @@ Help\ on\ external\ applications=Ajuda em aplicativos externos
 Identifier-based\ Web\ Search=Pesquisa da Web baseada em identificadores
 
 Pushing\ citations\ to\ TeXShop\ is\ only\ possible\ on\ macOS\!=Só é possível enviar referências para TeXShop no macOS\!
+
+
+
+
+
+
diff --git a/src/main/resources/l10n/JabRef_ru.properties b/src/main/resources/l10n/JabRef_ru.properties
index fc318078628..ed338ade0eb 100644
--- a/src/main/resources/l10n/JabRef_ru.properties
+++ b/src/main/resources/l10n/JabRef_ru.properties
@@ -126,6 +126,7 @@ Case\ sensitive=С учетом регистра
 
 change\ assignment\ of\ entries=изменить назначение для записей
 
+
 Change\ case=Изменить регистр
 
 Change\ entry\ type=Изменить тип записи
@@ -163,7 +164,6 @@ Copied=Скопированное
 Copy=Копировать
 
 Copy\ title=Копировать заглавие
-Copy\ \\cite{citation\ key}=Копировать \\ цитировать{citation key}
 Copy\ citation\ (html)=Копировать цитирование (html)
 Copy\ citation\ (text)=Копировать цитирование (текст)
 Copy\ citation\ key=Копировать ключ цитаты
@@ -481,7 +481,6 @@ Last\ modified=Последнее изменение
 LaTeX\ AUX\ file\:=AUX-файл LaTeX\:
 
 Link=Ссылка
-Listen\ for\ remote\ operation\ on\ port=Прослушивать удаленные подключения для порта
 
 Show\ advanced\ hints\ (i.e.\ helpful\ tooltips,\ suggestions\ and\ explanation)=Отобразить расширенные подсказки (т.е. всплывающие подсказки, предположения и объяснения)
 
@@ -944,7 +943,6 @@ Citation\ key\ generator=Генератор ключей цитирования
 Unable\ to\ open\ link.=Не удалось перейти по ссылке.
 MIME\ type=MIME-тип
 
-This\ feature\ lets\ new\ files\ be\ opened\ or\ imported\ into\ an\ already\ running\ instance\ of\ JabRef\ instead\ of\ opening\ a\ new\ instance.\ For\ instance,\ this\ is\ useful\ when\ you\ open\ a\ file\ in\ JabRef\ from\ your\ web\ browser.\ Note\ that\ this\ will\ prevent\ you\ from\ running\ more\ than\ one\ instance\ of\ JabRef\ at\ a\ time.=Эта функция позволяет открывать или импортировать файлы в работающий экземпляр JabRef без запуска нового экземпляра приложения. Например, при передаче файла в JabRef из веб-браузера. Обратите внимание, что эта функция не даст запустить несколько экземпляров JabRef одновременно.
 Run\ fetcher=Запустить выборку
 
 Line\ %0\:\ Found\ corrupted\ citation\ key\ %1.=Строка %0\: Найден поврежденный ключ цитаты %1.
@@ -1927,12 +1925,16 @@ Matching=Соответствие
 Same\ as\ --import,\ but\ will\ be\ imported\ to\ the\ opened\ tab=То же, что и --import, но будет импортировано в открытую вкладку
 Allow\ integers\ in\ 'edition'\ field\ in\ BibTeX\ mode=Разрешить целые числа в поле 'редакция' в режиме BibTeX
 
+
+
+
 Search\ for\ citations\ in\ LaTeX\ files...=Поиск цитат в файлах LaTeX...
 LaTeX\ Citations\ Search\ Results=Результаты поиска по цитатам LaTeX
 LaTeX\ files\ directory\:=Папка с файлами LaTeX\:
 LaTeX\ files\ found\:=Найдены файлы LaTeX\:
 files=файлы
 Show\ 'LaTeX\ Citations'\ tab=Показывать вкладку "Цитаты LaTeX"
+
 LaTeX\ Citations=Цитаты LaTeX
 Search\ citations\ for\ this\ entry\ in\ LaTeX\ files=Поиск цитат для этой записи в файлах LaTeX
 No\ citations\ found=Цитаты не найдены
@@ -2386,3 +2388,9 @@ This\ could\ indicate\ that\ JabRef\ did\ not\ shut\ down\ cleanly\ last\ time\
 
 
 
+
+
+
+
+
+
diff --git a/src/main/resources/l10n/JabRef_sv.properties b/src/main/resources/l10n/JabRef_sv.properties
index 8008a27b056..b6fe1763992 100644
--- a/src/main/resources/l10n/JabRef_sv.properties
+++ b/src/main/resources/l10n/JabRef_sv.properties
@@ -116,6 +116,7 @@ Case\ sensitive=Shiftlägeskänlig
 
 change\ assignment\ of\ entries=ändra tilldelning av poster
 
+
 Change\ case=Ändra shiftläge
 
 Change\ entry\ type=Ändra posttyp
@@ -152,6 +153,7 @@ Copied=Kopierade
 Copy=Kopiera
 
 Copy\ title=Kopiera titel
+Copy\ citation\ (html)=Kopiera referensnyckel (html)
 Copy\ citation\ key=Kopiera referensnyckel
 Copy\ citation\ key\ and\ title=Kopiera referensnyckel och titel
 
@@ -457,7 +459,6 @@ Last\ modified=Senast ändrad
 LaTeX\ AUX\ file\:=LaTeX AUX-fil\:
 
 Link=Länk
-Listen\ for\ remote\ operation\ on\ port=Lyssna efter fjärrstyrning på port
 Memory\ stick\ mode\ -\ Store\ preferences\ in\ 'jabref.xml'\ in\ the\ app\ folder.=Portabelt läge - Spara inställningar i 'jabref.xml' i appmappen.
 
 Show\ advanced\ hints\ (i.e.\ helpful\ tooltips,\ suggestions\ and\ explanation)=Visa avancerade tips (dvs. hjälpsamma verktygstips, förslag och förklaringar)
@@ -1451,6 +1452,10 @@ New\ Filename=Nytt filnamn
 
 
 
+
+
+
+
 Group\ color=Gruppfärg
 
 
@@ -1480,6 +1485,7 @@ Please\ provide\ a\ valid\ aux\ file.=Ange en giltig aux-fil.
 
 Starts\ the\ extraction\ and\ adds\ the\ resulting\ entries\ to\ the\ currently\ opened\ database=Startar extraktionen och lägger till de resulterande posterna till det öppna biblioteket
 
+Citation\ key\ filters=Filter för referensnycklar
 
 Required=Obligatorisk
 
@@ -1568,3 +1574,9 @@ Writing\ metadata\ to\ %0=Skriver metadata till %0
 Select\ entry=Välj post
 Help\ on\ external\ applications=Hjälp med externa program
 
+
+
+
+
+
+
diff --git a/src/main/resources/l10n/JabRef_tl.properties b/src/main/resources/l10n/JabRef_tl.properties
index cd0b42509f6..11236d85373 100644
--- a/src/main/resources/l10n/JabRef_tl.properties
+++ b/src/main/resources/l10n/JabRef_tl.properties
@@ -106,6 +106,7 @@ Case\ sensitive=Sensitibo ang kaso
 
 change\ assignment\ of\ entries=palitan ang pagtatalaga ng mga entries
 
+
 Change\ case=Palitan ang kaso
 
 Change\ entry\ type=Palitan ang uri ng entry
@@ -397,7 +398,6 @@ Language=Wika
 Last\ modified=Ang huling nabago
 
 Link=Ang link
-Listen\ for\ remote\ operation\ on\ port=Makinig para sa remote na operasyon sa port
 
 
 Manage\ custom\ exports=Pamahalaan ang kustom na pagpapalabas
@@ -766,7 +766,6 @@ Error\ while\ fetching\ from\ %0=Error habang kinukuha mula sa %0
 Unable\ to\ open\ link.=Hindi mabuksan ang link.
 MIME\ type=Uri ng 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.=Ang tampok na ito ay nagbibigay-daan sa mga bagong file na mabuksan o ma-import sa isang tumatakbo na halimbawa ng JabRef sa halip ng pagbubukas ng isang bagong pagkakataon. Halimbawa, ito ay kapaki-pakinabang kapag binuksan mo ang isang file sa JabRef mula sa iyong web browser. Tandaan na ito ay pipigil sa iyo mula sa pagpapatakbo ng higit sa isang halimbawa ng JabRef sa isang pagkakataon.
 
 Download\ from\ URL=I-download mula sa URL
 Rename\ field=Palitan ang pangalan ng patlang
@@ -1228,6 +1227,10 @@ Main\ layout\ file=Pangunahing layout ng file
 
 
 
+
+
+
+
 Always\ add\ letter\ (a,\ b,\ ...)\ to\ generated\ keys=Laging magdagdag ng titik (a, b, ...) sa mga nabuong key
 Default\ pattern=Default na pattern
 
@@ -1306,6 +1309,12 @@ plain\ text=plain na teksto
 
 
 
+
+
+
+
+
+
 
 
 
diff --git a/src/main/resources/l10n/JabRef_tr.properties b/src/main/resources/l10n/JabRef_tr.properties
index 83a6b833b1a..43909d730bf 100644
--- a/src/main/resources/l10n/JabRef_tr.properties
+++ b/src/main/resources/l10n/JabRef_tr.properties
@@ -131,6 +131,7 @@ Case\ sensitive=Büyük/küçük harfe duyarlı
 
 change\ assignment\ of\ entries=girdilerin atanmasını değiştir
 
+
 Change\ case=Büyük/küçük harf değiştir
 
 Change\ entry\ type=Girdi türünü değiştir
@@ -168,7 +169,6 @@ Copied=Kopyalandı
 Copy=Kopyala
 
 Copy\ title=Başlığı kopyala
-Copy\ \\cite{citation\ key}=\\cite{citation key}''nı kopyala
 Copy\ citation\ (html)=Atfı kopyala (html)
 Copy\ citation\ (text)=Atfı kopyala (metin)
 Copy\ citation\ key=Atıf anahtarını kopyala
@@ -470,7 +470,6 @@ 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ı
@@ -511,7 +510,6 @@ Last\ modified=Son değiştirme
 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)
@@ -993,7 +991,6 @@ Citation\ key\ generator=Atıf anahtarı oluşturucu
 Unable\ to\ open\ link.=Bağlantı açılamadı.
 MIME\ type=MIME türü
 
-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.=Bu özellik yeni dosyaların yeni bir oturum açmaktansa halen çalışmakta olan bir<BR>JabRef oturumu içine açılması ya da aktarılmasını sağlar. Örneğin bu, tarayıcınızdan bir dosyayı<BR>JabRef içine açtığnızda kullanışlıdır.<BR>Bunun, birden fazla JabRef oturumunu aynı anda çalıştırmanızı önleyeceğini not ediniz.
 Run\ fetcher=Getiriciyi çalıştır
 
 Line\ %0\:\ Found\ corrupted\ citation\ key\ %1.=Satır %0\: Bozulmuş atıf anahtarı bulundu %1.
@@ -2016,12 +2013,16 @@ Matching=Eşleştirme
 Same\ as\ --import,\ but\ will\ be\ imported\ to\ the\ opened\ tab=İçe aktarma gibi, fakat açık sekmeye aktarılacak
 Allow\ integers\ in\ 'edition'\ field\ in\ BibTeX\ mode=BibTeX kipinin 'sürüm' alanında tam sayılara izin ver
 
+
+
+
 Search\ for\ citations\ in\ LaTeX\ files...=LaTeX dosyalarında alıntıları ara...
 LaTeX\ Citations\ Search\ Results=LaTeX Alıntıları Arama Sonuçları
 LaTeX\ files\ directory\:=LaTeX dosyaları dizini\:
 LaTeX\ files\ found\:=Bulunan LaTeX dosyaları\:
 files=dosyalar
 Show\ 'LaTeX\ Citations'\ tab='LaTeX Alıntıları' sekmesini göster
+
 LaTeX\ Citations=LaTeX Alıntıları
 Search\ citations\ for\ this\ entry\ in\ LaTeX\ files=LaTeX dosyalarında bu girdi için alıntıları ara
 No\ citations\ found=Alıntı bulunamadı
@@ -2547,3 +2548,9 @@ Automatically\ search\ and\ show\ unlinked\ files\ in\ the\ entry\ editor=Bağla
 
 
 
+
+
+
+
+
+
diff --git a/src/main/resources/l10n/JabRef_uk.properties b/src/main/resources/l10n/JabRef_uk.properties
index c92a52089e3..ee2eee21693 100644
--- a/src/main/resources/l10n/JabRef_uk.properties
+++ b/src/main/resources/l10n/JabRef_uk.properties
@@ -642,6 +642,17 @@ 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 86d41a736a0..0e19694e10a 100644
--- a/src/main/resources/l10n/JabRef_vi.properties
+++ b/src/main/resources/l10n/JabRef_vi.properties
@@ -112,6 +112,7 @@ Case\ sensitive=Phân biệt chữ hoa/thường
 
 change\ assignment\ of\ entries=đổi phép gán các mục
 
+
 Change\ case=Đổi chữ hoa/thường
 
 Change\ entry\ type=Đổi kiểu của mục
@@ -409,7 +410,6 @@ Language=Ngôn ngữ
 Last\ modified=Thay đổi lần sau cùng
 
 Link=Liên kết
-Listen\ for\ remote\ operation\ on\ port=Lắng nghe lệnh chạy từ xa tại cổng
 
 
 Manage\ custom\ exports=Quản lý các phép xuất tùy chọn
@@ -762,7 +762,6 @@ Error\ while\ fetching\ from\ %0=Lỗi khi lấy về từ %0
 Unable\ to\ open\ link.=Không thể mở liên kết.
 MIME\ type=Kiểu 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.=Tính chất này cho phép các tập tin mới có thể được mở hoặc nhập vào một phiên JabRef đang chạy thay vì phải mở một phiên làm việc mới. Điều này có ích, ví dụ như khi bạn mở một tập tin trong JabRef từ trình duyệt web của mình. Lưu ý rằng điều này sẽ không cho phép bạn chạy nhiều hơn một phiên làm việc của JabRef cùng lúc.
 
 Download\ from\ URL=Kéo từ URL
 Rename\ field=Đổi tên dữ liệu
@@ -1016,6 +1015,10 @@ Main\ layout\ file=Tập tin trình bày chính
 
 
 
+
+
+
+
 Always\ add\ letter\ (a,\ b,\ ...)\ to\ generated\ keys=Luôn thêm mẫu tự (a, b, ...) để tạo ra các khóa
 Default\ pattern=Kiểu mặc định
 
@@ -1099,3 +1102,9 @@ This\ could\ indicate\ that\ JabRef\ did\ not\ shut\ down\ cleanly\ last\ time\
 
 
 
+
+
+
+
+
+
diff --git a/src/main/resources/l10n/JabRef_zh_CN.properties b/src/main/resources/l10n/JabRef_zh_CN.properties
index c94dad5d939..af03a733d76 100644
--- a/src/main/resources/l10n/JabRef_zh_CN.properties
+++ b/src/main/resources/l10n/JabRef_zh_CN.properties
@@ -131,6 +131,7 @@ Case\ sensitive=区分大小写
 
 change\ assignment\ of\ entries=修改记录的组分配
 
+
 Change\ case=修改大小写
 
 Change\ entry\ type=更改条目类型
@@ -168,7 +169,6 @@ Copied=已复制
 Copy=复制
 
 Copy\ title=复制标题
-Copy\ \\cite{citation\ key}=复制 \\cite{citation key}
 Copy\ citation\ (html)=复制引用 (html)
 Copy\ citation\ (text)=复制引用 (text)
 Copy\ citation\ key=复制 citationkey
@@ -471,7 +471,6 @@ Year=年份
 ISSN\ or\ journal\ name\ required\ for\ fetching\ journal\ information=ISSN 或者期刊名称以用于获取期刊信息
 Fetch\ journal\ information\ online\ to\ show=在线获取期刊信息以显示
 Allow\ sending\ ISSN\ to\ a\ JabRef\ online\ service\ (SCimago)\ for\ fetching\ journal\ information=允许将 ISSN 发送到一个 JabRef 在线服务 (SCimago) 以获取期刊信息
-Please\ enable\ journal\ information\ fetching\ in\ %0\ >\ %1=请在 %0 > %1 中启用获取期刊信息
 Categories=分类
 ISSN=ISSN
 Publisher=出版商
@@ -506,7 +505,6 @@ Last\ modified=上次修改的
 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)=显示高级建议（如浮动提示、建议、解释说明）
@@ -988,7 +986,6 @@ Citation\ key\ generator=Citationkey
 Unable\ to\ open\ link.=无法打开链接。
 MIME\ type=MIME 类型
 
-This\ feature\ lets\ new\ files\ be\ opened\ or\ imported\ into\ an\ already\ running\ instance\ of\ JabRef\ instead\ of\ opening\ a\ new\ instance.\ For\ instance,\ this\ is\ useful\ when\ you\ open\ a\ file\ in\ JabRef\ from\ your\ web\ browser.\ Note\ that\ this\ will\ prevent\ you\ from\ running\ more\ than\ one\ instance\ of\ JabRef\ at\ a\ time.=在当前运行的 JabRef 中打开或者导入新文件，而非新建另一个 JabRef 窗口。例如，当通过浏览器调用 JabRef 打开文件时，这个选项会比较有用。注意：它将阻止同时运行多个 JabRef 实例。
 Run\ fetcher=Run fetcher
 
 Line\ %0\:\ Found\ corrupted\ citation\ key\ %1.=第 %0 行\: 发现错误的Citationkey %1.
@@ -2013,12 +2010,16 @@ Matching=Matching
 Same\ as\ --import,\ but\ will\ be\ imported\ to\ the\ opened\ tab=Same as --import, but will be imported to the opened tab
 Allow\ integers\ in\ 'edition'\ field\ in\ BibTeX\ mode=允许在 BibTeX 模式的 edition 字段中使用整数
 
+
+
+
 Search\ for\ citations\ in\ LaTeX\ files...=在LaTeX文件中搜索引文
 LaTeX\ Citations\ Search\ Results=LaTeX 引文搜索结果
 LaTeX\ files\ directory\:=LaTeX 文件目录：
 LaTeX\ files\ found\:=发现的 LaTeX 文件
 files=files
 Show\ 'LaTeX\ Citations'\ tab=显示 “LaTeX Citations” 选项卡
+
 LaTeX\ Citations=LaTeX 引文
 Search\ citations\ for\ this\ entry\ in\ LaTeX\ files=在该条目的LaTeX文件中搜索引文
 No\ citations\ found=没有找到引用
@@ -2553,3 +2554,9 @@ Processing...=处理中...
 
 
 
+
+
+
+
+
+
diff --git a/src/main/resources/l10n/JabRef_zh_TW.properties b/src/main/resources/l10n/JabRef_zh_TW.properties
index dd5e814920e..968b02e35e1 100644
--- a/src/main/resources/l10n/JabRef_zh_TW.properties
+++ b/src/main/resources/l10n/JabRef_zh_TW.properties
@@ -123,6 +123,7 @@ Case\ sensitive=區分大小寫
 
 change\ assignment\ of\ entries=修改條目的分發組別
 
+
 Change\ case=修改大小寫
 
 Change\ entry\ type=修改條目類型
@@ -159,7 +160,6 @@ Copied=已複製
 Copy=複製
 
 Copy\ title=複製標題
-Copy\ \\cite{citation\ key}=複製 \\cite{citation key}
 Copy\ citation\ key=複製引用鍵值（citation key）
 Copy\ citation\ key\ and\ link=複製引用鍵與連結
 Copy\ citation\ key\ and\ title=複製引用鍵與標題
@@ -952,6 +952,10 @@ Set\ rank\ to\ five=設定評分為 5 級
 
 
 
+
+
+
+
 Order=順序
 
 
@@ -1075,6 +1079,12 @@ Select\ directory=選擇資料夾
 
 
 
+
+
+
+
+
+
 
 
 
diff --git a/src/test/java/org/jabref/architecture/TestArchitectureTest.java b/src/test/java/org/jabref/architecture/TestArchitectureTest.java
index 81f73e5a117..9df4d5b2652 100644
--- a/src/test/java/org/jabref/architecture/TestArchitectureTest.java
+++ b/src/test/java/org/jabref/architecture/TestArchitectureTest.java
@@ -25,6 +25,7 @@ public void testsAreIndependent(JavaClasses classes) {
                    .and().doNotHaveSimpleName("PreferencesMigrationsTest")
                    .and().doNotHaveSimpleName("SaveDatabaseActionTest")
                    .and().doNotHaveSimpleName("UpdateTimestampListenerTest")
+                   .and().doNotHaveSimpleName("DatabaseSearcherWithBibFilesTest")
                    .and().doNotHaveFullyQualifiedName("org.jabref.benchmarks.Benchmarks")
                    .and().doNotHaveFullyQualifiedName("org.jabref.testutils.interactive.styletester.StyleTesterMain")
                    .should().dependOnClassesThat().haveFullyQualifiedName(CLASS_ORG_JABREF_GLOBALS)
diff --git a/src/test/java/org/jabref/gui/edit/CopyMoreActionTest.java b/src/test/java/org/jabref/gui/edit/CopyMoreActionTest.java
index d5fe209a3a0..ba3c8465be1 100644
--- a/src/test/java/org/jabref/gui/edit/CopyMoreActionTest.java
+++ b/src/test/java/org/jabref/gui/edit/CopyMoreActionTest.java
@@ -14,11 +14,13 @@
 import org.jabref.gui.actions.StandardActions;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.l10n.Localization;
+import org.jabref.logic.push.CitationCommandString;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
+import org.jabref.preferences.ExternalApplicationsPreferences;
 import org.jabref.preferences.PreferencesService;
 
 import org.junit.jupiter.api.BeforeEach;
@@ -58,6 +60,10 @@ public void setUp() {
         titles.add(title);
         keys.add("abc");
         dois.add("10.1145/3377811.3380330");
+
+        ExternalApplicationsPreferences externalApplicationsPreferences = mock(ExternalApplicationsPreferences.class);
+        when(externalApplicationsPreferences.getCiteCommand()).thenReturn(new CitationCommandString("\\cite{", ",", "}"));
+        when(preferencesService.getExternalApplicationsPreferences()).thenReturn(externalApplicationsPreferences);
     }
 
     @Test
diff --git a/src/test/java/org/jabref/gui/entryeditor/CommentsTabTest.java b/src/test/java/org/jabref/gui/entryeditor/CommentsTabTest.java
index 1d255cf7536..be3f9274d4a 100644
--- a/src/test/java/org/jabref/gui/entryeditor/CommentsTabTest.java
+++ b/src/test/java/org/jabref/gui/entryeditor/CommentsTabTest.java
@@ -1,6 +1,7 @@
 package org.jabref.gui.entryeditor;
 
 import java.util.Optional;
+import java.util.SequencedSet;
 import java.util.Set;
 
 import javax.swing.undo.UndoManager;
@@ -11,7 +12,7 @@
 import org.jabref.gui.theme.ThemeManager;
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
-import org.jabref.logic.pdf.search.indexing.IndexingTaskManager;
+import org.jabref.logic.pdf.search.IndexingTaskManager;
 import org.jabref.logic.preferences.OwnerPreferences;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.database.BibDatabaseMode;
@@ -28,6 +29,8 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.testfx.framework.junit5.ApplicationExtension;
@@ -71,12 +74,17 @@ class CommentsTabTest {
     @Mock
     private OwnerPreferences ownerPreferences;
 
+    @Mock
+    private EntryEditorPreferences entryEditorPreferences;
+
     @BeforeEach
     void setUp() {
         MockitoAnnotations.initMocks(this);
 
         when(preferences.getOwnerPreferences()).thenReturn(ownerPreferences);
         when(ownerPreferences.getDefaultOwner()).thenReturn(ownerName);
+        when(preferences.getEntryEditorPreferences()).thenReturn(entryEditorPreferences);
+        when(entryEditorPreferences.shouldShowUserCommentsFields()).thenReturn(true);
         when(databaseContext.getMode()).thenReturn(BibDatabaseMode.BIBLATEX);
         BibEntryType entryTypeMock = mock(BibEntryType.class);
         when(entryTypesManager.enrich(any(), any())).thenReturn(Optional.of(entryTypeMock));
@@ -96,14 +104,41 @@ void setUp() {
     }
 
     @Test
-    void testDetermineFieldsToShowWorksForASingleUser() {
+    void emptyCommentShownIfGloballyEnabled() {
+        final UserSpecificCommentField ownerComment = new UserSpecificCommentField(ownerName);
+        when(entryEditorPreferences.shouldShowUserCommentsFields()).thenReturn(true);
+
+        BibEntry entry = new BibEntry(StandardEntryType.Book)
+                .withField(StandardField.COMMENT, "Standard comment text");
+
+        SequencedSet<Field> fields = commentsTab.determineFieldsToShow(entry);
+
+        assertEquals(Set.of(StandardField.COMMENT, ownerComment), fields);
+    }
+
+    @Test
+    void emptyCommentFieldNotShownIfGloballyDisabled() {
+        when(entryEditorPreferences.shouldShowUserCommentsFields()).thenReturn(false);
+
+        BibEntry entry = new BibEntry(StandardEntryType.Book)
+                .withField(StandardField.COMMENT, "Standard comment text");
+
+        SequencedSet<Field> fields = commentsTab.determineFieldsToShow(entry);
+
+        assertEquals(Set.of(StandardField.COMMENT), fields);
+    }
+
+    @ParameterizedTest
+    @ValueSource(booleans = {true, false})
+    void commentFieldShownIfContainsText(boolean shouldShowUserCommentsFields) {
         final UserSpecificCommentField ownerComment = new UserSpecificCommentField(ownerName);
+        when(entryEditorPreferences.shouldShowUserCommentsFields()).thenReturn(shouldShowUserCommentsFields);
 
         BibEntry entry = new BibEntry(StandardEntryType.Book)
                 .withField(StandardField.COMMENT, "Standard comment text")
                 .withField(ownerComment, "User-specific comment text");
 
-        Set<Field> fields = commentsTab.determineFieldsToShow(entry);
+        SequencedSet<Field> fields = commentsTab.determineFieldsToShow(entry);
 
         assertEquals(Set.of(StandardField.COMMENT, ownerComment), fields);
     }
@@ -118,7 +153,7 @@ void testDetermineFieldsToShowWorksForMultipleUsers() {
                 .withField(ownerComment, "User-specific comment text")
                 .withField(otherUsersComment, "other-user-id comment text");
 
-        Set<Field> fields = commentsTab.determineFieldsToShow(entry);
+        SequencedSet<Field> fields = commentsTab.determineFieldsToShow(entry);
 
         assertEquals(Set.of(StandardField.COMMENT, ownerComment, otherUsersComment), fields);
     }
diff --git a/src/test/java/org/jabref/gui/entryeditor/citationrelationtab/CitationsRelationsTabViewModelTest.java b/src/test/java/org/jabref/gui/entryeditor/citationrelationtab/CitationsRelationsTabViewModelTest.java
new file mode 100644
index 00000000000..e3037b2edc6
--- /dev/null
+++ b/src/test/java/org/jabref/gui/entryeditor/citationrelationtab/CitationsRelationsTabViewModelTest.java
@@ -0,0 +1,131 @@
+package org.jabref.gui.entryeditor.citationrelationtab;
+
+import java.util.List;
+import java.util.Optional;
+
+import javax.swing.undo.UndoManager;
+
+import org.jabref.gui.DialogService;
+import org.jabref.gui.StateManager;
+import org.jabref.gui.entryeditor.citationrelationtab.semanticscholar.CitationFetcher;
+import org.jabref.gui.externalfiles.ImportHandler;
+import org.jabref.gui.util.CurrentThreadTaskExecutor;
+import org.jabref.logic.citationkeypattern.CitationKeyPatternPreferences;
+import org.jabref.logic.citationkeypattern.GlobalCitationKeyPattern;
+import org.jabref.logic.database.DuplicateCheck;
+import org.jabref.logic.importer.ImportFormatPreferences;
+import org.jabref.logic.importer.ImporterPreferences;
+import org.jabref.logic.preferences.OwnerPreferences;
+import org.jabref.logic.preferences.TimestampPreferences;
+import org.jabref.model.database.BibDatabase;
+import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.field.StandardField;
+import org.jabref.model.entry.types.StandardEntryType;
+import org.jabref.model.util.DummyFileUpdateMonitor;
+import org.jabref.preferences.FilePreferences;
+import org.jabref.preferences.PreferencesService;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+class CitationsRelationsTabViewModelTest {
+    private ImportHandler importHandler;
+    private BibDatabaseContext bibDatabaseContext;
+    private BibEntry testEntry;
+
+    @Mock
+    private PreferencesService preferencesService;
+    @Mock
+    private DuplicateCheck duplicateCheck;
+    private BibEntry existingEntry;
+    private BibEntry firstEntryToImport;
+    private BibEntry secondEntryToImport;
+    private CitationsRelationsTabViewModel viewModel;
+
+    @BeforeEach
+    void setUp() {
+        MockitoAnnotations.openMocks(this);
+
+        ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        when(preferencesService.getImportFormatPreferences()).thenReturn(importFormatPreferences);
+
+        ImporterPreferences importerPreferences = mock(ImporterPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        when(importerPreferences.isGenerateNewKeyOnImport()).thenReturn(false);
+        when(preferencesService.getImporterPreferences()).thenReturn(importerPreferences);
+
+        when(preferencesService.getFilePreferences()).thenReturn(mock(FilePreferences.class));
+        when(preferencesService.getOwnerPreferences()).thenReturn(mock(OwnerPreferences.class, Answers.RETURNS_DEEP_STUBS));
+        when(preferencesService.getTimestampPreferences()).thenReturn(mock(TimestampPreferences.class, Answers.RETURNS_DEEP_STUBS));
+
+        CitationKeyPatternPreferences citationKeyPatternPreferences = mock(CitationKeyPatternPreferences.class);
+        GlobalCitationKeyPattern pattern = GlobalCitationKeyPattern.fromPattern("[auth][year]");
+        when(citationKeyPatternPreferences.getKeyPattern()).thenReturn(pattern);
+        when(preferencesService.getCitationKeyPatternPreferences()).thenReturn(citationKeyPatternPreferences);
+
+        bibDatabaseContext = new BibDatabaseContext(new BibDatabase());
+        when(duplicateCheck.isDuplicate(any(), any(), any())).thenReturn(false);
+
+        viewModel = new CitationsRelationsTabViewModel(
+                bibDatabaseContext,
+                preferencesService,
+                mock(UndoManager.class),
+                mock(StateManager.class, Answers.RETURNS_DEEP_STUBS),
+                mock(DialogService.class),
+                new DummyFileUpdateMonitor(),
+                new CurrentThreadTaskExecutor());
+
+        existingEntry = new BibEntry(StandardEntryType.Article)
+                .withCitationKey("Test2023")
+                .withField(StandardField.AUTHOR, "Test Author");
+
+        bibDatabaseContext.getDatabase().insertEntry(existingEntry);
+
+        firstEntryToImport = new BibEntry(StandardEntryType.Article).withField(StandardField.AUTHOR, "First Author")
+                                                                    .withField(StandardField.YEAR, "2022")
+                                                                    .withCitationKey("FirstAuthorCitationKey2022");
+
+        secondEntryToImport = new BibEntry(StandardEntryType.Article).withField(StandardField.AUTHOR, "Second Author")
+                                                                     .withField(StandardField.YEAR, "2021")
+                                                                     .withCitationKey("SecondAuthorCitationKey20221");
+    }
+
+    @Test
+    void testExistingEntryCitesOtherPaperWithCitationKeys() {
+        var citationItems = List.of(new CitationRelationItem(firstEntryToImport, false),
+                new CitationRelationItem(secondEntryToImport, false));
+
+        viewModel.importEntries(citationItems, CitationFetcher.SearchType.CITES, existingEntry);
+        assertEquals(Optional.of("FirstAuthorCitationKey2022,SecondAuthorCitationKey20221"), existingEntry.getField(StandardField.CITES));
+        assertEquals(List.of(existingEntry, firstEntryToImport, secondEntryToImport), bibDatabaseContext.getEntries());
+    }
+
+    @Test
+    void testImportedEntriesWithExistingCitationKeysCiteExistingEntry() {
+        var citationItems = List.of(new CitationRelationItem(firstEntryToImport, false),
+                new CitationRelationItem(secondEntryToImport, false));
+
+        viewModel.importEntries(citationItems, CitationFetcher.SearchType.CITED_BY, existingEntry);
+        assertEquals(Optional.of("Test2023"), firstEntryToImport.getField(StandardField.CITES));
+        assertEquals(List.of(existingEntry, firstEntryToImport, secondEntryToImport), bibDatabaseContext.getEntries());
+    }
+
+    @Test
+    void testExistingEntryCitesOtherPaperWithCitationKeysAndExistingCiteField() {
+        existingEntry.setField(StandardField.CITES, "Asdf1222");
+        var citationItems = List.of(new CitationRelationItem(firstEntryToImport, false),
+                new CitationRelationItem(secondEntryToImport, false));
+
+        viewModel.importEntries(citationItems, CitationFetcher.SearchType.CITES, existingEntry);
+        assertEquals(Optional.of("Asdf1222,FirstAuthorCitationKey2022,SecondAuthorCitationKey20221"), existingEntry.getField(StandardField.CITES));
+        assertEquals(List.of(existingEntry, firstEntryToImport, secondEntryToImport), bibDatabaseContext.getEntries());
+    }
+}
diff --git a/src/test/java/org/jabref/gui/exporter/SaveDatabaseActionTest.java b/src/test/java/org/jabref/gui/exporter/SaveDatabaseActionTest.java
index 5752fc7afa7..9b36a5a712b 100644
--- a/src/test/java/org/jabref/gui/exporter/SaveDatabaseActionTest.java
+++ b/src/test/java/org/jabref/gui/exporter/SaveDatabaseActionTest.java
@@ -11,7 +11,6 @@
 import javafx.collections.FXCollections;
 
 import org.jabref.gui.DialogService;
-import org.jabref.gui.JabRefFrame;
 import org.jabref.gui.LibraryTab;
 import org.jabref.gui.undo.CountingUndoManager;
 import org.jabref.gui.util.FileDialogConfiguration;
@@ -54,18 +53,15 @@ class SaveDatabaseActionTest {
     private final FilePreferences filePreferences = mock(FilePreferences.class);
     private final JabRefPreferences preferences = mock(JabRefPreferences.class);
     private LibraryTab libraryTab = mock(LibraryTab.class);
-    private final JabRefFrame jabRefFrame = mock(JabRefFrame.class);
     private BibDatabaseContext dbContext = spy(BibDatabaseContext.class);
     private SaveDatabaseAction saveDatabaseAction;
 
     @BeforeEach
     public void setUp() {
-        when(libraryTab.frame()).thenReturn(jabRefFrame);
         when(libraryTab.getBibDatabaseContext()).thenReturn(dbContext);
         when(filePreferences.getWorkingDirectory()).thenReturn(Path.of(TEST_BIBTEX_LIBRARY_LOCATION));
         when(preferences.getFilePreferences()).thenReturn(filePreferences);
         when(preferences.getExportPreferences()).thenReturn(mock(ExportPreferences.class));
-        when(jabRefFrame.getDialogService()).thenReturn(dialogService);
         saveDatabaseAction = spy(new SaveDatabaseAction(libraryTab, dialogService, preferences, mock(BibEntryTypesManager.class)));
     }
 
@@ -127,7 +123,6 @@ private SaveDatabaseAction createSaveDatabaseActionForBibDatabase(BibDatabase da
         when(preferences.getCitationKeyPatternPreferences().getKeyPattern()).thenReturn(emptyGlobalCitationKeyPattern);
         when(preferences.getFieldPreferences().getNonWrappableFields()).thenReturn(FXCollections.emptyObservableList());
         when(preferences.getLibraryPreferences()).thenReturn(mock(LibraryPreferences.class));
-        when(libraryTab.frame()).thenReturn(jabRefFrame);
         when(libraryTab.getBibDatabaseContext()).thenReturn(dbContext);
         when(libraryTab.getUndoManager()).thenReturn(mock(CountingUndoManager.class));
         when(libraryTab.getBibDatabaseContext()).thenReturn(dbContext);
diff --git a/src/test/java/org/jabref/gui/externalfiles/FileFilterUtilsTest.java b/src/test/java/org/jabref/gui/externalfiles/FileFilterUtilsTest.java
index 9af4b1364bb..9deab592e8f 100755
--- a/src/test/java/org/jabref/gui/externalfiles/FileFilterUtilsTest.java
+++ b/src/test/java/org/jabref/gui/externalfiles/FileFilterUtilsTest.java
@@ -16,7 +16,9 @@
 import org.junit.jupiter.api.io.TempDir;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class FileFilterUtilsTest {
 
@@ -25,42 +27,42 @@ public class FileFilterUtilsTest {
 
     @Test
     public void isDuringLastDayNegativeTest() {
-        assertEquals(fileFilterUtils.isDuringLastDay(time.minusHours(24)), false);
+        assertFalse(fileFilterUtils.isDuringLastDay(time.minusHours(24)));
     }
 
     @Test
     public void isDuringLastDayPositiveTest() {
-        assertEquals(fileFilterUtils.isDuringLastDay(time.minusHours(23)), true);
+        assertTrue(fileFilterUtils.isDuringLastDay(time.minusHours(23)));
     }
 
     @Test
     public void isDuringLastWeekNegativeTest() {
-        assertEquals(fileFilterUtils.isDuringLastWeek(time.minusDays(7)), false);
+        assertFalse(fileFilterUtils.isDuringLastWeek(time.minusDays(7)));
     }
 
     @Test
     public void isDuringLastWeekPositiveTest() {
-        assertEquals(fileFilterUtils.isDuringLastWeek(time.minusDays(6).minusHours(23)), true);
+        assertTrue(fileFilterUtils.isDuringLastWeek(time.minusDays(6).minusHours(23)));
     }
 
     @Test
     public void isDuringLastMonthNegativeTest() {
-        assertEquals(fileFilterUtils.isDuringLastMonth(time.minusDays(30)), false);
+        assertFalse(fileFilterUtils.isDuringLastMonth(time.minusDays(30)));
     }
 
     @Test
     public void isDuringLastMonthPositiveTest() {
-        assertEquals(fileFilterUtils.isDuringLastMonth(time.minusDays(29).minusHours(23)), true);
+        assertTrue(fileFilterUtils.isDuringLastMonth(time.minusDays(29).minusHours(23)));
     }
 
     @Test
     public void isDuringLastYearNegativeTest() {
-        assertEquals(fileFilterUtils.isDuringLastYear(time.minusDays(365)), false);
+        assertFalse(fileFilterUtils.isDuringLastYear(time.minusDays(365)));
     }
 
     @Test
     public void isDuringLastYearPositiveTest() {
-        assertEquals(fileFilterUtils.isDuringLastYear(time.minusDays(364).minusHours(23)), true);
+        assertTrue(fileFilterUtils.isDuringLastYear(time.minusDays(364).minusHours(23)));
     }
 
     @Nested
diff --git a/src/test/java/org/jabref/gui/groups/GroupColorPickerTest.java b/src/test/java/org/jabref/gui/groups/GroupColorPickerTest.java
new file mode 100644
index 00000000000..12c43a4801e
--- /dev/null
+++ b/src/test/java/org/jabref/gui/groups/GroupColorPickerTest.java
@@ -0,0 +1,49 @@
+package org.jabref.gui.groups;
+
+import java.util.List;
+import java.util.stream.Stream;
+
+import javafx.scene.paint.Color;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class GroupColorPickerTest {
+
+    static Stream<Arguments> generateColor() {
+        return Stream.of(
+                Arguments.of(
+                        Color.hsb(180, 1.0, 1.0),
+                        List.of(Color.hsb(0, 1.0, 1.0))
+                ),
+                Arguments.of(
+                        Color.hsb(270, 1.0, 1.0),
+                        List.of(
+                                Color.hsb(0, 1.0, 1.0),
+                                Color.hsb(180, 1.0, 1.0))
+                ),
+                Arguments.of(
+                        Color.hsb(270, 1.0, 1.0),
+                        List.of(
+                                Color.hsb(0, 1.0, 1.0),
+                                Color.hsb(90, 1.0, 1.0),
+                                Color.hsb(180, 1.0, 1.0))
+                )
+        );
+    }
+
+    private static String colorToHsb(Color color) {
+        return "h:%,.4f s:%,.4f b:%,.4f".formatted(color.getHue(), color.getSaturation(), color.getBrightness());
+    }
+
+    @ParameterizedTest
+    @MethodSource
+    void generateColor(Color expected, List<Color> subgroupColors) {
+        Color result = GroupColorPicker.generateColor(subgroupColors);
+        assertEquals(expected, result,
+                "%s != %s".formatted(colorToHsb(expected), colorToHsb(result)));
+    }
+}
diff --git a/src/test/java/org/jabref/gui/groups/GroupDialogViewModelTest.java b/src/test/java/org/jabref/gui/groups/GroupDialogViewModelTest.java
index 6022ef4d7c5..808b37a8158 100644
--- a/src/test/java/org/jabref/gui/groups/GroupDialogViewModelTest.java
+++ b/src/test/java/org/jabref/gui/groups/GroupDialogViewModelTest.java
@@ -51,7 +51,7 @@ void setUp(@TempDir Path temporaryFolder) {
 
         bibDatabaseContext.setMetaData(metaData);
 
-        viewModel = new GroupDialogViewModel(dialogService, bibDatabaseContext, preferencesService, group, new DummyFileUpdateMonitor());
+        viewModel = new GroupDialogViewModel(dialogService, bibDatabaseContext, preferencesService, group, null, new DummyFileUpdateMonitor());
     }
 
     @Test
@@ -88,7 +88,7 @@ void validateExistingRelativePath() throws Exception {
     void testHierarchicalContextFromGroup() throws Exception {
         GroupHierarchyType groupHierarchyType = GroupHierarchyType.INCLUDING;
         when(group.getHierarchicalContext()).thenReturn(groupHierarchyType);
-        viewModel = new GroupDialogViewModel(dialogService, bibDatabaseContext, preferencesService, group, new DummyFileUpdateMonitor());
+        viewModel = new GroupDialogViewModel(dialogService, bibDatabaseContext, preferencesService, group, null, new DummyFileUpdateMonitor());
 
         assertEquals(groupHierarchyType, viewModel.groupHierarchySelectedProperty().getValue());
     }
@@ -97,7 +97,7 @@ void testHierarchicalContextFromGroup() throws Exception {
     void testDefaultHierarchicalContext() throws Exception {
         GroupHierarchyType defaultHierarchicalContext = GroupHierarchyType.REFINING;
         when(preferencesService.getGroupsPreferences().getDefaultHierarchicalContext()).thenReturn(defaultHierarchicalContext);
-        viewModel = new GroupDialogViewModel(dialogService, bibDatabaseContext, preferencesService, null, new DummyFileUpdateMonitor());
+        viewModel = new GroupDialogViewModel(dialogService, bibDatabaseContext, preferencesService, null, null, new DummyFileUpdateMonitor());
 
         assertEquals(defaultHierarchicalContext, viewModel.groupHierarchySelectedProperty().getValue());
     }
diff --git a/src/test/java/org/jabref/gui/importer/NewEntryActionTest.java b/src/test/java/org/jabref/gui/importer/NewEntryActionTest.java
index 079bb6c1388..12e36236576 100644
--- a/src/test/java/org/jabref/gui/importer/NewEntryActionTest.java
+++ b/src/test/java/org/jabref/gui/importer/NewEntryActionTest.java
@@ -1,9 +1,10 @@
 package org.jabref.gui.importer;
 
+import java.util.List;
+
 import org.jabref.gui.DialogService;
-import org.jabref.gui.EntryTypeView;
-import org.jabref.gui.JabRefFrame;
 import org.jabref.gui.LibraryTab;
+import org.jabref.gui.LibraryTabContainer;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.util.OptionalObjectProperty;
 import org.jabref.model.entry.BibEntry;
@@ -14,7 +15,6 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
@@ -24,33 +24,23 @@
 public class NewEntryActionTest {
 
     private NewEntryAction newEntryAction;
-    private LibraryTab libraryTab = mock(LibraryTab.class);
-    private JabRefFrame jabRefFrame = mock(JabRefFrame.class);
-    private DialogService dialogService = spy(DialogService.class);
-    private PreferencesService preferencesService = mock(PreferencesService.class);
-    private StateManager stateManager = mock(StateManager.class);
+    private final LibraryTab libraryTab = mock(LibraryTab.class);
+    private final LibraryTabContainer tabContainer = mock(LibraryTabContainer.class);
+    private final DialogService dialogService = spy(DialogService.class);
+    private final PreferencesService preferencesService = mock(PreferencesService.class);
+    private final StateManager stateManager = mock(StateManager.class);
 
     @BeforeEach
     public void setUp() {
-        when(jabRefFrame.getCurrentLibraryTab()).thenReturn(libraryTab);
         when(stateManager.activeDatabaseProperty()).thenReturn(OptionalObjectProperty.empty());
-        newEntryAction = new NewEntryAction(jabRefFrame, dialogService, preferencesService, stateManager);
-    }
-
-    @Test
-    public void testExecuteIfNoBasePanel() {
-        when(jabRefFrame.getBasePanelCount()).thenReturn(0);
-
-        newEntryAction.execute();
-        verify(libraryTab, times(0)).insertEntry(any(BibEntry.class));
-        verify(dialogService, times(0)).showCustomDialogAndWait(any(EntryTypeView.class));
+        newEntryAction = new NewEntryAction(() -> libraryTab, dialogService, preferencesService, stateManager);
     }
 
     @Test
     public void testExecuteOnSuccessWithFixedType() {
         EntryType type = StandardEntryType.Article;
-        newEntryAction = new NewEntryAction(jabRefFrame, type, dialogService, preferencesService, stateManager);
-        when(jabRefFrame.getBasePanelCount()).thenReturn(1);
+        newEntryAction = new NewEntryAction(() -> libraryTab, type, dialogService, preferencesService, stateManager);
+        when(tabContainer.getLibraryTabs()).thenReturn(List.of(libraryTab));
 
         newEntryAction.execute();
         verify(libraryTab, times(1)).insertEntry(new BibEntry(type));
diff --git a/src/test/java/org/jabref/gui/maintable/MainTableColumnModelTest.java b/src/test/java/org/jabref/gui/maintable/MainTableColumnModelTest.java
index a344886401a..750d92708fb 100644
--- a/src/test/java/org/jabref/gui/maintable/MainTableColumnModelTest.java
+++ b/src/test/java/org/jabref/gui/maintable/MainTableColumnModelTest.java
@@ -52,6 +52,6 @@ public void typeOnlyMainTableColumnModelParserRetrievesCorrectType() {
     public void typeOnlyMainTableColumnModelParserRetrievesCorrectQualifier() {
         MainTableColumnModel testColumnModel = MainTableColumnModel.parse(testTypeOnlyName);
 
-        assertEquals(testColumnModel.getQualifier(), "");
+        assertEquals("", testColumnModel.getQualifier());
     }
 }
diff --git a/src/test/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypesTabViewModelTest.java b/src/test/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypesTabViewModelTest.java
new file mode 100644
index 00000000000..8c730d6b583
--- /dev/null
+++ b/src/test/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypesTabViewModelTest.java
@@ -0,0 +1,98 @@
+package org.jabref.gui.preferences.externalfiletypes;
+
+import javafx.collections.ObservableList;
+
+import org.jabref.gui.DialogService;
+import org.jabref.preferences.FilePreferences;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Spy;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+
+public class ExternalFileTypesTabViewModelTest {
+
+    private FilePreferences filePreferences = mock(FilePreferences.class);
+    private DialogService dialogService = mock(DialogService.class);
+    private ExternalFileTypeItemViewModel externalFileTypeItemViewModel = new ExternalFileTypeItemViewModel();
+
+    @Spy
+    private ExternalFileTypesTabViewModel externalFileTypesTabViewModel = spy(new ExternalFileTypesTabViewModel(filePreferences, dialogService));
+
+    @BeforeEach
+    void setUp() {
+        externalFileTypeItemViewModel.nameProperty().set("Excel 2007");
+        externalFileTypeItemViewModel.extensionProperty().set("xlsx");
+        externalFileTypeItemViewModel.mimetypeProperty().set("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+        externalFileTypeItemViewModel.applicationProperty().set("oocalc");
+    }
+
+    public void setupViewModelWithoutName() {
+        externalFileTypeItemViewModel.nameProperty().set("");
+    }
+
+    public void viewModelClone(ExternalFileTypeItemViewModel updatedModel) {
+        updatedModel.nameProperty().set(externalFileTypeItemViewModel.getName());
+        updatedModel.extensionProperty().set(externalFileTypeItemViewModel.extensionProperty().get());
+        updatedModel.mimetypeProperty().set(externalFileTypeItemViewModel.mimetypeProperty().get());
+        updatedModel.applicationProperty().set(externalFileTypeItemViewModel.applicationProperty().get());
+    }
+
+    public boolean viewModelIsSameValue(ExternalFileTypeItemViewModel item) {
+        return !(!item.getName().equals(externalFileTypeItemViewModel.getName())
+                || !item.extensionProperty().get().equals(externalFileTypeItemViewModel.extensionProperty().get())
+                || !item.mimetypeProperty().get().equals(externalFileTypeItemViewModel.mimetypeProperty().get())
+                || !item.applicationProperty().get().equals(externalFileTypeItemViewModel.applicationProperty().get()));
+    }
+
+    @Test
+    public void whenExternalFileTypeItemViewModelWithNonEmptyStringValueThenisValidExternalFileTypeReturnTrue() {
+        assertTrue(externalFileTypesTabViewModel.isValidExternalFileType(externalFileTypeItemViewModel));
+    }
+
+    @Test
+    public void whenExternalFileTypeItemViewModelWithEmptyNameThenisValidExternalFileTypeReturnFalse() {
+        this.setupViewModelWithoutName();
+        assertFalse(externalFileTypesTabViewModel.isValidExternalFileType(externalFileTypeItemViewModel));
+    }
+
+    @Test
+    public void WhenExternalFileTypeItemViewModelIsValidThenAddNewTypeIsSuccessful() {
+        ArgumentCaptor<ExternalFileTypeItemViewModel> itemCaptor = ArgumentCaptor.forClass(ExternalFileTypeItemViewModel.class);
+        doAnswer(mocked -> {
+            ExternalFileTypeItemViewModel capturedItem = itemCaptor.getValue();
+            this.viewModelClone(capturedItem);
+            return null;
+        }).when(externalFileTypesTabViewModel).showEditDialog(itemCaptor.capture(), any());
+
+        externalFileTypesTabViewModel.addNewType();
+
+        ObservableList<ExternalFileTypeItemViewModel> actualFileTypes = externalFileTypesTabViewModel.getFileTypes();
+        assertEquals(1, actualFileTypes.size());
+        assertTrue(viewModelIsSameValue(actualFileTypes.getFirst()));
+    }
+
+    @Test
+    public void WhenExternalFileTypeItemViewModelMissNameThenAddNewTypeIsFailed() {
+        setupViewModelWithoutName();
+        ArgumentCaptor<ExternalFileTypeItemViewModel> itemCaptor = ArgumentCaptor.forClass(ExternalFileTypeItemViewModel.class);
+        doAnswer(mocked -> {
+            ExternalFileTypeItemViewModel capturedItem = itemCaptor.getValue();
+            viewModelClone(capturedItem);
+            return null;
+        }).when(externalFileTypesTabViewModel).showEditDialog(itemCaptor.capture(), any());
+
+        externalFileTypesTabViewModel.addNewType();
+
+        ObservableList<ExternalFileTypeItemViewModel> emptyFileTypes = externalFileTypesTabViewModel.getFileTypes();
+        assertEquals(0, emptyFileTypes.size());
+    }
+}
diff --git a/src/test/java/org/jabref/gui/push/PushToEmacsTest.java b/src/test/java/org/jabref/gui/push/PushToEmacsTest.java
index 830cfff46b5..7e298a2ec6e 100644
--- a/src/test/java/org/jabref/gui/push/PushToEmacsTest.java
+++ b/src/test/java/org/jabref/gui/push/PushToEmacsTest.java
@@ -41,7 +41,7 @@ public void setup() {
         when(preferencesService.getPushToApplicationPreferences()).thenReturn(pushToApplicationPreferences);
 
         ExternalApplicationsPreferences externalApplicationsPreferences = mock(ExternalApplicationsPreferences.class);
-        when(externalApplicationsPreferences.getCiteCommand()).thenReturn("\\cite{key1,key2}");
+        when(externalApplicationsPreferences.getCiteCommand().toString()).thenReturn("\\cite{key1,key2}");
         when(preferencesService.getExternalApplicationsPreferences()).thenReturn(externalApplicationsPreferences);
 
         pushToEmacs = new PushToEmacs(dialogService, preferencesService);
diff --git a/src/test/java/org/jabref/gui/search/GlobalSearchBarTest.java b/src/test/java/org/jabref/gui/search/GlobalSearchBarTest.java
index b702ec57e2d..4a3b9819cb9 100644
--- a/src/test/java/org/jabref/gui/search/GlobalSearchBarTest.java
+++ b/src/test/java/org/jabref/gui/search/GlobalSearchBarTest.java
@@ -9,7 +9,7 @@
 import javafx.stage.Stage;
 
 import org.jabref.gui.DialogService;
-import org.jabref.gui.JabRefFrame;
+import org.jabref.gui.LibraryTabContainer;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.undo.CountingUndoManager;
 import org.jabref.gui.util.DefaultTaskExecutor;
@@ -34,11 +34,8 @@
 @GUITest
 @ExtendWith(ApplicationExtension.class)
 public class GlobalSearchBarTest {
-    private Stage stage;
-    private Scene scene;
     private HBox hBox;
 
-    private GlobalSearchBar searchBar;
     private StateManager stateManager;
 
     @Start
@@ -53,8 +50,8 @@ public void onStart(Stage stage) {
         stateManager.setActiveDatabase(new BibDatabaseContext());
 
         // Instantiate GlobalSearchBar class, so the change listener is registered
-        searchBar = new GlobalSearchBar(
-                mock(JabRefFrame.class),
+        GlobalSearchBar searchBar = new GlobalSearchBar(
+                mock(LibraryTabContainer.class),
                 stateManager,
                 prefs,
                 mock(CountingUndoManager.class),
@@ -63,8 +60,7 @@ public void onStart(Stage stage) {
 
         hBox = new HBox(searchBar);
 
-        scene = new Scene(hBox, 400, 400);
-        this.stage = stage;
+        Scene scene = new Scene(hBox, 400, 400);
         stage.setScene(scene);
 
         stage.show();
diff --git a/src/test/java/org/jabref/gui/sidepane/SidePaneViewModelTest.java b/src/test/java/org/jabref/gui/sidepane/SidePaneViewModelTest.java
index 27db78fe64d..0419752b78e 100644
--- a/src/test/java/org/jabref/gui/sidepane/SidePaneViewModelTest.java
+++ b/src/test/java/org/jabref/gui/sidepane/SidePaneViewModelTest.java
@@ -76,30 +76,30 @@ void setUp() {
     void moveUp() {
         sidePaneViewModel.moveUp(SidePaneType.WEB_SEARCH);
 
-        assertEquals(sidePaneComponents.get(0), SidePaneType.WEB_SEARCH);
-        assertEquals(sidePaneComponents.get(1), SidePaneType.GROUPS);
+        assertEquals(SidePaneType.WEB_SEARCH, sidePaneComponents.get(0));
+        assertEquals(SidePaneType.GROUPS, sidePaneComponents.get(1));
     }
 
     @Test
     void moveUpFromFirstPosition() {
         sidePaneViewModel.moveUp(SidePaneType.GROUPS);
 
-        assertEquals(sidePaneComponents.get(0), SidePaneType.GROUPS);
+        assertEquals(SidePaneType.GROUPS, sidePaneComponents.get(0));
     }
 
     @Test
     void moveDown() {
         sidePaneViewModel.moveDown(SidePaneType.WEB_SEARCH);
 
-        assertEquals(sidePaneComponents.get(1), SidePaneType.OPEN_OFFICE);
-        assertEquals(sidePaneComponents.get(2), SidePaneType.WEB_SEARCH);
+        assertEquals(SidePaneType.OPEN_OFFICE, sidePaneComponents.get(1));
+        assertEquals(SidePaneType.WEB_SEARCH, sidePaneComponents.get(2));
     }
 
     @Test
     void moveDownFromLastPosition() {
         sidePaneViewModel.moveDown(SidePaneType.OPEN_OFFICE);
 
-        assertEquals(sidePaneComponents.get(2), SidePaneType.OPEN_OFFICE);
+        assertEquals(SidePaneType.OPEN_OFFICE, sidePaneComponents.get(2));
     }
 
     @Test
diff --git a/src/test/java/org/jabref/gui/theme/ThemeManagerTest.java b/src/test/java/org/jabref/gui/theme/ThemeManagerTest.java
index f96308c18b8..87e1d1a654c 100644
--- a/src/test/java/org/jabref/gui/theme/ThemeManagerTest.java
+++ b/src/test/java/org/jabref/gui/theme/ThemeManagerTest.java
@@ -145,7 +145,7 @@ public void largeCustomThemeNotHeldInMemory() throws IOException {
         Files.move(largeCssTestFile, largeCssTestFile.resolveSibling("renamed.css"));
 
         // getAdditionalStylesheet() should no longer offer the deleted stylesheet as it is not been held in memory
-        assertEquals(themeManager.getActiveTheme().getAdditionalStylesheet().get().getWebEngineStylesheet(), "",
+        assertEquals("", themeManager.getActiveTheme().getAdditionalStylesheet().get().getWebEngineStylesheet(),
                 "didn't expect additional stylesheet after css was deleted");
 
         Files.move(largeCssTestFile.resolveSibling("renamed.css"), largeCssTestFile);
@@ -194,7 +194,7 @@ public void installThemeOnWebEngine() throws IOException {
         });
 
         Assertions.assertDoesNotThrow(() -> {
-            assertEquals(webEngineStyleSheetLocation.get(), TEST_CSS_DATA);
+            assertEquals(TEST_CSS_DATA, webEngineStyleSheetLocation.get());
         });
     }
 
diff --git a/src/test/java/org/jabref/logic/bibtex/comparator/BibStringDiffTest.java b/src/test/java/org/jabref/logic/bibtex/comparator/BibStringDiffTest.java
index 28f8ed4d801..03527cb4387 100644
--- a/src/test/java/org/jabref/logic/bibtex/comparator/BibStringDiffTest.java
+++ b/src/test/java/org/jabref/logic/bibtex/comparator/BibStringDiffTest.java
@@ -10,9 +10,7 @@
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -54,17 +52,17 @@ void notEqualTest() {
     @Test
     void identicalObjectsAreEqual() {
         BibStringDiff other = diff;
-        assertTrue(other.equals(diff));
+        assertEquals(other, diff);
     }
 
     @Test
     void compareToNullObjectIsFalse() {
-        assertFalse(diff.equals(null));
+        assertNotEquals(null, diff);
     }
 
     @Test
     void compareToDifferentClassIsFalse() {
-        assertFalse(diff.equals(new Object()));
+        assertNotEquals(diff, new Object());
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/cleanup/FieldFormatterCleanupsTest.java b/src/test/java/org/jabref/logic/cleanup/FieldFormatterCleanupsTest.java
index b6737e8c924..90676249146 100644
--- a/src/test/java/org/jabref/logic/cleanup/FieldFormatterCleanupsTest.java
+++ b/src/test/java/org/jabref/logic/cleanup/FieldFormatterCleanupsTest.java
@@ -5,6 +5,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
+import java.util.stream.Stream;
 
 import org.jabref.logic.formatter.IdentityFormatter;
 import org.jabref.logic.formatter.bibtexfields.EscapeAmpersandsFormatter;
@@ -18,11 +19,15 @@
 import org.jabref.logic.layout.format.ReplaceUnicodeLigaturesFormatter;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
+import org.jabref.model.entry.field.InternalField;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -72,7 +77,7 @@ public void checkLowerCaseSaveAction() {
         FieldFormatterCleanups actions = new FieldFormatterCleanups(true, FieldFormatterCleanups.parse("title[lower_case]"));
 
         FieldFormatterCleanup lowerCaseTitle = new FieldFormatterCleanup(StandardField.TITLE, new LowerCaseFormatter());
-        assertEquals(Collections.singletonList(lowerCaseTitle), actions.getConfiguredActions());
+        assertEquals(List.of(lowerCaseTitle), actions.getConfiguredActions());
 
         actions.applySaveActions(entry);
 
@@ -309,6 +314,24 @@ void parserTest() {
                 fieldFormatterCleanups);
     }
 
+    @Test
+    void identityCanBeParsed() {
+        List<FieldFormatterCleanup> fieldFormatterCleanups = FieldFormatterCleanups.parse("""
+                all-text-fields[identity]
+                date[normalize_date]
+                month[normalize_month]
+                pages[normalize_page_numbers]
+                """);
+        assertEquals(
+                List.of(
+                        new FieldFormatterCleanup(InternalField.INTERNAL_ALL_TEXT_FIELDS_FIELD, new IdentityFormatter()),
+                        new FieldFormatterCleanup(StandardField.DATE, new NormalizeDateFormatter()),
+                        new FieldFormatterCleanup(StandardField.MONTH, new NormalizeMonthFormatter()),
+                        new FieldFormatterCleanup(StandardField.PAGES, new NormalizePagesFormatter())
+                ),
+                fieldFormatterCleanups);
+    }
+
     @Test
     void getMetaDataStringWorks() {
         assertEquals("""
@@ -329,8 +352,16 @@ void parsingOfDefaultSaveActions() {
                 """));
     }
 
-    @Test
-    void formatterFromString() {
-        assertEquals(new ReplaceUnicodeLigaturesFormatter(), FieldFormatterCleanups.getFormatterFromString("replace_unicode_ligatures"));
+    public static Stream<Arguments> formatterFromString() {
+        return Stream.of(
+                Arguments.of(new ReplaceUnicodeLigaturesFormatter(), "replace_unicode_ligatures"),
+                Arguments.of(new LowerCaseFormatter(), "lower_case")
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource
+    void formatterFromString(Formatter expected, String input) {
+        assertEquals(expected, FieldFormatterCleanups.getFormatterFromString(input));
     }
 }
diff --git a/src/test/java/org/jabref/logic/database/DatabaseMergerTest.java b/src/test/java/org/jabref/logic/database/DatabaseMergerTest.java
index a7464dbaed5..b6a874c93b6 100644
--- a/src/test/java/org/jabref/logic/database/DatabaseMergerTest.java
+++ b/src/test/java/org/jabref/logic/database/DatabaseMergerTest.java
@@ -162,7 +162,7 @@ void mergeMetaDataWithoutAllEntriesGroup() {
 
         // Assert that groups of other are children of root node of target
         assertEquals(targetRootGroup, target.getGroups().get());
-        assertEquals(target.getGroups().get().getChildren().size(), 1);
+        assertEquals(1, target.getGroups().get().getChildren().size());
         assertEquals(otherRootGroup, target.getGroups().get().getChildren().get(0));
     }
 
@@ -185,7 +185,7 @@ void mergeMetaDataWithAllEntriesGroup() {
 
         // Assert that groups of other are children of root node of target
         assertEquals(targetRootGroup, target.getGroups().get());
-        assertEquals(target.getGroups().get().getChildren().size(), 1);
+        assertEquals(1, target.getGroups().get().getChildren().size());
         assertEquals(expectedImportedGroupNode, target.getGroups().get().getChildren().get(0));
         assertEquals(expectedContentSelectors, target.getContentSelectorList());
     }
diff --git a/src/test/java/org/jabref/logic/database/DuplicateCheckTest.java b/src/test/java/org/jabref/logic/database/DuplicateCheckTest.java
index 8c644ab40f2..39741898087 100644
--- a/src/test/java/org/jabref/logic/database/DuplicateCheckTest.java
+++ b/src/test/java/org/jabref/logic/database/DuplicateCheckTest.java
@@ -78,6 +78,14 @@ public void testDuplicateDetectionWithSameAuthor() {
         assertTrue(duplicateChecker.isDuplicate(one, two, BibDatabaseMode.BIBTEX));
     }
 
+    @Test
+    public void testDuplicateDetectionWithSameAuthorAndUmlauts() {
+        BibEntry one = new BibEntry(StandardEntryType.Article).withField(StandardField.AUTHOR, "Billy Bobä");
+        BibEntry two = new BibEntry(StandardEntryType.Article).withField(StandardField.AUTHOR, "Bill{\\\"{a}} Bob{\\\"{a}}");
+
+        assertTrue(duplicateChecker.isDuplicate(one, two, BibDatabaseMode.BIBTEX));
+    }
+
     @Test
     public void testDuplicateDetectionWithDifferentAuthors() {
         BibEntry one = new BibEntry(StandardEntryType.Article).withField(StandardField.AUTHOR, "Billy Bob");
diff --git a/src/test/java/org/jabref/logic/exporter/OpenOfficeDocumentCreatorTest.java b/src/test/java/org/jabref/logic/exporter/OpenOfficeDocumentCreatorTest.java
index 53c0d088a45..db1cffa4ab1 100644
--- a/src/test/java/org/jabref/logic/exporter/OpenOfficeDocumentCreatorTest.java
+++ b/src/test/java/org/jabref/logic/exporter/OpenOfficeDocumentCreatorTest.java
@@ -73,7 +73,6 @@ void testPerformExportForSingleEntry(@TempDir Path testFolder) throws Exception
 
         Input.Builder control = Input.from(Files.newInputStream(xmlFile));
         Input.Builder test = Input.from(Files.newInputStream(contentXmlPath));
-
         // for debugging purposes
        // Path testPath = xmlFile.resolveSibling("test.xml");
        // Files.copy(Files.newInputStream(contentXmlPath), testPath, StandardCopyOption.REPLACE_EXISTING);
diff --git a/src/test/java/org/jabref/logic/importer/ParserResultTest.java b/src/test/java/org/jabref/logic/importer/ParserResultTest.java
index 4787583e113..c986a83710e 100644
--- a/src/test/java/org/jabref/logic/importer/ParserResultTest.java
+++ b/src/test/java/org/jabref/logic/importer/ParserResultTest.java
@@ -7,6 +7,7 @@
 
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -25,4 +26,26 @@ void isNotEmptyForBibDatabaseWithOneEntry() {
         ParserResult parserResult = new ParserResult(bibDatabase);
         assertFalse(parserResult.isEmpty());
     }
+
+    @Test
+    public void warningsAddedMatchErrorMessage() {
+        ParserResult parserResult = new ParserResult();
+        parserResult.addWarning("Warning 1 ");
+        parserResult.addWarning("Warning 2 ");
+        assertEquals("Warning 1 \nWarning 2 ", parserResult.getErrorMessage());
+    }
+
+    @Test
+    public void hasEmptyMessageForNoWarnings() {
+        ParserResult parserResult = new ParserResult();
+        assertEquals("", parserResult.getErrorMessage());
+    }
+
+    @Test
+    public void doesNotHaveDuplicateWarnings() {
+        ParserResult parserResult = new ParserResult();
+        parserResult.addWarning("Duplicate Warning");
+        parserResult.addWarning("Duplicate Warning");
+        assertEquals("Duplicate Warning", parserResult.getErrorMessage());
+    }
 }
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/ArXivFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/ArXivFetcherTest.java
index 65d3c2bcfc9..6f68a5d25d2 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/ArXivFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/ArXivFetcherTest.java
@@ -51,8 +51,6 @@ class ArXivFetcherTest implements SearchBasedFetcherCapabilityTest, PagedSearchF
     private BibEntry mainOriginalPaper;
     private BibEntry mainResultPaper;
 
-    private BibEntry completePaper;
-
     @BeforeAll
     static void setUp() {
         importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
@@ -111,7 +109,7 @@ void eachSetUp() {
 
         // Example of a robust result, with information from both ArXiv-assigned and user-assigned DOIs
         // FixMe: Test this BibEntry
-        completePaper = new BibEntry(StandardEntryType.Article)
+        BibEntry completePaper = new BibEntry(StandardEntryType.Article)
                 .withField(StandardField.AUTHOR, "Büscher, Tobias and Diez, Angel L. and Gompper, Gerhard and Elgeti, Jens")
                 .withField(StandardField.TITLE, "Instability and fingering of interfaces in growing tissue")
                 .withField(StandardField.DATE, "2020-03-10")
@@ -340,9 +338,10 @@ void searchEntryByOldId() throws Exception {
                 .withField(StandardField.PAGES, "17--29")
                 .withField(StandardField.DATE, "2003-07-07")
                 .withField(StandardField.YEAR, "2003")
-                .withField(StandardField.MONTH, "oct")
+                .withField(StandardField.MONTH, "#oct#")
+                .withField(StandardField.ISSN, "1434-6052")
                 .withField(StandardField.ABSTRACT, "Multi-electron production is studied at high electron transverse momentum in positron- and electron-proton collisions using the H1 detector at HERA. The data correspond to an integrated luminosity of 115 pb-1. Di-electron and tri-electron event yields are measured. Cross sections are derived in a restricted phase space region dominated by photon-photon collisions. In general good agreement is found with the Standard Model predictions. However, for electron pair invariant masses above 100 GeV, three di-electron events and three tri-electron events are observed, compared to Standard Model expectations of 0.30 \\pm 0.04 and 0.23 \\pm 0.04, respectively.")
-                .withField(StandardField.PUBLISHER, "Springer Science and Business Media {LLC}")
+                .withField(StandardField.PUBLISHER, "Springer Science and Business Media LLC")
                 .withField(StandardField.EPRINT, "hep-ex/0307015")
                 .withField(StandardField.FILE, ":http\\://arxiv.org/pdf/hep-ex/0307015v1:PDF")
                 .withField(StandardField.EPRINTTYPE, "arXiv")
@@ -474,11 +473,12 @@ public void supportsBooleanANDSearch() throws Exception {
                 .withField(StandardField.TITLE, "Instability and fingering of interfaces in growing tissue")
                 .withField(StandardField.DATE, "2020-03-10")
                 .withField(StandardField.YEAR, "2020")
-                .withField(StandardField.MONTH, "aug")
+                .withField(StandardField.MONTH, "#aug#")
                 .withField(StandardField.NUMBER, "8")
                 .withField(StandardField.VOLUME, "22")
+                .withField(StandardField.ISSN, "1367-2630")
                 .withField(StandardField.PAGES, "083005")
-                .withField(StandardField.PUBLISHER, "{IOP} Publishing")
+                .withField(StandardField.PUBLISHER, "IOP Publishing")
                 .withField(StandardField.JOURNAL, "New Journal of Physics")
                 .withField(StandardField.ABSTRACT, "Interfaces in tissues are ubiquitous, both between tissue and environment as well as between populations of different cell types. The propagation of an interface can be driven mechanically. % e.g. by a difference in the respective homeostatic stress of the different cell types. Computer simulations of growing tissues are employed to study the stability of the interface between two tissues on a substrate. From a mechanical perspective, the dynamics and stability of this system is controlled mainly by four parameters of the respective tissues: (i) the homeostatic stress (ii) cell motility (iii) tissue viscosity and (iv) substrate friction. For propagation driven by a difference in homeostatic stress, the interface is stable for tissue-specific substrate friction even for very large differences of homeostatic stress; however, it becomes unstable above a critical stress difference when the tissue with the larger homeostatic stress has a higher viscosity. A small difference in directed bulk motility between the two tissues suffices to result in propagation with a stable interface, even for otherwise identical tissues. Larger differences in motility force, however, result in a finite-wavelength instability of the interface. Interestingly, the instability is apparently bound by nonlinear effects and the amplitude of the interface undulations only grows to a finite value in time.")
                 .withField(StandardField.DOI, "10.1088/1367-2630/ab9e88")
@@ -573,12 +573,13 @@ public void retrievePartialResultWhenCannotGetInformationFromArXivAssignedDOI()
                 .withField(StandardField.JOURNAL, "PNAS December 27, 2016 vol. 113 no. 52 15000-15005")
                 .withField(StandardField.ABSTRACT, "Bacteria tightly regulate and coordinate the various events in their cell cycles to duplicate themselves accurately and to control their cell sizes. Growth of Escherichia coli, in particular, follows a relation known as Schaechter 's growth law. This law says that the average cell volume scales exponentially with growth rate, with a scaling exponent equal to the time from initiation of a round of DNA replication to the cell division at which the corresponding sister chromosomes segregate. Here, we sought to test the robustness of the growth law to systematic perturbations in cell dimensions achieved by varying the expression levels of mreB and ftsZ. We found that decreasing the mreB level resulted in increased cell width, with little change in cell length, whereas decreasing the ftsZ level resulted in increased cell length. Furthermore, the time from replication termination to cell division increased with the perturbed dimension in both cases. Moreover, the growth law remained valid over a range of growth conditions and dimension perturbations. The growth law can be quantitatively interpreted as a consequence of a tight coupling of cell division to replication initiation. Thus, its robustness to perturbations in cell dimensions strongly supports models in which the timing of replication initiation governs that of cell division, and cell volume is the key phenomenological variable governing the timing of replication initiation. These conclusions are discussed in the context of our recently proposed adder-per-origin model, in which cells add a constant volume per origin between initiations and divide a constant time after initiation.")
                 .withField(StandardField.DOI, "10.1073/pnas.1617932114")
+                .withField(StandardField.ISSN, "1091-6490")
                 .withField(StandardField.EPRINT, "1701.00587")
                 .withField(StandardField.FILE, ":http\\://arxiv.org/pdf/1701.00587v1:PDF")
                 .withField(StandardField.EPRINTTYPE, "arXiv")
                 .withField(StandardField.EPRINTCLASS, "q-bio.CB")
                 .withField(StandardField.KEYWORDS, "q-bio.CB")
-                .withField(StandardField.MONTH, "dec")
+                .withField(StandardField.MONTH, "#dec#")
                 .withField(StandardField.YEAR, "2016")
                 .withField(StandardField.VOLUME, "113")
                 .withField(InternalField.KEY_FIELD, "Zheng_2016")
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/AstrophysicsDataSystemTest.java b/src/test/java/org/jabref/logic/importer/fetcher/AstrophysicsDataSystemTest.java
index ad0fb840030..afd4d51e573 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/AstrophysicsDataSystemTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/AstrophysicsDataSystemTest.java
@@ -29,11 +29,40 @@ public class AstrophysicsDataSystemTest implements PagedSearchFetcherTest {
 
     private AstrophysicsDataSystem fetcher;
     private BibEntry diezSliceTheoremEntry;
-    private BibEntry famaeyMcGaughEntry;
+    private BibEntry famaeyMcGaughEntry = new BibEntry(StandardEntryType.Article)
+            .withCitationKey("2012LRR....15...10F")
+            .withField(StandardField.AUTHOR, "Famaey, Beno{\\^\\i}t and McGaugh, Stacy S.")
+            .withField(StandardField.TITLE, "Modified Newtonian Dynamics (MOND): Observational Phenomenology and Relativistic Extensions")
+            .withField(StandardField.JOURNAL, "Living Reviews in Relativity")
+            .withField(StandardField.YEAR, "2012")
+            .withField(StandardField.VOLUME, "15")
+            .withField(StandardField.MONTH, "#dec#")
+            .withField(StandardField.NUMBER, "1")
+            .withField(StandardField.ARCHIVEPREFIX, "arXiv")
+            .withField(StandardField.DOI, "10.12942/lrr-2012-10")
+            .withField(StandardField.PRIMARYCLASS, "astro-ph.CO")
+            .withField(StandardField.EID, "10")
+            .withField(StandardField.EPRINT, "1112.3960")
+            .withField(StandardField.PAGES, "10")
+            .withField(StandardField.KEYWORDS, "astronomical observations, Newtonian limit, equations of motion, extragalactic astronomy, cosmology, theories of gravity, fundamental physics, astrophysics, Modified Newtonian Dynamics (MOND), Dark Matter, Baryonic Tully-Fisher Relation (BTFR), MOND Theories, Tidal Dwarf Galaxies (TDGs), Astrophysics - Cosmology and Nongalactic Astrophysics, Astrophysics - Astrophysics of Galaxies, General Relativity and Quantum Cosmology, High Energy Physics - Phenomenology, High Energy Physics - Theory")
+            .withField(StandardField.URL, "https://ui.adsabs.harvard.edu/abs/2012LRR....15...10F");
     private BibEntry sunWelchEntry;
     private BibEntry xiongSunEntry;
     private BibEntry ingersollPollardEntry;
-    private BibEntry luceyPaulEntry;
+    private BibEntry luceyPaulEntry = new BibEntry(StandardEntryType.Article)
+            .withCitationKey("2000JGR...10520297L")
+            .withField(StandardField.AUTHOR, "Lucey, Paul G. and Blewett, David T. and Jolliff, Bradley L.")
+            .withField(StandardField.DOI, "10.1029/1999JE001117")
+            .withField(StandardField.JOURNAL, "\\jgr")
+            .withField(StandardField.KEYWORDS, "Planetology: Solid Surface Planets: Composition, Planetology: Solid Surface Planets: Remote sensing, Planetology: Solid Surface Planets: Surface materials and properties, Planetology: Solar System Objects: Moon (1221)")
+            .withField(StandardField.PAGES, "20297-20306")
+            .withField(StandardField.TITLE, "Lunar iron and titanium abundance algorithms based on final processing of Clementine ultraviolet-visible images")
+            .withField(StandardField.VOLUME, "105")
+            .withField(StandardField.YEAR, "2000")
+            .withField(StandardField.URL, "https://ui.adsabs.harvard.edu/abs/2000JGR...10520297L")
+            .withField(StandardField.MONTH, "#jan#")
+            .withField(StandardField.NUMBER, "E8")
+            .withField(StandardField.ABSTRACT, "The Clementine mission to the Moon returned global imaging data         collected by the ultraviolet visible (UVVIS) camera. This data         set is now in a final state of calibration, and a five-band         multispectral digital image model (DIM) of the lunar surface         will soon be available to the science community. We have used         observations of the lunar sample-return sites and stations         extracted from the final DIM in conjunction with compositional         information for returned lunar soils to revise our previously         published algorithms for the spectral determination of the FeO         and TiO$_{2}$ content of the lunar surface. The algorithms         successfully normalize the effects of space weathering so that         composition may be determined without regard to a surface's         state of maturity. These algorithms permit anyone with access to         the standard archived DIM to construct high spatial resolution         maps of FeO and TiO$_{2}$ abundance. Such maps will be of great         utility in a variety of lunar geologic studies.");
 
     @BeforeEach
     public void setUp() throws Exception {
@@ -61,24 +90,6 @@ public void setUp() throws Exception {
                 .withField(StandardField.ABSTRACT,
                         "We establish a general slice theorem for the action of a locally convex         Lie group on a locally convex manifold, which generalizes the         classical slice theorem of Palais to infinite dimensions. We         discuss two important settings under which the assumptions of         this theorem are fulfilled. First, using Gl{\\\"o}ckner's inverse         function theorem, we show that the linear action of a compact         Lie group on a Fr{\\'e}chet space admits a slice. Second, using         the Nash--Moser theorem, we establish a slice theorem for the         tame action of a tame Fr{\\'e}chet Lie group on a tame         Fr{\\'e}chet manifold. For this purpose, we develop the concept         of a graded Riemannian metric, which allows the construction of         a path-length metric compatible with the manifold topology and         of a local addition. Finally, generalizing a classical result in         finite dimensions, we prove that the existence of a slice         implies that the decomposition of the manifold into orbit types         of the group action is a stratification.");
 
-        famaeyMcGaughEntry = new BibEntry(StandardEntryType.Article)
-                .withCitationKey("2012LRR....15...10F")
-                .withField(StandardField.AUTHOR, "Famaey, Beno{\\^\\i}t and McGaugh, Stacy S.")
-                .withField(StandardField.TITLE, "Modified Newtonian Dynamics (MOND): Observational Phenomenology and Relativistic Extensions")
-                .withField(StandardField.JOURNAL, "Living Reviews in Relativity")
-                .withField(StandardField.YEAR, "2012")
-                .withField(StandardField.VOLUME, "15")
-                .withField(StandardField.MONTH, "#sep#")
-                .withField(StandardField.NUMBER, "1")
-                .withField(StandardField.ARCHIVEPREFIX, "arXiv")
-                .withField(StandardField.DOI, "10.12942/lrr-2012-10")
-                .withField(StandardField.PRIMARYCLASS, "astro-ph.CO")
-                .withField(StandardField.EID, "10")
-                .withField(StandardField.EPRINT, "1112.3960")
-                .withField(StandardField.PAGES, "10")
-                .withField(StandardField.KEYWORDS, "astronomical observations, Newtonian limit, equations of motion, extragalactic astronomy, cosmology, theories of gravity, fundamental physics, astrophysics, Astrophysics - Cosmology and Nongalactic Astrophysics, Astrophysics - Astrophysics of Galaxies, General Relativity and Quantum Cosmology, High Energy Physics - Phenomenology, High Energy Physics - Theory")
-                .withField(StandardField.URL, "https://ui.adsabs.harvard.edu/abs/2012LRR....15...10F");
-
         sunWelchEntry = new BibEntry(StandardEntryType.Article)
                 .withCitationKey("2012NatMa..11...44S")
                 .withField(StandardField.AUTHOR, "Sun, Yanming and Welch, Gregory C. and Leong, Wei Lin and Takacs, Christopher J. and Bazan, Guillermo C. and Heeger, Alan J.")
@@ -103,7 +114,6 @@ public void setUp() throws Exception {
                 .withField(StandardField.TITLE, "Multiyear On-Orbit Calibration and Performance of Terra MODIS Reflective Solar Bands")
                 .withField(StandardField.VOLUME, "45")
                 .withField(StandardField.YEAR, "2007")
-                .withField(StandardField.KEYWORDS, "Earth Science")
                 .withField(StandardField.URL, "https://ui.adsabs.harvard.edu/abs/2007ITGRS..45..879X");
 
         ingersollPollardEntry = new BibEntry(StandardEntryType.Article)
@@ -112,7 +122,7 @@ public void setUp() throws Exception {
                 .withField(StandardField.AUTHOR, "Ingersoll, A.~P. and Pollard, D.")
                 .withField(StandardField.DOI, "10.1016/0019-1035(82)90169-5")
                 .withField(StandardField.JOURNAL, "\\icarus")
-                .withField(StandardField.KEYWORDS, "Atmospheric Circulation, Barotropic Flow, Convective Flow, Flow Stability, Jupiter Atmosphere, Rotating Fluids, Saturn Atmosphere, Adiabatic Flow, Anelasticity, Compressible Fluids, Planetary Rotation, Rotating Cylinders, Scaling Laws, Wind Profiles, PLANETS, JUPITER, SATURN, MOTION, INTERIORS, ATMOSPHERE, ANALYSIS, SCALE, BAROTROPY, CHARACTERISTICS, STRUCTURE, WINDS, VISCOSITY, DATA, CONVECTION, ROTATION, EDDY EFFECTS, ENERGY, ADIABATICITY, DIAGRAMS, REVIEW, LATITUDE, ZONES, VELOCITY, MATHEMATICAL MODELS, HEAT FLOW, EQUATIONS OF MOTION, FLUIDS, DYNAMICS, TEMPERATURE, GRADIENTS, Lunar and Planetary Exploration; Planets, Earth Science, Earth Science")
+                .withField(StandardField.KEYWORDS, "Atmospheric Circulation, Barotropic Flow, Convective Flow, Flow Stability, Jupiter Atmosphere, Rotating Fluids, Saturn Atmosphere, Adiabatic Flow, Anelasticity, Compressible Fluids, Planetary Rotation, Rotating Cylinders, Scaling Laws, Wind Profiles, PLANETS, JUPITER, SATURN, MOTION, INTERIORS, ATMOSPHERE, ANALYSIS, SCALE, BAROTROPY, CHARACTERISTICS, STRUCTURE, WINDS, VISCOSITY, DATA, CONVECTION, ROTATION, EDDY EFFECTS, ENERGY, ADIABATICITY, DIAGRAMS, REVIEW, LATITUDE, ZONES, VELOCITY, MATHEMATICAL MODELS, HEAT FLOW, EQUATIONS OF MOTION, FLUIDS, DYNAMICS, TEMPERATURE, GRADIENTS, Lunar and Planetary Exploration; Planets, Earth Science")
                 .withField(StandardField.MONTH, "#oct#")
                 .withField(StandardField.NUMBER, "1")
                 .withField(StandardField.PAGES, "62-80")
@@ -120,21 +130,6 @@ public void setUp() throws Exception {
                 .withField(StandardField.VOLUME, "52")
                 .withField(StandardField.YEAR, "1982")
                 .withField(StandardField.URL, "https://ui.adsabs.harvard.edu/abs/1982Icar...52...62I");
-
-        luceyPaulEntry = new BibEntry(StandardEntryType.Article)
-                .withCitationKey("2000JGR...10520297L")
-                .withField(StandardField.AUTHOR, "Lucey, Paul G. and Blewett, David T. and Jolliff, Bradley L.")
-                .withField(StandardField.DOI, "10.1029/1999JE001117")
-                .withField(StandardField.JOURNAL, "\\jgr")
-                .withField(StandardField.KEYWORDS, "Planetology: Solid Surface Planets: Composition, Planetology: Solid Surface Planets: Remote sensing, Planetology: Solid Surface Planets: Surface materials and properties, Planetology: Solar System Objects: Moon (1221), Earth Science")
-                .withField(StandardField.PAGES, "20297-20306")
-                .withField(StandardField.TITLE, "Lunar iron and titanium abundance algorithms based on final processing of Clementine ultraviolet-visible images")
-                .withField(StandardField.VOLUME, "105")
-                .withField(StandardField.YEAR, "2000")
-                .withField(StandardField.URL, "https://ui.adsabs.harvard.edu/abs/2000JGR...10520297L")
-                .withField(StandardField.MONTH, "#jan#")
-                .withField(StandardField.NUMBER, "E8")
-                .withField(StandardField.ABSTRACT, "The Clementine mission to the Moon returned global imaging data         collected by the ultraviolet visible (UVVIS) camera. This data         set is now in a final state of calibration, and a five-band         multispectral digital image model (DIM) of the lunar surface         will soon be available to the science community. We have used         observations of the lunar sample-return sites and stations         extracted from the final DIM in conjunction with compositional         information for returned lunar soils to revise our previously         published algorithms for the spectral determination of the FeO         and TiO$_{2}$ content of the lunar surface. The algorithms         successfully normalize the effects of space weathering so that         composition may be determined without regard to a surface's         state of maturity. These algorithms permit anyone with access to         the standard archived DIM to construct high spatial resolution         maps of FeO and TiO$_{2}$ abundance. Such maps will be of great         utility in a variety of lunar geologic studies.");
     }
 
     @Test
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 d171ed5d8e1..02eb4c2f14c 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/CompositeIdFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/CompositeIdFetcherTest.java
@@ -42,7 +42,8 @@ public static Stream<Arguments> performSearchByIdReturnsCorrectEntryForIdentifie
                                 .withField(StandardField.TITLE, "Reading the CARDs: the Imprint of Accretion History in the Chemical Abundances of the Milky Way's Stellar Halo")
                                 .withField(StandardField.DATE, "2021-10-06")
                                 .withField(StandardField.YEAR, "2021")
-                                .withField(StandardField.MONTH, "aug")
+                                .withField(StandardField.MONTH, "#aug#")
+                                .withField(StandardField.ISSN, "1538-4357")
                                 .withField(StandardField.NUMBER, "2")
                                 .withField(StandardField.VOLUME, "934")
                                 .withField(StandardField.PUBLISHER, "American Astronomical Society")
@@ -94,11 +95,12 @@ public static Stream<Arguments> performSearchByIdReturnsCorrectEntryForIdentifie
                 Arguments.arguments(
                         "performSearchByIdReturnsCorrectEntryForDoiId",
                         new BibEntry(StandardEntryType.Book)
-                                .withField(StandardField.TITLE, "Java{\\textregistered} For Dummies{\\textregistered}")
+                                .withField(StandardField.TITLE, "Java® For Dummies®")
                                 .withField(StandardField.PUBLISHER, "Wiley")
                                 .withField(StandardField.YEAR, "2011")
-                                .withField(StandardField.AUTHOR, "Barry Burd")
-                                .withField(StandardField.MONTH, "jul")
+                                .withField(StandardField.AUTHOR, "Burd, Barry")
+                                .withField(StandardField.MONTH, "#jul#")
+                                .withField(StandardField.ISBN, "9781118257517")
                                 .withField(StandardField.DOI, "10.1002/9781118257517")
                                 .withCitationKey("Burd_2011"),
                         "10.1002/9781118257517"
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 5d00d34b356..8bf41644612 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/CompositeSearchBasedFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/CompositeSearchBasedFetcherTest.java
@@ -37,7 +37,7 @@ public class CompositeSearchBasedFetcherTest {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(CompositeSearchBasedFetcherTest.class);
 
-    private ImporterPreferences importerPreferences = mock(ImporterPreferences.class, Answers.RETURNS_DEEP_STUBS);
+    private final ImporterPreferences importerPreferences = mock(ImporterPreferences.class, Answers.RETURNS_DEEP_STUBS);
 
     @Test
     public void createCompositeFetcherWithNullSet() {
@@ -77,7 +77,7 @@ public void performSearchOnNonEmptyQuery(Set<SearchBasedFetcher> fetchers) throw
             try {
                 List<BibEntry> fetcherResult = fetcher.performSearch("quantum");
                 fetcherResult.forEach(cleanup::doPostCleanup);
-                Assertions.assertTrue(compositeResult.containsAll(fetcherResult));
+                Assertions.assertTrue(compositeResult.containsAll(fetcherResult), "Did not contain " + fetcherResult);
             } catch (FetcherException e) {
                 /* We catch the Fetcher exception here, since the failing fetcher also fails in the CompositeFetcher
                  * and just leads to no additional results in the returned list. Therefore, the test should not fail
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/DoiFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/DoiFetcherTest.java
index da157b42347..e434ad1da99 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/DoiFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/DoiFetcherTest.java
@@ -23,19 +23,20 @@ public class DoiFetcherTest {
 
     private final BibEntry bibEntryBurd2011 = new BibEntry(StandardEntryType.Book)
             .withCitationKey("Burd_2011")
-            .withField(StandardField.TITLE, "Java{\\textregistered} For Dummies{\\textregistered}")
+            .withField(StandardField.TITLE, "Java® For Dummies®")
             .withField(StandardField.PUBLISHER, "Wiley")
             .withField(StandardField.YEAR, "2011")
-            .withField(StandardField.AUTHOR, "Barry Burd")
-            .withField(StandardField.MONTH, "jul")
-            .withField(StandardField.DOI, "10.1002/9781118257517");
+            .withField(StandardField.AUTHOR, "Burd, Barry")
+            .withField(StandardField.MONTH, "#jul#")
+            .withField(StandardField.DOI, "10.1002/9781118257517")
+            .withField(StandardField.ISBN, "9781118257517");
     private final BibEntry bibEntryDecker2007 = new BibEntry(StandardEntryType.InProceedings)
             .withCitationKey("Decker_2007")
-            .withField(StandardField.AUTHOR, "Gero Decker and Oliver Kopp and Frank Leymann and Mathias Weske")
-            .withField(StandardField.BOOKTITLE, "{IEEE} International Conference on Web Services ({ICWS} 2007)")
-            .withField(StandardField.MONTH, "jul")
-            .withField(StandardField.PUBLISHER, "{IEEE}")
-            .withField(StandardField.TITLE, "{BPEL}4Chor: Extending {BPEL} for Modeling Choreographies")
+            .withField(StandardField.AUTHOR, "Decker, Gero and Kopp, Oliver and Leymann, Frank and Weske, Mathias")
+            .withField(StandardField.BOOKTITLE, "IEEE International Conference on Web Services (ICWS 2007)")
+            .withField(StandardField.MONTH, "#jul#")
+            .withField(StandardField.PUBLISHER, "IEEE")
+            .withField(StandardField.TITLE, "BPEL4Chor: Extending BPEL for Modeling Choreographies")
             .withField(StandardField.YEAR, "2007")
             .withField(StandardField.DOI, "10.1109/icws.2007.59");
     private final BibEntry bibEntryIannarelli2019 = new BibEntry(StandardEntryType.Article)
@@ -57,14 +58,15 @@ public class DoiFetcherTest {
             .withField(StandardField.VOLUME, "77");
     private final BibEntry bibEntryStenzel2020 = new BibEntry(StandardEntryType.Article)
             .withCitationKey("Stenzel_2020")
-            .withField(StandardField.AUTHOR, "L. Stenzel and A. L. C. Hayward and U. Schollwöck and F. Heidrich-Meisner")
+            .withField(StandardField.AUTHOR, "Stenzel, L. and Hayward, A. L. C. and Schollwöck, U. and Heidrich-Meisner, F.")
             .withField(StandardField.JOURNAL, "Physical Review A")
             .withField(StandardField.TITLE, "Topological phases in the Fermi-Hofstadter-Hubbard model on hybrid-space ladders")
             .withField(StandardField.YEAR, "2020")
-            .withField(StandardField.MONTH, "aug")
+            .withField(StandardField.MONTH, "#aug#")
             .withField(StandardField.VOLUME, "102")
             .withField(StandardField.DOI, "10.1103/physreva.102.023315")
-            .withField(StandardField.PUBLISHER, "American Physical Society ({APS})")
+            .withField(StandardField.ISSN, "2469-9934")
+            .withField(StandardField.PUBLISHER, "American Physical Society (APS)")
             .withField(StandardField.PAGES, "023315")
             .withField(StandardField.NUMBER, "2");
 
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/IacrEprintFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/IacrEprintFetcherTest.java
index 2eb837d2364..c168c4bceb7 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/IacrEprintFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/IacrEprintFetcherTest.java
@@ -168,7 +168,7 @@ public void searchByIdWithOldHtmlFormatWithoutDateCheck(String id) throws Fetche
         Optional<BibEntry> fetchedEntry = fetcher.performSearchById(id);
         assertTrue(fetchedEntry.isPresent(), "Expected to get an entry for id " + id);
         assertNotEquals(Optional.empty(), fetchedEntry.get().getField(StandardField.DATE), "Expected non empty date field, entry is\n" + fetchedEntry.toString());
-        assertTrue(fetchedEntry.get().getField(StandardField.DATE).get().length() == 10, "Expected yyyy-MM-dd date format, entry is\n" + fetchedEntry.toString());
+        assertEquals(10, fetchedEntry.get().getField(StandardField.DATE).get().length(), "Expected yyyy-MM-dd date format, entry is\n" + fetchedEntry.toString());
         assertNotEquals(Optional.empty(), fetchedEntry.get().getField(StandardField.ABSTRACT), "Expected non empty abstract field, entry is\n" + fetchedEntry.toString());
     }
 
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/LOBIDFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/LOBIDFetcherTest.java
index 978dd23c096..9b5de6f84f0 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/LOBIDFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/LOBIDFetcherTest.java
@@ -29,6 +29,12 @@ void setUp() {
         fetcher = new LOBIDFetcher(importerPreferences);
     }
 
+    @Override
+    public String queryForUniqueResultsPerPage() {
+        // LOBID does not have unique entries per page for "Software";
+        return "Discussion";
+    }
+
     @Test
     void searchByQueryFindsEntry() throws Exception {
         BibEntry firstArticle = new BibEntry(StandardEntryType.Book)
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/MedraTest.java b/src/test/java/org/jabref/logic/importer/fetcher/MedraTest.java
index 3d940312fa1..ae5a867ee76 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/MedraTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/MedraTest.java
@@ -3,8 +3,8 @@
 import java.util.Optional;
 import java.util.stream.Stream;
 
-import org.jabref.logic.importer.FetcherClientException;
 import org.jabref.logic.importer.FetcherException;
+import org.jabref.logic.importer.FetcherServerException;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
@@ -83,7 +83,7 @@ public void testPerformSearchEmptyDOI() throws FetcherException {
 
     @Test
     public void testPerformNonExistent() throws FetcherException {
-        assertThrows(FetcherClientException.class, () -> fetcher.performSearchById("10.1016/j.bjoms.2007.08.004"));
+        assertThrows(FetcherServerException.class, () -> fetcher.performSearchById("10.1016/j.bjoms.2007.08.004"));
     }
 
     @ParameterizedTest
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/PagedSearchFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/PagedSearchFetcherTest.java
index 43902fe9fa2..dad5618923c 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/PagedSearchFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/PagedSearchFetcherTest.java
@@ -6,6 +6,7 @@
 
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 
 /**
@@ -13,17 +14,25 @@
  */
 public interface PagedSearchFetcherTest {
 
+    default String queryForUniqueResultsPerPage() {
+        return "Software";
+    }
+
     /**
      * Ensure that different page return different entries
      */
     @Test
     default void pageSearchReturnsUniqueResultsPerPage() throws Exception {
-        String query = "Software";
+        String query = queryForUniqueResultsPerPage();
         Page<BibEntry> firstPage = getPagedFetcher().performSearchPaged(query, 0);
         Page<BibEntry> secondPage = getPagedFetcher().performSearchPaged(query, 1);
 
+        // Both pages need to be filled with contents to be valid for checking containment
+        assertEquals(20, firstPage.getSize());
+        assertEquals(20, secondPage.getSize());
+
         for (BibEntry entry : firstPage.getContent()) {
-            assertFalse(secondPage.getContent().contains(entry));
+            assertFalse(secondPage.getContent().contains(entry), "%s contained in %s".formatted(entry, secondPage.getContent()));
         }
     }
 
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/SemanticScholarTest.java b/src/test/java/org/jabref/logic/importer/fetcher/SemanticScholarTest.java
index 806f400009c..b4b203a5aa3 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/SemanticScholarTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/SemanticScholarTest.java
@@ -22,6 +22,7 @@
 import org.apache.lucene.queryparser.flexible.core.parser.SyntaxParser;
 import org.apache.lucene.queryparser.flexible.standard.parser.StandardSyntaxParser;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -60,9 +61,10 @@ void getDocument() throws IOException, FetcherException {
     }
 
     @Test
+    @Disabled("Returns a DOI instead of the required link")
     @DisabledOnCIServer("CI server is unreliable")
     void fullTextFindByDOI() throws Exception {
-        entry.withField(StandardField.DOI, "10.1038/nrn3241");
+        entry.setField(StandardField.DOI, "10.1038/nrn3241");
         assertEquals(
                 Optional.of(new URI("https://europepmc.org/articles/pmc4907333?pdf=render").toURL()),
                 fetcher.findFullText(entry)
@@ -81,7 +83,6 @@ void fullTextFindByDOIAlternate() throws Exception {
     @Test
     @DisabledOnCIServer("CI server is unreliable")
     void fullTextSearchOnEmptyEntry() throws IOException, FetcherException {
-
         assertEquals(Optional.empty(), fetcher.findFullText(new BibEntry()));
     }
 
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/TitleFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/TitleFetcherTest.java
index 9a4d229c0e2..5048ff20efb 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/TitleFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/TitleFetcherTest.java
@@ -26,16 +26,15 @@ public class TitleFetcherTest {
     public void setUp() {
         fetcher = new TitleFetcher(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS));
 
-        bibEntryBischof2009 = new BibEntry();
-        bibEntryBischof2009.setType(StandardEntryType.InProceedings);
-        bibEntryBischof2009.setCitationKey("Bischof_2009");
-        bibEntryBischof2009.setField(StandardField.AUTHOR, "Marc Bischof and Oliver Kopp and Tammo van Lessen and Frank Leymann");
-        bibEntryBischof2009.setField(StandardField.BOOKTITLE, "2009 35th Euromicro Conference on Software Engineering and Advanced Applications");
-        bibEntryBischof2009.setField(StandardField.PUBLISHER, "{IEEE}");
-        bibEntryBischof2009.setField(StandardField.TITLE, "{BPELscript}: A Simplified Script Syntax for {WS}-{BPEL} 2.0");
-        bibEntryBischof2009.setField(StandardField.YEAR, "2009");
-        bibEntryBischof2009.setField(StandardField.MONTH, "aug");
-        bibEntryBischof2009.setField(StandardField.DOI, "10.1109/seaa.2009.21");
+        bibEntryBischof2009 = new BibEntry(StandardEntryType.InProceedings)
+                .withCitationKey("Bischof_2009")
+                .withField(StandardField.AUTHOR, "Bischof, Marc and Kopp, Oliver and van Lessen, Tammo and Leymann, Frank")
+                .withField(StandardField.BOOKTITLE, "2009 35th Euromicro Conference on Software Engineering and Advanced Applications")
+                .withField(StandardField.PUBLISHER, "IEEE")
+                .withField(StandardField.TITLE, "BPELscript: A Simplified Script Syntax for WS-BPEL 2.0")
+                .withField(StandardField.YEAR, "2009")
+                .withField(StandardField.MONTH, "#aug#")
+                .withField(StandardField.DOI, "10.1109/seaa.2009.21");
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/importer/util/MetaDataParserTest.java b/src/test/java/org/jabref/logic/importer/util/MetaDataParserTest.java
index 251b3d10279..d043c51fe79 100644
--- a/src/test/java/org/jabref/logic/importer/util/MetaDataParserTest.java
+++ b/src/test/java/org/jabref/logic/importer/util/MetaDataParserTest.java
@@ -1,13 +1,22 @@
 package org.jabref.logic.importer.util;
 
+import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Stream;
 
+import org.jabref.logic.cleanup.FieldFormatterCleanup;
+import org.jabref.logic.cleanup.FieldFormatterCleanups;
 import org.jabref.logic.exporter.MetaDataSerializerTest;
+import org.jabref.logic.formatter.casechanger.LowerCaseFormatter;
 import org.jabref.model.entry.BibEntryTypeBuilder;
+import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.field.UnknownField;
 import org.jabref.model.entry.types.UnknownEntryType;
+import org.jabref.model.metadata.MetaData;
+import org.jabref.model.util.DummyFileUpdateMonitor;
 
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.CsvSource;
@@ -56,4 +65,16 @@ public static Stream<Arguments> parseCustomizedEntryType() {
     void parseCustomizedEntryType(BibEntryTypeBuilder expected, String source) {
         assertEquals(Optional.of(expected.build()), MetaDataParser.parseCustomEntryType(source));
     }
+
+    @Test
+    public void saveActions() throws Exception {
+        Map<String, String> data = Map.of("saveActions", "enabled;title[lower_case]");
+        MetaDataParser metaDataParser = new MetaDataParser(new DummyFileUpdateMonitor());
+        MetaData parsed = metaDataParser.parse(new MetaData(), data, ',');
+
+        MetaData expected = new MetaData();
+        FieldFormatterCleanups fieldFormatterCleanups = new FieldFormatterCleanups(true, List.of(new FieldFormatterCleanup(StandardField.TITLE, new LowerCaseFormatter())));
+        expected.setSaveActions(fieldFormatterCleanups);
+        assertEquals(expected, parsed);
+    }
 }
diff --git a/src/test/java/org/jabref/logic/integrity/ASCIICharacterCheckerTest.java b/src/test/java/org/jabref/logic/integrity/ASCIICharacterCheckerTest.java
index 09efadebe2d..9dbefceb61c 100644
--- a/src/test/java/org/jabref/logic/integrity/ASCIICharacterCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/ASCIICharacterCheckerTest.java
@@ -35,11 +35,11 @@ void fieldDoesNotAcceptUnicode() {
 
     @Test
     void fieldAcceptsOnlyAsciiCharacters() {
-        String field = "";
+        StringBuilder field = new StringBuilder();
         for (int i = 32; i <= 127; i++) {
-            field += Character.toString(i);
+            field.append(Character.toString(i));
         }
-        entry.setField(StandardField.TITLE, field);
+        entry.setField(StandardField.TITLE, field.toString());
         assertEquals(Collections.emptyList(), checker.check(entry));
     }
 
diff --git a/src/test/java/org/jabref/logic/integrity/IntegrityCheckTest.java b/src/test/java/org/jabref/logic/integrity/IntegrityCheckTest.java
index 5a589970aba..daaa371c3f7 100644
--- a/src/test/java/org/jabref/logic/integrity/IntegrityCheckTest.java
+++ b/src/test/java/org/jabref/logic/integrity/IntegrityCheckTest.java
@@ -1,6 +1,5 @@
 package org.jabref.logic.integrity;
 
-import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Collections;
@@ -13,6 +12,8 @@
 import org.jabref.logic.citationkeypattern.CitationKeyPatternPreferences;
 import org.jabref.logic.citationkeypattern.GlobalCitationKeyPattern;
 import org.jabref.logic.journals.JournalAbbreviationLoader;
+import org.jabref.logic.journals.predatory.PredatoryJournalListLoader;
+import org.jabref.logic.journals.predatory.PredatoryJournalRepository;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.database.BibDatabaseMode;
@@ -46,28 +47,28 @@
 class IntegrityCheckTest {
 
     @Test
-    void bibTexAcceptsStandardEntryType() {
+    void bibTexAcceptsStandardEntryType() throws Exception {
         assertCorrect(withMode(createContext(StandardField.TITLE, "sometitle", StandardEntryType.Article), BibDatabaseMode.BIBTEX));
     }
 
     @Test
-    void bibTexDoesNotAcceptIEEETranEntryType() {
+    void bibTexDoesNotAcceptIEEETranEntryType() throws Exception {
         assertWrong(withMode(createContext(StandardField.TITLE, "sometitle", IEEETranEntryType.Patent), BibDatabaseMode.BIBTEX));
     }
 
     @Test
-    void bibLaTexAcceptsIEEETranEntryType() {
+    void bibLaTexAcceptsIEEETranEntryType() throws Exception {
         assertCorrect((withMode(createContext(StandardField.TITLE, "sometitle", IEEETranEntryType.Patent), BibDatabaseMode.BIBLATEX)));
     }
 
     @Test
-    void bibLaTexAcceptsStandardEntryType() {
+    void bibLaTexAcceptsStandardEntryType() throws Exception {
         assertCorrect(withMode(createContext(StandardField.TITLE, "sometitle", StandardEntryType.Article), BibDatabaseMode.BIBLATEX));
     }
 
     @ParameterizedTest
     @MethodSource("provideCorrectFormat")
-    void authorNameChecksCorrectFormat(String input) {
+    void authorNameChecksCorrectFormat(String input) throws Exception {
         for (Field field : FieldFactory.getPersonNameFields()) {
             assertCorrect(withMode(createContext(field, input), BibDatabaseMode.BIBLATEX));
         }
@@ -75,7 +76,7 @@ void authorNameChecksCorrectFormat(String input) {
 
     @ParameterizedTest
     @MethodSource("provideIncorrectFormat")
-    void authorNameChecksIncorrectFormat(String input) {
+    void authorNameChecksIncorrectFormat(String input) throws Exception {
         for (Field field : FieldFactory.getPersonNameFields()) {
             assertWrong(withMode(createContext(field, input), BibDatabaseMode.BIBLATEX));
         }
@@ -93,7 +94,7 @@ private static Stream<String> provideIncorrectFormat() {
     }
 
     @Test
-    void testFileChecks() {
+    void testFileChecks() throws Exception {
         MetaData metaData = mock(MetaData.class);
         Mockito.when(metaData.getDefaultFileDirectory()).thenReturn(Optional.of("."));
         Mockito.when(metaData.getUserFileDirectory(any(String.class))).thenReturn(Optional.empty());
@@ -106,7 +107,7 @@ void testFileChecks() {
     }
 
     @Test
-    void fileCheckFindsFilesRelativeToBibFile(@TempDir Path testFolder) throws IOException {
+    void fileCheckFindsFilesRelativeToBibFile(@TempDir Path testFolder) throws Exception {
         Path bibFile = testFolder.resolve("lit.bib");
         Files.createFile(bibFile);
         Path pdfFile = testFolder.resolve("file.pdf");
@@ -119,7 +120,7 @@ void fileCheckFindsFilesRelativeToBibFile(@TempDir Path testFolder) throws IOExc
     }
 
     @Test
-    void testEntryIsUnchangedAfterChecks() {
+    void testEntryIsUnchangedAfterChecks() throws Exception {
         BibEntry entry = new BibEntry();
 
         // populate with all known fields
@@ -136,11 +137,14 @@ void testEntryIsUnchangedAfterChecks() {
         bibDatabase.insertEntry(entry);
         BibDatabaseContext context = new BibDatabaseContext(bibDatabase);
 
-        new IntegrityCheck(context,
-                mock(FilePreferences.class),
-                createCitationKeyPatternPreferences(),
-                JournalAbbreviationLoader.loadBuiltInRepository(), false)
-                .check();
+        try (PredatoryJournalRepository predatoryJournalRepository = PredatoryJournalListLoader.loadRepository()) {
+            new IntegrityCheck(context,
+                    mock(FilePreferences.class),
+                    createCitationKeyPatternPreferences(),
+                    JournalAbbreviationLoader.loadBuiltInRepository(),
+                    predatoryJournalRepository, false)
+                    .check();
+        }
 
         assertEquals(clonedEntry, entry);
     }
@@ -167,23 +171,31 @@ private BibDatabaseContext createContext(Field field, String value) {
         return createContext(field, value, metaData);
     }
 
-    private void assertWrong(BibDatabaseContext context) {
-        List<IntegrityMessage> messages = new IntegrityCheck(context,
-                mock(FilePreferences.class),
-                createCitationKeyPatternPreferences(),
-                JournalAbbreviationLoader.loadBuiltInRepository(), false)
-                .check();
+    private void assertWrong(BibDatabaseContext context) throws Exception {
+        List<IntegrityMessage> messages;
+        try (PredatoryJournalRepository predatoryJournalRepository = PredatoryJournalListLoader.loadRepository()) {
+            messages = new IntegrityCheck(context,
+                    mock(FilePreferences.class),
+                    createCitationKeyPatternPreferences(),
+                    JournalAbbreviationLoader.loadBuiltInRepository(),
+                    predatoryJournalRepository, false)
+                    .check();
+        }
         assertNotEquals(Collections.emptyList(), messages);
     }
 
-    private void assertCorrect(BibDatabaseContext context) {
+    private void assertCorrect(BibDatabaseContext context) throws Exception {
         FilePreferences filePreferencesMock = mock(FilePreferences.class);
         when(filePreferencesMock.shouldStoreFilesRelativeToBibFile()).thenReturn(true);
-        List<IntegrityMessage> messages = new IntegrityCheck(context,
-                filePreferencesMock,
-                createCitationKeyPatternPreferences(),
-                JournalAbbreviationLoader.loadBuiltInRepository(), false
-        ).check();
+        List<IntegrityMessage> messages;
+        try (PredatoryJournalRepository predatoryJournalRepository = PredatoryJournalListLoader.loadRepository()) {
+            messages = new IntegrityCheck(context,
+                    filePreferencesMock,
+                    createCitationKeyPatternPreferences(),
+                    JournalAbbreviationLoader.loadBuiltInRepository(),
+                    predatoryJournalRepository, false)
+                    .check();
+        }
         assertEquals(Collections.emptyList(), messages);
     }
 
diff --git a/src/test/java/org/jabref/logic/integrity/PredatoryJournalCheckerTest.java b/src/test/java/org/jabref/logic/integrity/PredatoryJournalCheckerTest.java
new file mode 100644
index 00000000000..74f9caa093f
--- /dev/null
+++ b/src/test/java/org/jabref/logic/integrity/PredatoryJournalCheckerTest.java
@@ -0,0 +1,78 @@
+package org.jabref.logic.integrity;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.jabref.logic.journals.predatory.PredatoryJournalListLoader;
+import org.jabref.logic.journals.predatory.PredatoryJournalRepository;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.field.StandardField;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class PredatoryJournalCheckerTest {
+
+    static PredatoryJournalChecker checker;
+    static PredatoryJournalRepository predatoryJournalRepository = PredatoryJournalListLoader.loadRepository();
+
+    @BeforeAll
+    static void initChecker() {
+        checker = new PredatoryJournalChecker(predatoryJournalRepository,
+                List.of(StandardField.JOURNAL, StandardField.PUBLISHER, StandardField.BOOKTITLE));
+    }
+
+    @AfterAll
+    static void close() throws Exception {
+        predatoryJournalRepository.close();
+    }
+
+    @Test
+    void journalIsNotPredatory() {
+        BibEntry entry = new BibEntry().withField(StandardField.JOURNAL, "IEEE Software");
+        assertEquals(Collections.emptyList(), checker.check(entry));
+    }
+
+    @Test
+    void journalIsPredatory() {
+        String journalName = "European International Journal of Science and Technology";
+        BibEntry entry = new BibEntry().withField(StandardField.JOURNAL, journalName);
+        assertEquals(List.of(new IntegrityMessage("Predatory journal %s found".formatted(journalName),
+                entry, StandardField.JOURNAL)), checker.check(entry));
+    }
+
+    @Test
+    void journalIsPredatoryCaseInsensitive() {
+        String journalName = "european international journal of science and technology";
+        BibEntry entry = new BibEntry().withField(StandardField.JOURNAL, journalName);
+        assertEquals(List.of(new IntegrityMessage("Predatory journal %s found".formatted(journalName),
+                entry, StandardField.JOURNAL)), checker.check(entry));
+    }
+
+    @Test
+    void journalIsPredatoryExtraCharacters() {
+        String journalName = "European International Journal, of Science and Technology";
+        BibEntry entry = new BibEntry().withField(StandardField.JOURNAL, journalName);
+        assertEquals(List.of(new IntegrityMessage("Predatory journal %s found".formatted(journalName),
+                entry, StandardField.JOURNAL)), checker.check(entry));
+    }
+
+    @Test
+    void publisherIsPredatory() {
+        String publisherName = "Academia Scholarly Journals";
+        BibEntry entry = new BibEntry().withField(StandardField.PUBLISHER, publisherName);
+        assertEquals(List.of(new IntegrityMessage("Predatory journal %s found".formatted(publisherName),
+                entry, StandardField.PUBLISHER)), checker.check(entry));
+    }
+
+    @Test
+    void bookTitleIsPredatory() {
+        String bookTitle = "Biosciences International";
+        BibEntry entry = new BibEntry().withField(StandardField.BOOKTITLE, bookTitle);
+        assertEquals(List.of(new IntegrityMessage("Predatory journal %s found".formatted(bookTitle),
+                entry, StandardField.BOOKTITLE)), checker.check(entry));
+    }
+}
diff --git a/src/test/java/org/jabref/logic/journals/AbbreviationTest.java b/src/test/java/org/jabref/logic/journals/AbbreviationTest.java
index 1f3ba7a8eab..423e235c0c2 100644
--- a/src/test/java/org/jabref/logic/journals/AbbreviationTest.java
+++ b/src/test/java/org/jabref/logic/journals/AbbreviationTest.java
@@ -105,10 +105,10 @@ void testDefaultAndShortestUniqueAbbreviationsAreSame() {
 
     @Test
     void testEquals() {
-      Abbreviation abbreviation = new Abbreviation("Long Name", "L N", "LN");
-      Abbreviation otherAbbreviation = new Abbreviation("Long Name", "L N", "LN");
-      assertEquals(abbreviation, otherAbbreviation);
-      assertNotEquals(abbreviation, "String");
+        Abbreviation abbreviation = new Abbreviation("Long Name", "L N", "LN");
+        Abbreviation otherAbbreviation = new Abbreviation("Long Name", "L N", "LN");
+        assertEquals(abbreviation, otherAbbreviation);
+        assertNotEquals("String", abbreviation);
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/layout/format/DOICheckTest.java b/src/test/java/org/jabref/logic/layout/format/DOICheckTest.java
index 2c7fb18598c..f1252c770ea 100644
--- a/src/test/java/org/jabref/logic/layout/format/DOICheckTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/DOICheckTest.java
@@ -3,16 +3,21 @@
 import java.util.stream.Stream;
 
 import org.jabref.logic.layout.LayoutFormatter;
+import org.jabref.logic.preferences.DOIPreferences;
 
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 public class DOICheckTest {
 
-    private LayoutFormatter layoutFormatter = new DOICheck();
+    private final DOIPreferences doiPreferences = mock(DOIPreferences.class);
+    private final LayoutFormatter layoutFormatter = new DOICheck(doiPreferences);
 
     @ParameterizedTest
     @MethodSource("provideDOI")
@@ -20,6 +25,13 @@ void formatDOI(String formattedDOI, String originalDOI) {
         assertEquals(formattedDOI, layoutFormatter.format(originalDOI));
     }
 
+    @Test
+    void formatDOIWithCustomBase() {
+        when(doiPreferences.isUseCustom()).thenReturn(true);
+        when(doiPreferences.getDefaultBaseURI()).thenReturn("http://example.org");
+        assertEquals("http://example.org/10.1000/ISBN1-900512-44-0", layoutFormatter.format("10.1000/ISBN1-900512-44-0"));
+    }
+
     private static Stream<Arguments> provideDOI() {
         return Stream.of(
                 Arguments.of("", ""),
diff --git a/src/test/java/org/jabref/logic/layout/format/ReplaceTest.java b/src/test/java/org/jabref/logic/layout/format/ReplaceTest.java
index 3d1eb4ebb9b..31bc81144f5 100644
--- a/src/test/java/org/jabref/logic/layout/format/ReplaceTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/ReplaceTest.java
@@ -5,6 +5,7 @@
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 public class ReplaceTest {
 
@@ -26,7 +27,7 @@ public void testSimpleTextNoHit() {
     public void testFormatNull() {
         ParamLayoutFormatter a = new Replace();
         a.setArgument("Eds.,Ed.");
-        assertEquals(null, a.format(null));
+        assertNull(a.format(null));
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/msbib/MsBibAuthorTest.java b/src/test/java/org/jabref/logic/msbib/MsBibAuthorTest.java
index 3b09b26c7d9..2ccef4f8722 100644
--- a/src/test/java/org/jabref/logic/msbib/MsBibAuthorTest.java
+++ b/src/test/java/org/jabref/logic/msbib/MsBibAuthorTest.java
@@ -5,6 +5,7 @@
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 public class MsBibAuthorTest {
 
@@ -26,14 +27,14 @@ public void testGetMiddleName() {
     public void testGetNoMiddleName() {
         Author author = new Author("Gustav", null, null, "Bach", null);
         MsBibAuthor msBibAuthor = new MsBibAuthor(author);
-        assertEquals(null, msBibAuthor.getMiddleName());
+        assertNull(msBibAuthor.getMiddleName());
     }
 
     @Test
     public void testGetNoFirstName() {
         Author author = new Author(null, null, null, "Bach", null);
         MsBibAuthor msBibAuthor = new MsBibAuthor(author);
-        assertEquals(null, msBibAuthor.getMiddleName());
+        assertNull(msBibAuthor.getMiddleName());
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/net/ProxyTest.java b/src/test/java/org/jabref/logic/net/ProxyTest.java
index 6b6e844d1b6..20f904441cb 100644
--- a/src/test/java/org/jabref/logic/net/ProxyTest.java
+++ b/src/test/java/org/jabref/logic/net/ProxyTest.java
@@ -3,6 +3,7 @@
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class ProxyTest {
    /**
@@ -31,10 +32,10 @@ public void testProxyPreferencesStorePassword() {
                persist);
 
        // Check if mock data is stored in object memory and can be extracted
-       assertEquals(proxyPref.shouldUseProxy(), true);
+       assertTrue(proxyPref.shouldUseProxy());
        assertEquals(proxyPref.getHostname(), hostname);
        assertEquals(proxyPref.getPort(), port);
-       assertEquals(proxyPref.shouldUseAuthentication(), true);
+       assertTrue(proxyPref.shouldUseAuthentication());
        assertEquals(proxyPref.getUsername(), username);
        assertEquals(proxyPref.getPassword(), password);
        assertEquals(proxyPref.shouldPersistPassword(), persist);
diff --git a/src/test/java/org/jabref/logic/pdf/search/indexing/DocumentReaderTest.java b/src/test/java/org/jabref/logic/pdf/search/DocumentReaderTest.java
similarity index 98%
rename from src/test/java/org/jabref/logic/pdf/search/indexing/DocumentReaderTest.java
rename to src/test/java/org/jabref/logic/pdf/search/DocumentReaderTest.java
index 982504c9938..135944c722c 100644
--- a/src/test/java/org/jabref/logic/pdf/search/indexing/DocumentReaderTest.java
+++ b/src/test/java/org/jabref/logic/pdf/search/DocumentReaderTest.java
@@ -1,4 +1,4 @@
-package org.jabref.logic.pdf.search.indexing;
+package org.jabref.logic.pdf.search;
 
 import java.nio.file.Path;
 import java.util.Collections;
diff --git a/src/test/java/org/jabref/logic/pdf/search/indexing/PdfIndexerTest.java b/src/test/java/org/jabref/logic/pdf/search/PdfIndexerTest.java
similarity index 74%
rename from src/test/java/org/jabref/logic/pdf/search/indexing/PdfIndexerTest.java
rename to src/test/java/org/jabref/logic/pdf/search/PdfIndexerTest.java
index 629bb293778..187f01ce656 100644
--- a/src/test/java/org/jabref/logic/pdf/search/indexing/PdfIndexerTest.java
+++ b/src/test/java/org/jabref/logic/pdf/search/PdfIndexerTest.java
@@ -1,4 +1,4 @@
-package org.jabref.logic.pdf.search.indexing;
+package org.jabref.logic.pdf.search;
 
 import java.io.IOException;
 import java.nio.file.Path;
@@ -53,8 +53,7 @@ public void exampleThesisIndex() throws IOException {
         database.insertEntry(entry);
 
         // when
-        indexer.createIndex();
-        indexer.addToIndex(context);
+        indexer.rebuildIndex();
 
         // then
         try (IndexReader reader = DirectoryReader.open(new NIOFSDirectory(context.getFulltextIndexPath()))) {
@@ -63,18 +62,17 @@ public void exampleThesisIndex() throws IOException {
     }
 
     @Test
-    public void dontIndexNonPdf() throws IOException {
+    public void doNotIndexNonPdf() throws IOException {
         // given
-        BibEntry entry = new BibEntry(StandardEntryType.PhdThesis);
-        entry.setFiles(Collections.singletonList(new LinkedFile("Example Thesis", "thesis-example.pdf", StandardFileType.AUX.getName())));
+        BibEntry entry = new BibEntry(StandardEntryType.PhdThesis)
+                .withFiles(Collections.singletonList(new LinkedFile("Example Thesis", "thesis-example.aux", StandardFileType.AUX.getName())));
         database.insertEntry(entry);
 
         // when
-        indexer.createIndex();
-        indexer.addToIndex(context);
+        indexer.rebuildIndex();
 
         // then
-        try (IndexReader reader = DirectoryReader.open(new NIOFSDirectory(context.getFulltextIndexPath()))) {
+        try (IndexReader reader = DirectoryReader.open(indexer.indexWriter)) {
             assertEquals(0, reader.numDocs());
         }
     }
@@ -87,11 +85,10 @@ public void dontIndexOnlineLinks() throws IOException {
         database.insertEntry(entry);
 
         // when
-        indexer.createIndex();
-        indexer.addToIndex(context);
+        indexer.rebuildIndex();
 
         // then
-        try (IndexReader reader = DirectoryReader.open(new NIOFSDirectory(context.getFulltextIndexPath()))) {
+        try (IndexReader reader = DirectoryReader.open(indexer.indexWriter)) {
             assertEquals(0, reader.numDocs());
         }
     }
@@ -105,8 +102,7 @@ public void exampleThesisIndexWithKey() throws IOException {
         database.insertEntry(entry);
 
         // when
-        indexer.createIndex();
-        indexer.addToIndex(context);
+        indexer.rebuildIndex();
 
         // then
         try (IndexReader reader = DirectoryReader.open(new NIOFSDirectory(context.getFulltextIndexPath()))) {
@@ -123,8 +119,7 @@ public void metaDataIndex() throws IOException {
         database.insertEntry(entry);
 
         // when
-        indexer.createIndex();
-        indexer.addToIndex(context);
+        indexer.rebuildIndex();
 
         // then
         try (IndexReader reader = DirectoryReader.open(new NIOFSDirectory(context.getFulltextIndexPath()))) {
@@ -132,30 +127,6 @@ public void metaDataIndex() throws IOException {
         }
     }
 
-    @Test
-    public void testFlushIndex() throws IOException {
-        // given
-        BibEntry entry = new BibEntry(StandardEntryType.PhdThesis);
-        entry.setCitationKey("Example2017");
-        entry.setFiles(Collections.singletonList(new LinkedFile("Example Thesis", "thesis-example.pdf", StandardFileType.PDF.getName())));
-        database.insertEntry(entry);
-
-        indexer.createIndex();
-        indexer.addToIndex(context);
-        // index actually exists
-        try (IndexReader reader = DirectoryReader.open(new NIOFSDirectory(context.getFulltextIndexPath()))) {
-            assertEquals(33, reader.numDocs());
-        }
-
-        // when
-        indexer.flushIndex();
-
-        // then
-        try (IndexReader reader = DirectoryReader.open(new NIOFSDirectory(context.getFulltextIndexPath()))) {
-            assertEquals(0, reader.numDocs());
-        }
-    }
-
     @Test
     public void exampleThesisIndexAppendMetaData() throws IOException {
         // given
@@ -163,8 +134,8 @@ public void exampleThesisIndexAppendMetaData() throws IOException {
         exampleThesis.setCitationKey("ExampleThesis2017");
         exampleThesis.setFiles(Collections.singletonList(new LinkedFile("Example Thesis", "thesis-example.pdf", StandardFileType.PDF.getName())));
         database.insertEntry(exampleThesis);
-        indexer.createIndex();
-        indexer.addToIndex(context);
+
+        indexer.rebuildIndex();
 
         // index with first entry
         try (IndexReader reader = DirectoryReader.open(new NIOFSDirectory(context.getFulltextIndexPath()))) {
@@ -176,7 +147,7 @@ public void exampleThesisIndexAppendMetaData() throws IOException {
         metadata.setFiles(Collections.singletonList(new LinkedFile("Metadata file", "metaData.pdf", StandardFileType.PDF.getName())));
 
         // when
-        indexer.addToIndex(metadata, null);
+        indexer.addToIndex(metadata);
 
         // then
         try (IndexReader reader = DirectoryReader.open(new NIOFSDirectory(context.getFulltextIndexPath()))) {
@@ -184,4 +155,3 @@ public void exampleThesisIndexAppendMetaData() throws IOException {
         }
     }
 }
-
diff --git a/src/test/java/org/jabref/logic/pdf/search/retrieval/PdfSearcherTest.java b/src/test/java/org/jabref/logic/pdf/search/PdfSearcherTest.java
similarity index 76%
rename from src/test/java/org/jabref/logic/pdf/search/retrieval/PdfSearcherTest.java
rename to src/test/java/org/jabref/logic/pdf/search/PdfSearcherTest.java
index e005c271ff1..b06bda0d328 100644
--- a/src/test/java/org/jabref/logic/pdf/search/retrieval/PdfSearcherTest.java
+++ b/src/test/java/org/jabref/logic/pdf/search/PdfSearcherTest.java
@@ -1,10 +1,10 @@
-package org.jabref.logic.pdf.search.retrieval;
+package org.jabref.logic.pdf.search;
 
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.Collections;
+import java.util.List;
 
-import org.jabref.logic.pdf.search.indexing.PdfIndexer;
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.database.BibDatabaseContext;
@@ -12,6 +12,7 @@
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.model.pdf.search.PdfSearchResults;
+import org.jabref.model.pdf.search.SearchResult;
 import org.jabref.preferences.FilePreferences;
 
 import org.apache.lucene.queryparser.classic.ParseException;
@@ -32,44 +33,48 @@ public class PdfSearcherTest {
     @BeforeEach
     public void setUp(@TempDir Path indexDir) throws IOException {
         FilePreferences filePreferences = mock(FilePreferences.class);
-        // given
+
         BibDatabase database = new BibDatabase();
+
         BibDatabaseContext context = mock(BibDatabaseContext.class);
         when(context.getFileDirectories(Mockito.any())).thenReturn(Collections.singletonList(Path.of("src/test/resources/pdfs")));
         when(context.getFulltextIndexPath()).thenReturn(indexDir);
         when(context.getDatabase()).thenReturn(database);
         when(context.getEntries()).thenReturn(database.getEntries());
-        BibEntry examplePdf = new BibEntry(StandardEntryType.Article);
-        examplePdf.setFiles(Collections.singletonList(new LinkedFile("Example Entry", "example.pdf", StandardFileType.PDF.getName())));
+
+        BibEntry examplePdf = new BibEntry(StandardEntryType.Article)
+                .withFiles(Collections.singletonList(new LinkedFile("Example Entry", "example.pdf", StandardFileType.PDF.getName())));
         database.insertEntry(examplePdf);
 
-        BibEntry metaDataEntry = new BibEntry(StandardEntryType.Article);
-        metaDataEntry.setFiles(Collections.singletonList(new LinkedFile("Metadata Entry", "metaData.pdf", StandardFileType.PDF.getName())));
-        metaDataEntry.setCitationKey("MetaData2017");
+        BibEntry metaDataEntry = new BibEntry(StandardEntryType.Article)
+                .withCitationKey("MetaData2017")
+                .withFiles(Collections.singletonList(new LinkedFile("Metadata Entry", "metaData.pdf", StandardFileType.PDF.getName())));
         database.insertEntry(metaDataEntry);
 
-        BibEntry exampleThesis = new BibEntry(StandardEntryType.PhdThesis);
-        exampleThesis.setFiles(Collections.singletonList(new LinkedFile("Example Thesis", "thesis-example.pdf", StandardFileType.PDF.getName())));
-        exampleThesis.setCitationKey("ExampleThesis");
+        BibEntry exampleThesis = new BibEntry(StandardEntryType.PhdThesis)
+                .withCitationKey("ExampleThesis")
+                .withFiles(Collections.singletonList(new LinkedFile("Example Thesis", "thesis-example.pdf", StandardFileType.PDF.getName())));
         database.insertEntry(exampleThesis);
 
         PdfIndexer indexer = PdfIndexer.of(context, filePreferences);
-        search = PdfSearcher.of(context);
+        search = PdfSearcher.of(indexer);
 
-        indexer.createIndex();
-        indexer.addToIndex(context);
+        indexer.rebuildIndex();
     }
 
     @Test
     public void searchForTest() throws IOException, ParseException {
         PdfSearchResults result = search.search("test", 10);
-        assertEquals(8, result.numSearchResults());
+        assertEquals(10, result.numSearchResults());
     }
 
     @Test
     public void searchForUniversity() throws IOException, ParseException {
         PdfSearchResults result = search.search("University", 10);
-        assertEquals(1, result.numSearchResults());
+        assertEquals(2, result.numSearchResults());
+        List<SearchResult> searchResults = result.getSearchResults();
+        assertEquals(0, searchResults.get(0).getPageNumber());
+        assertEquals(9, searchResults.get(1).getPageNumber());
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/search/DatabaseSearcherTest.java b/src/test/java/org/jabref/logic/search/DatabaseSearcherTest.java
index f276f9ddfaf..fa38b68cc03 100644
--- a/src/test/java/org/jabref/logic/search/DatabaseSearcherTest.java
+++ b/src/test/java/org/jabref/logic/search/DatabaseSearcherTest.java
@@ -66,9 +66,7 @@ public void testCorrectMatchFromDatabaseWithArticleTypeEntry() {
     @Test
     public void testNoMatchesFromEmptyDatabaseWithInvalidQuery() {
         SearchQuery query = new SearchQuery("asdf[", EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE, SearchRules.SearchFlags.REGULAR_EXPRESSION));
-
         DatabaseSearcher databaseSearcher = new DatabaseSearcher(query, database);
-
         assertEquals(Collections.emptyList(), databaseSearcher.getMatches());
     }
 
diff --git a/src/test/java/org/jabref/logic/search/DatabaseSearcherWithBibFilesTest.java b/src/test/java/org/jabref/logic/search/DatabaseSearcherWithBibFilesTest.java
new file mode 100644
index 00000000000..84a54d6b3c1
--- /dev/null
+++ b/src/test/java/org/jabref/logic/search/DatabaseSearcherWithBibFilesTest.java
@@ -0,0 +1,172 @@
+package org.jabref.logic.search;
+
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Stream;
+
+import org.jabref.architecture.AllowedToUseSwing;
+import org.jabref.gui.Globals;
+import org.jabref.logic.importer.ImportFormatPreferences;
+import org.jabref.logic.importer.ParserResult;
+import org.jabref.logic.importer.fileformat.BibtexImporter;
+import org.jabref.logic.pdf.search.PdfIndexer;
+import org.jabref.logic.pdf.search.PdfIndexerManager;
+import org.jabref.logic.util.StandardFileType;
+import org.jabref.model.database.BibDatabase;
+import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.LinkedFile;
+import org.jabref.model.entry.field.StandardField;
+import org.jabref.model.entry.types.StandardEntryType;
+import org.jabref.model.search.rules.SearchRules;
+import org.jabref.model.util.DummyFileUpdateMonitor;
+import org.jabref.preferences.FilePreferences;
+import org.jabref.preferences.PreferencesService;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.io.TempDir;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.mockito.Answers;
+import org.mockito.Mockito;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+@AllowedToUseSwing("Makes use of Globals because of FullTextSearchRule")
+public class DatabaseSearcherWithBibFilesTest {
+
+    private static BibEntry titleSentenceCased = new BibEntry(StandardEntryType.Misc)
+            .withCitationKey("title-sentence-cased")
+            .withField(StandardField.TITLE, "Title Sentence Cased");
+    private static BibEntry titleMixedCased = new BibEntry(StandardEntryType.Misc)
+            .withCitationKey("title-mixed-cased")
+            .withField(StandardField.TITLE, "TiTle MiXed CaSed");
+    private static BibEntry titleUpperCased = new BibEntry(StandardEntryType.Misc)
+            .withCitationKey("title-upper-cased")
+            .withField(StandardField.TITLE, "TITLE UPPER CASED");
+
+    private static BibEntry mininimalSentenceCase = new BibEntry(StandardEntryType.Misc)
+            .withCitationKey("minimal-sentence-case")
+            .withFiles(Collections.singletonList(new LinkedFile("", "minimal-sentence-case.pdf", StandardFileType.PDF.getName())));
+    private static BibEntry minimalAllUpperCase = new BibEntry(StandardEntryType.Misc)
+            .withCitationKey("minimal-all-upper-case")
+            .withFiles(Collections.singletonList(new LinkedFile("", "minimal-all-upper-case.pdf", StandardFileType.PDF.getName())));
+    private static BibEntry minimalMixedCase = new BibEntry(StandardEntryType.Misc)
+            .withCitationKey("minimal-mixed-case")
+            .withFiles(Collections.singletonList(new LinkedFile("", "minimal-mixed-case.pdf", StandardFileType.PDF.getName())));
+    private static BibEntry minimalNoteSentenceCase = new BibEntry(StandardEntryType.Misc)
+            .withCitationKey("minimal-note-sentence-case")
+            .withFiles(Collections.singletonList(new LinkedFile("", "minimal-note-sentence-case.pdf", StandardFileType.PDF.getName())));
+    private static BibEntry minimalNoteAllUpperCase = new BibEntry(StandardEntryType.Misc)
+            .withCitationKey("minimal-note-all-upper-case")
+            .withFiles(Collections.singletonList(new LinkedFile("", "minimal-note-all-upper-case.pdf", StandardFileType.PDF.getName())));
+    private static BibEntry minimalNoteMixedCase = new BibEntry(StandardEntryType.Misc)
+            .withCitationKey("minimal-note-mixed-case")
+            .withFiles(Collections.singletonList(new LinkedFile("", "minimal-note-mixed-case.pdf", StandardFileType.PDF.getName())));
+
+    FilePreferences filePreferences = mock(FilePreferences.class);
+
+    @TempDir
+    private Path indexDir;
+    private PdfIndexer pdfIndexer;
+
+    private BibDatabase initializeDatabaseFromPath(String testFile) throws Exception {
+        return initializeDatabaseFromPath(Path.of(Objects.requireNonNull(DatabaseSearcherWithBibFilesTest.class.getResource(testFile)).toURI()));
+    }
+
+    private BibDatabase initializeDatabaseFromPath(Path testFile) throws Exception {
+        ParserResult result = new BibtexImporter(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS), new DummyFileUpdateMonitor()).importDatabase(testFile);
+        BibDatabase database = result.getDatabase();
+
+        BibDatabaseContext context = mock(BibDatabaseContext.class);
+        when(context.getFileDirectories(Mockito.any())).thenReturn(List.of(testFile.getParent()));
+        when(context.getFulltextIndexPath()).thenReturn(indexDir);
+        when(context.getDatabase()).thenReturn(database);
+        when(context.getEntries()).thenReturn(database.getEntries());
+
+        // Required because of {@Link org.jabref.model.search.rules.FullTextSearchRule.FullTextSearchRule}
+        Globals.stateManager.setActiveDatabase(context);
+        PreferencesService preferencesService = mock(PreferencesService.class);
+        when(preferencesService.getFilePreferences()).thenReturn(filePreferences);
+        Globals.prefs = preferencesService;
+
+        pdfIndexer = PdfIndexerManager.getIndexer(context, filePreferences);
+        // Alternative - For debugging with Luke (part of the Apache Lucene distribution)
+        // pdfIndexer = PdfIndexer.of(context, Path.of("C:\\temp\\index"), filePreferences);
+
+        pdfIndexer.rebuildIndex();
+        return database;
+    }
+
+    @AfterEach
+    public void tearDown() throws Exception {
+        pdfIndexer.close();
+    }
+
+    private static Stream<Arguments> searchLibrary() {
+        return Stream.of(
+                // empty library
+                Arguments.of(List.of(), "empty.bib", "Test", EnumSet.noneOf(SearchRules.SearchFlags.class)),
+
+                // test-library-title-casing
+
+                Arguments.of(List.of(), "test-library-title-casing.bib", "NotExisting", EnumSet.noneOf(SearchRules.SearchFlags.class)),
+                Arguments.of(List.of(titleSentenceCased, titleMixedCased, titleUpperCased), "test-library-title-casing.bib", "Title", EnumSet.noneOf(SearchRules.SearchFlags.class)),
+
+                Arguments.of(List.of(), "test-library-title-casing.bib", "title=NotExisting", EnumSet.noneOf(SearchRules.SearchFlags.class)),
+                Arguments.of(List.of(titleSentenceCased, titleMixedCased, titleUpperCased), "test-library-title-casing.bib", "title=Title", EnumSet.noneOf(SearchRules.SearchFlags.class)),
+
+                Arguments.of(List.of(), "test-library-title-casing.bib", "title=TiTLE", EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE)),
+                Arguments.of(List.of(titleSentenceCased), "test-library-title-casing.bib", "title=Title", EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE)),
+
+                Arguments.of(List.of(), "test-library-title-casing.bib", "TiTLE", EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE)),
+                Arguments.of(List.of(titleMixedCased), "test-library-title-casing.bib", "TiTle", EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE)),
+
+                Arguments.of(List.of(), "test-library-title-casing.bib", "title=NotExisting", EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE)),
+                Arguments.of(List.of(titleMixedCased), "test-library-title-casing.bib", "title=TiTle", EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE)),
+
+                Arguments.of(List.of(), "test-library-title-casing.bib", "[Y]", EnumSet.of(SearchRules.SearchFlags.REGULAR_EXPRESSION)),
+                Arguments.of(List.of(titleUpperCased), "test-library-title-casing.bib", "[U]", EnumSet.of(SearchRules.SearchFlags.REGULAR_EXPRESSION)),
+
+                // Word boundaries
+                Arguments.of(List.of(), "test-library-title-casing.bib", "\\bTit\\b", EnumSet.of(SearchRules.SearchFlags.REGULAR_EXPRESSION, SearchRules.SearchFlags.CASE_SENSITIVE)),
+                Arguments.of(List.of(titleSentenceCased), "test-library-title-casing.bib", "\\bTitle\\b", EnumSet.of(SearchRules.SearchFlags.REGULAR_EXPRESSION, SearchRules.SearchFlags.CASE_SENSITIVE)),
+
+                // test-library-with-attached-files
+
+                Arguments.of(List.of(), "test-library-with-attached-files.bib", "This is a test.", EnumSet.of(SearchRules.SearchFlags.FULLTEXT, SearchRules.SearchFlags.CASE_SENSITIVE)),
+
+                Arguments.of(List.of(mininimalSentenceCase, minimalAllUpperCase, minimalMixedCase), "test-library-with-attached-files.bib", "This is a short sentence, comma included.", EnumSet.of(SearchRules.SearchFlags.FULLTEXT)),
+                Arguments.of(List.of(mininimalSentenceCase, minimalAllUpperCase, minimalMixedCase), "test-library-with-attached-files.bib", "comma", EnumSet.of(SearchRules.SearchFlags.FULLTEXT)),
+                // TODO: PDF search does not support case sensitive search (yet)
+                // Arguments.of(List.of(minimalAllUpperCase, minimalMixedCase), "test-library-with-attached-files.bib", "THIS", EnumSet.of(SearchRules.SearchFlags.FULLTEXT, SearchRules.SearchFlags.CASE_SENSITIVE)),
+                // Arguments.of(List.of(minimalAllUpperCase), "test-library-with-attached-files.bib", "THIS is a short sentence, comma included.", EnumSet.of(SearchRules.SearchFlags.FULLTEXT, SearchRules.SearchFlags.CASE_SENSITIVE)),
+                // Arguments.of(List.of(minimalSentenceCase, minimalAllUpperCase, minimalMixedCase), "test-library-with-attached-files.bib", "comma", EnumSet.of(SearchRules.SearchFlags.FULLTEXT, SearchRules.SearchFlags.CASE_SENSITIVE)),
+                // Arguments.of(List.of(minimalNoteAllUpperCase), "test-library-with-attached-files.bib", "THIS IS A SHORT SENTENCE, COMMA INCLUDED.", EnumSet.of(SearchRules.SearchFlags.FULLTEXT, SearchRules.SearchFlags.CASE_SENSITIVE)),
+
+                Arguments.of(List.of(), "test-library-with-attached-files.bib", "NotExisting", EnumSet.of(SearchRules.SearchFlags.FULLTEXT)),
+
+                Arguments.of(List.of(minimalNoteSentenceCase, minimalNoteAllUpperCase, minimalNoteMixedCase), "test-library-with-attached-files.bib", "world", EnumSet.of(SearchRules.SearchFlags.FULLTEXT)),
+                Arguments.of(List.of(minimalNoteSentenceCase, minimalNoteAllUpperCase, minimalNoteMixedCase), "test-library-with-attached-files.bib", "Hello World", EnumSet.of(SearchRules.SearchFlags.FULLTEXT)),
+                // TODO: PDF search does not support case sensitive search (yet)
+                // Arguments.of(List.of(minimalNoteAllUpperCase), "test-library-with-attached-files.bib", "HELLO WORLD", EnumSet.of(SearchRules.SearchFlags.FULLTEXT, SearchRules.SearchFlags.CASE_SENSITIVE)),
+                Arguments.of(List.of(), "test-library-with-attached-files.bib", "NotExisting", EnumSet.of(SearchRules.SearchFlags.FULLTEXT, SearchRules.SearchFlags.CASE_SENSITIVE))
+        );
+    }
+
+    @ParameterizedTest(name = "{index} => query={2}, searchFlags={3}, testFile={1}, expected={0}")
+    @MethodSource
+    public void searchLibrary(List<BibEntry> expected, String testFile, String query, EnumSet<SearchRules.SearchFlags> searchFlags) throws Exception {
+        BibDatabase database = initializeDatabaseFromPath(testFile);
+        List<BibEntry> matches = new DatabaseSearcher(new SearchQuery(query, searchFlags), database).getMatches();
+        assertEquals(expected, matches);
+    }
+}
+
+
diff --git a/src/test/java/org/jabref/logic/search/SearchQueryTest.java b/src/test/java/org/jabref/logic/search/SearchQueryTest.java
index 4bf01fadb73..399c89089e6 100644
--- a/src/test/java/org/jabref/logic/search/SearchQueryTest.java
+++ b/src/test/java/org/jabref/logic/search/SearchQueryTest.java
@@ -20,8 +20,8 @@ public class SearchQueryTest {
 
     @Test
     public void testToString() {
-        assertEquals("\"asdf\" (case sensitive, regular expression)", new SearchQuery("asdf", EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE, SearchRules.SearchFlags.REGULAR_EXPRESSION)).toString());
-        assertEquals("\"asdf\" (case insensitive, plain text)", new SearchQuery("asdf", EnumSet.noneOf(SearchFlags.class)).toString());
+        assertEquals("\"asdf\" (case sensitive, regular expression) [CASE_SENSITIVE, REGULAR_EXPRESSION]", new SearchQuery("asdf", EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE, SearchRules.SearchFlags.REGULAR_EXPRESSION)).toString());
+        assertEquals("\"asdf\" (case insensitive, plain text) []", new SearchQuery("asdf", EnumSet.noneOf(SearchFlags.class)).toString());
     }
 
     @Test
diff --git a/src/test/java/org/jabref/model/FieldChangeTest.java b/src/test/java/org/jabref/model/FieldChangeTest.java
index 1625a1ae652..b2a6b77f64b 100644
--- a/src/test/java/org/jabref/model/FieldChangeTest.java
+++ b/src/test/java/org/jabref/model/FieldChangeTest.java
@@ -57,7 +57,7 @@ void selfEqualsFieldchangeDifferentEntry() {
 
     @Test
     void fieldChangeDoesNotEqualString() {
-        assertNotEquals(fc, "foo");
+        assertNotEquals("foo", fc);
     }
 
     @Test
diff --git a/src/test/java/org/jabref/model/database/BibDatabaseContextTest.java b/src/test/java/org/jabref/model/database/BibDatabaseContextTest.java
index 55e4fd2a744..dfb069680d0 100644
--- a/src/test/java/org/jabref/model/database/BibDatabaseContextTest.java
+++ b/src/test/java/org/jabref/model/database/BibDatabaseContextTest.java
@@ -16,6 +16,7 @@
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -150,9 +151,11 @@ void testGetFullTextIndexPathWhenPathIsNotNull() {
         BibDatabaseContext bibDatabaseContext = new BibDatabaseContext();
         bibDatabaseContext.setDatabasePath(existingPath);
 
-        Path expectedPath = OS.getNativeDesktop().getFulltextIndexBaseDirectory().resolve(existingPath.hashCode() + "");
         Path actualPath = bibDatabaseContext.getFulltextIndexPath();
+        assertNotNull(actualPath);
 
-        assertEquals(expectedPath, actualPath);
+        String fulltextIndexBaseDirectory = OS.getNativeDesktop().getFulltextIndexBaseDirectory().toString();
+        String actualPathStart = actualPath.toString().substring(0, fulltextIndexBaseDirectory.length());
+        assertEquals(fulltextIndexBaseDirectory, actualPathStart);
     }
 }
diff --git a/src/test/java/org/jabref/model/entry/BibEntryTest.java b/src/test/java/org/jabref/model/entry/BibEntryTest.java
index b913030cc73..63cd6657bc9 100644
--- a/src/test/java/org/jabref/model/entry/BibEntryTest.java
+++ b/src/test/java/org/jabref/model/entry/BibEntryTest.java
@@ -364,17 +364,17 @@ void isEmptyCiteKey() {
     @Test
     void identicObjectsareEqual() throws Exception {
         BibEntry otherEntry = entry;
-        assertTrue(entry.equals(otherEntry));
+        assertEquals(entry, otherEntry);
     }
 
     @Test
     void compareToNullObjectIsFalse() throws Exception {
-        assertFalse(entry.equals(null));
+        assertNotEquals(null, entry);
     }
 
     @Test
     void compareToDifferentClassIsFalse() throws Exception {
-        assertFalse(entry.equals(new Object()));
+        assertNotEquals(entry, new Object());
     }
 
     @Test
diff --git a/src/test/java/org/jabref/model/groups/SearchGroupTest.java b/src/test/java/org/jabref/model/groups/SearchGroupTest.java
index 5bdec41d87e..75829b5a9b5 100644
--- a/src/test/java/org/jabref/model/groups/SearchGroupTest.java
+++ b/src/test/java/org/jabref/model/groups/SearchGroupTest.java
@@ -1,9 +1,11 @@
 package org.jabref.model.groups;
 
 import java.util.EnumSet;
+import java.util.List;
 
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
+import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.model.search.rules.SearchRules;
 
 import org.junit.jupiter.api.Test;
@@ -13,6 +15,32 @@
 
 public class SearchGroupTest {
 
+    private static BibEntry entry1D = new BibEntry(StandardEntryType.Misc)
+            .withCitationKey("entry1")
+            .withField(StandardField.AUTHOR, "Test")
+            .withField(StandardField.TITLE, "Case")
+            .withField(StandardField.GROUPS, "A");
+
+    private static BibEntry entry2D = new BibEntry(StandardEntryType.Misc)
+            .withCitationKey("entry2")
+            .withField(StandardField.AUTHOR, "TEST")
+            .withField(StandardField.TITLE, "CASE")
+            .withField(StandardField.GROUPS, "A");
+
+    @Test
+    public void containsFindsWords() {
+        SearchGroup groupPositive = new SearchGroup("A", GroupHierarchyType.INDEPENDENT, "Test", EnumSet.noneOf(SearchRules.SearchFlags.class));
+        List<BibEntry> positiveResult = List.of(entry1D, entry2D);
+        assertTrue(groupPositive.containsAll(positiveResult));
+    }
+
+    @Test
+    public void containsDoesNotFindWords() {
+        SearchGroup groupNegative = new SearchGroup("A", GroupHierarchyType.INDEPENDENT, "Unknown", EnumSet.noneOf(SearchRules.SearchFlags.class));
+        List<BibEntry> positiveResult = List.of(entry1D, entry2D);
+        assertFalse(groupNegative.containsAny(positiveResult));
+    }
+
     @Test
     public void containsFindsWordWithRegularExpression() {
         SearchGroup group = new SearchGroup("myExplicitGroup", GroupHierarchyType.INDEPENDENT, "anyfield=rev*", EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE, SearchRules.SearchFlags.REGULAR_EXPRESSION));
diff --git a/src/test/java/org/jabref/model/openoffice/CitationEntryTest.java b/src/test/java/org/jabref/model/openoffice/CitationEntryTest.java
index 8648d9b5df9..481afa00eac 100644
--- a/src/test/java/org/jabref/model/openoffice/CitationEntryTest.java
+++ b/src/test/java/org/jabref/model/openoffice/CitationEntryTest.java
@@ -48,7 +48,7 @@ void testCitationEntryEquals() {
         assertEquals(citationEntry1, citationEntry1);
         assertEquals(citationEntry1, citationEntry3);
         assertNotEquals(citationEntry1, citationEntry2);
-        assertNotEquals(citationEntry1, "Random String");
+        assertNotEquals("Random String", citationEntry1);
     }
 
     @Test
diff --git a/src/test/java/org/jabref/model/strings/StringUtilTest.java b/src/test/java/org/jabref/model/strings/StringUtilTest.java
index a1ba47b247a..f41584e1939 100644
--- a/src/test/java/org/jabref/model/strings/StringUtilTest.java
+++ b/src/test/java/org/jabref/model/strings/StringUtilTest.java
@@ -14,6 +14,7 @@
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -142,7 +143,7 @@ void testStripBrackets() {
         assertEquals("]", StringUtil.stripBrackets("]"));
         assertEquals("", StringUtil.stripBrackets("[]"));
         assertEquals("f[]f", StringUtil.stripBrackets("f[]f"));
-        assertEquals(null, StringUtil.stripBrackets(null));
+        assertNull(StringUtil.stripBrackets(null));
     }
 
     @Test
diff --git a/src/test/java/org/jabref/preferences/CitationCommandStringTest.java b/src/test/java/org/jabref/preferences/CitationCommandStringTest.java
new file mode 100644
index 00000000000..0bca17e7eed
--- /dev/null
+++ b/src/test/java/org/jabref/preferences/CitationCommandStringTest.java
@@ -0,0 +1,44 @@
+package org.jabref.preferences;
+
+import java.util.stream.Stream;
+
+import org.jabref.logic.push.CitationCommandString;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class CitationCommandStringTest {
+
+    @Test
+    void testToString() {
+        assertEquals("\\cite{key1,key2}", new CitationCommandString("\\cite{", ",", "}").toString());
+    }
+
+    public static Stream<Arguments> from() {
+        return Stream.of(
+                Arguments.of(
+                        new CitationCommandString("\\cite{", ",", "}"),
+                        "\\cite{key1,key2}"
+                ),
+                Arguments.of(
+                        new CitationCommandString("\\cite{", ",", "}"),
+                        "\\cite"
+                ),
+                // We could do better, but this is very seldom
+                Arguments.of(
+                        new CitationCommandString("\\cite[key1,key]{", ",", "}"),
+                        "\\cite[key1,key]"
+                )
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource
+    void from(CitationCommandString expected, String input) {
+        assertEquals(expected, CitationCommandString.from(input));
+    }
+}
diff --git a/src/test/resources/org/jabref/logic/exporter/OldOpenOfficeCalcExportFormatContentSingleEntry.xml b/src/test/resources/org/jabref/logic/exporter/OldOpenOfficeCalcExportFormatContentSingleEntry.xml
index 0594bb222be..618b78d30a2 100644
--- a/src/test/resources/org/jabref/logic/exporter/OldOpenOfficeCalcExportFormatContentSingleEntry.xml
+++ b/src/test/resources/org/jabref/logic/exporter/OldOpenOfficeCalcExportFormatContentSingleEntry.xml
@@ -1,12 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<office:document-content xmlns:office="http://openoffice.org/2000/office" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:class="spreadsheet" xmlns:version="1.0" xmlns:style="http://openoffice.org/2000/style" xmlns:table="http://openoffice.org/2000/table" xmlns:text="http://openoffice.org/2000/text">
-    <office:script/>
+<office:document-content xmlns:office="http://openoffice.org/2000/office"
+    xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:class="spreadsheet" xmlns:version="1.0"
+    xmlns:style="http://openoffice.org/2000/style" xmlns:table="http://openoffice.org/2000/table"
+    xmlns:text="http://openoffice.org/2000/text">
+    <office:script />
     <office:automatic-styles>
         <style:style style:family="table-row" style:name="ro1">
-            <style.properties fo:break-before="auto" style:row-height="0.1681inch" style:use-optimal-row-height="true"/>
+            <style.properties fo:break-before="auto" style:row-height="0.1681inch"
+                style:use-optimal-row-height="true" />
         </style:style>
         <style:style style:family="table" style:master-page-name="Default" style:name="ta1">
-            <style:properties table:display="true"/>
+            <style:properties table:display="true" />
         </style:style>
     </office:automatic-styles>
     <office:body>
@@ -75,6 +79,9 @@
                 <table:table-cell>
                     <text:p>Crossref</text:p>
                 </table:table-cell>
+                <table:table-cell>
+                    <text:p>Cites</text:p>
+                </table:table-cell>
                 <table:table-cell>
                     <text:p>Date</text:p>
                 </table:table-cell>
@@ -387,372 +394,376 @@
                     <text:p>7</text:p>
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
                     <text:p>New York, NY, USA</text:p>
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
                     <text:p>Tony Clear</text:p>
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
+                </table:table-cell>
+                <table:table-cell>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
                     <text:p>http://doi.acm.org/10.1145/820127.820136</text:p>
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
                     <text:p>0097-8418</text:p>
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
                     <text:p>SIGCSE Bull.</text:p>
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
                     <text:p>4</text:p>
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
                     <text:p>13--14</text:p>
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
                     <text:p>ACM</text:p>
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p>Design and usability in security systems: daily life as a context of use?</text:p>
+                    <text:p>Design and usability in security systems: daily life as a context of
+                        use?</text:p>
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
                     <text:p>34</text:p>
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
                     <text:p>2002</text:p>
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
                 <table:table-cell>
-                    <text:p/>
+                    <text:p />
                 </table:table-cell>
             </table:table-row>
         </table:table>
     </office:body>
-</office:document-content>
+</office:document-content>
\ No newline at end of file
diff --git a/src/test/search/resources/.gitignore b/src/test/resources/org/jabref/logic/search/.gitignore
similarity index 83%
rename from src/test/search/resources/.gitignore
rename to src/test/resources/org/jabref/logic/search/.gitignore
index 30aaa5e7abe..a5db2fdd1bd 100644
--- a/src/test/search/resources/.gitignore
+++ b/src/test/resources/org/jabref/logic/search/.gitignore
@@ -1,6 +1,8 @@
 # LaTeX temp files
 
 *.aux
+*.out
+*.log
 
 *.synctex
 *.synctex.gz
diff --git a/src/test/resources/org/jabref/logic/search/README.md b/src/test/resources/org/jabref/logic/search/README.md
new file mode 100644
index 00000000000..f607cfa269f
--- /dev/null
+++ b/src/test/resources/org/jabref/logic/search/README.md
@@ -0,0 +1,11 @@
+# Libraries and PDFs for testing search functionality
+
+This folder contains manual use-cases for testing the search functionality.
+
+It is used at the test code `org.jabref.logic.search.DatabaseSearcherWithBibFilesTest`.
+
+The `.pdf` files are generated from the `.tex` files using `pdflatex`.
+
+Compile all files in cmd.exe:
+
+    for %f in (*.tex) do pdflatex "%f"
diff --git a/src/test/search/resources/empty.bib b/src/test/resources/org/jabref/logic/search/empty.bib
similarity index 100%
rename from src/test/search/resources/empty.bib
rename to src/test/resources/org/jabref/logic/search/empty.bib
diff --git a/src/test/search/resources/minimal-note1.pdf b/src/test/resources/org/jabref/logic/search/minimal-all-upper-case.pdf
similarity index 89%
rename from src/test/search/resources/minimal-note1.pdf
rename to src/test/resources/org/jabref/logic/search/minimal-all-upper-case.pdf
index d6497ba5bbb..764b3807a3f 100644
Binary files a/src/test/search/resources/minimal-note1.pdf and b/src/test/resources/org/jabref/logic/search/minimal-all-upper-case.pdf differ
diff --git a/src/test/search/resources/minimal1.tex b/src/test/resources/org/jabref/logic/search/minimal-all-upper-case.tex
similarity index 53%
rename from src/test/search/resources/minimal1.tex
rename to src/test/resources/org/jabref/logic/search/minimal-all-upper-case.tex
index 991cd40d6b4..53abcbc594d 100644
--- a/src/test/search/resources/minimal1.tex
+++ b/src/test/resources/org/jabref/logic/search/minimal-all-upper-case.tex
@@ -1,9 +1,5 @@
 \documentclass{article}
-\usepackage[utf8]{inputenc}
 \usepackage[english]{babel}
-
 \begin{document}
-
-THIS is a short sentence, comma included.
-
+THIS IS A SHORT SENTENCE, COMMA INCLUDED.
 \end{document}
diff --git a/src/test/search/resources/minimal2.pdf b/src/test/resources/org/jabref/logic/search/minimal-mixed-case.pdf
similarity index 97%
rename from src/test/search/resources/minimal2.pdf
rename to src/test/resources/org/jabref/logic/search/minimal-mixed-case.pdf
index df5641aad1f..1f504143301 100644
Binary files a/src/test/search/resources/minimal2.pdf and b/src/test/resources/org/jabref/logic/search/minimal-mixed-case.pdf differ
diff --git a/src/test/search/resources/minimal2.tex b/src/test/resources/org/jabref/logic/search/minimal-mixed-case.tex
similarity index 80%
rename from src/test/search/resources/minimal2.tex
rename to src/test/resources/org/jabref/logic/search/minimal-mixed-case.tex
index 42b3e319f8d..9c71a665bac 100644
--- a/src/test/search/resources/minimal2.tex
+++ b/src/test/resources/org/jabref/logic/search/minimal-mixed-case.tex
@@ -1,9 +1,5 @@
 \documentclass{article}
-\usepackage[utf8]{inputenc}
 \usepackage[english]{babel}
-
 \begin{document}
-
 ThiS is a short sentence, comma included.
-
 \end{document}
diff --git a/src/test/resources/org/jabref/logic/search/minimal-note-all-upper-case.pdf b/src/test/resources/org/jabref/logic/search/minimal-note-all-upper-case.pdf
new file mode 100644
index 00000000000..6139da156a2
Binary files /dev/null and b/src/test/resources/org/jabref/logic/search/minimal-note-all-upper-case.pdf differ
diff --git a/src/test/search/resources/minimal-note1.tex b/src/test/resources/org/jabref/logic/search/minimal-note-all-upper-case.tex
similarity index 63%
rename from src/test/search/resources/minimal-note1.tex
rename to src/test/resources/org/jabref/logic/search/minimal-note-all-upper-case.tex
index efc1f5dbf49..365acaf8bd0 100644
--- a/src/test/search/resources/minimal-note1.tex
+++ b/src/test/resources/org/jabref/logic/search/minimal-note-all-upper-case.tex
@@ -1,13 +1,7 @@
 \documentclass{article}
-\usepackage[utf8]{inputenc}
 \usepackage[english]{babel}
-
 \usepackage{pdfcomment}
-
 \begin{document}
-
-THIS IS A SHORT SENTENCE, COMMA INCLUDED.
-
+Demonstration of different cases of a comment.
 \pdfcomment{HELLO WORLD}
-
 \end{document}
diff --git a/src/test/resources/org/jabref/logic/search/minimal-note-mixed-case.pdf b/src/test/resources/org/jabref/logic/search/minimal-note-mixed-case.pdf
new file mode 100644
index 00000000000..fc769e68c7e
Binary files /dev/null and b/src/test/resources/org/jabref/logic/search/minimal-note-mixed-case.pdf differ
diff --git a/src/test/search/resources/minimal-note2.tex b/src/test/resources/org/jabref/logic/search/minimal-note-mixed-case.tex
similarity index 63%
rename from src/test/search/resources/minimal-note2.tex
rename to src/test/resources/org/jabref/logic/search/minimal-note-mixed-case.tex
index f78511b658b..34fa22894aa 100644
--- a/src/test/search/resources/minimal-note2.tex
+++ b/src/test/resources/org/jabref/logic/search/minimal-note-mixed-case.tex
@@ -1,13 +1,7 @@
 \documentclass{article}
-\usepackage[utf8]{inputenc}
 \usepackage[english]{babel}
-
 \usepackage{pdfcomment}
-
 \begin{document}
-
-ThiS IS A SHORT SENTENCE, COMMA INCLUDED.
-
+Demonstration of different cases of a comment.
 \pdfcomment{HellO wORLd}
-
 \end{document}
diff --git a/src/test/resources/org/jabref/logic/search/minimal-note-sentence-case.pdf b/src/test/resources/org/jabref/logic/search/minimal-note-sentence-case.pdf
new file mode 100644
index 00000000000..a3d235df053
Binary files /dev/null and b/src/test/resources/org/jabref/logic/search/minimal-note-sentence-case.pdf differ
diff --git a/src/test/search/resources/minimal-note.tex b/src/test/resources/org/jabref/logic/search/minimal-note-sentence-case.tex
similarity index 63%
rename from src/test/search/resources/minimal-note.tex
rename to src/test/resources/org/jabref/logic/search/minimal-note-sentence-case.tex
index c47b1aa8b5d..9042f3b87ef 100644
--- a/src/test/search/resources/minimal-note.tex
+++ b/src/test/resources/org/jabref/logic/search/minimal-note-sentence-case.tex
@@ -1,13 +1,7 @@
 \documentclass{article}
-\usepackage[utf8]{inputenc}
 \usepackage[english]{babel}
-
 \usepackage{pdfcomment}
-
 \begin{document}
-
-This is a short sentence, comma included.
-
+Demonstration of different cases of a comment.
 \pdfcomment{Hello World}
-
 \end{document}
diff --git a/src/test/search/resources/minimal.pdf b/src/test/resources/org/jabref/logic/search/minimal-sentence-case.pdf
similarity index 96%
rename from src/test/search/resources/minimal.pdf
rename to src/test/resources/org/jabref/logic/search/minimal-sentence-case.pdf
index 3658e1118b0..0c9533132a8 100644
Binary files a/src/test/search/resources/minimal.pdf and b/src/test/resources/org/jabref/logic/search/minimal-sentence-case.pdf differ
diff --git a/src/test/search/resources/minimal.tex b/src/test/resources/org/jabref/logic/search/minimal-sentence-case.tex
similarity index 97%
rename from src/test/search/resources/minimal.tex
rename to src/test/resources/org/jabref/logic/search/minimal-sentence-case.tex
index c4d88276dcd..3e636650fa2 100644
--- a/src/test/search/resources/minimal.tex
+++ b/src/test/resources/org/jabref/logic/search/minimal-sentence-case.tex
@@ -1,10 +1,6 @@
 \documentclass{article}
 \usepackage[utf8]{inputenc}
 \usepackage[english]{babel}
-
-
 \begin{document}
-
 This is a short sentence, comma included.
-
 \end{document}
diff --git a/src/test/resources/org/jabref/logic/search/test-library-title-casing.bib b/src/test/resources/org/jabref/logic/search/test-library-title-casing.bib
new file mode 100644
index 00000000000..ef3f36ebe9f
--- /dev/null
+++ b/src/test/resources/org/jabref/logic/search/test-library-title-casing.bib
@@ -0,0 +1,13 @@
+@Misc{title-sentence-cased,
+  title  = {Title Sentence Cased},
+}
+
+@Misc{title-mixed-cased,
+  title  = {TiTle MiXed CaSed},
+}
+
+@Misc{title-upper-cased,
+  title  = {TITLE UPPER CASED},
+}
+
+@Comment{jabref-meta: databaseType:bibtex;}
diff --git a/src/test/resources/org/jabref/logic/search/test-library-with-attached-files.bib b/src/test/resources/org/jabref/logic/search/test-library-with-attached-files.bib
new file mode 100644
index 00000000000..d33d004c4e7
--- /dev/null
+++ b/src/test/resources/org/jabref/logic/search/test-library-with-attached-files.bib
@@ -0,0 +1,27 @@
+@Misc{minimal-sentence-case,
+  file = {:minimal-sentence-case.pdf:PDF},
+}
+
+@Misc{minimal-all-upper-case,
+  file = {:minimal-all-upper-case.pdf:PDF},
+}
+
+@Misc{minimal-mixed-case,
+  file = {:minimal-mixed-case.pdf:PDF},
+}
+
+@Misc{minimal-note-sentence-case,
+  file = {:minimal-note-sentence-case.pdf:PDF},
+}
+
+@Misc{minimal-note-all-upper-case,
+  file = {:minimal-note-all-upper-case.pdf:PDF},
+}
+
+@Misc{minimal-note-mixed-case,
+  file = {:minimal-note-mixed-case.pdf:PDF},
+}
+
+@Comment{jabref-meta: databaseType:bibtex;}
+
+@Comment{jabref-meta: fileDirectory:.;}
diff --git a/src/test/resources/testbib/Chocolate.bib b/src/test/resources/testbib/Chocolate.bib
new file mode 100644
index 00000000000..5fbb0f7af03
--- /dev/null
+++ b/src/test/resources/testbib/Chocolate.bib
@@ -0,0 +1,224 @@
+@Article{Corti_2009,
+  author       = {Corti, Roberto and Flammer, Andreas J. and Hollenberg, Norman K. and Lüscher, Thomas F.},
+  date         = {2009-03},
+  journaltitle = {Circulation},
+  title        = {Cocoa and Cardiovascular Health},
+  doi          = {10.1161/circulationaha.108.827022},
+  issn         = {1524-4539},
+  number       = {10},
+  pages        = {1433--1441},
+  volume       = {119},
+  file         = {:DownloadedViaJabRef/Corti et al. (2009-03) Cocoa Cardiovascular Health.pdf:PDF},
+  publisher    = {Ovid Technologies (Wolters Kluwer Health)},
+}
+
+@Article{Cooper_2007,
+  author       = {Cooper, Karen A. and Donovan, Jennifer L. and Waterhouse, Andrew L. and Williamson, Gary},
+  date         = {2007-08},
+  journaltitle = {British Journal of Nutrition},
+  title        = {Cocoa and health: a decade of research},
+  doi          = {10.1017/s0007114507795296},
+  issn         = {1475-2662},
+  number       = {1},
+  pages        = {1--11},
+  volume       = {99},
+  file         = {:DownloadedViaJabRef/Cooper et al. (2007-08) Cocoa health_ decade.pdf:PDF},
+  publisher    = {Cambridge University Press (CUP)},
+}
+
+@Article{Ding_2006,
+  author       = {Ding, Eric L and Hutfless, Susan M and Ding, Xin and Girotra, Saket},
+  date         = {2006-01},
+  journaltitle = {Nutrition &amp; Metabolism},
+  title        = {Chocolate and Prevention of Cardiovascular Disease: A Systematic Review},
+  doi          = {10.1186/1743-7075-3-2},
+  issn         = {1743-7075},
+  number       = {1},
+  volume       = {3},
+  file         = {:DownloadedViaJabRef/Ding et al. (2006-01) Chocolate Prevention Cardiovascular.pdf:PDF},
+  publisher    = {Springer Science and Business Media LLC},
+}
+
+@Article{Keen_2001,
+  author       = {Keen, Carl L.},
+  date         = {2001-10},
+  journaltitle = {Journal of the American College of Nutrition},
+  title        = {Chocolate: Food as Medicine/Medicine as Food},
+  doi          = {10.1080/07315724.2001.10719181},
+  issn         = {1541-1087},
+  number       = {sup5},
+  pages        = {436S--439S},
+  volume       = {20},
+  publisher    = {Informa UK Limited},
+}
+
+@Article{Katz_2011,
+  author       = {Katz, David L. and Doughty, Kim and Ali, Ather},
+  date         = {2011-11},
+  journaltitle = {Antioxidants &amp; Redox Signaling},
+  title        = {Cocoa and Chocolate in Human Health and Disease},
+  doi          = {10.1089/ars.2010.3697},
+  issn         = {1557-7716},
+  number       = {10},
+  pages        = {2779--2811},
+  volume       = {15},
+  file         = {:DownloadedViaJabRef/Katz et al. (2011-11) Cocoa Chocolate Human.pdf:PDF},
+  publisher    = {Mary Ann Liebert Inc},
+  readstatus   = {skimmed},
+}
+
+@Article{Parker_2006,
+  author       = {Parker, Gordon and Parker, Isabella and Brotchie, Heather},
+  date         = {2006-06},
+  journaltitle = {Journal of Affective Disorders},
+  title        = {Mood state effects of chocolate},
+  doi          = {10.1016/j.jad.2006.02.007},
+  issn         = {0165-0327},
+  number       = {2–3},
+  pages        = {149--159},
+  volume       = {92},
+  groups       = {Used},
+  publisher    = {Elsevier BV},
+  readstatus   = {read},
+}
+
+@Article{Scholey_2013,
+  author       = {Scholey, Andrew and Owen, Lauren},
+  date         = {2013-10},
+  journaltitle = {Nutrition Reviews},
+  title        = {Effects of chocolate on cognitive function and mood: a systematic review},
+  doi          = {10.1111/nure.12065},
+  issn         = {0029-6643},
+  number       = {10},
+  pages        = {665--681},
+  volume       = {71},
+  file         = {:Used/Scholey & Owen (2013-10) Effects chocolate cognitive.pdf:PDF},
+  groups       = {Used},
+  publisher    = {Oxford University Press (OUP)},
+  readstatus   = {read},
+}
+
+@Article{Tan_2021,
+  author       = {Tan, Terence Yew Chin and Lim, Xin Yi and Yeo, Julie Hsiao Hui and Lee, Shaun Wen Huey and Lai, Nai Ming},
+  date         = {2021-08},
+  journaltitle = {Nutrients},
+  title        = {The Health Effects of Chocolate and Cocoa: A Systematic Review},
+  doi          = {10.3390/nu13092909},
+  issn         = {2072-6643},
+  number       = {9},
+  pages        = {2909},
+  volume       = {13},
+  file         = {:DownloadedViaJabRef/Tan et al. (2021-08) Health Effects Chocolate.pdf:PDF},
+  publisher    = {MDPI AG},
+  readstatus   = {skimmed},
+}
+
+@Article{Macht_2007,
+  author       = {Macht, Michael and Mueller, Jochen},
+  date         = {2007-11},
+  journaltitle = {Appetite},
+  title        = {Immediate effects of chocolate on experimentally induced mood states},
+  doi          = {10.1016/j.appet.2007.05.004},
+  issn         = {0195-6663},
+  number       = {3},
+  pages        = {667--674},
+  volume       = {49},
+  groups       = {Used},
+  publisher    = {Elsevier BV},
+  readstatus   = {read},
+}
+
+@Article{Tokede_2011,
+  author       = {Tokede, O A and Gaziano, J M and Djoussé, L},
+  date         = {2011-05},
+  journaltitle = {European Journal of Clinical Nutrition},
+  title        = {Effects of cocoa products/dark chocolate on serum lipids: a meta-analysis},
+  doi          = {10.1038/ejcn.2011.64},
+  issn         = {1476-5640},
+  number       = {8},
+  pages        = {879--886},
+  volume       = {65},
+  publisher    = {Springer Science and Business Media LLC},
+}
+
+@Article{Garcia_2018,
+  author       = {Garcia, Jose P and Santana, Adrian and Baruqui, Diego Lugo and Suraci, Nicholas},
+  date         = {2018-12},
+  journaltitle = {Reviews in Cardiovascular Medicine},
+  title        = {The Cardiovascular effects of chocolate.},
+  doi          = {10.31083/j.rcm.2018.04.3187},
+  issn         = {2153-8174},
+  number       = {4},
+  volume       = {19},
+  publisher    = {IMR Press},
+}
+
+@Article{Hooper_2012,
+  author       = {Hooper, Lee and Kay, Colin and Abdelhamid, Asmaa and Kroon, Paul A and Cohn, Jeffrey S and Rimm, Eric B and Cassidy, Aedín},
+  date         = {2012-03},
+  journaltitle = {The American Journal of Clinical Nutrition},
+  title        = {Effects of chocolate, cocoa, and flavan-3-ols on cardiovascular health: a systematic review and meta-analysis of randomized trials},
+  doi          = {10.3945/ajcn.111.023457},
+  issn         = {0002-9165},
+  number       = {3},
+  pages        = {740--751},
+  volume       = {95},
+  publisher    = {Elsevier BV},
+  readstatus   = {skimmed},
+}
+
+@Article{Di_Renzo_2012,
+  author       = {Di Renzo, Gian Carlo and Brillo, Eleonora and Romanelli, Maila and Porcaro, Giuseppina and Capanna, Federica and Kanninen, Tomi T and Gerli, Sandro and Clerici, Graziano},
+  date         = {2012-06},
+  journaltitle = {The Journal of Maternal-Fetal &amp; Neonatal Medicine},
+  title        = {Potential effects of chocolate on human pregnancy: a randomized controlled trial},
+  doi          = {10.3109/14767058.2012.683085},
+  issn         = {1476-4954},
+  number       = {10},
+  pages        = {1860--1867},
+  volume       = {25},
+  groups       = {Used},
+  publisher    = {Informa UK Limited},
+  readstatus   = {read},
+}
+
+@Article{Richard_2017,
+  author       = {Richard, Anna and Meule, Adrian and Friese, Malte and Blechert, Jens},
+  date         = {2017-09},
+  journaltitle = {Frontiers in Psychology},
+  title        = {Effects of Chocolate Deprivation on Implicit and Explicit Evaluation of Chocolate in High and Low Trait Chocolate Cravers},
+  doi          = {10.3389/fpsyg.2017.01591},
+  issn         = {1664-1078},
+  volume       = {8},
+  groups       = {Used},
+  publisher    = {Frontiers Media SA},
+  readstatus   = {read},
+}
+
+@Article{Fulton_1969,
+  author       = {Fulton, James E., Jr. and Plewig, Gerd and Kligman, Albert M.},
+  date         = {1969-12},
+  journaltitle = {JAMA: The Journal of the American Medical Association},
+  title        = {{Effect of Chocolate on Acne Vulgaris}},
+  doi          = {10.1001/jama.1969.03160370055011},
+  eprint       = {https://jamanetwork.com/journals/jama/articlepdf/350738/jama\_210\_11\_011.pdf},
+  issn         = {0098-7484},
+  number       = {11},
+  pages        = {2071-2074},
+  url          = {https://doi.org/10.1001/jama.1969.03160370055011},
+  volume       = {210},
+  publisher    = {American Medical Association (AMA)},
+}
+
+@Comment{jabref-meta: databaseType:biblatex;}
+
+@Comment{jabref-meta: grouping:
+0 AllEntriesGroup:;
+1 SearchGroup:Entries without a group\;0\;groups != .+\;0\;1\;1\;\;\;\;;
+1 SearchGroup:Entries without a linked file\;0\;file != .+\;0\;1\;1\;\;\;\;;
+1 StaticGroup:Paywalled\;0\;1\;\;\;\;;
+1 SearchGroup:To read\;0\;groups != .+ and readstatus != .+\;0\;1\;1\;0x008080ff\;\;\;;
+1 KeywordGroup:Skimmed\;0\;readstatus\;skimmed\;0\;0\;1\;0xffff00ff\;\;\;;
+1 KeywordGroup:Read\;0\;readstatus\;read\;0\;0\;0\;0x00ff00ff\;\;\;;
+1 StaticGroup:Used\;0\;1\;0x0000ffff\;\;\;;
+}
diff --git a/src/test/resources/testbib/jabref-authors.bib b/src/test/resources/testbib/jabref-authors.bib
index 118df45c5b5..50119bc6454 100644
--- a/src/test/resources/testbib/jabref-authors.bib
+++ b/src/test/resources/testbib/jabref-authors.bib
@@ -1821,7 +1821,7 @@ @Article{BinzBreitenbuecherKoppEtAl2014a
   year      = {2014},
 }
 
-@Article{,
+@Article{Wettinger2014,
   author = {Johannes Wettinger and Tobias Binz and Uwe Breitenb{\"{u}}cher},
   title  = {Streamlining Cloud Management Incomplete},
   doi    = {10.4018/978-1-4666-6539-2.ch106},
@@ -3016,6 +3016,19 @@ @InProceedings{Kopp2018
   keywords  = {ADR, MADR, architecture decision records, architectural decision records, Nygard},
 }
 
+@Article{jabref,
+  author  = {Oliver Kopp and Carl Christian Snethlage and Christoph Schwentker},
+  title   = {JabRef: BibTeX-based literature management software},
+  doi     = {10.47397/tb/44-3/tb138kopp-jabref},
+  issn    = {0896-3207},
+  issue   = {138},
+  number  = {3},
+  pages   = {441--447},
+  volume  = {44},
+  journal = {TUGboat},
+  year    = {2023},
+}
+
 @Comment{jabref-meta: databaseType:biblatex;}
 
 @Comment{jabref-meta: grouping:
diff --git a/src/test/search/README.md b/src/test/search/README.md
deleted file mode 100644
index efb1db830db..00000000000
--- a/src/test/search/README.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Folder `src\test\search`
-
-This folder contains manual use-cases for testing the search functionality. 
-It contains the folder `src\test\search\resources` with material used in the use-cases.
-
-## Related Issues and Pull Requests
-
-[Pull Request #8963](https://github.com/JabRef/jabref/pull/8963): This PR is about Lucene which
-is used for the search functionality. 
diff --git a/src/test/search/resources/minimal-note.pdf b/src/test/search/resources/minimal-note.pdf
deleted file mode 100644
index d7b6f754cfe..00000000000
Binary files a/src/test/search/resources/minimal-note.pdf and /dev/null differ
diff --git a/src/test/search/resources/minimal-note2.pdf b/src/test/search/resources/minimal-note2.pdf
deleted file mode 100644
index 8b00e197a10..00000000000
Binary files a/src/test/search/resources/minimal-note2.pdf and /dev/null differ
diff --git a/src/test/search/resources/minimal1.pdf b/src/test/search/resources/minimal1.pdf
deleted file mode 100644
index 396acb36d16..00000000000
Binary files a/src/test/search/resources/minimal1.pdf and /dev/null differ
diff --git a/src/test/search/resources/test-library-A.bib b/src/test/search/resources/test-library-A.bib
deleted file mode 100644
index 267ae48d767..00000000000
--- a/src/test/search/resources/test-library-A.bib
+++ /dev/null
@@ -1,26 +0,0 @@
-@Misc{entry1,
-  author = {Test},
-  title  = {cASe},
-}
-
-@Misc{entry2,
-  author = {test},
-  title  = {casE},
-}
-
-@Misc{entry3,
-  author = {tESt},
-  title  = {Case},
-}
-
-@Misc{entry4,
-  author = {tesT},
-  title  = {CASE},
-}
-
-@Misc{entry5,
-  author = {TEST},
-  title  = {case},
-}
-
-@Comment{jabref-meta: databaseType:bibtex;}
diff --git a/src/test/search/resources/test-library-B.bib b/src/test/search/resources/test-library-B.bib
deleted file mode 100644
index ff076a5a52c..00000000000
--- a/src/test/search/resources/test-library-B.bib
+++ /dev/null
@@ -1,21 +0,0 @@
-@Misc{entry1,
-  author = {Test},
-  title  = {Case},
-}
-
-@Misc{entry2,
-  author = {User},
-  title  = {case},
-}
-
-@Misc{entry3,
-  author = {test},
-  title  = {text},
-}
-
-@Misc{entry4,
-  author = {Special},
-  title  = {192? title.},
-}
-
-@Comment{jabref-meta: databaseType:bibtex;}
diff --git a/src/test/search/resources/test-library-C.bib b/src/test/search/resources/test-library-C.bib
deleted file mode 100644
index 02f08f7b632..00000000000
--- a/src/test/search/resources/test-library-C.bib
+++ /dev/null
@@ -1,34 +0,0 @@
-@Misc{minimal1,
-  file = {:minimal.pdf:PDF},
-}
-
-@Misc{minimal2,
-  file = {:minimal1.pdf:PDF},
-}
-
-@Misc{minimal3,
-  file = {:minimal2.pdf:PDF},
-}
-
-@Misc{minimal-note1,
-  file = {:minimal-note.pdf:PDF},
-}
-
-@Misc{minimal-note2,
-  file = {:minimal-note1.pdf:PDF},
-}
-
-@Misc{minimal-note3,
-  file = {:minimal-note2.pdf:PDF},
-}
-
-@Comment{jabref-meta: databaseType:bibtex;}
-
-@Comment{jabref-meta: fileDirectory:.;}
-
-@Comment{jabref-meta: saveActions:disabled;
-all-text-fields[identity]
-date[normalize_date]
-month[normalize_month]
-pages[normalize_page_numbers]
-;}
diff --git a/src/test/search/resources/test-library-D.bib b/src/test/search/resources/test-library-D.bib
deleted file mode 100644
index 6d78ef8dd5d..00000000000
--- a/src/test/search/resources/test-library-D.bib
+++ /dev/null
@@ -1,55 +0,0 @@
-@Misc{entry1,
-  author = {Test},
-  title  = {Case},
-  groups = {A},
-}
-
-@Misc{entry2,
-  author = {TEST},
-  title  = {CASE},
-  groups = {A},
-}
-
-@Misc{entry3,
-  author = {Hello},
-  title  = {World},
-  groups = {A},
-}
-
-@Misc{entry4,
-  author = {HELLO},
-  title  = {WORLD},
-  groups = {A},
-}
-
-@Misc{entry5,
-  author = {tesT},
-  title  = {casE},
-  groups = {B},
-}
-
-@Misc{entry6,
-  author = {test},
-  title  = {case},
-  groups = {B},
-}
-
-@Misc{entry7,
-  author = {hellO},
-  title  = {worlD},
-  groups = {B},
-}
-
-@Misc{entry8,
-  author = {hello},
-  title  = {world},
-  groups = {B},
-}
-
-@Comment{jabref-meta: databaseType:bibtex;}
-
-@Comment{jabref-meta: grouping:
-0 AllEntriesGroup:;
-1 StaticGroup:A\;0\;0\;0x8a8a8aff\;\;\;;
-1 StaticGroup:B\;0\;1\;0x8a8a8aff\;\;\;;
-}