diff --git a/radio/src/storage/yaml/yaml_datastructs_nv14.cpp b/radio/src/storage/yaml/yaml_datastructs_nv14.cpp
index 076339017..24f6e3dc0 100644
--- a/radio/src/storage/yaml/yaml_datastructs_nv14.cpp
+++ b/radio/src/storage/yaml/yaml_datastructs_nv14.cpp
@@ -438,6 +438,8 @@ static const struct YamlNode struct_RadioData[] = {
   YAML_STRUCT("themeData", 480, struct_OpenTxTheme__PersistentData, NULL),
   YAML_STRING("ownerRegistrationID", 8),
   YAML_SIGNED( "uartSampleMode", 2 ),
+  YAML_UNSIGNED( "stickDeadZone", 3 ),
+  YAML_PADDING( 3 ),
   YAML_END
 };
 static const struct YamlNode struct_unsigned_8[] = {
diff --git a/radio/src/storage/yaml/yaml_datastructs_t12.cpp b/radio/src/storage/yaml/yaml_datastructs_t12.cpp
index 44f299067..7d6cea5c3 100644
--- a/radio/src/storage/yaml/yaml_datastructs_t12.cpp
+++ b/radio/src/storage/yaml/yaml_datastructs_t12.cpp
@@ -407,6 +407,7 @@ static const struct YamlNode struct_RadioData[] = {
   YAML_STRING("bluetoothName", 10),
   YAML_STRING("ownerRegistrationID", 8),
   YAML_SIGNED( "uartSampleMode", 2 ),
+  YAML_PADDING( 6 ),
   YAML_END
 };
 static const struct YamlNode struct_unsigned_8[] = {
diff --git a/radio/src/storage/yaml/yaml_datastructs_t8.cpp b/radio/src/storage/yaml/yaml_datastructs_t8.cpp
index a816fa02b..2c7432054 100644
--- a/radio/src/storage/yaml/yaml_datastructs_t8.cpp
+++ b/radio/src/storage/yaml/yaml_datastructs_t8.cpp
@@ -407,6 +407,7 @@ static const struct YamlNode struct_RadioData[] = {
   YAML_STRING("bluetoothName", 10),
   YAML_STRING("ownerRegistrationID", 8),
   YAML_SIGNED( "uartSampleMode", 2 ),
+  YAML_PADDING( 6 ),
   YAML_END
 };
 static const struct YamlNode struct_unsigned_8[] = {
diff --git a/radio/src/storage/yaml/yaml_datastructs_tlite.cpp b/radio/src/storage/yaml/yaml_datastructs_tlite.cpp
index a816fa02b..2c7432054 100644
--- a/radio/src/storage/yaml/yaml_datastructs_tlite.cpp
+++ b/radio/src/storage/yaml/yaml_datastructs_tlite.cpp
@@ -407,6 +407,7 @@ static const struct YamlNode struct_RadioData[] = {
   YAML_STRING("bluetoothName", 10),
   YAML_STRING("ownerRegistrationID", 8),
   YAML_SIGNED( "uartSampleMode", 2 ),
+  YAML_PADDING( 6 ),
   YAML_END
 };
 static const struct YamlNode struct_unsigned_8[] = {
diff --git a/radio/src/storage/yaml/yaml_datastructs_tpro.cpp b/radio/src/storage/yaml/yaml_datastructs_tpro.cpp
index e4218ecec..cb80626a5 100644
--- a/radio/src/storage/yaml/yaml_datastructs_tpro.cpp
+++ b/radio/src/storage/yaml/yaml_datastructs_tpro.cpp
@@ -413,6 +413,7 @@ static const struct YamlNode struct_RadioData[] = {
   YAML_PADDING( 144 ),
   YAML_STRING("ownerRegistrationID", 8),
   YAML_SIGNED( "uartSampleMode", 2 ),
+  YAML_PADDING( 6 ),
   YAML_END
 };
 static const struct YamlNode struct_unsigned_8[] = {
diff --git a/radio/src/storage/yaml/yaml_datastructs_tx12.cpp b/radio/src/storage/yaml/yaml_datastructs_tx12.cpp
index b9884c44e..a75335d90 100644
--- a/radio/src/storage/yaml/yaml_datastructs_tx12.cpp
+++ b/radio/src/storage/yaml/yaml_datastructs_tx12.cpp
@@ -407,6 +407,7 @@ static const struct YamlNode struct_RadioData[] = {
   YAML_STRING("bluetoothName", 10),
   YAML_STRING("ownerRegistrationID", 8),
   YAML_SIGNED( "uartSampleMode", 2 ),
+  YAML_PADDING( 6 ),
   YAML_END
 };
 static const struct YamlNode struct_unsigned_8[] = {
diff --git a/radio/src/storage/yaml/yaml_datastructs_tx12mk2.cpp b/radio/src/storage/yaml/yaml_datastructs_tx12mk2.cpp
index 878f839da..af5b6fa0f 100755
--- a/radio/src/storage/yaml/yaml_datastructs_tx12mk2.cpp
+++ b/radio/src/storage/yaml/yaml_datastructs_tx12mk2.cpp
@@ -122,6 +122,8 @@ const struct YamlIdStr enum_MixSources[] = {
   {  MIXSRC_SD, "SD"  },
   {  MIXSRC_SE, "SE"  },
   {  MIXSRC_SF, "SF"  },
+  {  MIXSRC_SG, "SG"  },
+  {  MIXSRC_SH, "SH"  },
   {  MIXSRC_SW1, "SW1"  },
   {  MIXSRC_CH1, "CH1"  },
   {  MIXSRC_CH2, "CH2"  },
@@ -198,6 +200,12 @@ const struct YamlIdStr enum_SwitchSources[] = {
   {  SWSRC_SF0, "SF0"  },
   {  SWSRC_SF1, "SF1"  },
   {  SWSRC_SF2, "SF2"  },
+  {  SWSRC_SG0, "SG0"  },
+  {  SWSRC_SG1, "SG1"  },
+  {  SWSRC_SG2, "SG2"  },
+  {  SWSRC_SH0, "SH0"  },
+  {  SWSRC_SH1, "SH1"  },
+  {  SWSRC_SH2, "SH2"  },
   {  SWSRC_TrimRudLeft, "TrimRudLeft"  },
   {  SWSRC_TrimRudRight, "TrimRudRight"  },
   {  SWSRC_TrimEleDown, "TrimEleDown"  },
@@ -386,7 +394,7 @@ static const struct YamlNode struct_RadioData[] = {
   YAML_ARRAY("customFn", 88, 64, struct_CustomFunctionData, cfn_is_active),
   YAML_CUSTOM("auxSerialMode",r_serialMode,nullptr),
   YAML_CUSTOM("aux2SerialMode",r_serialMode,nullptr),
-  YAML_ARRAY("serialPort", 4, 4, struct_serialConfig, nullptr),
+  YAML_ARRAY("serialPort", 8, 4, struct_serialConfig, nullptr),
   YAML_ARRAY("slidersConfig", 1, 4, struct_sliderConfig, nullptr),
   YAML_PADDING( 4 ),
   YAML_ARRAY("potsConfig", 2, 4, struct_potConfig, nullptr),
@@ -560,14 +568,14 @@ static const struct YamlNode struct_RssiAlarmData[] = {
   YAML_SIGNED( "critical", 6 ),
   YAML_END
 };
-static const struct YamlNode struct_anonymous_5[] = {
+static const struct YamlNode struct_PpmModule[] = {
   YAML_SIGNED( "delay", 6 ),
   YAML_UNSIGNED( "pulsePol", 1 ),
   YAML_UNSIGNED( "outputType", 1 ),
   YAML_SIGNED( "frameLength", 8 ),
   YAML_END
 };
-static const struct YamlNode struct_anonymous_6[] = {
+static const struct YamlNode struct_anonymous_5[] = {
   YAML_PADDING( 8 ),
   YAML_UNSIGNED( "disableTelemetry", 1 ),
   YAML_UNSIGNED( "disableMapping", 1 ),
@@ -579,7 +587,7 @@ static const struct YamlNode struct_anonymous_6[] = {
   YAML_SIGNED( "optionValue", 8 ),
   YAML_END
 };
-static const struct YamlNode struct_anonymous_7[] = {
+static const struct YamlNode struct_anonymous_6[] = {
   YAML_UNSIGNED( "power", 2 ),
   YAML_PADDING( 2 ),
   YAML_UNSIGNED( "receiverTelemetryOff", 1 ),
@@ -588,7 +596,7 @@ static const struct YamlNode struct_anonymous_7[] = {
   YAML_PADDING( 8 ),
   YAML_END
 };
-static const struct YamlNode struct_anonymous_8[] = {
+static const struct YamlNode struct_anonymous_7[] = {
   YAML_PADDING( 6 ),
   YAML_UNSIGNED( "noninverted", 1 ),
   YAML_PADDING( 1 ),
@@ -600,13 +608,13 @@ static const struct YamlNode struct_string_64[] = {
   YAML_STRING("val", 8),
   YAML_END
 };
-static const struct YamlNode struct_anonymous_9[] = {
+static const struct YamlNode struct_anonymous_8[] = {
   YAML_UNSIGNED( "receivers", 7 ),
   YAML_UNSIGNED( "racingMode", 1 ),
   YAML_ARRAY("receiverName", 64, 3, struct_string_64, NULL),
   YAML_END
 };
-static const struct YamlNode struct_anonymous_10[] = {
+static const struct YamlNode struct_anonymous_9[] = {
   YAML_ARRAY("rx_id", 8, 4, struct_unsigned_8, NULL),
   YAML_UNSIGNED( "mode", 3 ),
   YAML_UNSIGNED( "rfPower", 1 ),
@@ -614,7 +622,7 @@ static const struct YamlNode struct_anonymous_10[] = {
   YAML_ARRAY("rx_freq", 8, 2, struct_unsigned_8, NULL),
   YAML_END
 };
-static const struct YamlNode struct_anonymous_11[] = {
+static const struct YamlNode struct_anonymous_10[] = {
   YAML_UNSIGNED( "bindPower", 3 ),
   YAML_UNSIGNED( "runPower", 3 ),
   YAML_UNSIGNED( "emi", 1 ),
@@ -625,32 +633,32 @@ static const struct YamlNode struct_anonymous_11[] = {
   YAML_UNSIGNED( "reserved", 6 ),
   YAML_END
 };
-static const struct YamlNode struct_anonymous_12[] = {
+static const struct YamlNode struct_anonymous_11[] = {
   YAML_UNSIGNED( "raw12bits", 1 ),
   YAML_UNSIGNED( "telemetryBaudrate", 3 ),
   YAML_PADDING( 4 ),
   YAML_END
 };
-static const struct YamlNode struct_anonymous_13[] = {
+static const struct YamlNode struct_anonymous_12[] = {
   YAML_UNSIGNED( "telemetryBaudrate", 3 ),
   YAML_END
 };
-static const struct YamlNode struct_anonymous_14[] = {
+static const struct YamlNode struct_anonymous_13[] = {
   YAML_UNSIGNED( "flags", 8 ),
   YAML_END
 };
 static const struct YamlNode union_anonymous_4_elmts[] = {
   YAML_ARRAY("raw", 8, 25, struct_unsigned_8, NULL),
-  YAML_STRUCT("ppm", 16, struct_anonymous_5, NULL),
-  YAML_STRUCT("multi", 24, struct_anonymous_6, NULL),
-  YAML_STRUCT("pxx", 16, struct_anonymous_7, NULL),
-  YAML_STRUCT("sbus", 16, struct_anonymous_8, NULL),
-  YAML_STRUCT("pxx2", 200, struct_anonymous_9, NULL),
-  YAML_STRUCT("flysky", 56, struct_anonymous_10, NULL),
-  YAML_STRUCT("afhds3", 64, struct_anonymous_11, NULL),
-  YAML_STRUCT("ghost", 8, struct_anonymous_12, NULL),
-  YAML_STRUCT("crsf", 8, struct_anonymous_13, NULL),
-  YAML_STRUCT("dsmp", 8, struct_anonymous_14, NULL),
+  YAML_STRUCT("ppm", 16, struct_PpmModule, NULL),
+  YAML_STRUCT("multi", 24, struct_anonymous_5, NULL),
+  YAML_STRUCT("pxx", 16, struct_anonymous_6, NULL),
+  YAML_STRUCT("sbus", 16, struct_anonymous_7, NULL),
+  YAML_STRUCT("pxx2", 200, struct_anonymous_8, NULL),
+  YAML_STRUCT("flysky", 56, struct_anonymous_9, NULL),
+  YAML_STRUCT("afhds3", 64, struct_anonymous_10, NULL),
+  YAML_STRUCT("ghost", 8, struct_anonymous_11, NULL),
+  YAML_STRUCT("crsf", 8, struct_anonymous_12, NULL),
+  YAML_STRUCT("dsmp", 8, struct_anonymous_13, NULL),
   YAML_END
 };
 static const struct YamlNode struct_ModuleData[] = {
@@ -691,61 +699,61 @@ static const struct YamlNode struct_ScriptData[] = {
   YAML_ARRAY("inputs", 16, 6, union_ScriptDataInput, NULL),
   YAML_END
 };
-static const struct YamlNode union_anonymous_15_elmts[] = {
+static const struct YamlNode union_anonymous_14_elmts[] = {
   YAML_UNSIGNED( "id", 16 ),
   YAML_UNSIGNED( "persistentValue", 16 ),
   YAML_END
 };
-static const struct YamlNode struct_anonymous_17[] = {
+static const struct YamlNode struct_anonymous_16[] = {
   YAML_UNSIGNED( "physID", 5 ),
   YAML_UNSIGNED( "rxIndex", 3 ),
   YAML_END
 };
-static const struct YamlNode union_anonymous_16_elmts[] = {
-  YAML_STRUCT("frskyInstance", 8, struct_anonymous_17, NULL),
+static const struct YamlNode union_anonymous_15_elmts[] = {
+  YAML_STRUCT("frskyInstance", 8, struct_anonymous_16, NULL),
   YAML_UNSIGNED( "instance", 8 ),
   YAML_ENUM("formula", 8, enum_TelemetrySensorFormula),
   YAML_END
 };
-static const struct YamlNode struct_anonymous_19[] = {
+static const struct YamlNode struct_anonymous_18[] = {
   YAML_UNSIGNED( "ratio", 16 ),
   YAML_SIGNED( "offset", 16 ),
   YAML_END
 };
-static const struct YamlNode struct_anonymous_20[] = {
+static const struct YamlNode struct_anonymous_19[] = {
   YAML_UNSIGNED( "source", 8 ),
   YAML_UNSIGNED( "index", 8 ),
   YAML_PADDING( 16 ),
   YAML_END
 };
-static const struct YamlNode struct_anonymous_21[] = {
+static const struct YamlNode struct_anonymous_20[] = {
   YAML_ARRAY("sources", 8, 4, struct_signed_8, NULL),
   YAML_END
 };
-static const struct YamlNode struct_anonymous_22[] = {
+static const struct YamlNode struct_anonymous_21[] = {
   YAML_UNSIGNED( "source", 8 ),
   YAML_PADDING( 24 ),
   YAML_END
 };
-static const struct YamlNode struct_anonymous_23[] = {
+static const struct YamlNode struct_anonymous_22[] = {
   YAML_UNSIGNED( "gps", 8 ),
   YAML_UNSIGNED( "alt", 8 ),
   YAML_PADDING( 16 ),
   YAML_END
 };
-static const struct YamlNode union_anonymous_18_elmts[] = {
-  YAML_STRUCT("custom", 32, struct_anonymous_19, NULL),
-  YAML_STRUCT("cell", 32, struct_anonymous_20, NULL),
-  YAML_STRUCT("calc", 32, struct_anonymous_21, NULL),
-  YAML_STRUCT("consumption", 32, struct_anonymous_22, NULL),
-  YAML_STRUCT("dist", 32, struct_anonymous_23, NULL),
+static const struct YamlNode union_anonymous_17_elmts[] = {
+  YAML_STRUCT("custom", 32, struct_anonymous_18, NULL),
+  YAML_STRUCT("cell", 32, struct_anonymous_19, NULL),
+  YAML_STRUCT("calc", 32, struct_anonymous_20, NULL),
+  YAML_STRUCT("consumption", 32, struct_anonymous_21, NULL),
+  YAML_STRUCT("dist", 32, struct_anonymous_22, NULL),
   YAML_UNSIGNED( "param", 32 ),
   YAML_END
 };
 static const struct YamlNode struct_TelemetrySensor[] = {
   YAML_IDX,
-  YAML_UNION("id1", 16, union_anonymous_15_elmts, select_id1),
-  YAML_UNION("id2", 8, union_anonymous_16_elmts, select_id2),
+  YAML_UNION("id1", 16, union_anonymous_14_elmts, select_id1),
+  YAML_UNION("id2", 8, union_anonymous_15_elmts, select_id2),
   YAML_STRING("label", 4),
   YAML_UNSIGNED( "subId", 8 ),
   YAML_ENUM("type", 1, enum_TelemetrySensorType),
@@ -758,7 +766,7 @@ static const struct YamlNode struct_TelemetrySensor[] = {
   YAML_UNSIGNED( "persistent", 1 ),
   YAML_UNSIGNED( "onlyPositive", 1 ),
   YAML_PADDING( 1 ),
-  YAML_UNION("cfg", 32, union_anonymous_18_elmts, select_sensor_cfg),
+  YAML_UNION("cfg", 32, union_anonymous_17_elmts, select_sensor_cfg),
   YAML_END
 };
 static const struct YamlNode struct_FrSkyBarData[] = {
diff --git a/radio/src/storage/yaml/yaml_datastructs_x7.cpp b/radio/src/storage/yaml/yaml_datastructs_x7.cpp
index a816fa02b..2c7432054 100644
--- a/radio/src/storage/yaml/yaml_datastructs_x7.cpp
+++ b/radio/src/storage/yaml/yaml_datastructs_x7.cpp
@@ -407,6 +407,7 @@ static const struct YamlNode struct_RadioData[] = {
   YAML_STRING("bluetoothName", 10),
   YAML_STRING("ownerRegistrationID", 8),
   YAML_SIGNED( "uartSampleMode", 2 ),
+  YAML_PADDING( 6 ),
   YAML_END
 };
 static const struct YamlNode struct_unsigned_8[] = {
diff --git a/radio/src/storage/yaml/yaml_datastructs_x9d.cpp b/radio/src/storage/yaml/yaml_datastructs_x9d.cpp
index a485c8e4b..5f9f3cec7 100644
--- a/radio/src/storage/yaml/yaml_datastructs_x9d.cpp
+++ b/radio/src/storage/yaml/yaml_datastructs_x9d.cpp
@@ -414,6 +414,7 @@ static const struct YamlNode struct_RadioData[] = {
   YAML_STRING("bluetoothName", 10),
   YAML_STRING("ownerRegistrationID", 8),
   YAML_SIGNED( "uartSampleMode", 2 ),
+  YAML_PADDING( 6 ),
   YAML_END
 };
 static const struct YamlNode struct_unsigned_8[] = {
diff --git a/radio/src/storage/yaml/yaml_datastructs_x9e.cpp b/radio/src/storage/yaml/yaml_datastructs_x9e.cpp
index e3155049a..0fcc29345 100644
--- a/radio/src/storage/yaml/yaml_datastructs_x9e.cpp
+++ b/radio/src/storage/yaml/yaml_datastructs_x9e.cpp
@@ -453,6 +453,7 @@ static const struct YamlNode struct_RadioData[] = {
   YAML_STRING("bluetoothName", 10),
   YAML_STRING("ownerRegistrationID", 8),
   YAML_SIGNED( "uartSampleMode", 2 ),
+  YAML_PADDING( 6 ),
   YAML_END
 };
 static const struct YamlNode struct_unsigned_8[] = {
diff --git a/radio/src/storage/yaml/yaml_datastructs_x9lite.cpp b/radio/src/storage/yaml/yaml_datastructs_x9lite.cpp
index 04642631b..b47c9de97 100644
--- a/radio/src/storage/yaml/yaml_datastructs_x9lite.cpp
+++ b/radio/src/storage/yaml/yaml_datastructs_x9lite.cpp
@@ -392,6 +392,7 @@ static const struct YamlNode struct_RadioData[] = {
   YAML_PADDING( 120 ),
   YAML_STRING("ownerRegistrationID", 8),
   YAML_SIGNED( "uartSampleMode", 2 ),
+  YAML_PADDING( 6 ),
   YAML_END
 };
 static const struct YamlNode struct_unsigned_8[] = {
diff --git a/radio/src/storage/yaml/yaml_datastructs_x9lites.cpp b/radio/src/storage/yaml/yaml_datastructs_x9lites.cpp
index 7b027241d..de3cbed44 100644
--- a/radio/src/storage/yaml/yaml_datastructs_x9lites.cpp
+++ b/radio/src/storage/yaml/yaml_datastructs_x9lites.cpp
@@ -402,6 +402,7 @@ static const struct YamlNode struct_RadioData[] = {
   YAML_STRING("bluetoothName", 10),
   YAML_STRING("ownerRegistrationID", 8),
   YAML_SIGNED( "uartSampleMode", 2 ),
+  YAML_PADDING( 6 ),
   YAML_END
 };
 static const struct YamlNode struct_unsigned_8[] = {
diff --git a/radio/src/storage/yaml/yaml_datastructs_xlite.cpp b/radio/src/storage/yaml/yaml_datastructs_xlite.cpp
index 33af4293d..3ae0a7c5b 100644
--- a/radio/src/storage/yaml/yaml_datastructs_xlite.cpp
+++ b/radio/src/storage/yaml/yaml_datastructs_xlite.cpp
@@ -399,6 +399,7 @@ static const struct YamlNode struct_RadioData[] = {
   YAML_STRING("bluetoothName", 10),
   YAML_STRING("ownerRegistrationID", 8),
   YAML_SIGNED( "uartSampleMode", 2 ),
+  YAML_PADDING( 6 ),
   YAML_END
 };
 static const struct YamlNode struct_unsigned_8[] = {
diff --git a/radio/src/storage/yaml/yaml_datastructs_zorro.cpp b/radio/src/storage/yaml/yaml_datastructs_zorro.cpp
index 321623543..af5b6fa0f 100644
--- a/radio/src/storage/yaml/yaml_datastructs_zorro.cpp
+++ b/radio/src/storage/yaml/yaml_datastructs_zorro.cpp
@@ -407,6 +407,7 @@ static const struct YamlNode struct_RadioData[] = {
   YAML_STRING("bluetoothName", 10),
   YAML_STRING("ownerRegistrationID", 8),
   YAML_SIGNED( "uartSampleMode", 2 ),
+  YAML_PADDING( 6 ),
   YAML_END
 };
 static const struct YamlNode struct_unsigned_8[] = {