diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..097f9f98d
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,9 @@
+#
+# https://help.github.com/articles/dealing-with-line-endings/
+#
+# Linux start script should use lf
+/gradlew        text eol=lf
+
+# These are Windows script files and should use crlf
+*.bat           text eol=crlf
+
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index ed72baef9..5713f7507 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -9,10 +9,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 17
           java-package: jdk+fx
       - name: Build and test with gradle
         run: ./gradlew check developTest build
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
deleted file mode 100644
index 1a09867c9..000000000
--- a/.github/workflows/nightly.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-name: Deploy develop nightly
-on:
-  schedule:
-    - cron: '0 0 * * *'
-
-jobs:
-  nightly:
-    name: Deploy nightly
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          ref: develop
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
-        with:
-          java-version: 11
-          java-package: jdk+fx
-      - name: Cache local Maven repository
-        uses: actions/cache@v2
-        with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-maven-
-      - name: Build and test
-        run: ./mvnw -B package
-      - name: Publish to the Maven Central Repository
-        uses: samuelmeuli/action-maven-publish@v1
-        with:
-          gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
-          gpg_passphrase: ${{ secrets.GPG_PASSPHRASE }}
-          nexus_username: ${{ secrets.OSSRH_USERNAME }}
-          nexus_password: ${{ secrets.OSSRH_TOKEN }}
-          maven_profiles: deploy,docker
-          maven_args: --settings .maven.xml
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 8f6da3ad9..abc04fd22 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -2,30 +2,53 @@ name: Release
 on:
   push:
     tags:
-      - '*'
+      - "*"
 
 jobs:
-  build:
+  release:
     runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 1.8
+      - name: Set up JDK 17
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 17
           java-package: jdk+fx
+      - name: Cache local Maven repository
+        uses: actions/cache@v2
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-maven-
+
       - name: Build and test
         run: ./gradlew check developTest build
-      - name: Publish to the Maven Central Repository
-        run: ./gradlew release -PSONATYPE_USERNAME=${{ secrets.OSSRH_USERNAME }} -PSONATYPE_PASSWORD=${{ secrets.OSSRH_TOKEN }}
+
+      - name: SonarCloud Scan
+        run: ./gradlew sonarqube -Dsonar.projectKey=mediathekview_MServer -Dsonar.organization=mediathekview -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=$SONAR_TOKEN
         env:
-          ORG_GRADLE_PROJECT_signingKeyId: CE3BA5E0
-          ORG_GRADLE_PROJECT_signingKey: ${{ secrets.GPG_PRIVATE_KEY }}
-          ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.GPG_PASSPHRASE }}
-      - name: Build and deploy docker
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+
+      - name: Publish docker container
         run: |
           export VERSION=$(find . -name "MServer-*.tar.gz" | sed "s/.*MServer-\(.*\).tar.gz/\1/")
           docker build . -t mediathekview/mserver:$VERSION -t mediathekview/mserver:latest --build-arg VERSION=$VERSION
-          echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
+          echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
           docker push mediathekview/mserver
+        env:
+          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Publish GitHub Release
+        uses: marvinpinto/action-automatic-releases@latest
+        with:
+          repo_token: "${{ secrets.GITHUB_TOKEN }}"
+          automatic_release_tag: "latest"
+          prerelease: false
+          files: |
+            LICENSE.md
+            build/libs/*.jar
+            build/distributions/*
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 91ac0950e..f9e2eca3f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,4 +27,11 @@ logs/
 /.checkstyle
 
 ui/
+
+# Ignore Gradle project-specific cache directory
+.gradle
+
+# Ignore Gradle build output directory
+build
+
 devenv/
\ No newline at end of file
diff --git a/README.md b/README.md
index 325c7fb6f..df8032f69 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ git clone https://github.com/mediathekview/Mlib.git
 ## Bauen und starten an der Kommandozeile
 ```bash
 cd MServer
-./gradlew run
+./gradlew start
 ```
 
 ## Einstellungen
diff --git a/build.gradle b/build.gradle
index 0358b4257..dcd8a2636 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,20 +1,30 @@
-import org.apache.tools.ant.filters.ReplaceTokens
-
 import java.nio.file.Files
 
 plugins {
-    id "com.github.jk1.dependency-license-report" version "1.17"
-    id "org.sonarqube" version "3.3"
+    id 'application'
+    id 'com.github.jk1.dependency-license-report' version "2.0"
+    id "org.sonarqube" version "3.4.0.2513"
+    id 'org.openjfx.javafxplugin' version '0.0.13'
+}
+
+repositories {
+    mavenLocal()
+    // Use Maven Central for resolving dependencies.
+    mavenCentral()
 }
 
-apply plugin: 'java'
-apply plugin: 'distribution'
-apply plugin: 'maven'
-apply plugin: 'signing'
-apply from: "${project.rootDir}/gradle/eclipse.gradle"
+application {
+    // Define the main class for the application.
+    mainClass = 'mServer.Main'
+}
+
+javafx {
+    version = "19"
+    modules = [ 'javafx.base', 'javafx.controls', 'javafx.fxml', 'javafx.graphics', 'javafx.media' ]
+}
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+sourceCompatibility = JavaVersion.VERSION_17
+targetCompatibility = JavaVersion.VERSION_17
 group = 'de.mediathekview'
 archivesBaseName = "MServer"
 version = '3.1.213'
@@ -22,27 +32,30 @@ version = '3.1.213'
 def jarName = 'MServer.jar'
 def mainClass = 'mServer.Main'
 
-compileJava {
-    options.encoding = "UTF-8"
-    options.compilerArgs = ['-Xlint:all']
-}
-compileTestJava {
-    options.encoding = "UTF-8"
-    options.compilerArgs = ['-Xlint:all']
-}
+dependencies {
+    implementation 'de.mediathekview:MLib:3.0.13'
+    implementation 'commons-net:commons-net:3.9.0'
+    implementation 'org.apache.commons:commons-compress:1.22'
+    implementation 'org.apache.commons:commons-text:1.10.0'
+    implementation 'org.tukaani:xz:1.9'
+    implementation 'com.google.code.gson:gson:2.10.1'
+    implementation 'org.glassfish.jersey.core:jersey-client:3.0.8'
+    implementation 'org.glassfish.jersey.inject:jersey-hk2:3.0.8'
+    implementation 'org.jsoup:jsoup:1.15.4'
+    implementation 'javax.activation:activation:1.1.1'
+    implementation 'com.google.guava:guava:31.1-jre'
+    implementation 'org.apache.logging.log4j:log4j-core:2.20.0'
+    implementation 'fm.void.jetm:jetm:1.2.3'
+
+
+    testImplementation 'junit:junit:4.13.2'
+    testImplementation 'org.mockito:mockito-core:4.11.0'
+    testImplementation 'com.squareup.okhttp3:mockwebserver:4.10.0'
+    testImplementation "org.hamcrest:hamcrest-all:1.3"
+    testImplementation 'org.assertj:assertj-core:3.23.1'
 
-task copyRuntimeLibs(type: Copy) {
-    into "libs"
-    from configurations.testRuntime - configurations.runtime
 }
 
-repositories {
-    mavenLocal()
-    mavenCentral()
-    maven {
-        url "https://oss.sonatype.org/content/repositories/snapshots/"
-    }
-}
 
 sourceSets {
     developTest {
@@ -73,11 +86,11 @@ sourceSets {
 
 configurations {
     deployerJars
-    developTestCompile.extendsFrom testCompile
+    developTestImplementation.extendsFrom testImplementation
     developTestRuntime.extendsFrom testRuntime
-    integrationTestCompile.extendsFrom testCompile
+    integrationTestImplementation.extendsFrom testImplementation
     integrationTestRuntime.extendsFrom testRuntime
-    performanceTestCompile.extendsFrom testCompile
+    performanceTestImplementation.extendsFrom testImplementation
     performanceTestRuntime.extendsFrom testRuntime
 }
 
@@ -119,40 +132,6 @@ tasks.withType(Test) {
     reports.html.destination = file("${reporting.baseDir}/${name}")
 }
 
-dependencies {
-    compile 'de.mediathekview:MLib:3.0.13'
-    compile 'commons-net:commons-net:3.9.0'
-    compile 'org.apache.commons:commons-compress:1.22'
-    compile 'org.apache.commons:commons-text:1.10.0'
-    compile 'org.tukaani:xz:1.9'
-    compile 'com.google.code.gson:gson:2.10.1'
-    compile 'org.glassfish.jersey.core:jersey-client:3.0.3'
-    compile 'org.glassfish.jersey.inject:jersey-hk2:3.0.3'
-    compile 'org.jsoup:jsoup:1.15.4'
-    compile 'javax.activation:activation:1.1.1'
-    compile 'com.google.guava:guava:31.1-jre'
-    compile 'org.apache.logging.log4j:log4j-core:2.20.0'
-    compile 'fm.void.jetm:jetm:1.2.3'
-
-    testCompile 'junit:junit:4.13.2'
-    testCompile 'org.mockito:mockito-core:4.11.0'
-    testCompile 'com.squareup.okhttp3:mockwebserver:4.10.0'
-    testCompile "org.hamcrest:hamcrest-all:1.3"
-}
-
-configurations.compile {
-    resolutionStrategy.dependencySubstitution {
-        def substituteIfExists = { String moduleName, String projectName ->
-            if (findProject(projectName)) {
-                assert !(project.hasProperty('org.gradle.configureondemand') && Boolean.valueOf(project.getProperty('org.gradle.configureondemand'))): "org.gradle.configureondemand = true will cause problems when substituting a project"
-                logger.lifecycle "$project: Substituting module '$moduleName' with project $projectName"
-                substitute module(moduleName) with project(projectName)
-            }
-        }
-        substituteIfExists('de.mediathekview:MLib', ':MLib')
-    }
-}
-
 ext {
     propsFile = file('src/main/resources/version.properties').absoluteFile
     if (!propsFile.exists()) {
@@ -166,95 +145,6 @@ def loadVersionProperties() {
     return props
 }
 
-if (project.hasProperty('SONATYPE_USERNAME')) {
-    signing {
-        sign configurations.archives
-    }
-
-    uploadArchives {
-        repositories {
-            mavenDeployer {
-                beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
-
-                repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
-                    authentication(userName: SONATYPE_USERNAME, password: SONATYPE_PASSWORD)
-                }
-
-                snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") {
-                    authentication(userName: SONATYPE_USERNAME, password: SONATYPE_PASSWORD)
-                }
-
-                pom.project {
-                    name project.name
-                    packaging 'jar'
-                    description 'The crawler for mediathekview/MediathekView'
-                    url 'https://github.com/mediathekview/' + project.name
-
-                    scm {
-                        connection 'scm:git:git://github.com/mediathekview/MServer.git'
-                        developerConnection 'scm:git:ssh://github.com:mediathekview/MServer.git'
-                        url 'http://github.com/mediathekview/MServer/tree/master'
-                    }
-
-                    licenses {
-                        license {
-                            name 'GNU General Public License v3.0'
-                            url 'https://www.gnu.org/licenses/gpl.html'
-                        }
-                    }
-
-                    developers {
-                        developer {
-                            id 'Nicklas2751'
-                            name 'Nicklas Wiegandt'
-                            email 'nicklas@mediathekview.de'
-                        }
-                        developer {
-                            id 'derreisende77'
-                            name 'Christian F.'
-                            url 'https://github.com/derreisende77'
-                        }
-                        developer {
-                            id 'pidoubleyou'
-                            name 'Peter W.'
-                            url 'https://github.com/pidoubleyou'
-                        }
-                        developer {
-                            id 'TheSasch'
-                            name 'Sascha Wiegandt'
-                            url 'https://github.com/thesasch'
-                        }
-                        developer {
-                            id 'alex1702'
-                            name 'Alexander Finkhäuser'
-                            url 'https://github.com/alex1702'
-                        }
-                    }
-                }
-            }
-        }
-    }
-    task myJavadocs(type: Javadoc) {
-        source = sourceSets.main.allJava
-        failOnError = false
-    }
-
-    task javadocJar(type: Jar) {
-
-        classifier = 'javadoc'
-        from myJavadocs
-    }
-
-    task sourcesJar(type: Jar) {
-        classifier = 'sources'
-        from sourceSets.main.allSource
-    }
-
-    artifacts {
-        archives javadocJar, sourcesJar
-    }
-}
-build.dependsOn(install)
 task updateVersion {
     doLast {
         Properties props = loadVersionProperties()
@@ -290,7 +180,7 @@ jar {
     manifest {
         attributes(
                 'Main-Class': mainClass,
-                'Class-Path': configurations.runtime.files.collect { "lib/$it.name" }.join(' ')
+                'Class-Path': configurations.compileClasspath.files.collect { "lib/$it.name" }.join(' ')
         )
     }
     archiveName = jarName
@@ -298,20 +188,16 @@ jar {
 
 distributions {
     main {
-        baseName = 'MServer'
         contents {
-            into('lib') {
-                from configurations.compile
-            }
             from('dist') {
                 filesMatching('**/*.sh') {
-                    filter(ReplaceTokens, tokens: [JARNAME: jarName])
+                    filter(org.apache.tools.ant.filters.ReplaceTokens, tokens: [JARNAME: jarName])
                 }
                 filesMatching('**/*.txt') {
-                    filter(ReplaceTokens, tokens: [JARNAME: jarName])
+                    filter(org.apache.tools.ant.filters.ReplaceTokens, tokens: [JARNAME: jarName])
                 }
                 filesMatching('**/*.command') {
-                    filter(ReplaceTokens, tokens: [JARNAME: jarName])
+                    filter(org.apache.tools.ant.filters.ReplaceTokens, tokens: [JARNAME: jarName])
                 }
             }
             from('build/libs') {
@@ -325,9 +211,9 @@ distributions {
 }
 
 /**
- * This is how you pass arguments: "./gradlew run -Pargs=arg1,arg2,arg3
+ * This is how you pass arguments: "./gradlew start -Pargs=arg1,arg2,arg3
  */
-task run(type: JavaExec, dependsOn: classes) {
+task start(type: JavaExec, dependsOn: classes) {
     main = mainClass
     classpath = sourceSets.main.runtimeClasspath
 
@@ -383,5 +269,4 @@ sonarqube {
     properties {
         property "sonar.projectKey", "mediathekview_MServer"
     }
-}
-
+}
\ No newline at end of file
diff --git a/gradle/eclipse.gradle b/gradle/eclipse.gradle
deleted file mode 100644
index 4bb60a25d..000000000
--- a/gradle/eclipse.gradle
+++ /dev/null
@@ -1,14 +0,0 @@
-import org.gradle.plugins.ide.eclipse.model.AccessRule
-
-apply plugin: 'eclipse'
-
-eclipse {
-    classpath {
-        file {
-            whenMerged {
-                def jre = entries.find { it.path.contains 'org.eclipse.jdt.launching.JRE_CONTAINER' }
-                jre.accessRules.add(new AccessRule('0', 'javafx/**'))
-            }
-        }
-    }
-}
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 91ca28c8b..249e5832f 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 dc72a4583..ae04661ee 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Fri May 24 00:56:15 CEST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
diff --git a/gradlew b/gradlew
index cccdd3d51..a69d9cb6c 100755
--- a/gradlew
+++ b/gradlew
@@ -1,78 +1,129 @@
-#!/usr/bin/env sh
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+APP_BASE_NAME=${0##*/}
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -81,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    JAVACMD=java
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -89,84 +140,101 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
 fi
 
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
     # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
         fi
-        i=$((i+1))
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
     done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=$(save "$@")
-
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
 fi
 
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
 exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index e95643d6a..f127cfd49 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,84 +1,91 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/settings.gradle b/settings.gradle
index 0ace534aa..de4cec677 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-rootProject.name = 'MServer'
\ No newline at end of file
+rootProject.name = 'MServer'
diff --git a/src/main/java/mServer/crawler/AddToFilmlist.java b/src/main/java/mServer/crawler/AddToFilmlist.java
index a2fa815dc..4c51aa526 100644
--- a/src/main/java/mServer/crawler/AddToFilmlist.java
+++ b/src/main/java/mServer/crawler/AddToFilmlist.java
@@ -12,7 +12,9 @@
 import de.mediathekview.mlib.tool.Hash;
 import de.mediathekview.mlib.tool.Log;
 import de.mediathekview.mlib.tool.MVHttpClient;
-import java.util.Optional;
+
+import java.util.*;
+
 import mServer.crawler.sender.base.UrlUtils;
 import mServer.crawler.sender.orf.OrfVideoInfoDTO;
 import mServer.tool.MserverDaten;
@@ -23,10 +25,7 @@
 
 import java.io.IOException;
 import java.net.SocketTimeoutException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
+import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
@@ -201,7 +200,7 @@ private void removeTimeFromMdrAktuell(ListeFilme listeEinsortieren) {
   private void startThreads() {
     final OkHttpClient client = MVHttpClient.getInstance().getReducedTimeOutClient();
 
-    List syncList = Collections.synchronizedList(listeEinsortieren);
+    Queue<DatenFilm> syncList = new LinkedBlockingQueue<>(listeEinsortieren);
     for (int i = 0; i < NUMBER_OF_THREADS; ++i) {
       ImportOldFilmlistThread t = new ImportOldFilmlistThread(syncList, client);
       t.setName("ImportOldFilmlistThread Thread-" + i);
@@ -296,13 +295,13 @@ private int retrieveThreadResults() {
 
   private class ImportOldFilmlistThread extends Thread {
 
-    private final List<DatenFilm> listeOld;
+    private final Queue<DatenFilm> listeOld;
     private final ArrayList<DatenFilm> localAddList = new ArrayList<>(
         (vonListe.size() / NUMBER_OF_THREADS) + 500);
     private int treffer = 0;
     private OkHttpClient client = null;
 
-    public ImportOldFilmlistThread(List<DatenFilm> listeOld, OkHttpClient client) {
+    public ImportOldFilmlistThread(Queue<DatenFilm> listeOld, OkHttpClient client) {
       this.listeOld = listeOld;
       threadCounter.incrementAndGet();
       this.client = client;
@@ -328,19 +327,11 @@ private void addOld(DatenFilm film) {
       localAddList.add(film);
     }
 
-    private synchronized DatenFilm popOld(List<DatenFilm> listeOld) {
-      if (!listeOld.isEmpty()) {
-        return listeOld.remove(0);
-      } else {
-        return null;
-      }
-    }
-
     @Override
     public void run() {
 
       DatenFilm film;
-      while (!isInterrupted() && (film = popOld(listeOld)) != null) {
+      while (!isInterrupted() && (film = listeOld.poll()) != null) {
         final String url = film.arr[DatenFilm.FILM_URL];
         if (film.arr[DatenFilm.FILM_GROESSE].isEmpty()) {
           Request request = createOnlineCheckRequest(url);
diff --git a/src/test/developTest/java/mServer/crawler/AddToFilmlistTest.java b/src/test/developTest/java/mServer/crawler/AddToFilmlistTest.java
index f0b5acf27..c9b6af2d2 100644
--- a/src/test/developTest/java/mServer/crawler/AddToFilmlistTest.java
+++ b/src/test/developTest/java/mServer/crawler/AddToFilmlistTest.java
@@ -15,6 +15,7 @@
 import okhttp3.mockwebserver.MockResponse;
 import okhttp3.mockwebserver.MockWebServer;
 import okhttp3.mockwebserver.RecordedRequest;
+import org.assertj.core.api.Assertions;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -247,11 +248,14 @@ public void testReplaceOrfAudioDescriptionNaming() {
     AddToFilmlist target = new AddToFilmlist(list, listToAdd);
     target.addOldList();
 
-    assertThat(list.size(), equalTo(4));
-    assertThat(list.get(2).arr[DatenFilm.FILM_THEMA], equalTo("Film"));
-    assertThat(list.get(2).arr[DatenFilm.FILM_TITEL], equalTo("Film Testfilm (Audiodeskription)"));
-    assertThat(list.get(3).arr[DatenFilm.FILM_THEMA], equalTo("AD | Film"));
-    assertThat(list.get(3).arr[DatenFilm.FILM_TITEL], equalTo("AD | Film ARD"));
+    Assertions.assertThat(list).hasSize(4)
+            .anySatisfy(film -> checkFilmThemaAndTitle(film, "Film", "Film Testfilm (Audiodeskription)"))
+            .anySatisfy(film -> checkFilmThemaAndTitle(film, "AD | Film", "AD | Film ARD"));
+  }
+
+  private void checkFilmThemaAndTitle(DatenFilm film, final String expectedThema, final String expectedTitle) {
+    Assertions.assertThat(film.arr[DatenFilm.FILM_THEMA]).isEqualTo(expectedThema);
+    Assertions.assertThat(film.arr[DatenFilm.FILM_TITEL]).isEqualTo(expectedTitle);
   }
 
   @Test
@@ -263,13 +267,10 @@ public void testReplaceSrfAudioDescriptionNaming() {
     AddToFilmlist target = new AddToFilmlist(list, listToAdd);
     target.addOldList();
 
-    assertThat(list.size(), equalTo(5));
-    assertThat(list.get(2).arr[DatenFilm.FILM_THEMA], equalTo("Film"));
-    assertThat(list.get(2).arr[DatenFilm.FILM_TITEL], equalTo("Testfilm (Staffel 1) (Audiodeskription)"));
-    assertThat(list.get(3).arr[DatenFilm.FILM_THEMA], equalTo("Film"));
-    assertThat(list.get(3).arr[DatenFilm.FILM_TITEL], equalTo("Testfilm2 (Audiodeskription)"));
-    assertThat(list.get(4).arr[DatenFilm.FILM_THEMA], equalTo("Film mit Audiodeskription"));
-    assertThat(list.get(4).arr[DatenFilm.FILM_TITEL], equalTo("Testfilm mit Audiodeskription"));
+    Assertions.assertThat(list).hasSize(5)
+            .anySatisfy(film -> checkFilmThemaAndTitle(film, "Film", "Testfilm (Staffel 1) (Audiodeskription)"))
+            .anySatisfy(film -> checkFilmThemaAndTitle(film, "Film", "Testfilm2 (Audiodeskription)"))
+            .anySatisfy(film -> checkFilmThemaAndTitle(film, "Film mit Audiodeskription", "Testfilm mit Audiodeskription"));
   }
 
   @Test