diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml
new file mode 100644
index 0000000..53a9973
--- /dev/null
+++ b/dependency-reduced-pom.xml
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.openautonomousconnection</groupId>
+  <artifactId>WebClient</artifactId>
+  <version>1.0.0-BETA.1.0</version>
+  <description>The default WebClient</description>
+  <url>https://open-autonomous-connection.org/</url>
+  <issueManagement>
+    <system>Issue Tracker</system>
+    <url>https://repo.open-autonomous-connection.org/open-autonomous-connection/WebClient/issues</url>
+  </issueManagement>
+  <developers>
+    <developer>
+      <name>UnlegitDqrk</name>
+      <url>https://unlegitdqrk.dev/</url>
+      <organization>Open Autonomous Connection</organization>
+      <organizationUrl>https://open-autonomous-connection.org/</organizationUrl>
+      <roles>
+        <role>Owner</role>
+        <role>Head Developer</role>
+      </roles>
+    </developer>
+    <developer>
+      <name>Maple</name>
+      <url>https://niumaple.carrd.co/</url>
+      <organization>Open Autonomous Connection</organization>
+      <organizationUrl>https://open-autonomous-connection.org/</organizationUrl>
+      <roles>
+        <role>Owner</role>
+        <role>Head Developer</role>
+      </roles>
+    </developer>
+  </developers>
+  <licenses>
+    <license>
+      <name>Open Autonomous Public License (OAPL)</name>
+      <url>https://open-autonomous-connection.org/license.html</url>
+    </license>
+  </licenses>
+  <organization>
+    <name>Open Autonomous Connection</name>
+    <url>https://open-autonomous-connection.org/</url>
+  </organization>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>3.6.0</version>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <transformers>
+                <transformer>
+                  <mainClass>org.openautonomousconnection.webclient.Main</mainClass>
+                </transformer>
+              </transformers>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.13.0</version>
+        <configuration>
+          <compilerArgs>
+            <arg>--add-exports</arg>
+            <arg>java.base/sun.security.x509=ALL-UNNAMED</arg>
+            <arg>--add-exports</arg>
+            <arg>java.base/sun.security.util=ALL-UNNAMED</arg>
+          </compilerArgs>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <version>3.6.3</version>
+        <executions>
+          <execution>
+            <id>attach-javadocs</id>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <failOnError>false</failOnError>
+          <failOnWarnings>false</failOnWarnings>
+          <doclint>none</doclint>
+          <locale>en_US</locale>
+          <encoding>UTF-8</encoding>
+          <docencoding>UTF-8</docencoding>
+          <charset>UTF-8</charset>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <repositories>
+    <repository>
+      <snapshots />
+      <id>oac</id>
+      <url>https://repo.open-autonomous-connection.org/api/packages/open-autonomous-connection/maven</url>
+    </repository>
+  </repositories>
+  <dependencies>
+    <dependency>
+      <groupId>org.projectlombok</groupId>
+      <artifactId>lombok</artifactId>
+      <version>1.18.38</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <maven.compiler.target>23</maven.compiler.target>
+    <maven.compiler.source>23</maven.compiler.source>
+  </properties>
+</project>
diff --git a/pom.xml b/pom.xml
index 408b0ec..83eb462 100644
--- a/pom.xml
+++ b/pom.xml
@@ -111,17 +111,38 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-                <version>3.3.0</version>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.6.0</version>
                 <executions>
                     <execution>
-                        <id>attach-sources</id>
+                        <phase>package</phase>
                         <goals>
-                            <goal>jar</goal>
+                            <goal>shade</goal>
                         </goals>
+                        <configuration>
+                            <transformers>
+                                <transformer
+                                        implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                    <mainClass>org.openautonomousconnection.webclient.Main</mainClass>
+                                </transformer>
+                            </transformers>
+                        </configuration>
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.13.0</version>
+                <configuration>
+                    <compilerArgs>
+                        <arg>--add-exports</arg>
+                        <arg>java.base/sun.security.x509=ALL-UNNAMED</arg>
+                        <arg>--add-exports</arg>
+                        <arg>java.base/sun.security.util=ALL-UNNAMED</arg>
+                    </compilerArgs>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
diff --git a/src/main/java/org/openautonomousconnection/webclient/Main.java b/src/main/java/org/openautonomousconnection/webclient/Main.java
index a80427f..07cc55e 100644
--- a/src/main/java/org/openautonomousconnection/webclient/Main.java
+++ b/src/main/java/org/openautonomousconnection/webclient/Main.java
@@ -50,6 +50,7 @@ public class Main {
         SwingUtilities.invokeLater(() -> {
             ui = new BrowserUI(settings);
             ui.setSize(1200, 800);
+            ui.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
             ui.setLocationRelativeTo(null);
             ui.setVisible(true);
             ui.openNewTab(settings.getStartPageUrl());