diff --git a/.github/workflows/build-badges.yml.old b/.github/workflows/build-badges.yml.old
deleted file mode 100644
index 43249b9..0000000
--- a/.github/workflows/build-badges.yml.old
+++ /dev/null
@@ -1,62 +0,0 @@
-#https://github.com/cicirello/examples-jacoco-badge-generator/blob/main/.github/workflows/build-badges-branch.yml
-
-name: build (badges branch)
-
-on:
-  push:
-    branches: [ main ]
-  pull_request:
-    branches: [ main ]
-  workflow_dispatch:
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v3
-
-    - name: Checkout badges branch dedicated to storing badges only
-      uses: actions/checkout@v3
-      with:
-        ref: badges
-        path: badges
-
-    - name: Set up JDK 21
-      uses: actions/setup-java@v3
-      with:
-        distribution: 'adopt'
-        java-version: '21'
-
-    - name: Build with Maven
-      run: mvn -B package
-
-    - name: Generate Jacoco Badge
-      id: jacoco
-      uses: cicirello/jacoco-badge-generator@v2
-      with:
-        badges-directory: badges
-        generate-branches-badge: true
-
-    - name: Log coverage percentage
-      run: |
-        echo "coverage = ${{ steps.jacoco.outputs.coverage }}"
-        echo "branches = ${{ steps.jacoco.outputs.branches }}"
-    - name: Commit and push
-      if: ${{ github.event_name != 'pull_request' }}
-      run: |
-        cd badges
-        if [[ `git status --porcelain *.svg` ]]; then
-          git config --global user.name 'github-actions'
-          git config --global user.email '41898282+github-actions[bot]@users.noreply.github.com'
-          git add *.svg
-          git commit -m "Autogenerated JaCoCo coverage badge" *.svg
-          git push
-        fi
-    - name: Upload Jacoco coverage report
-      uses: actions/upload-artifact@v3
-      with:
-        name: jacoco-report
-        path: target/site/jacoco/
\ No newline at end of file
diff --git a/.github/workflows/deploy-javadoc.yml.old b/.github/workflows/deploy-javadoc.yml.old
deleted file mode 100644
index d170390..0000000
--- a/.github/workflows/deploy-javadoc.yml.old
+++ /dev/null
@@ -1,32 +0,0 @@
-name: Deploy Javadoc
-
-on:
-  push:
-    branches:
-      - main
-    paths:
-      - src/**
-      - pom.xml
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up JDK 17
-      uses: actions/setup-java@v2
-      with:
-        java-version: '17'
-        distribution: 'temurin'
-        cache: maven
-    - name: Build with Maven
-      run: mvn --batch-mode --update-snapshots verify
-    - name: Generate JavaDoc
-      run: mvn javadoc:javadoc
-    - name: Deploy 🚀
-      uses: JamesIves/github-pages-deploy-action@v4.2.2
-      with:
-        branch: gh-pages
-        clear: true
-        folder: target/site/apidocs
-        target-folder: docs
diff --git a/.github/workflows/development-release.yml b/.github/workflows/development-release.yml
deleted file mode 100644
index 9fd2aea..0000000
--- a/.github/workflows/development-release.yml
+++ /dev/null
@@ -1,85 +0,0 @@
-name: Development Build
-
-on:
-  push:
-    branches:
-      - develop
-    paths:
-      - src/**
-      - pom.xml
-      - simulator-example.properties
-      
-jobs:
-  verify:
-    name: Verify project
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up JDK 21
-      uses: actions/setup-java@v2
-      with:
-        java-version: '21'
-        distribution: 'adopt'
-        cache: maven
-    - name: Verify with Maven
-      run: mvn --batch-mode --update-snapshots verify
-      
-  properties:
-    needs: verify
-    name: Publish simulator properties
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Upload Properties
-      uses: svenstaro/upload-release-action@v2
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        repo_token: ${{ secrets.GITHUB_TOKEN }}
-        file: simulator-example.properties
-        asset_name: simulator.properties
-        prerelease: true
-        overwrite: true
-        tag: development
-        release_name: Automatic Development Build
-        body: This release is an automatic build from the develop branch.
-  publish:
-    needs: verify
-    name: Publish for ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        include:
-          - os: ubuntu-latest
-            artifact_name: RobbiSimulator.jar
-            asset_name: RobbiSimulator-Linux.jar
-          - os: windows-latest
-            artifact_name: RobbiSimulator.jar
-            asset_name: RobbiSimulator-Win.jar
-          - os: macos-latest
-            artifact_name: RobbiSimulator.jar
-            asset_name: RobbiSimulator-Mac.jar
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up JDK 21
-      uses: actions/setup-java@v2
-      with:
-        java-version: '21'
-        distribution: 'adopt'
-        cache: maven
-    - name: Generate Jar
-      run: |
-        mvn --batch-mode --update-snapshots clean install package
-    - name: Upload Application
-      uses: svenstaro/upload-release-action@v2
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        repo_token: ${{ secrets.GITHUB_TOKEN }}
-        file: target/${{ matrix.artifact_name }}
-        asset_name: ${{ matrix.asset_name }}
-        prerelease: true
-        overwrite: true
-        tag: development
-        release_name: Automatic Development Build
-        body: This release is an automatic build from the develop branch.
diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml
deleted file mode 100644
index 0997c15..0000000
--- a/.github/workflows/pre-release.yml
+++ /dev/null
@@ -1,85 +0,0 @@
-name: Prerelease Build
-
-on:
-  push:
-    branches:
-      - main
-    paths:
-      - src/**
-      - pom.xml
-      - simulator-example.properties
-      
-jobs:
-  verify:
-    name: Verify project
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up JDK 21
-      uses: actions/setup-java@v2
-      with:
-        java-version: '21'
-        distribution: 'adopt'
-        cache: maven
-    - name: Verify with Maven
-      run: mvn --batch-mode --update-snapshots verify
-            
-  properties:
-    needs: verify
-    name: Publish simulator properties
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Upload Properties
-      uses: svenstaro/upload-release-action@v2
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        repo_token: ${{ secrets.GITHUB_TOKEN }}
-        file: simulator-example.properties
-        asset_name: simulator.properties
-        prerelease: true
-        overwrite: true
-        tag: latest
-        release_name: Automatic Prerelease Build
-        body: This release is an automatic build from the develop main.
-  publish:
-    needs: verify
-    name: Publish for ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        include:
-          - os: ubuntu-latest
-            artifact_name: RobbiSimulator.jar
-            asset_name: RobbiSimulator-Linux.jar
-          - os: windows-latest
-            artifact_name: RobbiSimulator.jar
-            asset_name: RobbiSimulator-Win.jar
-          - os: macos-latest
-            artifact_name: RobbiSimulator.jar
-            asset_name: RobbiSimulator-Mac.jar
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up JDK 21
-      uses: actions/setup-java@v2
-      with:
-        java-version: '21'
-        distribution: 'adopt'
-        cache: maven
-    - name: Generate Jar
-      run: |
-        mvn --batch-mode --update-snapshots clean install package
-    - name: Upload Application
-      uses: svenstaro/upload-release-action@v2
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        repo_token: ${{ secrets.GITHUB_TOKEN }}
-        file: target/${{ matrix.artifact_name }}
-        asset_name: ${{ matrix.asset_name }}
-        prerelease: true
-        overwrite: true
-        tag: latest
-        release_name: Automatic Prerelease Build
-        body: This release is an automatic build from the develop main.
diff --git a/.github/workflows/tagged-release.yml b/.github/workflows/tagged-release.yml
deleted file mode 100644
index 12e9a46..0000000
--- a/.github/workflows/tagged-release.yml
+++ /dev/null
@@ -1,86 +0,0 @@
-name: Tagged Release
-
-on:
-  push:
-    tags:
-      - "v*"
-      
-jobs:
-  verify:
-    name: Verify project
-    runs-on: ubuntu-latest
-    outputs:
-      tagname: ${{ steps.tagname.outputs.tag }}
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up JDK 21
-      uses: actions/setup-java@v2
-      with:
-        java-version: '21'
-        distribution: 'adopt'
-        cache: maven
-    - name: Verify with Maven
-      run: mvn --batch-mode --update-snapshots verify
-    - name: Get tagname
-      id: tagname
-      run: echo ::set-output name=tag::${GITHUB_REF#refs/*/}
-      
-  properties:
-    needs: verify
-    name: Publish simulator properties
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Upload Properties
-      uses: svenstaro/upload-release-action@v2
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        repo_token: ${{ secrets.GITHUB_TOKEN }}
-        file: simulator-example.properties
-        asset_name: simulator.properties
-        prerelease: false
-        overwrite: true
-        tag: ${{ needs.verify.outputs.tagname }}
-        release_name: ${{ needs.verify.outputs.tagname }}
-        body: This release is an automatic build.
-  publish:
-    needs: verify
-    name: Publish for ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        include:
-          - os: ubuntu-latest
-            artifact_name: RobbiSimulator.jar
-            asset_name: RobbiSimulator-Linux.jar
-          - os: windows-latest
-            artifact_name: RobbiSimulator.jar
-            asset_name: RobbiSimulator-Win.jar
-          - os: macos-latest
-            artifact_name: RobbiSimulator.jar
-            asset_name: RobbiSimulator-Mac.jar
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up JDK 21
-      uses: actions/setup-java@v2
-      with:
-        java-version: '21'
-        distribution: 'adopt'
-        cache: maven
-    - name: Generate Jar
-      run: |
-        mvn --batch-mode --update-snapshots clean install package
-    - name: Upload Application
-      uses: svenstaro/upload-release-action@v2
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        repo_token: ${{ secrets.GITHUB_TOKEN }}
-        file: target/${{ matrix.artifact_name }}
-        asset_name: ${{ matrix.asset_name }}
-        prerelease: false
-        overwrite: true
-        tag: ${{ needs.verify.outputs.tagname }}
-        release_name: ${{ needs.verify.outputs.tagname }}
-        body: This release is an automatic build.
\ No newline at end of file
diff --git a/jpackage/RobbiSimulator.png b/jpackage/RobbiSimulator.png
deleted file mode 100644
index 56a3fc9..0000000
Binary files a/jpackage/RobbiSimulator.png and /dev/null differ
diff --git a/pom.xml b/pom.xml
index fcca17f..ea01b49 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,11 +9,11 @@
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <javafx.version>16</javafx.version> <!-- Version 16 is used to resolve conflicts with monacoFX -->
+        <javafx.version>21</javafx.version> <!-- Version 16 is used to resolve conflicts with monacoFX -->
         <junit.version>5.8.2</junit.version>
         <derby.version>10.17.1.0</derby.version>
         <lombok.version>1.18.30</lombok.version>
-        <hibernate.version>6.1.2.Final</hibernate.version>
+        <hibernate.version>6.4.2.Final</hibernate.version>
     </properties>
 
     <build>
@@ -34,81 +34,8 @@
                     </annotationProcessorPaths>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.2.3</version>
-                <configuration>
-                    <includes>
-                        <include>**/*TestCases.java</include>
-                        <include>**/*Tests.java</include>
-                        <include>**/*TestCase.java</include>
-                        <include>**/*Test.java</include>
-                        <include>**/Test*.java</include>
-                    </includes>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.openjfx</groupId>
-                <artifactId>javafx-maven-plugin</artifactId>
-                <version>0.0.8</version>
-                <configuration>
-                    <mainClass>RobbiSimulator/com.JayPi4c.RobbiSimulator.App</mainClass>
-                        <stripDebug>true</stripDebug>
-                        <compress>2</compress>
-                        <noHeaderFiles>true</noHeaderFiles>
-                        <noManPages>true</noManPages>
-                        <jlinkImageName>RobbiSimulator</jlinkImageName>
-                        <jlinkZipName>RobbiSimulator</jlinkZipName>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
-    <profiles>
-
-        <profile>
-            <id>linux-deb</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.panteleyev</groupId>
-                        <artifactId>jpackage-maven-plugin</artifactId>
-                        <configuration>
-                            <type>DEB</type>
-                            <linuxShortcut>true</linuxShortcut>
-                            <linuxPackageName>RobbiSimulator</linuxPackageName>
-                            <linuxAppCategory>Utilities</linuxAppCategory>
-                            <linuxMenuGroup>Utilities</linuxMenuGroup>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>jpackage</id>
-            <build>
-                <plugins>
-
-                    <plugin>
-                        <groupId>org.panteleyev</groupId>
-                        <artifactId>jpackage-maven-plugin</artifactId>
-                        <version>1.6.0</version>
-                        <configuration>
-                            <name>RobbiSimulator</name>
-                            <vendor>JayPi4c</vendor>
-                            <destination>target/dist</destination>
-                            <module>RobbiSimulator/com.JayPi4c.RobbiSimulator.App</module>
-                            <runtimeImage>target/robbisimulator</runtimeImage>
-                            <resourceDir>./jpackage</resourceDir>
-                            <javaOptions>
-                                <option>-Dfile.encoding=UTF-8</option>
-                            </javaOptions>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 
 
     <dependencies>
@@ -136,9 +63,14 @@
             <groupId>eu.mihosoft.monacofx</groupId>
             <artifactId>monacofx</artifactId>
             <version>0.0.8</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.openjfx</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
-
         <dependency>
             <groupId>org.hibernate.orm</groupId>
             <artifactId>hibernate-core</artifactId>