diff --git a/companion/src/constants.h b/companion/src/constants.h
index fdabacbc4..d2d32a745 100644
--- a/companion/src/constants.h
+++ b/companion/src/constants.h
@@ -38,7 +38,7 @@
 #define CPN_MAX_MODULES                2
 #define CPN_MAX_STICKS                 Board::STICK_AXIS_COUNT
 #define CPN_MAX_TRIMS                  Board::TRIM_AXIS_COUNT
-#define CPN_MAX_KNOBS                  4
+#define CPN_MAX_KNOBS                  8
 #define CPN_MAX_SLIDERS                4
 #define CPN_MAX_POTS                   (CPN_MAX_KNOBS + CPN_MAX_SLIDERS)
 #define CPN_MAX_CYC                    3
diff --git a/companion/src/firmwares/boards.cpp b/companion/src/firmwares/boards.cpp
index 2187a98fb..f753b354e 100644
--- a/companion/src/firmwares/boards.cpp
+++ b/companion/src/firmwares/boards.cpp
@@ -270,9 +270,19 @@ const int Boards::getCapability(Board::Type board, Board::Capability capability)
         return 2;
       else if (IS_TARANIS_X9E(board))
         return 4;
+      else if (IS_HORUS_X10(board))
+        return 5;
+      else if (IS_HORUS_X12S(board))
+        return 3;
       else
         return 3;
 
+    case PotsStorage:
+      if (IS_HORUS(board))
+        return 5;
+      else
+        return getCapability(board, Pots);
+
     case FactoryInstalledPots:
       if (IS_TARANIS_X9(board))
         return 2;
@@ -287,8 +297,14 @@ const int Boards::getCapability(Board::Type board, Board::Capability capability)
       else
         return 0;
 
+    case SlidersStorage:
+      if (IS_HORUS_X10(board))
+        return 4;
+      else
+        return getCapability(board, Sliders);
+      
     case MouseAnalogs:
-      if (IS_HORUS_X12S(board))
+      if (IS_HORUS(board))
         return 2;
       else
         return 0;
@@ -321,10 +337,12 @@ const int Boards::getCapability(Board::Type board, Board::Capability capability)
         return 6;
       else if (IS_TARANIS_XLITE(board))
         return 6;
+      else if (IS_TARANIS(board))
+        return 8;
       else if (board == Board::BOARD_TARANIS_X9DP_2019)
         return 9;
-      else if (IS_HORUS_OR_TARANIS(board))
-        return 8;
+      else if (IS_HORUS(board))
+        return 10;
       else
         return 7;
 
@@ -450,6 +468,8 @@ const QString Boards::getAnalogInputName(Board::Type board, int index)
       "S1",
       "6P",
       "S2",
+      "EX1",
+      "EX2",
       "LS",
       "RS"
     };
diff --git a/companion/src/firmwares/boards.h b/companion/src/firmwares/boards.h
index efb1b2be1..1533107c3 100644
--- a/companion/src/firmwares/boards.h
+++ b/companion/src/firmwares/boards.h
@@ -114,8 +114,10 @@ namespace Board {
   enum Capability {
     Sticks,
     Pots,
+    PotsStorage,
     FactoryInstalledPots,
     Sliders,
+    SlidersStorage,
     MouseAnalogs,
     GyroAnalogs,
     MaxAnalogs,
diff --git a/companion/src/firmwares/opentx/opentxeeprom.cpp b/companion/src/firmwares/opentx/opentxeeprom.cpp
index b4ec24d5b..72e1b8d9d 100644
--- a/companion/src/firmwares/opentx/opentxeeprom.cpp
+++ b/companion/src/firmwares/opentx/opentxeeprom.cpp
@@ -29,25 +29,42 @@
 using namespace Board;
 
 #define MAX_VIEWS(board)                      (HAS_LARGE_LCD(board) ? 2 : 256)
-#define MAX_SLIDERS(board)                    (IS_HORUS_X10(board) ? 4 : (Boards::getCapability(board, Board::Sliders))) //TODO need to be remove when x10 eeprom gets fixed
-#define MAX_MOUSE_ANALOGS(board)              (IS_HORUS_X10(board) ? 2 : (Boards::getCapability(board, Board::MouseAnalogs))) //TODO need to be remove when x10 eeprom gets fixed
 #define MAX_GYRO_ANALOGS(board, version)      (version >= 219 ? Boards::getCapability(board, Board::GyroAnalogs) : 0)
 
 inline int MAX_SWITCHES(Board::Type board, int version)
 {
   if (version <= 218 && IS_TARANIS_X7(board))
     return 6;
-  if (version <= 218 && IS_TARANIS_X9D(board))
+  if (version <= 218 && (IS_TARANIS_X9D(board) || IS_HORUS(board)))
     return 8;
   return Boards::getCapability(board, Board::Switches);
 }
 
+#define MAX_KNOBS(board, version) (IS_HORUS(board) ? 8 : 4)
+
+inline int MAX_POTS(Board::Type board, int version)
+{
+  if (version <= 218 && IS_HORUS(board))
+    return 3;
+  return Boards::getCapability(board, Board::Pots);
+}
+
+inline int MAX_POTS_STORAGE(Board::Type board, int version)
+{
+  if (version <= 218 && IS_HORUS(board))
+    return 3;
+  return Boards::getCapability(board, Board::PotsStorage);
+}
+
 // bitsize of swconfig_t / 2 (see radio/src/datastructs.h)
 inline int MAX_SWITCH_SLOTS(Board::Type board, int version)
 {
   if (IS_TARANIS_X9E(board))
     return 32;
 
+  if (IS_HORUS(board))
+    return 16;
+  
   if (version >= 219 && IS_TARANIS_X9D(board))
     return 16;
 
@@ -105,7 +122,7 @@ class SwitchesConversionTable: public ConversionTable {
       }
 
       if (IS_HORUS_OR_TARANIS(board)) {
-        for (int i=1; i<=Boards::getCapability(board, Board::Pots)*6; i++) {
+        for (int i=1; i<=MAX_POTS(board, version)*6; i++) {
           addConversion(RawSwitch(SWITCH_TYPE_MULTIPOS_POT, -i), -val+offset);
           addConversion(RawSwitch(SWITCH_TYPE_MULTIPOS_POT, i), val++);
         }
@@ -227,7 +244,7 @@ class SourcesConversionTable: public ConversionTable {
         }
       }
 
-      for (int i=0; i<CPN_MAX_STICKS+Boards::getCapability(board, Board::Pots)+MAX_SLIDERS(board)+MAX_MOUSE_ANALOGS(board)+MAX_GYRO_ANALOGS(board, version); i++) {
+      for (int i=0; i<CPN_MAX_STICKS+MAX_POTS(board,version)+Boards::getCapability(board, Board::Sliders)+Boards::getCapability(board, Board::MouseAnalogs)+MAX_GYRO_ANALOGS(board, version); i++) {
         addConversion(RawSource(SOURCE_TYPE_STICK, i), val++);
       }
 
@@ -1946,7 +1963,10 @@ OpenTxModelData::OpenTxModelData(ModelData & modelData, Board::Type board, unsig
   internalField.Append(new UnsignedField<8>(this, modelData.moduleData[1].modelId));
 
   if (HAS_LARGE_LCD(board)) {
-    internalField.Append(new CharField<10>(this, modelData.bitmap, true, "Model bitmap"));
+    if (version >= 219 && IS_HORUS(board))
+      internalField.Append(new CharField<14>(this, modelData.bitmap, true, "Model bitmap"));
+    else
+      internalField.Append(new CharField<10>(this, modelData.bitmap, true, "Model bitmap"));
   }
 
   for (int i=0; i<MAX_TIMERS(board, version); i++) {
@@ -2151,13 +2171,13 @@ OpenTxModelData::OpenTxModelData(ModelData & modelData, Board::Type board, unsig
   }
 
   for (int i=0; i<8; i++) {
-    if (i < Boards::getCapability(board, Board::Pots) + MAX_SLIDERS(board))
+    if (i < Boards::getCapability(board, Board::Pots) + Boards::getCapability(board, Board::Sliders))
       internalField.Append(new BoolField<1>(this, modelData.potsWarningEnabled[i]));
     else
       internalField.Append(new SpareBitsField<1>(this));
   }
 
-  for (int i=0; i < Boards::getCapability(board, Board::Pots) + MAX_SLIDERS(board); i++) {
+  for (int i=0; i < Boards::getCapability(board, Board::Pots) + Boards::getCapability(board, Board::Sliders); i++) {
     internalField.Append(new SignedField<8>(this, modelData.potPosition[i]));
   }
 
@@ -2300,7 +2320,7 @@ OpenTxGeneralData::OpenTxGeneralData(GeneralSettings & generalData, Board::Type
   generalData(generalData),
   board(board),
   version(version),
-  inputsCount(CPN_MAX_STICKS + Boards::getCapability(board, Board::Pots) + MAX_SLIDERS(board) + MAX_MOUSE_ANALOGS(board))
+  inputsCount(CPN_MAX_STICKS + Boards::getCapability(board, Board::PotsStorage) + Boards::getCapability(board, Board::SlidersStorage) + Boards::getCapability(board, Board::MouseAnalogs))
 {
   qCDebug(eepromImport) << QString("OpenTxGeneralData::OpenTxGeneralData(board: %1, version:%2, variant:%3)").arg(board).arg(version).arg(variant);
 
@@ -2311,6 +2331,10 @@ OpenTxGeneralData::OpenTxGeneralData(GeneralSettings & generalData, Board::Type
   internalField.Append(new UnsignedField<16>(this, generalData.variant));
 
   for (int i=0; i<inputsCount; i++) {
+    if (version <= 218 && IS_HORUS(board) && (i == CPN_MAX_STICKS + 3)) {
+      // skip not yet existing pots (EXT1 / EXT2 for X10)
+      i += 2;
+    }
     internalField.Append(new SignedField<16>(this, generalData.calibMid[i]));
     internalField.Append(new SignedField<16>(this, generalData.calibSpanNeg[i]));
     internalField.Append(new SignedField<16>(this, generalData.calibSpanPos[i]));
@@ -2453,6 +2477,7 @@ OpenTxGeneralData::OpenTxGeneralData(GeneralSettings & generalData, Board::Type
   if (IS_STM32(board)) {
     if (version >= 218) {
       internalField.Append(new UnsignedField<4>(this, generalData.hw_uartMode));
+      // not on Horus...
       for (uint8_t i=0; i<4; i++) {
         internalField.Append(new UnsignedField<1>(this, generalData.sliderConfig[i]));
       }
@@ -2469,19 +2494,32 @@ OpenTxGeneralData::OpenTxGeneralData(GeneralSettings & generalData, Board::Type
     }
 
     if (IS_HORUS(board)) {
-      for (int i=0; i<16; i++) {
+      for (int i=0; i<MAX_SWITCH_SLOTS(board, version); i++) { // bits swconfig_t / 2
         if (i < MAX_SWITCHES(board, version))
           internalField.Append(new UnsignedField<2>(this, generalData.switchConfig[i]));
         else
           internalField.Append(new SpareBitsField<2>(this));
       }
     }
-    for (int i=0; i<4; i++) {
-      if (i < Boards::getCapability(board, Board::Pots))
+    for (int i=0; i<MAX_KNOBS(board, version); i++) {
+
+      // 2 new pots for Horus from 219 on
+      if (version <= 218 && IS_HORUS(board) && (i == 3))
+        i += 2;
+      
+      if (i < Boards::getCapability(board, Board::PotsStorage))
         internalField.Append(new UnsignedField<2>(this, generalData.potConfig[i]));
       else
         internalField.Append(new SpareBitsField<2>(this));
     }
+    if (IS_HORUS(board)) {
+      for (int i=0; i<8; i++) {
+        if (i <  Boards::getCapability(board, Board::SlidersStorage))
+          internalField.Append(new UnsignedField<1>(this, generalData.sliderConfig[i]));
+        else
+          internalField.Append(new SpareBitsField<1>(this));
+      }
+    }    
     if (!IS_HORUS(board)) {
       internalField.Append(new UnsignedField<8>(this, generalData.backlightColor));
     }
@@ -2515,10 +2553,14 @@ OpenTxGeneralData::OpenTxGeneralData(GeneralSettings & generalData, Board::Type
     for (int i=0; i<CPN_MAX_STICKS; ++i) {
       internalField.Append(new ZCharField<3>(this, generalData.stickName[i], "Stick name"));
     }
-    for (int i=0; i<Boards::getCapability(board, Board::Pots); ++i) {
+    for (int i=0; i<Boards::getCapability(board, Board::PotsStorage); ++i) {
+      if (version <= 218 && IS_HORUS(board) && (i == 3)) {
+        // skip not yet existing pots (EXT1 / EXT2 for X10)
+        i += 2;
+      }
       internalField.Append(new ZCharField<3>(this, generalData.potName[i], "Pot name"));
     }
-    for (int i=0; i<MAX_SLIDERS(board); ++i) {
+    for (int i=0; i<Boards::getCapability(board, Board::SlidersStorage); ++i) {
       internalField.Append(new ZCharField<3>(this, generalData.sliderName[i], "Slider name"));
     }
     internalField.Append(new CharField<17>(this, generalData.currModelFilename, true, "Current model filename"));
@@ -2539,7 +2581,7 @@ OpenTxGeneralData::OpenTxGeneralData(GeneralSettings & generalData, Board::Type
     for (int i=0; i<Boards::getCapability(board, Board::Pots); ++i) {
       internalField.Append(new ZCharField<3>(this, generalData.potName[i], "Pot name"));
     }
-    for (int i=0; i<MAX_SLIDERS(board); ++i) {
+    for (int i=0; i<Boards::getCapability(board, Board::Sliders); ++i) {
       internalField.Append(new ZCharField<3>(this, generalData.sliderName[i], "Slider name"));
     }
   }
diff --git a/companion/src/generaledit/hardware.cpp b/companion/src/generaledit/hardware.cpp
index bb482598e..f33800635 100644
--- a/companion/src/generaledit/hardware.cpp
+++ b/companion/src/generaledit/hardware.cpp
@@ -126,6 +126,7 @@ HardwarePanel::HardwarePanel(QWidget * parent, GeneralSettings & generalSettings
   setupPotType(1, ui->pot2Label, ui->pot2Name, ui->pot2Type);
   setupPotType(2, ui->pot3Label, ui->pot3Name, ui->pot3Type);
   setupPotType(3, ui->pot4Label, ui->pot4Name, ui->pot4Type);
+  setupPotType(4, ui->pot5Label, ui->pot5Name, ui->pot5Type);
 
   setupSliderType(0, ui->lsLabel, ui->lsName, ui->lsType);
   setupSliderType(1, ui->rsLabel, ui->rsName, ui->rsType);
diff --git a/companion/src/generaledit/hardware.ui b/companion/src/generaledit/hardware.ui
index 3a54521ba..c28c4584c 100644
--- a/companion/src/generaledit/hardware.ui
+++ b/companion/src/generaledit/hardware.ui
@@ -23,10 +23,27 @@
    <property name="spacing">
     <number>6</number>
    </property>
-   <item row="29" column="0">
-    <widget class="QLabel" name="sqLabel">
+   <item row="15" column="2">
+    <widget class="AutoComboBox" name="sbType">
+     <property name="toolTip">
+      <string/>
+     </property>
+     <property name="statusTip">
+      <string/>
+     </property>
+    </widget>
+   </item>
+   <item row="6" column="0">
+    <widget class="QLabel" name="pot3Label">
      <property name="text">
-      <string>SQ</string>
+      <string>S3</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="0">
+    <widget class="QLabel" name="rudLabel">
+     <property name="text">
+      <string>Rud</string>
      </property>
     </widget>
    </item>
@@ -37,36 +54,15 @@
      </property>
     </widget>
    </item>
-   <item row="30" column="0">
-    <widget class="QLabel" name="srLabel">
-     <property name="text">
-      <string>SR</string>
-     </property>
-    </widget>
-   </item>
-   <item row="27" column="1">
-    <widget class="AutoLineEdit" name="soName">
+   <item row="1" column="1">
+    <widget class="AutoLineEdit" name="eleName">
      <property name="maxLength">
       <number>3</number>
      </property>
     </widget>
    </item>
-   <item row="29" column="1">
-    <widget class="AutoLineEdit" name="sqName">
-     <property name="maxLength">
-      <number>3</number>
-     </property>
-    </widget>
-   </item>
-   <item row="10" column="0">
-    <widget class="QLabel" name="ls2Label">
-     <property name="text">
-      <string>LS2</string>
-     </property>
-    </widget>
-   </item>
-   <item row="23" column="2">
-    <widget class="AutoComboBox" name="skType">
+   <item row="17" column="2">
+    <widget class="AutoComboBox" name="sdType">
      <property name="toolTip">
       <string/>
      </property>
@@ -78,24 +74,67 @@
      </property>
     </widget>
    </item>
-   <item row="28" column="1">
-    <widget class="AutoLineEdit" name="spName">
+   <item row="4" column="2">
+    <widget class="AutoComboBox" name="pot1Type">
+     <property name="toolTip">
+      <string/>
+     </property>
+     <property name="statusTip">
+      <string/>
+     </property>
+    </widget>
+   </item>
+   <item row="15" column="1">
+    <widget class="AutoLineEdit" name="sbName">
      <property name="maxLength">
       <number>3</number>
      </property>
     </widget>
    </item>
-   <item row="28" column="0">
-    <widget class="QLabel" name="spLabel">
-     <property name="text">
-      <string>SP</string>
+   <item row="30" column="2">
+    <widget class="AutoComboBox" name="sqType">
+     <property name="toolTip">
+      <string/>
+     </property>
+     <property name="statusTip">
+      <string/>
+     </property>
+     <property name="whatsThis">
+      <string/>
      </property>
     </widget>
    </item>
-   <item row="27" column="0">
-    <widget class="QLabel" name="soLabel">
-     <property name="text">
-      <string>SO</string>
+   <item row="39" column="0" colspan="3">
+    <widget class="Line" name="ppmSeparator">
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>10</height>
+      </size>
+     </property>
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="17" column="1">
+    <widget class="AutoLineEdit" name="sdName">
+     <property name="maxLength">
+      <number>3</number>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1">
+    <widget class="AutoLineEdit" name="rudName">
+     <property name="maxLength">
+      <number>3</number>
+     </property>
+    </widget>
+   </item>
+   <item row="27" column="1">
+    <widget class="AutoLineEdit" name="snName">
+     <property name="maxLength">
+      <number>3</number>
      </property>
     </widget>
    </item>
@@ -106,31 +145,122 @@
      </property>
     </widget>
    </item>
-   <item row="6" column="1">
-    <widget class="AutoLineEdit" name="pot3Name">
+   <item row="11" column="2">
+    <widget class="AutoComboBox" name="ls2Type">
+     <property name="toolTip">
+      <string/>
+     </property>
+     <property name="statusTip">
+      <string/>
+     </property>
+    </widget>
+   </item>
+   <item row="35" column="0" alignment="Qt::AlignLeft">
+    <widget class="QLabel" name="serialPortLabel">
+     <property name="text">
+      <string>Serial Port</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+     </property>
+    </widget>
+   </item>
+   <item row="33" column="0">
+    <widget class="QLabel" name="bluetoothLabel">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text">
+      <string>Bluetooth</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+     </property>
+    </widget>
+   </item>
+   <item row="30" column="1">
+    <widget class="AutoLineEdit" name="sqName">
      <property name="maxLength">
       <number>3</number>
      </property>
     </widget>
    </item>
-   <item row="9" column="0">
-    <widget class="QLabel" name="rsLabel">
-     <property name="text">
-      <string>RS</string>
+   <item row="23" column="2">
+    <widget class="AutoComboBox" name="sjType">
+     <property name="toolTip">
+      <string/>
+     </property>
+     <property name="statusTip">
+      <string/>
+     </property>
+     <property name="whatsThis">
+      <string/>
      </property>
     </widget>
    </item>
-   <item row="14" column="0">
+   <item row="45" column="0">
+    <widget class="QLabel" name="label_30">
+     <property name="text">
+      <string>PPM Multiplier</string>
+     </property>
+    </widget>
+   </item>
+   <item row="15" column="0">
     <widget class="QLabel" name="sbLabel">
      <property name="text">
       <string>SB</string>
      </property>
     </widget>
    </item>
-   <item row="41" column="0">
-    <widget class="QLabel" name="label_33">
+   <item row="9" column="1">
+    <widget class="AutoLineEdit" name="lsName">
+     <property name="maxLength">
+      <number>3</number>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="1">
+    <widget class="AutoLineEdit" name="ailName">
+     <property name="maxLength">
+      <number>3</number>
+     </property>
+    </widget>
+   </item>
+   <item row="20" column="1">
+    <widget class="AutoLineEdit" name="sgName">
+     <property name="maxLength">
+      <number>3</number>
+     </property>
+    </widget>
+   </item>
+   <item row="26" column="0">
+    <widget class="QLabel" name="smLabel">
      <property name="text">
-      <string>PPM 2</string>
+      <string>SM</string>
+     </property>
+    </widget>
+   </item>
+   <item row="10" column="1">
+    <widget class="AutoLineEdit" name="rsName">
+     <property name="maxLength">
+      <number>3</number>
+     </property>
+    </widget>
+   </item>
+   <item row="34" column="1">
+    <widget class="QCheckBox" name="filterEnable">
+     <property name="text">
+      <string/>
+     </property>
+    </widget>
+   </item>
+   <item row="12" column="0">
+    <widget class="QLabel" name="rs2Label">
+     <property name="text">
+      <string>RS2</string>
      </property>
     </widget>
    </item>
@@ -141,8 +271,41 @@
      </property>
     </widget>
    </item>
-   <item row="14" column="2">
-    <widget class="AutoComboBox" name="sbType">
+   <item row="29" column="2">
+    <widget class="AutoComboBox" name="spType">
+     <property name="toolTip">
+      <string/>
+     </property>
+     <property name="statusTip">
+      <string/>
+     </property>
+     <property name="whatsThis">
+      <string/>
+     </property>
+    </widget>
+   </item>
+   <item row="19" column="2">
+    <widget class="AutoComboBox" name="sfType">
+     <property name="toolTip">
+      <string/>
+     </property>
+     <property name="statusTip">
+      <string/>
+     </property>
+     <property name="whatsThis">
+      <string/>
+     </property>
+    </widget>
+   </item>
+   <item row="30" column="0">
+    <widget class="QLabel" name="sqLabel">
+     <property name="text">
+      <string>SQ</string>
+     </property>
+    </widget>
+   </item>
+   <item row="9" column="2">
+    <widget class="AutoComboBox" name="lsType">
      <property name="toolTip">
       <string/>
      </property>
@@ -151,17 +314,20 @@
      </property>
     </widget>
    </item>
-   <item row="13" column="2">
-    <widget class="AutoComboBox" name="saType">
+   <item row="28" column="2">
+    <widget class="AutoComboBox" name="soType">
      <property name="toolTip">
       <string/>
      </property>
      <property name="statusTip">
       <string/>
      </property>
+     <property name="whatsThis">
+      <string/>
+     </property>
     </widget>
    </item>
-   <item row="34" column="1">
+   <item row="35" column="1">
     <widget class="QComboBox" name="serialPortMode">
      <item>
       <property name="text">
@@ -190,95 +356,8 @@
      </item>
     </widget>
    </item>
-   <item row="14" column="1">
-    <widget class="AutoLineEdit" name="sbName">
-     <property name="maxLength">
-      <number>3</number>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="1">
-    <widget class="AutoLineEdit" name="pot1Name">
-     <property name="maxLength">
-      <number>3</number>
-     </property>
-    </widget>
-   </item>
-   <item row="13" column="1">
-    <widget class="AutoLineEdit" name="saName">
-     <property name="maxLength">
-      <number>3</number>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="0">
-    <widget class="QLabel" name="rudLabel">
-     <property name="text">
-      <string>Rud</string>
-     </property>
-    </widget>
-   </item>
-   <item row="37" column="1">
-    <widget class="QSpinBox" name="txCurrentCalibration">
-     <property name="minimum">
-      <number>-49</number>
-     </property>
-     <property name="maximum">
-      <number>49</number>
-     </property>
-    </widget>
-   </item>
-   <item row="42" column="0">
-    <widget class="QLabel" name="label_34">
-     <property name="text">
-      <string>PPM 3</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="1">
-    <widget class="AutoLineEdit" name="rudName">
-     <property name="maxLength">
-      <number>3</number>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="0">
-    <widget class="QLabel" name="pot1Label">
-     <property name="text">
-      <string>S1</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="1">
-    <widget class="AutoLineEdit" name="eleName">
-     <property name="maxLength">
-      <number>3</number>
-     </property>
-    </widget>
-   </item>
-   <item row="5" column="0">
-    <widget class="QLabel" name="pot2Label">
-     <property name="text">
-      <string>S2</string>
-     </property>
-    </widget>
-   </item>
-   <item row="6" column="0">
-    <widget class="QLabel" name="pot3Label">
-     <property name="text">
-      <string>S3</string>
-     </property>
-    </widget>
-   </item>
-   <item row="39" column="0">
-    <widget class="QLabel" name="label_23">
-     <property name="text">
-      <string>PPM 1</string>
-     </property>
-    </widget>
-   </item>
-   <item row="39" column="1">
-    <widget class="QSpinBox" name="PPM1">
+   <item row="42" column="1">
+    <widget class="QSpinBox" name="PPM2">
      <property name="toolTip">
       <string/>
      </property>
@@ -296,17 +375,94 @@
      </property>
     </widget>
    </item>
-   <item row="34" column="0" alignment="Qt::AlignLeft">
-    <widget class="QLabel" name="serialPortLabel">
-     <property name="text">
-      <string>Serial Port</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+   <item row="21" column="1">
+    <widget class="AutoLineEdit" name="shName">
+     <property name="maxLength">
+      <number>3</number>
      </property>
     </widget>
    </item>
-   <item row="36" column="1">
+   <item row="40" column="0">
+    <widget class="QLabel" name="label_23">
+     <property name="text">
+      <string>PPM 1</string>
+     </property>
+    </widget>
+   </item>
+   <item row="17" column="0">
+    <widget class="QLabel" name="sdLabel">
+     <property name="text">
+      <string>SD</string>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="0">
+    <widget class="QLabel" name="pot1Label">
+     <property name="text">
+      <string>S1</string>
+     </property>
+    </widget>
+   </item>
+   <item row="16" column="0">
+    <widget class="QLabel" name="scLabel">
+     <property name="text">
+      <string>SC</string>
+     </property>
+    </widget>
+   </item>
+   <item row="23" column="0">
+    <widget class="QLabel" name="sjLabel">
+     <property name="text">
+      <string>SJ</string>
+     </property>
+    </widget>
+   </item>
+   <item row="23" column="1">
+    <widget class="AutoLineEdit" name="sjName">
+     <property name="maxLength">
+      <number>3</number>
+     </property>
+    </widget>
+   </item>
+   <item row="25" column="0">
+    <widget class="QLabel" name="slLabel">
+     <property name="text">
+      <string>SL</string>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="2">
+    <widget class="AutoComboBox" name="pot2Type">
+     <property name="toolTip">
+      <string/>
+     </property>
+     <property name="statusTip">
+      <string/>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="0">
+    <widget class="QLabel" name="ailLabel">
+     <property name="text">
+      <string>Ail</string>
+     </property>
+    </widget>
+   </item>
+   <item row="42" column="0">
+    <widget class="QLabel" name="label_33">
+     <property name="text">
+      <string>PPM 2</string>
+     </property>
+    </widget>
+   </item>
+   <item row="18" column="1">
+    <widget class="AutoLineEdit" name="seName">
+     <property name="maxLength">
+      <number>3</number>
+     </property>
+    </widget>
+   </item>
+   <item row="37" column="1">
     <widget class="QDoubleSpinBox" name="txVoltageCalibration">
      <property name="statusTip">
       <string/>
@@ -328,217 +484,21 @@
      </property>
     </widget>
    </item>
-   <item row="44" column="0">
-    <widget class="QLabel" name="label_30">
+   <item row="26" column="1">
+    <widget class="AutoLineEdit" name="smName">
+     <property name="maxLength">
+      <number>3</number>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="0">
+    <widget class="QLabel" name="pot2Label">
      <property name="text">
-      <string>PPM Multiplier</string>
+      <string>S2</string>
      </property>
     </widget>
    </item>
    <item row="43" column="1">
-    <widget class="QSpinBox" name="PPM4">
-     <property name="toolTip">
-      <string/>
-     </property>
-     <property name="statusTip">
-      <string/>
-     </property>
-     <property name="whatsThis">
-      <string/>
-     </property>
-     <property name="minimum">
-      <number>-9999</number>
-     </property>
-     <property name="maximum">
-      <number>9999</number>
-     </property>
-    </widget>
-   </item>
-   <item row="24" column="2">
-    <widget class="AutoComboBox" name="slType">
-     <property name="toolTip">
-      <string/>
-     </property>
-     <property name="statusTip">
-      <string/>
-     </property>
-     <property name="whatsThis">
-      <string/>
-     </property>
-    </widget>
-   </item>
-   <item row="37" column="0">
-    <widget class="QLabel" name="txCurrentCalibrationLabel">
-     <property name="text">
-      <string>Current Offset</string>
-     </property>
-    </widget>
-   </item>
-   <item row="43" column="0">
-    <widget class="QLabel" name="label_35">
-     <property name="text">
-      <string>PPM 4</string>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="1">
-    <widget class="AutoLineEdit" name="ailName">
-     <property name="maxLength">
-      <number>3</number>
-     </property>
-    </widget>
-   </item>
-   <item row="13" column="0">
-    <widget class="QLabel" name="saLabel">
-     <property name="text">
-      <string>SA</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="0">
-    <widget class="QLabel" name="eleLabel">
-     <property name="text">
-      <string>Ele</string>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="1">
-    <widget class="AutoLineEdit" name="thrName">
-     <property name="maxLength">
-      <number>3</number>
-     </property>
-    </widget>
-   </item>
-   <item row="8" column="1">
-    <widget class="AutoLineEdit" name="lsName">
-     <property name="maxLength">
-      <number>3</number>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="0">
-    <widget class="QLabel" name="ailLabel">
-     <property name="text">
-      <string>Ail</string>
-     </property>
-    </widget>
-   </item>
-   <item row="9" column="1">
-    <widget class="AutoLineEdit" name="rsName">
-     <property name="maxLength">
-      <number>3</number>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="0">
-    <widget class="QLabel" name="thrLabel">
-     <property name="text">
-      <string>Thr</string>
-     </property>
-    </widget>
-   </item>
-   <item row="15" column="1">
-    <widget class="AutoLineEdit" name="scName">
-     <property name="maxLength">
-      <number>3</number>
-     </property>
-    </widget>
-   </item>
-   <item row="15" column="0">
-    <widget class="QLabel" name="scLabel">
-     <property name="text">
-      <string>SC</string>
-     </property>
-    </widget>
-   </item>
-   <item row="16" column="1">
-    <widget class="AutoLineEdit" name="sdName">
-     <property name="maxLength">
-      <number>3</number>
-     </property>
-    </widget>
-   </item>
-   <item row="8" column="0">
-    <widget class="QLabel" name="lsLabel">
-     <property name="text">
-      <string>LS</string>
-     </property>
-    </widget>
-   </item>
-   <item row="17" column="1">
-    <widget class="AutoLineEdit" name="seName">
-     <property name="maxLength">
-      <number>3</number>
-     </property>
-    </widget>
-   </item>
-   <item row="15" column="2">
-    <widget class="AutoComboBox" name="scType">
-     <property name="toolTip">
-      <string/>
-     </property>
-     <property name="statusTip">
-      <string/>
-     </property>
-     <property name="whatsThis">
-      <string/>
-     </property>
-    </widget>
-   </item>
-   <item row="18" column="1">
-    <widget class="AutoLineEdit" name="sfName">
-     <property name="maxLength">
-      <number>3</number>
-     </property>
-    </widget>
-   </item>
-   <item row="16" column="0">
-    <widget class="QLabel" name="sdLabel">
-     <property name="text">
-      <string>SD</string>
-     </property>
-    </widget>
-   </item>
-   <item row="16" column="2">
-    <widget class="AutoComboBox" name="sdType">
-     <property name="toolTip">
-      <string/>
-     </property>
-     <property name="statusTip">
-      <string/>
-     </property>
-     <property name="whatsThis">
-      <string/>
-     </property>
-    </widget>
-   </item>
-   <item row="41" column="1">
-    <widget class="QSpinBox" name="PPM2">
-     <property name="toolTip">
-      <string/>
-     </property>
-     <property name="statusTip">
-      <string/>
-     </property>
-     <property name="whatsThis">
-      <string/>
-     </property>
-     <property name="minimum">
-      <number>-9999</number>
-     </property>
-     <property name="maximum">
-      <number>9999</number>
-     </property>
-    </widget>
-   </item>
-   <item row="36" column="0">
-    <widget class="QLabel" name="txVoltageCalibrationLabel">
-     <property name="text">
-      <string>Battery Offset</string>
-     </property>
-    </widget>
-   </item>
-   <item row="42" column="1">
     <widget class="QSpinBox" name="PPM3">
      <property name="toolTip">
       <string/>
@@ -557,310 +517,7 @@
      </property>
     </widget>
    </item>
-   <item row="19" column="1">
-    <widget class="AutoLineEdit" name="sgName">
-     <property name="maxLength">
-      <number>3</number>
-     </property>
-    </widget>
-   </item>
-   <item row="17" column="0">
-    <widget class="QLabel" name="seLabel">
-     <property name="text">
-      <string>SE</string>
-     </property>
-    </widget>
-   </item>
-   <item row="17" column="2">
-    <widget class="AutoComboBox" name="seType">
-     <property name="toolTip">
-      <string/>
-     </property>
-     <property name="statusTip">
-      <string/>
-     </property>
-     <property name="whatsThis">
-      <string/>
-     </property>
-    </widget>
-   </item>
-   <item row="20" column="1">
-    <widget class="AutoLineEdit" name="shName">
-     <property name="maxLength">
-      <number>3</number>
-     </property>
-    </widget>
-   </item>
-   <item row="18" column="0">
-    <widget class="QLabel" name="sfLabel">
-     <property name="text">
-      <string>SF</string>
-     </property>
-    </widget>
-   </item>
-   <item row="18" column="2">
-    <widget class="AutoComboBox" name="sfType">
-     <property name="toolTip">
-      <string/>
-     </property>
-     <property name="statusTip">
-      <string/>
-     </property>
-     <property name="whatsThis">
-      <string/>
-     </property>
-    </widget>
-   </item>
-   <item row="21" column="1">
-    <widget class="AutoLineEdit" name="siName">
-     <property name="maxLength">
-      <number>3</number>
-     </property>
-    </widget>
-   </item>
-   <item row="19" column="0">
-    <widget class="QLabel" name="sgLabel">
-     <property name="text">
-      <string>SG</string>
-     </property>
-    </widget>
-   </item>
-   <item row="19" column="2">
-    <widget class="AutoComboBox" name="sgType">
-     <property name="toolTip">
-      <string/>
-     </property>
-     <property name="statusTip">
-      <string/>
-     </property>
-     <property name="whatsThis">
-      <string/>
-     </property>
-    </widget>
-   </item>
-   <item row="22" column="1">
-    <widget class="AutoLineEdit" name="sjName">
-     <property name="maxLength">
-      <number>3</number>
-     </property>
-    </widget>
-   </item>
-   <item row="20" column="0">
-    <widget class="QLabel" name="shLabel">
-     <property name="text">
-      <string>SH</string>
-     </property>
-    </widget>
-   </item>
-   <item row="23" column="1">
-    <widget class="AutoLineEdit" name="skName">
-     <property name="maxLength">
-      <number>3</number>
-     </property>
-    </widget>
-   </item>
-   <item row="21" column="0">
-    <widget class="QLabel" name="siLabel">
-     <property name="text">
-      <string>SI</string>
-     </property>
-    </widget>
-   </item>
-   <item row="24" column="1">
-    <widget class="AutoLineEdit" name="slName">
-     <property name="maxLength">
-      <number>3</number>
-     </property>
-    </widget>
-   </item>
-   <item row="22" column="0">
-    <widget class="QLabel" name="sjLabel">
-     <property name="text">
-      <string>SJ</string>
-     </property>
-    </widget>
-   </item>
-   <item row="25" column="1">
-    <widget class="AutoLineEdit" name="smName">
-     <property name="maxLength">
-      <number>3</number>
-     </property>
-    </widget>
-   </item>
-   <item row="23" column="0">
-    <widget class="QLabel" name="skLabel">
-     <property name="text">
-      <string>SK</string>
-     </property>
-    </widget>
-   </item>
-   <item row="26" column="1">
-    <widget class="AutoLineEdit" name="snName">
-     <property name="maxLength">
-      <number>3</number>
-     </property>
-    </widget>
-   </item>
-   <item row="24" column="0">
-    <widget class="QLabel" name="slLabel">
-     <property name="text">
-      <string>SL</string>
-     </property>
-    </widget>
-   </item>
-   <item row="25" column="0">
-    <widget class="QLabel" name="smLabel">
-     <property name="text">
-      <string>SM</string>
-     </property>
-    </widget>
-   </item>
-   <item row="11" column="1">
-    <widget class="AutoLineEdit" name="rs2Name">
-     <property name="maxLength">
-      <number>3</number>
-     </property>
-    </widget>
-   </item>
-   <item row="26" column="0">
-    <widget class="QLabel" name="snLabel">
-     <property name="text">
-      <string>SN</string>
-     </property>
-    </widget>
-   </item>
-   <item row="44" column="1">
-    <widget class="QDoubleSpinBox" name="PPM_MultiplierDSB">
-     <property name="decimals">
-      <number>1</number>
-     </property>
-     <property name="maximum">
-      <double>5.000000000000000</double>
-     </property>
-     <property name="value">
-      <double>1.000000000000000</double>
-     </property>
-    </widget>
-   </item>
-   <item row="10" column="1">
-    <widget class="AutoLineEdit" name="ls2Name">
-     <property name="maxLength">
-      <number>3</number>
-     </property>
-    </widget>
-   </item>
-   <item row="11" column="0">
-    <widget class="QLabel" name="rs2Label">
-     <property name="text">
-      <string>RS2</string>
-     </property>
-    </widget>
-   </item>
-   <item row="20" column="2">
-    <widget class="AutoComboBox" name="shType">
-     <property name="toolTip">
-      <string/>
-     </property>
-     <property name="statusTip">
-      <string/>
-     </property>
-     <property name="whatsThis">
-      <string/>
-     </property>
-    </widget>
-   </item>
-   <item row="21" column="2">
-    <widget class="AutoComboBox" name="siType">
-     <property name="toolTip">
-      <string/>
-     </property>
-     <property name="statusTip">
-      <string/>
-     </property>
-     <property name="whatsThis">
-      <string/>
-     </property>
-    </widget>
-   </item>
-   <item row="22" column="2">
-    <widget class="AutoComboBox" name="sjType">
-     <property name="toolTip">
-      <string/>
-     </property>
-     <property name="statusTip">
-      <string/>
-     </property>
-     <property name="whatsThis">
-      <string/>
-     </property>
-    </widget>
-   </item>
-   <item row="25" column="2">
-    <widget class="AutoComboBox" name="smType">
-     <property name="toolTip">
-      <string/>
-     </property>
-     <property name="statusTip">
-      <string/>
-     </property>
-     <property name="whatsThis">
-      <string/>
-     </property>
-    </widget>
-   </item>
-   <item row="26" column="2">
-    <widget class="AutoComboBox" name="snType">
-     <property name="toolTip">
-      <string/>
-     </property>
-     <property name="statusTip">
-      <string/>
-     </property>
-     <property name="whatsThis">
-      <string/>
-     </property>
-    </widget>
-   </item>
-   <item row="27" column="2">
-    <widget class="AutoComboBox" name="soType">
-     <property name="toolTip">
-      <string/>
-     </property>
-     <property name="statusTip">
-      <string/>
-     </property>
-     <property name="whatsThis">
-      <string/>
-     </property>
-    </widget>
-   </item>
-   <item row="28" column="2">
-    <widget class="AutoComboBox" name="spType">
-     <property name="toolTip">
-      <string/>
-     </property>
-     <property name="statusTip">
-      <string/>
-     </property>
-     <property name="whatsThis">
-      <string/>
-     </property>
-    </widget>
-   </item>
-   <item row="29" column="2">
-    <widget class="AutoComboBox" name="sqType">
-     <property name="toolTip">
-      <string/>
-     </property>
-     <property name="statusTip">
-      <string/>
-     </property>
-     <property name="whatsThis">
-      <string/>
-     </property>
-    </widget>
-   </item>
-   <item row="30" column="2">
+   <item row="31" column="2">
     <widget class="AutoComboBox" name="srType">
      <property name="toolTip">
       <string/>
@@ -873,56 +530,6 @@
      </property>
     </widget>
    </item>
-   <item row="11" column="2">
-    <widget class="AutoComboBox" name="rs2Type">
-     <property name="toolTip">
-      <string/>
-     </property>
-     <property name="statusTip">
-      <string/>
-     </property>
-    </widget>
-   </item>
-   <item row="10" column="2">
-    <widget class="AutoComboBox" name="ls2Type">
-     <property name="toolTip">
-      <string/>
-     </property>
-     <property name="statusTip">
-      <string/>
-     </property>
-    </widget>
-   </item>
-   <item row="9" column="2">
-    <widget class="AutoComboBox" name="rsType">
-     <property name="toolTip">
-      <string/>
-     </property>
-     <property name="statusTip">
-      <string/>
-     </property>
-    </widget>
-   </item>
-   <item row="8" column="2">
-    <widget class="AutoComboBox" name="lsType">
-     <property name="toolTip">
-      <string/>
-     </property>
-     <property name="statusTip">
-      <string/>
-     </property>
-    </widget>
-   </item>
-   <item row="7" column="2">
-    <widget class="AutoComboBox" name="pot4Type">
-     <property name="toolTip">
-      <string/>
-     </property>
-     <property name="statusTip">
-      <string/>
-     </property>
-    </widget>
-   </item>
    <item row="6" column="2">
     <widget class="AutoComboBox" name="pot3Type">
      <property name="toolTip">
@@ -933,64 +540,159 @@
      </property>
     </widget>
    </item>
-   <item row="5" column="2">
-    <widget class="AutoComboBox" name="pot2Type">
-     <property name="toolTip">
-      <string/>
-     </property>
-     <property name="statusTip">
-      <string/>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="2">
-    <widget class="AutoComboBox" name="pot1Type">
-     <property name="toolTip">
-      <string/>
-     </property>
-     <property name="statusTip">
-      <string/>
-     </property>
-    </widget>
-   </item>
-   <item row="32" column="0">
-    <widget class="QLabel" name="bluetoothLabel">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
+   <item row="14" column="0">
+    <widget class="QLabel" name="saLabel">
      <property name="text">
-      <string>Bluetooth</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+      <string>SA</string>
      </property>
     </widget>
    </item>
-   <item row="30" column="1">
-    <widget class="AutoLineEdit" name="srName">
+   <item row="16" column="1">
+    <widget class="AutoLineEdit" name="scName">
+     <property name="maxLength">
+      <number>3</number>
+     </property>
+    </widget>
+   </item>
+   <item row="25" column="2">
+    <widget class="AutoComboBox" name="slType">
+     <property name="toolTip">
+      <string/>
+     </property>
+     <property name="statusTip">
+      <string/>
+     </property>
+     <property name="whatsThis">
+      <string/>
+     </property>
+    </widget>
+   </item>
+   <item row="20" column="2">
+    <widget class="AutoComboBox" name="sgType">
+     <property name="toolTip">
+      <string/>
+     </property>
+     <property name="statusTip">
+      <string/>
+     </property>
+     <property name="whatsThis">
+      <string/>
+     </property>
+    </widget>
+   </item>
+   <item row="13" column="0" colspan="3">
+    <widget class="Line" name="potsTypeSeparator_1">
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>10</height>
+      </size>
+     </property>
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="11" column="1">
+    <widget class="AutoLineEdit" name="ls2Name">
+     <property name="maxLength">
+      <number>3</number>
+     </property>
+    </widget>
+   </item>
+   <item row="21" column="0">
+    <widget class="QLabel" name="shLabel">
+     <property name="text">
+      <string>SH</string>
+     </property>
+    </widget>
+   </item>
+   <item row="29" column="0">
+    <widget class="QLabel" name="spLabel">
+     <property name="text">
+      <string>SP</string>
+     </property>
+    </widget>
+   </item>
+   <item row="45" column="1">
+    <widget class="QDoubleSpinBox" name="PPM_MultiplierDSB">
+     <property name="decimals">
+      <number>1</number>
+     </property>
+     <property name="maximum">
+      <double>5.000000000000000</double>
+     </property>
+     <property name="value">
+      <double>1.000000000000000</double>
+     </property>
+    </widget>
+   </item>
+   <item row="28" column="1">
+    <widget class="AutoLineEdit" name="soName">
+     <property name="maxLength">
+      <number>3</number>
+     </property>
+    </widget>
+   </item>
+   <item row="12" column="1">
+    <widget class="AutoLineEdit" name="rs2Name">
+     <property name="maxLength">
+      <number>3</number>
+     </property>
+    </widget>
+   </item>
+   <item row="25" column="1">
+    <widget class="AutoLineEdit" name="slName">
+     <property name="maxLength">
+      <number>3</number>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="1">
+    <widget class="AutoLineEdit" name="pot1Name">
+     <property name="maxLength">
+      <number>3</number>
+     </property>
+    </widget>
+   </item>
+   <item row="38" column="1">
+    <widget class="QSpinBox" name="txCurrentCalibration">
+     <property name="minimum">
+      <number>-49</number>
+     </property>
+     <property name="maximum">
+      <number>49</number>
+     </property>
+    </widget>
+   </item>
+   <item row="26" column="2">
+    <widget class="AutoComboBox" name="smType">
+     <property name="toolTip">
+      <string/>
+     </property>
+     <property name="statusTip">
+      <string/>
+     </property>
+     <property name="whatsThis">
+      <string/>
+     </property>
+    </widget>
+   </item>
+   <item row="44" column="0">
+    <widget class="QLabel" name="label_35">
+     <property name="text">
+      <string>PPM 4</string>
+     </property>
+    </widget>
+   </item>
+   <item row="6" column="1">
+    <widget class="AutoLineEdit" name="pot3Name">
      <property name="maxLength">
       <number>3</number>
      </property>
     </widget>
    </item>
    <item row="33" column="1">
-    <widget class="QCheckBox" name="filterEnable">
-     <property name="text">
-      <string/>
-     </property>
-    </widget>
-   </item>
-   <item row="33" column="0">
-    <widget class="QLabel" name="filterLabel">
-     <property name="text">
-      <string>ADC Filter</string>
-     </property>
-    </widget>
-   </item>
-   <item row="32" column="1">
     <widget class="QWidget" name="bluetoothWidget" native="true">
      <layout class="QHBoxLayout" name="horizontalLayout">
       <property name="spacing">
@@ -1048,7 +750,7 @@
      </layout>
     </widget>
    </item>
-   <item row="31" column="0" colspan="3">
+   <item row="32" column="0" colspan="3">
     <widget class="Line" name="potsTypeSeparator_2">
      <property name="minimumSize">
       <size>
@@ -1061,32 +763,343 @@
      </property>
     </widget>
    </item>
-   <item row="38" column="0" colspan="3">
-    <widget class="Line" name="ppmSeparator">
-     <property name="minimumSize">
-      <size>
-       <width>0</width>
-       <height>10</height>
-      </size>
-     </property>
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
+   <item row="34" column="0">
+    <widget class="QLabel" name="filterLabel">
+     <property name="text">
+      <string>ADC Filter</string>
      </property>
     </widget>
    </item>
-   <item row="12" column="0" colspan="3">
-    <widget class="Line" name="potsTypeSeparator_1">
-     <property name="minimumSize">
-      <size>
-       <width>0</width>
-       <height>10</height>
-      </size>
-     </property>
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
+   <item row="19" column="0">
+    <widget class="QLabel" name="sfLabel">
+     <property name="text">
+      <string>SF</string>
      </property>
     </widget>
    </item>
+   <item row="27" column="2">
+    <widget class="AutoComboBox" name="snType">
+     <property name="toolTip">
+      <string/>
+     </property>
+     <property name="statusTip">
+      <string/>
+     </property>
+     <property name="whatsThis">
+      <string/>
+     </property>
+    </widget>
+   </item>
+   <item row="7" column="2">
+    <widget class="AutoComboBox" name="pot4Type">
+     <property name="toolTip">
+      <string/>
+     </property>
+     <property name="statusTip">
+      <string/>
+     </property>
+    </widget>
+   </item>
+   <item row="24" column="2">
+    <widget class="AutoComboBox" name="skType">
+     <property name="toolTip">
+      <string/>
+     </property>
+     <property name="statusTip">
+      <string/>
+     </property>
+     <property name="whatsThis">
+      <string/>
+     </property>
+    </widget>
+   </item>
+   <item row="14" column="1">
+    <widget class="AutoLineEdit" name="saName">
+     <property name="maxLength">
+      <number>3</number>
+     </property>
+    </widget>
+   </item>
+   <item row="31" column="0">
+    <widget class="QLabel" name="srLabel">
+     <property name="text">
+      <string>SR</string>
+     </property>
+    </widget>
+   </item>
+   <item row="12" column="2">
+    <widget class="AutoComboBox" name="rs2Type">
+     <property name="toolTip">
+      <string/>
+     </property>
+     <property name="statusTip">
+      <string/>
+     </property>
+    </widget>
+   </item>
+   <item row="10" column="2">
+    <widget class="AutoComboBox" name="rsType">
+     <property name="toolTip">
+      <string/>
+     </property>
+     <property name="statusTip">
+      <string/>
+     </property>
+    </widget>
+   </item>
+   <item row="14" column="2">
+    <widget class="AutoComboBox" name="saType">
+     <property name="toolTip">
+      <string/>
+     </property>
+     <property name="statusTip">
+      <string/>
+     </property>
+    </widget>
+   </item>
+   <item row="20" column="0">
+    <widget class="QLabel" name="sgLabel">
+     <property name="text">
+      <string>SG</string>
+     </property>
+    </widget>
+   </item>
+   <item row="43" column="0">
+    <widget class="QLabel" name="label_34">
+     <property name="text">
+      <string>PPM 3</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1">
+    <widget class="AutoLineEdit" name="thrName">
+     <property name="maxLength">
+      <number>3</number>
+     </property>
+    </widget>
+   </item>
+   <item row="24" column="0">
+    <widget class="QLabel" name="skLabel">
+     <property name="text">
+      <string>SK</string>
+     </property>
+    </widget>
+   </item>
+   <item row="24" column="1">
+    <widget class="AutoLineEdit" name="skName">
+     <property name="maxLength">
+      <number>3</number>
+     </property>
+    </widget>
+   </item>
+   <item row="21" column="2">
+    <widget class="AutoComboBox" name="shType">
+     <property name="toolTip">
+      <string/>
+     </property>
+     <property name="statusTip">
+      <string/>
+     </property>
+     <property name="whatsThis">
+      <string/>
+     </property>
+    </widget>
+   </item>
+   <item row="10" column="0">
+    <widget class="QLabel" name="rsLabel">
+     <property name="text">
+      <string>RS</string>
+     </property>
+    </widget>
+   </item>
+   <item row="9" column="0">
+    <widget class="QLabel" name="lsLabel">
+     <property name="text">
+      <string>LS</string>
+     </property>
+    </widget>
+   </item>
+   <item row="37" column="0">
+    <widget class="QLabel" name="txVoltageCalibrationLabel">
+     <property name="text">
+      <string>Battery Offset</string>
+     </property>
+    </widget>
+   </item>
+   <item row="22" column="0">
+    <widget class="QLabel" name="siLabel">
+     <property name="text">
+      <string>SI</string>
+     </property>
+    </widget>
+   </item>
+   <item row="22" column="2">
+    <widget class="AutoComboBox" name="siType">
+     <property name="toolTip">
+      <string/>
+     </property>
+     <property name="statusTip">
+      <string/>
+     </property>
+     <property name="whatsThis">
+      <string/>
+     </property>
+    </widget>
+   </item>
+   <item row="44" column="1">
+    <widget class="QSpinBox" name="PPM4">
+     <property name="toolTip">
+      <string/>
+     </property>
+     <property name="statusTip">
+      <string/>
+     </property>
+     <property name="whatsThis">
+      <string/>
+     </property>
+     <property name="minimum">
+      <number>-9999</number>
+     </property>
+     <property name="maximum">
+      <number>9999</number>
+     </property>
+    </widget>
+   </item>
+   <item row="16" column="2">
+    <widget class="AutoComboBox" name="scType">
+     <property name="toolTip">
+      <string/>
+     </property>
+     <property name="statusTip">
+      <string/>
+     </property>
+     <property name="whatsThis">
+      <string/>
+     </property>
+    </widget>
+   </item>
+   <item row="40" column="1">
+    <widget class="QSpinBox" name="PPM1">
+     <property name="toolTip">
+      <string/>
+     </property>
+     <property name="statusTip">
+      <string/>
+     </property>
+     <property name="whatsThis">
+      <string/>
+     </property>
+     <property name="minimum">
+      <number>-9999</number>
+     </property>
+     <property name="maximum">
+      <number>9999</number>
+     </property>
+    </widget>
+   </item>
+   <item row="18" column="2">
+    <widget class="AutoComboBox" name="seType">
+     <property name="toolTip">
+      <string/>
+     </property>
+     <property name="statusTip">
+      <string/>
+     </property>
+     <property name="whatsThis">
+      <string/>
+     </property>
+    </widget>
+   </item>
+   <item row="11" column="0">
+    <widget class="QLabel" name="ls2Label">
+     <property name="text">
+      <string>LS2</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <widget class="QLabel" name="eleLabel">
+     <property name="text">
+      <string>Ele</string>
+     </property>
+    </widget>
+   </item>
+   <item row="31" column="1">
+    <widget class="AutoLineEdit" name="srName">
+     <property name="maxLength">
+      <number>3</number>
+     </property>
+    </widget>
+   </item>
+   <item row="18" column="0">
+    <widget class="QLabel" name="seLabel">
+     <property name="text">
+      <string>SE</string>
+     </property>
+    </widget>
+   </item>
+   <item row="19" column="1">
+    <widget class="AutoLineEdit" name="sfName">
+     <property name="maxLength">
+      <number>3</number>
+     </property>
+    </widget>
+   </item>
+   <item row="27" column="0">
+    <widget class="QLabel" name="snLabel">
+     <property name="text">
+      <string>SN</string>
+     </property>
+    </widget>
+   </item>
+   <item row="29" column="1">
+    <widget class="AutoLineEdit" name="spName">
+     <property name="maxLength">
+      <number>3</number>
+     </property>
+    </widget>
+   </item>
+   <item row="22" column="1">
+    <widget class="AutoLineEdit" name="siName">
+     <property name="maxLength">
+      <number>3</number>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0">
+    <widget class="QLabel" name="thrLabel">
+     <property name="text">
+      <string>Thr</string>
+     </property>
+    </widget>
+   </item>
+   <item row="38" column="0">
+    <widget class="QLabel" name="txCurrentCalibrationLabel">
+     <property name="text">
+      <string>Current Offset</string>
+     </property>
+    </widget>
+   </item>
+   <item row="28" column="0">
+    <widget class="QLabel" name="soLabel">
+     <property name="text">
+      <string>SO</string>
+     </property>
+    </widget>
+   </item>
+   <item row="8" column="0">
+    <widget class="QLabel" name="pot5Label">
+     <property name="text">
+      <string>S5</string>
+     </property>
+    </widget>
+   </item>
+   <item row="8" column="1">
+    <widget class="AutoLineEdit" name="pot5Name"/>
+   </item>
+   <item row="8" column="2">
+    <widget class="AutoComboBox" name="pot5Type"/>
+   </item>
   </layout>
  </widget>
  <customwidgets>
diff --git a/radio/src/storage/conversions/conversions_218_219.cpp b/radio/src/storage/conversions/conversions_218_219.cpp
index 985d434aa..618d52887 100644
--- a/radio/src/storage/conversions/conversions_218_219.cpp
+++ b/radio/src/storage/conversions/conversions_218_219.cpp
@@ -342,22 +342,30 @@ void convertRadioData_218_to_219(RadioData & settings)
 #endif
 
 #if defined(PCBHORUS)
+  // 2 new pots from X10:
+  //  - copy btw. 'chkSum' and 'auxSerialMode' (excl.)
   memcpy(&settings.chkSum, &oldSettings.chkSum, offsetof(RadioData, auxSerialMode) - offsetof(RadioData, chkSum));
+  //  - move calibration data
   memcpy(&settings.calib[NUM_STICKS + 5], &oldSettings.calib[NUM_STICKS + 3], sizeof(CalibData) * (STORAGE_NUM_SLIDERS + STORAGE_NUM_MOUSE_ANALOGS));
   memclear(&settings.calib[NUM_STICKS + 3], sizeof(CalibData) * 2);
 
+  // move fields after custom functions
   settings.auxSerialMode = oldSettings.auxSerialMode;
   settings.switchConfig = oldSettings.switchConfig;
   settings.potsConfig = oldSettings.potsConfig;
   settings.slidersConfig = oldSettings.slidersConfig;
 
+  // 2 new switches
   memcpy(&settings.switchNames[0], &oldSettings.switchNames[0], 8 * LEN_SWITCH_NAME);
   memclear(&settings.switchNames[8], 2 * LEN_SWITCH_NAME);
 
+  // 2 new pots for X10
+  //  - split 'anaNames' (sticks + 3 old pots, 2 new pots, other old analogs)
   memcpy(&settings.anaNames[0], &oldSettings.anaNames[0], (NUM_STICKS + 3) * LEN_ANA_NAME);
   memclear(&settings.anaNames[NUM_STICKS + 3], 2 * LEN_SWITCH_NAME);
   memcpy(&settings.anaNames[NUM_STICKS + 5], &oldSettings.anaNames[NUM_STICKS + 3], STORAGE_NUM_SLIDERS * LEN_ANA_NAME);
 
+  //  - copy rest of RadioData struct
   memcpy(&settings.currModelFilename[0], &oldSettings.currModelFilename[0], sizeof(RadioData_v218) - offsetof(RadioData_v218, currModelFilename[0]));
 #endif