diff --git a/src/main/java/com/gtohelper/datafetcher/controllers/solversettings/BetSettingsController.java b/src/main/java/com/gtohelper/datafetcher/controllers/solversettings/BetSettingsController.java
index 372810d..385f8c6 100644
--- a/src/main/java/com/gtohelper/datafetcher/controllers/solversettings/BetSettingsController.java
+++ b/src/main/java/com/gtohelper/datafetcher/controllers/solversettings/BetSettingsController.java
@@ -7,7 +7,6 @@
 import javafx.beans.property.SimpleStringProperty;
 import javafx.fxml.FXML;
 import javafx.scene.control.*;
-import javafx.stage.Popup;
 
 import java.util.*;
 import java.util.function.Consumer;
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
index fadbd5b..bebb58e 100644
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@@ -6,5 +6,13 @@
     requires javafx.fxml;
     requires javafx.controls;
 
-    exports com.gtohelper;
+    exports com.gtohelper.datafetcher.models to javafx.graphics;
+
+    exports com.gtohelper.datafetcher.controllers to javafx.fxml;
+    opens com.gtohelper.datafetcher.controllers to javafx.fxml;
+
+    exports com.gtohelper.datafetcher.controllers.solversettings to javafx.fxml;
+    opens com.gtohelper.datafetcher.controllers.solversettings to javafx.fxml;
+
+    opens com.gtohelper.fxml to javafx.fxml;
 }
diff --git a/src/main/resources/com/gtohelper/fxml/BetSettings.fxml b/src/main/resources/com/gtohelper/fxml/BetSettings.fxml
index b08da77..0457065 100644
--- a/src/main/resources/com/gtohelper/fxml/BetSettings.fxml
+++ b/src/main/resources/com/gtohelper/fxml/BetSettings.fxml
@@ -10,7 +10,7 @@
 <?import javafx.scene.layout.*?>
 <?import javafx.geometry.Insets?>
 
-<AnchorPane minHeight="480.0" minWidth="720.0" prefHeight="480.0" prefWidth="720.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.gtohelper.datafetcher.controllers.solversettings.BetSettingsController">
+<AnchorPane minHeight="480.0" minWidth="720.0" prefHeight="480.0" prefWidth="720.0" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.gtohelper.datafetcher.controllers.solversettings.BetSettingsController">
    <children>
    
        <SplitPane dividerPositions="0.7" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
diff --git a/src/main/resources/com/gtohelper/fxml/DBConnection.fxml b/src/main/resources/com/gtohelper/fxml/DBConnection.fxml
index dd9e0bc..3c74f04 100644
--- a/src/main/resources/com/gtohelper/fxml/DBConnection.fxml
+++ b/src/main/resources/com/gtohelper/fxml/DBConnection.fxml
@@ -10,7 +10,7 @@
 
 <StackPane maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308"
            minHeight="400.0" minWidth="600.0" prefHeight="400.0" prefWidth="600.0"
-           xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1"
+           xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml/1"
            fx:controller="com.gtohelper.datafetcher.controllers.DBConnectionController">
     <children>
         <VBox fx:id="vbox" layoutX="129.0" layoutY="14.0" minHeight="350.0" minWidth="600.0" prefHeight="321.0" prefWidth="600.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
diff --git a/src/main/resources/com/gtohelper/fxml/DebugOutput.fxml b/src/main/resources/com/gtohelper/fxml/DebugOutput.fxml
index 3085ed5..83cc1ae 100644
--- a/src/main/resources/com/gtohelper/fxml/DebugOutput.fxml
+++ b/src/main/resources/com/gtohelper/fxml/DebugOutput.fxml
@@ -1,14 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.geometry.*?>
-<?import javafx.scene.text.*?>
-<?import java.lang.*?>
-<?import java.util.*?>
-<?import javafx.scene.*?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 
-<AnchorPane xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.gtohelper.datafetcher.controllers.DebugOutputController">
+<AnchorPane xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.gtohelper.datafetcher.controllers.DebugOutputController">
    <children>
       <TabPane tabClosingPolicy="UNAVAILABLE" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
         <tabs>
diff --git a/src/main/resources/com/gtohelper/fxml/GTOHelper.fxml b/src/main/resources/com/gtohelper/fxml/GTOHelper.fxml
index eb43bf3..38f99b5 100644
--- a/src/main/resources/com/gtohelper/fxml/GTOHelper.fxml
+++ b/src/main/resources/com/gtohelper/fxml/GTOHelper.fxml
@@ -4,7 +4,7 @@
 <?import javafx.scene.layout.*?>
 
 
-<AnchorPane xmlns="http://javafx.com/javafx/8"
+<AnchorPane xmlns="http://javafx.com/javafx"
           xmlns:fx="http://javafx.com/fxml/1"
           fx:controller="com.gtohelper.datafetcher.controllers.GTOHelperController">
    <children>
@@ -12,27 +12,27 @@
         <tabs>
           <Tab fx:id="workQueueTab"  id="workQueueTab" text="Work Queue">
             <content>
-              <fx:include fx:id="workQueue" source="/com/gtohelper/fxml/WorkQueue.fxml"/>
+              <fx:include fx:id="workQueue" source="WorkQueue.fxml"/>
             </content>
           </Tab>
           <Tab fx:id="solverSettingsTab" id="solverSettingsTab" text="Solver Settings">
             <content>
-              <fx:include fx:id="solverSettings" source="/com/gtohelper/fxml/SolverSettings.fxml"/>
+              <fx:include fx:id="solverSettings" source="SolverSettings.fxml"/>
             </content>
           </Tab>
           <Tab fx:id="handAnalysisTab"  id="handAnalysisTab" text="Hand Analysis" >
             <content>
-              <fx:include fx:id="handAnalysis" source="/com/gtohelper/fxml/HandAnalysis.fxml" />
+              <fx:include fx:id="handAnalysis" source="HandAnalysis.fxml" />
             </content>
           </Tab>
           <Tab fx:id="dbConnectionTab" id="dbConnectionTab" text="DB Connection">
             <content>
-              <fx:include fx:id="dbConnection" source="/com/gtohelper/fxml/DBConnection.fxml"/>
+              <fx:include fx:id="dbConnection" source="DBConnection.fxml"/>
             </content>
           </Tab>
           <Tab fx:id="debugOutputTab" id="debugOutput"  text="Debug Output">
             <content>
-              <fx:include fx:id="debugOutput" source="/com/gtohelper/fxml/DebugOutput.fxml"/>
+              <fx:include fx:id="debugOutput" source="DebugOutput.fxml"/>
             </content>
           </Tab>
         </tabs>
diff --git a/src/main/resources/com/gtohelper/fxml/HandAnalysis.fxml b/src/main/resources/com/gtohelper/fxml/HandAnalysis.fxml
index d6cc401..2e58fde 100644
--- a/src/main/resources/com/gtohelper/fxml/HandAnalysis.fxml
+++ b/src/main/resources/com/gtohelper/fxml/HandAnalysis.fxml
@@ -22,7 +22,7 @@
 <?import javafx.scene.text.Text?>
 <?import javafx.scene.text.TextFlow?>
 
-<AnchorPane prefHeight="600.0" prefWidth="960.0" xmlns="http://javafx.com/javafx/16" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.gtohelper.datafetcher.controllers.HandAnalysisController">
+<AnchorPane prefHeight="600.0" prefWidth="960.0" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.gtohelper.datafetcher.controllers.HandAnalysisController">
    <children>
       <SplitPane fx:id="rootSplitPane" dividerPositions="0.4" prefHeight="600.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
           <items>
@@ -148,7 +148,7 @@
                                                 <Insets top="3.0" />
                                              </padding>
                                           </Label>
-                                          <ComboBox fx:id="villainSeatComboBox" disable="true" onAction="#villainSeatSelected" prefWidth="222.0" stylesheets="/com/gtohelper/style/handAnalysis.css">
+                                          <ComboBox fx:id="villainSeatComboBox" disable="true" onAction="#villainSeatSelected" prefWidth="222.0" stylesheets="@../style/handAnalysis.css">
                                              <HBox.margin>
                                                 <Insets left="3.0" />
                                              </HBox.margin>
diff --git a/src/main/resources/com/gtohelper/fxml/OtherSettings.fxml b/src/main/resources/com/gtohelper/fxml/OtherSettings.fxml
index 0538645..c31e8c3 100644
--- a/src/main/resources/com/gtohelper/fxml/OtherSettings.fxml
+++ b/src/main/resources/com/gtohelper/fxml/OtherSettings.fxml
@@ -9,7 +9,7 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Text?>
 
-<AnchorPane prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/16" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.gtohelper.datafetcher.controllers.solversettings.OtherSettingsController">
+<AnchorPane prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.gtohelper.datafetcher.controllers.solversettings.OtherSettingsController">
    <children>
       <VBox layoutX="171.0" layoutY="79.0" prefHeight="200.0" prefWidth="100.0" AnchorPane.bottomAnchor="2.0" AnchorPane.leftAnchor="2.0" AnchorPane.rightAnchor="2.0" AnchorPane.topAnchor="2.0">
          <children>
diff --git a/src/main/resources/com/gtohelper/fxml/RangeFiles.fxml b/src/main/resources/com/gtohelper/fxml/RangeFiles.fxml
index b5e2f70..081353d 100644
--- a/src/main/resources/com/gtohelper/fxml/RangeFiles.fxml
+++ b/src/main/resources/com/gtohelper/fxml/RangeFiles.fxml
@@ -13,7 +13,7 @@
 <?import javafx.scene.text.Font?>
 <?import javafx.scene.text.Text?>
 
-<AnchorPane xmlns="http://javafx.com/javafx/20.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.gtohelper.datafetcher.controllers.solversettings.RangeFilesController">
+<AnchorPane xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.gtohelper.datafetcher.controllers.solversettings.RangeFilesController">
      <children>
         <VBox layoutX="50.0" layoutY="6.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
            <children>
diff --git a/src/main/resources/com/gtohelper/fxml/SolverSettings.fxml b/src/main/resources/com/gtohelper/fxml/SolverSettings.fxml
index 023ad9b..88fff97 100644
--- a/src/main/resources/com/gtohelper/fxml/SolverSettings.fxml
+++ b/src/main/resources/com/gtohelper/fxml/SolverSettings.fxml
@@ -17,20 +17,20 @@
 
                 <Tab fx:id="betSettingsTab" id="betSettingsTab" text="Bet Settings">
                     <content>
-                        <fx:include fx:id="betSettings" source="/com/gtohelper/fxml/BetSettings.fxml"/>
+                        <fx:include fx:id="betSettings" source="BetSettings.fxml"/>
                     </content>
                 </Tab>
 
 
                 <Tab fx:id="rangeFilesTab" id="rangeFilesTab" text="Range Files">
                     <content>
-                        <fx:include fx:id="rangeFiles" source="/com/gtohelper/fxml/RangeFiles.fxml"/>
+                        <fx:include fx:id="rangeFiles" source="RangeFiles.fxml"/>
                     </content>
                 </Tab>
 
                 <Tab fx:id="otherSettingsTab" id="otherSettingsTab" text="Other Settings">
                     <content>
-                        <fx:include fx:id="otherSettings" source="/com/gtohelper/fxml/OtherSettings.fxml"/>
+                        <fx:include fx:id="otherSettings" source="OtherSettings.fxml"/>
                     </content>
                 </Tab>
             </tabs>
diff --git a/src/main/resources/com/gtohelper/fxml/WorkItem.fxml b/src/main/resources/com/gtohelper/fxml/WorkItem.fxml
index face71d..5ba3318 100644
--- a/src/main/resources/com/gtohelper/fxml/WorkItem.fxml
+++ b/src/main/resources/com/gtohelper/fxml/WorkItem.fxml
@@ -6,7 +6,7 @@
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 
-<GridPane fx:id="rootGridPane" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" >
+<GridPane fx:id="rootGridPane" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml/1" >
    <children>
       <Text fx:id="name" GridPane.rowIndex="1" />
       <Text fx:id="ETA" GridPane.rowIndex="2" />
diff --git a/src/main/resources/com/gtohelper/fxml/WorkQueue.fxml b/src/main/resources/com/gtohelper/fxml/WorkQueue.fxml
index 9923bf1..65de3ff 100644
--- a/src/main/resources/com/gtohelper/fxml/WorkQueue.fxml
+++ b/src/main/resources/com/gtohelper/fxml/WorkQueue.fxml
@@ -3,13 +3,11 @@
 <?import javafx.scene.paint.*?>
 <?import javafx.scene.shape.*?>
 <?import javafx.geometry.*?>
-<?import java.lang.*?>
 <?import javafx.scene.text.*?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-<?import java.net.URL?>
 
-<AnchorPane xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.gtohelper.datafetcher.controllers.WorkQueueController">
+<AnchorPane xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.gtohelper.datafetcher.controllers.WorkQueueController">
    <children>
       <HBox style="-fx-background-color: white;" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
          <children>
@@ -67,7 +65,7 @@
                         </AnchorPane>
                         <AnchorPane GridPane.halignment="LEFT" GridPane.hgrow="NEVER" GridPane.rowIndex="1" GridPane.rowSpan="2" GridPane.vgrow="ALWAYS" VBox.vgrow="ALWAYS">
                            <children>
-                              <ListView fx:id="solveTaskListView" prefWidth="160.0" styleClass="task-list" stylesheets="/com/gtohelper/style/workQueue.css" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" VBox.vgrow="ALWAYS">
+                              <ListView fx:id="solveTaskListView" prefWidth="160.0" styleClass="task-list" stylesheets="@../style/workQueue.css" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" VBox.vgrow="ALWAYS">
 
                               </ListView>
                            </children>
@@ -87,7 +85,7 @@
                            <children>
                               <ScrollPane fx:id="taskInfoScrollPane" fitToHeight="true" fitToWidth="true" hbarPolicy="NEVER" prefViewportHeight="497.0" prefViewportWidth="205.0" style="-fx-box-border: transparent;" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
                                  <content>
-                                    <VBox layoutX="40.0" layoutY="116.0" stylesheets="/com/gtohelper/style/workQueue.css" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+                                    <VBox layoutX="40.0" layoutY="116.0" stylesheets="@../style/workQueue.css" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
                                        <children>
                                           <HBox VBox.vgrow="NEVER">
                                              <children>