Remove forced audio tracks & minor refactoring

2026-02-11 10:05:58 +01:00 · 2024-05-27 22:31:34 +02:00
46 changed files with 708 additions and 1135 deletions
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -3,35 +3,27 @@
 name: Build and release
 on:
  release:
-    types: [ created ]
+    types: [created]

 jobs:
-  portable-build:
+  build:
    runs-on: ubuntu-latest
    steps:
-      - name: Install mkvtoolnix
-        run: sudo apt-get install -y mkvtoolnix
-
      - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2

-      - name: Set timezone
-        uses: szenius/set-timezone@v2.0
-        with:
-          timezoneLinux: "Europe/Berlin"
-
-      - name: Set up JDK 21
-        uses: actions/setup-java@v4.7.0
+      - name: Set up JDK 11
+        uses: actions/setup-java@v2
        with:
          distribution: temurin
-          java-version: 21
+          java-version: 11

      - name: Setup workspace
        run: mkdir artifacts

      - name: Build with Maven
        run: |
-          mvn clean package --file pom.xml -P portable
+          mvn clean package --file pom.xml
          cp target/M*.{zip,tar} artifacts/

      - name: Upload artifacts
@@ -40,37 +32,4 @@ jobs:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        with:
          args: 'artifacts/M*'
-
-  windows-installer-build:
-    runs-on: windows-latest
-    steps:
-      - name: Install mkvtoolnix
-        uses: crazy-max/ghaction-chocolatey@v3
-        with:
-          args: install mkvtoolnix -y
-
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Set timezone
-        uses: szenius/set-timezone@v2.0
-        with:
-          timezoneWindows: "Berlin Standard Time"
-
-      - name: Set up JDK 21
-        uses: actions/setup-java@v4.7.0
-        with:
-          distribution: temurin
-          java-version: 21
-
-      - name: Setup workspace
-        run: mkdir artifacts
-
-      - name: Build with Maven
-        run: mvn clean package --file pom.xml -P windows
-
-      - name: Upload artifacts
-        uses: AButler/upload-release-assets@v3.0
-        with:
-          files: 'target/installer/*'
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
+        
--- a/README.md
+++ b/README.md
@@ -1,62 +1,49 @@
 ## Introduction

-A streamlined solution for managing MKV files, this program leverages MKVToolNix to modify audio and subtitle track properties without the need for time-consuming file reencoding. Users can easily set their track preferences, and the application intelligently applies the best matching configuration. The tool focuses on metadata modification rather than full file rewriting, ensuring quick operations while maintaining the original file integrity. This makes it an ideal choice for managing multilingual media collections or batch processing multiple MKV files.
-
+This program helps to change audio and subtitle tracks of mkv files without rewriting the file. Only track properties will be updated.
 ![](https://github.com/RatzzFatzz/MKVAudioSubtitleChanger/blob/master/example.gif)

 ## Requirements

- - Java 21 or newer
+ - Java 11 or higher
 - mkvtoolnix installation
 
 ## Execution
-### Minimal usage
-Portable: `java -jar mkvaudiosubtitlechanger-<version>.jar --library "X:/Files" --attribute-config eng:ger eng:OFF`
+**Minimal usage:**
+`java -jar mkvaudiosubtitlechanger.jar --library "X:/Files" --attribute-config eng:ger eng:OFF`

-Windows (installed): `mkvaudiosubtitlechanger.jar --library "X:/Files" --attribute-config eng:ger eng:OFF`
+**Safe usage (best for testing before applying to whole library):**
+`java -jar mkvaudiosubtitlechanger.jar --library "X:/Files" --attribute-config eng:ger eng:OFF --safe-mode`

-### Safe usage (best for testing before applying to whole library)
-Portable: `java -jar mkvaudiosubtitlechanger-<version>.jar --library "X:/Files" --attribute-config eng:ger eng:OFF --safe-mode`
-
-Windows (installed): `mkvaudiosubtitlechanger.jar --library "X:/Files" --attribute-config eng:ger eng:OFF --safe-mode`
-
-**Attribute-config must be entered in pairs: `audio:subtitle`; Example: `jpn:eng`. More about this topic
-[here](https://github.com/RatzzFatzz/MKVAudioSubtitleChanger/wiki/Attribute-Config).**
+Attribute-config must be entered in pairs: `audio:subtitle`; Example: `jpn:eng`. More about this topic
+[here](https://github.com/RatzzFatzz/MKVAudioSubtitleChanger/wiki/Attribute-Config).

 ## Available parameters
 ```
-  -a, --attribute-config=<attributeConfig>...
-                            List of audio:subtitle pairs used to match in order and update files accordingly (e.g. jpn:eng jpn:ger)
-  -c, --coherent=<coherent> try to match all files in dir of depth with the same attribute config
-      -cf, --force-coherent changes are only applied if it's a coherent match
-      --commentary-keywords=<commentaryKeywords>[, <commentaryKeywords>...]...
-                            Keywords to identify commentary tracks (Defaults will be overwritten; Default: commentary, director)
-  -d, --filter-date=<filterDate>
-                            only consider files created newer than entered date (format: "dd.MM.yyyy-HH:mm:ss")
-  -e, --excluded-directory=<excludedDirectories>...
-                            Directories to be excluded, combines with config file
-      --forced-keywords=<forcedKeywords>[, <forcedKeywords>...]...
-                            Keywords to identify forced tracks (Defaults will be overwritten; Default: forced, signs, songs)
-  -h, --help                Show this help message and exit.
-  -i, --include-pattern=<includePattern>
-                            include files matching pattern (default: ".*")
-  -l, --library=<libraryPath>
-                            path to library
-  -m, --mkvtoolnix=<mkvToolNix>
-                            path to mkvtoolnix installation
-  -n, --only-new-file       sets filter-date to last successful execution (overwrites input of filter-date)
-      --preferred-subtitles=<preferredSubtitles>[, <preferredSubtitles>...]...
-                            Keywords to prefer specific subtitle tracks (Defaults will be overwritten; Default: unstyled)
-  -s, --safemode            test run (no files will be changes)
-  -t, --threads=<threads>   thread count (default: 2)
-  -V, --version             Print version information and exit.
+ -l,--library-path <arg>           Path to library
+ -a,--attribute-config <arg>       Attribute config to decide which tracks to choose when
+ -p,--config-path <arg>            Path to config file
+ -m,--mkvtoolnix <arg>             Path to mkv tool nix installation
+ -s,--safe-mode                    Test run (no files will be changes)
+ -c,--coherent <arg>               Try to match all files in dir of depth with the same config
+ -cf,--force-coherent              Force coherent and don't update anything if config fits not whole config (default: false)
+ -n,--only-new-files               Sets filter-date to last successful execution (Overwrites input of filter-date)
+ -d,--filter-date <arg>            Only consider files created newer than entered date (format: "dd.MM.yyyy-HH:mm:ss")
+ -t,--threads <arg>                Thread count (default: 2)
+ -i,--include-pattern <arg>        Include files matching pattern (default: ".*")
+ -e,--excluded-directories <arg>   Directories to be excluded, combines with config file
+ -fk,--forced-keywords <arg>       Additional keywords to identify forced tracks
+ -ck,--commentary-keywords <arg>   Additional keywords to identify commentary tracks
+ -ps,--preferred-subtitles <arg>   Additional keywords to prefer specific subtitle tracks
+ -v,--version                      Display version
+ -h,--help                         "For help this is" - Yoda
 ```
-If you need more information how each parameter works, check out [this wiki page](https://github.com/RatzzFatzz/MKVAudioSubtitleChanger/wiki/Parameters-v4).
+If you need more information about how each parameter works, check out [this wiki page](https://github.com/RatzzFatzz/MKVAudioSubtitleChanger/wiki/Parameters).

-All parameters can also be defined in a [config file](https://picocli.info/#_argument_files_for_long_command_lines).
+All parameters can also be defined in a [config file](https://github.com/RatzzFatzz/MKVAudioSubtitleChanger/wiki/How-to-config-file).

 ## Build requirements
- JDK 21 or newer
+- JDK 11 or higher
 - Maven 3
 - Git

@@ -64,5 +51,5 @@ All parameters can also be defined in a [config file](https://picocli.info/#_arg
 ```shell
 git clone https://github.com/RatzzFatzz/MKVAudioSubtitleChanger.git
 cd MKVAudioSubtitleChanger
-mvn clean package -Pportable
+mvn package
 ```
--- a/example.gif
+++ b/example.gif
--- a/pom.xml
+++ b/pom.xml
@@ -6,135 +6,21 @@

    <groupId>at.pcgamingfreaks</groupId>
    <artifactId>MKVAudioSubtitleChanger</artifactId>
-    <version>4.0.0</version>
-
-    <properties>
-        <mainClass>at.pcgamingfreaks.mkvaudiosubtitlechanger.Main</mainClass>
-
-        <lombok-version>1.18.36</lombok-version>
-    </properties>
-
-    <profiles>
-        <profile>
-            <id>portable</id>
-            <build>
-                <resources>
-                    <resource>
-                        <directory>src/main/resources</directory>
-                        <includes>
-                            <include>log4j2.yml</include>
-                            <include>log4j2-debug.yml</include>
-                        </includes>
-                    </resource>
-                </resources>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-assembly-plugin</artifactId>
-                        <version>3.3.0</version>
-                        <executions>
-                            <execution>
-                                <id>archive</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>single</goal>
-                                </goals>
-                                <configuration>
-                                    <appendAssemblyId>false</appendAssemblyId>
-                                    <descriptors>
-                                        <descriptor>maven/assembly.xml</descriptor>
-                                    </descriptors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>windows</id>
-            <build>
-                <resources>
-                    <resource>
-                        <directory>src/main/resources</directory>
-                        <includes>
-                            <include>log4j2-installed.yaml</include>
-                        </includes>
-                    </resource>
-                </resources>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-resources-plugin</artifactId>
-                        <version>3.3.1</version>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.panteleyev</groupId>
-                        <artifactId>jpackage-maven-plugin</artifactId>
-                        <version>1.6.5</version>
-                        <executions>
-                            <execution>
-                                <id>windows</id>
-                                <configuration>
-                                    <resourceDir>${project.basedir}/src/main/resources/</resourceDir>
-                                    <type>EXE</type>
-                                    <winConsole>true</winConsole>
-                                    <winShortcut>false</winShortcut>
-                                    <winMenu>false</winMenu>
-                                    <javaOptions>
-                                        <javaOption>-Dlog4j.configurationFile=log4j2-installed.yaml</javaOption>
-                                    </javaOptions>
-                                </configuration>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>jpackage</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>linux</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.panteleyev</groupId>
-                        <artifactId>jpackage-maven-plugin</artifactId>
-                        <version>1.4.0</version>
-                        <executions>
-                            <execution>
-                                <id>linux-deb</id>
-                                <configuration>
-                                    <type>DEB</type>
-                                    <installDir>/usr/local/bin</installDir>
-                                    <linuxShortcut>false</linuxShortcut>
-                                    <linuxPackageName>mkvasc</linuxPackageName>
-                                    <linuxDebMaintainer>your@email.com</linuxDebMaintainer>
-                                </configuration>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>jpackage</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
+    <version>3.0.2</version>

    <build>
        <defaultGoal>clean package</defaultGoal>
        <sourceDirectory>src/main/java</sourceDirectory>
        <testSourceDirectory>src/test/java</testSourceDirectory>
        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+            </resource>
            <resource>
                <directory>./</directory>
                <includes>
                    <include>language-codes</include>
                    <include>project.properties</include>
-                    <include>LICENSE</include>
                </includes>
                <filtering>true</filtering>
            </resource>
@@ -149,11 +35,11 @@
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-jar-plugin</artifactId>
-                <version>3.4.2</version>
+                <version>3.2.2</version>
                <configuration>
                    <archive>
                        <manifestEntries>
-                            <Main-Class>${mainClass}</Main-Class>
+                            <Main-Class>at/pcgamingfreaks/mkvaudiosubtitlechanger/Main</Main-Class>
                        </manifestEntries>
                    </archive>
                </configuration>
@@ -161,7 +47,7 @@
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-shade-plugin</artifactId>
-                <version>3.6.0</version>
+                <version>3.4.1</version>
                <executions>
                    <execution>
                        <phase>package</phase>
@@ -190,79 +76,36 @@
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.5.2</version>
+                <version>2.22.2</version>
            </plugin>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.13.0</version>
                <configuration>
-                    <source>21</source>
-                    <target>21</target>
-                    <compilerArgs>
-                        <arg>-Aproject=${project.groupId}/${project.artifactId}</arg>
-                    </compilerArgs>
-                    <annotationProcessorPaths>
-                        <path>
-                            <groupId>org.projectlombok</groupId>
-                            <artifactId>lombok</artifactId>
-                            <version>${lombok-version}</version>
-                        </path>
-                        <path>
-                            <groupId>info.picocli</groupId>
-                            <artifactId>picocli-codegen</artifactId>
-                            <version>4.7.6</version>
-                        </path>
-                    </annotationProcessorPaths>
+                    <source>11</source>
+                    <target>11</target>
                </configuration>
            </plugin>
-
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>3.3.0</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <appendAssemblyId>false</appendAssemblyId>
+                            <descriptors>
+                                <descriptor>maven/assembly.xml</descriptor>
+                            </descriptors>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
        </plugins>
-
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <artifactId>maven-resources-plugin</artifactId>
-                    <version>3.3.1</version>
-                    <executions>
-                        <execution>
-                            <id>copy-jpackage-input</id>
-                            <phase>package</phase>
-                            <goals>
-                                <goal>copy-resources</goal>
-                            </goals>
-                            <configuration>
-                                <outputDirectory>${project.build.directory}/jpackage-input</outputDirectory>
-                                <resources>
-                                    <resource>
-                                        <directory>${project.build.directory}</directory>
-                                        <includes>
-                                            <include>${project.artifactId}-${project.version}.jar</include>
-                                        </includes>
-                                    </resource>
-                                </resources>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
-                <plugin>
-                    <groupId>org.panteleyev</groupId>
-                    <artifactId>jpackage-maven-plugin</artifactId>
-                    <version>1.4.0</version>
-                    <configuration>
-                        <name>${project.artifactId}</name>
-                        <vendor>RatzzFatzz</vendor>
-                        <appVersion>${project.version}</appVersion>
-
-                        <destination>target/installer</destination>
-
-                        <input>target/jpackage-input</input>
-                        <mainClass>at.pcgamingfreaks.mkvaudiosubtitlechanger.Main</mainClass>
-                        <mainJar>${project.artifactId}-${project.version}.jar</mainJar>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
    </build>

    <repositories>
@@ -273,139 +116,86 @@
    </repositories>

    <dependencies>
-        <!-- https://mvnrepository.com/artifact/com.intellij/forms_rt -->
        <dependency>
            <groupId>com.intellij</groupId>
            <artifactId>forms_rt</artifactId>
            <version>7.0.3</version>
        </dependency>
-        <!-- https://mvnrepository.com/artifact/org.projectlombok/lombok -->
        <dependency>
            <groupId>org.projectlombok</groupId>
            <artifactId>lombok</artifactId>
-            <version>${lombok-version}</version>
+            <version>1.18.24</version>
            <scope>provided</scope>
        </dependency>
-        <!-- https://mvnrepository.com/artifact/info.picocli/picocli -->
-        <dependency>
-            <groupId>info.picocli</groupId>
-            <artifactId>picocli</artifactId>
-            <version>4.7.6</version>
-        </dependency>
-
-        <!-- Hibernate Validator -->
-        <!-- https://mvnrepository.com/artifact/org.hibernate.validator/hibernate-validator -->
-        <dependency>
-            <groupId>org.hibernate.validator</groupId>
-            <artifactId>hibernate-validator</artifactId>
-            <version>8.0.2.Final</version>
-        </dependency>
-
-        <!-- Expression Language Implementation -->
-        <!-- https://mvnrepository.com/artifact/jakarta.el/jakarta.el-api -->
-        <dependency>
-            <groupId>jakarta.el</groupId>
-            <artifactId>jakarta.el-api</artifactId>
-            <version>6.0.1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.glassfish</groupId>
-            <artifactId>jakarta.el</artifactId>
-            <version>5.0.0-M1</version>
-        </dependency>
-
-        <!-- Jakarta Bean Validation -->
-        <!-- https://mvnrepository.com/artifact/jakarta.validation/jakarta.validation-api -->
-        <dependency>
-            <groupId>jakarta.validation</groupId>
-            <artifactId>jakarta.validation-api</artifactId>
-            <version>3.0.2</version>
-        </dependency>
-
        <!-- region logging -->
-        <!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-api -->
        <dependency>
            <groupId>org.apache.logging.log4j</groupId>
            <artifactId>log4j-api</artifactId>
-            <version>2.24.3</version>
+            <version>2.18.0</version>
        </dependency>
-        <!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core -->
        <dependency>
            <groupId>org.apache.logging.log4j</groupId>
            <artifactId>log4j-core</artifactId>
-            <version>2.24.3</version>
+            <version>2.18.0</version>
        </dependency>
        <!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-slf4j18-impl -->
-        <!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-slf4j2-impl -->
        <dependency>
            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j2-impl</artifactId>
-            <version>2.24.3</version>
+            <artifactId>log4j-slf4j18-impl</artifactId>
+            <version>2.18.0</version>
        </dependency>
-
-        <!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.dataformat/jackson-dataformat-yaml -->
        <dependency>
            <groupId>com.fasterxml.jackson.dataformat</groupId>
            <artifactId>jackson-dataformat-yaml</artifactId>
-            <version>2.18.2</version>
+            <version>2.13.4</version>
        </dependency>
-
-        <!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind -->
        <dependency>
            <groupId>com.fasterxml.jackson.core</groupId>
            <artifactId>jackson-databind</artifactId>
-            <version>2.18.2</version>
+            <version>2.13.4.2</version>
        </dependency>
-        <!-- https://mvnrepository.com/artifact/commons-cli/commons-cli -->
        <dependency>
            <groupId>commons-cli</groupId>
            <artifactId>commons-cli</artifactId>
-            <version>1.9.0</version>
+            <version>1.5.0</version>
        </dependency>
-        <!-- https://mvnrepository.com/artifact/org.apache.commons/commons-lang3 -->
        <dependency>
            <groupId>org.apache.commons</groupId>
            <artifactId>commons-lang3</artifactId>
-            <version>3.17.0</version>
+            <version>3.12.0</version>
        </dependency>
-        <!-- https://mvnrepository.com/artifact/me.tongfei/progressbar -->
        <dependency>
            <groupId>me.tongfei</groupId>
            <artifactId>progressbar</artifactId>
-            <version>0.10.1</version>
+            <version>0.9.5</version>
        </dependency>
        <!-- endregion -->
        <!-- region unit-tests -->
-        <!-- https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-api -->
        <dependency>
            <groupId>org.junit.jupiter</groupId>
            <artifactId>junit-jupiter-api</artifactId>
-            <version>5.11.4</version>
+            <version>5.9.0</version>
            <scope>test</scope>
        </dependency>
-        <!-- https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-engine -->
        <dependency>
            <groupId>org.junit.jupiter</groupId>
            <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.11.4</version>
+            <version>5.9.0</version>
            <scope>test</scope>
        </dependency>
-        <!-- https://mvnrepository.com/artifact/org.mockito/mockito-core -->
+        <!-- https://mvnrepository.com/artifact/org.mockito/mockito-all -->
        <dependency>
            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <version>5.15.2</version>
+            <artifactId>mockito-all</artifactId>
+            <version>1.10.19</version>
            <scope>test</scope>
        </dependency>
-        <!-- https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-params -->
        <dependency>
            <groupId>org.junit.jupiter</groupId>
            <artifactId>junit-jupiter-params</artifactId>
-            <version>5.11.4</version>
+            <version>5.9.0</version>
            <scope>test</scope>
        </dependency>
-
        <!-- endregion -->
        <dependency>
            <groupId>at.pcgamingfreaks</groupId>
@@ -416,7 +206,7 @@
        <dependency>
            <groupId>net.harawata</groupId>
            <artifactId>appdirs</artifactId>
-            <version>1.3.0</version>
+            <version>1.2.1</version>
        </dependency>
    </dependencies>

--- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/Main.java
+++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/Main.java
@@ -1,69 +1,21 @@
 package at.pcgamingfreaks.mkvaudiosubtitlechanger;

 import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.Config;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.ConfigLoader;
 import at.pcgamingfreaks.mkvaudiosubtitlechanger.impl.CachedMkvFileProcessor;
 import at.pcgamingfreaks.mkvaudiosubtitlechanger.impl.kernel.AttributeUpdaterKernel;
 import at.pcgamingfreaks.mkvaudiosubtitlechanger.impl.kernel.CoherentAttributeUpdaterKernel;
 import at.pcgamingfreaks.mkvaudiosubtitlechanger.impl.kernel.DefaultAttributeUpdaterKernel;
 import at.pcgamingfreaks.mkvaudiosubtitlechanger.impl.MkvFileCollector;
-import at.pcgamingfreaks.mkvaudiosubtitlechanger.util.ProjectUtil;
-import jakarta.validation.ConstraintViolation;
-import jakarta.validation.Validation;
-import jakarta.validation.Validator;
-import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
-import picocli.CommandLine;
-
-import java.util.Set;

@Slf4j
-@CommandLine.Command(
-        name = "mkvaudiosubtitlechanger",
-        usageHelpWidth = 120,
-        customSynopsis = {
-                "mkvaudiosubtitlechanger -a <attributeConfig>... -l <libraryPath> [-s]",
-                "Example: mkvaudiosubtitlechanger -a eng:eng eng:ger -l /mnt/media/ -s",
-                ""
-        },
-        mixinStandardHelpOptions = true,
-        versionProvider = ProjectUtil.class
-)
-public class Main implements Runnable {
-
-    @Getter
-    @CommandLine.ArgGroup(exclusive = false)
-    private Config config;
-
-    @CommandLine.Spec
-    CommandLine.Model.CommandSpec spec;
-
-    @Override
-    public void run() {
-        validate();
-        Config.setInstance(config);
+public class Main {
+    public static void main(String[] args) {
+        ConfigLoader.initConfig(args);
        AttributeUpdaterKernel kernel = Config.getInstance().getCoherent() != null
                ? new CoherentAttributeUpdaterKernel(new MkvFileCollector(), new CachedMkvFileProcessor())
                : new DefaultAttributeUpdaterKernel(new MkvFileCollector(), new CachedMkvFileProcessor());
        kernel.execute();
    }
-
-    private void validate() {
-        Validator validator = Validation.buildDefaultValidatorFactory().getValidator();
-        Set<ConstraintViolation<Config>> violations = validator.validate(config);
-
-        if (!violations.isEmpty()) {
-            StringBuilder errorMsg = new StringBuilder();
-            for (ConstraintViolation<Config> violation : violations) {
-                errorMsg.append("ERROR: ").append(violation.getPropertyPath()).append(" ").append(violation.getMessage()).append("\n");
-            }
-            throw new CommandLine.ParameterException(spec.commandLine(), errorMsg.toString());
-        }
-    }
-
-    public static void main(String[] args) {
-        if (args.length == 0) {
-            args = new String[] { "--help" };
-        }
-        new CommandLine(Main.class).execute(args);
-    }
 }
--- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/AttributeConfigConverter.java
+++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/AttributeConfigConverter.java
@@ -1,58 +0,0 @@
-package at.pcgamingfreaks.mkvaudiosubtitlechanger.config;
-
-import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.AttributeConfig;
-import picocli.CommandLine;
-
-import java.util.regex.Pattern;
-
-import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.LanguageValidatorUtil.isAudioLanguageValid;
-import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.LanguageValidatorUtil.isLanguageValid;
-
-public class AttributeConfigConverter implements CommandLine.ITypeConverter<AttributeConfig> {
-    private static final String SEPARATOR = ":";
-    private static final Pattern PATTERN = Pattern.compile("^.{3}:.{3}$");
-
-    /**
-     * Converts the input string into an AttributeConfig object.
-     *
-     * @param s The input string containing audio and subtitle language configuration in format "audioLang:subtitleLang"
-     * @return An AttributeConfig object representing the parsed configuration
-     * @throws CommandLine.TypeConversionException if the input string is invalid or contains invalid language codes
-     */
-    @Override
-    public AttributeConfig convert(String s) throws Exception {
-        validateInput(s);
-
-        String[] split = s.split(SEPARATOR);
-        AttributeConfig attr = new AttributeConfig(split[0], split[1]);
-
-        validateResult(attr);
-
-        return attr;
-    }
-
-    /**
-     * Validates that the input string matches the expected pattern.
-     *
-     * @param s String to validate
-     * @throws CommandLine.TypeConversionException if the value doesn't match the expected pattern
-     */
-    private static void validateInput(String s) {
-        if (!PATTERN.matcher(s).matches()) {
-            throw new CommandLine.TypeConversionException("Invalid Attribute config: " + s);
-        }
-    }
-
-    /**
-     * Validates that both language codes in the AttributeConfig object are valid.
-     *
-     * @param attr AttributeConfig object to validate
-     * @throws CommandLine.TypeConversionException if either language code is invalid
-     */
-    private static void validateResult(AttributeConfig attr) {
-        if (!isAudioLanguageValid(attr.getAudioLanguage()))
-            throw new CommandLine.TypeConversionException("Audio language invalid: " + attr.getAudioLanguage());
-        if (!isLanguageValid(attr.getSubtitleLanguage()))
-            throw new CommandLine.TypeConversionException("Subtitle language invalid: " + attr.getSubtitleLanguage());
-    }
-}
--- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/Config.java
+++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/Config.java
@@ -2,97 +2,51 @@ package at.pcgamingfreaks.mkvaudiosubtitlechanger.config;

 import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.AttributeConfig;
 import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.MkvToolNix;
-import jakarta.validation.constraints.Min;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.SystemUtils;
-import picocli.CommandLine;
+import org.apache.commons.cli.CommandLineParser;
+import org.apache.commons.cli.DefaultParser;
+import org.apache.commons.cli.HelpFormatter;

 import java.io.File;
-import java.nio.file.Path;
 import java.util.*;
 import java.util.regex.Pattern;

@Slf4j
@Getter
@Setter
-@NoArgsConstructor
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
 public class Config {
    @Getter(AccessLevel.NONE)
    @Setter(AccessLevel.NONE)
    private static Config config = null;
-
+    @Getter(AccessLevel.NONE)
+    CommandLineParser parser = new DefaultParser();
+    @Getter(AccessLevel.NONE)
+    HelpFormatter formatter = new HelpFormatter();
    private File configPath;
-
-    @CommandLine.Spec
-    CommandLine.Model.CommandSpec spec;
-
-    @CommandLine.Option(names = {"-a", "--attribute-config"}, required = true, arity = "1..*", converter = AttributeConfigConverter.class,
-            description = "List of audio:subtitle pairs used to match in order and update files accordingly (e.g. jpn:eng jpn:ger)")
-    private List<AttributeConfig> attributeConfig;
-
-    @Setter(AccessLevel.NONE)
    private File libraryPath;
-
-    @CommandLine.Option(names = {"-s", "--safemode"}, description = "test run (no files will be changes)")
-    private boolean safeMode;
-
-    @Setter(AccessLevel.NONE)
+    @Getter(AccessLevel.NONE)
    private File mkvToolNix;

-    @Min(value = 1)
-    @CommandLine.Option(names = {"-t", "--threads"}, defaultValue = "2", description = "thread count (default: ${DEFAULT-VALUE})")
    private int threads;
-
-    @CommandLine.Option(names = {"-c", "--coherent"}, description = "try to match all files in dir of depth with the same attribute config")
-    private Integer coherent;
-    @CommandLine.Option(names = {"-cf", "--force-coherent"}, description = "changes are only applied if it's a coherent match")
-    private boolean forceCoherent;
-
-    @CommandLine.Option(names = {"-n", "--only-new-file"}, description = "sets filter-date to last successful execution (overwrites input of filter-date)")
-    private boolean onlyNewFiles;
-    @CommandLine.Option(names = {"-d", "--filter-date"}, defaultValue = CommandLine.Option.NULL_VALUE, description = "only consider files created newer than entered date (format: \"dd.MM.yyyy-HH:mm:ss\")")
-    private Date filterDate;
-    @CommandLine.Option(names = {"-i", "--include-pattern"}, defaultValue = ".*", description = "include files matching pattern (default: \".*\")")
    private Pattern includePattern;
-    @CommandLine.Option(names = {"-e", "--excluded-directory"}, arity = "1..*",
-            description = "Directories to be excluded, combines with config file")
+    private boolean safeMode;
+
+    private Integer coherent;
+    private boolean forceCoherent;
+    private boolean onlyNewFiles;
+    private Date filterDate;
+
+    private Set<String> forcedKeywords = new HashSet<>(Arrays.asList("forced", "signs", "songs"));
+    private Set<String> commentaryKeywords = new HashSet<>(Arrays.asList("commentary", "director"));
    private Set<String> excludedDirectories = new HashSet<>();
+    private Set<String> preferredSubtitles = new HashSet<>(Arrays.asList("unstyled"));

-    @CommandLine.Option(names = {"--forced-keywords"}, arity = "1..*", defaultValue = "forced, signs, songs", split = ", ",
-            description = "Keywords to identify forced tracks (Defaults will be overwritten; Default: ${DEFAULT-VALUE})")
-    private Set<String> forcedKeywords;
-    @CommandLine.Option(names = {"--commentary-keywords"}, arity = "1..*", defaultValue = "commentary, director", split = ", ",
-            description = "Keywords to identify commentary tracks (Defaults will be overwritten; Default: ${DEFAULT-VALUE})")
-    private Set<String> commentaryKeywords;
-    @CommandLine.Option(names = {"--preferred-subtitles"}, arity = "1..*", defaultValue = "unstyled", split = ", ",
-            description = "Keywords to prefer specific subtitle tracks (Defaults will be overwritten; Default: ${DEFAULT-VALUE})")
-    private Set<String> preferredSubtitles;
-
-    @CommandLine.Option(names = {"-l", "--library"}, required = true, description = "path to library")
-    public void setLibraryPath(File libraryPath) {
-        if (!libraryPath.exists()) throw new CommandLine.ParameterException(spec.commandLine(), "Path does not exist: " + libraryPath.getAbsolutePath());
-        this.libraryPath = libraryPath;
-    }
-
-    static {
-        // Set default value into system properties to picocli can read the conditional value
-        System.setProperty("DEFAULT_MKV_TOOL_NIX", SystemUtils.IS_OS_WINDOWS ? "C:\\Program Files\\MKVToolNix" : "/usr/bin/");
-    }
-
-    @CommandLine.Option(names = {"-m", "--mkvtoolnix"}, defaultValue = "${DEFAULT_MKV_TOOL_NIX}", description = "path to mkvtoolnix installation")
-    public void setMkvToolNix(File mkvToolNix) {
-        this.mkvToolNix = mkvToolNix;
-        if (!mkvToolNix.exists()
-                || !Path.of(getPathFor(MkvToolNix.MKV_MERGE, SystemUtils.IS_OS_WINDOWS)).toFile().exists()
-                || !Path.of(getPathFor(MkvToolNix.MKV_PROP_EDIT, SystemUtils.IS_OS_WINDOWS)).toFile().exists()) {
-            throw new CommandLine.ParameterException(spec.commandLine(),
-                    "Invalid path to mkvtoolnix installation: " + mkvToolNix.getAbsolutePath());
-        }
-    }
+    private List<AttributeConfig> attributeConfig;

    public static Config getInstance() {
        return getInstance(false);
@@ -105,23 +59,14 @@ public class Config {
        return config;
    }

-    public static void setInstance(Config c) {
-        config = c;
-    }
-
    /**
     * Get path to specific mkvtoolnix application.
     *
     * @return absolute path to desired application.
     */
    public String getPathFor(MkvToolNix application) {
-        return mkvToolNix.getAbsolutePath().endsWith("/")
-                ? mkvToolNix.getAbsolutePath() + application
-                : mkvToolNix.getAbsolutePath() + "/" + application;
-    }
-
-    public String getPathFor(MkvToolNix application, boolean isWindows) {
-        return getPathFor(application) + (isWindows ? ".exe" : "");
+        return mkvToolNix.getAbsolutePath().endsWith("/") ? mkvToolNix.getAbsolutePath() + application :
+                    mkvToolNix.getAbsolutePath() + "/" + application;
    }

    public String getNormalizedLibraryPath() {
@@ -131,6 +76,8 @@ public class Config {
    @Override
    public String toString() {
        return new StringJoiner(", ", Config.class.getSimpleName() + "[", "]")
+                .add("parser=" + parser)
+                .add("formatter=" + formatter)
                .add("configPath=" + configPath)
                .add("libraryPath=" + libraryPath)
                .add("mkvToolNix=" + mkvToolNix)
--- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/ConfigLoader.java
+++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/ConfigLoader.java
@@ -0,0 +1,110 @@
+package at.pcgamingfreaks.mkvaudiosubtitlechanger.config;
+
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.validator.*;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.util.ProjectUtil;
+import at.pcgamingfreaks.yaml.YAML;
+import at.pcgamingfreaks.yaml.YamlInvalidContentException;
+import org.apache.commons.cli.*;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.List;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty.*;
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.CommandLineOptionsUtil.optionOf;
+
+public class ConfigLoader {
+    private static final List<ConfigValidator<?>> VALIDATORS = Stream.of(
+            new ConfigPathValidator(CONFIG_PATH, false),
+            new PathValidator(LIBRARY, true, null),
+            new ThreadValidator(THREADS, false, 2),
+            new MkvToolNixPathValidator(MKV_TOOL_NIX, true, Path.of("C:\\Program Files\\MKVToolNix").toFile()),
+            new BooleanValidator(SAFE_MODE, false),
+            new BooleanValidator(ONLY_NEW_FILES, false),
+            new DateValidator(FILTER_DATE, false),
+            new PatternValidator(INCLUDE_PATTERN, false, Pattern.compile(".*")),
+            new SetValidator(FORCED_KEYWORDS, false, true),
+            new SetValidator(COMMENTARY_KEYWORDS, false, true),
+            new SetValidator(EXCLUDED_DIRECTORY, false, true),
+            new SetValidator(PREFERRED_SUBTITLES, false, true),
+            new AttributeConfigValidator(),
+            new CoherentConfigValidator(COHERENT, false),
+            new BooleanValidator(FORCE_COHERENT, false)
+    ).sorted(Comparator.comparing((ConfigValidator<?> validator) -> validator.getWeight()).reversed()).collect(Collectors.toList());
+
+    public static void initConfig(String[] args) {
+        HelpFormatter formatter = new HelpFormatter();
+        formatter.setOptionComparator(null);
+        YAML yamlConfig = null;
+
+        Options options = initOptions();
+        CommandLine cmd = parseCommandLineArgs(formatter, options, args);
+
+        exitIfHelp(cmd, options, formatter);
+        exitIfVersion(cmd);
+
+        List<ValidationResult> results = new ArrayList<>();
+
+        for (ConfigValidator<?> validator: VALIDATORS) {
+            results.add(validator.validate(yamlConfig, cmd));
+            if (yamlConfig == null) {
+                try {
+                    yamlConfig = Config.getInstance().getConfigPath() != null
+                            ? new YAML(Config.getInstance().getConfigPath())
+                            : new YAML("");
+                } catch (IOException | YamlInvalidContentException ignored) {}
+            }
+        }
+
+        if (results.contains(ValidationResult.INVALID) || results.contains(ValidationResult.MISSING)) System.exit(1);
+        System.out.println();
+    }
+
+    private static Options initOptions() {
+        Options options = new Options();
+        Arrays.stream(ConfigProperty.values())
+                .filter(prop -> prop.abrv() != null)
+                .map(prop -> optionOf(prop, prop.abrv(), prop.args()))
+                .forEach(options::addOption);
+        return options;
+    }
+
+    private static CommandLine parseCommandLineArgs(HelpFormatter formatter, Options options, String[] args) {
+        CommandLineParser parser = new DefaultParser();
+
+        try {
+            CommandLine cmd = parser.parse(options, args);
+            if (cmd == null) throw new NullPointerException();
+            return cmd;
+        } catch (ParseException | NullPointerException e) {
+            formatter.printHelp(130, "java -jar MKVAudioSubtitlesChanger.jar -l <path_to_library>",
+                    "\nParameters:", options,
+                    "\nFeature requests and bug reports: https://github.com/RatzzFatzz/MKVAudioSubtitleChanger/issues");
+            System.exit(1);
+        }
+        return null; // can't be reached
+    }
+
+    private static void exitIfHelp(CommandLine cmd, Options options, HelpFormatter formatter) {
+        if (cmd.hasOption(HELP.prop())) {
+            formatter.printHelp(130, "java -jar MKVAudioSubtitlesChanger.jar -l <path_to_library>",
+                    "\nParameters:", options,
+                    "\nFeature requests and bug reports: https://github.com/RatzzFatzz/MKVAudioSubtitleChanger/issues");
+            System.exit(0);
+        }
+    }
+
+    private static void exitIfVersion(CommandLine cmd) {
+        if (cmd.hasOption(VERSION.prop())) {
+            System.out.printf("MKV Audio Subtitle Changer Version %s%n", ProjectUtil.getVersion());
+            System.exit(0);
+        }
+    }
+}
--- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/ValidationResult.java
+++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/ValidationResult.java
@@ -1,6 +1,5 @@
 package at.pcgamingfreaks.mkvaudiosubtitlechanger.config;

-@Deprecated
 public enum ValidationResult {
    VALID,
    DEFAULT,
--- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/validator/AttributeConfigValidator.java
+++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/validator/AttributeConfigValidator.java
@@ -13,7 +13,6 @@ import java.util.stream.Collectors;
 import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.LanguageValidatorUtil.isAudioLanguageValid;
 import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.LanguageValidatorUtil.isLanguageValid;

-@Deprecated
 public class AttributeConfigValidator extends ConfigValidator<List<AttributeConfig>> {
    private static final String SEPARATOR = ":";

--- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/validator/BooleanValidator.java
+++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/validator/BooleanValidator.java
@@ -12,7 +12,6 @@ import java.util.function.BiFunction;

 import static at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty.ARGUMENTS;

-@Deprecated
 public class BooleanValidator extends ConfigValidator<Boolean> {

    public BooleanValidator(ConfigProperty property, boolean required) {
--- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/validator/CoherentConfigValidator.java
+++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/validator/CoherentConfigValidator.java
@@ -3,7 +3,6 @@ package at.pcgamingfreaks.mkvaudiosubtitlechanger.config.validator;
 import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty;
 import org.apache.commons.lang3.math.NumberUtils;

-@Deprecated
 public class CoherentConfigValidator extends ConfigValidator<Integer> {
    private static final Integer DISABLED = -1;

--- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/validator/ConfigPathValidator.java
+++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/validator/ConfigPathValidator.java
@@ -7,7 +7,6 @@ import java.io.File;
 import java.util.Optional;
 import java.util.function.BiFunction;

-@Deprecated
 public class ConfigPathValidator extends PathValidator {
    public ConfigPathValidator(ConfigProperty property, boolean required) {
        super(property, required, null);
--- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/validator/ConfigValidator.java
+++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/validator/ConfigValidator.java
@@ -19,7 +19,6 @@ import java.util.function.Predicate;

@Slf4j
@RequiredArgsConstructor
-@Deprecated
 public abstract class ConfigValidator<FieldType> {
    protected final ConfigProperty property;
    protected final boolean required;
--- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/validator/DateValidator.java
+++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/validator/DateValidator.java
@@ -15,7 +15,6 @@ import java.nio.file.Path;
 import java.util.Date;

@Slf4j
-@Deprecated
 public class DateValidator extends ConfigValidator<Date> {
    private static final Date INVALID_DATE = new Date(0);
    private static final Date DEFAULT_DATE = new Date(1000);
--- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/validator/MkvToolNixPathValidator.java
+++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/validator/MkvToolNixPathValidator.java
@@ -5,10 +5,9 @@ import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty;
 import java.io.File;
 import java.nio.file.Path;

-import static at.pcgamingfreaks.mkvaudiosubtitlechanger.model.MkvToolNix.MKV_MERGE;
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.model.MkvToolNix.MKV_MERGER;
 import static at.pcgamingfreaks.mkvaudiosubtitlechanger.model.MkvToolNix.MKV_PROP_EDIT;

-@Deprecated
 public class MkvToolNixPathValidator extends PathValidator {
    private static final String EXE = ".exe";

@@ -19,9 +18,9 @@ public class MkvToolNixPathValidator extends PathValidator {
    @Override
    protected boolean isValid(File result) {
        return result.isDirectory()
-                && (Path.of(result.getAbsolutePath() + "/" + MKV_MERGE + EXE).toFile().isFile()
+                && (Path.of(result.getAbsolutePath() + "/" + MKV_MERGER + EXE).toFile().isFile()
                && Path.of(result.getAbsolutePath() + "/" + MKV_PROP_EDIT + EXE).toFile().isFile())
-                || (Path.of(result.getAbsolutePath() + "/" + MKV_MERGE).toFile().isFile()
+                || (Path.of(result.getAbsolutePath() + "/" + MKV_MERGER).toFile().isFile()
                && Path.of(result.getAbsolutePath() + "/" + MKV_PROP_EDIT).toFile().isFile());
    }
 }
--- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/validator/PathValidator.java
+++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/validator/PathValidator.java
@@ -5,7 +5,6 @@ import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty;
 import java.io.File;
 import java.nio.file.Path;

-@Deprecated
 public class PathValidator extends ConfigValidator<File> {

    public PathValidator(ConfigProperty property, boolean required, File defaultValue) {
--- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/validator/PatternValidator.java
+++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/validator/PatternValidator.java
@@ -5,7 +5,6 @@ import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;

-@Deprecated
 public class PatternValidator extends ConfigValidator<Pattern> {
    private static final Pattern EMPTY_PATTERN = Pattern.compile("");

--- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/validator/SetValidator.java
+++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/validator/SetValidator.java
@@ -13,7 +13,6 @@ import java.util.*;
 import java.util.function.BiFunction;
 import java.util.stream.Collectors;

-@Deprecated
 public class SetValidator extends ConfigValidator<Set<String>> {
    private final boolean append;

--- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/validator/ThreadValidator.java
+++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/validator/ThreadValidator.java
@@ -3,7 +3,6 @@ package at.pcgamingfreaks.mkvaudiosubtitlechanger.config.validator;
 import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty;
 import org.apache.commons.lang3.math.NumberUtils;

-@Deprecated
 public class ThreadValidator extends ConfigValidator<Integer>{
    public ThreadValidator(ConfigProperty property, boolean required, Integer defaultValue) {
        super(property, required, defaultValue);
--- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/MkvFileProcessor.java
+++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/MkvFileProcessor.java
@@ -39,7 +39,7 @@ public class MkvFileProcessor implements FileProcessor {
        Map<String, Object> jsonMap;
        List<FileAttribute> fileAttributes = new ArrayList<>();
        try {
-            String command = format("\"%s\"", Config.getInstance().getPathFor(MkvToolNix.MKV_MERGE));
+            String command = format("\"%s\"", Config.getInstance().getPathFor(MkvToolNix.MKV_MERGER));
            String[] arguments = new String[]{
                    command,
                    "--identify",
--- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/kernel/AttributeUpdaterKernel.java
+++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/impl/kernel/AttributeUpdaterKernel.java
@@ -19,7 +19,6 @@ import me.tongfei.progressbar.ProgressBar;
 import me.tongfei.progressbar.ProgressBarBuilder;
 import me.tongfei.progressbar.ProgressBarStyle;
 import net.harawata.appdirs.AppDirsFactory;
-import picocli.CommandLine;

 import java.io.File;
 import java.io.IOException;
--- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/MkvToolNix.java
+++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/model/MkvToolNix.java
@@ -4,7 +4,7 @@ import lombok.AllArgsConstructor;

@AllArgsConstructor
 public enum MkvToolNix {
-    MKV_MERGE("mkvmerge"),
+    MKV_MERGER("mkvmerge"),
    MKV_PROP_EDIT("mkvpropedit");

    private final String file;
--- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/util/LanguageValidatorUtil.java
+++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/util/LanguageValidatorUtil.java
@@ -24,7 +24,7 @@ public class LanguageValidatorUtil {
    }

    public static boolean isAudioLanguageValid(String language) {
-        return !language.equals("OFF") && isLanguageValid(language);
+        return !language.equals("OFF") && ISO3_LANGUAGES.contains(language);
    }

    public static boolean isLanguageValid(String language) {
--- a/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/util/ProjectUtil.java
+++ b/src/main/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/util/ProjectUtil.java
@@ -1,12 +1,10 @@
 package at.pcgamingfreaks.mkvaudiosubtitlechanger.util;

-import picocli.CommandLine;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Properties;

-public class ProjectUtil implements CommandLine.IVersionProvider {
+public class ProjectUtil {
    private static final Properties PROJECT_PROPERTIES = new Properties();

    static {
@@ -17,8 +15,8 @@ public class ProjectUtil implements CommandLine.IVersionProvider {
        }
    }

-    public String[] getVersion() {
-        return new String[] {getProjectName() + " " + PROJECT_PROPERTIES.getProperty("version")};
+    public static String getVersion() {
+        return PROJECT_PROPERTIES.getProperty("version");
    }

    public static String getProjectName() {
--- a/src/main/resources/log4j2-dev.yaml
+++ b/src/main/resources/log4j2-dev.yaml
@@ -7,27 +7,13 @@ Configuration:
        Pattern: "%d{DEFAULT} | %-5level | %thread | %msg %n %throwable"
      ThresholdFilter:
        level: debug
-    RollingFile:
+    File:
      name: FileAppender
-      fileName: logs/application.log
-      filePattern: logs/archive/application-%d{yyyy-MM-dd}-%i.log.gz
+      fileName: default.log
      PatternLayout:
        Pattern: "%d{DEFAULT} | %-5level | %thread | %msg %n %throwable"
      ThresholdFilter:
        level: debug
-      Policies:
-        OnStartupTriggeringPolicy:
-          minSize: 0
-      DefaultRolloverStrategy:
-        max: 30
-        Delete:
-          basePath: logs/archive
-          maxDepth: 1
-          IfLastModified:
-            age: 30d
-          IfAccumulatedFileSize:
-            exceeds: 1GB
-
  Loggers:
    Root:
      level: debug
--- a/src/main/resources/log4j2-installed.yaml
+++ b/src/main/resources/log4j2-installed.yaml
@@ -1,34 +0,0 @@
-Configuration:
-  name: DefaultLogger
-  Appenders:
-    RollingFile:
-      name: FileAppender
-      fileName: ${sys:user.home}/AppData/Roaming/MKVAudioSubtitleChanger/logs/application.log
-      filePattern: ${sys:user.home}/AppData/Roaming/MKVAudioSubtitleChanger/logs/archive/application-%d{yyyy-MM-dd}-%i.log.gz
-      PatternLayout:
-        Pattern: "%d{DEFAULT} | %-5level | %thread | %msg %n %throwable"
-      ThresholdFilter:
-        level: info
-      Policies:
-        OnStartupTriggeringPolicy:
-          minSize: 0
-      DefaultRolloverStrategy:
-        max: 30
-        Delete:
-          basePath: logs/archive
-          maxDepth: 1
-          IfLastModified:
-            age: 30d
-          IfAccumulatedFileSize:
-            exceeds: 1GB
-
-  Loggers:
-    Root:
-      level: info
-      AppenderRef:
-        - ref: FileAppender
-    Logger:
-      name: "com.zaxxer.hikari.HikariConfig"
-      level: info
-      AppenderRef:
-        - ref: FileAppender
--- a/src/main/resources/log4j2.yaml
+++ b/src/main/resources/log4j2.yaml
@@ -1,27 +1,13 @@
 Configuration:
  name: DefaultLogger
  Appenders:
-    RollingFile:
+    File:
      name: FileAppender
-      fileName: logs/application.log
-      filePattern: logs/archive/application-%d{yyyy-MM-dd}-%i.log.gz
+      fileName: default.log
      PatternLayout:
        Pattern: "%d{DEFAULT} | %-5level | %thread | %msg %n %throwable"
      ThresholdFilter:
        level: info
-      Policies:
-        OnStartupTriggeringPolicy:
-          minSize: 0
-      DefaultRolloverStrategy:
-        max: 30
-        Delete:
-          basePath: logs/archive
-          maxDepth: 1
-          IfLastModified:
-            age: 30d
-          IfAccumulatedFileSize:
-            exceeds: 1GB
-
  Loggers:
    Root:
      level: info
--- a/src/main/resources/main.wxs
+++ b/src/main/resources/main.wxs
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
-     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
-
-  <?ifdef JpIsSystemWide ?>
-    <?define JpInstallScope="perMachine"?>
-  <?else?>
-    <?define JpInstallScope="perUser"?>
-  <?endif?>
-
-  <?define JpProductLanguage=1033 ?>
-  <?define JpInstallerVersion=200 ?>
-  <?define JpCompressedMsi=yes ?>
-
-  <?ifdef JpAllowUpgrades ?>
-    <?define JpUpgradeVersionOnlyDetectUpgrade="no"?>
-  <?else?>
-    <?define JpUpgradeVersionOnlyDetectUpgrade="yes"?>
-  <?endif?>
-  <?ifdef JpAllowDowngrades ?>
-    <?define JpUpgradeVersionOnlyDetectDowngrade="no"?>
-  <?else?>
-    <?define JpUpgradeVersionOnlyDetectDowngrade="yes"?>
-  <?endif?>
-
-  <?define JpProductCode="*"?>
-  <?define JpAppName="MKVAudioSubtitleChanger"?>
-  <?define JpAppVersion="4.0.0"?>
-  <?define JpAppVendor="RatzzFatzz"?>
-  <?define JpProductUpgradeCode="a9527300-d364-4cc3-a392-94035065d8c9"?>
-  <?define JpAppDescription="Change audio and subtitle tracks for .mkv files"?>
-  <?define JpHelpURL="github.com/RatzzFatzz"?>
-
-  <Product
-    Id="$(var.JpProductCode)"
-    Name="$(var.JpAppName)"
-    Language="$(var.JpProductLanguage)"
-    Version="$(var.JpAppVersion)"
-    Manufacturer="$(var.JpAppVendor)"
-    UpgradeCode="$(var.JpProductUpgradeCode)">
-
-    <Package
-      Description="$(var.JpAppDescription)"
-      Manufacturer="$(var.JpAppVendor)"
-      InstallerVersion="$(var.JpInstallerVersion)"
-      Compressed="$(var.JpCompressedMsi)"
-      InstallScope="$(var.JpInstallScope)" Platform="x64"
-    />
-
-    <Media Id="1" Cabinet="Data.cab" EmbedCab="yes" />
-
-    <Upgrade Id="$(var.JpProductUpgradeCode)">
-      <UpgradeVersion
-        OnlyDetect="$(var.JpUpgradeVersionOnlyDetectUpgrade)"
-        Property="JP_UPGRADABLE_FOUND"
-        Maximum="$(var.JpAppVersion)"
-        MigrateFeatures="yes"
-        IncludeMaximum="$(var.JpUpgradeVersionOnlyDetectUpgrade)" />
-      <UpgradeVersion
-        OnlyDetect="$(var.JpUpgradeVersionOnlyDetectDowngrade)"
-        Property="JP_DOWNGRADABLE_FOUND"
-        Minimum="$(var.JpAppVersion)"
-        MigrateFeatures="yes"
-        IncludeMinimum="$(var.JpUpgradeVersionOnlyDetectDowngrade)" />
-    </Upgrade>
-
-    <?ifndef JpAllowUpgrades ?>
-    <CustomAction Id="JpDisallowUpgrade" Error="!(loc.DisallowUpgradeErrorMessage)" />
-    <?endif?>
-    <?ifndef JpAllowDowngrades ?>
-    <CustomAction Id="JpDisallowDowngrade" Error="!(loc.DowngradeErrorMessage)" />
-    <?endif?>
-
-    <Binary Id="JpCaDll" SourceFile="wixhelper.dll"/>
-
-    <CustomAction Id="JpFindRelatedProducts" BinaryKey="JpCaDll" DllEntry="FindRelatedProductsEx" />
-
-    <!-- Standard required root -->
-    <Directory Id="TARGETDIR" Name="SourceDir"/>
-
-    <Feature Id="DefaultFeature" Title="!(loc.MainFeatureTitle)" Level="1">
-      <ComponentGroupRef Id="Shortcuts"/>
-      <ComponentGroupRef Id="Files"/>
-      <ComponentGroupRef Id="FileAssociations"/>
-      <Component Id="pathEnvironmentVariable" Guid="$(var.JpProductUpgradeCode)" KeyPath="yes" Directory="TARGETDIR">
-        <Environment Id="MyPathVariable" Name="Path" Value="[INSTALLDIR]" Action="set" System="no" Permanent="no" Part="last" Separator=";" />
-      </Component>
-    </Feature>
-
-    <CustomAction Id="JpSetARPINSTALLLOCATION" Property="ARPINSTALLLOCATION" Value="[INSTALLDIR]" />
-    <CustomAction Id="JpSetARPCOMMENTS" Property="ARPCOMMENTS" Value="$(var.JpAppDescription)" />
-    <CustomAction Id="JpSetARPCONTACT" Property="ARPCONTACT" Value="$(var.JpAppVendor)" />
-<!--     <CustomAction Id="JpSetARPSIZE" Property="ARPSIZE" Value="$(var.JpAppSizeKb)" /> -->
-
-    <?ifdef JpHelpURL ?>
-      <CustomAction Id="JpSetARPHELPLINK" Property="ARPHELPLINK" Value="$(var.JpHelpURL)" />
-    <?endif?>
-
-    <?ifdef JpAboutURL ?>
-      <CustomAction Id="JpSetARPURLINFOABOUT" Property="ARPURLINFOABOUT" Value="$(var.JpAboutURL)" />
-    <?endif?>
-
-    <?ifdef JpUpdateURL ?>
-      <CustomAction Id="JpSetARPURLUPDATEINFO" Property="ARPURLUPDATEINFO" Value="$(var.JpUpdateURL)" />
-    <?endif?>
-
-    <?ifdef JpIcon ?>
-    <Property Id="ARPPRODUCTICON" Value="JpARPPRODUCTICON"/>
-    <Icon Id="JpARPPRODUCTICON" SourceFile="$(var.JpIcon)"/>
-    <?endif?>
-
-    <UIRef Id="JpUI"/>
-
-    <InstallExecuteSequence>
-      <Custom Action="JpSetARPINSTALLLOCATION" After="CostFinalize">Not Installed</Custom>
-      <Custom Action="JpSetARPCOMMENTS" After="CostFinalize">Not Installed</Custom>
-      <Custom Action="JpSetARPCONTACT" After="CostFinalize">Not Installed</Custom>
-<!--       <Custom Action="JpSetARPSIZE" After="CostFinalize">Not Installed</Custom> -->
-      <?ifdef JpHelpURL ?>
-        <Custom Action="JpSetARPHELPLINK" After="CostFinalize">Not Installed</Custom>
-      <?endif?>
-      <?ifdef JpAboutURL ?>
-        <Custom Action="JpSetARPURLINFOABOUT" After="CostFinalize">Not Installed</Custom>
-      <?endif?>
-      <?ifdef JpUpdateURL ?>
-        <Custom Action="JpSetARPURLUPDATEINFO" After="CostFinalize">Not Installed</Custom>
-      <?endif?>
-
-      <?ifndef JpAllowUpgrades ?>
-      <Custom Action="JpDisallowUpgrade" After="JpFindRelatedProducts">JP_UPGRADABLE_FOUND</Custom>
-      <?endif?>
-      <?ifndef JpAllowDowngrades ?>
-      <Custom Action="JpDisallowDowngrade" After="JpFindRelatedProducts">JP_DOWNGRADABLE_FOUND</Custom>
-      <?endif?>
-      <RemoveExistingProducts Before="CostInitialize"/>
-      <Custom Action="JpFindRelatedProducts" After="FindRelatedProducts"/>
-    </InstallExecuteSequence>
-
-    <InstallUISequence>
-      <Custom Action="JpFindRelatedProducts" After="FindRelatedProducts"/>
-    </InstallUISequence>
-
-  </Product>
-</Wix>
--- a/src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/AttributeConfigTest.java
+++ b/src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/AttributeConfigTest.java
@@ -1,61 +0,0 @@
-package at.pcgamingfreaks.mkvaudiosubtitlechanger.config;
-
-import at.pcgamingfreaks.mkvaudiosubtitlechanger.Main;
-import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.AttributeConfig;
-
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.Arguments;
-import org.junit.jupiter.params.provider.MethodSource;
-import picocli.CommandLine;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Stream;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-class AttributeConfigTest {
-
-    private static Stream<Arguments> provideTestCases() {
-        return Stream.of(
-                Arguments.of(args("-a", "jpn:ger"), attrConf("jpn", "ger")),
-                Arguments.of(args("-a", "jpn:ger", "jpn:eng"), attrConf("jpn", "ger", "jpn", "eng")),
-                Arguments.of(args("-a", "jpn:ger", "jpn:OFF"), attrConf("jpn", "ger", "jpn", "OFF"))
-        );
-    }
-
-    @ParameterizedTest
-    @MethodSource("provideTestCases")
-    void validate(String[] cmdArgs, List<AttributeConfig> expectedConfig) {
-        Main underTest = new Main();
-        CommandLine.populateCommand(underTest, cmdArgs);
-        assertIterableEquals(expectedConfig, underTest.getConfig().getAttributeConfig());
-    }
-
-    @Test
-    void validate() {
-        Main sut = new Main();
-        assertThrows(CommandLine.MissingParameterException.class, () -> CommandLine.populateCommand(sut, new String[]{"-l", "/"}));
-        assertThrows(CommandLine.MissingParameterException.class, () -> CommandLine.populateCommand(sut, new String[]{"-l", "/", "-a"}));
-        assertThrows(CommandLine.ParameterException.class, () -> CommandLine.populateCommand(sut, new String[]{"-l", "/", "-a", "ger:"}));
-        assertThrows(CommandLine.ParameterException.class,
-                () -> CommandLine.populateCommand(sut, new String[]{"-l", "/", "-a", "ger:qwf"})); // Invalid language code
-    }
-
-    private static String[] args(String... args) {
-        String[] staticArray = new String[]{"-l", "/"};
-        String[] result = new String[staticArray.length + args.length];
-        System.arraycopy(staticArray, 0, result, 0, staticArray.length);
-        System.arraycopy(args, 0, result, staticArray.length, args.length);
-        return result;
-    }
-
-    private static List<AttributeConfig> attrConf(String... languages) {
-        List<AttributeConfig> conf = new ArrayList<>();
-        for (int i = 0; i < languages.length; i += 2) {
-            conf.add(new AttributeConfig(languages[i], languages[i+1]));
-        }
-        return conf;
-    }
-}
--- a/src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/BooleanConfigParameterTest.java
+++ b/src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/BooleanConfigParameterTest.java
@@ -1,37 +0,0 @@
-package at.pcgamingfreaks.mkvaudiosubtitlechanger.config;
-
-import at.pcgamingfreaks.mkvaudiosubtitlechanger.Main;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.Arguments;
-import org.junit.jupiter.params.provider.MethodSource;
-import picocli.CommandLine;
-
-import java.util.function.Function;
-import java.util.stream.Stream;
-
-import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.TestUtil.args;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-class BooleanConfigParameterTest {
-
-    private static Stream<Arguments> provideTestCases() {
-        return Stream.of(
-                Arguments.of(args("-s"), true, (Function<Config, Boolean>) Config::isSafeMode),
-                Arguments.of(args("--safemode"), true, (Function<Config, Boolean>) Config::isSafeMode),
-                Arguments.of(args(), false, (Function<Config, Boolean>) Config::isSafeMode),
-                Arguments.of(args("-cf"), true, (Function<Config, Boolean>) Config::isForceCoherent),
-                Arguments.of(args("--force-coherent"), true, (Function<Config, Boolean>) Config::isForceCoherent),
-                Arguments.of(args(), false, (Function<Config, Boolean>) Config::isForceCoherent),
-                Arguments.of(args("-n"), true, (Function<Config, Boolean>) Config::isOnlyNewFiles),
-                Arguments.of(args(), false, (Function<Config, Boolean>) Config::isOnlyNewFiles)
-        );
-    }
-
-    @ParameterizedTest
-    @MethodSource("provideTestCases")
-    void validate(String[] cmdArgs, boolean expected, Function<Config, Boolean> fieldUnderTest) {
-        Main sut = new Main();
-        CommandLine.populateCommand(sut, cmdArgs);
-        assertEquals(expected, fieldUnderTest.apply(sut.getConfig()));
-    }
-}
--- a/src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/ConfigLoaderTest.java
+++ b/src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/ConfigLoaderTest.java
@@ -2,36 +2,34 @@ package at.pcgamingfreaks.mkvaudiosubtitlechanger.config;

 import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.AttributeConfig;
 import org.junit.jupiter.api.Test;
-import picocli.CommandLine;

 import java.util.List;

 import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.PathUtils.TEST_FILE;
 import static org.junit.jupiter.api.Assertions.*;

-class ConfigTest {
+class ConfigLoaderTest {

    @Test
    void initConfig() {
-        String[] sut = new String[]{"-a", "ger:ger", "eng:eng", "-l", TEST_FILE,
+        String[] sut = new String[]{"-a", "ger:ger", "-l", TEST_FILE,
                "-s", "-cf", "-n",
                "-c", "2",
                "-t", "4",
                "-i", ".*[abc].*",
-                "--forced-keywords", "testForced",
-                "--commentary-keywords", "testCommentary",
-                "--preferred-subtitles", "testPreferred"
+                "-fk", "testForced",
+                "-ck", "testCommentary",
+                "-ps", "testPreferred"
        };
-        CommandLine.populateCommand(Config.getInstance(), sut);
+        ConfigLoader.initConfig(sut);

        assertTrue(Config.getInstance().getLibraryPath().exists());
-        assertEquals(List.of(new AttributeConfig("ger", "ger"), new AttributeConfig("eng", "eng")),
-                Config.getInstance().getAttributeConfig());
+        assertEquals(List.of(new AttributeConfig("ger", "ger")), Config.getInstance().getAttributeConfig());

        assertTrue(Config.getInstance().isSafeMode());
        assertTrue(Config.getInstance().isForceCoherent());
        assertTrue(Config.getInstance().isOnlyNewFiles());
-        assertNull(Config.getInstance().getFilterDate());
+        assertNotNull(Config.getInstance().getFilterDate());

        assertEquals(2, Config.getInstance().getCoherent());
        assertEquals(4, Config.getInstance().getThreads());
--- a/src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/IntegerConfigParameterTest.java
+++ b/src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/IntegerConfigParameterTest.java
@@ -1,50 +0,0 @@
-package at.pcgamingfreaks.mkvaudiosubtitlechanger.config;
-
-import at.pcgamingfreaks.mkvaudiosubtitlechanger.Main;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.Arguments;
-import org.junit.jupiter.params.provider.MethodSource;
-import picocli.CommandLine;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.function.Function;
-import java.util.stream.Stream;
-
-import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.TestUtil.args;
-import static org.junit.jupiter.api.Assertions.*;
-
-class IntegerConfigParameterTest {
-
-    private static Stream<Arguments> provideTestCases() {
-        return Stream.of(
-                Arguments.of(args(), 2, (Function<Config, Integer>) Config::getThreads),
-                Arguments.of(args("-t", "5"), 5, (Function<Config, Integer>) Config::getThreads),
-                Arguments.of(args("--threads", "5"), 5, (Function<Config, Integer>) Config::getThreads)
-        );
-    }
-
-    @ParameterizedTest
-    @MethodSource("provideTestCases")
-    void validate(String[] cmdArgs, int expected, Function<Config, Integer> fieldUnderTest) {
-        Main sut = new Main();
-        CommandLine.populateCommand(sut, cmdArgs);
-        assertEquals(expected, fieldUnderTest.apply(sut.getConfig()));
-    }
-
-    @Test
-    void validate() {
-        Main sut = new Main();
-        assertThrows(CommandLine.MissingParameterException.class, () -> CommandLine.populateCommand(sut, args("-t")));
-        assertThrows(CommandLine.MissingParameterException.class, () -> CommandLine.populateCommand(sut, args("--threads")));
-
-        StringWriter writer = new StringWriter();
-        PrintWriter printWriter = new PrintWriter(writer);
-        CommandLine underTest = new  CommandLine(sut);
-        underTest = underTest.setErr(printWriter);
-        underTest.execute(args("-t", "0"));
-        printWriter.flush();
-        assertTrue(writer.toString().contains("ERROR: threads must be greater than or equal to 1"));
-    }
-}
--- a/src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/MkvToolNixPathConfigParameterTest.java
+++ b/src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/MkvToolNixPathConfigParameterTest.java
@@ -1,54 +0,0 @@
-package at.pcgamingfreaks.mkvaudiosubtitlechanger.config;
-
-import at.pcgamingfreaks.mkvaudiosubtitlechanger.Main;
-import org.apache.commons.lang3.SystemUtils;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.Arguments;
-import org.junit.jupiter.params.provider.MethodSource;
-import picocli.CommandLine;
-
-import java.io.File;
-import java.nio.file.Path;
-import java.util.function.Function;
-import java.util.stream.Stream;
-
-import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.TestUtil.args;
-import static org.junit.jupiter.api.Assertions.*;
-
-class MkvToolNixPathConfigParameterTest {
-
-    private static final String TEST_INVALID_DIR = "src/test/resources/test-dir";
-    private static final String TEST_MKVTOOLNIX_DIR = "src/test/resources/mkvtoolnix";
-    private static final String TEST_MKVTOOLNIX_EXE_DIR = "src/test/resources/mkvtoolnix_exe";
-
-    private static Stream<Arguments> provideTestCases() {
-        if (SystemUtils.IS_OS_WINDOWS) {
-            return Stream.of(
-                    Arguments.of(args("-m", TEST_MKVTOOLNIX_EXE_DIR), TEST_MKVTOOLNIX_EXE_DIR, (Function<Config, File>) Config::getMkvToolNix),
-                    Arguments.of(args("--mkvtoolnix", TEST_MKVTOOLNIX_EXE_DIR), TEST_MKVTOOLNIX_EXE_DIR, (Function<Config, File>) Config::getMkvToolNix)
-            );
-        }
-
-        return Stream.of(
-                Arguments.of(args("-m", TEST_MKVTOOLNIX_DIR), TEST_MKVTOOLNIX_DIR, (Function<Config, File>) Config::getMkvToolNix),
-                Arguments.of(args("--mkvtoolnix", TEST_MKVTOOLNIX_DIR), TEST_MKVTOOLNIX_DIR, (Function<Config, File>) Config::getMkvToolNix)
-        );
-    }
-
-    @ParameterizedTest
-    @MethodSource("provideTestCases")
-    void validate(String[] cmdArgs, String expected, Function<Config, File> fieldUnderTest) {
-        Main sut = new Main();
-        CommandLine.populateCommand(sut, cmdArgs);
-        assertEquals(Path.of(expected).toFile().getAbsolutePath(), fieldUnderTest.apply(sut.getConfig()).getAbsolutePath());
-    }
-
-    @Test
-    void validate() {
-        Main sut = new Main();
-        assertThrows(CommandLine.ParameterException.class, () -> CommandLine.populateCommand(sut, args("-m", TEST_INVALID_DIR)));
-        assertThrows(CommandLine.ParameterException.class, () -> CommandLine.populateCommand(sut, args("-m")));
-        assertThrows(CommandLine.ParameterException.class, () -> CommandLine.populateCommand(sut, args("")));
-    }
-}
--- a/src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/PathConfigParameterTest.java
+++ b/src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/PathConfigParameterTest.java
@@ -1,53 +0,0 @@
-package at.pcgamingfreaks.mkvaudiosubtitlechanger.config;
-
-import at.pcgamingfreaks.mkvaudiosubtitlechanger.Main;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.Arguments;
-import org.junit.jupiter.params.provider.MethodSource;
-import picocli.CommandLine;
-
-import java.io.File;
-import java.nio.file.Path;
-import java.util.function.Function;
-import java.util.stream.Stream;
-
-import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.PathUtils.TEST_DIR;
-import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.PathUtils.TEST_FILE;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-class PathConfigParameterTest {
-
-    private static Stream<Arguments> provideTestCases() {
-        return Stream.of(
-                Arguments.of(args("-l", TEST_DIR), Path.of(TEST_DIR).toFile(), true, (Function<Config, File>) Config::getLibraryPath),
-                Arguments.of(args("-l", TEST_FILE), Path.of(TEST_FILE).toFile(), true, (Function<Config, File>) Config::getLibraryPath)
-        );
-    }
-
-    @ParameterizedTest
-    @MethodSource("provideTestCases")
-    void validate(String[] cmdArgs, File expected, boolean exists, Function<Config, File> fieldUnderTest) {
-        Main sut = new Main();
-        CommandLine.populateCommand(sut, cmdArgs);
-        assertEquals(expected.getAbsolutePath(), fieldUnderTest.apply(sut.getConfig()).getAbsolutePath());
-        assertEquals(exists, fieldUnderTest.apply(sut.getConfig()).exists());
-    }
-
-    @Test
-    void validate() {
-        Main sut = new Main();
-        assertThrows(CommandLine.ParameterException.class, () -> CommandLine.populateCommand(sut, args("-l", "arst")));
-        assertThrows(CommandLine.MissingParameterException.class, () -> CommandLine.populateCommand(sut, args("-l")));
-        assertThrows(CommandLine.UnmatchedArgumentException.class, () -> CommandLine.populateCommand(sut, args("")));
-    }
-
-    private static String[] args(String... args) {
-        String[] staticArray = new String[]{"-a", "ger:ger"};
-        String[] result = new String[staticArray.length + args.length];
-        System.arraycopy(staticArray, 0, result, 0, staticArray.length);
-        System.arraycopy(args, 0, result, staticArray.length, args.length);
-        return result;
-    }
-}
--- a/src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/PatternConfigParameterTest.java
+++ b/src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/PatternConfigParameterTest.java
@@ -1,42 +0,0 @@
-package at.pcgamingfreaks.mkvaudiosubtitlechanger.config;
-
-import at.pcgamingfreaks.mkvaudiosubtitlechanger.Main;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.Arguments;
-import org.junit.jupiter.params.provider.MethodSource;
-import picocli.CommandLine;
-
-import java.util.function.Function;
-import java.util.regex.Pattern;
-import java.util.stream.Stream;
-
-import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.TestUtil.args;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-class PatternConfigParameterTest {
-
-    private static Stream<Arguments> provideTestCases() {
-        return Stream.of(
-                Arguments.of(args("-i", "[abd]?.*"), Pattern.compile("[abd]?.*"), (Function<Config, Pattern>) Config::getIncludePattern),
-                Arguments.of(args("-i", ".*"), Pattern.compile(".*"), (Function<Config, Pattern>) Config::getIncludePattern),
-                Arguments.of(args(), Pattern.compile(".*"), (Function<Config, Pattern>) Config::getIncludePattern)
-        );
-    }
-
-    @ParameterizedTest
-    @MethodSource("provideTestCases")
-    void validate(String[] cmdArgs, Pattern expected, Function<Config, Pattern> fieldUnderTest) {
-        Main sut = new Main();
-        CommandLine.populateCommand(sut, cmdArgs);
-        assertEquals(expected.pattern(), fieldUnderTest.apply(sut.getConfig()).pattern());
-    }
-
-    @Test
-    void validate() {
-        Main sut = new Main();
-        assertThrows(CommandLine.MissingParameterException.class, () -> CommandLine.populateCommand(sut, args("-i")));
-        assertThrows(CommandLine.ParameterException.class, () -> CommandLine.populateCommand(sut, args("-i", "[")));
-    }
-}
--- a/src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/SetConfigParameterTest.java
+++ b/src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/SetConfigParameterTest.java
@@ -1,50 +0,0 @@
-package at.pcgamingfreaks.mkvaudiosubtitlechanger.config;
-
-import at.pcgamingfreaks.mkvaudiosubtitlechanger.Main;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.Arguments;
-import org.junit.jupiter.params.provider.MethodSource;
-import picocli.CommandLine;
-
-import java.util.Set;
-import java.util.function.Function;
-import java.util.stream.Stream;
-
-import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.TestUtil.args;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-class SetConfigParameterTest {
-
-    private static Stream<Arguments> provideTestCases() {
-        return Stream.of(
-                Arguments.of(args("--commentary-keywords", "test"), 1, (Function<Config, Set<String>>) Config::getCommentaryKeywords),
-                Arguments.of(args("--commentary-keywords", "test", "test1", "test2", "test3", "test4"), 5, (Function<Config, Set<String>>) Config::getCommentaryKeywords),
-                Arguments.of(args(), 2, (Function<Config, Set<String>>) Config::getCommentaryKeywords),
-                Arguments.of(args("--forced-keywords", "test"), 1, (Function<Config, Set<String>>) Config::getForcedKeywords),
-                Arguments.of(args("--forced-keywords", "test", "test1", "test2", "test3", "test4"), 5, (Function<Config, Set<String>>) Config::getForcedKeywords),
-                Arguments.of(args(), 3, (Function<Config, Set<String>>) Config::getForcedKeywords),
-                Arguments.of(args("--preferred-subtitles", "test"), 1, (Function<Config, Set<String>>) Config::getPreferredSubtitles),
-                Arguments.of(args("--preferred-subtitles", "test", "test1", "test2", "test3", "test4"), 5, (Function<Config, Set<String>>) Config::getPreferredSubtitles),
-                Arguments.of(args(), 1, (Function<Config, Set<String>>) Config::getPreferredSubtitles)
-        );
-    }
-
-    @ParameterizedTest
-    @MethodSource("provideTestCases")
-    void validate(String[] cmdArgs, int expectedSize, Function<Config, Set<String>> fieldUnderTest) {
-        Main sut = new Main();
-        CommandLine.populateCommand(sut, cmdArgs);
-        assertEquals(expectedSize, fieldUnderTest.apply(sut.getConfig()).size());
-    }
-
-    @Test
-    void validate() {
-        Main sut = new Main();
-        assertThrows(CommandLine.MissingParameterException.class, () -> CommandLine.populateCommand(sut, args("--commentary-keywords")));
-        assertThrows(CommandLine.MissingParameterException.class, () -> CommandLine.populateCommand(sut, args("--forced-keywords")));
-        assertThrows(CommandLine.MissingParameterException.class, () -> CommandLine.populateCommand(sut, args("-e")));
-        assertThrows(CommandLine.MissingParameterException.class, () -> CommandLine.populateCommand(sut, args("--preferred-subtitles")));
-    }
-}
--- a/src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/validator/AttributeConfigValidatorTest.java
+++ b/src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/validator/AttributeConfigValidatorTest.java
@@ -0,0 +1,85 @@
+package at.pcgamingfreaks.mkvaudiosubtitlechanger.config.validator;
+
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.Config;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.ValidationResult;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.AttributeConfig;
+import at.pcgamingfreaks.yaml.YAML;
+import at.pcgamingfreaks.yaml.YamlInvalidContentException;
+import org.apache.commons.cli.CommandLineParser;
+import org.apache.commons.cli.DefaultParser;
+import org.apache.commons.cli.Options;
+import org.apache.commons.cli.ParseException;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Stream;
+
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.config.ValidationResult.*;
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty.*;
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.CommandLineOptionsUtil.optionOf;
+import static org.junit.jupiter.api.Assertions.*;
+
+class AttributeConfigValidatorTest {
+    private static CommandLineParser parser;
+    private static Options options;
+
+    @BeforeAll
+    static void before() {
+        parser = new DefaultParser();
+        options = new Options();
+        options.addOption(optionOf(ATTRIBUTE_CONFIG, ATTRIBUTE_CONFIG.abrv(), ATTRIBUTE_CONFIG.args()));
+    }
+
+    @BeforeEach
+    void beforeEach() {
+        Config.getInstance(true);
+    }
+
+    private static Stream<Arguments> provideTestCases() {
+        return Stream.of(
+                Arguments.of(attrConfYaml("jpn", "ger"), new String[]{}, VALID, attrConf("jpn", "ger")),
+                Arguments.of("", new String[]{"-a", "jpn:ger"}, VALID, attrConf("jpn", "ger")),
+                Arguments.of(attrConfYaml("jpn", "ger", "jpn", "eng"), new String[]{}, VALID, attrConf("jpn", "ger", "jpn", "eng")),
+                Arguments.of("", new String[]{"-a", "jpn:ger", "jpn:eng"}, VALID, attrConf("jpn", "ger", "jpn", "eng")),
+                Arguments.of(attrConfYaml("jpn", "ger", "jpn", "OFF"), new String[]{}, VALID, attrConf("jpn", "ger", "jpn", "OFF")),
+                Arguments.of("", new String[]{"-a", "jpn:ger", "jpn:OFF"}, VALID, attrConf("jpn", "ger", "jpn", "OFF")),
+                Arguments.of(attrConfYaml("jpn", "invalid"), new String[]{}, INVALID, null),
+                Arguments.of("", new String[]{}, MISSING, null)
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource("provideTestCases")
+    void validate(String yamlArgs, String[] cmdArgs, ValidationResult expectedResult, List<AttributeConfig> expectedConfig)
+            throws ParseException, YamlInvalidContentException {
+        AttributeConfigValidator underTest = new AttributeConfigValidator();
+
+        ValidationResult result = underTest.validate(new YAML(yamlArgs), parser.parse(options, cmdArgs));
+
+        assertEquals(expectedResult, result);
+        assertIterableEquals(expectedConfig, Config.getInstance().getAttributeConfig());
+    }
+
+    private static String attrConfYaml(String... languages) {
+        StringBuilder yaml = new StringBuilder("attribute-config: ");
+        int counter = 0;
+        for (int i = 0; i < languages.length; i += 2) {
+            counter++;
+            yaml.append(String.format("\n %s:\n  audio: %s\n  subtitle: %s", counter, languages[i], languages[i+1]));
+        }
+        return yaml.toString();
+    }
+
+    private static List<AttributeConfig> attrConf(String... languages) {
+        List<AttributeConfig> conf = new ArrayList<>();
+        for (int i = 0; i < languages.length; i += 2) {
+            conf.add(new AttributeConfig(languages[i], languages[i+1]));
+        }
+        return conf;
+    }
+}
--- a/src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/validator/BooleanValidatorTest.java
+++ b/src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/validator/BooleanValidatorTest.java
@@ -0,0 +1,58 @@
+package at.pcgamingfreaks.mkvaudiosubtitlechanger.config.validator;
+
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.ValidationResult;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty;
+import at.pcgamingfreaks.yaml.YAML;
+import at.pcgamingfreaks.yaml.YamlInvalidContentException;
+import org.apache.commons.cli.CommandLineParser;
+import org.apache.commons.cli.DefaultParser;
+import org.apache.commons.cli.Options;
+import org.apache.commons.cli.ParseException;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.util.stream.Stream;
+
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.config.ValidationResult.*;
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty.*;
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.CommandLineOptionsUtil.optionOf;
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.TestUtil.yamlList;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class BooleanValidatorTest {
+    private static CommandLineParser parser;
+    private static Options options;
+
+    @BeforeAll
+    static void before() {
+        parser = new DefaultParser();
+        options = new Options();
+        options.addOption(optionOf(SAFE_MODE, SAFE_MODE.abrv(), SAFE_MODE.args()));
+    }
+
+    private static Stream<Arguments> provideTestCases() {
+        return Stream.of(
+                Arguments.of(SAFE_MODE, false, "", new String[]{"-safe-mode"}, VALID),
+                Arguments.of(SAFE_MODE, true, "", new String[]{"-safe-mode"}, VALID),
+                Arguments.of(SAFE_MODE, false, "", new String[]{""}, NOT_PRESENT),
+                Arguments.of(SAFE_MODE, true, "", new String[]{""}, MISSING),
+                Arguments.of(SAFE_MODE, false, yamlList(ARGUMENTS, SAFE_MODE), new String[]{""}, VALID),
+                Arguments.of(SAFE_MODE, true, yamlList(ARGUMENTS, SAFE_MODE), new String[]{""}, VALID),
+                Arguments.of(SAFE_MODE, false, yamlList(ARGUMENTS, WINDOWS), new String[]{""}, NOT_PRESENT),
+                Arguments.of(SAFE_MODE, true, yamlList(ARGUMENTS, WINDOWS), new String[]{""}, MISSING)
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource("provideTestCases")
+    void validate(ConfigProperty property, boolean required, String yamlArgs, String[] cmdArgs,
+                  ValidationResult expectedResult) throws ParseException, YamlInvalidContentException {
+        BooleanValidator underTest = new BooleanValidator(property, required);
+
+        ValidationResult result = underTest.validate(new YAML(yamlArgs), parser.parse(options, cmdArgs));
+
+        assertEquals(expectedResult, result);
+    }
+}
--- a/src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/validator/MkvToolNixPathValidatorTest.java
+++ b/src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/validator/MkvToolNixPathValidatorTest.java
@@ -0,0 +1,65 @@
+package at.pcgamingfreaks.mkvaudiosubtitlechanger.config.validator;
+
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.ValidationResult;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty;
+import at.pcgamingfreaks.yaml.YAML;
+import at.pcgamingfreaks.yaml.YamlInvalidContentException;
+import org.apache.commons.cli.CommandLineParser;
+import org.apache.commons.cli.DefaultParser;
+import org.apache.commons.cli.Options;
+import org.apache.commons.cli.ParseException;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.io.File;
+import java.nio.file.Path;
+import java.util.stream.Stream;
+
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.config.ValidationResult.*;
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.config.ValidationResult.MISSING;
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty.*;
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.CommandLineOptionsUtil.optionOf;
+import static org.junit.jupiter.api.Assertions.*;
+
+class MkvToolNixPathValidatorTest {
+    private static final String TEST_INVALID_DIR = "src/test/resources/test-dir";
+    private static final String TEST_MKVTOOLNIX_DIR = "src/test/resources/mkvtoolnix";
+    private static final String TEST_MKVTOOLNIX_EXE_DIR = "src/test/resources/mkvtoolnix_exe";
+
+    private static CommandLineParser parser;
+    private static Options options;
+
+    @BeforeAll
+    static void before() {
+        parser = new DefaultParser();
+        options = new Options();
+        options.addOption(optionOf(MKV_TOOL_NIX, MKV_TOOL_NIX.abrv(), MKV_TOOL_NIX.args()));
+    }
+
+    private static Stream<Arguments> provideTestCases() {
+        return Stream.of(
+                Arguments.of(MKV_TOOL_NIX, false, null, "", new String[]{"-m", TEST_MKVTOOLNIX_DIR}, VALID),
+                Arguments.of(MKV_TOOL_NIX, true, null, "", new String[]{"-m", TEST_MKVTOOLNIX_EXE_DIR}, VALID),
+                Arguments.of(MKV_TOOL_NIX, false, null, "mkvtoolnix: " + TEST_MKVTOOLNIX_EXE_DIR, new String[]{}, VALID),
+                Arguments.of(MKV_TOOL_NIX, true, null, "mkvtoolnix: " + TEST_MKVTOOLNIX_DIR, new String[]{}, VALID),
+                Arguments.of(MKV_TOOL_NIX, false, Path.of(TEST_MKVTOOLNIX_EXE_DIR).toFile(), "", new String[]{}, DEFAULT),
+                Arguments.of(MKV_TOOL_NIX, false, null, "", new String[]{}, NOT_PRESENT),
+                Arguments.of(MKV_TOOL_NIX, true, null, "", new String[]{}, MISSING),
+                Arguments.of(MKV_TOOL_NIX, true, null, "", new String[]{"-m", TEST_INVALID_DIR}, INVALID)
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource("provideTestCases")
+    void validate(ConfigProperty property, boolean required, File defaultValue, String yamlArgs, String[] cmdArgs,
+                  ValidationResult expectedResult) throws ParseException, YamlInvalidContentException {
+        MkvToolNixPathValidator underTest = new MkvToolNixPathValidator(property, required, defaultValue);
+
+        ValidationResult result = underTest.validate(new YAML(yamlArgs), parser.parse(options, cmdArgs));
+
+        assertEquals(expectedResult, result);
+    }
+
+}
--- a/src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/validator/PathValidatorTest.java
+++ b/src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/validator/PathValidatorTest.java
@@ -0,0 +1,65 @@
+package at.pcgamingfreaks.mkvaudiosubtitlechanger.config.validator;
+
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.ValidationResult;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty;
+import at.pcgamingfreaks.yaml.YAML;
+import at.pcgamingfreaks.yaml.YamlInvalidContentException;
+import org.apache.commons.cli.CommandLineParser;
+import org.apache.commons.cli.DefaultParser;
+import org.apache.commons.cli.Options;
+import org.apache.commons.cli.ParseException;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.io.File;
+import java.util.stream.Stream;
+
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.config.ValidationResult.*;
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.config.ValidationResult.INVALID;
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty.LIBRARY;
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.CommandLineOptionsUtil.optionOf;
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.PathUtils.TEST_DIR;
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.PathUtils.TEST_FILE;
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.TestUtil.argumentsOf;
+import static org.junit.jupiter.api.Assertions.*;
+
+class PathValidatorTest {
+    private static CommandLineParser parser;
+    private static Options options;
+
+    @BeforeAll
+    static void before() {
+        parser = new DefaultParser();
+        options = new Options();
+        options.addOption(optionOf(LIBRARY, LIBRARY.abrv(), LIBRARY.args()));
+    }
+
+    private static Stream<Arguments> provideTestCases() {
+        return Stream.of(
+                argumentsOf(LIBRARY, false, null, "library-path: " + TEST_DIR, new String[]{}, VALID),
+                argumentsOf(LIBRARY, true, null, "", new String[]{"-l", TEST_FILE}, VALID),
+
+                argumentsOf(LIBRARY, false, TEST_DIR, "", new String[]{}, DEFAULT),
+                argumentsOf(LIBRARY, true, TEST_FILE, "", new String[]{}, DEFAULT),
+                argumentsOf(LIBRARY, true, null, "", new String[]{}, MISSING),
+                argumentsOf(LIBRARY, false, null, "", new String[]{}, NOT_PRESENT),
+
+                argumentsOf(LIBRARY, true, null, "", new String[]{"-l", TEST_DIR + "/invalid"}, INVALID),
+                argumentsOf(LIBRARY, false, null, "library-path: " + TEST_DIR + "/invalid", new String[]{}, INVALID),
+                argumentsOf(LIBRARY, true, TEST_DIR, "", new String[]{"-l", TEST_DIR + "/invalid"}, INVALID)
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource("provideTestCases")
+    void validate(ConfigProperty property, boolean required, File defaultValue, String yamlArgs, String[] cmdArgs,
+                  ValidationResult expectedResult) throws ParseException, YamlInvalidContentException {
+        PathValidator underTest = new PathValidator(property, required, defaultValue);
+
+        ValidationResult result = underTest.validate(new YAML(yamlArgs), parser.parse(options, cmdArgs));
+
+        assertEquals(expectedResult, result);
+    }
+}
--- a/src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/validator/PatternValidatorTest.java
+++ b/src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/validator/PatternValidatorTest.java
@@ -0,0 +1,64 @@
+package at.pcgamingfreaks.mkvaudiosubtitlechanger.config.validator;
+
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.ValidationResult;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty;
+import at.pcgamingfreaks.yaml.YAML;
+import at.pcgamingfreaks.yaml.YamlInvalidContentException;
+import org.apache.commons.cli.CommandLineParser;
+import org.apache.commons.cli.DefaultParser;
+import org.apache.commons.cli.Options;
+import org.apache.commons.cli.ParseException;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.util.regex.Pattern;
+import java.util.stream.Stream;
+
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.config.ValidationResult.*;
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.config.ValidationResult.INVALID;
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty.INCLUDE_PATTERN;
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.CommandLineOptionsUtil.optionOf;
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.TestUtil.argumentsOf;
+import static org.junit.jupiter.api.Assertions.*;
+
+class PatternValidatorTest {
+    private static CommandLineParser parser;
+    private static Options options;
+
+    @BeforeAll
+    static void before() {
+        parser = new DefaultParser();
+        options = new Options();
+        options.addOption(optionOf(INCLUDE_PATTERN, INCLUDE_PATTERN.abrv(), INCLUDE_PATTERN.args()));
+    }
+
+    private static Stream<Arguments> provideTestCases() {
+        return Stream.of(
+                argumentsOf(INCLUDE_PATTERN, false, null, "include-pattern: \"[abd]?.*\"", new String[]{}, VALID),
+                argumentsOf(INCLUDE_PATTERN, true, null, "", new String[]{"-i", "[abd]?.*"}, VALID),
+
+                argumentsOf(INCLUDE_PATTERN, false, Pattern.compile(".*"), "", new String[]{}, DEFAULT),
+                argumentsOf(INCLUDE_PATTERN, true, Pattern.compile(".*"), "", new String[]{}, DEFAULT),
+
+                argumentsOf(INCLUDE_PATTERN, true, null, "", new String[]{}, MISSING),
+                argumentsOf(INCLUDE_PATTERN, false, null, "", new String[]{}, NOT_PRESENT),
+
+                argumentsOf(INCLUDE_PATTERN, true, null, "", new String[]{"-i", "?."}, INVALID),
+                argumentsOf(INCLUDE_PATTERN, false, null, "include-pattern: \"[arst*\"", new String[]{}, INVALID),
+                argumentsOf(INCLUDE_PATTERN, true, Pattern.compile(".?"), "", new String[]{"-i", "?."}, INVALID)
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource("provideTestCases")
+    void validate(ConfigProperty property, boolean required, Pattern defaultValue, String yamlArgs, String[] cmdArgs,
+                  ValidationResult expectedResult) throws ParseException, YamlInvalidContentException {
+        PatternValidator underTest = new PatternValidator(property, required, defaultValue);
+
+        ValidationResult result = underTest.validate(new YAML(yamlArgs), parser.parse(options, cmdArgs));
+
+        assertEquals(expectedResult, result);
+    }
+}
--- a/src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/validator/SetValidatorTest.java
+++ b/src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/validator/SetValidatorTest.java
@@ -0,0 +1,68 @@
+package at.pcgamingfreaks.mkvaudiosubtitlechanger.config.validator;
+
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.Config;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.ValidationResult;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty;
+import at.pcgamingfreaks.yaml.YAML;
+import at.pcgamingfreaks.yaml.YamlInvalidContentException;
+import org.apache.commons.cli.CommandLineParser;
+import org.apache.commons.cli.DefaultParser;
+import org.apache.commons.cli.Options;
+import org.apache.commons.cli.ParseException;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.util.stream.Stream;
+
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.config.ValidationResult.*;
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty.COMMENTARY_KEYWORDS;
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.CommandLineOptionsUtil.optionOf;
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.TestUtil.argumentsOf;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class SetValidatorTest {
+
+    private static CommandLineParser parser;
+    private static Options options;
+
+    @BeforeAll
+    static void before() {
+        parser = new DefaultParser();
+        options = new Options();
+        options.addOption(optionOf(COMMENTARY_KEYWORDS, COMMENTARY_KEYWORDS.abrv(), COMMENTARY_KEYWORDS.args()));
+    }
+
+    @BeforeEach
+    void beforeEach() {
+        Config.getInstance(true);
+    }
+
+    private static Stream<Arguments> provideTestCases() {
+        return Stream.of(
+                argumentsOf(COMMENTARY_KEYWORDS, true, true, "", new String[]{"-ck", "test"}, VALID, 3),
+                argumentsOf(COMMENTARY_KEYWORDS, true, false, COMMENTARY_KEYWORDS.prop() + ": [test]", new String[]{}, VALID, 1),
+                argumentsOf(COMMENTARY_KEYWORDS, true, false, COMMENTARY_KEYWORDS.prop() + ":\n - test\n - test2", new String[]{}, VALID, 2),
+                argumentsOf(COMMENTARY_KEYWORDS, false, true, COMMENTARY_KEYWORDS.prop() + ": [test]", new String[]{}, VALID, 3),
+                argumentsOf(COMMENTARY_KEYWORDS, false, false, "", new String[]{"-ck", "test"}, VALID, 1),
+                argumentsOf(COMMENTARY_KEYWORDS, true, true, COMMENTARY_KEYWORDS.prop() + ": [commentary]", new String[]{}, VALID, 2),
+
+                argumentsOf(COMMENTARY_KEYWORDS, true, true, "", new String[]{}, MISSING, 2),
+                argumentsOf(COMMENTARY_KEYWORDS, false, true, "", new String[]{}, NOT_PRESENT, 2)
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource("provideTestCases")
+    void validate(ConfigProperty property, boolean required, boolean append, String yamlArgs, String[] cmdArgs,
+                  ValidationResult expectedResult, int expectedSize) throws ParseException, YamlInvalidContentException {
+        SetValidator underTest = new SetValidator(property, required, append);
+
+        ValidationResult result = underTest.validate(new YAML(yamlArgs), parser.parse(options, cmdArgs));
+
+        assertEquals(expectedResult, result);
+        assertEquals(expectedSize, Config.getInstance().getCommentaryKeywords().size());
+    }
+}
--- a/src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/validator/ThreadValidatorTest.java
+++ b/src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/config/validator/ThreadValidatorTest.java
@@ -0,0 +1,61 @@
+package at.pcgamingfreaks.mkvaudiosubtitlechanger.config.validator;
+
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.config.ValidationResult;
+import at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty;
+import at.pcgamingfreaks.yaml.YAML;
+import at.pcgamingfreaks.yaml.YamlInvalidContentException;
+import org.apache.commons.cli.CommandLineParser;
+import org.apache.commons.cli.DefaultParser;
+import org.apache.commons.cli.Options;
+import org.apache.commons.cli.ParseException;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.util.stream.Stream;
+
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.config.ValidationResult.*;
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.model.ConfigProperty.THREADS;
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.CommandLineOptionsUtil.optionOf;
+import static at.pcgamingfreaks.mkvaudiosubtitlechanger.util.TestUtil.argumentsOf;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class ThreadValidatorTest {
+
+    private static CommandLineParser parser;
+    private static Options options;
+
+    @BeforeAll
+    static void before() {
+        parser = new DefaultParser();
+        options = new Options();
+        options.addOption(optionOf(THREADS, "t", THREADS.args()));
+    }
+
+    private static Stream<Arguments> provideTestCases() {
+        return Stream.of(
+                argumentsOf(THREADS, false, null, "", new String[]{"-t", "10"}, VALID),
+                argumentsOf(THREADS, true, null, "", new String[]{"-t", "10"}, VALID),
+                argumentsOf(THREADS, false, null, "threads: 10", new String[]{}, VALID),
+                argumentsOf(THREADS, true, null, "threads: 10", new String[]{}, VALID),
+                argumentsOf(THREADS, false, 2, "", new String[]{}, DEFAULT),
+                argumentsOf(THREADS, true, null, "", new String[]{}, MISSING),
+                argumentsOf(THREADS, false, null, "", new String[]{}, NOT_PRESENT),
+                argumentsOf(THREADS, true, null, "", new String[]{"-t", "-1"}, INVALID),
+                argumentsOf(THREADS, true, null, "threads: 0", new String[]{}, INVALID),
+                argumentsOf(THREADS, true, 2, "", new String[]{"-t", "0"}, INVALID)
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource("provideTestCases")
+    void validate(ConfigProperty property, boolean required, Integer defaultValue, String yamlArgs, String[] cmdArgs,
+                  ValidationResult expectedResult) throws ParseException, YamlInvalidContentException {
+        ThreadValidator underTest = new ThreadValidator(property, required, defaultValue);
+
+        ValidationResult result = underTest.validate(new YAML(yamlArgs), parser.parse(options, cmdArgs));
+
+        assertEquals(expectedResult, result);
+    }
+}
--- a/src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/util/DateUtilsTest.java
+++ b/src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/util/DateUtilsTest.java
@@ -1,13 +1,11 @@
 package at.pcgamingfreaks.mkvaudiosubtitlechanger.util;

-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;

 import java.util.Date;

 import static org.junit.jupiter.api.Assertions.*;

-@Disabled
 class DateUtilsTest {

    @Test
--- a/src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/util/TestUtil.java
+++ b/src/test/java/at/pcgamingfreaks/mkvaudiosubtitlechanger/util/TestUtil.java
@@ -43,12 +43,4 @@ public class TestUtil {
        fileInfoDto.setMatchedConfig(config);
        return fileInfoDto;
    }
-
-    public static String[] args(String... args) {
-        String[] staticArray = new String[]{"-l", "/", "-a", "jpn:ger"};
-        String[] result = new String[staticArray.length + args.length];
-        System.arraycopy(staticArray, 0, result, 0, staticArray.length);
-        System.arraycopy(args, 0, result, staticArray.length, args.length);
-        return result;
-    }
 }