diff --git a/companion/src/firmwares/eeprominterface.h b/companion/src/firmwares/eeprominterface.h
index 4377e500992..0dc3fd061d6 100644
--- a/companion/src/firmwares/eeprominterface.h
+++ b/companion/src/firmwares/eeprominterface.h
@@ -47,133 +47,114 @@ const uint8_t modn12x3[8][4]= {
 };
 
 enum Capability {
-  Models,
-  ModelName,
-  FlightModes,
-  FlightModesName,
-  FlightModesHaveFades,
-  Imperial,
-  Mixes,
-  Timers,
-  TimersName,
-  VoicesAsNumbers,
-  VoicesMaxLength,
-  MultiLangVoice,
-  HasModelImage,
-  ModelImageNameLen,
-  ModelImageFilters,
-  ModelImageKeepExtn,
-  CustomFunctions,
-  SafetyChannelCustomFunction,
-  LogicalSwitches,
-  CustomAndSwitches,
-  HasNegAndSwitches,
-  LogicalSwitchesExt,
-  Outputs,
+  BacklightLevelMin,
   ChannelsName,
-  ExtraInputs,
-  TrimsRange,
+  CustomAndSwitches,
+  CustomFunctions,
+  DangerousFunctions,
   ExtendedTrimsRange,
-  NumCurves,
-  NumCurvePoints,
-  OffsetWeight,
-  Simulation,
-  SoundMod,
-  SoundPitch,
-  MaxVolume,
-  MaxContrast,
-  MinContrast,
-  Haptic,
-  HasBeeper,
-  ModelTrainerEnable,
-  HasExpoNames,
-  HasNoExpo,
-  HasMixerNames,
-  HasCvNames,
-  HasPxxCountry,
-  HasPPMStart,
-  HasGeneralUnits,
-  HasFAIMode,
-  OptrexDisplay,
-  PPMExtCtrl,
-  PPMFrameLength,
-  Telemetry,
-  TelemetryUnits,
-  TelemetryBars,
-  Heli,
+  FlightModes,
+  FlightModesHaveFades,
+  FlightModesName,
+  GetThrSwitch,
+  GlobalFunctions,
   Gvars,
-  GvarsInCS,
-  GvarsAreNamed,
   GvarsFlightModes,
+  GvarsInCS,
   GvarsName,
-  NoTelemetryProtocol,
-  TelemetryCustomScreens,
-  TelemetryCustomScreensBars,
-  TelemetryCustomScreensLines,
-  TelemetryCustomScreensFieldsPerLine,
-  TelemetryMaxMultiplier,
-  HasVario,
-  HasVarioSink,
+  Haptic,
+  HasADCJitterFilter,
+  HasAux2SerialMode,
+  HasAuxSerialMode,
+  HasBatMeterRange,
+  HasBeeper,
+  HasBluetooth,
+  HasBrightness,
+  HasDisplayText,
+  HasExpoNames,
   HasFailsafe,
-  HasSoundMixer,
-  NumModules,
-  NumFirstUsableModule,
+  HasFAIMode,
+  HasFlySkyGimbals,
+  HasGeneralUnits,
+  HasInputDiff,
+  HasIntModuleCRSF,
+  HasIntModuleELRS,
+  HasIntModuleFlySky,
+  HasIntModuleMulti,
+  HasMixerExpo,
+  HasMixerNames,
+  HasModelImage,
+  HasModelLabels,
+  HasModelsList,
   HasModuleR9MFlex,
   HasModuleR9MMini,
-  PPMCenter,
-  SYMLimits,
-  HastxCurrentCalibration,
-  HasVolume,
-  HasBrightness,
-  PerModelTimers,
-  SlowScale,
-  SlowRange,
-  PermTimers,
+  HasNoExpo,
+  HasPPMStart,
+  HasPxxCountry,
   HasSDLogs,
-  CSFunc,
-  GetThrSwitch,
-  HasDisplayText,
+  HasSoftwareSerialPower,
+  HasSoundMixer,
+  HasSportConnector,
+  HasSwitchableJack,
+  HasTelemetryBaudrate,
   HasTopLcd,
-  GlobalFunctions,
-  VirtualInputs,
+  HasVario,
+  HasVarioSink,
+  HasVCPSerialMode,
+  HasVolume,
+  Heli,
+  Imperial,
   InputsLength,
-  TrainerInputs,
-  SportTelemetry,
-  LuaScripts,
+  KeyShortcuts,
+  LogicalSwitches,
+  LogicalSwitchesExt,
   LuaInputsPerScript,
   LuaOutputsPerScript,
-  LimitsPer1000,
-  EnhancedCurves,
-  HasFasOffset,
-  HasMahPersistent,
+  LuaScripts,
   MavlinkTelemetry,
-  HasInputDiff,
-  HasMixerExpo,
-  HasBatMeterRange,
-  DangerousFunctions,
-  HasModelLabels,
-  HasSwitchableJack,
-  HasSportConnector,
+  MaxContrast,
+  MaxVolume,
+  MinContrast,
+  Mixes,
+  ModelImageFilters,
+  ModelImageKeepExtn,
+  ModelImageNameLen,
+  ModelName,
+  Models,
+  ModelTrainerEnable,
+  MultiLangVoice,
+  NoTelemetryProtocol,
+  NumCurvePoints,
+  NumCurves,
+  NumFirstUsableModule,
+  NumModules,
+  OffsetWeight,
+  Outputs,
+  PermTimers,
+  PPMCenter,
+  PPMFrameLength,
   PwrButtonPress,
+  QMFavourites,
+  RotaryEncoderNavigation,
+  SafetyChannelCustomFunction,
   Sensors,
-  HasAuxSerialMode,
-  HasAux2SerialMode,
-  HasVCPSerialMode,
-  HasBluetooth,
-  HasADCJitterFilter,
-  HasTelemetryBaudrate,
+  SlowRange,
+  SlowScale,
+  SoundPitch,
+  SYMLimits,
+  Telemetry,
+  TelemetryCustomScreens,
+  TelemetryCustomScreensBars,
+  TelemetryCustomScreensFieldsPerLine,
+  TelemetryCustomScreensLines,
+  Timers,
+  TimersName,
   TopBarZones,
-  HasModelsList,
-  HasFlySkyGimbals,
-  RotaryEncoderNavigation,
-  HasSoftwareSerialPower,
-  HasIntModuleMulti,
-  HasIntModuleCRSF,
-  HasIntModuleELRS,
-  HasIntModuleFlySky,
-  BacklightLevelMin,
-  QMFavourites,
-  KeyShortcuts,
+  TrainerInputs,
+  TrimsRange,
+  VirtualInputs,
+  VoicesAsNumbers,
+  VoicesMaxLength,
 };
 
 float ValToTim(int value);
diff --git a/companion/src/firmwares/generalsettings.h b/companion/src/firmwares/generalsettings.h
index f29b6833320..bc65cb15678 100644
--- a/companion/src/firmwares/generalsettings.h
+++ b/companion/src/firmwares/generalsettings.h
@@ -302,7 +302,6 @@ class GeneralSettings {
     unsigned int contrast;
     unsigned int vBatWarn;
     int txVoltageCalibration;
-    int txCurrentCalibration;
     int vBatMin;
     int vBatMax;
     int backlightMode;
@@ -326,7 +325,6 @@ class GeneralSettings {
     int timezone;
     int timezoneMinutes;
     bool adjustRTC;
-    bool optrexDisplay;
     unsigned int inactivityTimer;
     unsigned int internalModuleBaudrate;
     bool minuteBeep;
@@ -342,7 +340,6 @@ class GeneralSettings {
     unsigned int stickReverse;
     unsigned int speakerPitch;
     int hapticStrength;
-    unsigned int speakerMode;
     char ownerName[OWNER_NAME_LEN + 1];
     int beeperLength;
     unsigned int gpsFormat;
diff --git a/companion/src/firmwares/opentx/opentxinterface.cpp b/companion/src/firmwares/opentx/opentxinterface.cpp
index 776abbf70d5..5e54a47cdd5 100644
--- a/companion/src/firmwares/opentx/opentxinterface.cpp
+++ b/companion/src/firmwares/opentx/opentxinterface.cpp
@@ -58,42 +58,34 @@ Firmware * OpenTxFirmware::getFirmwareVariant(const QString &id)
 int OpenTxFirmware::getCapability(::Capability capability)
 {
   switch (capability) {
-    case Models:
-      if (IS_FAMILY_HORUS_OR_T16(board))
-        return 0;
-      else
-        return 60;
-    case Imperial:
-      return 0;
-    case HasModelImage:
-      return (board == BOARD_TARANIS_X9D || IS_TARANIS_PLUS(board) || board == BOARD_TARANIS_X9DP_2019 || IS_FAMILY_HORUS_OR_T16(board));
-    case ModelImageNameLen:
-      return (IS_FAMILY_HORUS_OR_T16(board) ? 14 : 10); //  including extension if saved and <= CPN_MAX_BITMAP_LEN
-    case ModelImageKeepExtn:
-      return (IS_FAMILY_HORUS_OR_T16(board) ? true : false);
-    case HasBeeper:
-      return false;
-    case HasPxxCountry:
-      return 1;
-    case HasGeneralUnits:
-      return true;
-    case HasNegAndSwitches:
-      return true;
-    case PPMExtCtrl:
-      return 1;
-    case PPMFrameLength:
-      return 40;
+    case BacklightLevelMin:
+      if (IS_HORUS_X12S(board)) {
+        return 5;
+      } else if (IS_FAMILY_T16(board) || IS_FLYSKY_NV14(board) || IS_FLYSKY_EL18(board) || IS_FAMILY_PL18(board) || IS_FLYSKY_ST16(board)) {
+        return 1;
+      } else {
+        return 46;
+      }
+    case ChannelsName:
+      return (HAS_LARGE_LCD(board) ? 6 : 4);
+    case CustomAndSwitches:
+      return getCapability(LogicalSwitches);
+    case CustomFunctions:
+      return 64;
+    case DangerousFunctions:
+      return id.contains("danger") ? 1 : 0;
+    case ExtendedTrimsRange:
+      return 512;
     case FlightModes:
       return 9;
     case FlightModesHaveFades:
       return 1;
-    case Heli:
-      if (Boards::getCapability(board, Board::Surface))
-        return false;
-      else if (IS_HORUS_OR_TARANIS(board))
-        return id.contains("noheli") ? 0 : 1;
-      else
-        return id.contains("heli") ? 1 : 0;
+    case FlightModesName:
+      return (IS_HORUS_OR_TARANIS(board) ? 10 : 6);
+    case GetThrSwitch:
+      return (IS_HORUS_OR_TARANIS(board) ? SWITCH_SF1 : SWITCH_THR);
+    case GlobalFunctions:
+      return 64;
     case Gvars:
       if (IS_STM32H7(board) || IS_STM32H5(board))
         return id.contains("nogvars") ? 0 : 15;
@@ -103,195 +95,198 @@ int OpenTxFirmware::getCapability(::Capability capability)
         return 9;
       else
         return 0;
-    case ModelName:
-      return (IS_FAMILY_HORUS_OR_T16(board) ? 15 : (HAS_LARGE_LCD(board) ? 12 : 10));
-    case FlightModesName:
-      return (IS_HORUS_OR_TARANIS(board) ? 10 : 6);
-    case GvarsName:
-      return 3;
-    case GvarsInCS:
-    case HasFAIMode:
-      return 1;
-    case GvarsAreNamed:
     case GvarsFlightModes:
       return 1;
-    case Mixes:
-      return 64;
-    case OffsetWeight:
-      return 500;
-    case Timers:
-      return 3;
-    case TimersName:
-      if (HAS_LARGE_LCD(board))
-        return 8;
-      else
-        return 3;
-    case PermTimers:
-      return true;
-    case CustomFunctions:
-      return 64;
-    case SafetyChannelCustomFunction:
-      return id.contains("nooverridech") ? 0 : 1;
-    case LogicalSwitches:
-      return 64;
-    case CustomAndSwitches:
-      return getCapability(LogicalSwitches);
-    case LogicalSwitchesExt:
-      return true;
-    case Outputs:
-      return 32;
-    case NumCurvePoints:
-      return 512;
-    case VoicesAsNumbers:
-      return 0;
-    case VoicesMaxLength:
-      return 8;
-    case MultiLangVoice:
-      return 1;
-    case SoundPitch:
+    case GvarsInCS:
       return 1;
+    case GvarsName:
+      return 3;
     case Haptic:
       return board != Board::BOARD_TARANIS_X9D || id.contains("haptic");
-    case ModelTrainerEnable:
-      if (IS_HORUS_OR_TARANIS(board) && board!=Board::BOARD_TARANIS_XLITE)
-        return 1;
-      else
-        return 0;
-    case MaxVolume:
-      return 23;
-    case MaxContrast:
-      if (IS_TARANIS_SMALL(board))
-        return 30;
-      else
-        return 45;
-    case MinContrast:
-      if (IS_TARANIS_X9(board))
-        return 0;
-      else
-        return 10;
-    case HasSoundMixer:
-      return 1;
-    case ExtraInputs:
-      return 1;
-    case TrimsRange:
-      return 128;
-    case ExtendedTrimsRange:
-      return 512;
-    case Simulation:
+    case HasADCJitterFilter:
+      return IS_HORUS_OR_TARANIS(board);
+    case HasAux2SerialMode:
+      return IS_FAMILY_T16(board);
+    case HasAuxSerialMode:
+      return (IS_FAMILY_HORUS_OR_T16(board) && !(IS_FLYSKY_NV14(board) || IS_FLYSKY_EL18(board) || IS_FAMILY_PL18(board) || IS_FLYSKY_ST16(board))) ||
+             (IS_TARANIS_X9(board) && !IS_TARANIS_X9DP_2019(board)) ||
+             IS_RADIOMASTER_ZORRO(board) || IS_RADIOMASTER_TX12_MK2(board) || IS_RADIOMASTER_MT12(board);
+    case HasBatMeterRange:
+      return (IS_HORUS_OR_TARANIS(board) ? true : id.contains("battgraph"));
+    case HasBeeper:
+      return false;
+    case HasBluetooth:
+      return (IS_FAMILY_HORUS_OR_T16(board) || IS_TARANIS_X7(board) || IS_TARANIS_XLITE(board)|| IS_TARANIS_X9E(board) ||
+              IS_TARANIS_X9DP_2019(board) || IS_FLYSKY_NV14(board) || IS_FLYSKY_EL18(board) || IS_FAMILY_PL18(board)) ? true : false;
+    case HasBrightness:
+      return true;
+    case HasDisplayText:
       return 1;
-    case NumCurves:
-      return 32;
-    case HasMixerNames:
-      return (IS_TARANIS_X9(board) ? 8 : 6);
     case HasExpoNames:
       return (IS_TARANIS_X9(board) ? 8 : 6);
-    case HasNoExpo:
-      return (IS_HORUS_OR_TARANIS(board) ? false : true);
-    case ChannelsName:
-      return (HAS_LARGE_LCD(board) ? 6 : 4);
-    case HasCvNames:
-      return 1;
-    case Telemetry:
-      return 1;
-    case TelemetryBars:
-      return 1;
-    case TelemetryCustomScreens:
-      if (IS_FAMILY_HORUS_OR_T16(board))
-        return 0;
-      else
-        return 4;
-    case TelemetryCustomScreensBars:
-      return (getCapability(TelemetryCustomScreens) ? 4 : 0);
-    case TelemetryCustomScreensLines:
-      return (getCapability(TelemetryCustomScreens) ? 4 : 0);
-    case TelemetryCustomScreensFieldsPerLine:
-      return HAS_LARGE_LCD(board) ? 3 : 2;
-    case NoTelemetryProtocol:
-      return IS_HORUS_OR_TARANIS(board) ? 1 : 0;
-    case TelemetryUnits:
-      return 0;
-    case TelemetryMaxMultiplier:
-      return 32;
-    case PPMCenter:
-      return (IS_HORUS_OR_TARANIS(board) ? 500 : (id.contains("ppmca") ? 125 : 0));
-    case SYMLimits:
-      return 1;
-    case HasVario:
-      return Boards::isAir(board);
-    case HasVarioSink:
-      return Boards::isAir(board);
     case HasFailsafe:
       return 32;
-    case NumModules:
-      return 2;
-    case NumFirstUsableModule:
-      return (IS_JUMPER_T12(board) && !id.contains("internalmulti") ? 1 : 0);
+    case HasFAIMode:
+      return 1;
+    case HasFlySkyGimbals:
+      return (IS_RADIOMASTER_TX16S(board) && id.contains("flyskygimbals"));
+    case HasGeneralUnits:
+      return true;
+    case HasInputDiff:
+      return (IS_HORUS_OR_TARANIS(board) ? true : false);
+    case HasIntModuleCRSF:
+      return id.contains("internalcrsf");
+    case HasIntModuleELRS:
+      return id.contains("internalelrs") || IS_RADIOMASTER_TX12_MK2(board) ||
+             IS_IFLIGHT_COMMANDO8(board) || IS_RADIOMASTER_BOXER(board) ||
+             IS_RADIOMASTER_POCKET(board) || IS_JUMPER_T20(board) ||
+             IS_RADIOMASTER_MT12(board) || IS_RADIOMASTER_TX15(board) || IS_JUMPER_T15PRO(board);
+    case HasIntModuleFlySky:
+      return  id.contains("afhds2a") || id.contains("afhds3") ||
+              IS_FLYSKY_NV14(board) || IS_FLYSKY_EL18(board) || IS_FAMILY_PL18(board);
+    case HasIntModuleMulti:
+      return id.contains("internalmulti") || IS_RADIOMASTER_TX16S(board) || IS_JUMPER_T18(board) ||
+              IS_RADIOMASTER_TX12(board) || IS_JUMPER_TLITE(board) || IS_BETAFPV_LR3PRO(board) ||
+              (IS_RADIOMASTER_ZORRO(board) && !id.contains("internalelrs")) ||
+              (IS_RADIOMASTER_BOXER(board) && !id.contains("internalelrs")) ||
+              (IS_RADIOMASTER_POCKET(board) && !id.contains("internalelrs")) ||
+              (IS_RADIOMASTER_MT12(board) && !id.contains("internalelrs"));
+    case HasMixerExpo:
+      return (IS_HORUS_OR_TARANIS(board) ? true : false);
+    case HasMixerNames:
+      return (IS_TARANIS_X9(board) ? 8 : 6);
+    case HasModelImage:
+      return (board == BOARD_TARANIS_X9D || IS_TARANIS_PLUS(board) || board == BOARD_TARANIS_X9DP_2019 || IS_FAMILY_HORUS_OR_T16(board));
+    case HasModelLabels:
+      return IS_FAMILY_HORUS_OR_T16(board);
+    case HasModelsList:
+      return IS_FAMILY_HORUS_OR_T16(board);
     case HasModuleR9MFlex:
       return id.contains("flexr9m");
     case HasModuleR9MMini:
       return IS_TARANIS_XLITE(board) && !id.contains("stdr9m");
+    case HasNoExpo:
+      return (IS_HORUS_OR_TARANIS(board) ? false : true);
     case HasPPMStart:
       return true;
-    case HasVolume:
-      return true;
-    case HasBrightness:
-      return true;
-    case PerModelTimers:
+    case HasPxxCountry:
       return 1;
-    case SlowScale:
-      return 10;
-    case SlowRange:
-      return 250;
-    case CSFunc:
-      return 18;
     case HasSDLogs:
       return true;
-    case GetThrSwitch:
-      return (IS_HORUS_OR_TARANIS(board) ? SWITCH_SF1 : SWITCH_THR);
-    case HasDisplayText:
+    case HasSoftwareSerialPower:
+      return IS_RADIOMASTER_TX16S(board);
+    case HasSoundMixer:
       return 1;
+    case HasSportConnector:
+      return IS_ACCESS_RADIO(board, id) || IS_TARANIS_X7(board) || IS_HORUS_X10(board) || IS_TARANIS_XLITE(board);
+    case HasSwitchableJack:
+      return IS_TARANIS_XLITES(board);
+    case HasTelemetryBaudrate:
+      return IS_HORUS_OR_TARANIS(board);
     case HasTopLcd:
       return IS_TARANIS_X9E(board) ? 1 : 0;
-    case GlobalFunctions:
-      return 64;
-    case VirtualInputs:
-      return 32;
+    case HasVario:
+      return Boards::isAir(board);
+    case HasVarioSink:
+      return Boards::isAir(board);
+    case HasVCPSerialMode:
+      return IS_FAMILY_HORUS_OR_T16(board) || IS_RADIOMASTER_ZORRO(board) ||
+             IS_JUMPER_TPRO(board) || IS_RADIOMASTER_TX12_MK2(board) ||
+             IS_RADIOMASTER_BOXER(board) || IS_RADIOMASTER_POCKET(board) ||
+             IS_RADIOMASTER_MT12(board);
+    case HasVolume:
+      return true;
+    case Heli:
+      if (Boards::getCapability(board, Board::Surface))
+        return false;
+      else if (IS_HORUS_OR_TARANIS(board))
+        return id.contains("noheli") ? 0 : 1;
+      else
+        return id.contains("heli") ? 1 : 0;
+    case Imperial:
+      return 0;
     case InputsLength:
       return HAS_LARGE_LCD(board) ? 4 : 3;
-    case TrainerInputs:
-      return 16;
-    case LuaScripts:
-      return IS_HORUS_OR_TARANIS(board) && id.contains("lua") ? 7 : 0;
+    case KeyShortcuts:
+      return VERSION_MAJOR > 2 && Boards::getCapability(board, Board::HasColorLcd) ? MAX_KEYSHORTCUTS : 0;
+    case LogicalSwitches:
+      return 64;
+    case LogicalSwitchesExt:
+      return true;
     case LuaInputsPerScript:
       return IS_HORUS_OR_TARANIS(board) ? 10 : 0;
     case LuaOutputsPerScript:
       return IS_HORUS_OR_TARANIS(board) ? 6 : 0;
-    case LimitsPer1000:
-    case EnhancedCurves:
-      return 1;
-    case HasFasOffset:
-      return true;
-    case HasMahPersistent:
-      return true;
+    case LuaScripts:
+      return IS_HORUS_OR_TARANIS(board) && id.contains("lua") ? 7 : 0;
     case MavlinkTelemetry:
       return id.contains("mavlink") ? 1 : 0;
-    case SportTelemetry:
+    case MaxContrast:
+      if (IS_TARANIS_SMALL(board))
+        return 30;
+      else
+        return 45;
+    case MaxVolume:
+      return 23;
+    case MinContrast:
+      if (IS_TARANIS_X9(board))
+        return 0;
+      else
+        return 10;
+    case Mixes:
+      return 64;
+    case ModelImageKeepExtn:
+      return (IS_FAMILY_HORUS_OR_T16(board) ? true : false);
+    case ModelImageNameLen:
+      return (IS_FAMILY_HORUS_OR_T16(board) ? 14 : 10); //  including extension if saved and <= CPN_MAX_BITMAP_LEN
+    case ModelName:
+      return (IS_FAMILY_HORUS_OR_T16(board) ? 15 : (HAS_LARGE_LCD(board) ? 12 : 10));
+    case Models:
+      if (IS_FAMILY_HORUS_OR_T16(board))
+        return 0;
+      else
+        return 60;
+    case ModelTrainerEnable:
+      if (IS_HORUS_OR_TARANIS(board) && board!=Board::BOARD_TARANIS_XLITE)
+        return 1;
+      else
+        return 0;
+    case MultiLangVoice:
       return 1;
-    case HasInputDiff:
-    case HasMixerExpo:
-      return (IS_HORUS_OR_TARANIS(board) ? true : false);
-    case HasBatMeterRange:
-      return (IS_HORUS_OR_TARANIS(board) ? true : id.contains("battgraph"));
-    case DangerousFunctions:
-      return id.contains("danger") ? 1 : 0;
-    case HasModelLabels:
-      return IS_FAMILY_HORUS_OR_T16(board);
-    case HasSwitchableJack:
-      return IS_TARANIS_XLITES(board);
-    case HasSportConnector:
-      return IS_ACCESS_RADIO(board, id) || IS_TARANIS_X7(board) || IS_HORUS_X10(board) || IS_TARANIS_XLITE(board);
+    case NoTelemetryProtocol:
+      return IS_HORUS_OR_TARANIS(board) ? 1 : 0;
+    case NumCurvePoints:
+      return 512;
+    case NumCurves:
+      return 32;
+    case NumFirstUsableModule:
+      return (IS_JUMPER_T12(board) && !id.contains("internalmulti") ? 1 : 0);
+    case NumModules:
+      return 2;
+    case OffsetWeight:
+      return 500;
+    case Outputs:
+      return 32;
+    case PermTimers:
+      return true;
+    case PPMCenter:
+      return (IS_HORUS_OR_TARANIS(board) ? 500 : (id.contains("ppmca") ? 125 : 0));
+    case PPMFrameLength:
+      return 40;
     case PwrButtonPress:
       return IS_HORUS_OR_TARANIS(board) && (board!=Board::BOARD_TARANIS_X9D) && (board!=Board::BOARD_TARANIS_X9DP);
+    case QMFavourites:
+      return VERSION_MAJOR > 2 && Boards::getCapability(board, Board::HasColorLcd) ? MAX_QMFAVOURITES : 0;
+    case RotaryEncoderNavigation:
+      return (IS_TARANIS_X7(board) || IS_TARANIS_X9DP_2019(board) || IS_TARANIS_X9E(board) || IS_TARANIS_X9LITE(board) ||
+              IS_JUMPER_T15(board) || IS_JUMPER_T18(board) || IS_JUMPER_T20(board) || IS_JUMPER_TPRO(board) ||
+              IS_RADIOMASTER_BOXER(board) || IS_RADIOMASTER_GX12(board) || IS_RADIOMASTER_MT12(board) ||
+              IS_RADIOMASTER_POCKET(board) || IS_RADIOMASTER_TX12(board) || IS_RADIOMASTER_TX12_MK2(board) ||
+              IS_RADIOMASTER_TX16S(board) || IS_RADIOMASTER_ZORRO(board) || IS_RADIOMASTER_TX15(board) || IS_JUMPER_T15PRO(board) ||
+              IS_FLYSKY_PA01(board) || IS_FLYSKY_ST16(board) ||
+              IS_RADIOMASTER_TX16SMK3(board));
+    case SafetyChannelCustomFunction:
+      return id.contains("nooverridech") ? 0 : 1;
     case Sensors:
       if (IS_STM32H7(board))
         return 99;
@@ -299,69 +294,47 @@ int OpenTxFirmware::getCapability(::Capability capability)
         return 60;
       else
         return 40;
-    case HasAuxSerialMode:
-      return (IS_FAMILY_HORUS_OR_T16(board) && !(IS_FLYSKY_NV14(board) || IS_FLYSKY_EL18(board) || IS_FAMILY_PL18(board) || IS_FLYSKY_ST16(board))) ||
-             (IS_TARANIS_X9(board) && !IS_TARANIS_X9DP_2019(board)) ||
-             IS_RADIOMASTER_ZORRO(board) || IS_RADIOMASTER_TX12_MK2(board) || IS_RADIOMASTER_MT12(board);
-    case HasAux2SerialMode:
-      return IS_FAMILY_T16(board);
-    case HasVCPSerialMode:
-      return IS_FAMILY_HORUS_OR_T16(board) || IS_RADIOMASTER_ZORRO(board) ||
-             IS_JUMPER_TPRO(board) || IS_RADIOMASTER_TX12_MK2(board) ||
-             IS_RADIOMASTER_BOXER(board) || IS_RADIOMASTER_POCKET(board) ||
-             IS_RADIOMASTER_MT12(board);
-    case HasBluetooth:
-      return (IS_FAMILY_HORUS_OR_T16(board) || IS_TARANIS_X7(board) || IS_TARANIS_XLITE(board)|| IS_TARANIS_X9E(board) ||
-              IS_TARANIS_X9DP_2019(board) || IS_FLYSKY_NV14(board) || IS_FLYSKY_EL18(board) || IS_FAMILY_PL18(board)) ? true : false;
-    case HasADCJitterFilter:
-      return IS_HORUS_OR_TARANIS(board);
-    case HasTelemetryBaudrate:
-      return IS_HORUS_OR_TARANIS(board);
+    case SlowRange:
+      return 250;
+    case SlowScale:
+      return 10;
+    case SoundPitch:
+      return 1;
+    case SYMLimits:
+      return 1;
+    case Telemetry:
+      return 1;
+    case TelemetryCustomScreens:
+      if (IS_FAMILY_HORUS_OR_T16(board))
+        return 0;
+      else
+        return 4;
+    case TelemetryCustomScreensBars:
+      return (getCapability(TelemetryCustomScreens) ? 4 : 0);
+    case TelemetryCustomScreensFieldsPerLine:
+      return HAS_LARGE_LCD(board) ? 3 : 2;
+    case TelemetryCustomScreensLines:
+      return (getCapability(TelemetryCustomScreens) ? 4 : 0);
+    case Timers:
+      return 3;
+    case TimersName:
+      if (HAS_LARGE_LCD(board))
+        return 8;
+      else
+        return 3;
     case TopBarZones:
       return Boards::getCapability(board, Board::LcdWidth) > Boards::getCapability(board, Board::LcdHeight) ? 4 : 2;
-    case HasModelsList:
-      return IS_FAMILY_HORUS_OR_T16(board);
-    case HasFlySkyGimbals:
-      return (IS_RADIOMASTER_TX16S(board) && id.contains("flyskygimbals"));
-    case RotaryEncoderNavigation:
-      return (IS_TARANIS_X7(board) || IS_TARANIS_X9DP_2019(board) || IS_TARANIS_X9E(board) || IS_TARANIS_X9LITE(board) ||
-              IS_JUMPER_T15(board) || IS_JUMPER_T18(board) || IS_JUMPER_T20(board) || IS_JUMPER_TPRO(board) ||
-              IS_RADIOMASTER_BOXER(board) || IS_RADIOMASTER_GX12(board) || IS_RADIOMASTER_MT12(board) ||
-              IS_RADIOMASTER_POCKET(board) || IS_RADIOMASTER_TX12(board) || IS_RADIOMASTER_TX12_MK2(board) ||
-              IS_RADIOMASTER_TX16S(board) || IS_RADIOMASTER_ZORRO(board) || IS_RADIOMASTER_TX15(board) || IS_JUMPER_T15PRO(board) ||
-              IS_FLYSKY_PA01(board) || IS_FLYSKY_ST16(board) ||
-              IS_RADIOMASTER_TX16SMK3(board));
-    case HasSoftwareSerialPower:
-      return IS_RADIOMASTER_TX16S(board);
-    case HasIntModuleMulti:
-      return id.contains("internalmulti") || IS_RADIOMASTER_TX16S(board) || IS_JUMPER_T18(board) ||
-              IS_RADIOMASTER_TX12(board) || IS_JUMPER_TLITE(board) || IS_BETAFPV_LR3PRO(board) ||
-              (IS_RADIOMASTER_ZORRO(board) && !id.contains("internalelrs")) ||
-              (IS_RADIOMASTER_BOXER(board) && !id.contains("internalelrs")) ||
-              (IS_RADIOMASTER_POCKET(board) && !id.contains("internalelrs")) ||
-              (IS_RADIOMASTER_MT12(board) && !id.contains("internalelrs"));
-    case HasIntModuleCRSF:
-      return id.contains("internalcrsf");
-    case HasIntModuleELRS:
-      return id.contains("internalelrs") || IS_RADIOMASTER_TX12_MK2(board) ||
-             IS_IFLIGHT_COMMANDO8(board) || IS_RADIOMASTER_BOXER(board) ||
-             IS_RADIOMASTER_POCKET(board) || IS_JUMPER_T20(board) ||
-             IS_RADIOMASTER_MT12(board) || IS_RADIOMASTER_TX15(board) || IS_JUMPER_T15PRO(board);
-    case HasIntModuleFlySky:
-      return  id.contains("afhds2a") || id.contains("afhds3") ||
-              IS_FLYSKY_NV14(board) || IS_FLYSKY_EL18(board) || IS_FAMILY_PL18(board);
-    case BacklightLevelMin:
-      if (IS_HORUS_X12S(board)) {
-        return 5;
-      } else if (IS_FAMILY_T16(board) || IS_FLYSKY_NV14(board) || IS_FLYSKY_EL18(board) || IS_FAMILY_PL18(board) || IS_FLYSKY_ST16(board)) {
-        return 1;
-      } else {
-        return 46;
-      }
-    case QMFavourites:
-      return VERSION_MAJOR > 2 && Boards::getCapability(board, Board::HasColorLcd) ? MAX_QMFAVOURITES : 0;
-    case KeyShortcuts:
-      return VERSION_MAJOR > 2 && Boards::getCapability(board, Board::HasColorLcd) ? MAX_KEYSHORTCUTS : 0;
+    case TrainerInputs:
+      return 16;
+    case TrimsRange:
+      return 128;
+    case VirtualInputs:
+      return 32;
+    case VoicesAsNumbers:
+      return 0;
+    case VoicesMaxLength:
+      return 8;
+
     default:
       return 0;
   }
diff --git a/companion/src/generaledit/generalsetup.cpp b/companion/src/generaledit/generalsetup.cpp
index 5869b977934..cfd51253e9a 100644
--- a/companion/src/generaledit/generalsetup.cpp
+++ b/companion/src/generaledit/generalsetup.cpp
@@ -216,15 +216,6 @@ ui(new Ui::GeneralSetup)
     ui->jackModeCB->hide();
   }
 
-  if (!firmware->getCapability(OptrexDisplay)) {
-    ui->label_displayType->hide();
-    ui->displayTypeCB->setDisabled(true);
-    ui->displayTypeCB->hide();
-  }
-  else {
-    ui->displayTypeCB->setCurrentIndex(generalSettings.optrexDisplay);
-  }
-
   if (!firmware->getCapability(HasVolume)) {
     ui->volume_SL->hide();
     ui->volume_SL->setDisabled(true);
@@ -252,12 +243,6 @@ ui(new Ui::GeneralSetup)
     ui->label_KeysBl->hide();
   }
 
-  if (!firmware->getCapability(SoundMod)) {
-    ui->soundModeCB->setDisabled(true);
-    ui->label_soundMode->hide();
-    ui->soundModeCB->hide();
-  }
-
   if (!firmware->getCapability(SoundPitch)) {
     ui->speakerPitchSB->setDisabled(true);
     ui->label_speakerPitch->hide();
@@ -627,7 +612,6 @@ void GeneralSetupPanel::setValues()
   ui->OFFBright_SB->setValue(generalSettings.backlightOffBright);
   ui->BLBright_SB->setMinimum(ui->OFFBright_SB->value());
   ui->OFFBright_SB->setMaximum(ui->BLBright_SB->value());
-  ui->soundModeCB->setCurrentIndex(generalSettings.speakerMode);
   ui->volume_SL->setValue(generalSettings.speakerVolume + 12);
   ui->beeperlenCB->setCurrentIndex(generalSettings.beeperLength + 2);
   ui->speakerPitchSB->setValue(generalSettings.speakerPitch);
@@ -724,14 +708,6 @@ void GeneralSetupPanel::on_hapticStrength_valueChanged()
   }
 }
 
-void GeneralSetupPanel::on_soundModeCB_currentIndexChanged(int index)
-{
-  if (!lock) {
-    generalSettings.speakerMode = index;
-    emit modified();
-  }
-}
-
 void GeneralSetupPanel::on_splashScreenDuration_currentIndexChanged(int index)
 {
   if (!lock) {
@@ -1036,14 +1012,6 @@ void GeneralSetupPanel::on_beeperCB_currentIndexChanged(int index)
   }
 }
 
-void GeneralSetupPanel::on_displayTypeCB_currentIndexChanged(int index)
-{
-  if (!lock) {
-    generalSettings.optrexDisplay = index;
-    emit modified();
-  }
-}
-
 void GeneralSetupPanel::on_hapticmodeCB_currentIndexChanged(int index)
 {
   if (!lock) {
@@ -1052,7 +1020,6 @@ void GeneralSetupPanel::on_hapticmodeCB_currentIndexChanged(int index)
   }
 }
 
-
 void GeneralSetupPanel::on_channelorderCB_currentIndexChanged(int index)
 {
   if (!lock) {
diff --git a/companion/src/generaledit/generalsetup.h b/companion/src/generaledit/generalsetup.h
index 2e996e45daf..8ccac7c2448 100644
--- a/companion/src/generaledit/generalsetup.h
+++ b/companion/src/generaledit/generalsetup.h
@@ -44,7 +44,6 @@ class GeneralSetupPanel : public GeneralPanel
     void on_rssiPowerOffWarnChkB_stateChanged(int);
     void on_trainerPowerOffWarnChkB_stateChanged(int);
     void on_gpsFormatCB_currentIndexChanged(int index);
-    void on_displayTypeCB_currentIndexChanged(int index);
     void on_BLBright_SB_editingFinished();
     void on_OFFBright_SB_editingFinished();
     void on_brightCtrl_CB_currentIndexChanged(int index);
@@ -57,7 +56,6 @@ class GeneralSetupPanel : public GeneralPanel
     void on_timezoneLE_textEdited(const QString &text);
     void on_adjustRTC_stateChanged(int);
     void on_hapticStrength_valueChanged();
-    void on_soundModeCB_currentIndexChanged(int index);
     void on_beeperlenCB_currentIndexChanged(int index);
     void on_volume_SL_valueChanged();
     void on_hapticmodeCB_currentIndexChanged(int index);
diff --git a/companion/src/generaledit/generalsetup.ui b/companion/src/generaledit/generalsetup.ui
index 8bb5eb4347e..34e31839e55 100644
--- a/companion/src/generaledit/generalsetup.ui
+++ b/companion/src/generaledit/generalsetup.ui
@@ -503,41 +503,38 @@
    </item>
    <item row="0" column="3">
     <layout class="QGridLayout" name="gridLayout_3" columnstretch="0,0">
-     <item row="14" column="0">
-      <widget class="QLabel" name="label_BLBright">
-       <property name="text">
-        <string>Backlight Brightness</string>
-       </property>
-      </widget>
-     </item>
-     <item row="22" column="1">
-      <layout class="QHBoxLayout" name="horizontalLayout_2">
+     <item row="27" column="1">
+      <widget class="QComboBox" name="modelSelectLayout_CB">
        <item>
-        <widget class="TimezoneEdit" name="timezoneLE"/>
+        <property name="text">
+         <string>Large image (2 columns)</string>
+        </property>
        </item>
        <item>
-        <widget class="QCheckBox" name="adjustRTC">
-         <property name="toolTip">
-          <string>Automatically adjust the radio's clock if a GPS is connected to telemetry.</string>
-         </property>
-         <property name="layoutDirection">
-          <enum>Qt::LayoutDirection::LeftToRight</enum>
-         </property>
-         <property name="text">
-          <string>Adjust RTC</string>
-         </property>
-        </widget>
+        <property name="text">
+         <string>Small image (3 columns)</string>
+        </property>
        </item>
-      </layout>
+       <item>
+        <property name="text">
+         <string>Name only (2 columns)</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Name only (1 column)</string>
+        </property>
+       </item>
+      </widget>
      </item>
-     <item row="12" column="0">
-      <widget class="QLabel" name="label_5">
+     <item row="17" column="1">
+      <widget class="QCheckBox" name="keysBl_ChkB">
        <property name="text">
-        <string>Backlight  Auto OFF after</string>
+        <string/>
        </property>
       </widget>
      </item>
-     <item row="19" column="1">
+     <item row="18" column="1">
       <layout class="QHBoxLayout" name="horizontalLayout_3">
        <item>
         <widget class="QCheckBox" name="stickReverse1">
@@ -569,28 +566,33 @@
        </item>
       </layout>
      </item>
-     <item row="5" column="0">
-      <widget class="QLabel" name="wavVolume_label">
+     <item row="1" column="0">
+      <widget class="QLabel" name="label_volume">
        <property name="text">
-        <string>Wav volume</string>
+        <string>Speaker Volume</string>
        </property>
       </widget>
      </item>
-     <item row="30" column="1">
-      <widget class="QComboBox" name="labelMultiMode_CB">
-       <item>
-        <property name="text">
-         <string>Match all</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>Match any</string>
-        </property>
-       </item>
+     <item row="7" column="1">
+      <widget class="QSpinBox" name="varioP0_SB">
+       <property name="suffix">
+        <string> Hz</string>
+       </property>
+       <property name="minimum">
+        <number>300</number>
+       </property>
+       <property name="maximum">
+        <number>1100</number>
+       </property>
+       <property name="singleStep">
+        <number>10</number>
+       </property>
+       <property name="value">
+        <number>700</number>
+       </property>
       </widget>
      </item>
-     <item row="27" column="1">
+     <item row="26" column="1">
       <widget class="QCheckBox" name="modelQuickSelect_CB">
        <property name="toolTip">
         <string>Enable this to quickly change model on the model select page (a long press can then be used to open the model edit menu).</string>
@@ -600,147 +602,121 @@
        </property>
       </widget>
      </item>
-     <item row="18" column="0">
-      <widget class="QLabel" name="label_KeysBl">
-       <property name="text">
-        <string>Keys Backlight</string>
+     <item row="4" column="1">
+      <widget class="QSlider" name="wavVolume_SL">
+       <property name="minimum">
+        <number>-2</number>
+       </property>
+       <property name="maximum">
+        <number>2</number>
+       </property>
+       <property name="pageStep">
+        <number>1</number>
+       </property>
+       <property name="orientation">
+        <enum>Qt::Orientation::Horizontal</enum>
        </property>
       </widget>
      </item>
      <item row="6" column="0">
-      <widget class="QLabel" name="bgVolume_label">
+      <widget class="QLabel" name="varioVolume_label">
        <property name="text">
-        <string>Background volume</string>
+        <string>Vario volume</string>
        </property>
       </widget>
      </item>
-     <item row="10" column="0">
-      <widget class="QLabel" name="varioR0_label">
-       <property name="text">
-        <string>Vario repeat at zero</string>
+     <item row="24" column="1">
+      <widget class="QLineEdit" name="registrationId">
+       <property name="maxLength">
+        <number>8</number>
        </property>
       </widget>
      </item>
-     <item row="25" column="0">
-      <widget class="QLabel" name="label_registrationId">
-       <property name="text">
-        <string>Owner Registration ID</string>
-       </property>
-      </widget>
+     <item row="25" column="1">
+      <widget class="QComboBox" name="rotEncMode_CB"/>
      </item>
-     <item row="29" column="0">
-      <widget class="QLabel" name="label_labelSingleSelect">
+     <item row="9" column="0">
+      <widget class="QLabel" name="varioR0_label">
        <property name="text">
-        <string>Label selection mode</string>
+        <string>Vario repeat at zero</string>
        </property>
       </widget>
      </item>
-     <item row="2" column="1">
-      <widget class="QSlider" name="volume_SL">
-       <property name="maximum">
-        <number>23</number>
+     <item row="9" column="1">
+      <widget class="QSpinBox" name="varioR0_SB">
+       <property name="suffix">
+        <string> ms</string>
        </property>
-       <property name="pageStep">
-        <number>5</number>
+       <property name="minimum">
+        <number>200</number>
        </property>
-       <property name="value">
-        <number>0</number>
+       <property name="maximum">
+        <number>1000</number>
        </property>
-       <property name="orientation">
-        <enum>Qt::Orientation::Horizontal</enum>
+       <property name="singleStep">
+        <number>10</number>
        </property>
-      </widget>
-     </item>
-     <item row="3" column="1">
-      <widget class="QComboBox" name="volumeCtrl_CB">
-      </widget>
-     </item>
-     <item row="14" column="1">
-      <widget class="QSpinBox" name="BLBright_SB">
-       <property name="maximum">
-        <number>100</number>
+       <property name="value">
+        <number>500</number>
        </property>
       </widget>
      </item>
-     <item row="30" column="0">
-      <widget class="QLabel" name="label_labelMultiMode">
+     <item row="22" column="0">
+      <widget class="QLabel" name="VoiceLang_label">
        <property name="text">
-        <string>Label matching</string>
+        <string>Voice Language</string>
        </property>
       </widget>
      </item>
-     <item row="7" column="1">
-      <widget class="QSlider" name="varioVolume_SL">
-       <property name="minimum">
-        <number>-2</number>
-       </property>
-       <property name="maximum">
-        <number>2</number>
-       </property>
-       <property name="pageStep">
-        <number>1</number>
-       </property>
-       <property name="orientation">
-        <enum>Qt::Orientation::Horizontal</enum>
+     <item row="23" column="0">
+      <widget class="QLabel" name="TextLang_label">
+       <property name="text">
+        <string>Text Language</string>
        </property>
       </widget>
      </item>
-     <item row="20" column="0">
-      <widget class="QLabel" name="label_faimode">
+     <item row="30" column="0">
+      <widget class="QLabel" name="label_favMultiMode">
        <property name="text">
-        <string>FAI Mode</string>
+        <string>Favorites matching</string>
        </property>
       </widget>
      </item>
-     <item row="29" column="1">
-      <widget class="QComboBox" name="labelSingleSelect_CB">
+     <item row="21" column="1">
+      <layout class="QHBoxLayout" name="horizontalLayout_2">
        <item>
-        <property name="text">
-         <string>Multi select</string>
-        </property>
+        <widget class="TimezoneEdit" name="timezoneLE"/>
        </item>
        <item>
-        <property name="text">
-         <string>Single select</string>
-        </property>
+        <widget class="QCheckBox" name="adjustRTC">
+         <property name="toolTip">
+          <string>Automatically adjust the radio's clock if a GPS is connected to telemetry.</string>
+         </property>
+         <property name="layoutDirection">
+          <enum>Qt::LayoutDirection::LeftToRight</enum>
+         </property>
+         <property name="text">
+          <string>Adjust RTC</string>
+         </property>
+        </widget>
        </item>
-      </widget>
-     </item>
-     <item row="32" column="0">
-      <spacer name="verticalSpacer_3">
-       <property name="orientation">
-        <enum>Qt::Orientation::Vertical</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>20</width>
-         <height>40</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item row="18" column="1">
-      <widget class="QCheckBox" name="keysBl_ChkB">
-       <property name="text">
-        <string/>
-       </property>
-      </widget>
+      </layout>
      </item>
-     <item row="15" column="0">
-      <widget class="QLabel" name="label_OFFBright">
+     <item row="13" column="0">
+      <widget class="QLabel" name="label_BLBright">
        <property name="text">
-        <string>Backlight OFF Brightness</string>
+        <string>Backlight Brightness</string>
        </property>
       </widget>
      </item>
-     <item row="16" column="0">
-      <widget class="QLabel" name="label_BrightCtrl">
-       <property name="text">
-        <string>Backlight Control</string>
+     <item row="13" column="1">
+      <widget class="QSpinBox" name="BLBright_SB">
+       <property name="maximum">
+        <number>100</number>
        </property>
       </widget>
      </item>
-     <item row="11" column="1">
+     <item row="10" column="1">
       <widget class="QComboBox" name="backlightswCB">
        <property name="toolTip">
         <string/>
@@ -758,95 +734,69 @@
        </property>
       </widget>
      </item>
-     <item row="10" column="1">
-      <widget class="QSpinBox" name="varioR0_SB">
-       <property name="suffix">
-        <string> ms</string>
-       </property>
-       <property name="minimum">
-        <number>200</number>
-       </property>
-       <property name="maximum">
-        <number>1000</number>
-       </property>
-       <property name="singleStep">
-        <number>10</number>
-       </property>
-       <property name="value">
-        <number>500</number>
+     <item row="10" column="0">
+      <widget class="QLabel" name="label_4">
+       <property name="text">
+        <string>Backlight Switch</string>
        </property>
       </widget>
      </item>
-     <item row="6" column="1">
-      <widget class="QSlider" name="bgVolume_SL">
-       <property name="minimum">
-        <number>-2</number>
-       </property>
-       <property name="maximum">
-        <number>2</number>
-       </property>
-       <property name="pageStep">
-        <number>1</number>
+     <item row="3" column="0">
+      <widget class="QLabel" name="beepVolume_label">
+       <property name="text">
+        <string>Beep volume</string>
        </property>
-       <property name="orientation">
-        <enum>Qt::Orientation::Horizontal</enum>
+      </widget>
+     </item>
+     <item row="26" column="0">
+      <widget class="QLabel" name="label_modelQuickSelect">
+       <property name="text">
+        <string>Model quick select</string>
        </property>
       </widget>
      </item>
-     <item row="20" column="1">
-      <widget class="QCheckBox" name="faimode_CB">
-       <property name="toolTip">
-        <string>If you enable FAI, only RSSI and RxBt sensors will keep working. This function cannot be disabled by the radio.</string>
+     <item row="29" column="0">
+      <widget class="QLabel" name="label_labelMultiMode">
+       <property name="text">
+        <string>Label matching</string>
        </property>
+      </widget>
+     </item>
+     <item row="12" column="1">
+      <widget class="QCheckBox" name="blAlarm_ChkB">
        <property name="text">
         <string/>
        </property>
       </widget>
      </item>
-     <item row="9" column="1">
-      <widget class="QSpinBox" name="varioPMax_SB">
-       <property name="suffix">
-        <string> Hz</string>
-       </property>
-       <property name="minimum">
-        <number>1300</number>
-       </property>
-       <property name="maximum">
-        <number>2900</number>
-       </property>
-       <property name="singleStep">
-        <number>10</number>
-       </property>
-       <property name="value">
-        <number>1700</number>
+     <item row="12" column="0">
+      <widget class="QLabel" name="blAlarm_LB">
+       <property name="text">
+        <string>Backlight flash on alarm</string>
        </property>
       </widget>
      </item>
-     <item row="28" column="1">
-      <widget class="QComboBox" name="modelSelectLayout_CB">
-       <item>
-        <property name="text">
-         <string>Large image (2 columns)</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>Small image (3 columns)</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>Name only (2 columns)</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>Name only (1 column)</string>
-        </property>
-       </item>
+     <item row="28" column="0">
+      <widget class="QLabel" name="label_labelSingleSelect">
+       <property name="text">
+        <string>Label selection mode</string>
+       </property>
       </widget>
      </item>
-     <item row="17" column="1">
+     <item row="31" column="0">
+      <spacer name="verticalSpacer_3">
+       <property name="orientation">
+        <enum>Qt::Orientation::Vertical</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>20</width>
+         <height>40</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item row="16" column="1">
       <layout class="QHBoxLayout" name="backlightColor_Layout">
        <item>
         <widget class="QLabel" name="backlightColor1_label">
@@ -874,97 +824,57 @@
        </item>
       </layout>
      </item>
-     <item row="26" column="1">
-      <widget class="QComboBox" name="rotEncMode_CB"/>
-     </item>
-     <item row="0" column="1">
-      <widget class="QComboBox" name="soundModeCB">
-       <item>
-        <property name="text">
-         <string>Beeper</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>Speaker</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>BeeperVoice</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>SpeakerVoice</string>
-        </property>
-       </item>
-      </widget>
-     </item>
-     <item row="7" column="0">
-      <widget class="QLabel" name="varioVolume_label">
-       <property name="text">
-        <string>Vario volume</string>
+     <item row="6" column="1">
+      <widget class="QSlider" name="varioVolume_SL">
+       <property name="minimum">
+        <number>-2</number>
        </property>
-      </widget>
-     </item>
-     <item row="25" column="1">
-      <widget class="QLineEdit" name="registrationId">
-       <property name="maxLength">
-        <number>8</number>
+       <property name="maximum">
+        <number>2</number>
        </property>
-      </widget>
-     </item>
-     <item row="21" column="0">
-      <widget class="QLabel" name="countrycode_label">
-       <property name="text">
-        <string>Country Code</string>
+       <property name="pageStep">
+        <number>1</number>
        </property>
-      </widget>
-     </item>
-     <item row="23" column="0">
-      <widget class="QLabel" name="VoiceLang_label">
-       <property name="text">
-        <string>Voice Language</string>
+       <property name="orientation">
+        <enum>Qt::Orientation::Horizontal</enum>
        </property>
       </widget>
      </item>
-     <item row="24" column="0">
-      <widget class="QLabel" name="TextLang_label">
-       <property name="text">
-        <string>Text Language</string>
-       </property>
-      </widget>
+     <item row="2" column="1">
+      <widget class="QComboBox" name="volumeCtrl_CB"/>
      </item>
-     <item row="1" column="0">
+     <item row="0" column="0">
       <widget class="QLabel" name="label_speakerPitch">
        <property name="text">
         <string>Speaker Pitch (spkr only)</string>
        </property>
       </widget>
      </item>
-     <item row="8" column="0">
-      <widget class="QLabel" name="varioP0_label">
+     <item row="27" column="0">
+      <widget class="QLabel" name="label_modelSelectLayout">
        <property name="text">
-        <string>Vario pitch at zero</string>
+        <string>Manage Models layout</string>
        </property>
       </widget>
      </item>
-     <item row="15" column="1">
-      <widget class="QSpinBox" name="OFFBright_SB">
-       <property name="minimum">
-        <number>5</number>
-       </property>
-       <property name="maximum">
-        <number>100</number>
+     <item row="20" column="0">
+      <widget class="QLabel" name="countrycode_label">
+       <property name="text">
+        <string>Country Code</string>
        </property>
       </widget>
      </item>
-     <item row="16" column="1">
-      <widget class="QComboBox" name="brightCtrl_CB">
+     <item row="25" column="0">
+      <widget class="QLabel" name="rotEncMode_label">
+       <property name="text">
+        <string>Rotary Encoder Mode</string>
+       </property>
       </widget>
      </item>
-     <item row="19" column="0">
+     <item row="22" column="1">
+      <widget class="QComboBox" name="voiceLang_CB"/>
+     </item>
+     <item row="18" column="0">
       <widget class="QLabel" name="stickReverseLB">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
@@ -977,39 +887,23 @@
        </property>
       </widget>
      </item>
-     <item row="8" column="1">
-      <widget class="QSpinBox" name="varioP0_SB">
-       <property name="suffix">
-        <string> Hz</string>
-       </property>
+     <item row="5" column="1">
+      <widget class="QSlider" name="bgVolume_SL">
        <property name="minimum">
-        <number>300</number>
+        <number>-2</number>
        </property>
        <property name="maximum">
-        <number>1100</number>
-       </property>
-       <property name="singleStep">
-        <number>10</number>
+        <number>2</number>
        </property>
-       <property name="value">
-        <number>700</number>
+       <property name="pageStep">
+        <number>1</number>
        </property>
-      </widget>
-     </item>
-     <item row="13" column="1">
-      <widget class="QCheckBox" name="blAlarm_ChkB">
-       <property name="text">
-        <string/>
+       <property name="orientation">
+        <enum>Qt::Orientation::Horizontal</enum>
        </property>
       </widget>
      </item>
-     <item row="23" column="1">
-      <widget class="QComboBox" name="voiceLang_CB"/>
-     </item>
-     <item row="24" column="1">
-      <widget class="QComboBox" name="textLang_CB"/>
-     </item>
-     <item row="31" column="1">
+     <item row="30" column="1">
       <widget class="QComboBox" name="favMultiMode_CB">
        <item>
         <property name="text">
@@ -1023,77 +917,78 @@
        </item>
       </widget>
      </item>
-     <item row="0" column="0">
-      <widget class="QLabel" name="label_soundMode">
+     <item row="8" column="0">
+      <widget class="QLabel" name="varioPMax_label">
        <property name="text">
-        <string>Sound Mode</string>
+        <string>Vario pitch at max</string>
        </property>
       </widget>
      </item>
-     <item row="22" column="0">
-      <widget class="QLabel" name="label_timezone">
+     <item row="4" column="0">
+      <widget class="QLabel" name="wavVolume_label">
        <property name="text">
-        <string>Timeshift from UTC</string>
+        <string>Wav volume</string>
        </property>
       </widget>
      </item>
-     <item row="17" column="0">
-      <widget class="QLabel" name="backlightColor_label">
+     <item row="7" column="0">
+      <widget class="QLabel" name="varioP0_label">
        <property name="text">
-        <string>Backlight color</string>
+        <string>Vario pitch at zero</string>
        </property>
       </widget>
      </item>
-     <item row="4" column="0">
-      <widget class="QLabel" name="beepVolume_label">
-       <property name="text">
-        <string>Beep volume</string>
-       </property>
-      </widget>
+     <item row="23" column="1">
+      <widget class="QComboBox" name="textLang_CB"/>
      </item>
-     <item row="13" column="0">
-      <widget class="QLabel" name="blAlarm_LB">
+     <item row="11" column="0">
+      <widget class="QLabel" name="label_5">
        <property name="text">
-        <string>Backlight flash on alarm</string>
+        <string>Backlight  Auto OFF after</string>
        </property>
       </widget>
      </item>
-     <item row="11" column="0">
-      <widget class="QLabel" name="label_4">
+     <item row="14" column="0">
+      <widget class="QLabel" name="label_OFFBright">
        <property name="text">
-        <string>Backlight Switch</string>
+        <string>Backlight OFF Brightness</string>
        </property>
       </widget>
      </item>
-     <item row="12" column="1">
-      <widget class="QSpinBox" name="backlightautoSB">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
+     <item row="19" column="1">
+      <widget class="QCheckBox" name="faimode_CB">
        <property name="toolTip">
-        <string/>
+        <string>If you enable FAI, only RSSI and RxBt sensors will keep working. This function cannot be disabled by the radio.</string>
        </property>
-       <property name="statusTip">
+       <property name="text">
         <string/>
        </property>
-       <property name="whatsThis">
-        <string>If this value is not 0, any keypress will turn on the backlight and turn it off after the specified number of seconds.</string>
-       </property>
-       <property name="suffix">
-        <string> sec</string>
-       </property>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <widget class="QSlider" name="volume_SL">
        <property name="maximum">
-        <number>600</number>
+        <number>23</number>
        </property>
-       <property name="singleStep">
+       <property name="pageStep">
         <number>5</number>
        </property>
+       <property name="value">
+        <number>0</number>
+       </property>
+       <property name="orientation">
+        <enum>Qt::Orientation::Horizontal</enum>
+       </property>
       </widget>
      </item>
-     <item row="21" column="1">
+     <item row="2" column="0">
+      <widget class="QLabel" name="label_volumeCtrl">
+       <property name="text">
+        <string>Volume Control</string>
+       </property>
+      </widget>
+     </item>
+     <item row="20" column="1">
       <widget class="QComboBox" name="countrycode_CB">
        <item>
         <property name="text">
@@ -1112,74 +1007,78 @@
        </item>
       </widget>
      </item>
-     <item row="28" column="0">
-      <widget class="QLabel" name="label_modelSelectLayout">
+     <item row="19" column="0">
+      <widget class="QLabel" name="label_faimode">
        <property name="text">
-        <string>Manage Models layout</string>
+        <string>FAI Mode</string>
        </property>
       </widget>
      </item>
-     <item row="5" column="1">
-      <widget class="QSlider" name="wavVolume_SL">
-       <property name="minimum">
-        <number>-2</number>
-       </property>
-       <property name="maximum">
-        <number>2</number>
-       </property>
-       <property name="pageStep">
-        <number>1</number>
-       </property>
-       <property name="orientation">
-        <enum>Qt::Orientation::Horizontal</enum>
+     <item row="16" column="0">
+      <widget class="QLabel" name="backlightColor_label">
+       <property name="text">
+        <string>Backlight color</string>
        </property>
       </widget>
      </item>
-     <item row="26" column="0">
-      <widget class="QLabel" name="rotEncMode_label">
+     <item row="29" column="1">
+      <widget class="QComboBox" name="labelMultiMode_CB">
+       <item>
+        <property name="text">
+         <string>Match all</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Match any</string>
+        </property>
+       </item>
+      </widget>
+     </item>
+     <item row="17" column="0">
+      <widget class="QLabel" name="label_KeysBl">
        <property name="text">
-        <string>Rotary Encoder Mode</string>
+        <string>Keys Backlight</string>
        </property>
       </widget>
      </item>
-     <item row="4" column="1">
-      <widget class="QSlider" name="beepVolume_SL">
+     <item row="8" column="1">
+      <widget class="QSpinBox" name="varioPMax_SB">
+       <property name="suffix">
+        <string> Hz</string>
+       </property>
        <property name="minimum">
-        <number>-2</number>
+        <number>1300</number>
        </property>
        <property name="maximum">
-        <number>2</number>
+        <number>2900</number>
        </property>
-       <property name="pageStep">
-        <number>1</number>
+       <property name="singleStep">
+        <number>10</number>
        </property>
-       <property name="orientation">
-        <enum>Qt::Orientation::Horizontal</enum>
+       <property name="value">
+        <number>1700</number>
        </property>
       </widget>
      </item>
-     <item row="27" column="0">
-      <widget class="QLabel" name="label_modelQuickSelect">
+     <item row="15" column="0">
+      <widget class="QLabel" name="label_BrightCtrl">
        <property name="text">
-        <string>Model quick select</string>
+        <string>Backlight Control</string>
        </property>
       </widget>
      </item>
-     <item row="2" column="0">
-      <widget class="QLabel" name="label_volume">
-       <property name="text">
-        <string>Speaker Volume</string>
+     <item row="14" column="1">
+      <widget class="QSpinBox" name="OFFBright_SB">
+       <property name="minimum">
+        <number>5</number>
        </property>
-      </widget>
-     </item>
-     <item row="3" column="0">
-      <widget class="QLabel" name="label_volumeCtrl">
-       <property name="text">
-        <string>Volume Control</string>
+       <property name="maximum">
+        <number>100</number>
        </property>
       </widget>
      </item>
-     <item row="1" column="1">
+     <item row="0" column="1">
       <widget class="QSpinBox" name="speakerPitchSB">
        <property name="toolTip">
         <string/>
@@ -1206,58 +1105,51 @@ p, li { white-space: pre-wrap; }
        </property>
       </widget>
      </item>
-     <item row="9" column="0">
-      <widget class="QLabel" name="varioPMax_label">
-       <property name="text">
-        <string>Vario pitch at max</string>
-       </property>
-      </widget>
-     </item>
-     <item row="31" column="0">
-      <widget class="QLabel" name="label_favMultiMode">
+     <item row="24" column="0">
+      <widget class="QLabel" name="label_registrationId">
        <property name="text">
-        <string>Favorites matching</string>
+        <string>Owner Registration ID</string>
        </property>
       </widget>
      </item>
-    </layout>
-   </item>
-   <item row="0" column="0" colspan="2">
-    <layout class="QGridLayout" name="gridLayout_2">
-     <property name="sizeConstraint">
-      <enum>QLayout::SizeConstraint::SetDefaultConstraint</enum>
-     </property>
-     <item row="12" column="1">
-      <widget class="QComboBox" name="pwrOnDelay">
-       <item>
-        <property name="text">
-         <string>0s</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>0.5s</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>1s</string>
-        </property>
-       </item>
+     <item row="28" column="1">
+      <widget class="QComboBox" name="labelSingleSelect_CB">
        <item>
         <property name="text">
-         <string>2s</string>
+         <string>Multi select</string>
         </property>
        </item>
        <item>
         <property name="text">
-         <string>3s</string>
+         <string>Single select</string>
         </property>
        </item>
       </widget>
      </item>
-     <item row="22" column="1">
-      <widget class="QComboBox" name="channelorderCB">
+     <item row="3" column="1">
+      <widget class="QSlider" name="beepVolume_SL">
+       <property name="minimum">
+        <number>-2</number>
+       </property>
+       <property name="maximum">
+        <number>2</number>
+       </property>
+       <property name="pageStep">
+        <number>1</number>
+       </property>
+       <property name="orientation">
+        <enum>Qt::Orientation::Horizontal</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="11" column="1">
+      <widget class="QSpinBox" name="backlightautoSB">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
        <property name="toolTip">
         <string/>
        </property>
@@ -1265,38 +1157,61 @@ p, li { white-space: pre-wrap; }
         <string/>
        </property>
        <property name="whatsThis">
-        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Channel order&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Defines the order of the default mixes created on a new model.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        <string>If this value is not 0, any keypress will turn on the backlight and turn it off after the specified number of seconds.</string>
        </property>
-       <property name="currentIndex">
-        <number>-1</number>
+       <property name="suffix">
+        <string> sec</string>
+       </property>
+       <property name="maximum">
+        <number>600</number>
+       </property>
+       <property name="singleStep">
+        <number>5</number>
        </property>
       </widget>
      </item>
-     <item row="25" column="0">
-      <widget class="QLabel" name="switchesDelayLabel">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
+     <item row="15" column="1">
+      <widget class="QComboBox" name="brightCtrl_CB"/>
+     </item>
+     <item row="5" column="0">
+      <widget class="QLabel" name="bgVolume_label">
+       <property name="text">
+        <string>Background volume</string>
        </property>
+      </widget>
+     </item>
+     <item row="21" column="0">
+      <widget class="QLabel" name="label_timezone">
        <property name="text">
-        <string>Play Delay (switch mid position)</string>
+        <string>Timeshift from UTC</string>
        </property>
       </widget>
      </item>
-     <item row="17" column="1" colspan="2">
-      <widget class="QCheckBox" name="memwarnChkB">
+    </layout>
+   </item>
+   <item row="0" column="0" colspan="2">
+    <layout class="QGridLayout" name="gridLayout_2">
+     <property name="sizeConstraint">
+      <enum>QLayout::SizeConstraint::SetDefaultConstraint</enum>
+     </property>
+     <item row="15" column="1" colspan="2">
+      <widget class="QCheckBox" name="alarmwarnChkB">
        <property name="sizePolicy">
-        <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Minimum">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
-       <property name="maximumSize">
+       <property name="minimumSize">
         <size>
-         <width>16777215</width>
-         <height>16777215</height>
+         <width>0</width>
+         <height>22</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>16777215</width>
+         <height>16777215</height>
         </size>
        </property>
        <property name="whatsThis">
@@ -1320,8 +1235,8 @@ p, li { white-space: pre-wrap; }
        </property>
       </widget>
      </item>
-     <item row="4" column="0">
-      <widget class="QLabel" name="label_hapticStrengthSB">
+     <item row="6" column="1">
+      <widget class="QDoubleSpinBox" name="battwarningDSB">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
          <horstretch>0</horstretch>
@@ -1331,16 +1246,60 @@ p, li { white-space: pre-wrap; }
        <property name="minimumSize">
         <size>
          <width>0</width>
-         <height>0</height>
+         <height>22</height>
         </size>
        </property>
+       <property name="toolTip">
+        <string/>
+       </property>
+       <property name="statusTip">
+        <string/>
+       </property>
+       <property name="whatsThis">
+        <string>Battery warning voltage.
+This is the threshold where the battery warning sounds.
+
+Acceptable values are 3v..12v</string>
+       </property>
+       <property name="prefix">
+        <string notr="true"/>
+       </property>
+       <property name="suffix">
+        <string notr="true"> V</string>
+       </property>
+       <property name="decimals">
+        <number>1</number>
+       </property>
+       <property name="minimum">
+        <double>3.000000000000000</double>
+       </property>
+       <property name="maximum">
+        <double>12.000000000000000</double>
+       </property>
+       <property name="singleStep">
+        <double>0.100000000000000</double>
+       </property>
+       <property name="value">
+        <double>9.600000000000000</double>
+       </property>
+      </widget>
+     </item>
+     <item row="23" column="0">
+      <widget class="QLabel" name="gpsFormatLabel">
        <property name="text">
-        <string>Haptic Strength</string>
+        <string>GPS Coordinates</string>
        </property>
       </widget>
      </item>
-     <item row="6" column="0">
-      <widget class="QLabel" name="label_2">
+     <item row="18" column="1">
+      <widget class="QCheckBox" name="trainerPowerOffWarnChkB">
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1">
+      <widget class="QComboBox" name="beeperCB">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
          <horstretch>0</horstretch>
@@ -1349,20 +1308,56 @@ p, li { white-space: pre-wrap; }
        </property>
        <property name="minimumSize">
         <size>
-         <width>20</width>
-         <height>0</height>
+         <width>0</width>
+         <height>22</height>
         </size>
        </property>
        <property name="toolTip">
-        <string extracomment="Low Battery Voltage warning [5v-10v]"/>
+        <string/>
+       </property>
+       <property name="statusTip">
+        <string/>
+       </property>
+       <property name="whatsThis">
+        <string>Beeper volume
+
+0 - Quiet.  No beeps at all.
+1 - No Keys.  Normal beeps but menu keys do not beep.
+2 - Normal.
+3 - Loud.
+4 - Extra loud.</string>
        </property>
+       <item>
+        <property name="text">
+         <string>Quiet</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Alarms Only</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>No Keys</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>All</string>
+        </property>
+       </item>
+      </widget>
+     </item>
+     <item row="10" column="0">
+      <widget class="QLabel" name="label_playStartSound">
        <property name="text">
-        <string>Battery Warning</string>
+        <string>Play Startup Sound</string>
        </property>
       </widget>
      </item>
-     <item row="2" column="0">
-      <widget class="QLabel" name="label_hapticmode">
+     <item row="5" column="0">
+      <widget class="QLabel" name="label_contrast">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
          <horstretch>0</horstretch>
@@ -1375,84 +1370,23 @@ p, li { white-space: pre-wrap; }
          <height>0</height>
         </size>
        </property>
-       <property name="text">
-        <string>Haptic Mode</string>
+       <property name="toolTip">
+        <string extracomment="Screen Contrast [20-45]"/>
        </property>
-      </widget>
-     </item>
-     <item row="10" column="1" colspan="2">
-      <layout class="QHBoxLayout" name="horizontalLayout">
-       <item>
-        <widget class="QComboBox" name="splashScreenDuration">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <item>
-          <property name="text">
-           <string>---</string>
-          </property>
-         </item>
-         <item>
-          <property name="text">
-           <string>2s</string>
-          </property>
-         </item>
-         <item>
-          <property name="text">
-           <string>3s</string>
-          </property>
-         </item>
-         <item>
-          <property name="text">
-           <string>4s</string>
-          </property>
-         </item>
-         <item>
-          <property name="text">
-           <string>6s</string>
-          </property>
-         </item>
-         <item>
-          <property name="text">
-           <string>8s</string>
-          </property>
-         </item>
-         <item>
-          <property name="text">
-           <string>10s</string>
-          </property>
-         </item>
-         <item>
-          <property name="text">
-           <string>15s</string>
-          </property>
-         </item>
-        </widget>
-       </item>
-      </layout>
-     </item>
-     <item row="19" column="0">
-      <widget class="QLabel" name="label">
        <property name="text">
-        <string>Trainer Poweroff Warning</string>
+        <string>Contrast</string>
        </property>
       </widget>
      </item>
-     <item row="23" column="0">
-      <widget class="QLabel" name="units_label">
+     <item row="12" column="0">
+      <widget class="QLabel" name="pwrOffDelayLabel">
        <property name="text">
-        <string>Measurement Units</string>
+        <string>Power Off Delay</string>
        </property>
       </widget>
      </item>
-     <item row="28" column="1">
-      <widget class="AutoComboBox" name="hatsModeCB" native="true"/>
-     </item>
-     <item row="1" column="0">
-      <widget class="QLabel" name="label_beeperlen">
+     <item row="2" column="0">
+      <widget class="QLabel" name="label_hapticmode">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
          <horstretch>0</horstretch>
@@ -1466,12 +1400,12 @@ p, li { white-space: pre-wrap; }
         </size>
        </property>
        <property name="text">
-        <string>Beeper Length</string>
+        <string>Haptic Mode</string>
        </property>
       </widget>
      </item>
-     <item row="5" column="1">
-      <widget class="QSpinBox" name="contrastSB">
+     <item row="17" column="0">
+      <widget class="QLabel" name="label_15">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
          <horstretch>0</horstretch>
@@ -1481,40 +1415,18 @@ p, li { white-space: pre-wrap; }
        <property name="minimumSize">
         <size>
          <width>0</width>
-         <height>22</height>
+         <height>0</height>
         </size>
        </property>
-       <property name="toolTip">
-        <string/>
-       </property>
-       <property name="statusTip">
-        <string/>
-       </property>
-       <property name="whatsThis">
-        <string/>
-       </property>
-       <property name="minimum">
-        <number>10</number>
-       </property>
-       <property name="maximum">
-        <number>45</number>
-       </property>
-       <property name="value">
-        <number>25</number>
-       </property>
-      </widget>
-     </item>
-     <item row="24" column="0">
-      <widget class="QLabel" name="gpsFormatLabel">
        <property name="text">
-        <string>GPS Coordinates</string>
+        <string>RSSI Poweroff Warning</string>
        </property>
       </widget>
      </item>
-     <item row="16" column="1" colspan="2">
-      <widget class="QCheckBox" name="alarmwarnChkB">
+     <item row="9" column="0">
+      <widget class="QLabel" name="splashScreenLabel">
        <property name="sizePolicy">
-        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Minimum">
+        <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
@@ -1522,76 +1434,57 @@ p, li { white-space: pre-wrap; }
        <property name="minimumSize">
         <size>
          <width>0</width>
-         <height>22</height>
-        </size>
-       </property>
-       <property name="maximumSize">
-        <size>
-         <width>16777215</width>
-         <height>16777215</height>
+         <height>0</height>
         </size>
        </property>
-       <property name="whatsThis">
-        <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; text-decoration: underline;&quot;&gt;Warnings&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;These will define startup warnings.&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Throttle warning - will alert if the throttle is not at idle during startup&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Switch warning - will alert if switches are not in their defaul position&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Memory warning - will alert if there's not a lot of memory left&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Silent mode warning - will alert you if the beeper is set to quiet (0)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-       </property>
        <property name="text">
-        <string/>
-       </property>
-       <property name="checked">
-        <bool>true</bool>
+        <string>Show Splash Screen on Startup</string>
        </property>
       </widget>
      </item>
-     <item row="28" column="0">
-      <widget class="QLabel" name="hatsModeLabel">
-       <property name="text">
-        <string>Hats Mode</string>
-       </property>
-      </widget>
-     </item>
-     <item row="26" column="1">
-      <widget class="QComboBox" name="usbModeCB">
+     <item row="23" column="1">
+      <widget class="QComboBox" name="gpsFormatCB">
        <item>
         <property name="text">
-         <string>Ask on Connect</string>
+         <string>DMS</string>
         </property>
        </item>
        <item>
         <property name="text">
-         <string>Joystick (HID)</string>
+         <string>NMEA</string>
         </property>
        </item>
+      </widget>
+     </item>
+     <item row="19" column="0">
+      <widget class="QLabel" name="mavbaud_label">
+       <property name="minimumSize">
+        <size>
+         <width>0</width>
+         <height>0</height>
+        </size>
+       </property>
+       <property name="text">
+        <string>MAVLink Baud Rate</string>
+       </property>
+      </widget>
+     </item>
+     <item row="22" column="1">
+      <widget class="QComboBox" name="units_CB">
        <item>
         <property name="text">
-         <string>USB Mass Storage</string>
+         <string>Metric</string>
         </property>
        </item>
        <item>
         <property name="text">
-         <string>USB Serial (CDC)</string>
+         <string>Imperial</string>
         </property>
        </item>
       </widget>
      </item>
-     <item row="29" column="0">
-      <widget class="QLabel" name="ppm_units_label">
-       <property name="text">
-        <string>PPM Units</string>
-       </property>
-      </widget>
-     </item>
-     <item row="3" column="1" colspan="2">
-      <widget class="QComboBox" name="hapticLengthCB">
+     <item row="4" column="0">
+      <widget class="QLabel" name="label_hapticStrengthSB">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
          <horstretch>0</horstretch>
@@ -1601,80 +1494,216 @@ p, li { white-space: pre-wrap; }
        <property name="minimumSize">
         <size>
          <width>0</width>
-         <height>22</height>
+         <height>0</height>
         </size>
        </property>
+       <property name="text">
+        <string>Haptic Strength</string>
+       </property>
+      </widget>
+     </item>
+     <item row="22" column="0">
+      <widget class="QLabel" name="units_label">
+       <property name="text">
+        <string>Measurement Units</string>
+       </property>
+      </widget>
+     </item>
+     <item row="21" column="0">
+      <widget class="QLabel" name="channelorderLabel">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text">
+        <string>Default Channel Order</string>
+       </property>
+      </widget>
+     </item>
+     <item row="11" column="1">
+      <widget class="QComboBox" name="pwrOnDelay">
        <item>
         <property name="text">
-         <string>X-Short</string>
+         <string>0s</string>
         </property>
        </item>
        <item>
         <property name="text">
-         <string>Short</string>
+         <string>0.5s</string>
         </property>
        </item>
        <item>
         <property name="text">
-         <string>Normal</string>
+         <string>1s</string>
         </property>
        </item>
        <item>
         <property name="text">
-         <string>Long</string>
+         <string>2s</string>
         </property>
        </item>
        <item>
         <property name="text">
-         <string>X-Long</string>
+         <string>3s</string>
         </property>
        </item>
       </widget>
      </item>
      <item row="20" column="0">
-      <widget class="QLabel" name="mavbaud_label">
-       <property name="minimumSize">
+      <widget class="QLabel" name="stickModeLabel">
+       <property name="text">
+        <string>Stick Mode</string>
+       </property>
+      </widget>
+     </item>
+     <item row="17" column="1">
+      <widget class="QCheckBox" name="rssiPowerOffWarnChkB">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="maximumSize">
         <size>
-         <width>0</width>
-         <height>0</height>
+         <width>16777215</width>
+         <height>16777215</height>
         </size>
        </property>
+       <property name="whatsThis">
+        <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; text-decoration: underline;&quot;&gt;Warnings&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;These will define startup warnings.&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Throttle warning - will alert if the throttle is not at idle during startup&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Switch warning - will alert if switches are not in their defaul position&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Memory warning - will alert if there's not a lot of memory left&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Silent mode warning - will alert you if the beeper is set to quiet (0)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+       </property>
        <property name="text">
-        <string>MAVLink Baud Rate</string>
+        <string/>
+       </property>
+       <property name="checked">
+        <bool>true</bool>
        </property>
       </widget>
      </item>
-     <item row="13" column="1">
-      <widget class="QComboBox" name="pwrOffDelay">
+     <item row="9" column="1" colspan="2">
+      <layout class="QHBoxLayout" name="horizontalLayout">
+       <item>
+        <widget class="QComboBox" name="splashScreenDuration">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <item>
+          <property name="text">
+           <string>---</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>2s</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>3s</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>4s</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>6s</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>8s</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>10s</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>15s</string>
+          </property>
+         </item>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item row="3" column="1" colspan="2">
+      <widget class="QComboBox" name="hapticLengthCB">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>0</width>
+         <height>22</height>
+        </size>
+       </property>
        <item>
         <property name="text">
-         <string>0s</string>
+         <string>X-Short</string>
         </property>
        </item>
        <item>
         <property name="text">
-         <string>0.5s</string>
+         <string>Short</string>
         </property>
        </item>
        <item>
         <property name="text">
-         <string>1s</string>
+         <string>Normal</string>
         </property>
        </item>
        <item>
         <property name="text">
-         <string>2s</string>
+         <string>Long</string>
         </property>
        </item>
        <item>
         <property name="text">
-         <string>3s</string>
+         <string>X-Long</string>
         </property>
        </item>
       </widget>
      </item>
-     <item row="8" column="1" colspan="2">
-      <widget class="QComboBox" name="displayTypeCB">
+     <item row="13" column="0">
+      <widget class="QLabel" name="pwrOnOffHapticLabel">
+       <property name="text">
+        <string>Power ON/OFF Haptic</string>
+       </property>
+      </widget>
+     </item>
+     <item row="18" column="0">
+      <widget class="QLabel" name="label">
+       <property name="text">
+        <string>Trainer Poweroff Warning</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="1" colspan="2">
+      <widget class="QComboBox" name="hapticmodeCB">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
          <horstretch>0</horstretch>
@@ -1689,20 +1718,30 @@ p, li { white-space: pre-wrap; }
        </property>
        <item>
         <property name="text">
-         <string>Standard</string>
+         <string>Quiet</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Only Alarms</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>No Keys</string>
         </property>
        </item>
        <item>
         <property name="text">
-         <string>Optrex</string>
+         <string>All</string>
         </property>
        </item>
       </widget>
      </item>
-     <item row="6" column="1">
-      <widget class="QDoubleSpinBox" name="battwarningDSB">
+     <item row="13" column="1">
+      <widget class="QCheckBox" name="pwrOnOffHaptic_CB">
        <property name="sizePolicy">
-        <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Minimum">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
@@ -1713,72 +1752,102 @@ p, li { white-space: pre-wrap; }
          <height>22</height>
         </size>
        </property>
-       <property name="toolTip">
-        <string/>
+       <property name="maximumSize">
+        <size>
+         <width>16777215</width>
+         <height>16777215</height>
+        </size>
        </property>
-       <property name="statusTip">
+       <property name="whatsThis">
+        <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; text-decoration: underline;&quot;&gt;Warnings&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;These will define startup warnings.&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Throttle warning - will alert if the throttle is not at idle during startup&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Switch warning - will alert if switches are not in their defaul position&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Memory warning - will alert if there's not a lot of memory left&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Silent mode warning - will alert you if the beeper is set to quiet (0)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+       </property>
+       <property name="text">
         <string/>
        </property>
-       <property name="whatsThis">
-        <string>Battery warning voltage.
-This is the threshold where the battery warning sounds.
-
-Acceptable values are 3v..12v</string>
-       </property>
-       <property name="prefix">
-        <string notr="true"/>
-       </property>
-       <property name="suffix">
-        <string notr="true"> V</string>
-       </property>
-       <property name="decimals">
-        <number>1</number>
-       </property>
-       <property name="minimum">
-        <double>3.000000000000000</double>
-       </property>
-       <property name="maximum">
-        <double>12.000000000000000</double>
-       </property>
-       <property name="singleStep">
-        <double>0.100000000000000</double>
-       </property>
-       <property name="value">
-        <double>9.600000000000000</double>
+       <property name="checked">
+        <bool>true</bool>
        </property>
       </widget>
      </item>
+     <item row="12" column="1">
+      <widget class="QComboBox" name="pwrOffDelay">
+       <item>
+        <property name="text">
+         <string>0s</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>0.5s</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>1s</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>2s</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>3s</string>
+        </property>
+       </item>
+      </widget>
+     </item>
+     <item row="25" column="1">
+      <widget class="QComboBox" name="usbModeCB">
+       <item>
+        <property name="text">
+         <string>Ask on Connect</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Joystick (HID)</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>USB Mass Storage</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>USB Serial (CDC)</string>
+        </property>
+       </item>
+      </widget>
+     </item>
      <item row="26" column="0">
-      <widget class="QLabel" name="usbModeLabel">
+      <widget class="QLabel" name="jackModeLabel">
        <property name="text">
-        <string>USB Mode</string>
+        <string>Jack Mode</string>
        </property>
       </widget>
      </item>
-     <item row="5" column="0">
-      <widget class="QLabel" name="label_contrast">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>0</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="toolTip">
-        <string extracomment="Screen Contrast [20-45]"/>
-       </property>
+     <item row="14" column="0">
+      <widget class="QLabel" name="pwrOffIfInactiveLabel">
        <property name="text">
-        <string>Contrast</string>
+        <string>Power Auto Off</string>
        </property>
       </widget>
      </item>
-     <item row="10" column="0">
-      <widget class="QLabel" name="splashScreenLabel">
+     <item row="0" column="0">
+      <widget class="QLabel" name="label_12">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
          <horstretch>0</horstretch>
@@ -1792,75 +1861,174 @@ Acceptable values are 3v..12v</string>
         </size>
        </property>
        <property name="text">
-        <string>Show Splash Screen on Startup</string>
+        <string>Beeper Mode</string>
        </property>
       </widget>
      </item>
-     <item row="22" column="0">
-      <widget class="QLabel" name="channelorderLabel">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
+     <item row="20" column="1">
+      <widget class="QComboBox" name="stickmodeCB">
+       <property name="toolTip">
+        <string/>
        </property>
-       <property name="text">
-        <string>Default Channel Order</string>
+       <property name="statusTip">
+        <string/>
        </property>
-      </widget>
-     </item>
-     <item row="2" column="1" colspan="2">
-      <widget class="QComboBox" name="hapticmodeCB">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
+       <property name="whatsThis">
+        <string>Mode selection:
+
+Mode 1:
+  Left stick:  Elevator, Rudder
+  Right stick:  Throttle, Aileron
+
+Mode 2:
+  Left stick:  Throttle, Rudder
+  Right stick:  Elevator, Aileron
+
+Mode 3:
+  Left stick:  Elevator, Aileron
+  Right stick:  Throttle, Rudder
+
+Mode 4:
+  Left stick:  Throttle, Aileron
+  Right stick:  Elevator, Rudder
+
+</string>
        </property>
-       <property name="minimumSize">
-        <size>
-         <width>0</width>
-         <height>22</height>
-        </size>
+       <property name="currentIndex">
+        <number>-1</number>
        </property>
+      </widget>
+     </item>
+     <item row="19" column="1" colspan="2">
+      <widget class="QComboBox" name="mavbaud_CB">
        <item>
         <property name="text">
-         <string>Quiet</string>
+         <string>4800 Baud</string>
         </property>
        </item>
        <item>
         <property name="text">
-         <string>Only Alarms</string>
+         <string>9600 Baud</string>
         </property>
        </item>
        <item>
         <property name="text">
-         <string>No Keys</string>
+         <string>14400 Baud</string>
         </property>
        </item>
        <item>
         <property name="text">
-         <string>All</string>
+         <string>19200 Baud</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>38400 Baud</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>57600 Baud</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>76800 Baud</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>115200 Baud</string>
         </property>
        </item>
       </widget>
      </item>
-     <item row="24" column="1">
-      <widget class="QComboBox" name="gpsFormatCB">
+     <item row="28" column="1">
+      <widget class="QComboBox" name="ppm_units_CB">
+       <property name="currentText">
+        <string>0.--</string>
+       </property>
        <item>
         <property name="text">
-         <string>DMS</string>
+         <string>0.--</string>
         </property>
        </item>
        <item>
         <property name="text">
-         <string>NMEA</string>
+         <string>0.0</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>us</string>
         </property>
        </item>
       </widget>
      </item>
-     <item row="9" column="1">
-      <widget class="QSpinBox" name="inactimerSB">
+     <item row="7" column="1" colspan="2">
+      <layout class="QHBoxLayout" name="batMeterRangeLayout" stretch="0,1,0,1">
+       <item>
+        <widget class="QLabel" name="HasBatMeterMinRangeLabel">
+         <property name="text">
+          <string>Min</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QDoubleSpinBox" name="vBatMinDSB">
+         <property name="suffix">
+          <string>v</string>
+         </property>
+         <property name="decimals">
+          <number>1</number>
+         </property>
+         <property name="minimum">
+          <double>3.000000000000000</double>
+         </property>
+         <property name="maximum">
+          <double>16.000000000000000</double>
+         </property>
+         <property name="singleStep">
+          <double>0.100000000000000</double>
+         </property>
+         <property name="value">
+          <double>9.000000000000000</double>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="HasBatMeterMaxRangeLabel">
+         <property name="text">
+          <string>Max</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QDoubleSpinBox" name="vBatMaxDSB">
+         <property name="suffix">
+          <string>v</string>
+         </property>
+         <property name="decimals">
+          <number>1</number>
+         </property>
+         <property name="minimum">
+          <double>3.000000000000000</double>
+         </property>
+         <property name="maximum">
+          <double>16.000000000000000</double>
+         </property>
+         <property name="singleStep">
+          <double>0.100000000000000</double>
+         </property>
+         <property name="value">
+          <double>12.000000000000000</double>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item row="15" column="0">
+      <widget class="QLabel" name="label_27">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
          <horstretch>0</horstretch>
@@ -1870,9 +2038,16 @@ Acceptable values are 3v..12v</string>
        <property name="minimumSize">
         <size>
          <width>0</width>
-         <height>22</height>
+         <height>0</height>
         </size>
        </property>
+       <property name="text">
+        <string>&quot;No Sound&quot; Warning</string>
+       </property>
+      </widget>
+     </item>
+     <item row="24" column="1">
+      <widget class="QSpinBox" name="switchesDelay">
        <property name="toolTip">
         <string/>
        </property>
@@ -1880,25 +2055,44 @@ Acceptable values are 3v..12v</string>
         <string/>
        </property>
        <property name="whatsThis">
-        <string>If not zero will sound beeps if the transmitter has been left without inputs for the specified number of minutes.</string>
+        <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;LCD Screen Contrast&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;Values can be 20-45&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
        </property>
        <property name="suffix">
-        <string> min</string>
+        <string> ms</string>
+       </property>
+       <property name="minimum">
+        <number>0</number>
        </property>
        <property name="maximum">
-        <number>120</number>
+        <number>1000</number>
        </property>
-      </widget>
-     </item>
-     <item row="19" column="1">
-      <widget class="QCheckBox" name="trainerPowerOffWarnChkB">
-       <property name="text">
-        <string/>
+       <property name="singleStep">
+        <number>10</number>
+       </property>
+       <property name="value">
+        <number>0</number>
        </property>
       </widget>
      </item>
-     <item row="21" column="1">
-      <widget class="QComboBox" name="stickmodeCB">
+     <item row="5" column="1">
+      <widget class="QSpinBox" name="contrastSB">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>0</width>
+         <height>22</height>
+        </size>
+       </property>
        <property name="toolTip">
         <string/>
        </property>
@@ -1906,40 +2100,21 @@ Acceptable values are 3v..12v</string>
         <string/>
        </property>
        <property name="whatsThis">
-        <string>Mode selection:
-
-Mode 1:
-  Left stick:  Elevator, Rudder
-  Right stick:  Throttle, Aileron
-
-Mode 2:
-  Left stick:  Throttle, Rudder
-  Right stick:  Elevator, Aileron
-
-Mode 3:
-  Left stick:  Elevator, Aileron
-  Right stick:  Throttle, Rudder
-
-Mode 4:
-  Left stick:  Throttle, Aileron
-  Right stick:  Elevator, Rudder
-
-</string>
-       </property>
-       <property name="currentIndex">
-        <number>-1</number>
+        <string/>
        </property>
-      </widget>
-     </item>
-     <item row="14" column="0">
-      <widget class="QLabel" name="pwrOnOffHapticLabel">
-       <property name="text">
-        <string>Power ON/OFF Haptic</string>
+       <property name="minimum">
+        <number>10</number>
+       </property>
+       <property name="maximum">
+        <number>45</number>
+       </property>
+       <property name="value">
+        <number>25</number>
        </property>
       </widget>
      </item>
-     <item row="8" column="0">
-      <widget class="QLabel" name="label_displayType">
+     <item row="8" column="1">
+      <widget class="QSpinBox" name="inactimerSB">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
          <horstretch>0</horstretch>
@@ -1949,33 +2124,36 @@ Mode 4:
        <property name="minimumSize">
         <size>
          <width>0</width>
-         <height>0</height>
+         <height>22</height>
         </size>
        </property>
-       <property name="text">
-        <string>LCD Display Type</string>
+       <property name="toolTip">
+        <string/>
        </property>
-      </widget>
-     </item>
-     <item row="9" column="0">
-      <widget class="QLabel" name="label_6">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
+       <property name="statusTip">
+        <string/>
        </property>
-       <property name="minimumSize">
-        <size>
-         <width>0</width>
-         <height>0</height>
-        </size>
+       <property name="whatsThis">
+        <string>If not zero will sound beeps if the transmitter has been left without inputs for the specified number of minutes.</string>
        </property>
+       <property name="suffix">
+        <string> min</string>
+       </property>
+       <property name="maximum">
+        <number>120</number>
+       </property>
+      </widget>
+     </item>
+     <item row="28" column="0">
+      <widget class="QLabel" name="ppm_units_label">
        <property name="text">
-        <string>Inactivity Timer</string>
+        <string>PPM Units</string>
        </property>
       </widget>
      </item>
+     <item row="27" column="1">
+      <widget class="AutoComboBox" name="hatsModeCB" native="true"/>
+     </item>
      <item row="1" column="1">
       <widget class="QComboBox" name="beeperlenCB">
        <property name="sizePolicy">
@@ -2017,15 +2195,8 @@ Mode 4:
        </item>
       </widget>
      </item>
-     <item row="13" column="0">
-      <widget class="QLabel" name="pwrOffDelayLabel">
-       <property name="text">
-        <string>Power Off Delay</string>
-       </property>
-      </widget>
-     </item>
-     <item row="17" column="0">
-      <widget class="QLabel" name="label_11">
+     <item row="3" column="0">
+      <widget class="QLabel" name="label_HL">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
          <horstretch>0</horstretch>
@@ -2039,74 +2210,32 @@ Mode 4:
         </size>
        </property>
        <property name="text">
-        <string>Low EEPROM Warning</string>
+        <string>Haptic Length</string>
        </property>
       </widget>
      </item>
-     <item row="23" column="1">
-      <widget class="QComboBox" name="units_CB">
-       <item>
-        <property name="text">
-         <string>Metric</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>Imperial</string>
-        </property>
-       </item>
-      </widget>
-     </item>
-     <item row="29" column="1">
-      <widget class="QComboBox" name="ppm_units_CB">
-       <property name="currentText">
-        <string>0.--</string>
+     <item row="29" column="0">
+      <spacer name="verticalSpacer_2">
+       <property name="orientation">
+        <enum>Qt::Orientation::Vertical</enum>
        </property>
-       <item>
-        <property name="text">
-         <string>0.--</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>0.0</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>us</string>
-        </property>
-       </item>
-      </widget>
-     </item>
-     <item row="27" column="1">
-      <widget class="QComboBox" name="jackModeCB">
-       <item>
-        <property name="text">
-         <string>Ask on Connect</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>Audio</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>Trainer</string>
-        </property>
-       </item>
-      </widget>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>20</width>
+         <height>40</height>
+        </size>
+       </property>
+      </spacer>
      </item>
-     <item row="21" column="0">
-      <widget class="QLabel" name="stickModeLabel">
+     <item row="10" column="1">
+      <widget class="QCheckBox" name="startSoundCB">
        <property name="text">
-        <string>Stick Mode</string>
+        <string/>
        </property>
       </widget>
      </item>
-     <item row="0" column="1">
-      <widget class="QComboBox" name="beeperCB">
+     <item row="1" column="0">
+      <widget class="QLabel" name="label_beeperlen">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
          <horstretch>0</horstretch>
@@ -2116,109 +2245,53 @@ Mode 4:
        <property name="minimumSize">
         <size>
          <width>0</width>
-         <height>22</height>
+         <height>0</height>
         </size>
        </property>
-       <property name="toolTip">
-        <string/>
-       </property>
-       <property name="statusTip">
-        <string/>
-       </property>
-       <property name="whatsThis">
-        <string>Beeper volume
-
-0 - Quiet.  No beeps at all.
-1 - No Keys.  Normal beeps but menu keys do not beep.
-2 - Normal.
-3 - Loud.
-4 - Extra loud.</string>
-       </property>
-       <item>
-        <property name="text">
-         <string>Quiet</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>Alarms Only</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>No Keys</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>All</string>
-        </property>
-       </item>
-      </widget>
-     </item>
-     <item row="11" column="0">
-      <widget class="QLabel" name="label_playStartSound">
        <property name="text">
-        <string>Play Startup Sound</string>
+        <string>Beeper Length</string>
        </property>
       </widget>
      </item>
-     <item row="18" column="0">
-      <widget class="QLabel" name="label_15">
+     <item row="16" column="1" colspan="2">
+      <widget class="QCheckBox" name="memwarnChkB">
        <property name="sizePolicy">
-        <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+        <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
-       <property name="minimumSize">
+       <property name="maximumSize">
         <size>
-         <width>0</width>
-         <height>0</height>
+         <width>16777215</width>
+         <height>16777215</height>
         </size>
        </property>
-       <property name="text">
-        <string>RSSI Poweroff Warning</string>
-       </property>
-      </widget>
-     </item>
-     <item row="25" column="1">
-      <widget class="QSpinBox" name="switchesDelay">
-       <property name="toolTip">
-        <string/>
-       </property>
-       <property name="statusTip">
-        <string/>
-       </property>
        <property name="whatsThis">
         <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;LCD Screen Contrast&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;Values can be 20-45&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-       </property>
-       <property name="suffix">
-        <string> ms</string>
-       </property>
-       <property name="minimum">
-        <number>0</number>
-       </property>
-       <property name="maximum">
-        <number>1000</number>
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; text-decoration: underline;&quot;&gt;Warnings&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;These will define startup warnings.&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Throttle warning - will alert if the throttle is not at idle during startup&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Switch warning - will alert if switches are not in their defaul position&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Memory warning - will alert if there's not a lot of memory left&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Silent mode warning - will alert you if the beeper is set to quiet (0)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
        </property>
-       <property name="singleStep">
-        <number>10</number>
+       <property name="text">
+        <string/>
        </property>
-       <property name="value">
-        <number>0</number>
+       <property name="checked">
+        <bool>true</bool>
        </property>
       </widget>
      </item>
-     <item row="14" column="1">
-      <widget class="QCheckBox" name="pwrOnOffHaptic_CB">
+     <item row="4" column="1" colspan="2">
+      <widget class="QSlider" name="hapticStrength">
        <property name="sizePolicy">
-        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Minimum">
+        <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
@@ -2229,35 +2302,38 @@ p, li { white-space: pre-wrap; }
          <height>22</height>
         </size>
        </property>
-       <property name="maximumSize">
-        <size>
-         <width>16777215</width>
-         <height>16777215</height>
-        </size>
+       <property name="minimum">
+        <number>-2</number>
        </property>
-       <property name="whatsThis">
-        <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; text-decoration: underline;&quot;&gt;Warnings&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;These will define startup warnings.&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Throttle warning - will alert if the throttle is not at idle during startup&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Switch warning - will alert if switches are not in their defaul position&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Memory warning - will alert if there's not a lot of memory left&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Silent mode warning - will alert you if the beeper is set to quiet (0)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+       <property name="maximum">
+        <number>2</number>
+       </property>
+       <property name="pageStep">
+        <number>1</number>
        </property>
-       <property name="text">
+       <property name="orientation">
+        <enum>Qt::Orientation::Horizontal</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="21" column="1">
+      <widget class="QComboBox" name="channelorderCB">
+       <property name="toolTip">
         <string/>
        </property>
-       <property name="checked">
-        <bool>true</bool>
+       <property name="statusTip">
+        <string/>
+       </property>
+       <property name="whatsThis">
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Channel order&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Defines the order of the default mixes created on a new model.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+       </property>
+       <property name="currentIndex">
+        <number>-1</number>
        </property>
       </widget>
      </item>
-     <item row="3" column="0">
-      <widget class="QLabel" name="label_HL">
+     <item row="6" column="0">
+      <widget class="QLabel" name="label_2">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
          <horstretch>0</horstretch>
@@ -2266,109 +2342,58 @@ p, li { white-space: pre-wrap; }
        </property>
        <property name="minimumSize">
         <size>
-         <width>0</width>
+         <width>20</width>
          <height>0</height>
         </size>
        </property>
+       <property name="toolTip">
+        <string extracomment="Low Battery Voltage warning [5v-10v]"/>
+       </property>
        <property name="text">
-        <string>Haptic Length</string>
+        <string>Battery Warning</string>
        </property>
       </widget>
      </item>
-     <item row="12" column="0">
+     <item row="11" column="0">
       <widget class="QLabel" name="pwrOnDelayLabel">
        <property name="text">
         <string>Power On Delay</string>
        </property>
       </widget>
      </item>
-     <item row="0" column="0">
-      <widget class="QLabel" name="label_12">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>0</width>
-         <height>0</height>
-        </size>
+     <item row="14" column="1">
+      <widget class="QSpinBox" name="pwrOffIfInactiveSB">
+       <property name="suffix">
+        <string> min</string>
        </property>
-       <property name="text">
-        <string>Beeper Mode</string>
+       <property name="maximum">
+        <number>255</number>
        </property>
       </widget>
      </item>
-     <item row="20" column="1" colspan="2">
-      <widget class="QComboBox" name="mavbaud_CB">
-       <item>
-        <property name="text">
-         <string>4800 Baud</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>9600 Baud</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>14400 Baud</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>19200 Baud</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>38400 Baud</string>
-        </property>
-       </item>
+     <item row="26" column="1">
+      <widget class="QComboBox" name="jackModeCB">
        <item>
         <property name="text">
-         <string>57600 Baud</string>
+         <string>Ask on Connect</string>
         </property>
        </item>
        <item>
         <property name="text">
-         <string>76800 Baud</string>
+         <string>Audio</string>
         </property>
        </item>
        <item>
         <property name="text">
-         <string>115200 Baud</string>
+         <string>Trainer</string>
         </property>
        </item>
       </widget>
      </item>
-     <item row="30" column="0">
-      <spacer name="verticalSpacer_2">
-       <property name="orientation">
-        <enum>Qt::Orientation::Vertical</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>20</width>
-         <height>40</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item row="27" column="0">
-      <widget class="QLabel" name="jackModeLabel">
-       <property name="text">
-        <string>Jack Mode</string>
-       </property>
-      </widget>
-     </item>
-     <item row="4" column="1" colspan="2">
-      <widget class="QSlider" name="hapticStrength">
+     <item row="8" column="0">
+      <widget class="QLabel" name="label_6">
        <property name="sizePolicy">
-        <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
+        <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
@@ -2376,85 +2401,14 @@ p, li { white-space: pre-wrap; }
        <property name="minimumSize">
         <size>
          <width>0</width>
-         <height>22</height>
+         <height>0</height>
         </size>
        </property>
-       <property name="minimum">
-        <number>-2</number>
-       </property>
-       <property name="maximum">
-        <number>2</number>
-       </property>
-       <property name="pageStep">
-        <number>1</number>
-       </property>
-       <property name="orientation">
-        <enum>Qt::Orientation::Horizontal</enum>
+       <property name="text">
+        <string>Inactivity Timer</string>
        </property>
       </widget>
      </item>
-     <item row="7" column="1" colspan="2">
-      <layout class="QHBoxLayout" name="batMeterRangeLayout" stretch="0,1,0,1">
-       <item>
-        <widget class="QLabel" name="HasBatMeterMinRangeLabel">
-         <property name="text">
-          <string>Min</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QDoubleSpinBox" name="vBatMinDSB">
-         <property name="suffix">
-          <string>v</string>
-         </property>
-         <property name="decimals">
-          <number>1</number>
-         </property>
-         <property name="minimum">
-          <double>3.000000000000000</double>
-         </property>
-         <property name="maximum">
-          <double>16.000000000000000</double>
-         </property>
-         <property name="singleStep">
-          <double>0.100000000000000</double>
-         </property>
-         <property name="value">
-          <double>9.000000000000000</double>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QLabel" name="HasBatMeterMaxRangeLabel">
-         <property name="text">
-          <string>Max</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QDoubleSpinBox" name="vBatMaxDSB">
-         <property name="suffix">
-          <string>v</string>
-         </property>
-         <property name="decimals">
-          <number>1</number>
-         </property>
-         <property name="minimum">
-          <double>3.000000000000000</double>
-         </property>
-         <property name="maximum">
-          <double>16.000000000000000</double>
-         </property>
-         <property name="singleStep">
-          <double>0.100000000000000</double>
-         </property>
-         <property name="value">
-          <double>12.000000000000000</double>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </item>
      <item row="7" column="0">
       <widget class="QLabel" name="batMeterRangeLabel">
        <property name="sizePolicy">
@@ -2475,7 +2429,7 @@ p, li { white-space: pre-wrap; }
       </widget>
      </item>
      <item row="16" column="0">
-      <widget class="QLabel" name="label_27">
+      <widget class="QLabel" name="label_11">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
          <horstretch>0</horstretch>
@@ -2489,66 +2443,34 @@ p, li { white-space: pre-wrap; }
         </size>
        </property>
        <property name="text">
-        <string>&quot;No Sound&quot; Warning</string>
+        <string>Low EEPROM Warning</string>
        </property>
       </widget>
      </item>
-     <item row="11" column="1">
-      <widget class="QCheckBox" name="startSoundCB">
+     <item row="27" column="0">
+      <widget class="QLabel" name="hatsModeLabel">
        <property name="text">
-        <string/>
+        <string>Hats Mode</string>
        </property>
       </widget>
      </item>
-     <item row="18" column="1">
-      <widget class="QCheckBox" name="rssiPowerOffWarnChkB">
+     <item row="25" column="0">
+      <widget class="QLabel" name="usbModeLabel">
+       <property name="text">
+        <string>USB Mode</string>
+       </property>
+      </widget>
+     </item>
+     <item row="24" column="0">
+      <widget class="QLabel" name="switchesDelayLabel">
        <property name="sizePolicy">
-        <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+        <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
-       <property name="maximumSize">
-        <size>
-         <width>16777215</width>
-         <height>16777215</height>
-        </size>
-       </property>
-       <property name="whatsThis">
-        <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; text-decoration: underline;&quot;&gt;Warnings&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;These will define startup warnings.&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Throttle warning - will alert if the throttle is not at idle during startup&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Switch warning - will alert if switches are not in their defaul position&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Memory warning - will alert if there's not a lot of memory left&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Silent mode warning - will alert you if the beeper is set to quiet (0)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-       </property>
-       <property name="text">
-        <string/>
-       </property>
-       <property name="checked">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item row="15" column="0">
-      <widget class="QLabel" name="pwrOffIfInactiveLabel">
        <property name="text">
-        <string>Power Auto Off</string>
-       </property>
-      </widget>
-     </item>
-     <item row="15" column="1">
-      <widget class="QSpinBox" name="pwrOffIfInactiveSB">
-       <property name="suffix">
-        <string> min</string>
-       </property>
-       <property name="maximum">
-        <number>255</number>
+        <string>Play Delay (switch mid position)</string>
        </property>
       </widget>
      </item>
diff --git a/companion/src/generaledit/hardware.cpp b/companion/src/generaledit/hardware.cpp
index 8c9ba3989b2..8517354faa0 100644
--- a/companion/src/generaledit/hardware.cpp
+++ b/companion/src/generaledit/hardware.cpp
@@ -345,16 +345,6 @@ HardwarePanel::HardwarePanel(QWidget * parent, GeneralSettings & generalSettings
     addParams();
   }
 
-  if (firmware->getCapability(HastxCurrentCalibration)) {
-    addLabel(tr("Current Offset"));
-    AutoSpinBox *txCurrentCalibration = new AutoSpinBox(this);
-    FieldRange txCCRng = GeneralSettings::getTxCurrentCalibration();
-    txCurrentCalibration->setSuffix(txCCRng.unit);
-    txCurrentCalibration->setField(generalSettings.txCurrentCalibration);
-    params->append(txCurrentCalibration);
-    addParams();
-  }
-
   if (Boards::getCapability(board, Board::LcdWidth) == 128) {
     addSection(tr("Screen"));
 
diff --git a/companion/src/storage/labeled.cpp b/companion/src/storage/labeled.cpp
index 0d699d92e03..a9dffc28f09 100644
--- a/companion/src/storage/labeled.cpp
+++ b/companion/src/storage/labeled.cpp
@@ -188,7 +188,6 @@ bool LabelsStorageFormat::write(RadioData & radioData)
 
     if (loadRadioSettings(gsCur)) {
       GeneralSettings & gsNew = radioData.generalSettings;
-      gsNew.txCurrentCalibration = gsCur.txCurrentCalibration;
       gsNew.txVoltageCalibration = gsCur.txVoltageCalibration;
 
       for (int i = 0; i < CPN_MAX_INPUTS; i++) {