diff --git a/build-interactive-converter.py b/build-interactive-converter.py
new file mode 100644
index 00000000..a85935f8
--- /dev/null
+++ b/build-interactive-converter.py
@@ -0,0 +1,36 @@
+#!/usr/bin/env python
+
+# Compile Grbl_ESP32 for each of the machines defined in Machines/ .
+# Add-on files are built on top of a single base.
+# This is useful for automated testing, to make sure you haven't broken something
+
+# The output is filtered so that the only lines you see are a single
+# success or failure line for each build, plus any preceding lines that
+# contain the word "error".  If you need to see everything, for example to
+# see the details of an errored build, include -v on the command line.
+
+from __future__ import print_function
+from buildConverter import buildConvertMachine
+import os, sys
+
+extraArgs=None
+
+verbose = '-v' in sys.argv or '-q' not in sys.argv
+if '-v' in sys.argv:
+    sys.argv.remove('-v')
+if '-q' in sys.argv:
+    sys.argv.remove('-q')
+if '-u' in sys.argv:
+    sys.argv.remove('-u')
+    extraArgs = '--target=upload'
+
+exitCode = 255
+if len(sys.argv) == 2:
+    exitCode = buildConvertMachine(sys.argv[1], verbose=verbose, extraArgs=extraArgs)
+else:
+    print("Usage: ./convert-machine.py [-q] [-u] machine_name.h")
+    print(' Build for the given machine regardless of machine.h')
+    print('  -q suppresses most messages')
+    print('  -u uploads to the target after compilation')
+
+sys.exit(exitCode)
diff --git a/converter.py b/converter.py
index 6692a8d6..78ad5fab 100644
--- a/converter.py
+++ b/converter.py
@@ -10,8 +10,11 @@ from pathlib import Path
 
 env = dict(os.environ)
 
+# pioEnv='windows'
+pioEnv='native'
+
 def convertMachine(baseName, verbose=True, extraArgs=None):
-    cmd = ['platformio','run','-enative']
+    cmd = ['platformio','run','-e', pioEnv]
     if extraArgs:
         cmd.append(extraArgs)
     displayName = baseName
@@ -28,7 +31,7 @@ def convertMachine(baseName, verbose=True, extraArgs=None):
                 print(line, end='')
     app.wait()
     if app.returncode == 0:
-        cmd = [ '.pio/build/native/program.exe' ]
+        cmd = [ '.pio/build/' + pioEnv + '/program.exe' ]
         out_filename = "yaml/" + Path(baseName).stem + ".yaml"
         app = subprocess.Popen(cmd, env=env, stdout=open(out_filename, "w"), stderr=subprocess.STDOUT, bufsize=1)
         app.wait()
diff --git a/libraries/NativeStubs/native.h b/libraries/NativeStubs/native.h
index b9db8406..0ab45909 100644
--- a/libraries/NativeStubs/native.h
+++ b/libraries/NativeStubs/native.h
@@ -27,3 +27,60 @@ inline long map(long x, long in_min, long in_max, long out_min, long out_max) {
 }
 
 #define M_PI 3.1415926536
+
+#define GPIO_NUM_0 0
+#define GPIO_NUM_1 1
+#define GPIO_NUM_2 2
+#define GPIO_NUM_3 3
+#define GPIO_NUM_4 4
+#define GPIO_NUM_5 5
+#define GPIO_NUM_6 6
+#define GPIO_NUM_7 7
+#define GPIO_NUM_8 8
+#define GPIO_NUM_9 9
+#define GPIO_NUM_10 10
+#define GPIO_NUM_11 11
+#define GPIO_NUM_12 12
+#define GPIO_NUM_13 13
+#define GPIO_NUM_14 14
+#define GPIO_NUM_15 15
+#define GPIO_NUM_16 16
+#define GPIO_NUM_17 17
+#define GPIO_NUM_18 18
+#define GPIO_NUM_19 19
+#define GPIO_NUM_20 20
+#define GPIO_NUM_21 21
+#define GPIO_NUM_22 22
+#define GPIO_NUM_23 23
+#define GPIO_NUM_24 24
+#define GPIO_NUM_25 25
+#define GPIO_NUM_26 26
+#define GPIO_NUM_27 27
+#define GPIO_NUM_28 28
+#define GPIO_NUM_29 29
+#define GPIO_NUM_30 30
+#define GPIO_NUM_31 31
+#define GPIO_NUM_32 32
+#define GPIO_NUM_33 33
+#define GPIO_NUM_34 34
+#define GPIO_NUM_35 35
+#define GPIO_NUM_36 36
+#define GPIO_NUM_37 37
+#define GPIO_NUM_38 38
+#define GPIO_NUM_39 39
+
+#if 0
+#    define INPUT 0x0
+#    define OUTPUT 0x1
+#    define INPUT_PULLUP 0x2
+
+#    define CHANGE 0x03
+
+// Define pins used by I2C and SPI.
+static const uint8_t SS   = 1;
+static const uint8_t MOSI = 2;
+static const uint8_t MISO = 3;
+static const uint8_t SCK  = 4;
+static const uint8_t SDA  = 5;
+static const uint8_t SCL  = 6;
+#endif
diff --git a/platformio.ini b/platformio.ini
index 2460ff9b..00809e57 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -71,11 +71,33 @@ src_filter =
 	+<*.h> +<*.s> +<*.S> +<*.cpp> +<*.c> +<*.ino> +<src/>
 	-<.git/> -<data/> -<test/> -<tests/>
 
-[env:native]
+[env:windows]
 platform = windows_x86
 build_flags =
    ${common.build_flags}
    --std=c++17
+   -DARDUINO=100
+   -DNATIVE
+   -DCONFIG_BT_ENABLED
+   -DCONFIG_BLUEDROID_ENABLED
+lib_ldf_mode = deep
+lib_deps =
+  EpoxyDuino=https://github.com/bxparks/EpoxyDuino.git#v0.7.0
+  EpoxyEepromEsp
+  TMCStepper
+lib_ignore = WebSockets, ESP32SSPD
+lib_compat_mode = off
+src_filter = 
+	+<*.h> +<*.s> +<*.S> +<*.cpp> +<*.c> +<*.ino> +<src/>
+	-<.git/> -<data/> -<test/> -<tests/>
+        -<arduinoWebSockets/>
+
+[env:native]
+platform = native
+build_flags =
+   ${common.build_flags}
+   --std=c++17
+   -DARDUINO=100
    -DNATIVE
    -DCONFIG_BT_ENABLED
    -DCONFIG_BLUEDROID_ENABLED
@@ -83,6 +105,7 @@ lib_ldf_mode = deep
 lib_deps =
   EpoxyDuino=https://github.com/bxparks/EpoxyDuino.git
   EpoxyEepromEsp
+  TMCStepper
 lib_ignore = WebSockets, ESP32SSPD
 lib_compat_mode = off
 src_filter = 
diff --git a/yaml/3axis_v4.yaml b/yaml/3axis_v4.yaml
deleted file mode 100644
index 102cd080..00000000
--- a/yaml/3axis_v4.yaml
+++ /dev/null
@@ -1,107 +0,0 @@
-name: ESP32_V4
-board: unknown
-
-stepping:
-  engine: RMT
-  idle_ms: 250
-  dir_delay_us: 0
-  pulse_us: 3
-  disable_delay_us: 0
-
-axes:
-  shared_stepper_disable_pin: gpio.13
-  x:
-    steps_per_mm: 100.000
-    max_rate_mm_per_min: 1000.000
-    acceleration_mm_per_sec2: 200.000
-    max_travel_mm: 300.000
-    soft_limits: false
-    motor0:
-      limit_all_pin: gpio.17:low
-      hard_limits: false
-      stepstick:
-        direction_pin: gpio.14
-        step_pin: gpio.12
-    motor1:
-      null_motor:
-  y:
-    steps_per_mm: 100.000
-    max_rate_mm_per_min: 1000.000
-    acceleration_mm_per_sec2: 200.000
-    max_travel_mm: 300.000
-    soft_limits: false
-    motor0:
-      limit_all_pin: gpio.4:low
-      hard_limits: false
-      stepstick:
-        direction_pin: gpio.15
-        step_pin: gpio.26
-    motor1:
-      null_motor:
-  z:
-    steps_per_mm: 100.000
-    max_rate_mm_per_min: 1000.000
-    acceleration_mm_per_sec2: 200.000
-    max_travel_mm: 300.000
-    soft_limits: false
-    motor0:
-      limit_all_pin: gpio.16:low
-      hard_limits: false
-      stepstick:
-        direction_pin: gpio.33
-        step_pin: gpio.27
-    motor1:
-      null_motor:
-
-spi:
-  miso_pin: gpio.19
-  mosi_pin: gpio.23
-  sck_pin: gpio.18
-
-sdcard:
-  cs_pin: gpio.5
-
-control:
-
-coolant:
-  flood_pin: gpio.25
-  mist_pin: gpio.21
-  delay_ms: 1000.000
-
-probe:
-  pin: gpio.32:pu
-  check_mode_start: false
-
-macros:
-  startup_line0: 
-  startup_line1: 
-  macro0: 
-  macro1: 
-  macro2: 
-  macro3: 
-
-start:
-  must_home: true
-  check_limits: true
-  deactivate_parking_upon_init: false
-
-user_outputs:
-
-PWM:
-  spinup_ms: 0
-  spindown_ms: 0
-  tool_num: 0
-  speeds: 0=0.0% 1000=100.0%
-  output_pin: gpio.2
-  enable_pin: gpio.22
-  disable_with_s0: false
-  s0_with_disable: false
-  pwm_hz: 5000
-
-software_debounce_ms: 0
-arc_tolerance_mm: 0.002
-junction_deviation_mm: 0.010
-verbose_errors: false
-report_inches: false
-enable_parking_override_control: false
-use_line_numbers: false
diff --git a/yaml/4axis_external_driver.yaml b/yaml/4axis_external_driver.yaml
deleted file mode 100644
index adddfac2..00000000
--- a/yaml/4axis_external_driver.yaml
+++ /dev/null
@@ -1,121 +0,0 @@
-name: External 4 Axis Driver Board V2
-board: unknown
-
-stepping:
-  engine: RMT
-  idle_ms: 250
-  dir_delay_us: 0
-  pulse_us: 3
-  disable_delay_us: 0
-
-axes:
-  shared_stepper_disable_pin: gpio.13
-  x:
-    steps_per_mm: 100.000
-    max_rate_mm_per_min: 1000.000
-    acceleration_mm_per_sec2: 200.000
-    max_travel_mm: 300.000
-    soft_limits: false
-    motor0:
-      limit_all_pin: gpio.34:low
-      hard_limits: false
-      stepstick:
-        direction_pin: gpio.2
-        step_pin: gpio.0
-    motor1:
-      null_motor:
-  y:
-    steps_per_mm: 100.000
-    max_rate_mm_per_min: 1000.000
-    acceleration_mm_per_sec2: 200.000
-    max_travel_mm: 300.000
-    soft_limits: false
-    motor0:
-      limit_all_pin: gpio.35:low
-      hard_limits: false
-      stepstick:
-        direction_pin: gpio.15
-        step_pin: gpio.26
-    motor1:
-      null_motor:
-  z:
-    steps_per_mm: 100.000
-    max_rate_mm_per_min: 1000.000
-    acceleration_mm_per_sec2: 200.000
-    max_travel_mm: 300.000
-    soft_limits: false
-    motor0:
-      limit_all_pin: gpio.36:low
-      hard_limits: false
-      stepstick:
-        direction_pin: gpio.33
-        step_pin: gpio.27
-    motor1:
-      null_motor:
-  a:
-    steps_per_mm: 100.000
-    max_rate_mm_per_min: 1000.000
-    acceleration_mm_per_sec2: 200.000
-    max_travel_mm: 300.000
-    soft_limits: false
-    motor0:
-      limit_all_pin: gpio.39:low
-      hard_limits: false
-      stepstick:
-        direction_pin: gpio.14
-        step_pin: gpio.12
-    motor1:
-      null_motor:
-
-spi:
-  miso_pin: gpio.19
-  mosi_pin: gpio.23
-  sck_pin: gpio.18
-
-sdcard:
-  cs_pin: gpio.5
-
-control:
-
-coolant:
-  mist_pin: gpio.21
-  delay_ms: 1000.000
-
-probe:
-  pin: gpio.32:pu
-  check_mode_start: false
-
-macros:
-  startup_line0: 
-  startup_line1: 
-  macro0: 
-  macro1: 
-  macro2: 
-  macro3: 
-
-start:
-  must_home: true
-  check_limits: true
-  deactivate_parking_upon_init: false
-
-user_outputs:
-
-huanyang:
-  spinup_ms: 0
-  spindown_ms: 0
-  tool_num: 0
-  speeds: 0=0.0% 1000=100.0%
-  uart:
-    txd_pin: gpio.17
-    rxd_pin: gpio.4
-    rts_pin: gpio.16
-    baud: 9600
-    mode: 8n1
-
-software_debounce_ms: 0
-arc_tolerance_mm: 0.002
-junction_deviation_mm: 0.010
-verbose_errors: false
-report_inches: false
-enable_parking_override_control: false
-use_line_numbers: false
diff --git a/yaml/6_pack_Lowrider_stepstick_v1.yaml b/yaml/6_pack_Lowrider_stepstick_v1.yaml
deleted file mode 100644
index d92134d7..00000000
--- a/yaml/6_pack_Lowrider_stepstick_v1.yaml
+++ /dev/null
@@ -1,115 +0,0 @@
-name: 6 Pack Lowrider XYYZZ V1 (StepStick)
-board: 6-pack
-
-stepping:
-  engine: I2S_stream
-  idle_ms: 250
-  dir_delay_us: 0
-  pulse_us: 4
-  disable_delay_us: 0
-
-axes:
-  x:
-    steps_per_mm: 100.000
-    max_rate_mm_per_min: 1000.000
-    acceleration_mm_per_sec2: 200.000
-    max_travel_mm: 300.000
-    soft_limits: false
-    motor0:
-      limit_all_pin: gpio.33:low
-      hard_limits: false
-      stepstick:
-        direction_pin: i2so.1
-        step_pin: i2so.2
-        disable_pin: i2so.0
-        ms3_pin: i2so.3
-    motor1:
-      null_motor:
-  y:
-    steps_per_mm: 100.000
-    max_rate_mm_per_min: 1000.000
-    acceleration_mm_per_sec2: 200.000
-    max_travel_mm: 300.000
-    soft_limits: false
-    motor0:
-      limit_all_pin: gpio.32:low
-      hard_limits: false
-      stepstick:
-        direction_pin: i2so.4
-        step_pin: i2so.5
-        disable_pin: i2so.7
-        ms3_pin: i2so.6
-    motor1:
-      limit_all_pin: gpio.35:low
-      hard_limits: false
-      stepstick:
-        direction_pin: i2so.9
-        step_pin: i2so.10
-        disable_pin: i2so.8
-        ms3_pin: i2so.11
-  z:
-    steps_per_mm: 100.000
-    max_rate_mm_per_min: 1000.000
-    acceleration_mm_per_sec2: 200.000
-    max_travel_mm: 300.000
-    soft_limits: false
-    motor0:
-      limit_all_pin: gpio.34:low
-      hard_limits: false
-      stepstick:
-        direction_pin: i2so.12
-        step_pin: i2so.13
-        disable_pin: i2so.15
-        ms3_pin: i2so.14
-    motor1:
-      limit_all_pin: gpio.2:low
-      hard_limits: false
-      stepstick:
-        direction_pin: i2so.17
-        step_pin: i2so.18
-        disable_pin: i2so.16
-        ms3_pin: i2so.19
-
-i2so:
-  bck_pin: gpio.22
-  data_pin: gpio.21
-  ws_pin: gpio.17
-
-spi:
-  miso_pin: gpio.19
-  mosi_pin: gpio.23
-  sck_pin: gpio.18
-
-sdcard:
-  cs_pin: gpio.5
-
-control:
-
-coolant:
-  delay_ms: 1000.000
-
-probe:
-  check_mode_start: false
-
-macros:
-  startup_line0: 
-  startup_line1: 
-  macro0: 
-  macro1: 
-  macro2: 
-  macro3: 
-
-start:
-  must_home: true
-  check_limits: true
-  deactivate_parking_upon_init: false
-
-user_outputs:
-
-software_debounce_ms: 0
-arc_tolerance_mm: 0.002
-junction_deviation_mm: 0.010
-verbose_errors: false
-report_inches: false
-enable_parking_override_control: false
-use_line_numbers: false
diff --git a/yaml/6_pack_MPCNC_stepstick_v1.yaml b/yaml/6_pack_MPCNC_stepstick_v1.yaml
deleted file mode 100644
index d3d49231..00000000
--- a/yaml/6_pack_MPCNC_stepstick_v1.yaml
+++ /dev/null
@@ -1,115 +0,0 @@
-name: 6 Pack MPCNC XYZXY V1 (StepStick)
-board: 6-pack
-
-stepping:
-  engine: I2S_stream
-  idle_ms: 250
-  dir_delay_us: 0
-  pulse_us: 4
-  disable_delay_us: 0
-
-axes:
-  x:
-    steps_per_mm: 100.000
-    max_rate_mm_per_min: 1000.000
-    acceleration_mm_per_sec2: 200.000
-    max_travel_mm: 300.000
-    soft_limits: false
-    motor0:
-      limit_all_pin: gpio.33:low
-      hard_limits: false
-      stepstick:
-        direction_pin: i2so.1
-        step_pin: i2so.2
-        disable_pin: i2so.0
-        ms3_pin: i2so.3
-    motor1:
-      limit_all_pin: gpio.34:low
-      hard_limits: false
-      stepstick:
-        direction_pin: i2so.12
-        step_pin: i2so.13
-        disable_pin: i2so.15
-        ms3_pin: i2so.14
-  y:
-    steps_per_mm: 100.000
-    max_rate_mm_per_min: 1000.000
-    acceleration_mm_per_sec2: 200.000
-    max_travel_mm: 300.000
-    soft_limits: false
-    motor0:
-      limit_all_pin: gpio.32:low
-      hard_limits: false
-      stepstick:
-        direction_pin: i2so.4
-        step_pin: i2so.5
-        disable_pin: i2so.7
-        ms3_pin: i2so.6
-    motor1:
-      limit_all_pin: gpio.2:low
-      hard_limits: false
-      stepstick:
-        direction_pin: i2so.17
-        step_pin: i2so.18
-        disable_pin: i2so.16
-        ms3_pin: i2so.19
-  z:
-    steps_per_mm: 100.000
-    max_rate_mm_per_min: 1000.000
-    acceleration_mm_per_sec2: 200.000
-    max_travel_mm: 300.000
-    soft_limits: false
-    motor0:
-      limit_all_pin: gpio.35:low
-      hard_limits: false
-      stepstick:
-        direction_pin: i2so.9
-        step_pin: i2so.10
-        disable_pin: i2so.8
-        ms3_pin: i2so.11
-    motor1:
-      null_motor:
-
-i2so:
-  bck_pin: gpio.22
-  data_pin: gpio.21
-  ws_pin: gpio.17
-
-spi:
-  miso_pin: gpio.19
-  mosi_pin: gpio.23
-  sck_pin: gpio.18
-
-sdcard:
-  cs_pin: gpio.5
-
-control:
-
-coolant:
-  delay_ms: 1000.000
-
-probe:
-  check_mode_start: false
-
-macros:
-  startup_line0: 
-  startup_line1: 
-  macro0: 
-  macro1: 
-  macro2: 
-  macro3: 
-
-start:
-  must_home: true
-  check_limits: true
-  deactivate_parking_upon_init: false
-
-user_outputs:
-
-software_debounce_ms: 0
-arc_tolerance_mm: 0.002
-junction_deviation_mm: 0.010
-verbose_errors: false
-report_inches: false
-enable_parking_override_control: false
-use_line_numbers: false
diff --git a/yaml/6_pack_TMC2130_XYZ_Test.yaml b/yaml/6_pack_TMC2130_XYZ_Test.yaml
deleted file mode 100644
index 742ceb56..00000000
--- a/yaml/6_pack_TMC2130_XYZ_Test.yaml
+++ /dev/null
@@ -1,134 +0,0 @@
-name: 6 Pack TMC2130 XYZ PWM
-board: 6-pack
-
-stepping:
-  engine: I2S_stream
-  idle_ms: 250
-  dir_delay_us: 0
-  pulse_us: 4
-  disable_delay_us: 0
-
-axes:
-  x:
-    steps_per_mm: 100.000
-    max_rate_mm_per_min: 1000.000
-    acceleration_mm_per_sec2: 200.000
-    max_travel_mm: 300.000
-    soft_limits: false
-    motor0:
-      limit_all_pin: gpio.33:low
-      hard_limits: false
-      tmc_2130:
-        direction_pin: i2so.1
-        step_pin: i2so.2
-        disable_pin: i2so.0
-        run_amps: 0.250
-        hold_amps: 0.125
-        microsteps: 16
-        stallguard: 16
-        stallguard_debug: false
-        run_mode: Stallguard
-        homing_mode: Stallguard
-        use_enable: false
-        r_sense_ohms: 0.110
-        cs_pin: i2so.3:low
-        spi_index: 0
-    motor1:
-      null_motor:
-  y:
-    steps_per_mm: 100.000
-    max_rate_mm_per_min: 1000.000
-    acceleration_mm_per_sec2: 200.000
-    max_travel_mm: 300.000
-    soft_limits: false
-    motor0:
-      limit_all_pin: gpio.32:low
-      hard_limits: false
-      tmc_2130:
-        direction_pin: i2so.4
-        step_pin: i2so.5
-        disable_pin: i2so.7
-        run_amps: 0.250
-        hold_amps: 0.125
-        microsteps: 16
-        stallguard: 16
-        stallguard_debug: false
-        run_mode: Stallguard
-        homing_mode: Stallguard
-        use_enable: false
-        r_sense_ohms: 0.110
-        cs_pin: i2so.6:low
-        spi_index: 1
-    motor1:
-      null_motor:
-  z:
-    steps_per_mm: 100.000
-    max_rate_mm_per_min: 1000.000
-    acceleration_mm_per_sec2: 200.000
-    max_travel_mm: 300.000
-    soft_limits: false
-    motor0:
-      limit_all_pin: gpio.35:low
-      hard_limits: false
-      tmc_2130:
-        direction_pin: i2so.9
-        step_pin: i2so.10
-        disable_pin: i2so.8
-        run_amps: 0.250
-        hold_amps: 0.125
-        microsteps: 16
-        stallguard: 16
-        stallguard_debug: false
-        run_mode: Stallguard
-        homing_mode: Stallguard
-        use_enable: false
-        r_sense_ohms: 0.110
-        cs_pin: i2so.11:low
-        spi_index: 2
-    motor1:
-      null_motor:
-
-i2so:
-  bck_pin: gpio.22
-  data_pin: gpio.21
-  ws_pin: gpio.17
-
-spi:
-  miso_pin: gpio.19
-  mosi_pin: gpio.23
-  sck_pin: gpio.18
-
-sdcard:
-  cs_pin: gpio.5
-
-control:
-  safety_door_pin: gpio.34:low:pu
-
-coolant:
-  delay_ms: 1000.000
-
-probe:
-  check_mode_start: false
-
-macros:
-  startup_line0: 
-  startup_line1: 
-  macro0: 
-  macro1: 
-  macro2: 
-  macro3: 
-
-start:
-  must_home: true
-  check_limits: true
-  deactivate_parking_upon_init: false
-
-user_outputs:
-
-software_debounce_ms: 0
-arc_tolerance_mm: 0.002
-junction_deviation_mm: 0.010
-verbose_errors: false
-report_inches: false
-enable_parking_override_control: false
-use_line_numbers: false
diff --git a/yaml/6_pack_external_XYZ.yaml b/yaml/6_pack_external_XYZ.yaml
deleted file mode 100644
index 32559d4d..00000000
--- a/yaml/6_pack_external_XYZ.yaml
+++ /dev/null
@@ -1,100 +0,0 @@
-name: 6 Pack External XYZ
-board: 6-pack
-
-stepping:
-  engine: I2S_stream
-  idle_ms: 250
-  dir_delay_us: 6
-  pulse_us: 4
-  disable_delay_us: 5
-
-axes:
-  x:
-    steps_per_mm: 100.000
-    max_rate_mm_per_min: 1000.000
-    acceleration_mm_per_sec2: 200.000
-    max_travel_mm: 300.000
-    soft_limits: false
-    motor0:
-      limit_all_pin: gpio.33:low
-      hard_limits: false
-      stepstick:
-        direction_pin: i2so.1:low
-        step_pin: i2so.2:low
-        disable_pin: i2so.0
-    motor1:
-      null_motor:
-  y:
-    steps_per_mm: 100.000
-    max_rate_mm_per_min: 1000.000
-    acceleration_mm_per_sec2: 200.000
-    max_travel_mm: 300.000
-    soft_limits: false
-    motor0:
-      limit_all_pin: gpio.32:low
-      hard_limits: false
-      stepstick:
-        direction_pin: i2so.4:low
-        step_pin: i2so.5:low
-        disable_pin: i2so.7
-    motor1:
-      null_motor:
-  z:
-    steps_per_mm: 100.000
-    max_rate_mm_per_min: 1000.000
-    acceleration_mm_per_sec2: 200.000
-    max_travel_mm: 300.000
-    soft_limits: false
-    motor0:
-      limit_all_pin: gpio.35:low
-      hard_limits: false
-      stepstick:
-        direction_pin: i2so.9:low
-        step_pin: i2so.10:low
-        disable_pin: i2so.8
-    motor1:
-      null_motor:
-
-i2so:
-  bck_pin: gpio.22
-  data_pin: gpio.21
-  ws_pin: gpio.17
-
-spi:
-  miso_pin: gpio.19
-  mosi_pin: gpio.23
-  sck_pin: gpio.18
-
-sdcard:
-  cs_pin: gpio.5
-
-control:
-
-coolant:
-  delay_ms: 1000.000
-
-probe:
-  check_mode_start: false
-
-macros:
-  startup_line0: 
-  startup_line1: 
-  macro0: 
-  macro1: 
-  macro2: 
-  macro3: 
-
-start:
-  must_home: true
-  check_limits: true
-  deactivate_parking_upon_init: false
-
-user_outputs:
-
-software_debounce_ms: 0
-arc_tolerance_mm: 0.002
-junction_deviation_mm: 0.010
-verbose_errors: false
-report_inches: false
-enable_parking_override_control: false
-use_line_numbers: false
diff --git a/yaml/6_pack_stepstick_v1.yaml b/yaml/6_pack_stepstick_v1.yaml
deleted file mode 100644
index 5e2ce048..00000000
--- a/yaml/6_pack_stepstick_v1.yaml
+++ /dev/null
@@ -1,159 +0,0 @@
-name: 6 Pack Controller V1 (StepStick)
-board: 6-pack
-
-stepping:
-  engine: I2S_stream
-  idle_ms: 250
-  dir_delay_us: 0
-  pulse_us: 4
-  disable_delay_us: 0
-
-axes:
-  x:
-    steps_per_mm: 100.000
-    max_rate_mm_per_min: 1000.000
-    acceleration_mm_per_sec2: 200.000
-    max_travel_mm: 300.000
-    soft_limits: false
-    motor0:
-      limit_all_pin: gpio.33:low
-      hard_limits: false
-      stepstick:
-        direction_pin: i2so.1
-        step_pin: i2so.2
-        disable_pin: i2so.0
-        ms3_pin: i2so.3
-    motor1:
-      null_motor:
-  y:
-    steps_per_mm: 100.000
-    max_rate_mm_per_min: 1000.000
-    acceleration_mm_per_sec2: 200.000
-    max_travel_mm: 300.000
-    soft_limits: false
-    motor0:
-      limit_all_pin: gpio.32:low
-      hard_limits: false
-      stepstick:
-        direction_pin: i2so.4
-        step_pin: i2so.5
-        disable_pin: i2so.7
-        ms3_pin: i2so.6
-    motor1:
-      null_motor:
-  z:
-    steps_per_mm: 100.000
-    max_rate_mm_per_min: 1000.000
-    acceleration_mm_per_sec2: 200.000
-    max_travel_mm: 300.000
-    soft_limits: false
-    motor0:
-      limit_all_pin: gpio.35:low
-      hard_limits: false
-      stepstick:
-        direction_pin: i2so.9
-        step_pin: i2so.10
-        disable_pin: i2so.8
-        ms3_pin: i2so.11
-    motor1:
-      null_motor:
-  a:
-    steps_per_mm: 100.000
-    max_rate_mm_per_min: 1000.000
-    acceleration_mm_per_sec2: 200.000
-    max_travel_mm: 300.000
-    soft_limits: false
-    motor0:
-      stepstick:
-        direction_pin: i2so.12
-        step_pin: i2so.13
-        disable_pin: i2so.15
-        ms3_pin: i2so.14
-    motor1:
-      null_motor:
-  b:
-    steps_per_mm: 100.000
-    max_rate_mm_per_min: 1000.000
-    acceleration_mm_per_sec2: 200.000
-    max_travel_mm: 300.000
-    soft_limits: false
-    motor0:
-      stepstick:
-        direction_pin: i2so.17
-        step_pin: i2so.18
-        disable_pin: i2so.16
-        ms3_pin: i2so.19
-    motor1:
-      null_motor:
-  c:
-    steps_per_mm: 100.000
-    max_rate_mm_per_min: 1000.000
-    acceleration_mm_per_sec2: 200.000
-    max_travel_mm: 300.000
-    soft_limits: false
-    motor0:
-      stepstick:
-        direction_pin: i2so.20
-        step_pin: i2so.21
-        disable_pin: i2so.23
-        ms3_pin: i2so.22
-    motor1:
-      null_motor:
-
-i2so:
-  bck_pin: gpio.22
-  data_pin: gpio.21
-  ws_pin: gpio.17
-
-spi:
-  miso_pin: gpio.19
-  mosi_pin: gpio.23
-  sck_pin: gpio.18
-
-sdcard:
-  cs_pin: gpio.5
-
-control:
-
-coolant:
-  mist_pin: gpio.27
-  delay_ms: 1000.000
-
-probe:
-  pin: gpio.34:pu
-  check_mode_start: false
-
-macros:
-  startup_line0: 
-  startup_line1: 
-  macro0: 
-  macro1: 
-  macro2: 
-  macro3: 
-
-start:
-  must_home: true
-  check_limits: true
-  deactivate_parking_upon_init: false
-
-user_outputs:
-
-PWM:
-  spinup_ms: 0
-  spindown_ms: 0
-  tool_num: 0
-  speeds: 0=0.0% 1000=100.0%
-  output_pin: gpio.26
-  enable_pin: gpio.4
-  direction_pin: gpio.16
-  disable_with_s0: false
-  s0_with_disable: false
-  pwm_hz: 5000
-
-software_debounce_ms: 0
-arc_tolerance_mm: 0.002
-junction_deviation_mm: 0.010
-verbose_errors: false
-report_inches: false
-enable_parking_override_control: false
-use_line_numbers: false
diff --git a/yaml/6_pack_trinamic_stallguard.yaml b/yaml/6_pack_trinamic_stallguard.yaml
deleted file mode 100644
index f163e89b..00000000
--- a/yaml/6_pack_trinamic_stallguard.yaml
+++ /dev/null
@@ -1,223 +0,0 @@
-name: 6 Pack Controller V1 (Trinamic Stallguard)
-board: 6-pack
-
-stepping:
-  engine: I2S_stream
-  idle_ms: 250
-  dir_delay_us: 0
-  pulse_us: 4
-  disable_delay_us: 0
-
-axes:
-  x:
-    steps_per_mm: 100.000
-    max_rate_mm_per_min: 1000.000
-    acceleration_mm_per_sec2: 200.000
-    max_travel_mm: 300.000
-    soft_limits: false
-    motor0:
-      limit_all_pin: gpio.33:low
-      hard_limits: false
-      tmc_2130:
-        direction_pin: i2so.1
-        step_pin: i2so.2
-        disable_pin: i2so.0
-        run_amps: 0.250
-        hold_amps: 0.125
-        microsteps: 16
-        stallguard: 16
-        stallguard_debug: false
-        run_mode: Stallguard
-        homing_mode: Stallguard
-        use_enable: false
-        r_sense_ohms: 0.110
-        cs_pin: i2so.3:low
-        spi_index: 0
-    motor1:
-      null_motor:
-  y:
-    steps_per_mm: 100.000
-    max_rate_mm_per_min: 1000.000
-    acceleration_mm_per_sec2: 200.000
-    max_travel_mm: 300.000
-    soft_limits: false
-    motor0:
-      limit_all_pin: gpio.32:low
-      hard_limits: false
-      tmc_2130:
-        direction_pin: i2so.4
-        step_pin: i2so.5
-        disable_pin: i2so.7
-        run_amps: 0.250
-        hold_amps: 0.125
-        microsteps: 16
-        stallguard: 16
-        stallguard_debug: false
-        run_mode: Stallguard
-        homing_mode: Stallguard
-        use_enable: false
-        r_sense_ohms: 0.110
-        cs_pin: i2so.6:low
-        spi_index: 1
-    motor1:
-      null_motor:
-  z:
-    steps_per_mm: 100.000
-    max_rate_mm_per_min: 1000.000
-    acceleration_mm_per_sec2: 200.000
-    max_travel_mm: 300.000
-    soft_limits: false
-    motor0:
-      limit_all_pin: gpio.35:low
-      hard_limits: false
-      tmc_2130:
-        direction_pin: i2so.9
-        step_pin: i2so.10
-        disable_pin: i2so.8
-        run_amps: 0.250
-        hold_amps: 0.125
-        microsteps: 16
-        stallguard: 16
-        stallguard_debug: false
-        run_mode: Stallguard
-        homing_mode: Stallguard
-        use_enable: false
-        r_sense_ohms: 0.110
-        cs_pin: i2so.11:low
-        spi_index: 2
-    motor1:
-      null_motor:
-  a:
-    steps_per_mm: 100.000
-    max_rate_mm_per_min: 1000.000
-    acceleration_mm_per_sec2: 200.000
-    max_travel_mm: 300.000
-    soft_limits: false
-    motor0:
-      limit_all_pin: gpio.34:low
-      hard_limits: false
-      tmc_2130:
-        direction_pin: i2so.12
-        step_pin: i2so.13
-        disable_pin: i2so.15
-        run_amps: 0.250
-        hold_amps: 0.125
-        microsteps: 16
-        stallguard: 16
-        stallguard_debug: false
-        run_mode: Stallguard
-        homing_mode: Stallguard
-        use_enable: false
-        r_sense_ohms: 0.110
-        cs_pin: i2so.14:low
-        spi_index: 3
-    motor1:
-      null_motor:
-  b:
-    steps_per_mm: 100.000
-    max_rate_mm_per_min: 1000.000
-    acceleration_mm_per_sec2: 200.000
-    max_travel_mm: 300.000
-    soft_limits: false
-    motor0:
-      limit_all_pin: gpio.39:low
-      hard_limits: false
-      tmc_2130:
-        direction_pin: i2so.17
-        step_pin: i2so.18
-        disable_pin: i2so.16
-        run_amps: 0.250
-        hold_amps: 0.125
-        microsteps: 16
-        stallguard: 16
-        stallguard_debug: false
-        run_mode: Stallguard
-        homing_mode: Stallguard
-        use_enable: false
-        r_sense_ohms: 0.110
-        cs_pin: i2so.19:low
-        spi_index: 4
-    motor1:
-      null_motor:
-  c:
-    steps_per_mm: 100.000
-    max_rate_mm_per_min: 1000.000
-    acceleration_mm_per_sec2: 200.000
-    max_travel_mm: 300.000
-    soft_limits: false
-    motor0:
-      limit_all_pin: gpio.36:low
-      hard_limits: false
-      tmc_2130:
-        direction_pin: i2so.20
-        step_pin: i2so.21
-        disable_pin: i2so.23
-        run_amps: 0.250
-        hold_amps: 0.125
-        microsteps: 16
-        stallguard: 16
-        stallguard_debug: false
-        run_mode: Stallguard
-        homing_mode: Stallguard
-        use_enable: false
-        r_sense_ohms: 0.110
-        cs_pin: i2so.22:low
-        spi_index: 5
-    motor1:
-      null_motor:
-
-i2so:
-  bck_pin: gpio.22
-  data_pin: gpio.21
-  ws_pin: gpio.17
-
-spi:
-  miso_pin: gpio.19
-  mosi_pin: gpio.23
-  sck_pin: gpio.18
-
-sdcard:
-  cs_pin: gpio.5
-
-control:
-
-coolant:
-  delay_ms: 1000.000
-
-probe:
-  check_mode_start: false
-
-macros:
-  startup_line0: 
-  startup_line1: 
-  macro0: 
-  macro1: 
-  macro2: 
-  macro3: 
-
-start:
-  must_home: true
-  check_limits: true
-  deactivate_parking_upon_init: false
-
-user_outputs:
-
-PWM:
-  spinup_ms: 0
-  spindown_ms: 0
-  tool_num: 0
-  speeds: 0=0.0% 1000=100.0%
-  output_pin: gpio.26
-  enable_pin: gpio.4
-  direction_pin: gpio.16
-  disable_with_s0: false
-  s0_with_disable: false
-  pwm_hz: 5000
-
-software_debounce_ms: 0
-arc_tolerance_mm: 0.002
-junction_deviation_mm: 0.010
-verbose_errors: false
-report_inches: false
-enable_parking_override_control: false
-use_line_numbers: false
diff --git a/yaml/Romarin.yaml b/yaml/Romarin.yaml
deleted file mode 100644
index a77ef6f7..00000000
--- a/yaml/Romarin.yaml
+++ /dev/null
@@ -1,161 +0,0 @@
-

-board: unknown
-name: CNC Romarin XYYZ 10V Spin
-stepping:
-  engine: I2S Steps, Stream
-  idle_ms: 250
-  pulse_us: 4
-  dir_delay_us: 6
-  disable_delay_us: 5
-axes:
-  number_axis: 3
-  shared_stepper_disable: 255
-  x:
-    steps_per_mm: 100.000
-    max_rate: 1000.000
-    acceleration: 200.000
-    max_travel: 300.000
-    soft_limits: false
-    homing:
-      cycle: 2
-      positive_direction: true
-      mpos: 0.000
-      debounce: 250.000
-      pulloff: 1.000
-      square: false
-      seek_rate: 2000.000
-      feed_rate: 200.000
-      seek_scaler: 1.100
-      feed_scaler: 5.000
-    endstops:
-      dual: gpio.33:low
-      hard_limits: false
-    gang0:
-      endstops:
-        dual: gpio.33:low
-        hard_limits: false
-      stepstick:
-        direction: i2so.1
-        step: i2so.2
-        disable: i2so.0
-    gang1:
-      null_motor:
-  y:
-    steps_per_mm: 100.000
-    max_rate: 1000.000
-    acceleration: 200.000
-    max_travel: 300.000
-    soft_limits: false
-    homing:
-      cycle: 2
-      positive_direction: true
-      mpos: 0.000
-      debounce: 250.000
-      pulloff: 1.000
-      square: false
-      seek_rate: 2000.000
-      feed_rate: 200.000
-      seek_scaler: 1.100
-      feed_scaler: 5.000
-    endstops:
-      dual: gpio.32:low
-      hard_limits: false
-    gang0:
-      endstops:
-        dual: gpio.32:low
-        hard_limits: false
-      stepstick:
-        direction: i2so.4
-        step: i2so.5
-        disable: i2so.7
-    gang1:
-      stepstick:
-        direction: i2so.9
-        step: i2so.10
-        disable: i2so.8
-  z:
-    steps_per_mm: 100.000
-    max_rate: 1000.000
-    acceleration: 200.000
-    max_travel: 300.000
-    soft_limits: false
-    homing:
-      cycle: 1
-      positive_direction: false
-      mpos: 0.000
-      debounce: 250.000
-      pulloff: 1.000
-      square: false
-      seek_rate: 2000.000
-      feed_rate: 200.000
-      seek_scaler: 1.100
-      feed_scaler: 5.000
-    endstops:
-      dual: gpio.35:low
-      hard_limits: false
-    gang0:
-      endstops:
-        dual: gpio.35:low
-        hard_limits: false
-      stepstick:
-        direction: i2so.12
-        step: i2so.13
-        disable: i2so.15
-    gang1:
-      null_motor:
-i2so:
-  bck: gpio.22
-  data: gpio.21
-  ws: gpio.17
-spi:
-  cs: gpio.5
-  miso: gpio.19
-  mosi: gpio.23
-  sck: gpio.18
-control:
-  safety_door: NO_PIN
-  reset: NO_PIN
-  cycle_start: NO_PIN
-  macro0: NO_PIN
-  macro1: NO_PIN
-  macro2: NO_PIN
-  macro3: NO_PIN
-coolant:
-  flood: NO_PIN
-  mist: NO_PIN
-  delay_ms: 1000.000
-probe:
-  pin: gpio.34:pu
-  check_mode_start: false
-comms:
-macros:
-  n0: 
-  n1: 
-  macro0: 
-  macro1: 
-  macro2: 
-  macro3: 
-software_debounce_ms: 0
-laser_mode: false
-arc_tolerance: 0.002
-junction_deviation: 0.010
-verbose_errors: false
-homing_init_lock: true
-report_inches: false
-enable_parking_override_control: false
-deactivate_parking_upon_init: false
-check_limits_at_init: true
-limits_two_switches_on_axis: false
-disable_laser_during_hold: true
-use_line_numbers: false
-10v:
-  spinup_ms: 0
-  spindown_ms: 0
-  tool: 0
-  speeds: 0=0% 1000=100%
-output_pin: gpio.26
-enable_pin: NO_PIN
-direction_pin: NO_PIN
-disable_with_zero_speed: false
-zero_speed_with_disable: false
-pwm_freq: 5000
diff --git a/yaml/Root_Controller_Root_4_Lite_RS485.yaml b/yaml/Root_Controller_Root_4_Lite_RS485.yaml
deleted file mode 100644
index 05cb57f2..00000000
--- a/yaml/Root_Controller_Root_4_Lite_RS485.yaml
+++ /dev/null
@@ -1,153 +0,0 @@
-name: Root Controller 3 Axis XYYZ
-board: 6-pack
-
-stepping:
-  engine: I2S_stream
-  idle_ms: 250
-  dir_delay_us: 0
-  pulse_us: 4
-  disable_delay_us: 0
-
-axes:
-  x:
-    steps_per_mm: 800.000
-    max_rate_mm_per_min: 1000.000
-    acceleration_mm_per_sec2: 50.000
-    max_travel_mm: 220.000
-    soft_limits: true
-    homing:
-      cycle: 2
-      mpos_mm: 0.000
-      positive_direction: false
-      settle_ms: 250.000
-      seek_mm_per_min: 800.000
-      feed_mm_per_min: 100.000
-      seek_scaler: 1.100
-      feed_scaler: 5.000
-    motor0:
-      limit_all_pin: gpio.2:low
-      hard_limits: true
-      stepstick:
-        direction_pin: i2so.6
-        step_pin: i2so.5
-        disable_pin: i2so.7
-    motor1:
-      null_motor:
-  y:
-    steps_per_mm: 800.000
-    max_rate_mm_per_min: 1000.000
-    acceleration_mm_per_sec2: 50.000
-    max_travel_mm: 278.000
-    soft_limits: true
-    homing:
-      cycle: 3
-      mpos_mm: 0.000
-      positive_direction: false
-      settle_ms: 250.000
-      seek_mm_per_min: 800.000
-      feed_mm_per_min: 100.000
-      seek_scaler: 1.100
-      feed_scaler: 5.000
-    motor0:
-      limit_all_pin: gpio.26:low
-      hard_limits: true
-      stepstick:
-        direction_pin: i2so.3
-        step_pin: i2so.2
-        disable_pin: i2so.4
-    motor1:
-      limit_all_pin: gpio.27:low
-      hard_limits: true
-      stepstick:
-        direction_pin: i2so.0
-        step_pin: i2so.15
-        disable_pin: i2so.1
-  z:
-    steps_per_mm: 1000.000
-    max_rate_mm_per_min: 1000.000
-    acceleration_mm_per_sec2: 50.000
-    max_travel_mm: 60.000
-    soft_limits: true
-    homing:
-      cycle: 1
-      mpos_mm: 0.000
-      positive_direction: false
-      settle_ms: 250.000
-      seek_mm_per_min: 800.000
-      feed_mm_per_min: 100.000
-      seek_scaler: 1.100
-      feed_scaler: 5.000
-    motor0:
-      limit_all_pin: gpio.14:low
-      hard_limits: true
-      stepstick:
-        direction_pin: i2so.13
-        step_pin: i2so.12
-        disable_pin: i2so.14
-    motor1:
-      null_motor:
-
-i2so:
-  bck_pin: gpio.22
-  data_pin: gpio.12
-  ws_pin: gpio.21
-
-spi:
-  miso_pin: gpio.19
-  mosi_pin: gpio.23
-  sck_pin: gpio.18
-
-sdcard:
-  cs_pin: gpio.5
-
-control:
-  reset_pin: gpio.13:pu
-  cycle_start_pin: gpio.39:pu
-  macro0_pin: gpio.34:pu
-
-coolant:
-  flood_pin: i2so.21
-  mist_pin: i2so.20
-  delay_ms: 1000.000
-
-probe:
-  pin: gpio.33:pu
-  check_mode_start: false
-
-macros:
-  startup_line0: 
-  startup_line1: 
-  macro0: 
-  macro1: 
-  macro2: 
-  macro3: 
-
-start:
-  must_home: true
-  check_limits: true
-  deactivate_parking_upon_init: false
-
-user_outputs:
-  digital0_pin: i2so.17
-  digital1_pin: i2so.18
-  digital2_pin: i2so.19
-
-huanyang:
-  spinup_ms: 10000
-  spindown_ms: 10000
-  tool_num: 0
-  speeds: 0=0.0% 1000=0.0% 24000=100.0%
-  uart:
-    txd_pin: gpio.17
-    rxd_pin: gpio.16
-    rts_pin: gpio.4
-    baud: 9600
-    mode: 8n1
-
-software_debounce_ms: 0
-arc_tolerance_mm: 0.002
-junction_deviation_mm: 0.010
-verbose_errors: false
-report_inches: false
-enable_parking_override_control: false
-use_line_numbers: false
diff --git a/yaml/TMC2209_4x.yaml b/yaml/TMC2209_4x.yaml
deleted file mode 100644
index 07073be5..00000000
--- a/yaml/TMC2209_4x.yaml
+++ /dev/null
@@ -1,98 +0,0 @@
-name: TMC2209 4x Controller
-board: unknown
-
-stepping:
-  engine: RMT
-  idle_ms: 250
-  dir_delay_us: 0
-  pulse_us: 3
-  disable_delay_us: 0
-
-axes:
-  shared_stepper_disable_pin: gpio.25
-  x:
-    steps_per_mm: 100.000
-    max_rate_mm_per_min: 1000.000
-    acceleration_mm_per_sec2: 200.000
-    max_travel_mm: 300.000
-    soft_limits: false
-    motor0:
-      limit_all_pin: gpio.35:low
-      hard_limits: false
-    motor1:
-      null_motor:
-  y:
-    steps_per_mm: 100.000
-    max_rate_mm_per_min: 1000.000
-    acceleration_mm_per_sec2: 200.000
-    max_travel_mm: 300.000
-    soft_limits: false
-    motor0:
-      limit_all_pin: gpio.34:low
-      hard_limits: false
-    motor1:
-      null_motor:
-  z:
-    steps_per_mm: 100.000
-    max_rate_mm_per_min: 1000.000
-    acceleration_mm_per_sec2: 200.000
-    max_travel_mm: 300.000
-    soft_limits: false
-    motor0:
-      limit_all_pin: gpio.39:low
-      hard_limits: false
-    motor1:
-      null_motor:
-  a:
-    steps_per_mm: 100.000
-    max_rate_mm_per_min: 1000.000
-    acceleration_mm_per_sec2: 200.000
-    max_travel_mm: 300.000
-    soft_limits: false
-    motor0:
-    motor1:
-      null_motor:
-
-spi:
-  miso_pin: gpio.19
-  mosi_pin: gpio.23
-  sck_pin: gpio.18
-
-sdcard:
-  cs_pin: gpio.5
-
-control:
-
-coolant:
-  delay_ms: 1000.000
-
-probe:
-  pin: gpio.36:low:pu
-  check_mode_start: false
-
-macros:
-  startup_line0: 
-  startup_line1: 
-  macro0: 
-  macro1: 
-  macro2: 
-  macro3: 
-
-start:
-  must_home: true
-  check_limits: true
-  deactivate_parking_upon_init: false
-
-user_outputs:
-  digital0_pin: gpio.4
-  digital1_pin: gpio.13
-  digital2_pin: gpio.17
-  digital3_pin: gpio.12
-
-software_debounce_ms: 0
-arc_tolerance_mm: 0.002
-junction_deviation_mm: 0.010
-verbose_errors: false
-report_inches: false
-enable_parking_override_control: false
-use_line_numbers: false
diff --git a/yaml/fysetc_ant.yaml b/yaml/fysetc_ant.yaml
deleted file mode 100644
index de02c269..00000000
--- a/yaml/fysetc_ant.yaml
+++ /dev/null
@@ -1,107 +0,0 @@
-name: FYSETC E4 3D Printer Controller
-board: unknown
-
-stepping:
-  engine: RMT
-  idle_ms: 250
-  dir_delay_us: 0
-  pulse_us: 3
-  disable_delay_us: 0
-
-axes:
-  shared_stepper_disable_pin: gpio.25
-  x:
-    steps_per_mm: 100.000
-    max_rate_mm_per_min: 1000.000
-    acceleration_mm_per_sec2: 200.000
-    max_travel_mm: 300.000
-    soft_limits: false
-    motor0:
-      limit_all_pin: gpio.34:low
-      hard_limits: false
-    motor1:
-      null_motor:
-  y:
-    steps_per_mm: 100.000
-    max_rate_mm_per_min: 1000.000
-    acceleration_mm_per_sec2: 200.000
-    max_travel_mm: 300.000
-    soft_limits: false
-    motor0:
-      limit_all_pin: gpio.35:low
-      hard_limits: false
-    motor1:
-      null_motor:
-  z:
-    steps_per_mm: 100.000
-    max_rate_mm_per_min: 1000.000
-    acceleration_mm_per_sec2: 200.000
-    max_travel_mm: 300.000
-    soft_limits: false
-    motor0:
-      limit_all_pin: gpio.15:low
-      hard_limits: false
-    motor1:
-      null_motor:
-  a:
-    steps_per_mm: 100.000
-    max_rate_mm_per_min: 1000.000
-    acceleration_mm_per_sec2: 200.000
-    max_travel_mm: 300.000
-    soft_limits: false
-    motor0:
-      limit_all_pin: gpio.36:low
-      hard_limits: false
-    motor1:
-      null_motor:
-
-spi:
-  miso_pin: gpio.19
-  mosi_pin: gpio.23
-  sck_pin: gpio.18
-
-sdcard:
-  cs_pin: gpio.5
-
-control:
-
-coolant:
-  flood_pin: gpio.4
-  mist_pin: gpio.2
-  delay_ms: 1000.000
-
-probe:
-  pin: gpio.39:pu
-  check_mode_start: false
-
-macros:
-  startup_line0: 
-  startup_line1: 
-  macro0: 
-  macro1: 
-  macro2: 
-  macro3: 
-
-start:
-  must_home: true
-  check_limits: true
-  deactivate_parking_upon_init: false
-
-user_outputs:
-
-relay:
-  spinup_ms: 0
-  spindown_ms: 0
-  tool_num: 0
-  speeds: 0=0.0% 1000=100.0%
-  output_pin: gpio.13
-  disable_with_s0: false
-  s0_with_disable: false
-
-software_debounce_ms: 0
-arc_tolerance_mm: 0.002
-junction_deviation_mm: 0.010
-verbose_errors: false
-report_inches: false
-enable_parking_override_control: false
-use_line_numbers: false
diff --git a/yaml/fysetc_e4.yaml b/yaml/fysetc_e4.yaml
deleted file mode 100644
index de02c269..00000000
--- a/yaml/fysetc_e4.yaml
+++ /dev/null
@@ -1,107 +0,0 @@
-name: FYSETC E4 3D Printer Controller
-board: unknown
-
-stepping:
-  engine: RMT
-  idle_ms: 250
-  dir_delay_us: 0
-  pulse_us: 3
-  disable_delay_us: 0
-
-axes:
-  shared_stepper_disable_pin: gpio.25
-  x:
-    steps_per_mm: 100.000
-    max_rate_mm_per_min: 1000.000
-    acceleration_mm_per_sec2: 200.000
-    max_travel_mm: 300.000
-    soft_limits: false
-    motor0:
-      limit_all_pin: gpio.34:low
-      hard_limits: false
-    motor1:
-      null_motor:
-  y:
-    steps_per_mm: 100.000
-    max_rate_mm_per_min: 1000.000
-    acceleration_mm_per_sec2: 200.000
-    max_travel_mm: 300.000
-    soft_limits: false
-    motor0:
-      limit_all_pin: gpio.35:low
-      hard_limits: false
-    motor1:
-      null_motor:
-  z:
-    steps_per_mm: 100.000
-    max_rate_mm_per_min: 1000.000
-    acceleration_mm_per_sec2: 200.000
-    max_travel_mm: 300.000
-    soft_limits: false
-    motor0:
-      limit_all_pin: gpio.15:low
-      hard_limits: false
-    motor1:
-      null_motor:
-  a:
-    steps_per_mm: 100.000
-    max_rate_mm_per_min: 1000.000
-    acceleration_mm_per_sec2: 200.000
-    max_travel_mm: 300.000
-    soft_limits: false
-    motor0:
-      limit_all_pin: gpio.36:low
-      hard_limits: false
-    motor1:
-      null_motor:
-
-spi:
-  miso_pin: gpio.19
-  mosi_pin: gpio.23
-  sck_pin: gpio.18
-
-sdcard:
-  cs_pin: gpio.5
-
-control:
-
-coolant:
-  flood_pin: gpio.4
-  mist_pin: gpio.2
-  delay_ms: 1000.000
-
-probe:
-  pin: gpio.39:pu
-  check_mode_start: false
-
-macros:
-  startup_line0: 
-  startup_line1: 
-  macro0: 
-  macro1: 
-  macro2: 
-  macro3: 
-
-start:
-  must_home: true
-  check_limits: true
-  deactivate_parking_upon_init: false
-
-user_outputs:
-
-relay:
-  spinup_ms: 0
-  spindown_ms: 0
-  tool_num: 0
-  speeds: 0=0.0% 1000=100.0%
-  output_pin: gpio.13
-  disable_with_s0: false
-  s0_with_disable: false
-
-software_debounce_ms: 0
-arc_tolerance_mm: 0.002
-junction_deviation_mm: 0.010
-verbose_errors: false
-report_inches: false
-enable_parking_override_control: false
-use_line_numbers: false
diff --git a/yaml/lowrider_v1p2.yaml b/yaml/lowrider_v1p2.yaml
deleted file mode 100644
index 6ec2eb20..00000000
--- a/yaml/lowrider_v1p2.yaml
+++ /dev/null
@@ -1,111 +0,0 @@
-name: LOWRIDER YYZZX V1P2 
-board: unknown
-
-stepping:
-  engine: RMT
-  idle_ms: 250
-  dir_delay_us: 0
-  pulse_us: 3
-  disable_delay_us: 0
-
-axes:
-  shared_stepper_disable_pin: gpio.13
-  x:
-    steps_per_mm: 100.000
-    max_rate_mm_per_min: 1000.000
-    acceleration_mm_per_sec2: 200.000
-    max_travel_mm: 300.000
-    soft_limits: false
-    motor0:
-      limit_all_pin: gpio.15:low
-      hard_limits: false
-      stepstick:
-        direction_pin: gpio.33
-        step_pin: gpio.27
-    motor1:
-      null_motor:
-  y:
-    steps_per_mm: 100.000
-    max_rate_mm_per_min: 1000.000
-    acceleration_mm_per_sec2: 200.000
-    max_travel_mm: 300.000
-    soft_limits: false
-    motor0:
-      limit_all_pin: gpio.4:low
-      hard_limits: false
-      stepstick:
-        direction_pin: gpio.26
-        step_pin: gpio.12
-    motor1:
-      stepstick:
-        direction_pin: gpio.26
-        step_pin: gpio.22
-  z:
-    steps_per_mm: 100.000
-    max_rate_mm_per_min: 1000.000
-    acceleration_mm_per_sec2: 200.000
-    max_travel_mm: 300.000
-    soft_limits: false
-    motor0:
-      limit_all_pin: gpio.17:low
-      hard_limits: false
-      stepstick:
-        direction_pin: gpio.25
-        step_pin: gpio.14
-    motor1:
-      stepstick:
-        direction_pin: gpio.25
-        step_pin: gpio.21
-
-spi:
-  miso_pin: gpio.19
-  mosi_pin: gpio.23
-  sck_pin: gpio.18
-
-sdcard:
-  cs_pin: gpio.5
-
-control:
-  reset_pin: gpio.34:low:pu
-  cycle_start_pin: gpio.39:low:pu
-
-coolant:
-  delay_ms: 1000.000
-
-probe:
-  pin: gpio.35:pu
-  check_mode_start: false
-
-macros:
-  startup_line0: 
-  startup_line1: 
-  macro0: 
-  macro1: 
-  macro2: 
-  macro3: 
-
-start:
-  must_home: true
-  check_limits: true
-  deactivate_parking_upon_init: false
-
-user_outputs:
-
-PWM:
-  spinup_ms: 0
-  spindown_ms: 0
-  tool_num: 0
-  speeds: 0=0.0% 1000=100.0%
-  output_pin: gpio.16
-  enable_pin: gpio.32
-  disable_with_s0: false
-  s0_with_disable: false
-  pwm_hz: 5000
-
-software_debounce_ms: 32
-arc_tolerance_mm: 0.002
-junction_deviation_mm: 0.010
-verbose_errors: false
-report_inches: false
-enable_parking_override_control: false
-use_line_numbers: false
diff --git a/yaml/midtbot.yaml b/yaml/midtbot.yaml
deleted file mode 100644
index 267ea25b..00000000
--- a/yaml/midtbot.yaml
+++ /dev/null
@@ -1,122 +0,0 @@
-name: midTbot
-board: unknown
-
-stepping:
-  engine: RMT
-  idle_ms: 255
-  dir_delay_us: 0
-  pulse_us: 3
-  disable_delay_us: 0
-
-axes:
-  shared_stepper_disable_pin: gpio.13
-  x:
-    steps_per_mm: 100.000
-    max_rate_mm_per_min: 8000.000
-    acceleration_mm_per_sec2: 200.000
-    max_travel_mm: 100.000
-    soft_limits: false
-    homing:
-      cycle: 3
-      mpos_mm: 5.000
-      positive_direction: true
-      settle_ms: 250.000
-      seek_mm_per_min: 2000.000
-      feed_mm_per_min: 500.000
-      seek_scaler: 1.100
-      feed_scaler: 5.000
-    motor0:
-      limit_all_pin: gpio.2:low
-      hard_limits: false
-      stepstick:
-        direction_pin: gpio.26
-        step_pin: gpio.12
-    motor1:
-      null_motor:
-  y:
-    steps_per_mm: 100.000
-    max_rate_mm_per_min: 8000.000
-    acceleration_mm_per_sec2: 200.000
-    max_travel_mm: 100.000
-    soft_limits: false
-    homing:
-      cycle: 2
-      mpos_mm: 0.000
-      positive_direction: false
-      settle_ms: 250.000
-      seek_mm_per_min: 2000.000
-      feed_mm_per_min: 500.000
-      seek_scaler: 1.100
-      feed_scaler: 5.000
-    motor0:
-      limit_all_pin: gpio.4:low
-      hard_limits: false
-      stepstick:
-        direction_pin: gpio.25:low
-        step_pin: gpio.14
-    motor1:
-      null_motor:
-  z:
-    steps_per_mm: 100.000
-    max_rate_mm_per_min: 5000.000
-    acceleration_mm_per_sec2: 100.000
-    max_travel_mm: 5.000
-    soft_limits: false
-    homing:
-      cycle: 1
-      mpos_mm: 0.000
-      positive_direction: true
-      settle_ms: 250.000
-      seek_mm_per_min: 2000.000
-      feed_mm_per_min: 500.000
-      seek_scaler: 1.100
-      feed_scaler: 5.000
-    motor0:
-      rc_servo:
-        timer_ms: 75.000
-        cal_min: 1.000
-        cal_max: 1.000
-        pwm_pin: gpio.27
-        min_pulse_us: 3276
-        max_pulse_us: 6553
-    motor1:
-      null_motor:
-
-spi:
-  miso_pin: gpio.19
-  mosi_pin: gpio.23
-  sck_pin: gpio.18
-
-sdcard:
-  cs_pin: gpio.5
-
-control:
-
-coolant:
-  delay_ms: 1000.000
-
-probe:
-  check_mode_start: false
-
-macros:
-  startup_line0: 
-  startup_line1: 
-  macro0: 
-  macro1: 
-  macro2: 
-  macro3: 
-
-start:
-  must_home: true
-  check_limits: true
-  deactivate_parking_upon_init: false
-
-user_outputs:
-
-software_debounce_ms: 0
-arc_tolerance_mm: 0.002
-junction_deviation_mm: 0.010
-verbose_errors: false
-report_inches: false
-enable_parking_override_control: false
-use_line_numbers: false
diff --git a/yaml/mpcnc_laser_module_v1p2.yaml b/yaml/mpcnc_laser_module_v1p2.yaml
deleted file mode 100644
index 4dad78d0..00000000
--- a/yaml/mpcnc_laser_module_v1p2.yaml
+++ /dev/null
@@ -1,138 +0,0 @@
-name: MPCNC_V1P2 with Laser Module
-board: unknown
-
-stepping:
-  engine: RMT
-  idle_ms: 255
-  dir_delay_us: 0
-  pulse_us: 3
-  disable_delay_us: 0
-
-axes:
-  shared_stepper_disable_pin: gpio.13
-  x:
-    steps_per_mm: 200.000
-    max_rate_mm_per_min: 8000.000
-    acceleration_mm_per_sec2: 200.000
-    max_travel_mm: 500.000
-    soft_limits: false
-    homing:
-      cycle: 2
-      mpos_mm: 0.000
-      positive_direction: true
-      settle_ms: 250.000
-      seek_mm_per_min: 200.000
-      feed_mm_per_min: 100.000
-      seek_scaler: 1.100
-      feed_scaler: 5.000
-    motor0:
-      limit_all_pin: gpio.17:low
-      hard_limits: false
-      stepstick:
-        direction_pin: gpio.26
-        step_pin: gpio.12
-    motor1:
-      stepstick:
-        direction_pin: gpio.26
-        step_pin: gpio.22
-  y:
-    steps_per_mm: 200.000
-    max_rate_mm_per_min: 8000.000
-    acceleration_mm_per_sec2: 200.000
-    max_travel_mm: 500.000
-    soft_limits: false
-    homing:
-      cycle: 2
-      mpos_mm: 0.000
-      positive_direction: true
-      settle_ms: 250.000
-      seek_mm_per_min: 200.000
-      feed_mm_per_min: 100.000
-      seek_scaler: 1.100
-      feed_scaler: 5.000
-    motor0:
-      limit_all_pin: gpio.4:low
-      hard_limits: false
-      stepstick:
-        direction_pin: gpio.25
-        step_pin: gpio.14
-    motor1:
-      stepstick:
-        direction_pin: gpio.25
-        step_pin: gpio.21
-  z:
-    steps_per_mm: 800.000
-    max_rate_mm_per_min: 3000.000
-    acceleration_mm_per_sec2: 100.000
-    max_travel_mm: 80.000
-    soft_limits: false
-    homing:
-      cycle: 1
-      mpos_mm: 0.000
-      positive_direction: false
-      settle_ms: 250.000
-      seek_mm_per_min: 200.000
-      feed_mm_per_min: 100.000
-      seek_scaler: 1.100
-      feed_scaler: 5.000
-    motor0:
-      limit_all_pin: gpio.15:low
-      hard_limits: false
-      stepstick:
-        direction_pin: gpio.33
-        step_pin: gpio.27
-    motor1:
-      null_motor:
-
-spi:
-  miso_pin: gpio.19
-  mosi_pin: gpio.23
-  sck_pin: gpio.18
-
-sdcard:
-  cs_pin: gpio.5
-
-control:
-  reset_pin: gpio.34:low:pu
-  cycle_start_pin: gpio.39:low:pu
-
-coolant:
-  mist_pin: gpio.2
-  delay_ms: 1000.000
-
-probe:
-  pin: gpio.35:pu
-  check_mode_start: false
-
-macros:
-  startup_line0: 
-  startup_line1: 
-  macro0: 
-  macro1: 
-  macro2: 
-  macro3: 
-
-start:
-  must_home: true
-  check_limits: true
-  deactivate_parking_upon_init: false
-
-user_outputs:
-
-laser:
-  spinup_ms: 0
-  spindown_ms: 0
-  tool_num: 0
-  speeds: 0=0.0% 1000=100.0%
-  output_pin: gpio.16
-  disable_with_s0: false
-  s0_with_disable: false
-  pwm_hz: 5000
-
-software_debounce_ms: 32
-arc_tolerance_mm: 0.002
-junction_deviation_mm: 0.010
-verbose_errors: false
-report_inches: false
-enable_parking_override_control: false
-use_line_numbers: false
diff --git a/yaml/mpcnc_v1p1.yaml b/yaml/mpcnc_v1p1.yaml
deleted file mode 100644
index 0a8a2c8f..00000000
--- a/yaml/mpcnc_v1p1.yaml
+++ /dev/null
@@ -1,138 +0,0 @@
-name: MPCNC_V1P1
-board: unknown
-
-stepping:
-  engine: RMT
-  idle_ms: 255
-  dir_delay_us: 0
-  pulse_us: 3
-  disable_delay_us: 0
-
-axes:
-  shared_stepper_disable_pin: gpio.13
-  x:
-    steps_per_mm: 200.000
-    max_rate_mm_per_min: 8000.000
-    acceleration_mm_per_sec2: 200.000
-    max_travel_mm: 500.000
-    soft_limits: false
-    homing:
-      cycle: 2
-      mpos_mm: 0.000
-      positive_direction: true
-      settle_ms: 250.000
-      seek_mm_per_min: 200.000
-      feed_mm_per_min: 100.000
-      seek_scaler: 1.100
-      feed_scaler: 5.000
-    motor0:
-      limit_all_pin: gpio.2:low
-      hard_limits: false
-      stepstick:
-        direction_pin: gpio.26
-        step_pin: gpio.12
-    motor1:
-      stepstick:
-        direction_pin: gpio.26
-        step_pin: gpio.22
-  y:
-    steps_per_mm: 200.000
-    max_rate_mm_per_min: 8000.000
-    acceleration_mm_per_sec2: 200.000
-    max_travel_mm: 500.000
-    soft_limits: false
-    homing:
-      cycle: 2
-      mpos_mm: 0.000
-      positive_direction: true
-      settle_ms: 250.000
-      seek_mm_per_min: 200.000
-      feed_mm_per_min: 100.000
-      seek_scaler: 1.100
-      feed_scaler: 5.000
-    motor0:
-      limit_all_pin: gpio.4:low
-      hard_limits: false
-      stepstick:
-        direction_pin: gpio.25
-        step_pin: gpio.14
-    motor1:
-      stepstick:
-        direction_pin: gpio.25
-        step_pin: gpio.21
-  z:
-    steps_per_mm: 800.000
-    max_rate_mm_per_min: 3000.000
-    acceleration_mm_per_sec2: 100.000
-    max_travel_mm: 80.000
-    soft_limits: false
-    homing:
-      cycle: 1
-      mpos_mm: 0.000
-      positive_direction: false
-      settle_ms: 250.000
-      seek_mm_per_min: 200.000
-      feed_mm_per_min: 100.000
-      seek_scaler: 1.100
-      feed_scaler: 5.000
-    motor0:
-      limit_all_pin: gpio.15:low
-      hard_limits: false
-      stepstick:
-        direction_pin: gpio.33
-        step_pin: gpio.27
-    motor1:
-      null_motor:
-
-spi:
-  miso_pin: gpio.19
-  mosi_pin: gpio.23
-  sck_pin: gpio.18
-
-sdcard:
-  cs_pin: gpio.5
-
-control:
-  reset_pin: gpio.34:low:pu
-  cycle_start_pin: gpio.39:low:pu
-
-coolant:
-  delay_ms: 1000.000
-
-probe:
-  pin: gpio.35:pu
-  check_mode_start: false
-
-macros:
-  startup_line0: 
-  startup_line1: 
-  macro0: 
-  macro1: 
-  macro2: 
-  macro3: 
-
-start:
-  must_home: true
-  check_limits: true
-  deactivate_parking_upon_init: false
-
-user_outputs:
-
-PWM:
-  spinup_ms: 0
-  spindown_ms: 0
-  tool_num: 0
-  speeds: 0=0.0% 1000=100.0%
-  output_pin: gpio.16
-  enable_pin: gpio.32
-  disable_with_s0: false
-  s0_with_disable: false
-  pwm_hz: 5000
-
-software_debounce_ms: 0
-arc_tolerance_mm: 0.002
-junction_deviation_mm: 0.010
-verbose_errors: false
-report_inches: false
-enable_parking_override_control: false
-use_line_numbers: false
diff --git a/yaml/mpcnc_v1p2.yaml b/yaml/mpcnc_v1p2.yaml
deleted file mode 100644
index 72b42070..00000000
--- a/yaml/mpcnc_v1p2.yaml
+++ /dev/null
@@ -1,138 +0,0 @@
-name: MPCNC_V1P2
-board: unknown
-
-stepping:
-  engine: RMT
-  idle_ms: 255
-  dir_delay_us: 0
-  pulse_us: 3
-  disable_delay_us: 0
-
-axes:
-  shared_stepper_disable_pin: gpio.13
-  x:
-    steps_per_mm: 200.000
-    max_rate_mm_per_min: 8000.000
-    acceleration_mm_per_sec2: 200.000
-    max_travel_mm: 500.000
-    soft_limits: false
-    homing:
-      cycle: 2
-      mpos_mm: 0.000
-      positive_direction: true
-      settle_ms: 250.000
-      seek_mm_per_min: 200.000
-      feed_mm_per_min: 100.000
-      seek_scaler: 1.100
-      feed_scaler: 5.000
-    motor0:
-      limit_all_pin: gpio.17:low
-      hard_limits: false
-      stepstick:
-        direction_pin: gpio.26
-        step_pin: gpio.12
-    motor1:
-      stepstick:
-        direction_pin: gpio.26
-        step_pin: gpio.22
-  y:
-    steps_per_mm: 200.000
-    max_rate_mm_per_min: 8000.000
-    acceleration_mm_per_sec2: 200.000
-    max_travel_mm: 500.000
-    soft_limits: false
-    homing:
-      cycle: 2
-      mpos_mm: 0.000
-      positive_direction: true
-      settle_ms: 250.000
-      seek_mm_per_min: 200.000
-      feed_mm_per_min: 100.000
-      seek_scaler: 1.100
-      feed_scaler: 5.000
-    motor0:
-      limit_all_pin: gpio.4:low
-      hard_limits: false
-      stepstick:
-        direction_pin: gpio.25
-        step_pin: gpio.14
-    motor1:
-      stepstick:
-        direction_pin: gpio.25
-        step_pin: gpio.21
-  z:
-    steps_per_mm: 800.000
-    max_rate_mm_per_min: 3000.000
-    acceleration_mm_per_sec2: 100.000
-    max_travel_mm: 80.000
-    soft_limits: false
-    homing:
-      cycle: 1
-      mpos_mm: 0.000
-      positive_direction: false
-      settle_ms: 250.000
-      seek_mm_per_min: 200.000
-      feed_mm_per_min: 100.000
-      seek_scaler: 1.100
-      feed_scaler: 5.000
-    motor0:
-      limit_all_pin: gpio.15:low
-      hard_limits: false
-      stepstick:
-        direction_pin: gpio.33
-        step_pin: gpio.27
-    motor1:
-      null_motor:
-
-spi:
-  miso_pin: gpio.19
-  mosi_pin: gpio.23
-  sck_pin: gpio.18
-
-sdcard:
-  cs_pin: gpio.5
-
-control:
-  reset_pin: gpio.34:low:pu
-  cycle_start_pin: gpio.39:low:pu
-
-coolant:
-  delay_ms: 1000.000
-
-probe:
-  pin: gpio.35:pu
-  check_mode_start: false
-
-macros:
-  startup_line0: 
-  startup_line1: 
-  macro0: 
-  macro1: 
-  macro2: 
-  macro3: 
-
-start:
-  must_home: true
-  check_limits: true
-  deactivate_parking_upon_init: false
-
-user_outputs:
-
-PWM:
-  spinup_ms: 0
-  spindown_ms: 0
-  tool_num: 0
-  speeds: 0=0.0% 1000=100.0%
-  output_pin: gpio.16
-  enable_pin: gpio.32
-  disable_with_s0: false
-  s0_with_disable: false
-  pwm_hz: 5000
-
-software_debounce_ms: 32
-arc_tolerance_mm: 0.002
-junction_deviation_mm: 0.010
-verbose_errors: false
-report_inches: false
-enable_parking_override_control: false
-use_line_numbers: false
diff --git a/yaml/pen_laser.yaml b/yaml/pen_laser.yaml
deleted file mode 100644
index bcaa82c7..00000000
--- a/yaml/pen_laser.yaml
+++ /dev/null
@@ -1,95 +0,0 @@
-name: PEN_LASER
-board: unknown
-
-stepping:
-  engine: RMT
-  idle_ms: 250
-  dir_delay_us: 0
-  pulse_us: 3
-  disable_delay_us: 0
-
-axes:
-  shared_stepper_disable_pin: gpio.13
-  x:
-    steps_per_mm: 80.000
-    max_rate_mm_per_min: 5000.000
-    acceleration_mm_per_sec2: 50.000
-    max_travel_mm: 300.000
-    soft_limits: false
-    motor0:
-      limit_all_pin: gpio.15:low
-      hard_limits: false
-      stepstick:
-        direction_pin: gpio.26
-        step_pin: gpio.12
-    motor1:
-      null_motor:
-  y:
-    steps_per_mm: 80.000
-    max_rate_mm_per_min: 5000.000
-    acceleration_mm_per_sec2: 50.000
-    max_travel_mm: 300.000
-    soft_limits: false
-    motor0:
-      limit_all_pin: gpio.4:low
-      hard_limits: false
-      stepstick:
-        direction_pin: gpio.25
-        step_pin: gpio.14
-    motor1:
-      null_motor:
-  z:
-    steps_per_mm: 100.000
-    max_rate_mm_per_min: 5000.000
-    acceleration_mm_per_sec2: 50.000
-    max_travel_mm: 100.000
-    soft_limits: false
-    motor0:
-      rc_servo:
-        timer_ms: 75.000
-        cal_min: 1.000
-        cal_max: 1.000
-        pwm_pin: gpio.27
-        min_pulse_us: 3276
-        max_pulse_us: 6553
-    motor1:
-      null_motor:
-
-spi:
-  miso_pin: gpio.19
-  mosi_pin: gpio.23
-  sck_pin: gpio.18
-
-sdcard:
-  cs_pin: gpio.5
-
-control:
-
-coolant:
-  delay_ms: 1000.000
-
-probe:
-  check_mode_start: false
-
-macros:
-  startup_line0: 
-  startup_line1: 
-  macro0: 
-  macro1: 
-  macro2: 
-  macro3: 
-
-start:
-  must_home: true
-  check_limits: true
-  deactivate_parking_upon_init: false
-
-user_outputs:
-
-software_debounce_ms: 0
-arc_tolerance_mm: 0.002
-junction_deviation_mm: 0.010
-verbose_errors: false
-report_inches: false
-enable_parking_override_control: false
-use_line_numbers: false
diff --git a/yaml/polar_coaster.yaml b/yaml/polar_coaster.yaml
deleted file mode 100644
index 46b679bb..00000000
--- a/yaml/polar_coaster.yaml
+++ /dev/null
@@ -1,123 +0,0 @@
-name: POLAR_COASTER
-board: unknown
-
-stepping:
-  engine: RMT
-  idle_ms: 255
-  dir_delay_us: 0
-  pulse_us: 3
-  disable_delay_us: 0
-
-axes:
-  shared_stepper_disable_pin: gpio.17
-  x:
-    steps_per_mm: 200.000
-    max_rate_mm_per_min: 5000.000
-    acceleration_mm_per_sec2: 200.000
-    max_travel_mm: 50.000
-    soft_limits: false
-    homing:
-      cycle: 2
-      mpos_mm: 0.000
-      positive_direction: false
-      settle_ms: 250.000
-      seek_mm_per_min: 1000.000
-      feed_mm_per_min: 200.000
-      seek_scaler: 1.100
-      feed_scaler: 5.000
-    motor0:
-      limit_all_pin: gpio.4:low
-      hard_limits: false
-      stepstick:
-        direction_pin: gpio.25
-        step_pin: gpio.15
-    motor1:
-      null_motor:
-  y:
-    steps_per_mm: 71.111
-    max_rate_mm_per_min: 15000.000
-    acceleration_mm_per_sec2: 200.000
-    max_travel_mm: 300.000
-    soft_limits: false
-    homing:
-      cycle: 2
-      mpos_mm: 0.000
-      positive_direction: false
-      settle_ms: 250.000
-      seek_mm_per_min: 1000.000
-      feed_mm_per_min: 200.000
-      seek_scaler: 1.100
-      feed_scaler: 5.000
-    motor0:
-      stepstick:
-        direction_pin: gpio.26:low
-        step_pin: gpio.2
-    motor1:
-      null_motor:
-  z:
-    steps_per_mm: 100.000
-    max_rate_mm_per_min: 3000.000
-    acceleration_mm_per_sec2: 50.000
-    max_travel_mm: 5.000
-    soft_limits: false
-    homing:
-      cycle: 1
-      mpos_mm: 5.000
-      positive_direction: false
-      settle_ms: 250.000
-      seek_mm_per_min: 1000.000
-      feed_mm_per_min: 200.000
-      seek_scaler: 1.100
-      feed_scaler: 5.000
-    motor0:
-      rc_servo:
-        timer_ms: 75.000
-        cal_min: 1.000
-        cal_max: 1.000
-        pwm_pin: gpio.16
-        min_pulse_us: 3276
-        max_pulse_us: 6553
-    motor1:
-      null_motor:
-
-spi:
-  miso_pin: gpio.19
-  mosi_pin: gpio.23
-  sck_pin: gpio.18
-
-sdcard:
-  cs_pin: gpio.5
-
-control:
-  macro0_pin: gpio.13:low:pu
-  macro1_pin: gpio.12:low:pu
-  macro2_pin: gpio.14:low:pu
-
-coolant:
-  delay_ms: 1000.000
-
-probe:
-  check_mode_start: false
-
-macros:
-  startup_line0: 
-  startup_line1: 
-  macro0: 
-  macro1: 
-  macro2: 
-  macro3: 
-
-start:
-  must_home: true
-  check_limits: true
-  deactivate_parking_upon_init: false
-
-user_outputs:
-
-software_debounce_ms: 0
-arc_tolerance_mm: 0.002
-junction_deviation_mm: 0.010
-verbose_errors: false
-report_inches: false
-enable_parking_override_control: false
-use_line_numbers: false
diff --git a/yaml/spi_daisy_4axis_xyza.yaml b/yaml/spi_daisy_4axis_xyza.yaml
deleted file mode 100644
index e43b68df..00000000
--- a/yaml/spi_daisy_4axis_xyza.yaml
+++ /dev/null
@@ -1,174 +0,0 @@
-name: SPI_DAISY_4X XYZA
-board: unknown
-
-stepping:
-  engine: RMT
-  idle_ms: 250
-  dir_delay_us: 0
-  pulse_us: 3
-  disable_delay_us: 0
-
-axes:
-  x:
-    steps_per_mm: 100.000
-    max_rate_mm_per_min: 1000.000
-    acceleration_mm_per_sec2: 200.000
-    max_travel_mm: 300.000
-    soft_limits: false
-    motor0:
-      limit_all_pin: gpio.36:low
-      hard_limits: false
-      tmc_2130:
-        direction_pin: gpio.14
-        step_pin: gpio.12
-        run_amps: 0.250
-        hold_amps: 0.125
-        microsteps: 16
-        stallguard: 16
-        stallguard_debug: false
-        run_mode: Stallguard
-        homing_mode: Stallguard
-        use_enable: true
-        toff_disable: 0
-        toff_stealthchop: 5
-        toff_coolstep: 3
-        r_sense_ohms: 0.110
-        cs_pin: gpio.17:low
-        spi_index: 0
-    motor1:
-      null_motor:
-  y:
-    steps_per_mm: 100.000
-    max_rate_mm_per_min: 1000.000
-    acceleration_mm_per_sec2: 200.000
-    max_travel_mm: 300.000
-    soft_limits: false
-    motor0:
-      limit_all_pin: gpio.39:low
-      hard_limits: false
-      tmc_2130:
-        direction_pin: gpio.26
-        step_pin: gpio.27
-        run_amps: 0.250
-        hold_amps: 0.125
-        microsteps: 16
-        stallguard: 16
-        stallguard_debug: false
-        run_mode: Stallguard
-        homing_mode: Stallguard
-        use_enable: true
-        toff_disable: 0
-        toff_stealthchop: 5
-        toff_coolstep: 3
-        r_sense_ohms: 0.110
-        cs_pin: gpio.17:low
-        spi_index: 1
-    motor1:
-      null_motor:
-  z:
-    steps_per_mm: 100.000
-    max_rate_mm_per_min: 1000.000
-    acceleration_mm_per_sec2: 200.000
-    max_travel_mm: 300.000
-    soft_limits: false
-    motor0:
-      limit_all_pin: gpio.34:low
-      hard_limits: false
-      tmc_2130:
-        direction_pin: gpio.2
-        step_pin: gpio.15
-        run_amps: 0.250
-        hold_amps: 0.125
-        microsteps: 16
-        stallguard: 16
-        stallguard_debug: false
-        run_mode: Stallguard
-        homing_mode: Stallguard
-        use_enable: true
-        toff_disable: 0
-        toff_stealthchop: 5
-        toff_coolstep: 3
-        r_sense_ohms: 0.110
-        cs_pin: gpio.17:low
-        spi_index: 2
-    motor1:
-      null_motor:
-  a:
-    steps_per_mm: 100.000
-    max_rate_mm_per_min: 1000.000
-    acceleration_mm_per_sec2: 200.000
-    max_travel_mm: 300.000
-    soft_limits: false
-    motor0:
-      limit_all_pin: gpio.35:low
-      hard_limits: false
-      tmc_2130:
-        direction_pin: gpio.32
-        step_pin: gpio.33
-        run_amps: 0.250
-        hold_amps: 0.125
-        microsteps: 16
-        stallguard: 16
-        stallguard_debug: false
-        run_mode: Stallguard
-        homing_mode: Stallguard
-        use_enable: true
-        toff_disable: 0
-        toff_stealthchop: 5
-        toff_coolstep: 3
-        r_sense_ohms: 0.110
-        cs_pin: gpio.17:low
-        spi_index: 3
-    motor1:
-      null_motor:
-
-spi:
-  miso_pin: gpio.19
-  mosi_pin: gpio.23
-  sck_pin: gpio.18
-
-sdcard:
-  cs_pin: gpio.5
-
-control:
-
-coolant:
-  mist_pin: gpio.21
-  delay_ms: 1000.000
-
-probe:
-  pin: gpio.22:pu
-  check_mode_start: false
-
-macros:
-  startup_line0: 
-  startup_line1: 
-  macro0: 
-  macro1: 
-  macro2: 
-  macro3: 
-
-start:
-  must_home: true
-  check_limits: true
-  deactivate_parking_upon_init: false
-
-user_outputs:
-
-relay:
-  spinup_ms: 0
-  spindown_ms: 0
-  tool_num: 0
-  speeds: 0=0.0% 1000=100.0%
-  output_pin: gpio.25
-  enable_pin: gpio.4
-  disable_with_s0: false
-  s0_with_disable: false
-
-software_debounce_ms: 0
-arc_tolerance_mm: 0.002
-junction_deviation_mm: 0.010
-verbose_errors: false
-report_inches: false
-enable_parking_override_control: false
-use_line_numbers: false
diff --git a/yaml/tapster_3.yaml b/yaml/tapster_3.yaml
deleted file mode 100644
index 0f211c7d..00000000
--- a/yaml/tapster_3.yaml
+++ /dev/null
@@ -1,122 +0,0 @@
-name: Tapster 3 Delta (Dynamixel)
-board: unknown
-
-stepping:
-  engine: RMT
-  idle_ms: 200
-  dir_delay_us: 0
-  pulse_us: 3
-  disable_delay_us: 0
-
-axes:
-  x:
-    steps_per_mm: 800.000
-    max_rate_mm_per_min: 200.000
-    acceleration_mm_per_sec2: 200.000
-    max_travel_mm: 2.618
-    soft_limits: false
-    motor0:
-      Dynamixel2:
-        timer_ms: 50.000
-        invert_direction: false
-        count_min: 1332.227
-        count_max: 3039.159
-        id: 1
-        uart:
-          txd_pin: gpio.4
-          rxd_pin: gpio.13
-          rts_pin: gpio.17
-          baud: 1000000
-          mode: 8n1
-    motor1:
-      null_motor:
-  y:
-    steps_per_mm: 800.000
-    max_rate_mm_per_min: 200.000
-    acceleration_mm_per_sec2: 200.000
-    max_travel_mm: 2.618
-    soft_limits: false
-    motor0:
-      Dynamixel2:
-        timer_ms: 50.000
-        invert_direction: false
-        count_min: 1332.227
-        count_max: 3039.159
-        id: 2
-        uart:
-          txd_pin: gpio.4
-          rxd_pin: gpio.13
-          rts_pin: gpio.17
-          baud: 1000000
-          mode: 8n1
-    motor1:
-      null_motor:
-  z:
-    steps_per_mm: 800.000
-    max_rate_mm_per_min: 200.000
-    acceleration_mm_per_sec2: 200.000
-    max_travel_mm: 2.618
-    soft_limits: false
-    motor0:
-      Dynamixel2:
-        timer_ms: 50.000
-        invert_direction: false
-        count_min: 1332.227
-        count_max: 3039.159
-        id: 3
-        uart:
-          txd_pin: gpio.4
-          rxd_pin: gpio.13
-          rts_pin: gpio.17
-          baud: 1000000
-          mode: 8n1
-    motor1:
-      null_motor:
-
-spi:
-  miso_pin: gpio.19
-  mosi_pin: gpio.23
-  sck_pin: gpio.18
-
-sdcard:
-  cs_pin: gpio.5
-
-control:
-
-coolant:
-  delay_ms: 1000.000
-
-probe:
-  check_mode_start: false
-
-macros:
-  startup_line0: 
-  startup_line1: 
-  macro0: 
-  macro1: 
-  macro2: 
-  macro3: 
-
-start:
-  must_home: true
-  check_limits: true
-  deactivate_parking_upon_init: false
-
-user_outputs:
-  analog0_pin: gpio.2
-  analog0_hz: 50
-  analog1_pin: gpio.15
-  analog1_hz: 50
-  analog2_pin: gpio.16
-  analog2_hz: 50
-  digital0_pin: gpio.25
-  digital1_pin: gpio.26
-  digital2_pin: gpio.27
-
-software_debounce_ms: 0
-arc_tolerance_mm: 0.002
-junction_deviation_mm: 0.010
-verbose_errors: false
-report_inches: false
-enable_parking_override_control: false
-use_line_numbers: false
diff --git a/yaml/tapster_pro_6P_trinamic.yaml b/yaml/tapster_pro_6P_trinamic.yaml
deleted file mode 100644
index 46e0c881..00000000
--- a/yaml/tapster_pro_6P_trinamic.yaml
+++ /dev/null
@@ -1,172 +0,0 @@
-name: Tapster Pro Delta 6P Trinamic
-board: 6-pack
-
-stepping:
-  engine: I2S_stream
-  idle_ms: 255
-  dir_delay_us: 0
-  pulse_us: 4
-  disable_delay_us: 0
-
-axes:
-  x:
-    steps_per_mm: 1909.859
-    max_rate_mm_per_min: 100.000
-    acceleration_mm_per_sec2: 20.000
-    max_travel_mm: 2.321
-    soft_limits: false
-    homing:
-      cycle: 1
-      mpos_mm: -0.750
-      positive_direction: true
-      settle_ms: 250.000
-      seek_mm_per_min: 100.000
-      feed_mm_per_min: 25.000
-      seek_scaler: 1.100
-      feed_scaler: 5.000
-    motor0:
-      limit_all_pin: gpio.33
-      hard_limits: false
-      tmc_2130:
-        direction_pin: i2so.1
-        step_pin: i2so.2
-        disable_pin: i2so.0
-        run_amps: 1.000
-        hold_amps: 0.500
-        microsteps: 8
-        stallguard: 16
-        stallguard_debug: false
-        run_mode: Stallguard
-        homing_mode: Stallguard
-        use_enable: false
-        r_sense_ohms: 0.110
-        cs_pin: i2so.3:low
-        spi_index: 0
-    motor1:
-      null_motor:
-  y:
-    steps_per_mm: 1909.859
-    max_rate_mm_per_min: 100.000
-    acceleration_mm_per_sec2: 20.000
-    max_travel_mm: 2.321
-    soft_limits: false
-    homing:
-      cycle: 1
-      mpos_mm: -0.750
-      positive_direction: true
-      settle_ms: 250.000
-      seek_mm_per_min: 100.000
-      feed_mm_per_min: 25.000
-      seek_scaler: 1.100
-      feed_scaler: 5.000
-    motor0:
-      limit_all_pin: gpio.32
-      hard_limits: false
-      tmc_2130:
-        direction_pin: i2so.4
-        step_pin: i2so.5
-        disable_pin: i2so.7
-        run_amps: 1.000
-        hold_amps: 0.500
-        microsteps: 8
-        stallguard: 16
-        stallguard_debug: false
-        run_mode: Stallguard
-        homing_mode: Stallguard
-        use_enable: false
-        r_sense_ohms: 0.110
-        cs_pin: i2so.6:low
-        spi_index: 1
-    motor1:
-      null_motor:
-  z:
-    steps_per_mm: 1909.859
-    max_rate_mm_per_min: 100.000
-    acceleration_mm_per_sec2: 20.000
-    max_travel_mm: 2.321
-    soft_limits: false
-    homing:
-      cycle: 1
-      mpos_mm: -0.750
-      positive_direction: true
-      settle_ms: 250.000
-      seek_mm_per_min: 100.000
-      feed_mm_per_min: 25.000
-      seek_scaler: 1.100
-      feed_scaler: 5.000
-    motor0:
-      limit_all_pin: gpio.35
-      hard_limits: false
-      tmc_2130:
-        direction_pin: i2so.9
-        step_pin: i2so.10
-        disable_pin: i2so.8
-        run_amps: 1.000
-        hold_amps: 0.500
-        microsteps: 8
-        stallguard: 16
-        stallguard_debug: false
-        run_mode: Stallguard
-        homing_mode: Stallguard
-        use_enable: false
-        r_sense_ohms: 0.110
-        cs_pin: i2so.11:low
-        spi_index: 2
-    motor1:
-      null_motor:
-
-i2so:
-  bck_pin: gpio.22
-  data_pin: gpio.21
-  ws_pin: gpio.17
-
-spi:
-  miso_pin: gpio.19
-  mosi_pin: gpio.23
-  sck_pin: gpio.18
-
-sdcard:
-  cs_pin: gpio.5
-
-control:
-
-coolant:
-  delay_ms: 1000.000
-
-probe:
-  check_mode_start: false
-
-macros:
-  startup_line0: 
-  startup_line1: 
-  macro0: 
-  macro1: 
-  macro2: 
-  macro3: 
-
-start:
-  must_home: true
-  check_limits: true
-  deactivate_parking_upon_init: false
-
-user_outputs:
-  analog0_pin: gpio.14
-  analog0_hz: 50
-  analog1_pin: gpio.13
-  analog1_hz: 50
-  analog2_pin: gpio.15
-  analog2_hz: 50
-  analog3_pin: gpio.12
-  analog3_hz: 50
-  digital0_pin: gpio.26
-  digital1_pin: gpio.4
-  digital2_pin: gpio.16
-  digital3_pin: gpio.27
-
-software_debounce_ms: 0
-arc_tolerance_mm: 0.002
-junction_deviation_mm: 0.010
-verbose_errors: false
-report_inches: false
-enable_parking_override_control: false
-use_line_numbers: false
diff --git a/yaml/test_drive.yaml b/yaml/test_drive.yaml
deleted file mode 100644
index daaca7bd..00000000
--- a/yaml/test_drive.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
-name: Test Drive - Demo Only No I/O!
-board: unknown
-
-stepping:
-  engine: RMT
-  idle_ms: 250
-  dir_delay_us: 0
-  pulse_us: 3
-  disable_delay_us: 0
-
-axes:
-  x:
-    steps_per_mm: 100.000
-    max_rate_mm_per_min: 1000.000
-    acceleration_mm_per_sec2: 200.000
-    max_travel_mm: 300.000
-    soft_limits: false
-    motor0:
-      null_motor:
-    motor1:
-      null_motor:
-  y:
-    steps_per_mm: 100.000
-    max_rate_mm_per_min: 1000.000
-    acceleration_mm_per_sec2: 200.000
-    max_travel_mm: 300.000
-    soft_limits: false
-    motor0:
-      null_motor:
-    motor1:
-      null_motor:
-  z:
-    steps_per_mm: 100.000
-    max_rate_mm_per_min: 1000.000
-    acceleration_mm_per_sec2: 200.000
-    max_travel_mm: 300.000
-    soft_limits: false
-    motor0:
-      null_motor:
-    motor1:
-      null_motor:
-
-spi:
-  miso_pin: gpio.19
-  mosi_pin: gpio.23
-  sck_pin: gpio.18
-
-sdcard:
-  cs_pin: gpio.5
-
-control:
-
-coolant:
-  delay_ms: 1000.000
-
-probe:
-  check_mode_start: false
-
-macros:
-  startup_line0: 
-  startup_line1: 
-  macro0: 
-  macro1: 
-  macro2: 
-  macro3: 
-
-start:
-  must_home: true
-  check_limits: true
-  deactivate_parking_upon_init: false
-
-user_outputs:
-
-software_debounce_ms: 0
-arc_tolerance_mm: 0.002
-junction_deviation_mm: 0.010
-verbose_errors: false
-report_inches: false
-enable_parking_override_control: false
-use_line_numbers: false
diff --git a/yaml/tmc2130_pen.yaml b/yaml/tmc2130_pen.yaml
deleted file mode 100644
index 4dd737af..00000000
--- a/yaml/tmc2130_pen.yaml
+++ /dev/null
@@ -1,117 +0,0 @@
-name: ESP32_TMC2130_PEN V2
-board: unknown
-
-stepping:
-  engine: RMT
-  idle_ms: 250
-  dir_delay_us: 0
-  pulse_us: 3
-  disable_delay_us: 0
-
-axes:
-  shared_stepper_disable_pin: gpio.13
-  x:
-    steps_per_mm: 100.000
-    max_rate_mm_per_min: 1000.000
-    acceleration_mm_per_sec2: 200.000
-    max_travel_mm: 300.000
-    soft_limits: false
-    motor0:
-      limit_all_pin: gpio.32:low
-      hard_limits: false
-      tmc_2130:
-        direction_pin: gpio.26
-        step_pin: gpio.12
-        run_amps: 0.250
-        hold_amps: 0.125
-        microsteps: 16
-        stallguard: 16
-        stallguard_debug: false
-        run_mode: Stallguard
-        homing_mode: Stallguard
-        use_enable: false
-        r_sense_ohms: 0.110
-        cs_pin: gpio.17:low
-        spi_index: 0
-    motor1:
-      null_motor:
-  y:
-    steps_per_mm: 100.000
-    max_rate_mm_per_min: 1000.000
-    acceleration_mm_per_sec2: 200.000
-    max_travel_mm: 300.000
-    soft_limits: false
-    motor0:
-      limit_all_pin: gpio.4:low
-      hard_limits: false
-      tmc_2130:
-        direction_pin: gpio.25
-        step_pin: gpio.14
-        run_amps: 0.250
-        hold_amps: 0.125
-        microsteps: 16
-        stallguard: 16
-        stallguard_debug: false
-        run_mode: Stallguard
-        homing_mode: Stallguard
-        use_enable: false
-        r_sense_ohms: 0.110
-        cs_pin: gpio.16:low
-        spi_index: 1
-    motor1:
-      null_motor:
-  z:
-    steps_per_mm: 100.000
-    max_rate_mm_per_min: 1000.000
-    acceleration_mm_per_sec2: 200.000
-    max_travel_mm: 5.000
-    soft_limits: false
-    motor0:
-      rc_servo:
-        timer_ms: 75.000
-        cal_min: 1.000
-        cal_max: 1.000
-        pwm_pin: gpio.27
-        min_pulse_us: 3276
-        max_pulse_us: 6553
-    motor1:
-      null_motor:
-
-spi:
-  miso_pin: gpio.19
-  mosi_pin: gpio.23
-  sck_pin: gpio.18
-
-sdcard:
-  cs_pin: gpio.5
-
-control:
-
-coolant:
-  delay_ms: 1000.000
-
-probe:
-  check_mode_start: false
-
-macros:
-  startup_line0: 
-  startup_line1: 
-  macro0: 
-  macro1: 
-  macro2: 
-  macro3: 
-
-start:
-  must_home: true
-  check_limits: true
-  deactivate_parking_upon_init: false
-
-user_outputs:
-
-software_debounce_ms: 0
-arc_tolerance_mm: 0.002
-junction_deviation_mm: 0.010
-verbose_errors: false
-report_inches: false
-enable_parking_override_control: false
-use_line_numbers: false