diff --git a/pom.xml b/pom.xml
index 90e02b6..7321989 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,8 +19,8 @@
 	</modules>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<maven.compiler.source>16</maven.compiler.source>
-		<maven.compiler.target>16</maven.compiler.target>
+		<maven.compiler.source>17</maven.compiler.source>
+		<maven.compiler.target>17</maven.compiler.target>
 	</properties>
 
 	<licenses>
@@ -59,7 +59,7 @@
 					<artifactId>maven-compiler-plugin</artifactId>
 					<version>3.8.0</version>
 					<configuration>
-						<release>16</release>
+						<release>${maven.compiler.target}</release>
 					</configuration>
 				</plugin>
 				<plugin>
@@ -89,22 +89,13 @@
 	</build>
 	<repositories>
 		<repository>
-			<id>javassh-opensource-snapshots</id>
-			<name>artifactory.javassh.com-snapshots</name>
-			<url>http://artifactory.javassh.com/opensource-snapshots</url>
-			<snapshots />
-			<releases>
-				<enabled>false</enabled>
-			</releases>
+			<id>central</id>
+			<url>https://repo.maven.apache.org/maven2</url>
 		</repository>
+		<!-- This is required to find the com.sshtools artifacts. -->
 		<repository>
-			<id>javassh-opensource-releases</id>
-			<name>artifactory.javassh.com-releases</name>
-			<url>http://artifactory.javassh.com/opensource-releases</url>
-			<releases />
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
+			<id>jadaptive-os-repo</id>
+			<url>https://artifactory.jadaptive.com/opensource-releases/</url>
 		</repository>
 		<repository>
 			<id>oss-snapshots</id>
@@ -115,26 +106,6 @@
 			</releases>
 		</repository>
 	</repositories>
-	<pluginRepositories>
-		<pluginRepository>
-			<id>javassh-opensource-snapshots</id>
-			<name>artifactory.javassh.com-snapshots</name>
-			<url>http://artifactory.javassh.com/opensource-snapshots</url>
-			<snapshots />
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-		</pluginRepository>
-		<pluginRepository>
-			<id>javassh-opensource-releases</id>
-			<name>artifactory.javassh.com-releases</name>
-			<url>http://artifactory.javassh.com/opensource-releases</url>
-			<releases />
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</pluginRepository>
-	</pluginRepositories>
 	<name>Snake - Parent</name>
 	<description>The parent module for all Snake modules.</description>
 </project>
diff --git a/snake-app-linux/pom.xml b/snake-app-linux/pom.xml
index 04ef095..6f1e1a7 100644
--- a/snake-app-linux/pom.xml
+++ b/snake-app-linux/pom.xml
@@ -148,8 +148,8 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
 				<configuration>
-					<source>9</source>
-					<target>9</target>
+					<source>${maven.compiler.source}</source>
+					<target>${maven.compiler.target}</target>
 					<encoding>UTF-8</encoding>
 				</configuration>
 			</plugin>
diff --git a/snake-backend-openrazer/pom.xml b/snake-backend-openrazer/pom.xml
index 3dd61a9..946a994 100644
--- a/snake-backend-openrazer/pom.xml
+++ b/snake-backend-openrazer/pom.xml
@@ -9,16 +9,18 @@
 		<artifactId>snake</artifactId>
 	</parent>
 	<dependencies>
+		<!-- https://mvnrepository.com/artifact/com.github.hypfvieh/dbus-java -->
 		<dependency>
 			<groupId>com.github.hypfvieh</groupId>
 			<artifactId>dbus-java</artifactId>
-			<version>4.0.0-SNAPSHOT</version>
+			<version>3.3.2</version>
+		</dependency>
+		<!-- https://mvnrepository.com/artifact/com.github.hypfvieh/dbus-java-transport-native-unixsocket -->
+		<dependency>
+			<groupId>com.github.hypfvieh</groupId>
+			<artifactId>dbus-java-transport-native-unixsocket</artifactId>
+			<version>4.0.0</version>
 		</dependency>
-        <dependency>
-            <groupId>com.github.hypfvieh</groupId>
-            <artifactId>dbus-java-transport-native-unixsocket</artifactId>
-            <version>4.0.0-SNAPSHOT</version>
-        </dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
 			<version>${project.version}</version>
diff --git a/snake-dist/pom.xml b/snake-dist/pom.xml
index f3e7cdc..84bd075 100644
--- a/snake-dist/pom.xml
+++ b/snake-dist/pom.xml
@@ -51,199 +51,6 @@
 			</dependencies>
 			<build>
 				<plugins>
-					<plugin>
-						<groupId>com.sshtools</groupId>
-						<artifactId>forker-updater-maven-plugin</artifactId>
-						<version>1.7-SNAPSHOT</version>
-						<executions>
-							<execution>
-								<id>updater</id>
-								<phase>package</phase>
-								<goals>
-									<goal>updates</goal>
-								</goals>
-								<configuration>
-									<version>${project.version}-${buildNumber}</version>
-									<repositoryDirectory>${project.build.directory}/repository</repositoryDirectory>
-									<launcherScriptName>snake</launcherScriptName>
-									<remoteBase>${snakeRemote}</remoteBase>
-									<mainClass>uk.co.bithatch.snake.app.linux/uk.co.bithatch.snake.app.linux.App</mainClass>
-									<remotesFromOriginalSource>false</remotesFromOriginalSource>
-                                    <splash>${basedir}/src/main/images/splash.png</splash>
-									<image>true</image>
-									<vmArgs>
-										<vmArg>-Xmx64m</vmArg>
-									</vmArgs>
-									<id>snake</id>
-									<forkerArgs>
-										<forkerArg>jvmarg -Dforker.releaseChannel=${snakeRemoteStable}</forkerArg>
-										<forkerArg>jvmarg -Dforker.betaChannel=${snakeRemoteSnapshot}</forkerArg>
-										<forkerArg>jvmarg -Djava.system.class.loader=uk.co.bithatch.snake.ui.DynamicClassLoader</forkerArg>
-										<forkerArg>restart-on 90</forkerArg>
-										<forkerArg>single-instance-per-user</forkerArg>
-                                        <forkerArg>run-on-install</forkerArg>
-										<forkerArg>install-location ${installer.home}/snake-razer</forkerArg>
-										<forkerArg>jvmarg --add-modules</forkerArg>
-										<forkerArg>jvmarg themes.awhitelight,themes.agreenfuture,themes.aredsky,themes.abluelife,themes.ayellowdwarf,themes.anorangetwist,themes.apinkburst,themes.apurplehaze</forkerArg>
-										<forkerArg>jvmarg -Djfreedesktop.quiet=true</forkerArg>
-									</forkerArgs>
-									<bootstrapFiles>
-										<bootstrapFile>
-											<source>${basedir}/../README.md</source>
-											<target>docs</target>
-										</bootstrapFile>
-										<bootstrapFile>
-											<source>${basedir}/target/CHANGES.md</source>
-											<target>docs</target>
-										</bootstrapFile>
-									</bootstrapFiles>
-									<sharedArtifacts>
-										<sharedArtifact>javafx-base</sharedArtifact>
-										<sharedArtifact>javafx-base-linux</sharedArtifact>
-										<sharedArtifact>javafx-controls</sharedArtifact>
-										<sharedArtifact>javafx-controls-linux</sharedArtifact>
-										<sharedArtifact>javafx-fxml</sharedArtifact>
-										<sharedArtifact>javafx-fxml-linux</sharedArtifact>
-										<sharedArtifact>javafx-graphics</sharedArtifact>
-										<sharedArtifact>javafx-graphics-linux</sharedArtifact>
-										<sharedArtifact>FX-BorderlessScene</sharedArtifact>
-                                        <sharedArtifact>ikonli-core</sharedArtifact>
-                                        <sharedArtifact>ikonli-javafx</sharedArtifact>
-                                        <sharedArtifact>ikonli-fontawesome-pack</sharedArtifact>
-									</sharedArtifacts>
-									<bootstrapArtifacts>
-										<bootstrapArtifact>snake-updater</bootstrapArtifact>
-									</bootstrapArtifacts>
-                                    <automaticArtifacts>
-                                        <automaticArtifact>svgSalamander</automaticArtifact>
-                                        <automaticArtifact>kotlin-stdlib</automaticArtifact>
-                                        <automaticArtifact>kotlin-stdlib-common</automaticArtifact>
-                                        <automaticArtifact>annotations</automaticArtifact>
-                                        <automaticArtifact>kotlinx-coroutines-core-jvm</automaticArtifact>
-                                        <automaticArtifact>kotlin-logging-jvm</automaticArtifact>
-                                    </automaticArtifacts>
-									<systemModules>
-										<systemModule>java.prefs</systemModule>
-										<systemModule>java.xml</systemModule>
-										<systemModule>jdk.unsupported</systemModule>
-										<systemModule>jdk.crypto.ec</systemModule>
-										<systemModule>jdk.zipfs</systemModule>
-
-										<systemModule>java.instrument</systemModule>
-										<systemModule>jdk.xml.dom</systemModule>
-                                        <systemModule>java.scripting</systemModule>
-										<systemModule>jdk.jsobject</systemModule>
-										<systemModule>java.net.http</systemModule>
-                                        <systemModule>jdk.net</systemModule>
-                                        <systemModule>jdk.security.auth</systemModule>
-                                        <systemModule>jdk.management.agent</systemModule>
-                                        <systemModule>java.management</systemModule>
-
-										<!-- TODO separate this in forker? -->
-										<systemModule>java.desktop</systemModule>
-
-										<!-- TODO Because of Gson, consider finding a library that doesnt 
-											link to SQL -->
-										<systemModule>java.sql</systemModule>
-									</systemModules>
-								</configuration>
-							</execution>
-
-							<execution>
-								<id>updater-noruntime</id>
-								<phase>package</phase>
-								<goals>
-									<goal>updates</goal>
-								</goals>
-								<configuration>
-									<version>${project.version}-${buildNumber}</version>
-									<repositoryDirectory>${project.build.directory}/repository-noruntime</repositoryDirectory>
-									<launcherScriptName>snake</launcherScriptName>
-									<remoteBase>${snakeRemoteNoRuntime}</remoteBase>
-									<mainClass>uk.co.bithatch.snake.app.linux/uk.co.bithatch.snake.app.linux.App</mainClass>
-									<remotesFromOriginalSource>false</remotesFromOriginalSource>
-									<imageDirectory>${project.build.directory}/image-noruntime</imageDirectory>
-                                    <splash>${basedir}/src/main/images/splash.png</splash>
-									<image>true</image>
-									<link>false</link>
-									<vmArgs>
-										<vmArg>-Xmx64m</vmArg>
-									</vmArgs>
-									<id>snake</id>
-									<forkerArgs>
-										<forkerArg>jvmarg -Dforker.releaseChannel=${snakeRemoteNoRuntimeStable}</forkerArg>
-										<forkerArg>jvmarg -Dforker.betaChannel=${snakeRemoteNoRuntimeSnapshot}</forkerArg>
-										<forkerArg>jvmarg -Djava.system.class.loader=uk.co.bithatch.snake.ui.DynamicClassLoader</forkerArg>
-										<forkerArg>restart-on 90</forkerArg>
-                                        <forkerArg>run-on-install</forkerArg>
-										<forkerArg>single-instance-per-user</forkerArg>
-										<forkerArg>install-location ${installer.home}/snake-razer</forkerArg>
-										<forkerArg>jvmarg --add-modules</forkerArg>
-										<forkerArg>jvmarg themes.awhitelight,themes.agreenfuture,themes.aredsky,themes.abluelife,themes.ayellowdwarf,themes.anorangetwist,themes.apinkburst,themes.apurplehaze</forkerArg>
-                                        <forkerArg>jvmarg -Djfreedesktop.quiet=true</forkerArg>
-									</forkerArgs>
-									<bootstrapFiles>
-										<bootstrapFile>
-											<source>${basedir}/../README.md</source>
-											<target>docs</target>
-										</bootstrapFile>
-										<bootstrapFile>
-											<source>${basedir}/target/CHANGES.md</source>
-											<target>docs</target>
-										</bootstrapFile>
-									</bootstrapFiles>
-									<sharedArtifacts>
-										<sharedArtifact>javafx-base</sharedArtifact>
-										<sharedArtifact>javafx-base-linux</sharedArtifact>
-										<sharedArtifact>javafx-controls</sharedArtifact>
-										<sharedArtifact>javafx-controls-linux</sharedArtifact>
-										<sharedArtifact>javafx-fxml</sharedArtifact>
-										<sharedArtifact>javafx-fxml-linux</sharedArtifact>
-										<sharedArtifact>javafx-graphics</sharedArtifact>
-										<sharedArtifact>javafx-graphics-linux</sharedArtifact>
-										<sharedArtifact>FX-BorderlessScene</sharedArtifact>
-                                        <sharedArtifact>ikonli-core</sharedArtifact>
-                                        <sharedArtifact>ikonli-javafx</sharedArtifact>
-                                        <sharedArtifact>ikonli-fontawesome-pack</sharedArtifact>
-									</sharedArtifacts>
-									<bootstrapArtifacts>
-										<bootstrapArtifact>snake-updater</bootstrapArtifact>
-									</bootstrapArtifacts>
-                                    <automaticArtifacts>
-                                        <automaticArtifact>svgSalamander</automaticArtifact>
-                                        <automaticArtifact>kotlin-stdlib</automaticArtifact>
-                                        <automaticArtifact>kotlin-stdlib-common</automaticArtifact>
-                                        <automaticArtifact>annotations</automaticArtifact>
-                                        <automaticArtifact>kotlinx-coroutines-core-jvm</automaticArtifact>
-                                        <automaticArtifact>kotlin-logging-jvm</automaticArtifact>
-                                    </automaticArtifacts>
-									<systemModules>
-										<systemModule>java.prefs</systemModule>
-										<systemModule>java.xml</systemModule>
-										<systemModule>jdk.unsupported</systemModule>
-										<systemModule>jdk.crypto.ec</systemModule>
-
-										<systemModule>java.instrument</systemModule>
-										<systemModule>java.management</systemModule>
-										<systemModule>jdk.xml.dom</systemModule>
-										<systemModule>jdk.jsobject</systemModule>
-										<systemModule>java.net.http</systemModule>
-                                        <systemModule>jdk.net</systemModule>
-                                        <systemModule>java.scripting</systemModule>
-                                        <systemModule>jdk.management.agent</systemModule>
-                                        <systemModule>jdk.security.auth</systemModule>
-
-										<!-- TODO separate this in forker? -->
-										<systemModule>java.desktop</systemModule>
-
-										<!-- TODO Because of Gson, consider finding a library that doesnt 
-											link to SQL -->
-										<systemModule>java.sql</systemModule>
-									</systemModules>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
 					<plugin>
 						<groupId>com.github.hazendaz.maven</groupId>
 						<artifactId>makeself-maven-plugin</artifactId>
diff --git a/snake-themes/snake-theme-abluelife/pom.xml b/snake-themes/snake-theme-abluelife/pom.xml
index ff46612..713a6ac 100644
--- a/snake-themes/snake-theme-abluelife/pom.xml
+++ b/snake-themes/snake-theme-abluelife/pom.xml
@@ -11,14 +11,7 @@
 	<properties>
 		<themeName>abluelife</themeName>
 	</properties>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>uk.co.bithatch</groupId>
-				<artifactId>svg-rasterizer-maven-plugin</artifactId>
-			</plugin>
-		</plugins>
-	</build>
+
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
diff --git a/snake-themes/snake-theme-agreenfuture/pom.xml b/snake-themes/snake-theme-agreenfuture/pom.xml
index eb11b1d..3e16a3f 100644
--- a/snake-themes/snake-theme-agreenfuture/pom.xml
+++ b/snake-themes/snake-theme-agreenfuture/pom.xml
@@ -11,14 +11,7 @@
 	<properties>
 		<themeName>agreenfuture</themeName>
 	</properties>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>uk.co.bithatch</groupId>
-				<artifactId>svg-rasterizer-maven-plugin</artifactId>
-			</plugin>
-		</plugins>
-	</build>
+
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
diff --git a/snake-themes/snake-theme-anorangetwist/pom.xml b/snake-themes/snake-theme-anorangetwist/pom.xml
index b9909d7..e831a80 100644
--- a/snake-themes/snake-theme-anorangetwist/pom.xml
+++ b/snake-themes/snake-theme-anorangetwist/pom.xml
@@ -11,14 +11,7 @@
 	<properties>
 		<themeName>anorangetwist</themeName>
 	</properties>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>uk.co.bithatch</groupId>
-				<artifactId>svg-rasterizer-maven-plugin</artifactId>
-			</plugin>
-		</plugins>
-	</build>
+
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
diff --git a/snake-themes/snake-theme-apinkburst/pom.xml b/snake-themes/snake-theme-apinkburst/pom.xml
index 27a0d91..6f502a4 100644
--- a/snake-themes/snake-theme-apinkburst/pom.xml
+++ b/snake-themes/snake-theme-apinkburst/pom.xml
@@ -11,14 +11,7 @@
 	<properties>
 		<themeName>apinkburst</themeName>
 	</properties>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>uk.co.bithatch</groupId>
-				<artifactId>svg-rasterizer-maven-plugin</artifactId>
-			</plugin>
-		</plugins>
-	</build>
+
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
diff --git a/snake-themes/snake-theme-apurplehaze/pom.xml b/snake-themes/snake-theme-apurplehaze/pom.xml
index aa7bc52..8fff3b3 100644
--- a/snake-themes/snake-theme-apurplehaze/pom.xml
+++ b/snake-themes/snake-theme-apurplehaze/pom.xml
@@ -11,14 +11,7 @@
 	<properties>
 		<themeName>apurplehaze</themeName>
 	</properties>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>uk.co.bithatch</groupId>
-				<artifactId>svg-rasterizer-maven-plugin</artifactId>
-			</plugin>
-		</plugins>
-	</build>
+
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
diff --git a/snake-themes/snake-theme-aredsky/pom.xml b/snake-themes/snake-theme-aredsky/pom.xml
index efdc6cf..b58f3cc 100644
--- a/snake-themes/snake-theme-aredsky/pom.xml
+++ b/snake-themes/snake-theme-aredsky/pom.xml
@@ -11,14 +11,7 @@
 	<properties>
 		<themeName>aredsky</themeName>
 	</properties>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>uk.co.bithatch</groupId>
-				<artifactId>svg-rasterizer-maven-plugin</artifactId>
-			</plugin>
-		</plugins>
-	</build>
+
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
diff --git a/snake-themes/snake-theme-awhitelight/pom.xml b/snake-themes/snake-theme-awhitelight/pom.xml
index 2ed9eb8..2c7afa9 100644
--- a/snake-themes/snake-theme-awhitelight/pom.xml
+++ b/snake-themes/snake-theme-awhitelight/pom.xml
@@ -11,14 +11,7 @@
 	<properties>
 		<themeName>awhitelight</themeName>
 	</properties>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>uk.co.bithatch</groupId>
-				<artifactId>svg-rasterizer-maven-plugin</artifactId>
-			</plugin>
-		</plugins>
-	</build>
+
 	<name>Snake - Themes - Default</name>
 	<description>The default theme.</description>
 </project>
diff --git a/snake-themes/snake-theme-ayellowdwarf/pom.xml b/snake-themes/snake-theme-ayellowdwarf/pom.xml
index f671440..06a5a2d 100644
--- a/snake-themes/snake-theme-ayellowdwarf/pom.xml
+++ b/snake-themes/snake-theme-ayellowdwarf/pom.xml
@@ -11,14 +11,7 @@
 	<properties>
 		<themeName>ayellowdwarf</themeName>
 	</properties>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>uk.co.bithatch</groupId>
-				<artifactId>svg-rasterizer-maven-plugin</artifactId>
-			</plugin>
-		</plugins>
-	</build>
+
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
diff --git a/snake-ui/pom.xml b/snake-ui/pom.xml
index 456bf0b..74792dd 100644
--- a/snake-ui/pom.xml
+++ b/snake-ui/pom.xml
@@ -15,7 +15,7 @@
         <dependency>
             <groupId>com.github.hypfvieh</groupId>
             <artifactId>dbus-java</artifactId>
-            <version>4.0.0-SNAPSHOT</version>
+            <version>3.3.2</version>
         </dependency>
 		<dependency>
 			<groupId>org.openjfx</groupId>
@@ -75,19 +75,7 @@
 				<exclusion>
 					<groupId>ch.qos.logback</groupId>
 					<artifactId>logback-classic</artifactId>
-				</exclusion><!--
-				<exclusion>
-					<groupId>org.jetbrains.kotlin</groupId>
-					<artifactId>kotlin-stdlib-jdk8</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.jetbrains.kotlinx</groupId>
-					<artifactId>kotlin-coroutines-core-jvm</artifactId>
 				</exclusion>
-				<exclusion>
-					<groupId>io.github.microutils</groupId>
-					<artifactId>kotlin-logging-jvm</artifactId>
-				</exclusion> -->
 				<exclusion>
 					<groupId>com.hierynomus</groupId>
 					<artifactId>sshj</artifactId>
@@ -98,15 +86,11 @@
 				</exclusion> 
 			</exclusions>
 		</dependency>
-		<!-- <dependency>
-			<groupId>org.jetbrains.kotlin</groupId>
-			<artifactId>kotlin-stdlib</artifactId>
-			<version>1.4.32</version>
-		</dependency> -->
+		<!-- https://mvnrepository.com/artifact/com.sshtools/forker-wrapped -->
 		<dependency>
 			<groupId>com.sshtools</groupId>
 			<artifactId>forker-wrapped</artifactId>
-			<version>1.7-SNAPSHOT</version>
+			<version>1.7</version>
 		</dependency>
 		<dependency>
 			<groupId>com.sshtools</groupId>
@@ -166,84 +150,6 @@
 					<name>rasterize</name>
 				</property>
 			</activation>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>uk.co.bithatch</groupId>
-						<artifactId>svg-rasterizer-maven-plugin</artifactId>
-						<version>1.2</version>
-						<executions>
-							<execution>
-								<id>rasterize-icons</id>
-								<phase>process-resources</phase>
-								<goals>
-									<goal>rasterize-directory</goal>
-								</goals>
-								<configuration>
-									<inputDir>${basedir}/src/main/svg/icons</inputDir>
-									<destDir>${basedir}/src/main/resources/uk/co/bithatch/snake/ui/icons</destDir>
-									<outputs>
-										<output>
-											<path>{name}16{ext}</path>
-											<format>png</format>
-											<width>16</width>
-											<height>16</height>
-										</output>
-										<output>
-											<path>{name}24{ext}</path>
-											<format>png</format>
-											<width>24</width>
-											<height>24</height>
-										</output>
-										<output>
-											<path>{name}32{ext}</path>
-											<format>png</format>
-											<width>32</width>
-											<height>32</height>
-										</output>
-										<output>
-											<path>{name}48{ext}</path>
-											<format>png</format>
-											<width>48</width>
-											<height>48</height>
-										</output>
-										<output>
-											<path>{name}64{ext}</path>
-											<format>png</format>
-											<width>64</width>
-											<height>64</height>
-										</output>
-										<output>
-											<path>{name}96{ext}</path>
-											<format>png</format>
-											<width>96</width>
-											<height>96</height>
-										</output>
-										<output>
-											<path>{name}128{ext}</path>
-											<format>png</format>
-											<width>128</width>
-											<height>128</height>
-										</output>
-										<output>
-											<path>{name}256{ext}</path>
-											<format>png</format>
-											<width>256</width>
-											<height>256</height>
-										</output>
-										<output>
-											<path>{name}512{ext}</path>
-											<format>png</format>
-											<width>512</width>
-											<height>512</height>
-										</output>
-									</outputs>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
 		</profile>
 	</profiles>
 	<name>Snake - User Interface</name>
diff --git a/snake-ui/src/main/java/uk/co/bithatch/snake/ui/macros/MacroManager.java b/snake-ui/src/main/java/uk/co/bithatch/snake/ui/macros/MacroManager.java
index 337c5e3..5be1dda 100644
--- a/snake-ui/src/main/java/uk/co/bithatch/snake/ui/macros/MacroManager.java
+++ b/snake-ui/src/main/java/uk/co/bithatch/snake/ui/macros/MacroManager.java
@@ -70,12 +70,12 @@ public class MacroManager implements AutoCloseable, ActiveBankListener, ActivePr
 	public static final String CLIENT_PROP_INCLUDE_INPUT_EVENT_DEVICES = "includeInputEventDevices";
 	public static final String CLIENT_PROP_EXCLUDE_INPUT_EVENT_DEVICES = "excludeInputEventDevices";
 
-	private MacroSystem macroSystem;
-	private App context;
-	private Map<MacroDevice, Device> macroDevices = new HashMap<>();
-	private Map<Device, MacroDevice> reverseMacroDevices = new HashMap<>();
-	private Map<String, List<Pattern>> includeDevicePatterns = new HashMap<>();
-	private Map<String, List<Pattern>> excludeDevicePatterns = new HashMap<>();
+	private final MacroSystem macroSystem;
+	private final App context;
+	private final Map<MacroDevice, Device> macroDevices = new HashMap<>();
+	private final Map<Device, MacroDevice> reverseMacroDevices = new HashMap<>();
+	private final Map<String, List<Pattern>> includeDevicePatterns = new HashMap<>();
+	private final Map<String, List<Pattern>> excludeDevicePatterns = new HashMap<>();
 
 	private boolean started;
 
diff --git a/snake-updater/pom.xml b/snake-updater/pom.xml
index fbafaeb..6ace1c2 100644
--- a/snake-updater/pom.xml
+++ b/snake-updater/pom.xml
@@ -34,7 +34,7 @@
 		<dependency>
 			<groupId>com.sshtools</groupId>
 			<artifactId>forker-updater</artifactId>
-			<version>1.7-SNAPSHOT</version>
+			<version>1.7</version>
 		</dependency>
         <dependency>
             <groupId>org.kordamp.ikonli</groupId>
diff --git a/snake-widgets/pom.xml b/snake-widgets/pom.xml
index 03a3de4..2204800 100644
--- a/snake-widgets/pom.xml
+++ b/snake-widgets/pom.xml
@@ -19,35 +19,9 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>3.8.0</version>
 				<configuration>
-					<release>11</release>
+					<release>${maven.compiler.target}</release>
 				</configuration>
 			</plugin>
-			<!-- <plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-shade-plugin</artifactId>
-				<version>3.2.4</version>
-				<executions>
-					<execution>
-						<phase>package</phase>
-						<goals>
-							<goal>shade</goal>
-						</goals>
-						<configuration>
-							<artifactSet>
-								<excludes>
-									<exclude>org.openjfx:*</exclude>
-								</excludes>
-							</artifactSet>
-							<transformers>
-								<transformer
-									implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-									<mainClass>org.sonatype.haven.HavenCli</mainClass>
-								</transformer>
-							</transformers>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin> -->
 		</plugins>
 	</build>
 	<dependencies>