diff --git a/.DS_Store b/.DS_Store
deleted file mode 100644
index 78e2070c..00000000
Binary files a/.DS_Store and /dev/null differ
diff --git a/.github/workflows/check-standard.yaml b/.github/workflows/check-standard.yaml
index a2ddfd12..ae010756 100644
--- a/.github/workflows/check-standard.yaml
+++ b/.github/workflows/check-standard.yaml
@@ -25,6 +25,7 @@ jobs:
       fail-fast: false
       matrix:
         config:
+          - {os: macos-12,   r: 'release'}
           - {os: macos-latest,   r: 'release'}
           - {os: windows-latest, r: 'release'}
           - {os: ubuntu-latest,   r: 'devel', http-user-agent: 'release'}
diff --git a/.github/workflows/maven-build-installer-macos.yml b/.github/workflows/maven-build-installer-macos.yml
index e6f4832b..708b568b 100644
--- a/.github/workflows/maven-build-installer-macos.yml
+++ b/.github/workflows/maven-build-installer-macos.yml
@@ -1,7 +1,7 @@
 # This workflow will build a Java project with Maven 
 # For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
 
-name: Build macOS Installer
+name: Build macOS x64 Installer
 
 on:
   workflow_dispatch:
@@ -14,15 +14,16 @@ on:
 jobs:
   build:
 
-    runs-on: macos-latest
+    runs-on: macos-12
 
     steps:
-      - uses: actions/checkout@v3
-      - name: Set up JDK 17
-        uses: actions/setup-java@v2
+      - uses: actions/checkout@v4
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
         with:
-          java-version: 17.0.1
-          distribution: 'temurin'
+          java-version: 21.0.3
+          distribution: 'liberica'
+          java-package: jdk+fx
           cache: 'maven'
 
       - name: Import signing certificate into keychain
@@ -51,5 +52,5 @@ jobs:
           repo_token: "${{ secrets.GITHUB_TOKEN}}"
           automatic_release_tag: "macOS-latest"
           prerelease: true
-          title: "macOS Development Build"
+          title: "macOS x64 Development Build"
           files: ./RCaNconstructor/target/*.dmg
diff --git a/.github/workflows/maven-build-installer-macosaarch64.yml b/.github/workflows/maven-build-installer-macosaarch64.yml
new file mode 100644
index 00000000..ac6cbb99
--- /dev/null
+++ b/.github/workflows/maven-build-installer-macosaarch64.yml
@@ -0,0 +1,56 @@
+# This workflow will build a Java project with Maven 
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
+
+name: Build macOS aarch64 Installer
+
+on:
+  workflow_dispatch:
+    branches: [ master ]
+  push:
+    branches: [ master ]
+    paths:
+      - RCaNconstructor/**
+
+jobs:
+  build:
+
+    runs-on: macos-latest
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          java-version: 21.0.3
+          distribution: 'liberica'
+          java-package: jdk+fx
+          cache: 'maven'
+
+      - name: Import signing certificate into keychain
+        run: |
+          KEYCHAIN_FILE=default.keychain
+          KEYCHAIN_PASSWORD=myvoiceismypassport
+          security create-keychain -p $KEYCHAIN_PASSWORD $KEYCHAIN_FILE
+          security default-keychain -s $KEYCHAIN_FILE
+          security unlock-keychain -p $KEYCHAIN_PASSWORD $KEYCHAIN_FILE
+          security import <(echo $SIGNING_CERTIFICATE_P12_DATA | base64 --decode) \
+                          -f pkcs12 \
+                          -k $KEYCHAIN_FILE \
+                          -P $SIGNING_CERTIFICATE_PASSWORD \
+                          -T /usr/bin/codesign
+          security set-key-partition-list -S apple-tool:,apple: -s -k $KEYCHAIN_PASSWORD $KEYCHAIN_FILE
+        env:
+          SIGNING_CERTIFICATE_P12_DATA: ${{ secrets.SIGNING_CERTIFICATE_P12_DATA }}
+          SIGNING_CERTIFICATE_PASSWORD: ${{ secrets.SIGNING_CERTIFICATE_PASSWORD }}
+
+
+      - name: Build with Maven
+        run: mvn -B clean install --file RCaNconstructor/pom.xml
+      - name: Update Automatic Release
+        uses: marvinpinto/action-automatic-releases@latest
+        with:
+          repo_token: "${{ secrets.GITHUB_TOKEN}}"
+          automatic_release_tag: "macOSaarch64-latest"
+          prerelease: true
+          title: "macOS aarch64 Development Build"
+          files: ./RCaNconstructor/target/*.dmg
diff --git a/.github/workflows/maven-build-installer-unix.yml b/.github/workflows/maven-build-installer-unix.yml
index c8f4dea9..4b908c43 100644
--- a/.github/workflows/maven-build-installer-unix.yml
+++ b/.github/workflows/maven-build-installer-unix.yml
@@ -16,12 +16,13 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
-    - name: Set up JDK 17
-      uses: actions/setup-java@v2
+    - uses: actions/checkout@v4
+    - name: Set up JDK 21
+      uses: actions/setup-java@v4
       with:
-        java-version: 17.0.1
-        distribution: 'temurin'
+        java-version: 21.0.3
+        distribution: 'liberica'
+        java-package: jdk+fx
         cache: 'maven'
     - name: Build with Maven
       run: mvn -B clean install --file RCaNconstructor/pom.xml
diff --git a/.github/workflows/maven-build-installer-windows.yml b/.github/workflows/maven-build-installer-windows.yml
index 5eb79ddf..e13e3f39 100644
--- a/.github/workflows/maven-build-installer-windows.yml
+++ b/.github/workflows/maven-build-installer-windows.yml
@@ -29,12 +29,13 @@ jobs:
         pathTarget: ./target/wix
     - name: Add Wix to Path
       run: echo "$HOME/target/wix" >> $GITHUB_PATH
-    - uses: actions/checkout@v3
-    - name: Set up JDK 17
-      uses: actions/setup-java@v2
+    - uses: actions/checkout@v4
+    - name: Set up JDK 21
+      uses: actions/setup-java@v4
       with:
-        java-version: 17.0.1
-        distribution: 'temurin'
+        java-version: 21.0.3
+        distribution: 'liberica'
+        java-package: jdk+fx
         cache: 'maven'
     - name: Build with Maven
       run: mvn -B clean install --file RCaNconstructor/pom.xml
diff --git a/.github/workflows/maven-package.yml b/.github/workflows/maven-package.yml
index b8eaaed2..c90002f7 100644
--- a/.github/workflows/maven-package.yml
+++ b/.github/workflows/maven-package.yml
@@ -19,10 +19,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v2
       with:
-        java-version: 17.0.1
+        java-version: 21.0.3
         distribution: 'temurin'
         cache: 'maven'
     - name: Build with Maven
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..1ac335bf
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+.Rproj.user
+.Rhistory
+.RData
+.Ruserdata
+*.DS_Store
+RCaNconstructor/target
diff --git a/RCaNconstructor/linux-javafx/README.txt b/RCaNconstructor/linux-javafx/README.txt
deleted file mode 100644
index 5f0b79e9..00000000
--- a/RCaNconstructor/linux-javafx/README.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-
-These files are the same as those available from, with the WebKit browser libraries removed
-due to (default, non-LFS) GitHub:
-
-https://gluonhq.com/products/javafx/
-
-These files are included here to make it easier to just clone off this repository and
-immediately run the project.
-
-The JavaFX web libraries - the embedded WebKit browser components, are NOT included 
-due to GitHub template size restrictions. You can download those from the link above 
-and drop them into your own GitHub repo and they should work fine.
diff --git a/RCaNconstructor/linux-javafx/javafx-jmods-16/javafx.base.jmod b/RCaNconstructor/linux-javafx/javafx-jmods-16/javafx.base.jmod
deleted file mode 100644
index 163ae859..00000000
Binary files a/RCaNconstructor/linux-javafx/javafx-jmods-16/javafx.base.jmod and /dev/null differ
diff --git a/RCaNconstructor/linux-javafx/javafx-jmods-16/javafx.controls.jmod b/RCaNconstructor/linux-javafx/javafx-jmods-16/javafx.controls.jmod
deleted file mode 100644
index 8a5f27e5..00000000
Binary files a/RCaNconstructor/linux-javafx/javafx-jmods-16/javafx.controls.jmod and /dev/null differ
diff --git a/RCaNconstructor/linux-javafx/javafx-jmods-16/javafx.fxml.jmod b/RCaNconstructor/linux-javafx/javafx-jmods-16/javafx.fxml.jmod
deleted file mode 100644
index b804579b..00000000
Binary files a/RCaNconstructor/linux-javafx/javafx-jmods-16/javafx.fxml.jmod and /dev/null differ
diff --git a/RCaNconstructor/linux-javafx/javafx-jmods-16/javafx.graphics.jmod b/RCaNconstructor/linux-javafx/javafx-jmods-16/javafx.graphics.jmod
deleted file mode 100644
index a49386c9..00000000
Binary files a/RCaNconstructor/linux-javafx/javafx-jmods-16/javafx.graphics.jmod and /dev/null differ
diff --git a/RCaNconstructor/linux-javafx/javafx-jmods-16/javafx.media.jmod b/RCaNconstructor/linux-javafx/javafx-jmods-16/javafx.media.jmod
deleted file mode 100644
index 9e7c5f3e..00000000
Binary files a/RCaNconstructor/linux-javafx/javafx-jmods-16/javafx.media.jmod and /dev/null differ
diff --git a/RCaNconstructor/linux-javafx/javafx-jmods-16/javafx.swing.jmod b/RCaNconstructor/linux-javafx/javafx-jmods-16/javafx.swing.jmod
deleted file mode 100644
index 0dfccc4a..00000000
Binary files a/RCaNconstructor/linux-javafx/javafx-jmods-16/javafx.swing.jmod and /dev/null differ
diff --git a/RCaNconstructor/mac-javafx/README.txt b/RCaNconstructor/mac-javafx/README.txt
deleted file mode 100644
index 8a393c86..00000000
--- a/RCaNconstructor/mac-javafx/README.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-
-These files are the same as those available from:
-
-https://gluonhq.com/products/javafx/
-
-...included here to make it easier to just clone off this repository and immediately
-run the project.
-
-Please note that the JavaFX web libraries - the embedded WebKit browser components,
-are NOT included due to GitHub template size restrictions. You can download those
-from the link above and drop them into your own GitHub repo and they should work
-fine.
diff --git a/RCaNconstructor/mac-javafx/javafx-jmods-16/javafx.base.jmod b/RCaNconstructor/mac-javafx/javafx-jmods-16/javafx.base.jmod
deleted file mode 100644
index b30c5687..00000000
Binary files a/RCaNconstructor/mac-javafx/javafx-jmods-16/javafx.base.jmod and /dev/null differ
diff --git a/RCaNconstructor/mac-javafx/javafx-jmods-16/javafx.controls.jmod b/RCaNconstructor/mac-javafx/javafx-jmods-16/javafx.controls.jmod
deleted file mode 100644
index 828f503e..00000000
Binary files a/RCaNconstructor/mac-javafx/javafx-jmods-16/javafx.controls.jmod and /dev/null differ
diff --git a/RCaNconstructor/mac-javafx/javafx-jmods-16/javafx.fxml.jmod b/RCaNconstructor/mac-javafx/javafx-jmods-16/javafx.fxml.jmod
deleted file mode 100644
index b1edfe9d..00000000
Binary files a/RCaNconstructor/mac-javafx/javafx-jmods-16/javafx.fxml.jmod and /dev/null differ
diff --git a/RCaNconstructor/mac-javafx/javafx-jmods-16/javafx.graphics.jmod b/RCaNconstructor/mac-javafx/javafx-jmods-16/javafx.graphics.jmod
deleted file mode 100644
index e3d6288b..00000000
Binary files a/RCaNconstructor/mac-javafx/javafx-jmods-16/javafx.graphics.jmod and /dev/null differ
diff --git a/RCaNconstructor/mac-javafx/javafx-jmods-16/javafx.media.jmod b/RCaNconstructor/mac-javafx/javafx-jmods-16/javafx.media.jmod
deleted file mode 100644
index d47f506e..00000000
Binary files a/RCaNconstructor/mac-javafx/javafx-jmods-16/javafx.media.jmod and /dev/null differ
diff --git a/RCaNconstructor/mac-javafx/javafx-jmods-16/javafx.swing.jmod b/RCaNconstructor/mac-javafx/javafx-jmods-16/javafx.swing.jmod
deleted file mode 100644
index 759b8c85..00000000
Binary files a/RCaNconstructor/mac-javafx/javafx-jmods-16/javafx.swing.jmod and /dev/null differ
diff --git a/RCaNconstructor/pom.xml b/RCaNconstructor/pom.xml
index bf1f8070..9bd3baa1 100644
--- a/RCaNconstructor/pom.xml
+++ b/RCaNconstructor/pom.xml
@@ -32,11 +32,12 @@
         <!-- Set the project to UTF-8, avoiding warnings in the build logs -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
 
-        <!-- Used to set both the path to find the JavaFX modules and also the versions for Maven dependencies -->
-        <javafx.version>16</javafx.version>
+        <!-- needs to be consistent with github actions -->
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
+
+
         
         <!-- Replace this UUID with a custom one for your project. This ID is used by the Windows installer system
         to know that an installer is intended to replace/upgrade an earlier version. The easiest thing to do is
@@ -57,33 +58,18 @@
             <artifactId>javafaker</artifactId>
             <version>1.0.2</version>
         </dependency>
+        <!-- Modern JavaFX Look and Feel -->
+        <!-- https://github.com/mkpaz/atlantafx -->
+        <dependency>
+            <groupId>io.github.mkpaz</groupId>
+            <artifactId>atlantafx-base</artifactId>
+            <version>1.1.0</version>
+        </dependency>        
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
             <version>2.4</version>
         </dependency>
-        <!-- Javafx -->
-        <!-- This downloads the platform specific JavaFX libraries used by the project. -->
-        <!-- For the final installable, the JavaFX dependencies are provided via modules, but by including these here
-         they work nicely with with IDEs and other Maven plugins (e.g. the javafx:run). -->
-        <dependency>
-            <groupId>org.openjfx</groupId>
-            <artifactId>javafx-controls</artifactId>
-            <version>${javafx.version}</version>
-            <classifier>${platform}</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.openjfx</groupId>
-            <artifactId>javafx-graphics</artifactId>
-            <version>${javafx.version}</version>
-            <classifier>${platform}</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.openjfx</groupId>
-            <artifactId>javafx-fxml</artifactId>
-            <version>${javafx.version}</version>
-            <classifier>${platform}</classifier>
-        </dependency>
         <!-- excel java -->
         <dependency>
             <groupId>org.apache.poi</groupId>
@@ -194,8 +180,6 @@
                         <configuration>
                             <toolName>jlink</toolName>
                             <removeDirectories>${project.build.directory}/jvm-image/</removeDirectories>
-                            <modulePath>${project.basedir}/${platform}-javafx/javafx-jmods-${javafx.version}/
-                            </modulePath>
                             <addModules>${jvm.modules}</addModules>
                             <output>${project.build.directory}/jvm-image</output>
                             <args>
@@ -250,7 +234,12 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.8.1</version>
+                    <version>3.13.0</version>
+                    <configuration>
+                    	<source>21</source> <!-- JDK source version -->
+                    	<target>21</target> <!-- JDK target version -->
+                    	<release>21</release> <!-- Use this for JDK 9+ to ensure API compatibility -->
+                    </configuration>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -375,16 +364,29 @@
             </build>
         </profile>
         <profile>
-            <id>mac-active</id>
+            <id>macx64-active</id>
             <activation>
                 <os>
                     <family>mac</family>
+                    <arch>x64</arch>
                 </os>
             </activation>
             <properties>
                 <platform>mac</platform>
             </properties>
         </profile>
+        <profile>
+            <id>macaarch64-active</id>
+            <activation>
+                <os>
+                    <family>mac</family>
+                    <arch>aarch64</arch>
+                </os>
+            </activation>
+            <properties>
+                <platform>macaarch64</platform>
+            </properties>
+        </profile>
     </profiles>
 </project>
 
diff --git a/RCaNconstructor/win-javafx/README.txt b/RCaNconstructor/win-javafx/README.txt
deleted file mode 100644
index 8a393c86..00000000
--- a/RCaNconstructor/win-javafx/README.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-
-These files are the same as those available from:
-
-https://gluonhq.com/products/javafx/
-
-...included here to make it easier to just clone off this repository and immediately
-run the project.
-
-Please note that the JavaFX web libraries - the embedded WebKit browser components,
-are NOT included due to GitHub template size restrictions. You can download those
-from the link above and drop them into your own GitHub repo and they should work
-fine.
diff --git a/RCaNconstructor/win-javafx/javafx-jmods-16/javafx.base.jmod b/RCaNconstructor/win-javafx/javafx-jmods-16/javafx.base.jmod
deleted file mode 100644
index e54cb607..00000000
Binary files a/RCaNconstructor/win-javafx/javafx-jmods-16/javafx.base.jmod and /dev/null differ
diff --git a/RCaNconstructor/win-javafx/javafx-jmods-16/javafx.controls.jmod b/RCaNconstructor/win-javafx/javafx-jmods-16/javafx.controls.jmod
deleted file mode 100644
index d4f0ba31..00000000
Binary files a/RCaNconstructor/win-javafx/javafx-jmods-16/javafx.controls.jmod and /dev/null differ
diff --git a/RCaNconstructor/win-javafx/javafx-jmods-16/javafx.fxml.jmod b/RCaNconstructor/win-javafx/javafx-jmods-16/javafx.fxml.jmod
deleted file mode 100644
index bb897d40..00000000
Binary files a/RCaNconstructor/win-javafx/javafx-jmods-16/javafx.fxml.jmod and /dev/null differ
diff --git a/RCaNconstructor/win-javafx/javafx-jmods-16/javafx.graphics.jmod b/RCaNconstructor/win-javafx/javafx-jmods-16/javafx.graphics.jmod
deleted file mode 100644
index cc6a824f..00000000
Binary files a/RCaNconstructor/win-javafx/javafx-jmods-16/javafx.graphics.jmod and /dev/null differ
diff --git a/RCaNconstructor/win-javafx/javafx-jmods-16/javafx.media.jmod b/RCaNconstructor/win-javafx/javafx-jmods-16/javafx.media.jmod
deleted file mode 100644
index 20584e2c..00000000
Binary files a/RCaNconstructor/win-javafx/javafx-jmods-16/javafx.media.jmod and /dev/null differ
diff --git a/RCaNconstructor/win-javafx/javafx-jmods-16/javafx.swing.jmod b/RCaNconstructor/win-javafx/javafx-jmods-16/javafx.swing.jmod
deleted file mode 100644
index 9a78965b..00000000
Binary files a/RCaNconstructor/win-javafx/javafx-jmods-16/javafx.swing.jmod and /dev/null differ