diff --git a/companion/src/eeprominterface.cpp b/companion/src/eeprominterface.cpp
index 08c8dacba..1862e0ed5 100644
--- a/companion/src/eeprominterface.cpp
+++ b/companion/src/eeprominterface.cpp
@@ -116,6 +116,7 @@ RawSourceRange RawSource::getRange(bool singleprec)
         case TELEMETRY_SOURCE_RSSI_TX:
         case TELEMETRY_SOURCE_RSSI_RX:
           result.max = 100;
+          if (singleprec) result.offset = 128;
           break;
         case TELEMETRY_SOURCE_A1:
         case TELEMETRY_SOURCE_A2:
@@ -144,6 +145,11 @@ RawSourceRange RawSource::getRange(bool singleprec)
           result.min = -30;
           result.max = 225;
           break;
+        case TELEMETRY_SOURCE_HDG:
+          result.step = singleprec ? 2 : 1;
+          result.max = 360;
+          if (singleprec) result.offset = 256;
+          break;
         case TELEMETRY_SOURCE_RPM:
         case TELEMETRY_SOURCE_RPM_MAX:
           result.step = singleprec ? 50 : 1;
@@ -155,12 +161,18 @@ RawSourceRange RawSource::getRange(bool singleprec)
         case TELEMETRY_SOURCE_SPEED:
         case TELEMETRY_SOURCE_SPEED_MAX:
           result.step = singleprec ? 4 : 1;
-          result.max = singleprec ? 944 : 2000;
+          result.max = singleprec ? (4*236) : 2000;
           if (model && !model->frsky.imperial) {
             result.step *= 1.852;
             result.max *= 1.852;
           }
           break;
+        case TELEMETRY_SOURCE_VERTICAL_SPEED:
+          result.step = 0.1;
+          result.min = -12.5;
+          result.max = 13.0;
+          result.decimals = 1;
+          break;
         case TELEMETRY_SOURCE_DIST:
         case TELEMETRY_SOURCE_DIST_MAX:
           result.step = singleprec ? 8 : 1;
@@ -195,11 +207,18 @@ RawSourceRange RawSource::getRange(bool singleprec)
           result.step = singleprec ? 5 : 1;
           result.max = singleprec ? 1275 : 2000;
           break;
+        case TELEMETRY_SOURCE_ACCX:
+        case TELEMETRY_SOURCE_ACCY:
+        case TELEMETRY_SOURCE_ACCZ:
+          result.step = 0.01;
+          result.decimals = 2;
+          result.max = 2.55;
+          break;
         default:
           result.max = 125;
           break;
       }
-      if (singleprec) {
+      if (singleprec && !result.offset) {
         result.offset = result.max - (127*result.step);
       }
       break;
@@ -245,7 +264,7 @@ QString RawSource::toString()
     QObject::tr("Speed"), QObject::tr("Dist"), QObject::tr("GPS Alt"),
     QObject::tr("Cell"), QObject::tr("Cells"), QObject::tr("Vfas"), QObject::tr("Curr"), QObject::tr("Cnsp"), QObject::tr("Powr"),
     QObject::tr("AccX"), QObject::tr("AccY"), QObject::tr("AccZ"),
-    QObject::tr("HDG "), QObject::tr("VSpd"), QObject::tr("AirSpeed"), QObject::tr("dTE"),
+    QObject::tr("Hdg "), QObject::tr("VSpd"), QObject::tr("AirSpeed"), QObject::tr("dTE"),
     QObject::tr("A1-"),  QObject::tr("A2-"), QObject::tr("A3-"),  QObject::tr("A4-"),
     QObject::tr("Alt-"), QObject::tr("Alt+"), QObject::tr("Rpm+"), QObject::tr("T1+"), QObject::tr("T2+"), QObject::tr("Speed+"), QObject::tr("Dist+"), QObject::tr("AirSpeed+"),
     QObject::tr("Cell-"), QObject::tr("Cells-"), QObject::tr("Vfas-"), QObject::tr("Curr+"), QObject::tr("Powr+"),
diff --git a/companion/src/eeprominterface.h b/companion/src/eeprominterface.h
index 9947e3fd7..adecee4fb 100644
--- a/companion/src/eeprominterface.h
+++ b/companion/src/eeprominterface.h
@@ -244,7 +244,7 @@ enum TelemetrySource {
   TELEMETRY_SOURCE_GPS_TIME,
   TELEMETRY_SOURCES_STATUS_COUNT = TELEMETRY_SOURCE_GPS_TIME+1,
   TELEMETRY_SOURCES_DISPLAY_COUNT = TELEMETRY_SOURCE_POWER_MAX+1,
-  TELEMETRY_SOURCES_COUNT = TELEMETRY_SOURCE_DTE+1,
+  TELEMETRY_SOURCES_COUNT = TELEMETRY_SOURCE_POWER_MAX+1,
   TELEMETRY_SOURCE_RESERVE = -1
 };
 
diff --git a/companion/src/firmwares/opentx/opentxeeprom.cpp b/companion/src/firmwares/opentx/opentxeeprom.cpp
index 7efa4deab..466f8dfa5 100644
--- a/companion/src/firmwares/opentx/opentxeeprom.cpp
+++ b/companion/src/firmwares/opentx/opentxeeprom.cpp
@@ -241,6 +241,10 @@ class SourcesConversionTable: public ConversionTable {
             if (i==TELEMETRY_SOURCE_SWR || i==TELEMETRY_SOURCE_RX_BATT || i==TELEMETRY_SOURCE_A3 || i==TELEMETRY_SOURCE_A4 || i==TELEMETRY_SOURCE_ASPD || i==TELEMETRY_SOURCE_DTE || i==TELEMETRY_SOURCE_CELL_MIN || i==TELEMETRY_SOURCE_CELLS_MIN || i==TELEMETRY_SOURCE_VFAS_MIN)
               continue;
           }
+          if (!IS_ARM(board)) {
+            if (i==TELEMETRY_SOURCE_SWR|| i==TELEMETRY_SOURCE_RX_BATT || i==TELEMETRY_SOURCE_A3 || i==TELEMETRY_SOURCE_A4 || i==TELEMETRY_SOURCE_A3_MIN || i==TELEMETRY_SOURCE_A4_MIN)
+              continue;
+          }
           addConversion(RawSource(SOURCE_TYPE_TELEMETRY, i), val++);
           if (version >= 216 && IS_ARM(board)) {
             if (i==TELEMETRY_SOURCE_DTE)
diff --git a/companion/src/firmwares/opentx/opentxinterface.cpp b/companion/src/firmwares/opentx/opentxinterface.cpp
index 0e2e49b31..0ef9eaf97 100644
--- a/companion/src/firmwares/opentx/opentxinterface.cpp
+++ b/companion/src/firmwares/opentx/opentxinterface.cpp
@@ -278,7 +278,7 @@ template <class T>
 bool OpenTxInterface::saveModel(unsigned int index, ModelData &model, unsigned int version, unsigned int variant)
 {
   T open9xModel(model, board, version, variant);
-  // open9xModel.Dump();
+  open9xModel.Dump();
   QByteArray eeprom;
   open9xModel.Export(eeprom);
   int sz = efile->writeRlc2(FILE_MODEL(index), FILE_TYP_MODEL, (const uint8_t*)eeprom.constData(), eeprom.size());
diff --git a/companion/src/helpers.cpp b/companion/src/helpers.cpp
index 73beefce1..92ec4bd87 100644
--- a/companion/src/helpers.cpp
+++ b/companion/src/helpers.cpp
@@ -667,11 +667,11 @@ void populateCSWCB(QComboBox *b, int value)
   b->clear();
   for (int i=0; i<LS_FN_MAX; i++) {
     int func = order[i];
+    if (!IS_ARM(GetEepromInterface()->getBoard())) {
+      if (func == LS_FN_VEQUAL || func == LS_FN_STAY)
+        continue;
+    }
     b->addItem(LogicalSwitchData(func).funcToString(), func);
-//    if (i>GetEepromInterface()->getCapability(CSFunc)) {
-//      QModelIndex index = b->model()->index(i, 0);
-//      QVariant v(0);
-//    }
     if (value == func) {
       b->setCurrentIndex(b->count()-1);
     }
diff --git a/companion/src/modeledit/logicalswitches.cpp b/companion/src/modeledit/logicalswitches.cpp
index 1cf097e57..eeadacbae 100644
--- a/companion/src/modeledit/logicalswitches.cpp
+++ b/companion/src/modeledit/logicalswitches.cpp
@@ -130,22 +130,12 @@ void LogicalSwitchesPanel::v1Edited(int value)
     model.customSw[i].val1 = cswitchSource1[i]->itemData(value).toInt();
     if (model.customSw[i].getFunctionFamily() == LS_FAMILY_VOFS) {
       RawSource source = RawSource(model.customSw[i].val1, &model);
-      if (source.type == SOURCE_TYPE_TELEMETRY) {
-        if (model.customSw[i].func == LS_FN_DPOS || model.customSw[i].func == LS_FN_DAPOS) {
-          model.customSw[i].val2 = 0;
-        }
-        else {
-          model.customSw[i].val2 = -128;
-        }
+      RawSourceRange range = source.getRange();
+      if (model.customSw[i].func == LS_FN_DPOS || model.customSw[i].func == LS_FN_DAPOS) {
+        model.customSw[i].val2 = (cswitchOffset[i]->value() / range.step);
       }
       else {
-        RawSourceRange range = source.getRange();
-        if (model.customSw[i].func == LS_FN_DPOS || model.customSw[i].func == LS_FN_DAPOS) {
-          model.customSw[i].val2 = (cswitchOffset[i]->value() / range.step);
-        }
-        else {
-          model.customSw[i].val2 = (cswitchOffset[i]->value() - range.offset) / range.step/* TODO - source.getRawOffset(model)*/;
-        }
+        model.customSw[i].val2 = (cswitchOffset[i]->value() - range.offset) / range.step/* TODO - source.getRawOffset(model)*/;
       }
       setSwitchWidgetVisibility(i);
     }
@@ -223,8 +213,8 @@ void LogicalSwitchesPanel::edited()
           cswitchOffset[i]->setValue(model.customSw[i].val2*range.step);
         }
         else {
-          model.customSw[i].val2 = ((cswitchOffset[i]->value()-range.offset)/range.step)/* TODO - source.getRawOffset(model)*/;
-          cswitchOffset[i]->setValue((model.customSw[i].val2 /* + TODO source.getRawOffset(model)*/)*range.step+range.offset);
+          model.customSw[i].val2 = round((cswitchOffset[i]->value()-range.offset)/range.step);
+          cswitchOffset[i]->setValue(model.customSw[i].val2*range.step + range.offset);
         }
         break;
       }
diff --git a/radio/src/lcd.cpp b/radio/src/lcd.cpp
index af94fedca..4334da644 100644
--- a/radio/src/lcd.cpp
+++ b/radio/src/lcd.cpp
@@ -1242,10 +1242,13 @@ void putsTelemetryChannel(xcoord_t x, uint8_t y, uint8_t channel, lcdint_t val,
     case TELEM_ACCx-1:
     case TELEM_ACCy-1:
     case TELEM_ACCz-1:
-    case TELEM_VSPD-1:
       putsTelemetryValue(x, y, val, UNIT_RAW, att|PREC2);
       break;
 
+    case TELEM_VSPD-1:
+      putsTelemetryValue(x, y, div10_and_round(val), UNIT_RAW, att|PREC1);
+      break;
+
 #if defined(CPUARM)
     case TELEM_SWR-1:
 #endif
@@ -1279,7 +1282,7 @@ void putsTelemetryChannel(xcoord_t x, uint8_t y, uint8_t channel, lcdint_t val,
       if (channel >= TELEM_MIN_ALT-1 && channel <= TELEM_MAX_ALT-1)
         unit = 0;
       if (channel == TELEM_HDG-1)
-        unit = UNIT_HDG;
+        unit = 3;
       putsTelemetryValue(x, y, val, pgm_read_byte(bchunit_ar+unit), att);
       break;
     }
diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp
index c4726d1b3..2009887ed 100644
--- a/radio/src/opentx.cpp
+++ b/radio/src/opentx.cpp
@@ -2051,6 +2051,10 @@ getvalue_t convert16bitsTelemValue(uint8_t channel, ls_telemetry_value_t value)
       result = value * 100;
       break;
 #endif
+    case TELEM_VSPD:
+      result = value * 10;
+      break;
+
     default:
       result = value;
       break;
@@ -2110,6 +2114,9 @@ getvalue_t convert8bitsTelemValue(uint8_t channel, ls_telemetry_value_t value)
     case TELEM_CONSUMPTION:
       result = value * 20;
       break;
+    case TELEM_VSPD:
+      result = ((getvalue_t)value - 125) * 10;
+      break;
 #endif
     default:
       result = value;
@@ -3249,8 +3256,8 @@ PLAY_FUNCTION(playValue, uint8_t idx)
       // no break
     case MIXSRC_FIRST_TELEM+TELEM_A1-1:
     case MIXSRC_FIRST_TELEM+TELEM_A2-1:
+      // A1 and A2
       idx -= (MIXSRC_FIRST_TELEM+TELEM_A1-1);
-        // A1 and A2
       {
         if (TELEMETRY_STREAMING()) {
           uint8_t att = 0;
diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt
index 6563d4aea..074c38796 100644
--- a/radio/src/translations/cz.h.txt
+++ b/radio/src/translations/cz.h.txt
@@ -285,16 +285,16 @@
   #define TR_RX_BATT           "RxBt"
   #define TR_A3_A4             "A3\0 ""A4\0 "
   #define TR_A3_A4_MIN         "A3-\0""A4-\0"
-  #define TR_ASPD_MAX          "ASp+" 
 #else
   #define TR_TELEM_RESERVE
   #define TR_SWR
   #define TR_RX_BATT
   #define TR_A3_A4
   #define TR_A3_A4_MIN
-  #define TR_ASPD_MAX
 #endif
 
+#define TR_ASPD_MAX            "ASp+" 
+
 #define TR_VTELEMCHNS          "---\0""Bat\0""Tmr1""Tmr2" TR_SWR "Tx\0 ""Rx\0 " TR_RX_BATT "A1\0 ""A2\0 " TR_A3_A4 "Alt\0""Rpm\0""Fuel""T1\0 ""T2\0 ""Spd\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VSpd""ASpd""dTE\0" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "A1-\0""A2-\0" TR_A3_A4_MIN "Alt-""Alt+""Rpm+""T1+\0""T2+\0""Spd+""Dst+" TR_ASPD_MAX "Cel-""Cls-""Vfs-""Cur+""Pwr+" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "Acc\0""Time"
 
 #define LENGTH_UNIT_IMP        "ft\0"
diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt
index a1cb9cd6b..d3dcff591 100644
--- a/radio/src/translations/de.h.txt
+++ b/radio/src/translations/de.h.txt
@@ -285,16 +285,16 @@
   #define TR_RX_BATT           "RxBt"
   #define TR_A3_A4             "A3\0 ""A4\0 "
   #define TR_A3_A4_MIN         "A3-\0""A4-\0"
-  #define TR_ASPD_MAX          "ASp+" 
 #else
   #define TR_TELEM_RESERVE
   #define TR_SWR
   #define TR_RX_BATT
   #define TR_A3_A4
   #define TR_A3_A4_MIN
-  #define TR_ASPD_MAX 
 #endif
 
+#define TR_ASPD_MAX            "ASp+" 
+
 #define TR_VTELEMCHNS          "---\0""Batt""Tmr1""Tmr2" TR_SWR "Tx\0 ""Rx\0 " TR_RX_BATT "A1\0 ""A2\0 " TR_A3_A4 "Alt\0""Rpm\0""Fuel""T1\0 ""T2\0 ""Spd\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VSpd""ASpd""dTE\0" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "A1-\0""A2-\0" TR_A3_A4_MIN "Alt-""Alt+""Rpm+""T1+\0""T2+\0""Spd+""Dst+" TR_ASPD_MAX "Cel-""Cls-""Vfs-""Cur+""Pwr+" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "Acc\0""Time"
 
 #define LENGTH_UNIT_IMP        "ft\0"
diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt
index 0db3bb705..3ed7c9d0e 100644
--- a/radio/src/translations/en.h.txt
+++ b/radio/src/translations/en.h.txt
@@ -285,20 +285,20 @@
   #define TR_RX_BATT           TR("RxBt", "RxBat")
   #define TR_A3_A4             TR("A3\0 ""A4\0 ", "A3\0  ""A4\0  ") 
   #define TR_A3_A4_MIN         TR("A3-\0""A4-\0", "A3-\0 ""A4-\0 ")
-  #define TR_ASPD_MAX          TR("ASp+", "ASpd+") 
 #else
   #define TR_TELEM_RESERVE
   #define TR_SWR
   #define TR_RX_BATT
   #define TR_A3_A4
   #define TR_A3_A4_MIN
-  #define TR_ASPD_MAX
 #endif
 
+#define TR_ASPD_MAX            TR("ASp+", "ASpd+") 
+
 #if LCD_W >= 212
-  #define TR_VTELEMCHNS          "---\0 ""Batt\0""Tmr1\0""Tmr2\0" TR_SWR "Tx\0  ""Rx\0  " TR_RX_BATT "A1\0  ""A2\0  " TR_A3_A4 "Alt\0 ""Rpm\0 ""Fuel\0""T1\0  ""T2\0  ""Spd\0 ""Dist\0""GAlt\0""Cell\0""Cells""Vfas\0""Curr\0""Cnsp\0""Powr\0""AccX\0""AccY\0""AccZ\0""Hdg\0 ""VSpd\0""ASpd\0""dTE\0 " TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "A1-\0 ""A2-\0 " TR_A3_A4_MIN "Alt-\0""Alt+\0""Rpm+\0""T1+\0 ""T2+\0 ""Spd+\0""Dst+\0" TR_ASPD_MAX "Cell-""Cels-""Vfas-""Curr+""Powr+" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "Acc\0 ""Time\0"
+  #define TR_VTELEMCHNS        "---\0 ""Batt\0""Tmr1\0""Tmr2\0" TR_SWR "Tx\0  ""Rx\0  " TR_RX_BATT "A1\0  ""A2\0  " TR_A3_A4 "Alt\0 ""Rpm\0 ""Fuel\0""T1\0  ""T2\0  ""Spd\0 ""Dist\0""GAlt\0""Cell\0""Cells""Vfas\0""Curr\0""Cnsp\0""Powr\0""AccX\0""AccY\0""AccZ\0""Hdg\0 ""VSpd\0""ASpd\0""dTE\0 " TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "A1-\0 ""A2-\0 " TR_A3_A4_MIN "Alt-\0""Alt+\0""Rpm+\0""T1+\0 ""T2+\0 ""Spd+\0""Dst+\0" TR_ASPD_MAX "Cell-""Cels-""Vfas-""Curr+""Powr+" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "Acc\0 ""Time\0"
 #else
-  #define TR_VTELEMCHNS          "---\0""Batt""Tmr1""Tmr2" TR_SWR "Tx\0 ""Rx\0 " TR_RX_BATT "A1\0 ""A2\0 " TR_A3_A4 "Alt\0""Rpm\0""Fuel""T1\0 ""T2\0 ""Spd\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VSpd""ASpd""dTE\0" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "A1-\0""A2-\0" TR_A3_A4_MIN "Alt-""Alt+""Rpm+""T1+\0""T2+\0""Spd+""Dst+" TR_ASPD_MAX "Cel-""Cls-""Vfs-""Cur+""Pwr+" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "Acc\0""Time"
+  #define TR_VTELEMCHNS        "---\0""Batt""Tmr1""Tmr2" TR_SWR "Tx\0 ""Rx\0 " TR_RX_BATT "A1\0 ""A2\0 " TR_A3_A4 "Alt\0""Rpm\0""Fuel""T1\0 ""T2\0 ""Spd\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VSpd""ASpd""dTE\0" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "A1-\0""A2-\0" TR_A3_A4_MIN "Alt-""Alt+""Rpm+""T1+\0""T2+\0""Spd+""Dst+" TR_ASPD_MAX "Cel-""Cls-""Vfs-""Cur+""Pwr+" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "Acc\0""Time"
 #endif
 
 #define LENGTH_UNIT_IMP        "ft\0"
diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt
index f4ee1194b..f91ef07e2 100644
--- a/radio/src/translations/es.h.txt
+++ b/radio/src/translations/es.h.txt
@@ -285,16 +285,16 @@
   #define TR_RX_BATT           "RxBt"
   #define TR_A3_A4             "A3\0 ""A4\0 "
   #define TR_A3_A4_MIN         "A3-\0""A4-\0"
-  #define TR_ASPD_MAX          "ASp+" 
 #else
   #define TR_TELEM_RESERVE
   #define TR_SWR
   #define TR_RX_BATT
   #define TR_A3_A4
   #define TR_A3_A4_MIN
-  #define TR_ASPD_MAX 
 #endif
 
+#define TR_ASPD_MAX            "ASp+" 
+
 #define TR_VTELEMCHNS          "---\0""Batt""Tmr1""Tmr2" TR_SWR "Tx\0 ""Rx\0 " TR_RX_BATT "A1\0 ""A2\0 " TR_A3_A4 "Alt\0""Rpm\0""Fuel""T1\0 ""T2\0 ""Spd\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VSpd""ASpd""dTE\0" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "A1-\0""A2-\0" TR_A3_A4_MIN "Alt-""Alt+""Rpm+""T1+\0""T2+\0""Spd+""Dst+" TR_ASPD_MAX "Cel-""Cls-""Vfs-""Cur+""Pwr+" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "Acc\0""Hora"
 
 #define LENGTH_UNIT_IMP        "ft\0"
diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt
index 0b7540155..54558a30e 100644
--- a/radio/src/translations/fi.h.txt
+++ b/radio/src/translations/fi.h.txt
@@ -285,16 +285,16 @@
   #define TR_RX_BATT           "RxBt"
   #define TR_A3_A4             "A3\0 ""A4\0 "
   #define TR_A3_A4_MIN         "A3-\0""A4-\0"
-  #define TR_ASPD_MAX          "ASp+" 
 #else
   #define TR_TELEM_RESERVE
   #define TR_SWR
   #define TR_RX_BATT
   #define TR_A3_A4
   #define TR_A3_A4_MIN
-  #define TR_ASPD_MAX 
 #endif
 
+#define TR_ASPD_MAX            "ASp+" 
+
 #define TR_VTELEMCHNS          "---\0""Batt""Tmr1""Tmr2" TR_SWR "Tx\0 ""Rx\0 " TR_RX_BATT "A1\0 ""A2\0 " TR_A3_A4 "Alt\0""Rpm\0""Fuel""T1\0 ""T2\0 ""Spd\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VSpd""ASpd""dTE\0" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "A1-\0""A2-\0" TR_A3_A4_MIN "Alt-""Alt+""Rpm+""T1+\0""T2+\0""Spd+""Dst+" TR_ASPD_MAX "Cel-""Cls-""Vfs-""Cel-""Cls-""Vfs-""Cur+""Pwr+" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "Acc\0""Time"
 
 #define LENGTH_UNIT_IMP        "ft\0"
diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt
index 083cc01f3..9779382e1 100644
--- a/radio/src/translations/fr.h.txt
+++ b/radio/src/translations/fr.h.txt
@@ -285,16 +285,16 @@
   #define TR_RX_BATT           "RxBt"
   #define TR_A3_A4             "A3\0 ""A4\0 "
   #define TR_A3_A4_MIN         "A3-\0""A4-\0"
-  #define TR_ASPD_MAX          "ViA+"
 #else
   #define TR_TELEM_RESERVE
   #define TR_SWR
   #define TR_RX_BATT
   #define TR_A3_A4
   #define TR_A3_A4_MIN
-  #define TR_ASPD_MAX 
 #endif
 
+#define TR_ASPD_MAX            "ViA+"
+
 #define TR_VTELEMCHNS          "---\0""Batt""Chr1""Chr2" TR_SWR "Tx\0 ""Rx\0 " TR_RX_BATT "A1\0 ""A2\0 " TR_A3_A4 "Alt\0""Rpm\0""Carb""T1\0 ""T2\0 ""Vit\0""Dist""AltG""Elem""Velm""Vfas""Cour""Cnsm""Puis""AccX""AccY""AccZ""Cap\0""VitV""VitA""dET\0" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "A1-\0""A2-\0" TR_A3_A4_MIN "Alt-""Alt+""Rpm+""T1+\0""T2+\0""Vit+""Dst+" TR_ASPD_MAX "Elm-""Els-""Vfs-""Cur+""Pui+" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "Acc\0""Tmps"
 
 #define LENGTH_UNIT_IMP        "ft\0"
diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt
index 333606b37..a1552b616 100644
--- a/radio/src/translations/it.h.txt
+++ b/radio/src/translations/it.h.txt
@@ -285,16 +285,16 @@
   #define TR_RX_BATT           "RxBt"
   #define TR_A3_A4             "A3\0 ""A4\0 "
   #define TR_A3_A4_MIN         "A3-\0""A4-\0"
-  #define TR_ASPD_MAX          "ASp+" 
 #else
   #define TR_TELEM_RESERVE
   #define TR_SWR
   #define TR_RX_BATT
   #define TR_A3_A4
   #define TR_A3_A4_MIN
-  #define TR_ASPD_MAX 
 #endif
 
+#define TR_ASPD_MAX            "ASp+" 
+
 #define TR_VTELEMCHNS          "---\0""Batt""Tmr1""Tmr2" TR_SWR "Tx\0 ""Rx\0 " TR_RX_BATT "A1\0 ""A2\0 " TR_A3_A4 "Alt\0""Rpm\0""Carb""T1\0 ""T2\0 ""Vel\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsm""Powr""AccX""AccY""AccZ""Dir\0""VelV""ASpd""dTE\0" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "A1-\0""A2-\0" TR_A3_A4_MIN "Alt-""Alt+""Rpm+""T1+\0""T2+\0""Vel+""Dst+" TR_ASPD_MAX "Cel-""Cls-""Vfs-""Cur+""Pwr+" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "Acc\0""Time"
 
 #define LENGTH_UNIT_IMP        "ft\0"
diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt
index fe5b93973..1cb9be58c 100644
--- a/radio/src/translations/pl.h.txt
+++ b/radio/src/translations/pl.h.txt
@@ -285,16 +285,16 @@
   #define TR_RX_BATT           "RxBt"
   #define TR_A3_A4             "A3\0 ""A4\0 "
   #define TR_A3_A4_MIN         "A3-\0""A4-\0"
-  #define TR_ASPD_MAX          "ASp+" 
 #else
   #define TR_TELEM_RESERVE
   #define TR_SWR
   #define TR_RX_BATT
   #define TR_A3_A4
   #define TR_A3_A4_MIN
-  #define TR_ASPD_MAX 
 #endif
 
+#define TR_ASPD_MAX            "ASp+" 
+
 #define TR_VTELEMCHNS          "---\0""Bat\0""Tmr1""Tmr2" TR_SWR "Tx\0 ""Rx\0 " TR_RX_BATT "A1\0 ""A2\0 " TR_A3_A4 "Wys\0""Rpm\0""Pali""T1\0 ""T2\0 ""Spd\0""Dyst""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Moc\0""AccX""AccY""AccZ""Hdg\0""VSpd""ASpd""dTE\0" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "A1-\0""A2-\0" TR_A3_A4_MIN "Wys-""Wys+""Rpm+""T1+\0""T2+\0""Spd+""Dst+" TR_ASPD_MAX "Cel-""Cls-""Vfs-""Cur+""Moc+" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "Acc\0""Time"
 
 #define LENGTH_UNIT_IMP        "ft\0"
diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt
index 41d249528..b895ba6e7 100644
--- a/radio/src/translations/pt.h.txt
+++ b/radio/src/translations/pt.h.txt
@@ -285,16 +285,16 @@
   #define TR_RX_BATT           "RxBt"
   #define TR_A3_A4             "A3\0 ""A4\0 "
   #define TR_A3_A4_MIN         "A3-\0""A4-\0"
-  #define TR_ASPD_MAX          "ASp+" 
 #else
   #define TR_TELEM_RESERVE
   #define TR_SWR
   #define TR_RX_BATT
   #define TR_A3_A4
   #define TR_A3_A4_MIN
-  #define TR_ASPD_MAX 
 #endif
 
+#define TR_ASPD_MAX            "ASp+" 
+
 #define TR_VTELEMCHNS          "---\0""Batt""Tmr1""Tmr2" TR_SWR "Tx\0 ""Rx\0 " TR_RX_BATT "A1\0 ""A2\0 " TR_A3_A4 "Alt\0""Rpm\0""Fuel""T1\0 ""T2\0 ""Spd\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VVel""ASpd""dTE\0" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "A1-\0""A2-\0" TR_A3_A4_MIN "Alt-""Alt+""Rpm+""T1+\0""T2+\0""Vel+""Dst+" TR_ASPD_MAX "Cel-""Cls-""Vfs-""Cur+""Pwr+" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "Acc\0""Hora"
 
 #define LENGTH_UNIT_IMP        "ft\0"
diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt
index 5e66482c4..b892839dd 100644
--- a/radio/src/translations/se.h.txt
+++ b/radio/src/translations/se.h.txt
@@ -285,16 +285,16 @@
   #define TR_RX_BATT           "RxBt"
   #define TR_A3_A4             "A3\0 ""A4\0 "
   #define TR_A3_A4_MIN         "A3-\0""A4-\0"
-  #define TR_ASPD_MAX          "ASp+" 
 #else
   #define TR_TELEM_RESERVE
   #define TR_SWR
   #define TR_RX_BATT
   #define TR_A3_A4
   #define TR_A3_A4_MIN
-  #define TR_ASPD_MAX 
 #endif
 
+#define TR_ASPD_MAX            "ASp+" 
+
 #define TR_VTELEMCHNS          "---\0""Batt""Tmr1""Tmr2" TR_SWR "Tx\0 ""Rx\0 " TR_RX_BATT "A1\0 ""A2\0 " TR_A3_A4 "Höjd""Varv""Tank""T1\0 ""T2\0 ""Fart""Avst""GHjd""Batt""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VFrt""ASpd""dTE\0" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "A1-\0""A2-\0" TR_A3_A4_MIN "Hjd-""Hjd+""Rpm+""T1+\0""T2+\0""Frt+""Avs+" TR_ASPD_MAX "Cel-""Cls-""Vfs-""Cur+""Pwr+" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "Acc\0""Tid\0"
 
 #define LENGTH_UNIT_IMP        "ft\0"