diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml
index 119e3b18f1..56dfe5f191 100644
--- a/.github/workflows/nightly.yaml
+++ b/.github/workflows/nightly.yaml
@@ -11,10 +11,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - name: Set up JDK 11
+    - name: Set up JDK
       uses: actions/setup-java@v3
       with:
-        java-version: '11'
+        java-version: '17'
         distribution: 'temurin'
 
     - name: Cache the Maven packages to speed up build
@@ -31,19 +31,15 @@ jobs:
       run: |
         sudo apt-get install -qq genisoimage
         mvn package -pl ugs-classic assembly:assembly -DskipTests=true          
-        mvn package -pl ugs-platform/application -P create-macosx-package -DskipTests=true
-        mvn package -pl ugs-platform/application -P create-win32-package -DskipTests=true
-        mvn package -pl ugs-platform/application -P create-win64-package -DskipTests=true
-        mvn package -pl ugs-platform/application -P create-linux-package -DskipTests=true 
-        mvn package -pl ugs-platform/application -P create-pi-package -DskipTests=true
-    
+        mvn package -pl ugs-platform/application -P create-macosx-x64-package,create-macosx-aarch64-package,create-win32-package,create-win64-package,create-linux-x64-package,create-linux-arm-package,create-linux-aarch64-package -DskipTests=true
+
     # https://github.com/marketplace/actions/upload-to-github-release
     - name: Upload binaries to snapshot release
       uses: xresloader/upload-to-github-release@v1
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
-        file: "ugs-classic/target/UniversalGcodeSender.zip;ugs-platform/application/target/ios-ugs-platform-app-*.dmg;ugs-platform/application/target/linux-ugs-platform-app*.tar.gz;ugs-platform/application/target/pi-ugs-platform-app*.tar.gz;ugs-platform/application/target/win-ugs-platform-app-*.zip;ugs-platform/application/target/win64-ugs-platform-app-*.zip;ugs-platform/application/target/ugs-platform-app-*.zip"
+        file: "ugs-classic/target/UniversalGcodeSender.zip;ugs-platform/application/target/macosx-*-ugs-platform-app-*.dmg;ugs-platform/application/target/linux-*-ugs-platform-app*.tar.gz;ugs-platform/application/target/win-ugs-platform-app-*.zip;ugs-platform/application/target/win64-ugs-platform-app-*.zip;ugs-platform/application/target/ugs-platform-app-*.zip"
         prerelease: true
         tag_name: "nightly"
         overwrite: true
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index bbae99040c..27983b2572 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -8,10 +8,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - name: Set up JDK 11
+    - name: Set up JDK
       uses: actions/setup-java@v3
       with:
-        java-version: '11'
+        java-version: '17'
         distribution: 'temurin'
 
     - name: Cache the Maven packages to speed up build
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 40c21a9940..14131ba136 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -11,10 +11,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - name: Set up JDK 11
+    - name: Set up JDK
       uses: actions/setup-java@v3
       with:
-        java-version: '11'
+        java-version: '17'
         distribution: 'temurin'
 
     - name: Cache the Maven packages to speed up build
@@ -50,7 +50,7 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
-        file: "ugs-classic/target/UniversalGcodeSender.zip;ugs-platform/application/target/ios-ugs-platform-app-*.dmg;ugs-platform/application/target/linux-ugs-platform-app*.tar.gz;ugs-platform/application/target/pi-ugs-platform-app*.tar.gz;ugs-platform/application/target/win-ugs-platform-app-*.zip;ugs-platform/application/target/win64-ugs-platform-app-*.zip;ugs-platform/application/target/ugs-platform-app-*.zip"
+        file: "ugs-classic/target/UniversalGcodeSender.zip;ugs-platform/application/target/macosx-*-ugs-platform-app-*.dmg;ugs-platform/application/target/linux-*-ugs-platform-app*.tar.gz;ugs-platform/application/target/win-ugs-platform-app-*.zip;ugs-platform/application/target/win64-ugs-platform-app-*.zip;ugs-platform/application/target/ugs-platform-app-*.zip"
         prerelease: true
         tag_name: ${GITHUB_REF_NAME}
         overwrite: true
diff --git a/.idea/runConfigurations/UGS_Platform.xml b/.idea/runConfigurations/UGS_Platform.xml
index 6b5794c2d7..680cb31827 100644
--- a/.idea/runConfigurations/UGS_Platform.xml
+++ b/.idea/runConfigurations/UGS_Platform.xml
@@ -1,11 +1,11 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="UGS-Platform" type="Application" factoryName="Application">
-    <option name="ALTERNATIVE_JRE_PATH" value="/usr/lib/jvm/java-1.11.0-openjdk-amd64" />
+    <option name="ALTERNATIVE_JRE_PATH" value="temurin-17" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
     <option name="MAIN_CLASS_NAME" value="org.netbeans.Main" />
     <module name="ugs-platform-app" />
     <option name="PROGRAM_PARAMETERS" value="--branding ugsplatform" />
-    <option name="VM_PARAMETERS" value="-Dnetbeans.user=$ProjectFileDir$/ugs-platform/application/target/userdir -Dnetbeans.home=$ProjectFileDir$/ugs-platform/application/target/ugsplatform/platform -Dnetbeans.logger.console=true -Dnetbeans.indexing.noFileRefresh=true -Dnetbeans.dirs=$ProjectFileDir$/ugs-platform/application/target/ugsplatform/ugsplatform:$ProjectFileDir$/ugs-platform/application/target/ugsplatform/platform:$ProjectFileDir$/ugs-platform/application/target/ugsplatform/ide:$ProjectFileDir$/ugs-platform/application/target/ugsplatform/extra:$ProjectFileDir$/ugs-platform/application/target/ugsplatform/java" />
+    <option name="VM_PARAMETERS" value="-Dpolyglot.engine.WarnInterpreterOnly=false -Dnetbeans.user=$ProjectFileDir$/ugs-platform/application/target/userdir -Dnetbeans.home=$ProjectFileDir$/ugs-platform/application/target/ugsplatform/platform -Dnetbeans.logger.console=true -Dnetbeans.indexing.noFileRefresh=true -Dnetbeans.moduleitem.dontverifyclassloader=true -Dnetbeans.dirs=$ProjectFileDir$/ugs-platform/application/target/ugsplatform/ugsplatform:$ProjectFileDir$/ugs-platform/application/target/ugsplatform/platform:$ProjectFileDir$/ugs-platform/application/target/ugsplatform/ide:$ProjectFileDir$/ugs-platform/application/target/ugsplatform/extra:$ProjectFileDir$/ugs-platform/application/target/ugsplatform/java --add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.base/java.lang.ref=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.security=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-exports=java.base/sun.reflect.annotation=ALL-UNNAMED --add-opens=java.prefs/java.util.prefs=ALL-UNNAMED --add-opens=java.desktop/javax.swing.plaf.basic=ALL-UNNAMED --add-opens=java.desktop/javax.swing.text=ALL-UNNAMED --add-opens=java.desktop/javax.swing=ALL-UNNAMED --add-opens=java.desktop/java.awt=ALL-UNNAMED --add-opens=java.desktop/java.awt.event=ALL-UNNAMED --add-opens=java.desktop/sun.awt.X11=ALL-UNNAMED --add-opens=java.desktop/javax.swing.plaf.synth=ALL-UNNAMED --add-opens=java.desktop/com.sun.java.swing.plaf.gtk=ALL-UNNAMED --add-opens=java.desktop/sun.awt.shell=ALL-UNNAMED --add-opens=java.desktop/sun.awt.im=ALL-UNNAMED --add-exports=java.desktop/sun.awt=ALL-UNNAMED --add-exports=java.desktop/java.awt.peer=ALL-UNNAMED --add-exports=java.desktop/com.sun.beans.editors=ALL-UNNAMED --add-exports=java.desktop/sun.swing=ALL-UNNAMED --add-exports=java.desktop/sun.awt.im=ALL-UNNAMED --add-exports=java.desktop/com.sun.java.swing.plaf.motif=ALL-UNNAMED --add-exports=java.desktop/com.apple.eio=ALL-UNNAMED" />
     <method v="2">
       <option name="Make" enabled="true" />
     </method>
diff --git a/README.md b/README.md
index 24a73f0d1b..6904f99a7d 100644
--- a/README.md
+++ b/README.md
@@ -95,7 +95,7 @@ UGS Classic with visualizer
 <details><summary>Show details on how to compile the software</summary>
 <p>
 
-For development we use [Maven](http://maven.apache.org) and [Java](https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/tag/jdk-13.0.1%2B9) for compiling. We rely on a specific version of Java 13.0.1-9 is needed due to compatibility issues with a library we depend on.
+For development we use [Maven](http://maven.apache.org) and [Java 17](https://adoptium.net/) for compiling.
 
 #### Compiling and starting the application
 
@@ -141,7 +141,40 @@ If you are more used to IntelliJ, you can also build, run and debug it there.
 - Import the Source, `File` -> `New` -> `Project from existing Sources`
 - Setup a new "Run Configuration", `Java Application`, with following settings:
   - Main Class: `org.netbeans.Main`
-  - VM Options: `-Dnetbeans.user=$ProjectFileDir$/ugs-platform/application/target/userdir -Dnetbeans.home=$ProjectFileDir$/ugs-platform/application/target/ugsplatform/platform -Dnetbeans.logger.console=true -Dnetbeans.indexing.noFileRefresh=true -Dnetbeans.dirs="$ProjectFileDir$/ugs-platform/application/target/ugsplatform/ugsplatform:$ProjectFileDir$/ugs-platform/application/target/ugsplatform/platform:$ProjectFileDir$/ugs-platform/application/target/ugsplatform/ide:$ProjectFileDir$/ugs-platform/application/target/ugsplatform/extra:$ProjectFileDir$/ugs-platform/application/target/ugsplatform/java"`
+  - VM Options:
+```
+-Dpolyglot.engine.WarnInterpreterOnly=false
+-Dnetbeans.user=$ProjectFileDir$/ugs-platform/application/target/userdir
+-Dnetbeans.home=$ProjectFileDir$/ugs-platform/application/target/ugsplatform/platform
+-Dnetbeans.logger.console=true
+-Dnetbeans.indexing.noFileRefresh=true
+-Dnetbeans.moduleitem.dontverifyclassloader=true
+-Dnetbeans.dirs=$ProjectFileDir$/ugs-platform/application/target/ugsplatform/ugsplatform:$ProjectFileDir$/ugs-platform/application/target/ugsplatform/platform:$ProjectFileDir$/ugs-platform/application/target/ugsplatform/ide:$ProjectFileDir$/ugs-platform/application/target/ugsplatform/extra:$ProjectFileDir$/ugs-platform/application/target/ugsplatform/java
+--add-opens=java.base/java.net=ALL-UNNAMED
+--add-opens=java.base/java.lang.ref=ALL-UNNAMED
+--add-opens=java.base/java.lang=ALL-UNNAMED
+--add-opens=java.base/java.security=ALL-UNNAMED
+--add-opens=java.base/java.util=ALL-UNNAMED
+--add-opens=java.base/java.nio=ALL-UNNAMED
+--add-exports=java.base/sun.reflect.annotation=ALL-UNNAMED
+--add-opens=java.prefs/java.util.prefs=ALL-UNNAMED
+--add-opens=java.desktop/javax.swing.plaf.basic=ALL-UNNAMED
+--add-opens=java.desktop/javax.swing.text=ALL-UNNAMED
+--add-opens=java.desktop/javax.swing=ALL-UNNAMED
+--add-opens=java.desktop/java.awt=ALL-UNNAMED
+--add-opens=java.desktop/java.awt.event=ALL-UNNAMED
+--add-opens=java.desktop/sun.awt.X11=ALL-UNNAMED
+--add-opens=java.desktop/javax.swing.plaf.synth=ALL-UNNAMED
+--add-opens=java.desktop/com.sun.java.swing.plaf.gtk=ALL-UNNAMED
+--add-opens=java.desktop/sun.awt.shell=ALL-UNNAMED
+--add-opens=java.desktop/sun.awt.im=ALL-UNNAMED
+--add-exports=java.desktop/sun.awt=ALL-UNNAMED
+--add-exports=java.desktop/java.awt.peer=ALL-UNNAMED
+--add-exports=java.desktop/com.sun.beans.editors=ALL-UNNAMED
+--add-exports=java.desktop/sun.swing=ALL-UNNAMED
+--add-exports=java.desktop/sun.awt.im=ALL-UNNAMED
+--add-exports=java.desktop/com.sun.java.swing.plaf.motif=ALL-UNNAMED
+``` 
   - Program arguments: `--branding ugsplatform`
   - Working dir: `$ProjectFileDir$`
   - Use classpath of module: `ugs-platform-app` 
diff --git a/pom.xml b/pom.xml
index cafe516d46..d6bc2e3260 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,7 +89,7 @@
     <timestamp>${maven.build.timestamp}</timestamp>
 
     <ugs.maven-compiler-plugin.version>3.6.1</ugs.maven-compiler-plugin.version>
-    <ugs.jvm.version>1.8</ugs.jvm.version>
+    <ugs.jvm.version>17</ugs.jvm.version>
     <ugs.kotlin.version>1.3.61</ugs.kotlin.version>
 
     <!-- cloud storage plugin -->
diff --git a/ugs-core/pom.xml b/ugs-core/pom.xml
index cfd915256b..cf0596e78e 100644
--- a/ugs-core/pom.xml
+++ b/ugs-core/pom.xml
@@ -112,6 +112,18 @@
             <artifactId>core</artifactId>
             <version>${zxing.version}</version>
         </dependency>
+
+        <!-- For scripting -->
+        <dependency>
+            <groupId>org.graalvm.js</groupId>
+            <artifactId>js</artifactId>
+            <version>23.0.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.graalvm.js</groupId>
+            <artifactId>js-scriptengine</artifactId>
+            <version>23.1.0</version>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/ugs-core/test/com/willwinder/universalgcodesender/firmware/fluidnc/commands/GetErrorCodesCommandTest.java b/ugs-core/test/com/willwinder/universalgcodesender/firmware/fluidnc/commands/GetErrorCodesCommandTest.java
index 5df243d942..1f946fb467 100644
--- a/ugs-core/test/com/willwinder/universalgcodesender/firmware/fluidnc/commands/GetErrorCodesCommandTest.java
+++ b/ugs-core/test/com/willwinder/universalgcodesender/firmware/fluidnc/commands/GetErrorCodesCommandTest.java
@@ -85,7 +85,7 @@ public void appendResponseWithErrorCodes() throws InterruptedException {
         command.appendResponse("ok");
 
         // Wait for the listener to complete
-        Thread.sleep(100);
+        Thread.sleep(200);
 
         assertTrue(command.isOk());
         assertEquals(1, eventsCounter.get());
diff --git a/ugs-platform/DowelModule/pom.xml b/ugs-platform/DowelModule/pom.xml
deleted file mode 100644
index 7080678275..0000000000
--- a/ugs-platform/DowelModule/pom.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?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/xsd/maven-4.0.0.xsd">  
-  <modelVersion>4.0.0</modelVersion>  
-  <parent> 
-    <groupId>com.willwinder</groupId>  
-    <artifactId>ugs-platform-parent</artifactId>  
-    <version>${revision}${changelist}</version>
-  </parent>  
-  <artifactId>DowelModule</artifactId>  
-  <packaging>nbm</packaging>
-  <name>DowelModule</name>  
-  <build> 
-    <plugins> 
-      <plugin> 
-        <groupId>org.apache.netbeans.utilities</groupId>
-        <artifactId>nbm-maven-plugin</artifactId>  
-        <extensions>true</extensions> 
-      </plugin>  
-      <plugin>
-        <groupId>org.jetbrains.kotlin</groupId>
-        <artifactId>kotlin-maven-plugin</artifactId>
-      </plugin>
-      <plugin> 
-        <groupId>org.apache.maven.plugins</groupId>  
-        <artifactId>maven-compiler-plugin</artifactId> 
-      </plugin>  
-    </plugins> 
-  </build>  
-  <dependencies> 
-    <dependency> 
-      <groupId>org.netbeans.api</groupId>  
-      <artifactId>org-netbeans-api-annotations-common</artifactId>  
-      <version>${netbeans.version}</version> 
-    </dependency>  
-    <dependency> 
-      <groupId>org.netbeans.api</groupId>  
-      <artifactId>org-openide-awt</artifactId>  
-      <version>${netbeans.version}</version>  
-      <type>jar</type> 
-    </dependency>  
-    <dependency> 
-      <groupId>org.netbeans.api</groupId>  
-      <artifactId>org-openide-windows</artifactId>  
-      <version>${netbeans.version}</version>  
-      <type>jar</type> 
-    </dependency>  
-    <dependency> 
-      <groupId>org.netbeans.api</groupId>  
-      <artifactId>org-openide-util</artifactId>  
-      <version>${netbeans.version}</version>  
-      <type>jar</type> 
-    </dependency>  
-    <dependency> 
-      <groupId>org.netbeans.api</groupId>  
-      <artifactId>org-openide-util-lookup</artifactId>  
-      <version>${netbeans.version}</version> 
-    </dependency>  
-    <dependency> 
-      <groupId>${project.groupId}</groupId>  
-      <artifactId>ugs-platform-ugslib</artifactId>  
-      <version>${project.version}</version>  
-      <type>jar</type> 
-    </dependency>  
-    <dependency> 
-      <groupId>${project.groupId}</groupId>  
-      <artifactId>ugs-platform-visualizer</artifactId>  
-      <version>${project.version}</version> 
-    </dependency>  
-    <dependency> 
-      <groupId>org.netbeans.api</groupId>  
-      <artifactId>org-openide-util-ui</artifactId>  
-      <version>${netbeans.version}</version> 
-    </dependency>  
-    <dependency> 
-      <groupId>org.netbeans.api</groupId>  
-      <artifactId>org-netbeans-modules-options-api</artifactId>  
-      <version>${netbeans.version}</version> 
-    </dependency>  
-    <dependency> 
-      <groupId>org.netbeans.api</groupId>  
-      <artifactId>org-netbeans-modules-settings</artifactId>  
-      <version>${netbeans.version}</version> 
-    </dependency>
-    <dependency> 
-      <groupId>org.jetbrains.kotlin</groupId>  
-      <artifactId>kotlin-stdlib</artifactId>  
-      <version>1.3.0</version>
-    </dependency> 
-  </dependencies> 
-</project>
diff --git a/ugs-platform/DowelModule/src/main/java/com/willwinder/ugs/platform/dowel/DowelGenerator.kt b/ugs-platform/DowelModule/src/main/java/com/willwinder/ugs/platform/dowel/DowelGenerator.kt
deleted file mode 100644
index 5bcc42850a..0000000000
--- a/ugs-platform/DowelModule/src/main/java/com/willwinder/ugs/platform/dowel/DowelGenerator.kt
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
-    Copyprintln 2017 Will Winder
-
-    This file is part of Universal Gcode Sender (UGS).
-
-    UGS is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    UGS is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with UGS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.willwinder.ugs.platform.dowel
-
-import com.google.common.collect.Iterables
-import com.willwinder.universalgcodesender.gcode.util.GcodeUtils
-import com.willwinder.universalgcodesender.model.UnitUtils
-import com.willwinder.universalgcodesender.model.Position
-import java.io.PrintWriter
-import java.util.Date
-
-/*
-
-  @author wwinder
-  Created on Oct 29, 2017
-*/
-
-public class DowelGenerator(var settings: DowelSettings) {
-
-  public fun unitMultiplier() = UnitUtils.scaleUnits(settings.units, UnitUtils.Units.MM)
-
-  public fun getLocations(target: UnitUtils.Units): List<Position> {
-    val mult= UnitUtils.scaleUnits(settings.units, target)
-    val offset = mult * (settings.dowelDiameter + settings.bitDiameter * 1.25)
-    val corner = Position(
-        mult * settings.dowelDiameter / 2.0,
-        mult * settings.dowelDiameter / 2.0,
-        0.0)
-
-    val ret: MutableList<Position> = mutableListOf()
-    for (x in 0 until settings.numDowelsX) {
-      for (y in 0 until settings.numDowelsY) {
-        ret.add(Position(corner.x + x * offset, corner.y + y * offset, 0.0))
-      }
-    }
-
-    return ret
-  }
-
-  public fun generate(output: PrintWriter) {
-    // Set units and absolute movement/IJK mode.
-    output.println("(Generated by Universal Gcode Sender ${Date()})")
-    output.println("${GcodeUtils.unitCommand(settings.units)} G90 G91.1")
-    output.println("G17 F${settings.feed}")
-    output.println("M3")
-
-    for (point in getLocations(settings.units)) {
-      generateOne(point, output)
-    }
-
-    output.println("\n(All done!)")
-    output.println("M5")
-    output.println("M30")
-  }
-
-  public fun generateOne(at: Position, output: PrintWriter) {
-    output.println("\n(Dowel at x:${at.x} y:${at.y})")
-
-    val radius = settings.bitDiameter / 2.0 + settings.dowelDiameter / 2.0
-    val quarterDepth = settings.cutDepth / 4.0
-
-    val arcSequence: Iterator<Position> = Iterables.cycle(listOf(
-        Position(at.x - radius, at.y, 0.0),
-        Position(at.x, at.y + radius, 0.0),
-        Position(at.x + radius, at.y, 0.0),
-        Position(at.x, at.y - radius, 0.0)
-    )).iterator()
-
-    var last = arcSequence.next();
-
-    // Start
-    output.println("G0 X${last.x} Y${last.y}")
-    output.println("G1 Z0")
-    output.println("G17 F${settings.feed}")
-
-    // Create the helix
-    var currentDepth = 0.0
-    while (currentDepth > -settings.dowelLength) {
-      val n = arcSequence.next()
-      output.println("G02 X${n.x} Y${n.y} Z${currentDepth} I${at.x - last.x} J${at.y - last.y}")
-      last = n
-      currentDepth -= quarterDepth
-    }
-
-    // final loop at final depth
-    for (i in 0..4) {
-      val n = arcSequence.next()
-      output.println("G02 X${n.x} Y${n.y} Z${-settings.dowelLength} I${at.x - last.x} J${at.y - last.y}")
-      last = n
-    }
-
-    // Lift tool out of pocket.
-    output.println("G0 Z${settings.safetyHeight}")
-  }
-}
diff --git a/ugs-platform/DowelModule/src/main/java/com/willwinder/ugs/platform/dowel/DowelPreview.kt b/ugs-platform/DowelModule/src/main/java/com/willwinder/ugs/platform/dowel/DowelPreview.kt
deleted file mode 100644
index 88fcbb3fe1..0000000000
--- a/ugs-platform/DowelModule/src/main/java/com/willwinder/ugs/platform/dowel/DowelPreview.kt
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
-    Copyright 2017 Will Winder
-
-    This file is part of Universal Gcode Sender (UGS).
-
-    UGS is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    UGS is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with UGS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.willwinder.ugs.platform.dowel
-
-import com.jogamp.opengl.GL2
-import com.jogamp.opengl.GLAutoDrawable
-import com.jogamp.opengl.util.gl2.GLUT
-import com.willwinder.ugs.nbm.visualizer.options.VisualizerOptions
-import com.willwinder.ugs.nbm.visualizer.shared.Renderable
-import com.willwinder.universalgcodesender.model.Position;
-import com.willwinder.universalgcodesender.model.UnitUtils
-
-/*
-
-  @author wwinder
-  Created on Nov 5, 2017
-*/
-
-class DowelPreview(val description: String, val generator: DowelGenerator) : Renderable(6, description) {
-
-    companion object {
-      val glut = GLUT()
-      val slices = 20
-      val stacks = 20
-
-      private fun drawDowel(gl: GL2, at: Position, diameter: Double, length: Double) {
-        gl.glPushMatrix()
-          gl.glTranslated(at.x, at.y, 0.0)
-          gl.glRotated(180.0, 1.0, 0.0, 0.0)
-          glut.glutSolidCylinder(diameter/2.0, length, slices, stacks)
-        gl.glPopMatrix()
-      }
-    }
-
-    override fun rotate() = true
-    override fun center() = true
-
-    override fun init(drawable: GLAutoDrawable?) {
-    }
-
-    override fun reloadPreferences(vo: VisualizerOptions?) {
-    }
-
-    override fun draw(drawable: GLAutoDrawable?, idle: Boolean, machineCoord: Position?, workCoord: Position?, objectMin: Position?, objectMax: Position?, scaleFactor: Double, mouseWorldCoordinates: Position?, rotation: Position?) {
-      if (drawable?.gl?.gL2 == null) return
-      val mult: Double = generator.unitMultiplier()
-      drawable.gl.gL2.let {
-        for (point in generator.getLocations(UnitUtils.Units.MM)) {
-          drawDowel(
-              it,
-              point,
-              mult * generator.settings.dowelDiameter,
-              mult * generator.settings.dowelLength)
-        }
-      }
-    }
-
-    override fun isEnabled(): Boolean {
-        return VisualizerOptions.getBooleanOption(VisualizerOptions.VISUALIZER_OPTION_DOWEL_PREVIEW, true)
-    }
-
-    override fun setEnabled(enabled: Boolean) {
-        VisualizerOptions.setBooleanOption(VisualizerOptions.VISUALIZER_OPTION_DOWEL_PREVIEW, enabled)
-    }
-}
diff --git a/ugs-platform/DowelModule/src/main/java/com/willwinder/ugs/platform/dowel/DowelTopComponent.java b/ugs-platform/DowelModule/src/main/java/com/willwinder/ugs/platform/dowel/DowelTopComponent.java
deleted file mode 100644
index 146c83ccac..0000000000
--- a/ugs-platform/DowelModule/src/main/java/com/willwinder/ugs/platform/dowel/DowelTopComponent.java
+++ /dev/null
@@ -1,303 +0,0 @@
-/*
-    Copyright 2017-2022 Will Winder
-
-    This file is part of Universal Gcode Sender (UGS).
-
-    UGS is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    UGS is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with UGS.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.willwinder.ugs.platform.dowel;
-
-import static com.willwinder.universalgcodesender.utils.SwingHelpers.getDouble;
-import static com.willwinder.universalgcodesender.utils.SwingHelpers.getInt;
-import static com.willwinder.universalgcodesender.utils.SwingHelpers.selectedUnit;
-import static com.willwinder.universalgcodesender.utils.SwingHelpers.unitIdx;
-
-import com.google.gson.Gson;
-import com.willwinder.ugs.nbm.visualizer.shared.RenderableUtils;
-import com.willwinder.ugs.nbp.lib.Mode;
-import com.willwinder.ugs.nbp.lib.lookup.CentralLookup;
-import com.willwinder.ugs.nbp.lib.services.LocalizingService;
-import static com.willwinder.ugs.nbp.lib.services.LocalizingService.lang;
-import com.willwinder.ugs.nbp.lib.services.TopComponentLocalizer;
-import com.willwinder.universalgcodesender.i18n.Localization;
-import com.willwinder.universalgcodesender.model.BackendAPI;
-import com.willwinder.universalgcodesender.utils.GUIHelpers;
-import com.willwinder.universalgcodesender.utils.SwingHelpers;
-
-import net.miginfocom.swing.MigLayout;
-
-import org.netbeans.api.settings.ConvertAsProperties;
-import org.openide.awt.ActionID;
-import org.openide.awt.ActionReference;
-import org.openide.windows.TopComponent;
-
-import java.awt.*;
-import java.io.PrintWriter;
-import java.io.File;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-
-import javax.swing.*;
-import javax.swing.border.Border;
-import org.openide.modules.OnStart;
-
-/**
- * Top component which displays something.
- */
-@ConvertAsProperties(
-        dtd = "-//com.willwinder.ugs.platform.dowel//Dowel//EN",
-        autostore = false
-)
-@TopComponent.Description(
-        preferredID = "DowelTopComponent",
-        //iconBase="SET/PATH/TO/ICON/HERE",
-        persistenceType = TopComponent.PERSISTENCE_ALWAYS
-)
-@TopComponent.Registration(mode = Mode.OUTPUT, openAtStartup = false)
-@ActionID(
-        category = DowelTopComponent.DowelCategory,
-        id = DowelTopComponent.DowelActionId)
-@ActionReference(path = LocalizingService.MENU_WINDOW_PLUGIN)
-@TopComponent.OpenActionRegistration(
-        displayName = "Dowel",
-        preferredID = "DowelTopComponent"
-)
-public final class DowelTopComponent extends TopComponent {
-  public final static String DowelTitle = Localization.getString("platform.window.dowel-module", lang);
-  public final static String DowelTooltip = Localization.getString("platform.window.dowel-module.tooltip", lang);
-  public final static String DowelActionId = "com.willwinder.ugs.platform.dowel.DowelTopComponent";
-  public final static String DowelCategory = LocalizingService.CATEGORY_WINDOW;
-
-  private final static String JSON_PROPERTY = "dowel_settings_json";
-  private final static String ERROR_GENERATING = "An error occurred generating dowel program: ";
-  private final static String ERROR_LOADING = "An error occurred loading generated dowel program: ";
-
-  private final BackendAPI backend;
-
-  private final JButton generateGcodeButton = new JButton(
-          Localization.getString("platform.plugin.dowel-module.generate"));
-  private final JButton exportGcodeButton = new JButton(
-          Localization.getString("platform.plugin.dowel-module.export"));
-
-  private final SpinnerNumberModel numDowelsX;
-  private final SpinnerNumberModel numDowelsY;
-  private final SpinnerNumberModel dowelDiameter;
-  private final SpinnerNumberModel dowelLength;
-  private final SpinnerNumberModel bitDiameter;
-  private final SpinnerNumberModel feed;
-  private final SpinnerNumberModel cutDepth;
-  private final SpinnerNumberModel safetyHeight;
-  private final JComboBox<String> units;
-
-  private static final Gson GSON = new Gson();
-
-  private final DowelGenerator generator;
-  private final DowelPreview preview;
-
-  @OnStart
-  public static class Localizer extends TopComponentLocalizer {
-    public Localizer() {
-      super(DowelCategory, DowelActionId, DowelTitle);
-    }
-  }
-
-  public DowelTopComponent() {
-    setName(DowelTitle);
-    setToolTipText(DowelTooltip);
-
-    backend = CentralLookup.getDefault().lookup(BackendAPI.class);
-
-    double doubleSpinner = 1000000;
-    int intSpinner = 1000000;
-
-    numDowelsX = new SpinnerNumberModel(3, 1, intSpinner, 1);
-    numDowelsY = new SpinnerNumberModel(3, 1, intSpinner, 1);
-    dowelDiameter = new SpinnerNumberModel(5, 0, doubleSpinner, 0.1);
-    dowelLength = new SpinnerNumberModel(10, 0, doubleSpinner, 0.1);
-    bitDiameter = new SpinnerNumberModel(3.17, 0, doubleSpinner, 0.1);
-    feed = new SpinnerNumberModel(100, 1, doubleSpinner, 1);
-    cutDepth = new SpinnerNumberModel(2, 0, doubleSpinner, 0.1);
-    safetyHeight = new SpinnerNumberModel(5, 0, doubleSpinner, 0.1);
-
-    units = new JComboBox<>(SwingHelpers.getUnitOptions());
-
-    generator = new DowelGenerator(getSettings());
-    preview = new DowelPreview(
-            Localization.getString("platform.plugin.dowel-module.preview"),generator);
-
-    setupGui();
-  }
-
-  private void setupGui() {
-    // Button callbacks
-    generateGcodeButton.addActionListener(al -> generateGcode());
-    exportGcodeButton.addActionListener(al -> exportGcode());
-
-    // Change listeners
-    numDowelsX.addChangeListener(l -> controlChangeListener());
-    numDowelsY.addChangeListener(l -> controlChangeListener());
-    dowelDiameter.addChangeListener(l -> controlChangeListener());
-    dowelLength.addChangeListener(l -> controlChangeListener());
-    bitDiameter.addChangeListener(l -> controlChangeListener());
-    feed.addChangeListener(l -> controlChangeListener());
-    cutDepth.addChangeListener(l -> controlChangeListener());
-    safetyHeight.addChangeListener(l -> controlChangeListener());
-    units.addActionListener(l -> controlChangeListener());
-    Border blackline = BorderFactory.createLineBorder(Color.black);
-
-    // Dowel settings
-    JPanel dowelPanel = new JPanel();
-    dowelPanel.setBorder(BorderFactory.createTitledBorder(blackline,
-            Localization.getString("platform.plugin.dowel-module.dowel")));
-    dowelPanel.setLayout(new MigLayout("fillx, wrap 4"));
-
-    dowelPanel.add(new JLabel(
-            Localization.getString("platform.plugin.dowel-module.x")), "growx");
-    dowelPanel.add(new JSpinner(numDowelsX), "growx");
-
-    dowelPanel.add(new JLabel(
-            Localization.getString("platform.plugin.dowel-module.diameter")), "growx");
-    dowelPanel.add(new JSpinner(dowelDiameter), "growx");
-
-    dowelPanel.add(new JLabel(
-            Localization.getString("platform.plugin.dowel-module.y")), "growx");
-    dowelPanel.add(new JSpinner(numDowelsY), "growx");
-
-    dowelPanel.add(new JLabel(
-            Localization.getString("platform.plugin.dowel-module.length")), "growx");
-    dowelPanel.add(new JSpinner(dowelLength), "growx");
-
-    dowelPanel.add(generateGcodeButton, "growx, span 2");
-    dowelPanel.add(exportGcodeButton, "growx, span 2");
-
-    // Gcode settings
-    JPanel cutPanel = new JPanel();
-    cutPanel.setBorder(BorderFactory.createTitledBorder(blackline,
-            Localization.getString("mainWindow.swing.settingsMenu")));
-    cutPanel.setLayout(new MigLayout("fillx, wrap 4"));
-
-    cutPanel.add(new JLabel(Localization.getString("gcode.setting.units")), "growx");
-    cutPanel.add(units, "growx");
-
-    cutPanel.add(new JLabel(
-            Localization.getString("gcode.setting.feed")), "growx");
-    cutPanel.add(new JSpinner(feed), "growx");
-
-    cutPanel.add(new JLabel(
-            Localization.getString("gcode.setting.endmill-diameter")), "growx");
-    cutPanel.add(new JSpinner(bitDiameter), "growx");
-
-    cutPanel.add(new JLabel(
-            Localization.getString("gcode.setting.cut-depth")), "growx");
-    cutPanel.add(new JSpinner(cutDepth), "growx");
-
-    cutPanel.add(new JLabel(
-            Localization.getString("gcode.setting.safety-height")), "growx");
-    cutPanel.add(new JSpinner(safetyHeight), "growx");
-
-    // Put it all together
-    setLayout(new MigLayout("fillx, wrap 2"));
-    add(dowelPanel, "grow");
-    add(cutPanel, "grow");
-  }
-
-  private void generateAndLoadGcode(File file) {
-    try {
-      try (PrintWriter writer = new PrintWriter(file, StandardCharsets.UTF_8.name())) {
-        generator.generate(writer);
-      }
-      backend.setGcodeFile(file);
-    } catch (IOException e) {
-      GUIHelpers.displayErrorDialog(ERROR_GENERATING + e.getLocalizedMessage());
-    } catch (Exception e) {
-      GUIHelpers.displayErrorDialog(ERROR_LOADING + e.getLocalizedMessage());
-    }
-
-  }
-
-  private void generateGcode() {
-    Path path = null;
-    try {
-      path = Files.createTempFile("dowel_program", ".gcode");
-      File file = path.toFile();
-      generateAndLoadGcode(file);
-    } catch (IOException e) {
-      GUIHelpers.displayErrorDialog(ERROR_LOADING + e.getLocalizedMessage());
-    }
-  }
-
-  private void exportGcode() {
-    String sourceDir = backend.getSettings().getLastOpenedFilename();
-    SwingHelpers
-          .createFile(sourceDir)
-          .ifPresent(file -> generateAndLoadGcode(file));
-  }
-
-  private void controlChangeListener() {
-    this.generator.setSettings(getSettings());
-  }
-
-  public DowelSettings getSettings() {
-    return new DowelSettings(
-        getInt(this.numDowelsX),
-        getInt(this.numDowelsY),
-        getDouble(this.dowelDiameter),
-        getDouble(this.dowelLength),
-        getDouble(this.bitDiameter),
-        getDouble(this.feed),
-        getDouble(this.cutDepth),
-        getDouble(this.safetyHeight),
-        selectedUnit(this.units.getSelectedIndex()));
-  }
-
-  @Override
-  public void componentOpened() {
-    RenderableUtils.registerRenderable(preview);
-  }
-
-  @Override
-  public void componentClosed() {
-    RenderableUtils.removeRenderable(preview);
-  }
-
-  public void writeProperties(java.util.Properties p) {
-    // better to version settings since initial version as advocated at
-    // http://wiki.apidesign.org/wiki/PropertyFiles
-    p.setProperty("version", "1.0");
-    p.setProperty(JSON_PROPERTY, GSON.toJson(getSettings()));
-  }
-
-  public void readProperties(java.util.Properties p) {
-    if (p.containsKey(JSON_PROPERTY)) {
-      String json = p.getProperty(JSON_PROPERTY);
-      try {
-        DowelSettings ds = new Gson().fromJson(json, DowelSettings.class);
-
-        this.numDowelsX.setValue(ds.getNumDowelsX());
-        this.numDowelsY.setValue(ds.getNumDowelsY());
-        this.dowelDiameter.setValue(ds.getDowelDiameter());
-        this.dowelLength.setValue(ds.getDowelLength());
-        this.bitDiameter.setValue(ds.getBitDiameter());
-        this.feed.setValue(ds.getFeed());
-        this.cutDepth.setValue(ds.getCutDepth());
-        this.safetyHeight.setValue(ds.getSafetyHeight());
-        this.units.setSelectedIndex(unitIdx(ds.getUnits()));
-      } catch (Exception e) {
-        GUIHelpers.displayErrorDialog("Problem loading Dowel Settings, defaults have been restored.");
-      }
-    }
-  }
-}
diff --git a/ugs-platform/DowelModule/src/main/nbm/manifest.mf b/ugs-platform/DowelModule/src/main/nbm/manifest.mf
deleted file mode 100644
index 2f1e156f6e..0000000000
--- a/ugs-platform/DowelModule/src/main/nbm/manifest.mf
+++ /dev/null
@@ -1,4 +0,0 @@
-Manifest-Version: 1.0
-OpenIDE-Module-Requires: org.openide.windows.WindowManager
-OpenIDE-Module-Localizing-Bundle: com/willwinder/ugs/platform/dowel/Bundle.properties
-OpenIDE-Module-Specification-Version: ${ugs.modules.specification.version}
diff --git a/ugs-platform/DowelModule/src/main/resources/com/willwinder/ugs/platform/dowel/Bundle.properties b/ugs-platform/DowelModule/src/main/resources/com/willwinder/ugs/platform/dowel/Bundle.properties
deleted file mode 100644
index 9d2de27c47..0000000000
--- a/ugs-platform/DowelModule/src/main/resources/com/willwinder/ugs/platform/dowel/Bundle.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-#Localized module labels. Defaults taken from POM (<name>, <description>, <groupId>) if unset.
-OpenIDE-Module-Name=Dowel Maker
-OpenIDE-Module-Short-Description=Dowel Maker
-OpenIDE-Module-Long-Description=Generate gcode for making dowels in various shapes and sizes.
-OpenIDE-Module-Display-Category=UGS Plugin
\ No newline at end of file
diff --git a/ugs-platform/application/pom.xml b/ugs-platform/application/pom.xml
index b176e05b5c..63ab5d3fb9 100644
--- a/ugs-platform/application/pom.xml
+++ b/ugs-platform/application/pom.xml
@@ -75,11 +75,6 @@
             <artifactId>ProbeModule</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>DowelModule</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>GcodeTools</artifactId>
@@ -406,207 +401,263 @@
         </profile>
 
         <profile>
-          <id>create-macosx-package</id>
-          <build>
-            <plugins>
-              <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                  <!-- Create the Mac OS X application bundle and dmg file -->
-                  <execution>
-                      <id>create-mac-app-bundle</id>
-                      <phase>package</phase>
-                      <goals>
-                          <goal>run</goal>
-                      </goals>
-                      <configuration>
-                          <target>
-                              <!-- Clean -->
-                              <delete includeEmptyDirs="true" failonerror="false" removeNotFollowedSymlinks="true">
-                                  <fileset dir="${project.build.directory}/${ugs.appbundle.name}.app" followsymlinks="false"/>
-                                  <fileset dir="${project.build.directory}/${ugs.app.title}" followsymlinks="false"/>
-                                  <fileset dir="${project.build.directory}/${project.artifactId}-${project.version}.dmg" followsymlinks="false"/>
-                              </delete>
-                              <delete file="${project.build.directory}/${project.artifactId}-${project.version}.dmg" failonerror="false"/>
-
-                              <!-- Create folders -->
-                              <mkdir dir="${project.build.directory}/${ugs.appbundle.name}.app"/>
-                              <mkdir dir="${project.build.directory}/${ugs.appbundle.name}.app/Contents/MacOS"/>
-
-                              <!-- Copy application -->
-                              <copy todir="${project.build.directory}/${ugs.appbundle.name}.app/Contents/Resources/${brandingToken}">
-                                  <fileset dir="${project.build.directory}/${brandingToken}"/>
-                              </copy>
-
-                              <!-- Copy logo and configuration files -->
-                              <copy tofile="${project.build.directory}/${ugs.appbundle.name}.app/Contents/Resources/${brandingToken}.icns" file="src/main/app-resources/${brandingToken}.icns" />
-                              <copy tofile="${project.build.directory}/${ugs.appbundle.name}.app/Contents/Info.plist" file="${project.build.directory}/Info.plist"/>
-
-                              <!-- Move bin/ugsplatform script into MacOS/ugsplatform and modify the script so it founds its resources -->
-                              <move file="${project.build.directory}/${ugs.appbundle.name}.app/Contents/Resources/${brandingToken}/bin/${brandingToken}" todir="${project.build.directory}/${ugs.appbundle.name}.app/Contents/MacOS"/>
-                              <replace file="${project.build.directory}/${ugs.appbundle.name}.app/Contents/MacOS/${brandingToken}" token="`dirname &quot;$PRG&quot;`" value="`dirname &quot;$PRG&quot;`&quot;/../Resources/${brandingToken}/bin&quot;"/>
-                              <chmod file="${project.build.directory}/${ugs.appbundle.name}.app/Contents/MacOS/${brandingToken}" perm="ugo+rx"/>
-
-                              <!-- Download and untar JRE -->
-                              <exec dir="${project.build.directory}" executable="curl" failonerror="true">
-                                  <arg line="-L"/>
-                                  <arg line="${ugs.bundle.java.mac.url}"/>
-                                  <arg line="-o"/>
-                                  <arg line="jre-mac.tar.gz"/>
-                              </exec>
-
-                              <!-- Unzip archive -->
-                              <mkdir dir="${project.build.directory}/${ugs.appbundle.name}.app/Contents/PlugIns"/>
-                              <exec dir="${project.build.directory}" executable="tar" failonerror="true">
-                                  <arg line="-zxf"/>
-                                  <arg line="jre-mac.tar.gz"/>
-                                  <arg line="-C &quot;${ugs.appbundle.name}.app/Contents/PlugIns&quot;"/>
-                              </exec>
-
-                              <!-- Remove quarantine bit set recursively on JRE -->
-                              <!--
-                              <exec dir="${project.build.directory}" os="Mac OS X" executable="xattr" failonerror="true">
-                                  <arg line="-rd"/>
-                                  <arg line="com.apple.quarantine"/>
-                                  <arg line="&quot;${ugs.appbundle.name}.app/Contents/PlugIns&quot;"/>
-                              </exec>
-                              -->
-
-                              <!-- Get the JRE folder name -->
-                              <path id="jre_name_osx">
-                                  <dirset dir="${project.build.directory}/${ugs.appbundle.name}.app/Contents/PlugIns" includes="jdk*" />
-                              </path>
-                              <property name="bundle.mac.jvm.path" refid="jre_name_osx" />
-                              <basename property="bundle.mac.jvm.name" file="${bundle.mac.jvm.path}"/>
-
-                              <!-- Configure relative JRE path into ugsplatform.conf -->
-                              <replace file="${project.build.directory}/${ugs.appbundle.name}.app/Contents/Resources/${brandingToken}/etc/${brandingToken}.conf" token="#jdkhome=&quot;/path/to/jdk&quot;" value="jdkhome=&quot;../../PlugIns/${bundle.mac.jvm.name}/Contents/Home&quot;"/>
-                              <chmod file="${project.build.directory}/${ugs.appbundle.name}.app/Contents/PlugIns/**" perm="+x" type="both"/>
-
-                              <!-- Codesign JRE -->
-                              <!--
-                              <exec dir="${project.build.directory}" os="Mac OS X" executable="codesign" failonerror="true">
-                                  <arg value="-fs"/>
-                                  <arg value="${ugs.codesign.identity}"/>
-                                  <arg value="-v"/>
-                                  <arg value="${ugs.appbundle.name}.app/Contents/PlugIns/${bundle.mac.jvm.name}/"/>
-                              </exec>
-                              -->
-
-                              <!-- Codesign app -->
-                              <!--
-                              <exec dir="${project.build.directory}" os="Mac OS X" executable="codesign" failonerror="true">
-                                  <arg value="-fs"/>
-                                  <arg value="${ugs.codesign.identity}"/>
-                                  <arg value="-v"/>
-                                  <arg value="${ugs.appbundle.name}.app"/>
-                              </exec>
-                              -->
-
-                              <!-- Create application folder and add Applications dynamic link -->
-                              <mkdir dir="${project.build.directory}/${ugs.app.title}"/>
-                              <move file="${project.build.directory}/${ugs.appbundle.name}.app" todir="${project.build.directory}/${ugs.app.title}/" />
-                              <symlink link="${project.build.directory}/${ugs.app.title}/Applications" resource="/Applications" failonerror="false" />
-
-                              <!-- Create DMG -->
-                              <!-- For this to work on MacOSX you need to install cdrtools: 'brew install cdrtools' -->
-                              <exec dir="${project.build.directory}" executable="mkisofs" failonerror="true">
-                                  <arg value="-V"/>
-                                  <arg value="${ugs.appbundle.name}"/>
-                                  <arg value="-r"/>
-                                  <arg value="-o"/>
-                                  <arg value="ios-${project.artifactId}-${project.version}.dmg"/>
-                                  <arg value="${project.build.directory}/${ugs.app.title}"/>
-                              </exec>
-                          </target>
-                      </configuration>
-                  </execution>
-                </executions>
-              </plugin>
-            </plugins>
-          </build>
+            <id>create-macosx-x64-package</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-antrun-plugin</artifactId>
+                        <executions>
+                            <!-- Create the Mac OS X application bundle and dmg file -->
+                            <execution>
+                                <id>create-mac-x64-app-bundle</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>run</goal>
+                                </goals>
+                                <configuration>
+                                    <target>
+                                        <!-- Clean -->
+                                        <delete includeEmptyDirs="true" failonerror="false" removeNotFollowedSymlinks="true">
+                                            <fileset dir="${project.build.directory}/${ugs.appbundle.name}.app" followsymlinks="false"/>
+                                            <fileset dir="${project.build.directory}/${ugs.app.title}" followsymlinks="false"/>
+                                            <fileset dir="${project.build.directory}/macos-x64-${project.artifactId}-${project.version}.dmg" followsymlinks="false"/>
+                                        </delete>
+
+                                        <!-- Create folders -->
+                                        <mkdir dir="${project.build.directory}/${ugs.appbundle.name}.app"/>
+                                        <mkdir dir="${project.build.directory}/${ugs.appbundle.name}.app/Contents/MacOS"/>
+
+                                        <!-- Copy application -->
+                                        <copy todir="${project.build.directory}/${ugs.appbundle.name}.app/Contents/Resources/${brandingToken}">
+                                            <fileset dir="${project.build.directory}/${brandingToken}"/>
+                                        </copy>
+
+                                        <!-- Delete windows binaries -->
+                                        <delete file="${project.build.directory}/${ugs.appbundle.name}.app/Contents/Resources/${brandingToken}/ugsplatform/bin/ugsplatform.exe" failonerror="false"/>
+                                        <delete file="${project.build.directory}/${ugs.appbundle.name}.app/Contents/Resources/${brandingToken}/ugsplatform/bin/ugsplatform64.exe" failonerror="false"/>
+
+                                        <!-- Copy logo and configuration files -->
+                                        <copy tofile="${project.build.directory}/${ugs.appbundle.name}.app/Contents/Resources/${brandingToken}.icns" file="src/main/app-resources/${brandingToken}.icns" />
+                                        <copy tofile="${project.build.directory}/${ugs.appbundle.name}.app/Contents/Info.plist" file="${project.build.directory}/Info.plist"/>
+
+                                        <!-- Move bin/ugsplatform script into MacOS/ugsplatform and modify the script so it founds its resources -->
+                                        <move file="${project.build.directory}/${ugs.appbundle.name}.app/Contents/Resources/${brandingToken}/bin/${brandingToken}" todir="${project.build.directory}/${ugs.appbundle.name}.app/Contents/MacOS"/>
+                                        <replace file="${project.build.directory}/${ugs.appbundle.name}.app/Contents/MacOS/${brandingToken}" token="`dirname &quot;$PRG&quot;`" value="`dirname &quot;$PRG&quot;`&quot;/../Resources/${brandingToken}/bin&quot;"/>
+                                        <chmod file="${project.build.directory}/${ugs.appbundle.name}.app/Contents/MacOS/${brandingToken}" perm="ugo+rx"/>
+
+                                        <!-- Download and untar JRE -->
+                                        <exec dir="${project.build.directory}" executable="curl" failonerror="true">
+                                            <arg line="-L"/>
+                                            <arg line="${ugs.bundle.java.mac.x64.url}"/>
+                                            <arg line="-o"/>
+                                            <arg line="jre-mac.tar.gz"/>
+                                        </exec>
+
+                                        <!-- Unzip archive -->
+                                        <mkdir dir="${project.build.directory}/${ugs.appbundle.name}.app/Contents/PlugIns"/>
+                                        <exec dir="${project.build.directory}" executable="tar" failonerror="true">
+                                            <arg line="-zxf"/>
+                                            <arg line="jre-mac.tar.gz"/>
+                                            <arg line="-C &quot;${ugs.appbundle.name}.app/Contents/PlugIns&quot;"/>
+                                        </exec>
+
+                                        <!-- Remove quarantine bit set recursively on JRE -->
+                                        <!--
+                                        <exec dir="${project.build.directory}" os="Mac OS X" executable="xattr" failonerror="true">
+                                            <arg line="-rd"/>
+                                            <arg line="com.apple.quarantine"/>
+                                            <arg line="&quot;${ugs.appbundle.name}.app/Contents/PlugIns&quot;"/>
+                                        </exec>
+                                        -->
+
+                                        <!-- Get the JRE folder name -->
+                                        <path id="jre_name_osx">
+                                            <dirset dir="${project.build.directory}/${ugs.appbundle.name}.app/Contents/PlugIns" includes="jdk*" />
+                                        </path>
+                                        <property name="bundle.mac.jvm.path" refid="jre_name_osx" />
+                                        <basename property="bundle.mac.jvm.name" file="${bundle.mac.jvm.path}"/>
+
+                                        <!-- Configure relative JRE path into ugsplatform.conf -->
+                                        <replace file="${project.build.directory}/${ugs.appbundle.name}.app/Contents/Resources/${brandingToken}/etc/${brandingToken}.conf" token="#jdkhome=&quot;/path/to/jdk&quot;" value="jdkhome=&quot;../../PlugIns/${bundle.mac.jvm.name}/Contents/Home&quot;"/>
+                                        <chmod file="${project.build.directory}/${ugs.appbundle.name}.app/Contents/PlugIns/**" perm="+x" type="both"/>
+
+                                        <!-- Codesign JRE -->
+                                        <!--
+                                        <exec dir="${project.build.directory}" os="Mac OS X" executable="codesign" failonerror="true">
+                                            <arg value="-fs"/>
+                                            <arg value="${ugs.codesign.identity}"/>
+                                            <arg value="-v"/>
+                                            <arg value="${ugs.appbundle.name}.app/Contents/PlugIns/${bundle.mac.jvm.name}/"/>
+                                        </exec>
+                                        -->
+
+                                        <!-- Codesign app -->
+                                        <!--
+                                        <exec dir="${project.build.directory}" os="Mac OS X" executable="codesign" failonerror="true">
+                                            <arg value="-fs"/>
+                                            <arg value="${ugs.codesign.identity}"/>
+                                            <arg value="-v"/>
+                                            <arg value="${ugs.appbundle.name}.app"/>
+                                        </exec>
+                                        -->
+
+                                        <!-- Create application folder and add Applications dynamic link -->
+                                        <mkdir dir="${project.build.directory}/${ugs.app.title}"/>
+                                        <move file="${project.build.directory}/${ugs.appbundle.name}.app" todir="${project.build.directory}/${ugs.app.title}/" />
+                                        <symlink link="${project.build.directory}/${ugs.app.title}/Applications" resource="/Applications" failonerror="false" />
+
+                                        <!-- Create DMG -->
+                                        <!-- For this to work on MacOSX you need to install cdrtools: 'brew install cdrtools' -->
+                                        <exec dir="${project.build.directory}" executable="mkisofs" failonerror="true">
+                                            <arg value="-D"/>
+                                            <arg value="-V"/>
+                                            <arg value="${ugs.appbundle.name}"/>
+                                            <arg value="-r"/>
+                                            <arg value="-o"/>
+                                            <arg value="macos-x64-${project.artifactId}-${project.version}.dmg"/>
+                                            <arg value="${project.build.directory}/${ugs.app.title}"/>
+                                        </exec>
+                                    </target>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+
+        <profile>
+            <id>create-macosx-aarch64-package</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-antrun-plugin</artifactId>
+                        <executions>
+                            <!-- Create the Mac OS X application bundle and dmg file -->
+                            <execution>
+                                <id>create-mac-aarch64-app-bundle</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>run</goal>
+                                </goals>
+                                <configuration>
+                                    <target>
+                                        <!-- Clean -->
+                                        <delete includeEmptyDirs="true" failonerror="false" removeNotFollowedSymlinks="true">
+                                            <fileset dir="${project.build.directory}/${ugs.appbundle.name}.app" followsymlinks="false"/>
+                                            <fileset dir="${project.build.directory}/${ugs.app.title}" followsymlinks="false"/>
+                                            <fileset dir="${project.build.directory}/macos-aarch64-${project.artifactId}-${project.version}.dmg" followsymlinks="false"/>
+                                        </delete>
+
+                                        <!-- Create folders -->
+                                        <mkdir dir="${project.build.directory}/${ugs.appbundle.name}.app"/>
+                                        <mkdir dir="${project.build.directory}/${ugs.appbundle.name}.app/Contents/MacOS"/>
+
+                                        <!-- Copy application -->
+                                        <copy todir="${project.build.directory}/${ugs.appbundle.name}.app/Contents/Resources/${brandingToken}">
+                                            <fileset dir="${project.build.directory}/${brandingToken}"/>
+                                        </copy>
+
+                                        <!-- Delete windows binaries -->
+                                        <delete file="${project.build.directory}/${ugs.appbundle.name}.app/Contents/Resources/${brandingToken}/ugsplatform/bin/ugsplatform.exe" failonerror="false"/>
+                                        <delete file="${project.build.directory}/${ugs.appbundle.name}.app/Contents/Resources/${brandingToken}/ugsplatform/bin/ugsplatform64.exe" failonerror="false"/>
+
+                                        <!-- Copy logo and configuration files -->
+                                        <copy tofile="${project.build.directory}/${ugs.appbundle.name}.app/Contents/Resources/${brandingToken}.icns" file="src/main/app-resources/${brandingToken}.icns" />
+                                        <copy tofile="${project.build.directory}/${ugs.appbundle.name}.app/Contents/Info.plist" file="${project.build.directory}/Info.plist"/>
+
+                                        <!-- Move bin/ugsplatform script into MacOS/ugsplatform and modify the script so it founds its resources -->
+                                        <move file="${project.build.directory}/${ugs.appbundle.name}.app/Contents/Resources/${brandingToken}/bin/${brandingToken}" todir="${project.build.directory}/${ugs.appbundle.name}.app/Contents/MacOS"/>
+                                        <replace file="${project.build.directory}/${ugs.appbundle.name}.app/Contents/MacOS/${brandingToken}" token="`dirname &quot;$PRG&quot;`" value="`dirname &quot;$PRG&quot;`&quot;/../Resources/${brandingToken}/bin&quot;"/>
+                                        <chmod file="${project.build.directory}/${ugs.appbundle.name}.app/Contents/MacOS/${brandingToken}" perm="ugo+rx"/>
+
+                                        <!-- Download and untar JRE -->
+                                        <exec dir="${project.build.directory}" executable="curl" failonerror="true">
+                                            <arg line="-L"/>
+                                            <arg line="${ugs.bundle.java.mac.aarch64.url}"/>
+                                            <arg line="-o"/>
+                                            <arg line="jre-mac.tar.gz"/>
+                                        </exec>
+
+                                        <!-- Unzip archive -->
+                                        <mkdir dir="${project.build.directory}/${ugs.appbundle.name}.app/Contents/PlugIns"/>
+                                        <exec dir="${project.build.directory}" executable="tar" failonerror="true">
+                                            <arg line="-zxf"/>
+                                            <arg line="jre-mac.tar.gz"/>
+                                            <arg line="-C &quot;${ugs.appbundle.name}.app/Contents/PlugIns&quot;"/>
+                                        </exec>
+
+                                        <!-- Remove quarantine bit set recursively on JRE -->
+                                        <!--
+                                        <exec dir="${project.build.directory}" os="Mac OS X" executable="xattr" failonerror="true">
+                                            <arg line="-rd"/>
+                                            <arg line="com.apple.quarantine"/>
+                                            <arg line="&quot;${ugs.appbundle.name}.app/Contents/PlugIns&quot;"/>
+                                        </exec>
+                                        -->
+
+                                        <!-- Get the JRE folder name -->
+                                        <path id="jre_name_osx">
+                                            <dirset dir="${project.build.directory}/${ugs.appbundle.name}.app/Contents/PlugIns" includes="jdk*" />
+                                        </path>
+                                        <property name="bundle.mac.jvm.path" refid="jre_name_osx" />
+                                        <basename property="bundle.mac.jvm.name" file="${bundle.mac.jvm.path}"/>
+
+                                        <!-- Configure relative JRE path into ugsplatform.conf -->
+                                        <replace file="${project.build.directory}/${ugs.appbundle.name}.app/Contents/Resources/${brandingToken}/etc/${brandingToken}.conf" token="#jdkhome=&quot;/path/to/jdk&quot;" value="jdkhome=&quot;../../PlugIns/${bundle.mac.jvm.name}/Contents/Home&quot;"/>
+                                        <chmod file="${project.build.directory}/${ugs.appbundle.name}.app/Contents/PlugIns/**" perm="+x" type="both"/>
+
+                                        <!-- Codesign JRE -->
+                                        <!--
+                                        <exec dir="${project.build.directory}" os="Mac OS X" executable="codesign" failonerror="true">
+                                            <arg value="-fs"/>
+                                            <arg value="${ugs.codesign.identity}"/>
+                                            <arg value="-v"/>
+                                            <arg value="${ugs.appbundle.name}.app/Contents/PlugIns/${bundle.mac.jvm.name}/"/>
+                                        </exec>
+                                        -->
+
+                                        <!-- Codesign app -->
+                                        <!--
+                                        <exec dir="${project.build.directory}" os="Mac OS X" executable="codesign" failonerror="true">
+                                            <arg value="-fs"/>
+                                            <arg value="${ugs.codesign.identity}"/>
+                                            <arg value="-v"/>
+                                            <arg value="${ugs.appbundle.name}.app"/>
+                                        </exec>
+                                        -->
+
+                                        <!-- Create application folder and add Applications dynamic link -->
+                                        <mkdir dir="${project.build.directory}/${ugs.app.title}"/>
+                                        <move file="${project.build.directory}/${ugs.appbundle.name}.app" todir="${project.build.directory}/${ugs.app.title}/" />
+                                        <symlink link="${project.build.directory}/${ugs.app.title}/Applications" resource="/Applications" failonerror="false" />
+
+                                        <!-- Create DMG -->
+                                        <!-- For this to work on MacOSX you need to install cdrtools: 'brew install cdrtools' -->
+                                        <exec dir="${project.build.directory}" executable="mkisofs" failonerror="true">
+                                            <arg value="-D"/>
+                                            <arg value="-V"/>
+                                            <arg value="${ugs.appbundle.name}"/>
+                                            <arg value="-r"/>
+                                            <arg value="-o"/>
+                                            <arg value="macos-aarch64-${project.artifactId}-${project.version}.dmg"/>
+                                            <arg value="${project.build.directory}/${ugs.app.title}"/>
+                                        </exec>
+                                    </target>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
         </profile>
 
-     <!-- Create the RaspberryPi application bundle -->
-     <profile>
-       <id>create-pi-package</id>
-       <build>
-         <plugins>
-           <plugin>
-             <groupId>org.apache.maven.plugins</groupId>
-             <artifactId>maven-antrun-plugin</artifactId>
-             <executions>
-               <execution>
-                 <id>create-rpi-bundle</id>
-                 <phase>package</phase>
-                 <goals>
-                     <goal>run</goal>
-                 </goals>
-                 <configuration>
-                   <target>
-                     <!-- Clean -->
-                     <delete includeEmptyDirs="true" failonerror="false" removeNotFollowedSymlinks="true">
-                       <fileset dir="${project.build.directory}/${brandingToken}-pi" followsymlinks="false"/>
-                     </delete>
-                     <delete file="${project.build.directory}/${project.artifactId}-${project.version}-pi.tar.gz" failonerror="false"/>
-
-                     <!-- Create folders -->
-                     <mkdir dir="${project.build.directory}/${brandingToken}-pi"/>
-
-                     <!-- Copy application -->
-                     <copy todir="${project.build.directory}/${brandingToken}-pi">
-                       <fileset dir="${project.build.directory}/${brandingToken}"/>
-                     </copy>
-
-                     <!-- Download and untar JRE -->
-                     <exec dir="${project.build.directory}" executable="curl" failonerror="true">
-                       <arg line="-L"/>
-                       <arg line="${ugs.bundle.java.rpi.url}"/>
-                       <arg line="-o"/>
-                       <arg line="jre-rpi.tar.gz"/>
-                     </exec>
-
-                     <!-- Unzip archive -->
-                       <mkdir dir="${project.build.directory}/${brandingToken}-pi/jdk"/>
-                       <exec dir="${project.build.directory}" executable="tar" failonerror="true">
-                       <arg line="-zxf"/>
-                       <arg line="jre-rpi.tar.gz"/>
-                       <arg line="-C &quot;${brandingToken}-pi/jdk&quot;"/>
-                     </exec>
-
-                     <!-- Get the JRE folder name -->
-                     <path id="jre_name">
-                       <dirset dir="${project.build.directory}/${brandingToken}-pi/jdk" includes="jdk*" />
-                     </path>
-                     <property name="bundle.jvm.path" refid="jre_name" />
-                     <basename property="bundle.jvm.name" file="${bundle.jvm.path}"/>
-
-                     <!-- Configure relative JRE path into ugsplatform.conf -->
-                     <replace file="${project.build.directory}/${brandingToken}-pi/etc/${brandingToken}.conf" token="#jdkhome=&quot;/path/to/jdk&quot;" value="jdkhome=&quot;jdk/${bundle.jvm.name}&quot;"/>
-                     <chmod file="${project.build.directory}/${brandingToken}-pi/bin/**" perm="+x" type="both"/>
-
-                     <!-- Create Archive -->
-                     <exec dir="${project.build.directory}" executable="tar" failonerror="true">
-                       <env key="GZIP" value="-9"/>
-                       <arg value="-czvf"/>
-                       <arg value="pi-${project.artifactId}-${project.version}.tar.gz"/>
-                       <arg value="-C"/>
-                       <arg value="${project.build.directory}"/>
-                       <arg value="${brandingToken}-pi"/>
-                     </exec>
-                   </target>
-                 </configuration>
-               </execution>
-             </executions>
-           </plugin>
-         </plugins>
-       </build>
-     </profile>
-
-        <!-- Create the Linux application bundle -->
+        <!-- Create the Linux x64 application bundle -->
         <profile>
-            <id>create-linux-package</id>
+            <id>create-linux-x64-package</id>
             <build>
                 <plugins>
                     <plugin>
@@ -614,7 +665,7 @@
                         <artifactId>maven-antrun-plugin</artifactId>
                         <executions>
                             <execution>
-                                <id>create-rpi-bundle</id>
+                                <id>create-linux-x64-bundle</id>
                                 <phase>package</phase>
                                 <goals>
                                     <goal>run</goal>
@@ -623,53 +674,217 @@
                                     <target>
                                         <!-- Clean -->
                                         <delete includeEmptyDirs="true" failonerror="false" removeNotFollowedSymlinks="true">
-                                            <fileset dir="${project.build.directory}/${brandingToken}-linux" followsymlinks="false"/>
+                                            <fileset dir="${project.build.directory}/${brandingToken}-linux-x64" followsymlinks="false"/>
                                         </delete>
-                                        <delete file="${project.build.directory}/${project.artifactId}-${project.version}-linux.tar.gz" failonerror="false"/>
+                                        <delete file="${project.build.directory}/linux-x64-${project.artifactId}-${project.version}.tar.gz" failonerror="false"/>
 
                                         <!-- Create folders -->
-                                        <mkdir dir="${project.build.directory}/${brandingToken}-linux"/>
+                                        <mkdir dir="${project.build.directory}/${brandingToken}-linux-x64"/>
 
                                         <!-- Copy application -->
-                                        <copy todir="${project.build.directory}/${brandingToken}-linux">
+                                        <copy todir="${project.build.directory}/${brandingToken}-linux-x64">
                                             <fileset dir="${project.build.directory}/${brandingToken}"/>
                                         </copy>
 
+                                        <!-- Delete windows binaries -->
+                                        <delete file="${project.build.directory}/${brandingToken}-linux-x64/bin/ugsplatform.exe" failonerror="false"/>
+                                        <delete file="${project.build.directory}/${brandingToken}-linux-x64/bin/ugsplatform64.exe" failonerror="false"/>
+
                                         <!-- Download and untar JRE -->
                                         <exec dir="${project.build.directory}" executable="curl" failonerror="true">
                                           <arg line="-L"/>
-                                          <arg line="${ugs.bundle.java.linux.url}"/>
+                                          <arg line="${ugs.bundle.java.linux.x64.url}"/>
                                           <arg line="-o"/>
                                           <arg line="jre-linux.tar.gz"/>
                                         </exec>
 
                                         <!-- Unzip archive -->
-                                        <mkdir dir="${project.build.directory}/${brandingToken}-linux/jdk"/>
+                                        <mkdir dir="${project.build.directory}/${brandingToken}-linux-x64/jdk"/>
+                                        <exec dir="${project.build.directory}" executable="tar" failonerror="true">
+                                            <arg line="-zxf"/>
+                                            <arg line="jre-linux.tar.gz"/>
+                                            <arg line="-C &quot;${brandingToken}-linux-x64/jdk&quot;"/>
+                                        </exec>
+
+                                        <!-- Get the JRE folder name -->
+                                        <path id="jre_name">
+                                            <dirset dir="${project.build.directory}/${brandingToken}-linux-x64/jdk" includes="jdk*" />
+                                        </path>
+                                        <property name="bundle.jvm.path" refid="jre_name" />
+                                        <basename property="bundle.jvm.name" file="${bundle.jvm.path}"/>
+
+                                        <!-- Configure relative JRE path into ugsplatform.conf -->
+                                        <replace file="${project.build.directory}/${brandingToken}-linux-x64/etc/${brandingToken}.conf" token="#jdkhome=&quot;/path/to/jdk&quot;" value="jdkhome=&quot;jdk/${bundle.jvm.name}&quot;"/>
+                                        <chmod file="${project.build.directory}/${brandingToken}-linux-x64/bin/**" perm="+x" type="both"/>
+
+                                        <!-- Create Archive -->
+                                        <exec dir="${project.build.directory}" executable="tar" failonerror="true">
+                                            <env key="GZIP" value="-9"/>
+                                            <arg value="-czvf"/>
+                                            <arg value="linux-x64-${project.artifactId}-${project.version}.tar.gz"/>
+                                            <arg value="-C"/>
+                                            <arg value="${project.build.directory}"/>
+                                            <arg value="${brandingToken}-linux-x64"/>
+                                        </exec>
+                                    </target>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <!-- Create the Linux arm application bundle -->
+        <profile>
+            <id>create-linux-arm-package</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-antrun-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>create-linux-arm-bundle</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>run</goal>
+                                </goals>
+                                <configuration>
+                                    <target>
+                                        <!-- Clean -->
+                                        <delete includeEmptyDirs="true" failonerror="false" removeNotFollowedSymlinks="true">
+                                            <fileset dir="${project.build.directory}/${brandingToken}-linux-arm" followsymlinks="false"/>
+                                        </delete>
+                                        <delete file="${project.build.directory}/linux-arm-${project.artifactId}-${project.version}.tar.gz" failonerror="false"/>
+
+                                        <!-- Create folders -->
+                                        <mkdir dir="${project.build.directory}/${brandingToken}-linux-arm"/>
+
+                                        <!-- Copy application -->
+                                        <copy todir="${project.build.directory}/${brandingToken}-linux-arm">
+                                            <fileset dir="${project.build.directory}/${brandingToken}"/>
+                                        </copy>
+
+                                        <!-- Delete windows binaries -->
+                                        <delete file="${project.build.directory}/${brandingToken}-linux-arm/bin/ugsplatform.exe" failonerror="false"/>
+                                        <delete file="${project.build.directory}/${brandingToken}-linux-arm/bin/ugsplatform64.exe" failonerror="false"/>
+
+                                        <!-- Download and untar JRE -->
+                                        <exec dir="${project.build.directory}" executable="curl" failonerror="true">
+                                            <arg line="-L"/>
+                                            <arg line="${ugs.bundle.java.linux.arm.url}"/>
+                                            <arg line="-o"/>
+                                            <arg line="jre-linux.tar.gz"/>
+                                        </exec>
+
+                                        <!-- Unzip archive -->
+                                        <mkdir dir="${project.build.directory}/${brandingToken}-linux-arm/jdk"/>
+                                        <exec dir="${project.build.directory}" executable="tar" failonerror="true">
+                                            <arg line="-zxf"/>
+                                            <arg line="jre-linux.tar.gz"/>
+                                            <arg line="-C &quot;${brandingToken}-linux-arm/jdk&quot;"/>
+                                        </exec>
+
+                                        <!-- Get the JRE folder name -->
+                                        <path id="jre_name">
+                                            <dirset dir="${project.build.directory}/${brandingToken}-linux-arm/jdk" includes="jdk*" />
+                                        </path>
+                                        <property name="bundle.jvm.path" refid="jre_name" />
+                                        <basename property="bundle.jvm.name" file="${bundle.jvm.path}"/>
+
+                                        <!-- Configure relative JRE path into ugsplatform.conf -->
+                                        <replace file="${project.build.directory}/${brandingToken}-linux-arm/etc/${brandingToken}.conf" token="#jdkhome=&quot;/path/to/jdk&quot;" value="jdkhome=&quot;jdk/${bundle.jvm.name}&quot;"/>
+                                        <chmod file="${project.build.directory}/${brandingToken}-linux-arm/bin/**" perm="+x" type="both"/>
+
+                                        <!-- Create Archive -->
+                                        <exec dir="${project.build.directory}" executable="tar" failonerror="true">
+                                            <env key="GZIP" value="-9"/>
+                                            <arg value="-czvf"/>
+                                            <arg value="linux-arm-${project.artifactId}-${project.version}.tar.gz"/>
+                                            <arg value="-C"/>
+                                            <arg value="${project.build.directory}"/>
+                                            <arg value="${brandingToken}-linux-arm"/>
+                                        </exec>
+                                    </target>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <!-- Create the Linux arm application bundle -->
+        <profile>
+            <id>create-linux-aarch64-package</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-antrun-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>create-linux-aarch64-bundle</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>run</goal>
+                                </goals>
+                                <configuration>
+                                    <target>
+                                        <!-- Clean -->
+                                        <delete includeEmptyDirs="true" failonerror="false" removeNotFollowedSymlinks="true">
+                                            <fileset dir="${project.build.directory}/${brandingToken}-linux-aarch64" followsymlinks="false"/>
+                                        </delete>
+                                        <delete file="${project.build.directory}/linux-aarch64-${project.artifactId}-${project.version}.tar.gz" failonerror="false"/>
+
+                                        <!-- Create folders -->
+                                        <mkdir dir="${project.build.directory}/${brandingToken}-linux-aarch64"/>
+
+                                        <!-- Copy application -->
+                                        <copy todir="${project.build.directory}/${brandingToken}-linux-aarch64">
+                                            <fileset dir="${project.build.directory}/${brandingToken}"/>
+                                        </copy>
+
+                                        <!-- Delete windows binaries -->
+                                        <delete file="${project.build.directory}/${brandingToken}-linux-aarch64/bin/ugsplatform.exe" failonerror="false"/>
+                                        <delete file="${project.build.directory}/${brandingToken}-linux-aarch64/bin/ugsplatform64.exe" failonerror="false"/>
+
+                                        <!-- Download and untar JRE -->
+                                        <exec dir="${project.build.directory}" executable="curl" failonerror="true">
+                                            <arg line="-L"/>
+                                            <arg line="${ugs.bundle.java.linux.arm.url}"/>
+                                            <arg line="-o"/>
+                                            <arg line="jre-linux.tar.gz"/>
+                                        </exec>
+
+                                        <!-- Unzip archive -->
+                                        <mkdir dir="${project.build.directory}/${brandingToken}-linux-aarch64/jdk"/>
                                         <exec dir="${project.build.directory}" executable="tar" failonerror="true">
                                             <arg line="-zxf"/>
                                             <arg line="jre-linux.tar.gz"/>
-                                            <arg line="-C &quot;${brandingToken}-linux/jdk&quot;"/>
+                                            <arg line="-C &quot;${brandingToken}-linux-aarch64/jdk&quot;"/>
                                         </exec>
 
                                         <!-- Get the JRE folder name -->
                                         <path id="jre_name">
-                                            <dirset dir="${project.build.directory}/${brandingToken}-linux/jdk" includes="jdk*" />
+                                            <dirset dir="${project.build.directory}/${brandingToken}-linux-aarch64/jdk" includes="jdk*" />
                                         </path>
                                         <property name="bundle.jvm.path" refid="jre_name" />
                                         <basename property="bundle.jvm.name" file="${bundle.jvm.path}"/>
 
                                         <!-- Configure relative JRE path into ugsplatform.conf -->
-                                        <replace file="${project.build.directory}/${brandingToken}-linux/etc/${brandingToken}.conf" token="#jdkhome=&quot;/path/to/jdk&quot;" value="jdkhome=&quot;jdk/${bundle.jvm.name}&quot;"/>
-                                        <chmod file="${project.build.directory}/${brandingToken}-linux/bin/**" perm="+x" type="both"/>
+                                        <replace file="${project.build.directory}/${brandingToken}-linux-aarch64/etc/${brandingToken}.conf" token="#jdkhome=&quot;/path/to/jdk&quot;" value="jdkhome=&quot;jdk/${bundle.jvm.name}&quot;"/>
+                                        <chmod file="${project.build.directory}/${brandingToken}-linux-aarch64/bin/**" perm="+x" type="both"/>
 
                                         <!-- Create Archive -->
                                         <exec dir="${project.build.directory}" executable="tar" failonerror="true">
                                             <env key="GZIP" value="-9"/>
                                             <arg value="-czvf"/>
-                                            <arg value="linux-${project.artifactId}-${project.version}.tar.gz"/>
+                                            <arg value="linux-aarch64-${project.artifactId}-${project.version}.tar.gz"/>
                                             <arg value="-C"/>
                                             <arg value="${project.build.directory}"/>
-                                            <arg value="${brandingToken}-linux"/>
+                                            <arg value="${brandingToken}-linux-aarch64"/>
                                         </exec>
                                     </target>
                                 </configuration>
@@ -680,6 +895,7 @@
             </build>
         </profile>
 
+
         <profile>
         <id>create-autoupdate</id>
         <build>
@@ -824,7 +1040,6 @@
                 <message>Creating site for ${project.version}</message>
                 <path>${project.version}</path>
                 <merge>true</merge>
-                <!--<repositoryName>ugs-platform-updates</repositoryName>-->
                 <repositoryName>gh-site-test</repositoryName>
                 <repositoryOwner>winder</repositoryOwner>
               </configuration>
diff --git a/ugs-platform/application/src/main/resources/ugsplatform.conf b/ugs-platform/application/src/main/resources/ugsplatform.conf
index 1eabe0f279..1db9b7d809 100644
--- a/ugs-platform/application/src/main/resources/ugsplatform.conf
+++ b/ugs-platform/application/src/main/resources/ugsplatform.conf
@@ -3,7 +3,7 @@ default_cachedir="${DEFAULT_CACHEDIR_ROOT}/var/cache"
 
 # options used by the launcher by default, can be overridden by explicit
 # command line switches
-default_options="--branding ${branding.token} -J-Xms64m -J-Xverify:none -J-Dsun.java2d.noddraw=true -J-Dsun.awt.noerasebackground=true -J-Dnetbeans.indexing.noFileRefresh=true -J-Dorg.openide.text.big.file.size=20"
+default_options="--branding ${branding.token} -J-Xms64m -J-Xverify:none -J-Dsun.java2d.noddraw=true -J-Dsun.awt.noerasebackground=true -J-Dpolyglot.engine.WarnInterpreterOnly=false -J-Dnetbeans.indexing.noFileRefresh=true -J-Dorg.openide.text.big.file.size=20 -J--add-opens=java.base/java.net=ALL-UNNAMED -J--add-opens=java.base/java.lang.ref=ALL-UNNAMED -J--add-opens=java.base/java.lang=ALL-UNNAMED -J--add-opens=java.base/java.security=ALL-UNNAMED -J--add-opens=java.base/java.util=ALL-UNNAMED -J--add-opens=java.base/java.nio=ALL-UNNAMED -J--add-opens=java.prefs/java.util.prefs=ALL-UNNAMED -J--add-opens=java.desktop/javax.swing.plaf.basic=ALL-UNNAMED -J--add-opens=java.desktop/javax.swing.text=ALL-UNNAMED -J--add-opens=java.desktop/javax.swing=ALL-UNNAMED -J--add-opens=java.desktop/java.awt=ALL-UNNAMED -J--add-opens=java.desktop/java.awt.event=ALL-UNNAMED -J--add-opens=java.desktop/sun.awt.X11=ALL-UNNAMED -J--add-opens=java.desktop/javax.swing.plaf.synth=ALL-UNNAMED -J--add-opens=java.desktop/com.sun.java.swing.plaf.gtk=ALL-UNNAMED -J--add-opens=java.desktop/sun.awt.shell=ALL-UNNAMED -J--add-opens=java.desktop/sun.awt.im=ALL-UNNAMED -J--add-exports=java.base/sun.reflect.annotation=ALL-UNNAMED -J--add-exports=java.desktop/sun.awt=ALL-UNNAMED -J--add-exports=java.desktop/java.awt.peer=ALL-UNNAMED -J--add-exports=java.desktop/com.sun.beans.editors=ALL-UNNAMED -J--add-exports=java.desktop/sun.swing=ALL-UNNAMED -J--add-exports=java.desktop/sun.awt.im=ALL-UNNAMED -J--add-exports=java.desktop/com.sun.java.swing.plaf.motif=ALL-UNNAMED -J-XX:+IgnoreUnrecognizedVMOptions"
 # for development purposes you may wish to append: -J-Dnetbeans.logger.console=true -J-ea
 
 # default location of JDK/JRE, can be overridden by using --jdkhome <dir> switch
diff --git a/ugs-platform/pom.xml b/ugs-platform/pom.xml
index c44ab6d4b5..e90c0de623 100644
--- a/ugs-platform/pom.xml
+++ b/ugs-platform/pom.xml
@@ -15,7 +15,7 @@
 
     <properties>
       <maven.build.timestamp.format>yyyy.MM.dd.HH.mm</maven.build.timestamp.format>
-      <netbeans.version>RELEASE150</netbeans.version>
+      <netbeans.version>RELEASE190</netbeans.version>
       <ugs.app.title>Universal Gcode Platform ${project.version}</ugs.app.title>
       <ugs.appbundle.name>Universal Gcode Platform</ugs.appbundle.name>
       <parsedVersion.majorVersion>2</parsedVersion.majorVersion>
@@ -30,14 +30,16 @@
       </ugs.modules.specification.version>
 
       <!--==== JRE Bundle Properties ====-->
-      <!-- JVMS can be found here: https://adoptopenjdk.net/archive.html?variant=openjdk12&jvmVariant=hotspot -->
-      <ugs.bundle.java.mac.url>https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.1%2B9/OpenJDK13U-jre_x64_mac_hotspot_13.0.1_9.tar.gz</ugs.bundle.java.mac.url>
-      <!-- Using 32-bit JRE as there are still many 32-bit systems -->
-      <ugs.bundle.java.win32.url>https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.1%2B9/OpenJDK13U-jre_x86-32_windows_hotspot_13.0.1_9.zip</ugs.bundle.java.win32.url>
-      <ugs.bundle.java.win64.url>https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.1%2B9/OpenJDK13U-jre_x64_windows_hotspot_13.0.1_9.zip</ugs.bundle.java.win64.url>
-      <!-- Using JRE8 as a bug in JRE13 makes the PI to consume 100% cpu -->
-      <ugs.bundle.java.rpi.url>https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u275-b01/OpenJDK8U-jre_arm_linux_hotspot_8u275b01.tar.gz</ugs.bundle.java.rpi.url>
-      <ugs.bundle.java.linux.url>https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.1%2B9/OpenJDK13U-jre_x64_linux_hotspot_13.0.1_9.tar.gz</ugs.bundle.java.linux.url>
+      <!-- JVMS can be found here: https://adoptium.net/download/ -->
+      <ugs.bundle.java.mac.x64.url>https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.8.1%2B1/OpenJDK17U-jre_x64_mac_hotspot_17.0.8.1_1.tar.gz</ugs.bundle.java.mac.x64.url>
+      <ugs.bundle.java.mac.aarch64.url>https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.8.1%2B1/OpenJDK17U-jre_aarch64_mac_hotspot_17.0.8.1_1.tar.gz</ugs.bundle.java.mac.aarch64.url>
+
+      <ugs.bundle.java.win32.url>https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.8.1%2B1/OpenJDK17U-jre_x86-32_windows_hotspot_17.0.8.1_1.zip</ugs.bundle.java.win32.url>
+      <ugs.bundle.java.win64.url>https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.8.1%2B1/OpenJDK17U-jre_x64_windows_hotspot_17.0.8.1_1.zip</ugs.bundle.java.win64.url>
+
+      <ugs.bundle.java.linux.x64.url>https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.8.1%2B1/OpenJDK17U-jre_x64_linux_hotspot_17.0.8.1_1.tar.gz</ugs.bundle.java.linux.x64.url>
+      <ugs.bundle.java.linux.arm.url>https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.8.1%2B1/OpenJDK17U-jre_arm_linux_hotspot_17.0.8.1_1.tar.gz</ugs.bundle.java.linux.arm.url>
+      <ugs.bundle.java.linux.aarch64.url>https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.8.1%2B1/OpenJDK17U-jre_aarch64_linux_hotspot_17.0.8.1_1.tar.gz</ugs.bundle.java.linux.aarch64.url>
 
       <!-- Mac OS X signing identity - must match with a verified Apple developer certificate in the keychain -->
       <ugs.codesign.identity>Developer ID Application</ugs.codesign.identity>
@@ -92,23 +94,23 @@
         </pluginManagement>
 
         <plugins>
-          <!-- Copy and apply filtering on manifest.mf file -->                                                                                   
+          <!-- Copy and apply filtering on manifest.mf file -->
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-resources-plugin</artifactId>
             <version>${ugs.maven-resources-plugin.version}</version>
             <executions>
-              <execution>                                                                                                              
+              <execution>
                 <id>generate-modules-xml</id>
-                <phase>generate-resources</phase>    
+                <phase>generate-resources</phase>
                 <goals>
-                  <goal>copy-resources</goal>   
+                  <goal>copy-resources</goal>
                 </goals>
-                <configuration>  
+                <configuration>
                   <outputDirectory>${basedir}/target/</outputDirectory>
-                  <resources>      
+                  <resources>
                     <resource>
-                      <directory>src/main/nbm</directory>   
+                      <directory>src/main/nbm</directory>
                       <includes>
                           <include>manifest.mf</include>
                       </includes>
@@ -149,7 +151,6 @@
     <module>ugs-platform-plugin-jog</module>
     <module>ugs-platform-plugin-setup-wizard</module>
     <module>ProbeModule</module>
-    <module>DowelModule</module>
     <module>GcodeTools</module>
     <module>ugs-platform-welcome-page</module>
     <module>ugs-platform-plugin-joystick</module>
diff --git a/ugs-platform/DowelModule/src/main/java/com/willwinder/ugs/platform/dowel/DowelSettings.kt b/ugs-platform/ugs-platform-ugscore/src/main/java/com/willwinder/ugs/nbp/core/lifecycle/LookAndFeelInstaller.java
similarity index 56%
rename from ugs-platform/DowelModule/src/main/java/com/willwinder/ugs/platform/dowel/DowelSettings.kt
rename to ugs-platform/ugs-platform-ugscore/src/main/java/com/willwinder/ugs/nbp/core/lifecycle/LookAndFeelInstaller.java
index 3ca3d2075e..a582aea449 100644
--- a/ugs-platform/DowelModule/src/main/java/com/willwinder/ugs/platform/dowel/DowelSettings.kt
+++ b/ugs-platform/ugs-platform-ugscore/src/main/java/com/willwinder/ugs/nbp/core/lifecycle/LookAndFeelInstaller.java
@@ -1,5 +1,5 @@
 /*
-    Copyright 2017 Will Winder
+    Copyright 2023 Will Winder
 
     This file is part of Universal Gcode Sender (UGS).
 
@@ -16,23 +16,23 @@ This file is part of Universal Gcode Sender (UGS).
     You should have received a copy of the GNU General Public License
     along with UGS.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.willwinder.ugs.platform.dowel
+package com.willwinder.ugs.nbp.core.lifecycle;
 
-import com.willwinder.universalgcodesender.model.UnitUtils
+import org.openide.modules.ModuleInstall;
+import org.openide.util.NbPreferences;
 
-/*
+import java.util.prefs.Preferences;
 
-  @author wwinder
-  Created on Nov 4, 2017
-*/
-
-data class DowelSettings(
-        val numDowelsX: Int,
-        val numDowelsY: Int,
-        val dowelDiameter: Double,
-        val dowelLength: Double,
-        val bitDiameter: Double,
-        val feed: Double,
-        val cutDepth: Double,
-        val safetyHeight: Double,
-        val units: UnitUtils.Units)
+/**
+ * Sets the look and feel (if not already set)
+ */
+public class LookAndFeelInstaller extends ModuleInstall {
+
+    @Override
+    public void validate() {
+        Preferences prefs = NbPreferences.root().node("laf");
+        if (prefs.get("laf", "").isBlank()) {
+            prefs.put("laf", "com.formdev.flatlaf.FlatLightLaf");
+        }
+    }
+}
\ No newline at end of file
diff --git a/ugs-platform/ugs-platform-ugscore/src/main/nbm/manifest.mf b/ugs-platform/ugs-platform-ugscore/src/main/nbm/manifest.mf
index a9e012b106..f25b615a06 100644
--- a/ugs-platform/ugs-platform-ugscore/src/main/nbm/manifest.mf
+++ b/ugs-platform/ugs-platform-ugscore/src/main/nbm/manifest.mf
@@ -3,4 +3,5 @@ OpenIDE-Module-Layer: com/willwinder/ugs/nbp/core/layer.xml
 OpenIDE-Module-Localizing-Bundle: com/willwinder/ugs/nbp/core/Bundle.properties
 OpenIDE-Module-Specification-Version: ${ugs.modules.specification.version}
 AutoUpdate-Essential-Module: true
+OpenIDE-Module-Install: com/willwinder/ugs/nbp/core/lifecycle/LookAndFeelInstaller.class
 OpenIDE-Module-Java-Dependencies: Java > 1.8
diff --git a/ugs-platform/ugs-platform-ugscore/src/main/resources/com/willwinder/ugs/nbp/core/layer.xml b/ugs-platform/ugs-platform-ugscore/src/main/resources/com/willwinder/ugs/nbp/core/layer.xml
index 92af5144fa..dbd0865abc 100644
--- a/ugs-platform/ugs-platform-ugscore/src/main/resources/com/willwinder/ugs/nbp/core/layer.xml
+++ b/ugs-platform/ugs-platform-ugscore/src/main/resources/com/willwinder/ugs/nbp/core/layer.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.2//EN" "http://www.netbeans.org/dtds/filesystem-1_2.dtd">
 <filesystem>
+    <folder name="Editors">
+        <attr name="currentFontColorProfile" stringvalue="FlatLaf Light" />
+    </folder>
     <folder name="Actions">
         <folder name="Machine">
             <!-- ugs deprecated item -->