diff --git a/src/js/admin-general-view.js b/src/js/admin-general-view.js
index 59c9f33..891c77c 100644
--- a/src/js/admin-general-view.js
+++ b/src/js/admin-general-view.js
@@ -101,7 +101,7 @@ module.exports = {
     reset: async function () {
       const fetchConfig = async () => {
         try {
-          return await fetchJSON(`onefinity_${this.reset_variant}_defaults.json`);
+          return await fetchJSON(`/api/config/${this.reset_variant}`);
         } catch (err) {
           api.alert("Invalid default config file");
           console.error('Invalid default config file', err);
diff --git a/src/py/bbctrl/Web.py b/src/py/bbctrl/Web.py
index 0b05e71..951c7f7 100644
--- a/src/py/bbctrl/Web.py
+++ b/src/py/bbctrl/Web.py
@@ -26,18 +26,15 @@
 ################################################################################
 
 import os
-import sys
 import json
 import tornado
 import sockjs.tornado
 import datetime
-import shutil
-import tarfile
 import subprocess
 import socket
-import time
 from tornado.web import HTTPError
-from tornado import web, gen
+from tornado import gen
+from pkg_resources import Requirement, resource_filename
 
 import bbctrl
 
@@ -228,6 +225,13 @@ class PasswordHandler(bbctrl.APIHandler):
         raise HTTPError(401, 'Failed to set password')
 
 
+class ConfigDefaultsHandler(bbctrl.APIHandler):
+    def get(self):
+        # defaults_path = bbctrl.get_resource("")
+        # defaults_path = resource_filename(Requirement.parse('bbctrl'), 'bbctrl/' + path)
+        # self.write_json(self.get_ctrl().config.load())
+        pass
+
 class ConfigLoadHandler(bbctrl.APIHandler):
     def get(self): self.write_json(self.get_ctrl().config.load())
 
@@ -525,6 +529,7 @@ class Web(tornado.web.Application):
             (r'/api/wifi', WifiHandler),
             (r'/api/remote/username', UsernameHandler),
             (r'/api/remote/password', PasswordHandler),
+            (r'/api/config/defaults/(.*)', ConfigDefaultsHandler),
             (r'/api/config/load', ConfigLoadHandler),
             (r'/api/config/download', ConfigDownloadHandler),
             (r'/api/config/save', ConfigSaveHandler),
diff --git a/src/resources/onefinity_defaults.json b/src/resources/onefinity_defaults.json
new file mode 100644
index 0000000..f4f861b
--- /dev/null
+++ b/src/resources/onefinity_defaults.json
@@ -0,0 +1,325 @@
+{
+  "tool": {
+    "tool-reversed": false,
+    "tool-enable-mode": "disabled",
+    "tool-direction-mode": "disabled",
+    "tool-type": "PWM Spindle",
+    "min-spin": 0,
+    "max-spin": 255
+  },
+  "switches": {
+    "switch-lockout": 250,
+    "estop": "disabled",
+    "switch-debounce": 5,
+    "probe": "normally-open"
+  },
+  "probe": {
+    "probe-ydim": 53.975,
+    "probe-slow-seek": 25,
+    "probe-fast-seek": 75,
+    "probe-zdim": 15.4,
+    "probe-xdim": 53.975
+  },
+  "version": "1.0.4",
+  "outputs": {
+    "load-1": "disabled",
+    "fault": "disabled",
+    "load-2": "disabled"
+  },
+  "settings": {
+    "junction-accel": 200000,
+    "max-deviation": 0.05,
+    "units": "METRIC",
+    "probing-prompts": true
+  },
+  "motors": [
+    {
+      "latch-velocity": 0.1,
+      "max-accel": 750,
+      "max-velocity": 10,
+      "search-velocity": 1.688,
+      "travel-per-rev": 10,
+      "idle-current": 1,
+      "drive-current": 2.8,
+      "latch-backoff": 5,
+      "enabled": true,
+      "homing-mode": "stall-min",
+      "reverse": false,
+      "stall-microstep": 8,
+      "min-soft-limit": 0,
+      "max-switch": "disabled",
+      "step-angle": 1.8,
+      "stall-current": 1,
+      "stall-sample-time": 200,
+      "microsteps": 16,
+      "stall-volts": 2,
+      "axis": "X",
+      "min-switch": "disabled",
+      "max-jerk": 1000,
+      "max-soft-limit": 0,
+      "zero-backoff": 1.5
+    },
+    {
+      "latch-velocity": 0.1,
+      "max-accel": 750,
+      "max-velocity": 10,
+      "search-velocity": 1.688,
+      "travel-per-rev": 10,
+      "idle-current": 1,
+      "drive-current": 2.8,
+      "latch-backoff": 5,
+      "enabled": true,
+      "homing-mode": "stall-min",
+      "reverse": false,
+      "stall-microstep": 8,
+      "min-soft-limit": 0,
+      "max-switch": "disabled",
+      "step-angle": 1.8,
+      "stall-current": 1,
+      "stall-sample-time": 200,
+      "microsteps": 16,
+      "stall-volts": 2,
+      "axis": "Y",
+      "min-switch": "disabled",
+      "max-jerk": 1000,
+      "max-soft-limit": 0,
+      "zero-backoff": 1.5
+    },
+    {
+      "latch-velocity": 0.1,
+      "max-accel": 750,
+      "max-velocity": 10,
+      "search-velocity": 1.688,
+      "travel-per-rev": 10,
+      "idle-current": 1,
+      "drive-current": 2.8,
+      "latch-backoff": 5,
+      "enabled": true,
+      "homing-mode": "stall-min",
+      "reverse": false,
+      "stall-microstep": 8,
+      "min-soft-limit": 0,
+      "max-switch": "disabled",
+      "step-angle": 1.8,
+      "stall-current": 1,
+      "stall-sample-time": 200,
+      "microsteps": 16,
+      "stall-volts": 2,
+      "axis": "Y",
+      "min-switch": "disabled",
+      "max-jerk": 1000,
+      "max-soft-limit": 0,
+      "zero-backoff": 1.5
+    },
+    {
+      "latch-velocity": 0.1,
+      "max-accel": 750,
+      "max-velocity": 3,
+      "search-velocity": 0.675,
+      "travel-per-rev": 4,
+      "idle-current": 1,
+      "drive-current": 2.8,
+      "latch-backoff": 5,
+      "enabled": true,
+      "homing-mode": "stall-max",
+      "reverse": true,
+      "stall-microstep": 8,
+      "min-soft-limit": -133,
+      "max-switch": "disabled",
+      "step-angle": 1.8,
+      "stall-current": 1,
+      "stall-sample-time": 200,
+      "microsteps": 16,
+      "stall-volts": 2,
+      "axis": "Z",
+      "min-switch": "disabled",
+      "max-jerk": 1000,
+      "max-soft-limit": 0,
+      "zero-backoff": 1
+    }
+  ],
+  "modbus-spindle": {
+    "baud": "9600",
+    "multi-write": false,
+    "regs": [
+      {
+        "reg-type": "disabled",
+        "reg-value": 0,
+        "reg-addr": 0
+      },
+      {
+        "reg-type": "disabled",
+        "reg-value": 0,
+        "reg-addr": 0
+      },
+      {
+        "reg-type": "disabled",
+        "reg-value": 0,
+        "reg-addr": 0
+      },
+      {
+        "reg-type": "disabled",
+        "reg-value": 0,
+        "reg-addr": 0
+      },
+      {
+        "reg-type": "disabled",
+        "reg-value": 0,
+        "reg-addr": 0
+      },
+      {
+        "reg-type": "disabled",
+        "reg-value": 0,
+        "reg-addr": 0
+      },
+      {
+        "reg-type": "disabled",
+        "reg-value": 0,
+        "reg-addr": 0
+      },
+      {
+        "reg-type": "disabled",
+        "reg-value": 0,
+        "reg-addr": 0
+      },
+      {
+        "reg-type": "disabled",
+        "reg-value": 0,
+        "reg-addr": 0
+      },
+      {
+        "reg-type": "disabled",
+        "reg-value": 0,
+        "reg-addr": 0
+      },
+      {
+        "reg-type": "disabled",
+        "reg-value": 0,
+        "reg-addr": 0
+      },
+      {
+        "reg-type": "disabled",
+        "reg-value": 0,
+        "reg-addr": 0
+      },
+      {
+        "reg-type": "disabled",
+        "reg-value": 0,
+        "reg-addr": 0
+      },
+      {
+        "reg-type": "disabled",
+        "reg-value": 0,
+        "reg-addr": 0
+      },
+      {
+        "reg-type": "disabled",
+        "reg-value": 0,
+        "reg-addr": 0
+      },
+      {
+        "reg-type": "disabled",
+        "reg-value": 0,
+        "reg-addr": 0
+      },
+      {
+        "reg-type": "disabled",
+        "reg-value": 0,
+        "reg-addr": 0
+      },
+      {
+        "reg-type": "disabled",
+        "reg-value": 0,
+        "reg-addr": 0
+      },
+      {
+        "reg-type": "disabled",
+        "reg-value": 0,
+        "reg-addr": 0
+      },
+      {
+        "reg-type": "disabled",
+        "reg-value": 0,
+        "reg-addr": 0
+      },
+      {
+        "reg-type": "disabled",
+        "reg-value": 0,
+        "reg-addr": 0
+      },
+      {
+        "reg-type": "disabled",
+        "reg-value": 0,
+        "reg-addr": 0
+      },
+      {
+        "reg-type": "disabled",
+        "reg-value": 0,
+        "reg-addr": 0
+      },
+      {
+        "reg-type": "disabled",
+        "reg-value": 0,
+        "reg-addr": 0
+      },
+      {
+        "reg-type": "disabled",
+        "reg-value": 0,
+        "reg-addr": 0
+      },
+      {
+        "reg-type": "disabled",
+        "reg-value": 0,
+        "reg-addr": 0
+      },
+      {
+        "reg-type": "disabled",
+        "reg-value": 0,
+        "reg-addr": 0
+      },
+      {
+        "reg-type": "disabled",
+        "reg-value": 0,
+        "reg-addr": 0
+      },
+      {
+        "reg-type": "disabled",
+        "reg-value": 0,
+        "reg-addr": 0
+      },
+      {
+        "reg-type": "disabled",
+        "reg-value": 0,
+        "reg-addr": 0
+      },
+      {
+        "reg-type": "disabled",
+        "reg-value": 0,
+        "reg-addr": 0
+      },
+      {
+        "reg-type": "disabled",
+        "reg-value": 0,
+        "reg-addr": 0
+      }
+    ],
+    "bus-id": "1",
+    "parity": "None"
+  },
+  "pwm-spindle": {
+    "pwm-min-duty": 1,
+    "pwm-inverted": false,
+    "pwm-max-duty": 99.99,
+    "pwm-freq": 1000,
+    "dynamic-power": true,
+    "rapid-auto-off": true
+  },
+  "admin": {
+    "auto-check-upgrade": true
+  },
+  "gcode": {
+    "program-start": "(Runs at program start)\nG90 (Absolute distance mode)\nG17 (Select XY plane)\n",
+    "tool-change": "(Runs on M6, tool change)\nM70\nG21\nS0\nM0 M6 (MSG, Change tool and attach probe)\nF100\n(probe to minimum z soft limit, which is -10)\nG38.2 Z-10\nG92 Z15.4\ng0 Z30\nM0 (MSG, Remove probe, start spindle)\nM72\n\n",
+    "program-end": "(Runs on M2, program end)\nM2"
+  }
+}
diff --git a/src/resources/onefinity_journeyman_x50_defaults.json b/src/resources/onefinity_journeyman_x50_defaults.json
index aa0512c..e573301 100644
--- a/src/resources/onefinity_journeyman_x50_defaults.json
+++ b/src/resources/onefinity_journeyman_x50_defaults.json
@@ -1,325 +1,14 @@
 {
-  "tool": {
-    "tool-reversed": false,
-    "tool-enable-mode": "disabled",
-    "tool-direction-mode": "disabled",
-    "tool-type": "PWM Spindle",
-    "min-spin": 0,
-    "max-spin": 255
-  },
-  "switches": {
-    "switch-lockout": 250,
-    "estop": "disabled",
-    "switch-debounce": 5,
-    "probe": "normally-open"
-  },
-  "probe": {
-    "probe-ydim": 53.975,
-    "probe-slow-seek": 25,
-    "probe-fast-seek": 75,
-    "probe-zdim": 15.4,
-    "probe-xdim": 53.975
-  },
-  "version": "1.0.4",
-  "outputs": {
-    "load-1": "disabled",
-    "fault": "disabled",
-    "load-2": "disabled"
-  },
-  "settings": {
-    "junction-accel": 200000,
-    "max-deviation": 0.05,
-    "units": "METRIC",
-    "probing-prompts": true
-  },
   "motors": [
     {
-      "latch-velocity": 0.1,
-      "max-accel": 750,
-      "max-velocity": 10,
-      "search-velocity": 1.688,
       "travel-per-rev": 16,
-      "idle-current": 1,
-      "drive-current": 2.8,
-      "latch-backoff": 5,
-      "enabled": true,
-      "homing-mode": "stall-min",
-      "reverse": false,
-      "stall-microstep": 8,
-      "min-soft-limit": 0,
-      "max-switch": "disabled",
-      "step-angle": 1.8,
-      "stall-current": 1,
-      "stall-sample-time": 200,
-      "microsteps": 16,
-      "stall-volts": 2,
-      "axis": "X",
-      "min-switch": "disabled",
-      "max-jerk": 1000,
-      "max-soft-limit": 1220,
-      "zero-backoff": 1.5
+      "max-soft-limit": 1220
     },
     {
-      "latch-velocity": 0.1,
-      "max-accel": 750,
-      "max-velocity": 10,
-      "search-velocity": 1.688,
-      "travel-per-rev": 10,
-      "idle-current": 1,
-      "drive-current": 2.8,
-      "latch-backoff": 5,
-      "enabled": true,
-      "homing-mode": "stall-min",
-      "reverse": false,
-      "stall-microstep": 8,
-      "min-soft-limit": 0,
-      "max-switch": "disabled",
-      "step-angle": 1.8,
-      "stall-current": 1,
-      "stall-sample-time": 200,
-      "microsteps": 16,
-      "stall-volts": 2,
-      "axis": "Y",
-      "min-switch": "disabled",
-      "max-jerk": 1000,
-      "max-soft-limit": 816,
-      "zero-backoff": 1.5
+      "max-soft-limit": 816
     },
     {
-      "latch-velocity": 0.1,
-      "max-accel": 750,
-      "max-velocity": 10,
-      "search-velocity": 1.688,
-      "travel-per-rev": 10,
-      "idle-current": 1,
-      "drive-current": 2.8,
-      "latch-backoff": 5,
-      "enabled": true,
-      "homing-mode": "stall-min",
-      "reverse": false,
-      "stall-microstep": 8,
-      "min-soft-limit": 0,
-      "max-switch": "disabled",
-      "step-angle": 1.8,
-      "stall-current": 1,
-      "stall-sample-time": 200,
-      "microsteps": 16,
-      "stall-volts": 2,
-      "axis": "Y",
-      "min-switch": "disabled",
-      "max-jerk": 1000,
-      "max-soft-limit": 816,
-      "zero-backoff": 1.5
-    },
-    {
-      "latch-velocity": 0.1,
-      "max-accel": 750,
-      "max-velocity": 3,
-      "search-velocity": 0.675,
-      "travel-per-rev": 4,
-      "idle-current": 1,
-      "drive-current": 2.8,
-      "latch-backoff": 5,
-      "enabled": true,
-      "homing-mode": "stall-max",
-      "reverse": true,
-      "stall-microstep": 8,
-      "min-soft-limit": -133,
-      "max-switch": "disabled",
-      "step-angle": 1.8,
-      "stall-current": 1,
-      "stall-sample-time": 200,
-      "microsteps": 16,
-      "stall-volts": 2,
-      "axis": "Z",
-      "min-switch": "disabled",
-      "max-jerk": 1000,
-      "max-soft-limit": 0,
-      "zero-backoff": 1
+      "max-soft-limit": 816
     }
-  ],
-  "modbus-spindle": {
-    "baud": "9600",
-    "multi-write": false,
-    "regs": [
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      }
-    ],
-    "bus-id": "1",
-    "parity": "None"
-  },
-  "pwm-spindle": {
-    "pwm-min-duty": 1,
-    "pwm-inverted": false,
-    "pwm-max-duty": 99.99,
-    "pwm-freq": 1000,
-    "dynamic-power": true,
-    "rapid-auto-off": true
-  },
-  "admin": {
-    "auto-check-upgrade": true
-  },
-  "gcode": {
-    "program-start": "(Runs at program start)\nG90 (Absolute distance mode)\nG17 (Select XY plane)\n",
-    "tool-change": "(Runs on M6, tool change)\nM70\nG21\nS0\nM0 M6 (MSG, Change tool and attach probe)\nF100\n(probe to minimum z soft limit, which is -10)\nG38.2 Z-10\nG92 Z15.4\ng0 Z30\nM0 (MSG, Remove probe, start spindle)\nM72\n\n",
-    "program-end": "(Runs on M2, program end)\nM2"
-  }
+  ]
 }
diff --git a/src/resources/onefinity_machinist_x35_defaults.json b/src/resources/onefinity_machinist_x35_defaults.json
index 7542227..87ffeeb 100644
--- a/src/resources/onefinity_machinist_x35_defaults.json
+++ b/src/resources/onefinity_machinist_x35_defaults.json
@@ -1,325 +1,13 @@
 {
-  "tool": {
-    "tool-reversed": false,
-    "tool-enable-mode": "disabled",
-    "tool-direction-mode": "disabled",
-    "tool-type": "PWM Spindle",
-    "min-spin": 0,
-    "max-spin": 255
-  },
-  "switches": {
-    "switch-lockout": 250,
-    "estop": "disabled",
-    "switch-debounce": 5,
-    "probe": "normally-open"
-  },
-  "probe": {
-    "probe-ydim": 53.975,
-    "probe-slow-seek": 25,
-    "probe-fast-seek": 75,
-    "probe-zdim": 15.4,
-    "probe-xdim": 53.975
-  },
-  "version": "1.0.4",
-  "outputs": {
-    "load-1": "disabled",
-    "fault": "disabled",
-    "load-2": "disabled"
-  },
-  "settings": {
-    "junction-accel": 200000,
-    "max-deviation": 0.05,
-    "units": "METRIC",
-    "probing-prompts": true
-  },
   "motors": [
     {
-      "latch-velocity": 0.1,
-      "max-accel": 750,
-      "max-velocity": 10,
-      "search-velocity": 1.688,
-      "travel-per-rev": 10,
-      "idle-current": 1,
-      "drive-current": 2.8,
-      "latch-backoff": 5,
-      "enabled": true,
-      "homing-mode": "stall-min",
-      "reverse": false,
-      "stall-microstep": 8,
-      "min-soft-limit": 0,
-      "max-switch": "disabled",
-      "step-angle": 1.8,
-      "stall-current": 1,
-      "stall-sample-time": 200,
-      "microsteps": 16,
-      "stall-volts": 2,
-      "axis": "X",
-      "min-switch": "disabled",
-      "max-jerk": 1000,
-      "max-soft-limit": 410,
-      "zero-backoff": 1.5
+      "max-soft-limit": 410
     },
     {
-      "latch-velocity": 0.1,
-      "max-accel": 750,
-      "max-velocity": 10,
-      "search-velocity": 1.688,
-      "travel-per-rev": 10,
-      "idle-current": 1,
-      "drive-current": 2.8,
-      "latch-backoff": 5,
-      "enabled": true,
-      "homing-mode": "stall-min",
-      "reverse": false,
-      "stall-microstep": 8,
-      "min-soft-limit": 0,
-      "max-switch": "disabled",
-      "step-angle": 1.8,
-      "stall-current": 1,
-      "stall-sample-time": 200,
-      "microsteps": 16,
-      "stall-volts": 2,
-      "axis": "Y",
-      "min-switch": "disabled",
-      "max-jerk": 1000,
-      "max-soft-limit": 410,
-      "zero-backoff": 1.5
+      "max-soft-limit": 410
     },
     {
-      "latch-velocity": 0.1,
-      "max-accel": 750,
-      "max-velocity": 10,
-      "search-velocity": 1.688,
-      "travel-per-rev": 10,
-      "idle-current": 1,
-      "drive-current": 2.8,
-      "latch-backoff": 5,
-      "enabled": true,
-      "homing-mode": "stall-min",
-      "reverse": false,
-      "stall-microstep": 8,
-      "min-soft-limit": 0,
-      "max-switch": "disabled",
-      "step-angle": 1.8,
-      "stall-current": 1,
-      "stall-sample-time": 200,
-      "microsteps": 16,
-      "stall-volts": 2,
-      "axis": "Y",
-      "min-switch": "disabled",
-      "max-jerk": 1000,
-      "max-soft-limit": 410,
-      "zero-backoff": 1.5
-    },
-    {
-      "latch-velocity": 0.1,
-      "max-accel": 750,
-      "max-velocity": 3,
-      "search-velocity": 0.675,
-      "travel-per-rev": 4,
-      "idle-current": 1,
-      "drive-current": 2.8,
-      "latch-backoff": 5,
-      "enabled": true,
-      "homing-mode": "stall-max",
-      "reverse": true,
-      "stall-microstep": 8,
-      "min-soft-limit": -133,
-      "max-switch": "disabled",
-      "step-angle": 1.8,
-      "stall-current": 1,
-      "stall-sample-time": 200,
-      "microsteps": 16,
-      "stall-volts": 2,
-      "axis": "Z",
-      "min-switch": "disabled",
-      "max-jerk": 1000,
-      "max-soft-limit": 0,
-      "zero-backoff": 1
+      "max-soft-limit": 410
     }
-  ],
-  "modbus-spindle": {
-    "baud": "9600",
-    "multi-write": false,
-    "regs": [
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      }
-    ],
-    "bus-id": "1",
-    "parity": "None"
-  },
-  "pwm-spindle": {
-    "pwm-min-duty": 1,
-    "pwm-inverted": false,
-    "pwm-max-duty": 99.99,
-    "pwm-freq": 1000,
-    "dynamic-power": true,
-    "rapid-auto-off": true
-  },
-  "admin": {
-    "auto-check-upgrade": true
-  },
-  "gcode": {
-    "program-start": "(Runs at program start)\nG90 (Absolute distance mode)\nG17 (Select XY plane)\n",
-    "tool-change": "(Runs on M6, tool change)\nM70\nG21\nS0\nM0 M6 (MSG, Change tool and attach probe)\nF100\n(probe to minimum z soft limit, which is -10)\nG38.2 Z-10\nG92 Z15.4\ng0 Z30\nM0 (MSG, Remove probe, start spindle)\nM72\n\n",
-    "program-end": "(Runs on M2, program end)\nM2"
-  }
+  ]
 }
diff --git a/src/resources/onefinity_woodworker_x35_defaults.json b/src/resources/onefinity_woodworker_x35_defaults.json
index bca8fc7..655e054 100644
--- a/src/resources/onefinity_woodworker_x35_defaults.json
+++ b/src/resources/onefinity_woodworker_x35_defaults.json
@@ -1,325 +1,13 @@
 {
-  "tool": {
-    "tool-reversed": false,
-    "tool-enable-mode": "disabled",
-    "tool-direction-mode": "disabled",
-    "tool-type": "PWM Spindle",
-    "min-spin": 0,
-    "max-spin": 255
-  },
-  "switches": {
-    "switch-lockout": 250,
-    "estop": "disabled",
-    "switch-debounce": 5,
-    "probe": "normally-open"
-  },
-  "probe": {
-    "probe-ydim": 53.975,
-    "probe-slow-seek": 25,
-    "probe-fast-seek": 75,
-    "probe-zdim": 15.4,
-    "probe-xdim": 53.975
-  },
-  "version": "1.0.4",
-  "outputs": {
-    "load-1": "disabled",
-    "fault": "disabled",
-    "load-2": "disabled"
-  },
-  "settings": {
-    "junction-accel": 200000,
-    "max-deviation": 0.05,
-    "units": "METRIC",
-    "probing-prompts": true
-  },
   "motors": [
     {
-      "latch-velocity": 0.1,
-      "max-accel": 750,
-      "max-velocity": 10,
-      "search-velocity": 1.688,
-      "travel-per-rev": 10,
-      "idle-current": 1,
-      "drive-current": 2.8,
-      "latch-backoff": 5,
-      "enabled": true,
-      "homing-mode": "stall-min",
-      "reverse": false,
-      "stall-microstep": 8,
-      "min-soft-limit": 0,
-      "max-switch": "disabled",
-      "step-angle": 1.8,
-      "stall-current": 1,
-      "stall-sample-time": 200,
-      "microsteps": 16,
-      "stall-volts": 2,
-      "axis": "X",
-      "min-switch": "disabled",
-      "max-jerk": 1000,
-      "max-soft-limit": 816,
-      "zero-backoff": 1.5
+      "max-soft-limit": 816
     },
     {
-      "latch-velocity": 0.1,
-      "max-accel": 750,
-      "max-velocity": 10,
-      "search-velocity": 1.688,
-      "travel-per-rev": 10,
-      "idle-current": 1,
-      "drive-current": 2.8,
-      "latch-backoff": 5,
-      "enabled": true,
-      "homing-mode": "stall-min",
-      "reverse": false,
-      "stall-microstep": 8,
-      "min-soft-limit": 0,
-      "max-switch": "disabled",
-      "step-angle": 1.8,
-      "stall-current": 1,
-      "stall-sample-time": 200,
-      "microsteps": 16,
-      "stall-volts": 2,
-      "axis": "Y",
-      "min-switch": "disabled",
-      "max-jerk": 1000,
-      "max-soft-limit": 816,
-      "zero-backoff": 1.5
+      "max-soft-limit": 816
     },
     {
-      "latch-velocity": 0.1,
-      "max-accel": 750,
-      "max-velocity": 10,
-      "search-velocity": 1.688,
-      "travel-per-rev": 10,
-      "idle-current": 1,
-      "drive-current": 2.8,
-      "latch-backoff": 5,
-      "enabled": true,
-      "homing-mode": "stall-min",
-      "reverse": false,
-      "stall-microstep": 8,
-      "min-soft-limit": 0,
-      "max-switch": "disabled",
-      "step-angle": 1.8,
-      "stall-current": 1,
-      "stall-sample-time": 200,
-      "microsteps": 16,
-      "stall-volts": 2,
-      "axis": "Y",
-      "min-switch": "disabled",
-      "max-jerk": 1000,
-      "max-soft-limit": 816,
-      "zero-backoff": 1.5
-    },
-    {
-      "latch-velocity": 0.1,
-      "max-accel": 750,
-      "max-velocity": 3,
-      "search-velocity": 0.675,
-      "travel-per-rev": 4,
-      "idle-current": 1,
-      "drive-current": 2.8,
-      "latch-backoff": 5,
-      "enabled": true,
-      "homing-mode": "stall-max",
-      "reverse": true,
-      "stall-microstep": 8,
-      "min-soft-limit": -133,
-      "max-switch": "disabled",
-      "step-angle": 1.8,
-      "stall-current": 1,
-      "stall-sample-time": 200,
-      "microsteps": 16,
-      "stall-volts": 2,
-      "axis": "Z",
-      "min-switch": "disabled",
-      "max-jerk": 1000,
-      "max-soft-limit": 0,
-      "zero-backoff": 1
+      "max-soft-limit": 816
     }
-  ],
-  "modbus-spindle": {
-    "baud": "9600",
-    "multi-write": false,
-    "regs": [
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      }
-    ],
-    "bus-id": "1",
-    "parity": "None"
-  },
-  "pwm-spindle": {
-    "pwm-min-duty": 1,
-    "pwm-inverted": false,
-    "pwm-max-duty": 99.99,
-    "pwm-freq": 1000,
-    "dynamic-power": true,
-    "rapid-auto-off": true
-  },
-  "admin": {
-    "auto-check-upgrade": true
-  },
-  "gcode": {
-    "program-start": "(Runs at program start)\nG90 (Absolute distance mode)\nG17 (Select XY plane)\n",
-    "tool-change": "(Runs on M6, tool change)\nM70\nG21\nS0\nM0 M6 (MSG, Change tool and attach probe)\nF100\n(probe to minimum z soft limit, which is -10)\nG38.2 Z-10\nG92 Z15.4\ng0 Z30\nM0 (MSG, Remove probe, start spindle)\nM72\n\n",
-    "program-end": "(Runs on M2, program end)\nM2"
-  }
+  ]
 }
diff --git a/src/resources/onefinity_woodworker_x50_defaults.json b/src/resources/onefinity_woodworker_x50_defaults.json
index 6ddeb1a..48a29f4 100644
--- a/src/resources/onefinity_woodworker_x50_defaults.json
+++ b/src/resources/onefinity_woodworker_x50_defaults.json
@@ -1,325 +1,15 @@
 {
-  "tool": {
-    "tool-reversed": false,
-    "tool-enable-mode": "disabled",
-    "tool-direction-mode": "disabled",
-    "tool-type": "PWM Spindle",
-    "min-spin": 0,
-    "max-spin": 255
-  },
-  "switches": {
-    "switch-lockout": 250,
-    "estop": "disabled",
-    "switch-debounce": 5,
-    "probe": "normally-open"
-  },
-  "probe": {
-    "probe-ydim": 53.975,
-    "probe-slow-seek": 25,
-    "probe-fast-seek": 75,
-    "probe-zdim": 15.4,
-    "probe-xdim": 53.975
-  },
-  "version": "1.0.4",
-  "outputs": {
-    "load-1": "disabled",
-    "fault": "disabled",
-    "load-2": "disabled"
-  },
-  "settings": {
-    "junction-accel": 200000,
-    "max-deviation": 0.05,
-    "units": "METRIC",
-    "probing-prompts": true
-  },
+
   "motors": [
     {
-      "latch-velocity": 0.1,
-      "max-accel": 750,
-      "max-velocity": 10,
-      "search-velocity": 1.688,
       "travel-per-rev": 16,
-      "idle-current": 1,
-      "drive-current": 2.8,
-      "latch-backoff": 5,
-      "enabled": true,
-      "homing-mode": "stall-min",
-      "reverse": false,
-      "stall-microstep": 8,
-      "min-soft-limit": 0,
-      "max-switch": "disabled",
-      "step-angle": 1.8,
-      "stall-current": 1,
-      "stall-sample-time": 200,
-      "microsteps": 16,
-      "stall-volts": 2,
-      "axis": "X",
-      "min-switch": "disabled",
-      "max-jerk": 1000,
-      "max-soft-limit": 816,
-      "zero-backoff": 1.5
+      "max-soft-limit": 816
     },
     {
-      "latch-velocity": 0.1,
-      "max-accel": 750,
-      "max-velocity": 10,
-      "search-velocity": 1.688,
-      "travel-per-rev": 10,
-      "idle-current": 1,
-      "drive-current": 2.8,
-      "latch-backoff": 5,
-      "enabled": true,
-      "homing-mode": "stall-min",
-      "reverse": false,
-      "stall-microstep": 8,
-      "min-soft-limit": 0,
-      "max-switch": "disabled",
-      "step-angle": 1.8,
-      "stall-current": 1,
-      "stall-sample-time": 200,
-      "microsteps": 16,
-      "stall-volts": 2,
-      "axis": "Y",
-      "min-switch": "disabled",
-      "max-jerk": 1000,
-      "max-soft-limit": 816,
-      "zero-backoff": 1.5
+      "max-soft-limit": 816
     },
     {
-      "latch-velocity": 0.1,
-      "max-accel": 750,
-      "max-velocity": 10,
-      "search-velocity": 1.688,
-      "travel-per-rev": 10,
-      "idle-current": 1,
-      "drive-current": 2.8,
-      "latch-backoff": 5,
-      "enabled": true,
-      "homing-mode": "stall-min",
-      "reverse": false,
-      "stall-microstep": 8,
-      "min-soft-limit": 0,
-      "max-switch": "disabled",
-      "step-angle": 1.8,
-      "stall-current": 1,
-      "stall-sample-time": 200,
-      "microsteps": 16,
-      "stall-volts": 2,
-      "axis": "Y",
-      "min-switch": "disabled",
-      "max-jerk": 1000,
-      "max-soft-limit": 816,
-      "zero-backoff": 1.5
-    },
-    {
-      "latch-velocity": 0.1,
-      "max-accel": 750,
-      "max-velocity": 3,
-      "search-velocity": 0.675,
-      "travel-per-rev": 4,
-      "idle-current": 1,
-      "drive-current": 2.8,
-      "latch-backoff": 5,
-      "enabled": true,
-      "homing-mode": "stall-max",
-      "reverse": true,
-      "stall-microstep": 8,
-      "min-soft-limit": -133,
-      "max-switch": "disabled",
-      "step-angle": 1.8,
-      "stall-current": 1,
-      "stall-sample-time": 200,
-      "microsteps": 16,
-      "stall-volts": 2,
-      "axis": "Z",
-      "min-switch": "disabled",
-      "max-jerk": 1000,
-      "max-soft-limit": 0,
-      "zero-backoff": 1
+      "max-soft-limit": 816
     }
-  ],
-  "modbus-spindle": {
-    "baud": "9600",
-    "multi-write": false,
-    "regs": [
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      },
-      {
-        "reg-type": "disabled",
-        "reg-value": 0,
-        "reg-addr": 0
-      }
-    ],
-    "bus-id": "1",
-    "parity": "None"
-  },
-  "pwm-spindle": {
-    "pwm-min-duty": 1,
-    "pwm-inverted": false,
-    "pwm-max-duty": 99.99,
-    "pwm-freq": 1000,
-    "dynamic-power": true,
-    "rapid-auto-off": true
-  },
-  "admin": {
-    "auto-check-upgrade": true
-  },
-  "gcode": {
-    "program-start": "(Runs at program start)\nG90 (Absolute distance mode)\nG17 (Select XY plane)\n",
-    "tool-change": "(Runs on M6, tool change)\nM70\nG21\nS0\nM0 M6 (MSG, Change tool and attach probe)\nF100\n(probe to minimum z soft limit, which is -10)\nG38.2 Z-10\nG92 Z15.4\ng0 Z30\nM0 (MSG, Remove probe, start spindle)\nM72\n\n",
-    "program-end": "(Runs on M2, program end)\nM2"
-  }
+  ]
 }