diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index a28be65ba1f..f901e1356d2 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -13,6 +13,7 @@ body:
       label: JabRef version
       options:
         - "5.15 (latest release)"
+        - "6.0-alpha"
         - 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/deployment-arm64.yml b/.github/workflows/deployment-arm64.yml
index 8b26386157d..02071792b73 100644
--- a/.github/workflows/deployment-arm64.yml
+++ b/.github/workflows/deployment-arm64.yml
@@ -69,12 +69,12 @@ jobs:
           submodules: 'true'
           show-progress: 'false'
       - name: Install GitVersion
-        uses: gittools/actions/gitversion/setup@v3.0.3
+        uses: gittools/actions/gitversion/setup@v3.1.1
         with:
           versionSpec: "5.x"
       - name: Run GitVersion
         id: gitversion
-        uses: gittools/actions/gitversion/execute@v3.0.3
+        uses: gittools/actions/gitversion/execute@v3.1.1
       - name: Setup JDK
         uses: actions/setup-java@v4
         with:
diff --git a/.github/workflows/deployment-jdk-ea.yml b/.github/workflows/deployment-jdk-ea.yml
index 799b6c569c7..27c8fd2a65d 100644
--- a/.github/workflows/deployment-jdk-ea.yml
+++ b/.github/workflows/deployment-jdk-ea.yml
@@ -85,12 +85,12 @@ jobs:
           packages: pigz
           version: 1.0
       - name: Install GitVersion
-        uses: gittools/actions/gitversion/setup@v3.0.3
+        uses: gittools/actions/gitversion/setup@v3.1.1
         with:
           versionSpec: "5.x"
       - name: Run GitVersion
         id: gitversion
-        uses: gittools/actions/gitversion/execute@v3.0.3
+        uses: gittools/actions/gitversion/execute@v3.1.1
 
       # JDK
       - name: 'Set up JDK ${{ matrix.jdk }}'
diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml
index b0411f93902..ded05f696dc 100644
--- a/.github/workflows/deployment.yml
+++ b/.github/workflows/deployment.yml
@@ -81,12 +81,12 @@ jobs:
           packages: pigz
           version: 1.0
       - name: Install GitVersion
-        uses: gittools/actions/gitversion/setup@v3.0.3
+        uses: gittools/actions/gitversion/setup@v3.1.1
         with:
           versionSpec: "5.x"
       - name: Run GitVersion
         id: gitversion
-        uses: gittools/actions/gitversion/execute@v3.0.3
+        uses: gittools/actions/gitversion/execute@v3.1.1
       - name: Setup JDK
         uses: actions/setup-java@v4
         with:
diff --git a/.github/workflows/gource.yml b/.github/workflows/gource.yml
index 3bccc1f3d14..4fd7a7053ce 100644
--- a/.github/workflows/gource.yml
+++ b/.github/workflows/gource.yml
@@ -26,7 +26,7 @@ jobs:
       - name: 'Development history of current build'
         uses: BoundfoxStudios/action-gource@v2
         with:
-          gource_title: 'JabRef v5.16 (in development) | more information at contribute.jabref.org'
+          gource_title: 'JabRef v6.0 (in development) | more information at contribute.jabref.org'
           logo_url: 'https://www.jabref.org/img/JabRef-icon-256.png'
           avatars_auto_fetch: true
           # 5s * 365 / 4 = 7.5min
@@ -36,7 +36,7 @@ jobs:
       - name: 'Store video'
         run: |
           mkdir gource-videos
-          mv ./gource/gource.mp4 ./gource-videos/jabref-v5.16-dev.mp4
+          mv ./gource/gource.mp4 ./gource-videos/jabref-v6.0-dev.mp4
       - name: 'Development history of last release'
         uses: BoundfoxStudios/action-gource@v2
         with:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 48482f765e9..b00ed925c31 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,18 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv
 
 ### Added
 
+### Changed
+
+### Fixed
+
+- We fixed an issue where a bib file with UFF-8 charset was wrongly loaded with a different charset [forum#5369](https://discourse.jabref.org/t/jabref-5-15-opens-bib-files-with-shift-jis-encoding-instead-of-utf-8/5369/)
+
+### Removed
+
+## [6.0-alpha] – 2024-12-23
+
+### Added
+
 - We added a Markdown export layout. [#12220](https://github.com/JabRef/jabref/pull/12220)
 - We added a "view as BibTeX" option before importing an entry from the citation relation tab. [#11826](https://github.com/JabRef/jabref/issues/11826)
 - We added support finding LaTeX-encoded special characters based on plain Unicode and vice versa. [#11542](https://github.com/JabRef/jabref/pull/11542)
@@ -82,6 +94,7 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv
 - The CitationKey column is now a default shown column for the entry table. [#10510](https://github.com/JabRef/jabref/issues/10510)
 - We disabled the actions "Open Terminal here" and "Reveal in file explorer" for unsaved libraries. [#11920](https://github.com/JabRef/jabref/issues/11920)
 - JabRef now opens the corresponding directory in the library properties when "Browse" is clicked. [#12223](https://github.com/JabRef/jabref/pull/12223)
+- We changed the icon for macOS to be more consistent with Apple's Guidelines [#8443](https://github.com/JabRef/jabref/issues/8443)
 
 ### Fixed
 
@@ -126,6 +139,8 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv
 - We fixed an issue where identifier paste couldn't work with Unicode REPLACEMENT CHARACTER. [#11986](https://github.com/JabRef/jabref/issues/11986)
 - We fixed an issue when click on entry at "Check Integrity" wasn't properly focusing the entry and field. [#11997](https://github.com/JabRef/jabref/issues/11997)
 - We fixed an issue with the ui not scaling when changing the font size [#11219](https://github.com/JabRef/jabref/issues/11219)
+- We fixed an issue where a custom application for external file types would not be saved [#112311](https://github.com/JabRef/jabref/issues/12311)
+- We fixed an issue where a file that no longer exists could not be deleted from an entry using keyboard shortcut [#9731](https://github.com/JabRef/jabref/issues/9731)
 
 ### Removed
 
@@ -133,12 +148,6 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv
 - We removed support for importing using the SilverPlatterImporter (`Record INSPEC`). [#11576](https://github.com/JabRef/jabref/pull/11576)
 - We removed support for automatically generating file links using the CLI (`--automaticallySetFileLinks`).
 
-
-
-
-
-
-
 ## [5.15] – 2024-07-10
 
 ### Added
@@ -1485,7 +1494,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.15...HEAD
+[Unreleased]: https://github.com/JabRef/jabref/compare/v6.0-alpha...HEAD
+[6.0-alpha]: https://github.com/JabRef/jabref/compare/v5.15...v6.0-alpha
 [5.15]: https://github.com/JabRef/jabref/compare/v5.14...v5.15
 [5.14]: https://github.com/JabRef/jabref/compare/v5.13...v5.14
 [5.13]: https://github.com/JabRef/jabref/compare/v5.12...v5.13
diff --git a/GitVersion.yml b/GitVersion.yml
index 11c5cf1d81b..02cafeab994 100644
--- a/GitVersion.yml
+++ b/GitVersion.yml
@@ -5,5 +5,5 @@ mode: ContinuousDeployment
 branches:
   main:
     regex: ^main
-    tag: ''
-    pre-release-weight: 0  # 0 after stable release, 15000 before alpha release, 30000 before beta release, 50000 before stable release
+    tag: 'alpha'
+    pre-release-weight: 15000 # 0 after stable release, 15000 before alpha release, 30000 before beta release, 50000 before stable release
diff --git a/build.gradle b/build.gradle
index dee976fee1a..5e228b7db91 100644
--- a/build.gradle
+++ b/build.gradle
@@ -29,7 +29,7 @@ plugins {
 
     id 'idea'
 
-    id 'org.openrewrite.rewrite' version '6.27.2'
+    id 'org.openrewrite.rewrite' version '6.29.0'
 
     id "org.itsallcode.openfasttrace" version "3.0.1"
 }
@@ -172,7 +172,7 @@ dependencies {
         exclude group: 'commons-logging'
     }
 
-    def luceneVersion = "10.0.0"
+    def luceneVersion = "10.1.0"
     implementation "org.apache.lucene:lucene-core:$luceneVersion"
     implementation "org.apache.lucene:lucene-queryparser:$luceneVersion"
     implementation "org.apache.lucene:lucene-queries:$luceneVersion"
@@ -181,7 +181,7 @@ dependencies {
 
     implementation group: 'org.apache.commons', name: 'commons-csv', version: '1.12.0'
     implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.17.0'
-    implementation group: 'org.apache.commons', name: 'commons-text', version: '1.12.0'
+    implementation group: 'org.apache.commons', name: 'commons-text', version: '1.13.0'
     implementation 'commons-logging:commons-logging:1.3.4'
     implementation 'com.h2database:h2-mvstore:2.3.232'
 
@@ -204,10 +204,10 @@ dependencies {
     antlr4 'org.antlr:antlr4:4.13.2'
     implementation 'org.antlr:antlr4-runtime:4.13.2'
 
-    implementation group: 'org.eclipse.jgit', name: 'org.eclipse.jgit', version: '7.0.0.202409031743-r'
+    implementation group: 'org.eclipse.jgit', name: 'org.eclipse.jgit', version: '7.1.0.202411261347-r'
 
-    implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: '2.18.1'
-    implementation group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: '2.18.1'
+    implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: '2.18.2'
+    implementation group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: '2.18.2'
 
     implementation 'com.fasterxml:aalto-xml:1.3.3'
 
@@ -243,8 +243,8 @@ dependencies {
         exclude group: 'org.openjfx'
     }
     implementation 'org.fxmisc.flowless:flowless:0.7.3'
-    implementation 'org.fxmisc.richtext:richtextfx:0.11.3'
-    implementation (group: 'com.dlsc.gemsfx', name: 'gemsfx', version: '2.64.0') {
+    implementation 'org.fxmisc.richtext:richtextfx:0.11.4'
+    implementation (group: 'com.dlsc.gemsfx', name: 'gemsfx', version: '2.80.0') {
         exclude module: 'javax.inject' // Split package, use only jakarta.inject
         exclude module: 'commons-lang3'
         exclude group: 'org.apache.commons.validator'
@@ -265,7 +265,7 @@ dependencies {
     implementation 'org.controlsfx:controlsfx:11.2.1'
 
     // region HTTP clients
-    implementation 'org.jsoup:jsoup:1.18.1'
+    implementation 'org.jsoup:jsoup:1.18.3'
     implementation 'com.konghq:unirest-java-core:4.4.5'
     implementation 'com.konghq:unirest-modules-gson:4.4.5'
     implementation 'org.apache.httpcomponents.client5:httpclient5:5.4.1'
@@ -279,7 +279,7 @@ dependencies {
     // route all requests to java.util.logging to SLF4J (which in turn routes to tinylog)
     implementation 'org.slf4j:jul-to-slf4j:2.0.16'
     // route all requests to log4j to SLF4J
-    implementation 'org.apache.logging.log4j:log4j-to-slf4j:2.24.2'
+    implementation 'org.apache.logging.log4j:log4j-to-slf4j:2.24.3'
 
     implementation('de.undercouch:citeproc-java:3.1.0') {
         exclude group: 'org.antlr'
@@ -335,7 +335,7 @@ dependencies {
     implementation 'org.yaml:snakeyaml:2.3'
 
     // region AI
-    implementation 'dev.langchain4j:langchain4j:0.36.0'
+    implementation 'dev.langchain4j:langchain4j:0.36.2'
     // Even though we use jvm-openai for LLM connection, we still need this package for tokenization.
     implementation('dev.langchain4j:langchain4j-open-ai:0.36.2') {
         exclude group: 'com.squareup.okhttp3'
@@ -358,7 +358,7 @@ dependencies {
     }
 
     implementation 'org.apache.velocity:velocity-engine-core:2.4.1'
-    implementation platform('ai.djl:bom:0.30.0')
+    implementation platform('ai.djl:bom:0.31.1')
     implementation 'ai.djl:api'
     implementation 'ai.djl.huggingface:tokenizers'
     implementation 'ai.djl.pytorch:pytorch-model-zoo'
@@ -380,8 +380,8 @@ dependencies {
     implementation enforcedPlatform('io.zonky.test.postgres:embedded-postgres-binaries-bom:17.2.0')
 
     testImplementation 'io.github.classgraph:classgraph:4.8.179'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.11.3'
-    testImplementation 'org.junit.platform:junit-platform-launcher:1.11.3'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.11.4'
+    testImplementation 'org.junit.platform:junit-platform-launcher:1.11.4'
 
     testImplementation 'org.mockito:mockito-core:5.14.2'
     testImplementation 'org.xmlunit:xmlunit-core:2.10.0'
@@ -394,9 +394,9 @@ dependencies {
     testImplementation "com.github.javaparser:javaparser-symbol-solver-core:3.26.2"
 
     // recommended by https://github.com/wiremock/wiremock/issues/2149#issuecomment-1835775954
-    testImplementation 'org.wiremock:wiremock-standalone:3.9.2'
+    testImplementation 'org.wiremock:wiremock-standalone:3.10.0'
 
-    checkstyle 'com.puppycrawl.tools:checkstyle:10.20.1'
+    checkstyle 'com.puppycrawl.tools:checkstyle:10.21.1'
     // xjc needs the runtime as well for the ant task, otherwise it fails
     xjc group: 'org.glassfish.jaxb', name: 'jaxb-xjc', version: '3.0.2'
     xjc group: 'org.glassfish.jaxb', name: 'jaxb-runtime', version: '3.0.2'
@@ -594,7 +594,8 @@ javadoc {
         version = false
         author = false
         addMultilineStringsOption("-add-exports").setValue([
-            'javafx.controls/com.sun.javafx.scene.control=org.jabref'
+            'javafx.controls/com.sun.javafx.scene.control=org.jabref',
+            'org.controlsfx.controls/impl.org.controlsfx.skin=org.jabref'
         ])
     }
 }
diff --git a/buildres/abbrv.jabref.org b/buildres/abbrv.jabref.org
index 0fdf99147a8..78e1b08f044 160000
--- a/buildres/abbrv.jabref.org
+++ b/buildres/abbrv.jabref.org
@@ -1 +1 @@
-Subproject commit 0fdf99147a8a5fc8ae7ccd79ad4e0029e736e4a3
+Subproject commit 78e1b08f04405c376ae65488a1b268ee938750ce
diff --git a/buildres/mac/Jabref-volume.icns b/buildres/mac/Jabref-volume.icns
old mode 100755
new mode 100644
index cf7a8d59d26..e231e8d3bad
Binary files a/buildres/mac/Jabref-volume.icns and b/buildres/mac/Jabref-volume.icns differ
diff --git a/buildres/mac/launcher.icns b/buildres/mac/launcher.icns
old mode 100755
new mode 100644
index cf7a8d59d26..e231e8d3bad
Binary files a/buildres/mac/launcher.icns and b/buildres/mac/launcher.icns differ
diff --git a/external-libraries.md b/external-libraries.md
index 257aea187cb..3ea92892836 100644
--- a/external-libraries.md
+++ b/external-libraries.md
@@ -218,6 +218,27 @@ URL:     https://repo1.maven.org/maven2/com/oracle/ojdbc/ojdbc10/19.3.0.0/ojdbc1
 License: Oracle Free Use Terms and Conditions (FUTC)
 ```
 
+```yaml
+Id:      com.squareup.okhttp3:okhttp
+Project: OkHttp
+URL:     https://github.com/square/okhttp
+License: Apache-2.0
+```
+
+```yaml
+Id:      com.squareup.okio:okio
+Project: Okio
+URL:     https://github.com/square/okio
+License: Apache-2.0
+```
+
+```yaml
+Id:      com.squareup.retrofit2:retrofit
+Project: Retrofit
+URL:     https://github.com/square/retrofit
+License: Apache-2.0
+```
+
 ```yaml
 Id:      com.sun.istack:istack-commons-runtime
 Project: iStack Common Utility Code
@@ -335,6 +356,20 @@ URL:     http://michel-kraemer.github.io/citeproc-java/
 Licence: Apache-2.0
 ```
 
+```yaml
+Id:      dev.ai4j:openai4j
+Project: Java Client For OpenAI (ChatGPT)
+URL:     https://github.com/ai-for-java/openai4j
+Licence: Apache-2.0
+```
+
+```yaml
+Id:      dev.langchain4j:langchain4j
+Project: LangChain4j
+URL:     https://github.com/langchain4j/langchain4j/
+Licence: Apache-2.0
+```
+
 ```yaml
 Id:      eu.lestard:doc-annotations
 Project: doc annotations
@@ -363,6 +398,20 @@ URL:     https://github.com/java-diff-utils/java-diff-utils
 License: Apache-2.0
 ```
 
+```yaml
+Id:      io.github.stefanbratanov:jvm-openai
+Project: JVM OpenAI
+URL:     https://github.com/StefanBratanov/jvm-openai
+Licence: Apache-2.0
+```
+
+```yaml
+Id:      io.github.thibaultmeyer:cuid
+Project: CUID Java
+URL:     https://github.com/thibaultmeyer/cuid-java
+Licence: MIT
+```
+
 ```yaml
 Id:      io.zonky.test:embedded-postgres
 Project: embedded-postgres
@@ -461,6 +510,13 @@ URL:     https://lucene.apache.org/
 License: Apache-2.0
 ```
 
+```yaml
+Id:      org.apache.opennlp:opennlp-tools
+Project: Apache OpenNLP
+URL:     https://opennlp.apache.org/
+License: Apache-2.0
+```
+
 ```yaml
 Id:      org.apache.pdfbox:fontbox
 Project: Apache PDFBox
@@ -483,9 +539,9 @@ License: Apache-2.0
 ```
 
 ```yaml
-Id:      org.apiguardian:apiguardian-api
-Project: @API Guardian
-URL:     https://github.com/apiguardian-team/apiguardian
+Id:      org.apache.velocity:velocity-engine-core
+Project: Apache Velocity
+URL:     https://velocity.apache.org/
 License: Apache-2.0
 ```
 
@@ -562,6 +618,13 @@ URL:     https://github.com/JabRef/EasyBind
 License: BSD-2-Clause
 ```
 
+```yaml
+Id:      org.jetbrains.kotlin:kotlin-stdlib
+Project: Kotlin Standard Library
+URL:     https://kotlinlang.org/
+License: Apache-2.0
+```
+
 ```yaml
 Id:      org.jooq:jool
 Project: JOOλ
@@ -726,15 +789,15 @@ ai.djl.pytorch:pytorch-model-zoo:0.30.0
 ai.djl:api:0.30.0
 ai.djl:bom:0.30.0
 at.favre.lib:hkdf:1.1.0
-com.dlsc.gemsfx:gemsfx:2.48.0
+com.dlsc.gemsfx:gemsfx:2.80.0
 com.dlsc.pickerfx:pickerfx:1.3.1
 com.dlsc.unitfx:unitfx:1.0.10
-com.fasterxml.jackson.core:jackson-annotations:2.17.2
-com.fasterxml.jackson.core:jackson-core:2.17.2
-com.fasterxml.jackson.core:jackson-databind:2.17.2
-com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.17.2
-com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.17.2
-com.fasterxml.jackson:jackson-bom:2.17.2
+com.fasterxml.jackson.core:jackson-annotations:2.18.2
+com.fasterxml.jackson.core:jackson-core:2.18.2
+com.fasterxml.jackson.core:jackson-databind:2.18.2
+com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.18.2
+com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.18.2
+com.fasterxml.jackson:jackson-bom:2.18.2
 com.fasterxml:aalto-xml:1.3.3
 com.github.hypfvieh:dbus-java-core:4.2.1
 com.github.hypfvieh:dbus-java-transport-native-unixsocket:4.2.1
@@ -753,18 +816,23 @@ com.googlecode.javaewah:JavaEWAH:1.2.3
 com.googlecode.plist:dd-plist:1.28
 com.h2database:h2-mvstore:2.3.232
 com.knuddels:jtokkit:1.1.0
-com.kohlschutter.junixsocket:junixsocket-common:2.10.0
-com.kohlschutter.junixsocket:junixsocket-core:2.10.0
-com.kohlschutter.junixsocket:junixsocket-mysql:2.10.0
-com.kohlschutter.junixsocket:junixsocket-native-common:2.10.0
-com.konghq:unirest-java-core:4.4.4
-com.konghq:unirest-modules-gson:4.4.4
+com.kohlschutter.junixsocket:junixsocket-common:2.10.1
+com.kohlschutter.junixsocket:junixsocket-core:2.10.1
+com.kohlschutter.junixsocket:junixsocket-mysql:2.10.1
+com.kohlschutter.junixsocket:junixsocket-native-common:2.10.1
+com.konghq:unirest-java-core:4.4.5
+com.konghq:unirest-modules-gson:4.4.5
 com.oracle.ojdbc:ojdbc10:19.3.0.0
 com.oracle.ojdbc:ons:19.3.0.0
 com.oracle.ojdbc:osdt_cert:19.3.0.0
 com.oracle.ojdbc:osdt_core:19.3.0.0
 com.oracle.ojdbc:simplefan:19.3.0.0
 com.oracle.ojdbc:ucp:19.3.0.0
+com.squareup.okhttp3:okhttp:4.12.0
+com.squareup.okio:okio-jvm:3.6.0
+com.squareup.okio:okio:3.6.0
+com.squareup.retrofit2:converter-jackson:2.9.0
+com.squareup.retrofit2:retrofit:2.11.0
 com.sun.istack:istack-commons-runtime:4.1.2
 com.vladsch.flexmark:flexmark-ext-emoji:0.64.8
 com.vladsch.flexmark:flexmark-ext-gfm-strikethrough:0.64.8
@@ -792,7 +860,7 @@ commons-cli:commons-cli:1.9.0
 commons-codec:commons-codec:1.17.1
 commons-collections:commons-collections:3.2.2
 commons-digester:commons-digester:2.1
-commons-io:commons-io:2.16.1
+commons-io:commons-io:2.18.0
 commons-logging:commons-logging:1.3.4
 commons-validator:commons-validator:1.8.0
 de.rototor.jeuclid:jeuclid-core:3.1.11
@@ -802,10 +870,20 @@ de.rototor.snuggletex:snuggletex:1.3.0
 de.saxsys:mvvmfx:1.8.0
 de.swiesend:secret-service:1.8.1-jdk17
 de.undercouch:citeproc-java:3.1.0
+dev.ai4j:openai4j:0.23.0
+dev.langchain4j:langchain4j-core:0.36.2
+dev.langchain4j:langchain4j-google-ai-gemini:0.36.2
+dev.langchain4j:langchain4j-hugging-face:0.36.2
+dev.langchain4j:langchain4j-mistral-ai:0.36.2
+dev.langchain4j:langchain4j-open-ai:0.36.2
+dev.langchain4j:langchain4j:0.36.2
 eu.lestard:doc-annotations:0.2
 info.debatty:java-string-similarity:2.0.0
-io.github.java-diff-utils:java-diff-utils:4.12
-io.zonky.test:embedded-postgres:2.0.7
+io.github.adr:e-adr:2.0.0-SNAPSHOT
+io.github.java-diff-utils:java-diff-utils:4.15
+io.github.stefanbratanov:jvm-openai:0.11.0
+io.github.thibaultmeyer:cuid:2.0.3
+io.zonky.test:embedded-postgres:2.1.0
 jakarta.activation:jakarta.activation-api:2.1.3
 jakarta.annotation:jakarta.annotation-api:2.1.1
 jakarta.inject:jakarta.inject-api:2.0.1
@@ -822,30 +900,32 @@ net.synedra:validatorfx:0.5.0
 one.jpro.jproutils:tree-showing:0.2.2
 org.antlr:antlr4-runtime:4.13.2
 org.apache.commons:commons-compress:1.27.1
-org.apache.commons:commons-csv:1.11.0
+org.apache.commons:commons-csv:1.12.0
 org.apache.commons:commons-lang3:3.17.0
-org.apache.commons:commons-text:1.12.0
-org.apache.httpcomponents.client5:httpclient5:5.3.1
-org.apache.httpcomponents.core5:httpcore5-h2:5.2.4
-org.apache.httpcomponents.core5:httpcore5:5.2.4
-org.apache.logging.log4j:log4j-api:2.24.0
-org.apache.logging.log4j:log4j-to-slf4j:2.24.0
-org.apache.lucene:lucene-analysis-common:9.11.1
-org.apache.lucene:lucene-core:9.11.1
-org.apache.lucene:lucene-highlighter:9.11.1
-org.apache.lucene:lucene-queries:9.11.1
-org.apache.lucene:lucene-queryparser:9.11.1
-org.apache.lucene:lucene-sandbox:9.11.1
+org.apache.commons:commons-text:1.13.0
+org.apache.httpcomponents.client5:httpclient5:5.4.1
+org.apache.httpcomponents.core5:httpcore5-h2:5.3.1
+org.apache.httpcomponents.core5:httpcore5:5.3.1
+org.apache.logging.log4j:log4j-api:2.24.3
+org.apache.logging.log4j:log4j-to-slf4j:2.24.3
+org.apache.lucene:lucene-analysis-common:10.1.0
+org.apache.lucene:lucene-core:10.1.0
+org.apache.lucene:lucene-facet:10.1.0
+org.apache.lucene:lucene-highlighter:10.1.0
+org.apache.lucene:lucene-queries:10.1.0
+org.apache.lucene:lucene-queryparser:10.1.0
+org.apache.lucene:lucene-sandbox:10.1.0
+org.apache.opennlp:opennlp-tools:1.9.4
 org.apache.pdfbox:fontbox:3.0.3
 org.apache.pdfbox:pdfbox-io:3.0.3
 org.apache.pdfbox:pdfbox:3.0.3
 org.apache.pdfbox:xmpbox:3.0.3
-org.apiguardian:apiguardian-api:1.1.2
-org.bouncycastle:bcprov-jdk18on:1.78.1
+org.apache.velocity:velocity-engine-core:2.4.1
+org.bouncycastle:bcprov-jdk18on:1.79
 org.checkerframework:checker-qual:3.42.0
 org.codehaus.woodstox:stax2-api:4.2.2
 org.controlsfx:controlsfx:11.2.1
-org.eclipse.jgit:org.eclipse.jgit:6.10.0.202406032230-r
+org.eclipse.jgit:org.eclipse.jgit:7.1.0.202411261347-r
 org.fxmisc.flowless:flowless:0.7.3
 org.fxmisc.richtext:richtextfx:0.11.3
 org.fxmisc.undo:undofx:2.1.1
@@ -861,18 +941,22 @@ 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.8
-org.glassfish.jersey.core:jersey-client:3.1.8
-org.glassfish.jersey.core:jersey-common:3.1.8
-org.glassfish.jersey.core:jersey-server:3.1.8
-org.glassfish.jersey.inject:jersey-hk2:3.1.8
+org.glassfish.jersey.containers:jersey-container-grizzly2-http:3.1.9
+org.glassfish.jersey.core:jersey-client:3.1.9
+org.glassfish.jersey.core:jersey-common:3.1.9
+org.glassfish.jersey.core:jersey-server:3.1.9
+org.glassfish.jersey.inject:jersey-hk2:3.1.9
 org.jabref:afterburner.fx:2.0.0
 org.jabref:easybind:2.2.1-SNAPSHOT
 org.javassist:javassist:3.30.2-GA
 org.jbibtex:jbibtex:1.0.20
+org.jetbrains.kotlin:kotlin-stdlib-common:2.1.0
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.0
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.0
+org.jetbrains.kotlin:kotlin-stdlib:2.1.0
 org.jetbrains:annotations:24.0.1
 org.jooq:jool:0.9.15
-org.jsoup:jsoup:1.18.1
+org.jsoup:jsoup:1.18.3
 org.jspecify:jspecify:1.0.0
 org.kordamp.ikonli:ikonli-bootstrapicons-pack:12.3.1
 org.kordamp.ikonli:ikonli-core:12.3.1
@@ -883,13 +967,13 @@ org.kordamp.ikonli:ikonli-materialdesign2-pack:12.3.1
 org.libreoffice:libreoffice:24.2.3
 org.libreoffice:unoloader:24.2.3
 org.mariadb.jdbc:mariadb-java-client:2.7.9
-org.openjfx:javafx-base:23
-org.openjfx:javafx-controls:23
-org.openjfx:javafx-fxml:23
-org.openjfx:javafx-graphics:23
-org.openjfx:javafx-media:23
-org.openjfx:javafx-swing:23
-org.openjfx:javafx-web:23
+org.openjfx:javafx-base:23.0.1
+org.openjfx:javafx-controls:23.0.1
+org.openjfx:javafx-fxml:23.0.1
+org.openjfx:javafx-graphics:23.0.1
+org.openjfx:javafx-media:23.0.1
+org.openjfx:javafx-swing:23.0.1
+org.openjfx:javafx-web:23.0.1
 org.postgresql:postgresql:42.7.4
 org.reactfx:reactfx:2.0-M5
 org.scala-lang:scala-library:2.13.8
@@ -898,9 +982,9 @@ org.slf4j:slf4j-api:2.0.16
 org.tinylog:slf4j-tinylog:2.7.0
 org.tinylog:tinylog-api:2.7.0
 org.tinylog:tinylog-impl:2.7.0
-org.tukaani:xz:1.9
+org.tukaani:xz:1.10
 org.yaml:snakeyaml:2.3
 pt.davidafsilva.apple:jkeychain:1.1.0
-tech.units:indriya:2.2
+tech.units:indriya:2.2.1
 tech.uom.lib:uom-lib-common:2.2
 ```
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index eb1a55be0e1..e1b837a19c2 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=f397b287023acdba1e9f6fc5ea72d22dd63669d59ed4a289a29b1a76eee151c6
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+distributionSha256Sum=7a00d51fb93147819aab76024feece20b6b84e420694101f276be952e08bef03
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index f5feea6d6b1..f3b75f3b0d4 100755
--- a/gradlew
+++ b/gradlew
@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
diff --git a/settings.gradle b/settings.gradle
index 3221d2ed933..bba203df04b 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -19,7 +19,7 @@ pluginManagement {
 }
 
 plugins {
-    id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.9.0"
 }
 
 rootProject.name = "JabRef"
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
index f0151b8988e..ccb2f386829 100644
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@@ -167,7 +167,7 @@
     /*
      * In case the version is updated, please also increment {@link org.jabref.model.search.LinkedFilesConstants.VERSION} to trigger reindexing.
      */
-    uses org.apache.lucene.codecs.lucene100.Lucene100Codec;
+    uses org.apache.lucene.codecs.lucene101.Lucene101Codec;
     requires org.apache.lucene.analysis.common;
     requires org.apache.lucene.core;
     requires org.apache.lucene.highlighter;
diff --git a/src/main/java/org/jabref/gui/Base.css b/src/main/java/org/jabref/gui/Base.css
index af7759a1453..23337a9c7cc 100644
--- a/src/main/java/org/jabref/gui/Base.css
+++ b/src/main/java/org/jabref/gui/Base.css
@@ -1207,10 +1207,7 @@ We want to have a look that matches our icons in the tool-bar */
     -fx-padding: 0 0 -2 0;
 }
 
-.table-row-cell:dragOver-center {
-    -fx-border-color: -jr-drag-target;
-    -fx-border-width: 1 1 1 1;
-    -fx-padding: -1 -1 -1 -1;
+.table-row-cell:dragOver-center > .table-cell {
     -fx-background-color: -jr-drag-target-hover;
 }
 
diff --git a/src/main/java/org/jabref/gui/Dark.css b/src/main/java/org/jabref/gui/Dark.css
index 06bec9e65e7..d6baf277dc5 100644
--- a/src/main/java/org/jabref/gui/Dark.css
+++ b/src/main/java/org/jabref/gui/Dark.css
@@ -115,6 +115,12 @@
     -fx-background-color: -jr-hover;
 }
 
+/* Drag and drop colored indicator */
+
+.table-row-cell:dragOver-center {
+    -fx-background-color: -jr-drag-target-hover;
+}
+
 .merge-field-value .action-icon {
     -fx-blend-mode: none;
     -fx-opacity: 90%;
diff --git a/src/main/java/org/jabref/gui/ai/components/privacynotice/PrivacyNoticeComponent.fxml b/src/main/java/org/jabref/gui/ai/components/privacynotice/PrivacyNoticeComponent.fxml
index 543571673f4..44c4d3d3419 100644
--- a/src/main/java/org/jabref/gui/ai/components/privacynotice/PrivacyNoticeComponent.fxml
+++ b/src/main/java/org/jabref/gui/ai/components/privacynotice/PrivacyNoticeComponent.fxml
@@ -16,7 +16,7 @@
         <Text text="%This setting may be changed in preferences at any time."/>
         <GridPane fx:id="aiPolicies" hgap="4" vgap="4" />
         <Text fx:id="embeddingModelText" text="%Additionally, we use Deep Java Library (DJL) embedding models for both chatting and summarization. The embedding model will be downloaded in background (size %0) from Deep Java Library servers anonymously." />
-        <Hyperlink wrapText="true" onAction="#onDjlPrivacyPolicyClick" styleClass="embeddedHyperlink" text="%You find information about the privacy policy here." />
+        <Hyperlink wrapText="true" onAction="#onDjlPrivacyPolicyClick" styleClass="embeddedHyperlink" text="%You can find information about DJL privacy policy here." />
         <Button onAction="#onIAgreeButtonClick" text="%I agree"/>
     </VBox>
 </fx:root>
diff --git a/src/main/java/org/jabref/gui/ai/components/privacynotice/PrivacyNoticeComponent.java b/src/main/java/org/jabref/gui/ai/components/privacynotice/PrivacyNoticeComponent.java
index 925c786080e..78c95db9c18 100644
--- a/src/main/java/org/jabref/gui/ai/components/privacynotice/PrivacyNoticeComponent.java
+++ b/src/main/java/org/jabref/gui/ai/components/privacynotice/PrivacyNoticeComponent.java
@@ -74,7 +74,7 @@ private void addPrivacyHyperlink(GridPane gridPane, AiProvider aiProvider) {
         Label aiName = new Label(aiProvider.getLabel());
         gridPane.add(aiName, 0, row);
 
-        Hyperlink hyperlink = new Hyperlink(aiProvider.getApiUrl());
+        Hyperlink hyperlink = new Hyperlink(aiProvider.getPrivacyPolicyUrl());
         hyperlink.setWrapText(true);
         // hyperlink.setFont(aiName.getFont());
         hyperlink.setOnAction(event -> openBrowser(aiProvider.getApiUrl()));
diff --git a/src/main/java/org/jabref/gui/ai/components/summary/SummaryShowingComponent.fxml b/src/main/java/org/jabref/gui/ai/components/summary/SummaryShowingComponent.fxml
index f248bccab17..e0e0bfb6c66 100644
--- a/src/main/java/org/jabref/gui/ai/components/summary/SummaryShowingComponent.fxml
+++ b/src/main/java/org/jabref/gui/ai/components/summary/SummaryShowingComponent.fxml
@@ -1,22 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <?import javafx.geometry.Insets?>
+<?import javafx.scene.control.CheckBox?>
 <?import javafx.scene.control.Button?>
-<?import javafx.scene.control.TextArea?>
 <?import javafx.scene.layout.VBox?>
-<?import javafx.scene.text.Text?>
+<?import javafx.scene.layout.BorderPane?>
 <?import javafx.scene.text.TextFlow?>
-<fx:root alignment="TOP_CENTER" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="-Infinity" minWidth="-Infinity" spacing="10.0" type="VBox" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.ai.components.summary.SummaryShowingComponent">
-   <children>
-      <TextArea fx:id="summaryTextArea" editable="false" wrapText="true" VBox.vgrow="ALWAYS" />
-      <Button mnemonicParsing="false" onAction="#onRegenerateButtonClick" text="%Regenerate" />
-      <TextFlow textAlignment="CENTER">
-         <children>
-            <Text fx:id="summaryInfoText" strokeType="OUTSIDE" strokeWidth="0.0" text="%Generated at %0 by %1" />
-         </children>
-      </TextFlow>
-   </children>
-   <padding>
-      <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
-   </padding>
+<?import javafx.scene.text.Text?>
+
+<fx:root alignment="TOP_CENTER" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="400.0" minWidth="-Infinity" spacing="8.0" type="VBox" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.ai.components.summary.SummaryShowingComponent">
+    <children>
+        <BorderPane minHeight="30.0">
+            <left>
+                <CheckBox fx:id="markdownCheckbox" mnemonicParsing="false" onAction="#onMarkdownToggle" text="Markdown" />
+            </left>
+            <center>
+                <Button mnemonicParsing="false" onAction="#onRegenerateButtonClick" text="%Regenerate" translateX="-40" />
+            </center>
+        </BorderPane>
+        <Text fx:id="summaryInfoText" strokeType="OUTSIDE" strokeWidth="0.0" text="%Generated at %0 by %1" />
+    </children>
+    <padding>
+        <Insets bottom="8.0" left="8.0" right="8.0" top="8.0" />
+    </padding>
 </fx:root>
diff --git a/src/main/java/org/jabref/gui/ai/components/summary/SummaryShowingComponent.java b/src/main/java/org/jabref/gui/ai/components/summary/SummaryShowingComponent.java
index 3cb04347d11..b733ac6b4e5 100644
--- a/src/main/java/org/jabref/gui/ai/components/summary/SummaryShowingComponent.java
+++ b/src/main/java/org/jabref/gui/ai/components/summary/SummaryShowingComponent.java
@@ -6,18 +6,24 @@
 import java.util.Locale;
 
 import javafx.fxml.FXML;
-import javafx.scene.control.TextArea;
+import javafx.scene.control.CheckBox;
+import javafx.scene.layout.Priority;
 import javafx.scene.layout.VBox;
 import javafx.scene.text.Text;
+import javafx.scene.web.WebView;
 
 import org.jabref.logic.ai.summarization.Summary;
+import org.jabref.logic.layout.format.MarkdownFormatter;
+import org.jabref.logic.util.WebViewStore;
 
 import com.airhacks.afterburner.views.ViewLoader;
 
 public class SummaryShowingComponent extends VBox {
-    @FXML private TextArea summaryTextArea;
+    private static final MarkdownFormatter MARKDOWN_FORMATTER = new MarkdownFormatter();
     @FXML private Text summaryInfoText;
+    @FXML private CheckBox markdownCheckbox;
 
+    private WebView contentWebView;
     private final Summary summary;
     private final Runnable regenerateCallback;
 
@@ -32,13 +38,37 @@ public SummaryShowingComponent(Summary summary, Runnable regenerateCallback) {
 
     @FXML
     private void initialize() {
-        summaryTextArea.setText(summary.content());
+        initializeWebView();
+        updateContent(false); // Start in plain text mode
+        updateInfoText();
+    }
+
+    private void initializeWebView() {
+        contentWebView = WebViewStore.get();
+        VBox.setVgrow(contentWebView, Priority.ALWAYS);
+
+        getChildren().addFirst(contentWebView);
+    }
+
+    private void updateContent(boolean isMarkdown) {
+        String content = summary.content();
+        if (isMarkdown) {
+            contentWebView.getEngine().loadContent(MARKDOWN_FORMATTER.format(content));
+        } else {
+            contentWebView.getEngine().loadContent(
+                    "<body style='margin: 0; padding: 5px; width: 100vw'>" +
+                            "<div style='white-space: pre-wrap; word-wrap: break-word; width: 100vw'>" +
+                            content +
+                            "</div></body>"
+            );
+        }
+    }
 
+    private void updateInfoText() {
         String newInfo = summaryInfoText
                 .getText()
                 .replaceAll("%0", formatTimestamp(summary.timestamp()))
                 .replaceAll("%1", summary.aiProvider().getLabel() + " " + summary.model());
-
         summaryInfoText.setText(newInfo);
     }
 
@@ -46,6 +76,11 @@ private static String formatTimestamp(LocalDateTime timestamp) {
         return timestamp.format(DateTimeFormatter.ofLocalizedDateTime(FormatStyle.MEDIUM).withLocale(Locale.getDefault()));
     }
 
+    @FXML
+    private void onMarkdownToggle() {
+        updateContent(markdownCheckbox.isSelected());
+    }
+
     @FXML
     private void onRegenerateButtonClick() {
         regenerateCallback.run();
diff --git a/src/main/java/org/jabref/gui/externalfiles/ImportHandler.java b/src/main/java/org/jabref/gui/externalfiles/ImportHandler.java
index 808764d0231..61c85b34d7f 100644
--- a/src/main/java/org/jabref/gui/externalfiles/ImportHandler.java
+++ b/src/main/java/org/jabref/gui/externalfiles/ImportHandler.java
@@ -147,7 +147,7 @@ public List<ImportFilesResultItemViewModel> call() {
                                     entry.clearField(StandardField.FILE);
                                     // Modifiers do not work on macOS: https://bugs.openjdk.org/browse/JDK-8264172
                                     // Similar code as org.jabref.gui.preview.PreviewPanel.PreviewPanel
-                                    DragDrop.handleDropOfFiles(files, transferMode, fileLinker, entry);
+                                    DragDrop.handleDropOfFiles(List.of(file), transferMode, fileLinker, entry);
                                     entriesToAdd.addAll(pdfEntriesInFile);
                                     addResultToList(file, true, Localization.lang("File was successfully imported as a new entry"));
                                 });
diff --git a/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesDialogViewModel.java b/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesDialogViewModel.java
index 58f634d0067..50163b34515 100644
--- a/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesDialogViewModel.java
@@ -10,7 +10,6 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.function.Predicate;
-import java.util.stream.Collectors;
 
 import javax.swing.undo.UndoManager;
 
@@ -145,30 +144,32 @@ public void startSearch() {
     }
 
     public void startImport() {
-        Path directory = this.getSearchDirectory();
-        List<Path> fileList = checkedFileListProperty.stream()
-                                                     .map(item -> item.getValue().getPath())
-                                                     .filter(path -> path.toFile().isFile())
-                                                     .map(path -> directory.relativize(path))
-                                                     .collect(Collectors.toList());
+        List<Path> fileList = checkedFileListProperty
+                .stream()
+                .map(TreeItem::getValue)
+                .map(FileNodeViewModel::getPath)
+                .filter(Files::isRegularFile)
+                .toList();
+
         if (fileList.isEmpty()) {
-            LOGGER.warn("There are no valid files checked");
+            LOGGER.warn("There are no valid files checked for import");
             return;
         }
         resultList.clear();
 
-        importFilesBackgroundTask = importHandler.importFilesInBackground(fileList, bibDatabase, preferences.getFilePreferences(), TransferMode.LINK)
-                                                 .onRunning(() -> {
-                                                     progressValueProperty.bind(importFilesBackgroundTask.workDonePercentageProperty());
-                                                     progressTextProperty.bind(importFilesBackgroundTask.messageProperty());
-                                                     taskActiveProperty.setValue(true);
-                                                 })
-                                                 .onFinished(() -> {
-                                                     progressValueProperty.unbind();
-                                                     progressTextProperty.unbind();
-                                                     taskActiveProperty.setValue(false);
-                                                 })
-                                                 .onSuccess(resultList::addAll);
+        importFilesBackgroundTask = importHandler
+                .importFilesInBackground(fileList, bibDatabase, preferences.getFilePreferences(), TransferMode.LINK)
+                .onRunning(() -> {
+                    progressValueProperty.bind(importFilesBackgroundTask.workDonePercentageProperty());
+                    progressTextProperty.bind(importFilesBackgroundTask.messageProperty());
+                    taskActiveProperty.setValue(true);
+                })
+                .onFinished(() -> {
+                    progressValueProperty.unbind();
+                    progressTextProperty.unbind();
+                    taskActiveProperty.setValue(false);
+                })
+                .onSuccess(resultList::addAll);
         importFilesBackgroundTask.executeWith(taskExecutor);
     }
 
@@ -176,12 +177,13 @@ public void startImport() {
      * This starts the export of all files of all selected nodes in the file tree view.
      */
     public void startExport() {
-        List<Path> fileList = checkedFileListProperty.stream()
-                                                     .map(item -> item.getValue().getPath())
-                                                     .filter(path -> path.toFile().isFile())
-                                                     .toList();
+        List<Path> fileList = checkedFileListProperty
+                .stream()
+                .map(item -> item.getValue().getPath())
+                .filter(Files::isRegularFile)
+                .toList();
         if (fileList.isEmpty()) {
-            LOGGER.warn("There are no valid files checked");
+            LOGGER.warn("There are no valid files checked for export");
             return;
         }
 
diff --git a/src/main/java/org/jabref/gui/linkedfile/DeleteFileAction.java b/src/main/java/org/jabref/gui/linkedfile/DeleteFileAction.java
index 6925cbd88d5..143e3c6c43f 100644
--- a/src/main/java/org/jabref/gui/linkedfile/DeleteFileAction.java
+++ b/src/main/java/org/jabref/gui/linkedfile/DeleteFileAction.java
@@ -98,9 +98,16 @@ public void execute() {
                 Path path = file.get();
                 dialogTitle = Localization.lang("Delete '%0'", path.getFileName().toString());
             } else {
+                LOGGER.warn("Could not find file {}", linkedFile.getLink());
                 dialogService.notify(Localization.lang("Error accessing file '%0'.", linkedFile.getLink()));
+
+                // We can trigger deletion of "all" files from the entry (no deletion on disk), because in this case, there is only one files
+                assert numberOfLinkedFiles == 1;
+                deleteFiles(false);
+
                 // Deleting a non-existing file is a success
                 success = true;
+
                 return;
             }
         }
diff --git a/src/main/java/org/jabref/gui/maintable/MainTableColumnModel.java b/src/main/java/org/jabref/gui/maintable/MainTableColumnModel.java
index b8f89ac144e..cc14cdb7ac1 100644
--- a/src/main/java/org/jabref/gui/maintable/MainTableColumnModel.java
+++ b/src/main/java/org/jabref/gui/maintable/MainTableColumnModel.java
@@ -52,6 +52,7 @@ public enum Type {
 
         private final String name;
         private final String displayName;
+
         Type(String name) {
             this.name = name;
             this.displayName = name;
@@ -79,6 +80,14 @@ public static Type fromString(String text) {
             LOGGER.warn("Column type '{}' is unknown.", text);
             return NORMALFIELD;
         }
+
+        @Override
+        public String toString() {
+            return "Type{" +
+                   "name='" + name + '\'' +
+                   ", displayName='" + displayName + '\'' +
+                   '}';
+        }
     }
 
     private final ObjectProperty<Type> typeProperty = new SimpleObjectProperty<>();
@@ -220,6 +229,14 @@ public int hashCode() {
         return Objects.hash(typeProperty.getValue(), qualifierProperty.getValue());
     }
 
+    @Override
+    public String toString() {
+        return "MainTableColumnModel{" +
+               "qualifierProperty=" + qualifierProperty +
+               ", typeProperty=" + typeProperty +
+               '}';
+    }
+
     /**
      * This creates a new {@code MainTableColumnModel} out of a given string
      *
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 a0c4866fc2e..a228faf6d85 100644
--- a/src/main/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypesTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypesTabViewModel.java
@@ -82,7 +82,12 @@ public boolean edit(ExternalFileTypeItemViewModel type) {
         ExternalFileTypeItemViewModel typeToModify = new ExternalFileTypeItemViewModel(type.toExternalFileType());
         showEditDialog(typeToModify, Localization.lang("Edit file type"));
 
-        if (!isValidExternalFileType(typeToModify)) {
+        if (type.extensionProperty().get().equals(typeToModify.extensionProperty().get())) {
+            if (hasEmptyValue(typeToModify)) {
+                LOGGER.warn("One of the fields is empty or invalid. Not saving.");
+                return false;
+            }
+        } else if (!isValidExternalFileType(typeToModify)) {
             return false;
         }
 
@@ -96,20 +101,20 @@ public void remove(ExternalFileTypeItemViewModel type) {
     }
 
     public boolean isValidExternalFileType(ExternalFileTypeItemViewModel item) {
-        if (withEmptyValue(item)) {
-            LOGGER.debug("One of the fields is empty or invalid.");
+        if (hasEmptyValue(item)) {
+            LOGGER.warn("One of the fields is empty or invalid. Not saving.");
             return false;
         }
 
         if (!isUniqueExtension(item)) {
-            LOGGER.debug("File Extension exists already.");
+            LOGGER.warn("File Extension already exists. Not saving.");
             return false;
         }
 
         return true;
     }
 
-    private boolean withEmptyValue(ExternalFileTypeItemViewModel item) {
+    private boolean hasEmptyValue(ExternalFileTypeItemViewModel item) {
         return item.getName().isEmpty() || item.extensionProperty().get().isEmpty() || item.mimetypeProperty().get().isEmpty();
     }
 
diff --git a/src/main/java/org/jabref/logic/importer/Importer.java b/src/main/java/org/jabref/logic/importer/Importer.java
index d991b087d3b..7f465176eea 100644
--- a/src/main/java/org/jabref/logic/importer/Importer.java
+++ b/src/main/java/org/jabref/logic/importer/Importer.java
@@ -121,7 +121,8 @@ protected static Charset getCharset(BufferedInputStream bufferedInputStream) {
                 return defaultCharSet;
             }
 
-            if (Arrays.stream(matches).anyMatch(charset -> "ASCII".equals(charset.getName()))) {
+            // if we have utf8 with 100 confidence we assume that the file is in utf8, more likely
+            if (Arrays.stream(matches).anyMatch(charset -> "ASCII".equals(charset.getName()) || ("UTF-8".equals(charset.getName()) && charset.getConfidence() == 100))) {
                 return defaultCharSet;
             }
 
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/PdfContentImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/PdfContentImporter.java
index 7d43be038a4..2c9c94a4745 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/PdfContentImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/PdfContentImporter.java
@@ -203,7 +203,7 @@ public ParserResult importDatabase(Path filePath) {
         List<BibEntry> result = new ArrayList<>(1);
         try (PDDocument document = new XmpUtilReader().loadWithAutomaticDecryption(filePath)) {
             String firstPageContents = getFirstPageContents(document);
-            String titleByFontSize = extractTitleFromDocument(document);
+            Optional<String> titleByFontSize = extractTitleFromDocument(document);
             Optional<BibEntry> entry = getEntryFromPDFContent(firstPageContents, OS.NEWLINE, titleByFontSize);
             entry.ifPresent(result::add);
         } catch (EncryptedPdfsNotSupportedException e) {
@@ -216,7 +216,7 @@ public ParserResult importDatabase(Path filePath) {
         return new ParserResult(result);
     }
 
-    private static String extractTitleFromDocument(PDDocument document) throws IOException {
+    private static Optional<String> extractTitleFromDocument(PDDocument document) throws IOException {
         TitleExtractorByFontSize stripper = new TitleExtractorByFontSize();
         return stripper.getTitle(document);
     }
@@ -230,7 +230,7 @@ public TitleExtractorByFontSize() {
             this.textPositionsList = new ArrayList<>();
         }
 
-        public String getTitle(PDDocument document) throws IOException {
+        public Optional<String> getTitle(PDDocument document) throws IOException {
             this.setStartPage(1);
             this.setEndPage(2);
             this.writeText(document, new StringWriter());
@@ -266,7 +266,7 @@ private boolean isUnwantedText(TextPosition previousTextPosition, TextPosition t
             return isFarAway(previousTextPosition, textPosition);
         }
 
-        private String findLargestFontText(List<TextPosition> textPositions) {
+        private Optional<String> findLargestFontText(List<TextPosition> textPositions) {
             Map<Float, StringBuilder> fontSizeTextMap = new TreeMap<>(Collections.reverseOrder());
             TextPosition previousTextPosition = null;
             for (TextPosition textPosition : textPositions) {
@@ -285,10 +285,10 @@ private String findLargestFontText(List<TextPosition> textPositions) {
             for (Map.Entry<Float, StringBuilder> entry : fontSizeTextMap.entrySet()) {
                 String candidateText = entry.getValue().toString().trim();
                 if (isLegalTitle(candidateText)) {
-                    return candidateText;
+                    return Optional.of(candidateText);
                 }
             }
-            return fontSizeTextMap.values().iterator().next().toString().trim();
+            return fontSizeTextMap.values().stream().findFirst().map(StringBuilder::toString).map(String::trim);
         }
 
         private boolean isLegalTitle(String candidateText) {
@@ -334,7 +334,7 @@ private boolean isThereSpace(TextPosition previous, TextPosition current) {
      *         is successful. Otherwise, an empty {@link Optional}.
      */
     @VisibleForTesting
-    Optional<BibEntry> getEntryFromPDFContent(String firstpageContents, String lineSeparator, String titleByFontSize) {
+    Optional<BibEntry> getEntryFromPDFContent(String firstpageContents, String lineSeparator, Optional<String> titleByFontSize) {
         String firstpageContentsUnifiedLineBreaks = StringUtil.unifyLineBreaks(firstpageContents, lineSeparator);
 
         lines = firstpageContentsUnifiedLineBreaks.split(lineSeparator);
@@ -393,8 +393,8 @@ Optional<BibEntry> getEntryFromPDFContent(String firstpageContents, String lineS
         title = streamlineTitle(curString);
         // i points to the next non-empty line
         curString = "";
-        if (!isNullOrEmpty(titleByFontSize)) {
-            title = titleByFontSize;
+        if (titleByFontSize.isPresent() && !isNullOrEmpty(titleByFontSize.get())) {
+            title = titleByFontSize.get();
         }
 
         // after title: authors
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/PdfMergeMetadataImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/PdfMergeMetadataImporter.java
index 21b18e27f84..bb461423a76 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/PdfMergeMetadataImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/PdfMergeMetadataImporter.java
@@ -136,22 +136,10 @@ public ParserResult importDatabase(Path filePath) throws IOException {
         return new ParserResult(List.of(entry));
     }
 
-    /**
-     * A modified version of {@link PdfMergeMetadataImporter#importDatabase(Path)}, but it
-     * relativizes the {@code filePath} if there are working directories before parsing it
-     * into {@link PdfMergeMetadataImporter#importDatabase(Path)}
-     * (Otherwise no path modification happens).
-     *
-     * @param filePath    The unrelativized {@code filePath}.
-     */
     public ParserResult importDatabase(Path filePath, BibDatabaseContext context, FilePreferences filePreferences) throws IOException {
         Objects.requireNonNull(context);
         Objects.requireNonNull(filePreferences);
 
-        List<Path> directories = context.getFileDirectories(filePreferences);
-
-        filePath = FileUtil.relativize(filePath, directories);
-
         return importDatabase(filePath);
     }
 
diff --git a/src/main/java/org/jabref/logic/openoffice/oocsltext/CSLCitationOOAdapter.java b/src/main/java/org/jabref/logic/openoffice/oocsltext/CSLCitationOOAdapter.java
index e9c611f02ec..eaa4e099f31 100644
--- a/src/main/java/org/jabref/logic/openoffice/oocsltext/CSLCitationOOAdapter.java
+++ b/src/main/java/org/jabref/logic/openoffice/oocsltext/CSLCitationOOAdapter.java
@@ -54,14 +54,14 @@ public void insertCitation(XTextCursor cursor, CitationStyle selectedStyle, List
         String style = selectedStyle.getSource();
         boolean isAlphanumeric = isAlphanumericStyle(selectedStyle);
 
-        String inTextCitation;
+        String citation;
         if (isAlphanumeric) {
-            inTextCitation = CSLFormatUtils.generateAlphanumericCitation(entries, bibDatabaseContext);
+            citation = CSLFormatUtils.generateAlphanumericCitation(entries, bibDatabaseContext);
         } else {
-            inTextCitation = CitationStyleGenerator.generateCitation(entries, style, CSLFormatUtils.OUTPUT_FORMAT, bibDatabaseContext, bibEntryTypesManager).getText();
+            citation = CitationStyleGenerator.generateCitation(entries, style, CSLFormatUtils.OUTPUT_FORMAT, bibDatabaseContext, bibEntryTypesManager).getText();
         }
 
-        String formattedCitation = CSLFormatUtils.transformHTML(inTextCitation);
+        String formattedCitation = CSLFormatUtils.transformHTML(citation);
 
         if (selectedStyle.isNumericStyle()) {
             formattedCitation = updateSingleOrMultipleCitationNumbers(formattedCitation, entries);
@@ -75,7 +75,7 @@ public void insertCitation(XTextCursor cursor, CitationStyle selectedStyle, List
      * Inserts in-text citations for a group of entries.
      * Comparable to LaTeX's \citet command.
      *
-     * @implNote Very similar to the {@link #insertCitation(XTextCursor, CitationStyle, List, BibDatabaseContext, BibEntryTypesManager)} method.insertInText method
+     * @implNote Very similar to the {@link #insertCitation(XTextCursor, CitationStyle, List, BibDatabaseContext, BibEntryTypesManager) insertCitation} method.
      */
     public void insertInTextCitation(XTextCursor cursor, CitationStyle selectedStyle, List<BibEntry> entries, BibDatabaseContext bibDatabaseContext, BibEntryTypesManager bibEntryTypesManager)
             throws IOException, CreationException, Exception {
@@ -152,22 +152,22 @@ public void insertBibliography(XTextCursor cursor, CitationStyle selectedStyle,
             entries.sort(Comparator.comparingInt(entry -> markManager.getCitationNumber(entry.getCitationKey().orElse(""))));
 
             for (BibEntry entry : entries) {
-                String citation = CitationStyleGenerator.generateBibliography(List.of(entry), style, CSLFormatUtils.OUTPUT_FORMAT, bibDatabaseContext, bibEntryTypesManager).getFirst();
+                String bibliographyEntry = CitationStyleGenerator.generateBibliography(List.of(entry), style, CSLFormatUtils.OUTPUT_FORMAT, bibDatabaseContext, bibEntryTypesManager).getFirst();
                 String citationKey = entry.getCitationKey().orElse("");
                 int currentNumber = markManager.getCitationNumber(citationKey);
 
-                String formattedCitation = CSLFormatUtils.updateSingleBibliographyNumber(CSLFormatUtils.transformHTML(citation), currentNumber);
-                OOText ooText = OOFormat.setLocaleNone(OOText.fromString(formattedCitation));
+                String formattedBibliographyEntry = CSLFormatUtils.updateSingleBibliographyNumber(CSLFormatUtils.transformHTML(bibliographyEntry), currentNumber);
+                OOText ooText = OOFormat.setLocaleNone(OOText.fromString(formattedBibliographyEntry));
 
                 OOTextIntoOO.write(document, cursor, ooText);
             }
         } else {
             // Ordering will be according to citeproc item data provider (default)
-            List<String> citations = CitationStyleGenerator.generateBibliography(entries, style, CSLFormatUtils.OUTPUT_FORMAT, bibDatabaseContext, bibEntryTypesManager);
+            List<String> bibliographyEntries = CitationStyleGenerator.generateBibliography(entries, style, CSLFormatUtils.OUTPUT_FORMAT, bibDatabaseContext, bibEntryTypesManager);
 
-            for (String citation : citations) {
-                String formattedCitation = CSLFormatUtils.transformHTML(citation);
-                OOText ooText = OOFormat.setLocaleNone(OOText.fromString(formattedCitation));
+            for (String bibliographyEntry : bibliographyEntries) {
+                String formattedBibliographyEntry = CSLFormatUtils.transformHTML(bibliographyEntry);
+                OOText ooText = OOFormat.setLocaleNone(OOText.fromString(formattedBibliographyEntry));
                 OOTextIntoOO.write(document, cursor, ooText);
             }
         }
diff --git a/src/main/java/org/jabref/logic/openoffice/oocsltext/CSLFormatUtils.java b/src/main/java/org/jabref/logic/openoffice/oocsltext/CSLFormatUtils.java
index 525a1803be5..51be704a014 100644
--- a/src/main/java/org/jabref/logic/openoffice/oocsltext/CSLFormatUtils.java
+++ b/src/main/java/org/jabref/logic/openoffice/oocsltext/CSLFormatUtils.java
@@ -36,7 +36,7 @@ public class CSLFormatUtils {
 
     /**
      * Transforms provided HTML into a format that can be fully parsed and inserted into an OO document.
-     * Context: The HTML produced by {@link org.jabref.logic.citationstyle.CitationStyleGenerator#generateBibliography(List, String, CitationStyleOutputFormat, BibDatabaseContext, BibEntryTypesManager) generateBibliography} or {@link org.jabref.logic.citationstyle.CitationStyleGenerator#generateCitation(List, String, CitationStyleOutputFormat, BibDatabaseContext, BibEntryTypesManager) generateCitation} is not directly (completely) parsable by by {@link OOTextIntoOO#write(XTextDocument, XTextCursor, OOText) write}.
+     * Context: The HTML produced by {@link org.jabref.logic.citationstyle.CitationStyleGenerator#generateBibliography(List, String, CitationStyleOutputFormat, BibDatabaseContext, BibEntryTypesManager) generateBibliography} or {@link org.jabref.logic.citationstyle.CitationStyleGenerator#generateCitation(List, String, CitationStyleOutputFormat, BibDatabaseContext, BibEntryTypesManager) generateCitation} is not directly (completely) parsable by {@link OOTextIntoOO#write(XTextDocument, XTextCursor, OOText) write}.
      * For more details, read the documentation for the {@link OOTextIntoOO} class.
      * <a href="https://devdocs.jabref.org/code-howtos/openoffice/code-reorganization.html">Additional Information</a>.
      *
@@ -122,7 +122,7 @@ public static String generateAlphanumericCitation(List<BibEntry> entries, BibDat
 
     /**
      * Method to update citation number of a bibliographic entry (to be inserted in the list of references).
-     * By default, citeproc-java ({@link org.jabref.logic.citationstyle.CitationStyleGenerator#generateBibliography(List, String, CitationStyleOutputFormat, BibDatabaseContext, BibEntryTypesManager) generateBibliography} always starts the numbering of a list of citations with "1".
+     * By default, citeproc-java ({@link org.jabref.logic.citationstyle.CitationStyleGenerator#generateBibliography(List, String, CitationStyleOutputFormat, BibDatabaseContext, BibEntryTypesManager) generateBibliography}) always starts the numbering of a list of references with "1".
      * If a citation doesn't correspond to the first cited entry, the number should be changed to the appropriate current citation number.
      * The numbers should be globally unique. If an entry has been cited before, the older citation number corresponding to it should be reused.
      * The number can be enclosed in different formats, such as "1", "1.", "1)", "(1)" or "[1]".
diff --git a/src/main/java/org/jabref/logic/openoffice/style/JStyle.java b/src/main/java/org/jabref/logic/openoffice/style/JStyle.java
index 8ab93ca939c..74563d3e3d4 100644
--- a/src/main/java/org/jabref/logic/openoffice/style/JStyle.java
+++ b/src/main/java/org/jabref/logic/openoffice/style/JStyle.java
@@ -5,6 +5,8 @@
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.io.StringReader;
+import java.net.URISyntaxException;
+import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -19,6 +21,7 @@
 import java.util.TreeSet;
 import java.util.regex.Pattern;
 
+import org.jabref.architecture.AllowedToUseClassGetResource;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.layout.Layout;
 import org.jabref.logic.layout.LayoutFormatter;
@@ -55,6 +58,7 @@
  * 3) If the entries are not numbered, a citation marker must be produced for each entry. This
  * operation is performed for each JabRef BibEntry.
  */
+@AllowedToUseClassGetResource("Required for jstyle loading")
 public class JStyle implements Comparable<JStyle>, OOStyle {
 
     public static final String ITALIC_ET_AL = "ItalicEtAl";
@@ -160,7 +164,7 @@ public JStyle(String resourcePath, LayoutFormatterPreferences layoutPreferences,
         setDefaultProperties();
         // we need to distinguish if it's a style from the local resources or a file on disk
         InputStream stream = JStyle.class.getResourceAsStream(resourcePath);
-        styleFile = Path.of(resourcePath);
+        styleFile = Path.of(resourcePath).toAbsolutePath();
         fromResource = true;
         if (stream == null) {
             stream = Files.newInputStream(styleFile);
@@ -274,8 +278,19 @@ public void ensureUpToDate() throws IOException {
      */
     private void reload() throws IOException {
         if (styleFile != null) {
-            this.styleFileModificationTime = Files.getLastModifiedTime(styleFile).toMillis();
-            try (InputStream stream = Files.newInputStream(styleFile)) {
+            Path resourcePath = styleFile;
+            if (fromResource) {
+                try {
+                    URL resUrl = JStyle.class.getResource(path);
+                    if (resUrl != null) {
+                        resourcePath = Path.of(resUrl.toURI());
+                    }
+                } catch (URISyntaxException ex) {
+                    LOGGER.error("Couldn't resolve resource path for style  {}", path, ex);
+                }
+            }
+            this.styleFileModificationTime = Files.getLastModifiedTime(resourcePath).toMillis();
+            try (InputStream stream = Files.newInputStream(resourcePath)) {
                 initialize(stream);
             }
         }
diff --git a/src/main/java/org/jabref/model/ai/AiProvider.java b/src/main/java/org/jabref/model/ai/AiProvider.java
index 053406fdc5f..030f02502ef 100644
--- a/src/main/java/org/jabref/model/ai/AiProvider.java
+++ b/src/main/java/org/jabref/model/ai/AiProvider.java
@@ -4,8 +4,8 @@
 
 public enum AiProvider implements Serializable {
     OPEN_AI("OpenAI", "https://api.openai.com/v1", "https://openai.com/policies/privacy-policy/"),
-    MISTRAL_AI("Mistral AI", "https://mistral.ai/terms/#privacy-policy", "https://mistral.ai/terms/#privacy-policy"),
-    GEMINI("Gemini", "https://huggingface.co/privacy", "https://ai.google.dev/gemini-api/terms"),
+    MISTRAL_AI("Mistral AI", "https://api.mistral.ai/v1", "https://mistral.ai/terms/#privacy-policy"),
+    GEMINI("Gemini", "https://generativelanguage.googleapis.com/v1beta/", "https://ai.google.dev/gemini-api/terms"),
     HUGGING_FACE("Hugging Face", "https://huggingface.co/api", "https://huggingface.co/privacy"),
     GPT4ALL("GPT4All", "http://localhost:4891/v1", "https://www.nomic.ai/gpt4all/legal/privacy-policy");
 
diff --git a/src/main/java/org/jabref/model/search/LinkedFilesConstants.java b/src/main/java/org/jabref/model/search/LinkedFilesConstants.java
index 873cb5717c9..eb5d7c275f7 100644
--- a/src/main/java/org/jabref/model/search/LinkedFilesConstants.java
+++ b/src/main/java/org/jabref/model/search/LinkedFilesConstants.java
@@ -13,7 +13,7 @@ public enum LinkedFilesConstants {
      * 2. Lucene codec changes (see module-info.java Lucene section)
      * Incrementing triggers reindexing.
      */
-    VERSION("3"),
+    VERSION("4"),
     PATH("path"),
     CONTENT("content"),
     ANNOTATIONS("annotations"),
diff --git a/src/main/resources/csl-styles b/src/main/resources/csl-styles
index 6b7b611908b..080516e2747 160000
--- a/src/main/resources/csl-styles
+++ b/src/main/resources/csl-styles
@@ -1 +1 @@
-Subproject commit 6b7b611908b20c91f34110d1c9489fb3278e0ef5
+Subproject commit 080516e27470d03c70bd3d5f6d712a0b61a45448
diff --git a/src/main/resources/icons/jabref.icns b/src/main/resources/icons/jabref.icns
old mode 100755
new mode 100644
index cf7a8d59d26..e231e8d3bad
Binary files a/src/main/resources/icons/jabref.icns and b/src/main/resources/icons/jabref.icns differ
diff --git a/src/main/resources/l10n/JabRef_de.properties b/src/main/resources/l10n/JabRef_de.properties
index f0733cdf0c4..68da93ed476 100644
--- a/src/main/resources/l10n/JabRef_de.properties
+++ b/src/main/resources/l10n/JabRef_de.properties
@@ -2620,7 +2620,6 @@ Estimated\ time\ left\:\ 5\ seconds.=Geschätzte verbleibende Zeit\: 5 Sekunden.
 Estimated\ time\ left\:\ approx.\ 1\ minute.=Geschätzte verbleibende Zeit\: ca. 1 Minute.
 Estimated\ time\ left\:\ approx.\ 2\ minutes.=Geschätzte verbleibende Zeit\: ca. 2 Minuten.
 Estimated\ time\ left\:\ more\ than\ 2\ minutes.=Geschätzte verbleibende Zeit\: mehr als 2 Minuten.
-You\ find\ information\ about\ the\ privacy\ policy\ here.=Hier finden Sie Informationen über die Datenschutzerklärung.
 The\ size\ of\ the\ embedding\ model\ could\ be\ smaller\ than\ written\ in\ the\ list.=Die Größe des Einbettungsmodells könnte kleiner sein als in der Liste angegeben.
 Embedding\ model\ has\ to\ be\ provided=Einbettungsmodell muss angegeben werden
 After\ the\ file\ will\ be\ ingested,\ you\ will\ be\ able\ to\ chat\ with\ it.=Nachdem die Datei verarbeitet wurde, können Sie mit ihr chatten.
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 32bc777fcc6..52ffb629f5e 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -2621,7 +2621,7 @@ Estimated\ time\ left\:\ 5\ seconds.=Estimated time left: 5 seconds.
 Estimated\ time\ left\:\ approx.\ 1\ minute.=Estimated time left: approx. 1 minute.
 Estimated\ time\ left\:\ approx.\ 2\ minutes.=Estimated time left: approx. 2 minutes.
 Estimated\ time\ left\:\ more\ than\ 2\ minutes.=Estimated time left: more than 2 minutes.
-You\ find\ information\ about\ the\ privacy\ policy\ here.=You find information about the privacy policy here.
+You\ can\ find\ information\ about\ DJL\ privacy\ policy\ here.=You can find information about DJL privacy policy here.
 The\ size\ of\ the\ embedding\ model\ could\ be\ smaller\ than\ written\ in\ the\ list.=The size of the embedding model could be smaller than written in the list.
 Embedding\ model\ has\ to\ be\ provided=Embedding model has to be provided
 After\ the\ file\ will\ be\ ingested,\ you\ will\ be\ able\ to\ chat\ with\ it.=After the file will be ingested, you will be able to chat with it.
diff --git a/src/main/resources/l10n/JabRef_fr.properties b/src/main/resources/l10n/JabRef_fr.properties
index f7cd4304f07..df79f02518b 100644
--- a/src/main/resources/l10n/JabRef_fr.properties
+++ b/src/main/resources/l10n/JabRef_fr.properties
@@ -2621,7 +2621,7 @@ Estimated\ time\ left\:\ 5\ seconds.=Temps restant estimé \: 5 secondes.
 Estimated\ time\ left\:\ approx.\ 1\ minute.=Temps restant estimé \: environ 1 minute.
 Estimated\ time\ left\:\ approx.\ 2\ minutes.=Temps restant estimé \: environ 2 minutes.
 Estimated\ time\ left\:\ more\ than\ 2\ minutes.=Temps restant estimé \: plus de 2 minutes.
-You\ find\ information\ about\ the\ privacy\ policy\ here.=Vous trouverez ici des informations sur la politique de confidentialité.
+You\ can\ find\ information\ about\ DJL\ privacy\ policy\ here.=Vous trouverez ici des informations sur la politique de confidentialité de DJL.
 The\ size\ of\ the\ embedding\ model\ could\ be\ smaller\ than\ written\ in\ the\ list.=La taille du modèle d'intégration pourrait être plus petite que ce qui est écrit dans la liste.
 Embedding\ model\ has\ to\ be\ provided=Le modèle d'intégration doit être fourni
 After\ the\ file\ will\ be\ ingested,\ you\ will\ be\ able\ to\ chat\ with\ it.=Une fois le fichier ingéré, vous pourrez tchatter avec lui.
diff --git a/src/main/resources/l10n/JabRef_it.properties b/src/main/resources/l10n/JabRef_it.properties
index f4008f93703..b12c36b4373 100644
--- a/src/main/resources/l10n/JabRef_it.properties
+++ b/src/main/resources/l10n/JabRef_it.properties
@@ -2594,6 +2594,7 @@ Enable\ AI\ functionality\ (summary\ generation\ and\ chatting)\ in\ JabRef=Abil
 Customize\ expert\ settings=Personalizza le impostazioni avanzate
 These\ parameters\ affect\ how\ the\ AI\ will\ answer\ your\ questions.=Questi parametri influenzano come l'IA risponderà alle tue domande.
 JabRef\ uses\ AI\ providers\ to\ enable\ AI\ functionality\ (chatting\ with\ attached\ file(s)\ and\ summarization).\ AI\ provider\ is\ an\ external\ service.\ To\ enable\ processing\ of\ attached\ file(s),\ their\ contents\ need\ to\ be\ shared\ with\ the\ currently\ selected\ AI\ provider.\ As\ soon\ as\ you\ ask\ a\ question,\ the\ text\ content\ of\ all\ PDFs\ attached\ to\ the\ entry\ are\ sent\ to\ external\ service.\ By\ using\ this\ service\ you\ agree\ to\ the\ privacy\ police\ of\ the\ selected\ AI\ provider.=JabRef utilizza i provider AI per abilitare la funzionalità AI (chattare con file allegati e riepilogazione). Il provider AI è un servizio esterno. Per consentire l'elaborazione di file allegati, il loro contenuto deve essere condiviso con il provider AI attualmente selezionato. Non appena si fa una domanda, il contenuto del testo di tutti i PDF allegati alla voce viene inviato al servizio esterno. Utilizzando questo servizio, accetti la polizia sulla privacy del provider AI selezionato.
+You\ can\ find\ information\ about\ DJL\ privacy\ policy\ here.=Qui puoi trovare informazioni sulla politica della privacy di DJL.
 Embedding\ model\ has\ to\ be\ provided=Il modello di incorporazione deve essere fornito
 After\ the\ file\ will\ be\ ingested,\ you\ will\ be\ able\ to\ chat\ with\ it.=Dopo che il file sarà ingerito, sarai in grado di chattare con esso.
 Could\ not\ find\ path\ for\ a\ linked\ file\ '%0'\ while\ generating\ embeddings.=Impossibile trovare il percorso per un file collegato '%0' durante la generazione di incorporazioni.
diff --git a/src/main/resources/l10n/JabRef_pl.properties b/src/main/resources/l10n/JabRef_pl.properties
index 5b2630625d1..f16caf5d5ea 100644
--- a/src/main/resources/l10n/JabRef_pl.properties
+++ b/src/main/resources/l10n/JabRef_pl.properties
@@ -1780,7 +1780,7 @@ Estimated\ time\ left\:\ 5\ seconds.=Pozostały szacowany czas\: 5 sekund.
 Estimated\ time\ left\:\ approx.\ 1\ minute.=Pozostały szacowany czas\: około 1 minuta.
 Estimated\ time\ left\:\ approx.\ 2\ minutes.=Pozostały szacowany czas\: około 2 minuty.
 Estimated\ time\ left\:\ more\ than\ 2\ minutes.=Pozostały szacowany czas\: ponad 2 minuty.
-You\ find\ information\ about\ the\ privacy\ policy\ here.=Tutaj znajdziesz informacje o polityce prywatności.
+You\ can\ find\ information\ about\ DJL\ privacy\ policy\ here.=Tutaj znajdziesz informacje o polityce prywatności DJL.
 Embedding\ model\ has\ to\ be\ provided=Należy podać model osadzania
 Could\ not\ find\ path\ for\ a\ linked\ file\ '%0'\ while\ generating\ embeddings.=Nie udało się znaleźć ścieżki połączonego pliku '%0' podczas generowania osadzeń.
 File\ %0\ is\ currently\ being\ processed=Plik %0 jest obecnie przetwarzany
diff --git a/src/main/resources/l10n/JabRef_pt_BR.properties b/src/main/resources/l10n/JabRef_pt_BR.properties
index f0d85882ab0..c5427197021 100644
--- a/src/main/resources/l10n/JabRef_pt_BR.properties
+++ b/src/main/resources/l10n/JabRef_pt_BR.properties
@@ -2621,7 +2621,7 @@ Estimated\ time\ left\:\ 5\ seconds.=Tempo restante estimado\: 5 segundos.
 Estimated\ time\ left\:\ approx.\ 1\ minute.=Tempo restante estimado\: aprox. 1 minuto.
 Estimated\ time\ left\:\ approx.\ 2\ minutes.=Tempo restante estimado\: aprox. 2 minutos.
 Estimated\ time\ left\:\ more\ than\ 2\ minutes.=Tempo restante estimado\: mais de 2 minutos.
-You\ find\ information\ about\ the\ privacy\ policy\ here.=Você encontra informações sobre a política de privacidade aqui.
+You\ can\ find\ information\ about\ DJL\ privacy\ policy\ here.=Você pode encontrar informações sobre a política de privacidade do DJL aqui.
 The\ size\ of\ the\ embedding\ model\ could\ be\ smaller\ than\ written\ in\ the\ list.=O tamanho do modelo de incorporação pôde ser menor que o escrito na lista.
 Embedding\ model\ has\ to\ be\ provided=O modelo de incorporação precisa ser fornecido
 After\ the\ file\ will\ be\ ingested,\ you\ will\ be\ able\ to\ chat\ with\ it.=Após o arquivo ser armazenado, você poderá conversar com ele.
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/PdfContentImporterTest.java b/src/test/java/org/jabref/logic/importer/fileformat/PdfContentImporterTest.java
index 318cb858508..43a551a8634 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/PdfContentImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/PdfContentImporterTest.java
@@ -70,7 +70,7 @@ void parsingEditorWithoutPagesorSeriesInformation() {
                 Corpus linguistics investigates human language by starting out from large
                 """;
 
-        assertEquals(Optional.of(entry), importer.getEntryFromPDFContent(firstPageContents, "\n", ""));
+        assertEquals(Optional.of(entry), importer.getEntryFromPDFContent(firstPageContents, "\n", Optional.empty()));
     }
 
     @Test
@@ -93,7 +93,7 @@ Smith, Lucy Anna (2014) Mortality in the Ornamental Fish Retail Sector: an Analy
                 UNSPECIFIED
                 Master of Research (MRes) thesis, University of Kent,.""";
 
-        assertEquals(Optional.of(entry), importer.getEntryFromPDFContent(firstPageContents, "\n", ""));
+        assertEquals(Optional.of(entry), importer.getEntryFromPDFContent(firstPageContents, "\n", Optional.empty()));
     }
 
     @Test
@@ -126,7 +126,7 @@ British Journal of Nutrition (2008), 99, 1–11 doi: 10.1017/S0007114507795296
                 British Journal of Nutrition
                 https://doi.org/10.1017/S0007114507795296 Published online by Cambridge University Press""";
 
-        assertEquals(Optional.of(entry), importer.getEntryFromPDFContent(firstPageContent, "\n", ""));
+        assertEquals(Optional.of(entry), importer.getEntryFromPDFContent(firstPageContent, "\n", Optional.empty()));
     }
 
     @ParameterizedTest
diff --git a/src/test/java/org/jabref/logic/openoffice/oocsltext/CSLFormatUtilsTest.java b/src/test/java/org/jabref/logic/openoffice/oocsltext/CSLFormatUtilsTest.java
index 69df8bb42f1..dc43b0d26cb 100644
--- a/src/test/java/org/jabref/logic/openoffice/oocsltext/CSLFormatUtilsTest.java
+++ b/src/test/java/org/jabref/logic/openoffice/oocsltext/CSLFormatUtilsTest.java
@@ -142,9 +142,8 @@ static Stream<Arguments> ooHTMLTransformFromRawHTML() {
 
     /**
      * Test to check correct transformation of raw CSL bibliography generated by citeproc-java methods into OO-ready text.
-     * <p>
-     * <b>Precondition:</b> This test assumes that {@link CitationStyleGenerator#generateBibliography(List, String, CitationStyleOutputFormat, BibDatabaseContext, BibEntryTypesManager) generateBibliography} works as expected.
-     * </p>
+     *
+     * @implSpec Assumes that {@link CitationStyleGenerator#generateBibliography(List, String, CitationStyleOutputFormat, BibDatabaseContext, BibEntryTypesManager) generateBibliography} works as expected.
      */
     @ParameterizedTest
     @MethodSource
@@ -254,9 +253,8 @@ static Stream<Arguments> ooHTMLTransformFromRawBibliography() {
 
     /**
      * Test to check correct transformation of raw CSL citation with a single entry generated by citeproc-java methods into OO-ready text.
-     * <p>
-     * <b>Precondition:</b> This test assumes that {@link CitationStyleGenerator#generateCitation(List, String, CitationStyleOutputFormat, BibDatabaseContext, BibEntryTypesManager) generateCitation} works as expected.
-     * </p>
+     *
+     * @implSpec Assumes that {@link CitationStyleGenerator#generateCitation(List, String, CitationStyleOutputFormat, BibDatabaseContext, BibEntryTypesManager) generateCitation} works as expected.
      */
     @ParameterizedTest
     @MethodSource
@@ -356,9 +354,8 @@ static Stream<Arguments> ooHTMLTransformFromCitationWithSingleEntry() {
 
     /**
      * Test to check correct transformation of raw CSL citations with multiple entries generated by citeproc-java methods into OO-ready text.
-     * <p>
-     * <b>Precondition:</b> This test assumes that {@link CitationStyleGenerator#generateCitation(List, String, CitationStyleOutputFormat, BibDatabaseContext, BibEntryTypesManager) generateCitation} works as expected.
-     * </p>
+     *
+     * @implSpec Assumes that {@link CitationStyleGenerator#generateCitation(List, String, CitationStyleOutputFormat, BibDatabaseContext, BibEntryTypesManager) generateCitation} works as expected.
      */
     @ParameterizedTest
     @MethodSource
@@ -482,10 +479,13 @@ static Stream<Arguments> ooHTMLTransformFromCitationWithMultipleEntries() {
      * Test for modifying the number (index) of a numeric citation.
      * The numeric index should change to the provided "current number".
      * The rest of the citation should stay as it is (other numbers in the body shouldn't be affected).
-     * <p>
-     * <b>Precondition 1:</b> This test assumes that {@link CitationStyleGenerator#generateBibliography(List, String, CitationStyleOutputFormat, BibDatabaseContext, BibEntryTypesManager) generateBibliography} works as expected.<br>
-     * <b>Precondition 2:</b> This test assumes that the method {@link CSLFormatUtils#transformHTML(String) transformHTML} works as expected.<br>
-     * <b>Precondition 3:</b> Run this test ONLY on numeric Citation Styles.</p>
+     *
+     * @implSpec
+     * <ol>
+     * <li>Assumes that {@link CitationStyleGenerator#generateBibliography(List, String, CitationStyleOutputFormat, BibDatabaseContext, BibEntryTypesManager) generateBibliography} works as expected.</li>
+     * <li>Assumes that the method {@link CSLFormatUtils#transformHTML(String) transformHTML} works as expected.</li>
+     * <li>Run this test ONLY on numeric Citation Styles.</li>
+     * </ol>
      */
     @ParameterizedTest
     @MethodSource
@@ -593,8 +593,8 @@ private static Stream<Arguments> ChangeToInText() {
 
     /**
      * Test for proper generation of alphanumeric citations (currently supported: DIN 1505-2).
-     * <p>
-     * <b>Precondition:</b> This test assumes that the method {@link org.jabref.logic.citationkeypattern.BracketedPattern#authorsAlpha authorsAlpha} works as expected.</p>
+     *
+     * @implSpec Assumes that the method {@link org.jabref.logic.citationkeypattern.BracketedPattern#authorsAlpha authorsAlpha} works as expected.</p>
      */
     @ParameterizedTest
     @MethodSource