diff --git a/companion/src/generaledit/generalsetup.cpp b/companion/src/generaledit/generalsetup.cpp
index 265aad75a..3aeed72bf 100644
--- a/companion/src/generaledit/generalsetup.cpp
+++ b/companion/src/generaledit/generalsetup.cpp
@@ -530,8 +530,8 @@ void GeneralSetupPanel::on_faimode_CB_stateChanged(int)
 void GeneralSetupPanel::populateRotEncModeCB()
 {
   QComboBox * b = ui->rotEncMode_CB;
-  QString strings[] = { tr("Normal"), tr("Inverted"), tr("Vertical Inverted, Horizontal Normal"), tr("Vertical Inverted, Horizontal Alternate") };
-  int itemCount = 4;
+  QString strings[] = { tr("Normal"), tr("Inverted"), tr("Vertical Inverted, Horizontal Normal"), tr("Vertical Inverted, Horizontal Alternate"),  tr("Normal, Edit Inverted") };
+  int itemCount = 5;
 
   if (Boards::getCapability(firmware->getBoard(), Board::HasColorLcd)) {
     itemCount = 2;
diff --git a/radio/src/datastructs.h b/radio/src/datastructs.h
index fba828f07..d307497d7 100644
--- a/radio/src/datastructs.h
+++ b/radio/src/datastructs.h
@@ -117,7 +117,7 @@ static inline void check_struct()
   CHKSIZE(TrainerData, 16);
 
 #if defined(PCBXLITES)
-  CHKSIZE(RadioData, 872);
+  CHKSIZE(RadioData, 873);
   CHKSIZE(ModelData, 6265);
 #elif defined(PCBXLITE)
   CHKSIZE(RadioData, 870);
@@ -150,14 +150,14 @@ static inline void check_struct()
   CHKSIZE(ModelData, 6706);
 #elif defined(PCBHORUS)
   #if defined(PCBX10)
-    CHKSIZE(RadioData, 836);
+    CHKSIZE(RadioData, 837);
     CHKSIZE(ModelData, 15607);
   #else
-    CHKSIZE(RadioData, 836);
+    CHKSIZE(RadioData, 837);
     CHKSIZE(ModelData, 15607);
   #endif
 #elif defined(PCBNV14)
-  CHKSIZE(RadioData, 836);
+  CHKSIZE(RadioData, 837);
   CHKSIZE(ModelData, 15463);
 #endif
 
diff --git a/radio/src/datastructs_private.h b/radio/src/datastructs_private.h
index 3c8ec69cd..30ab1e7d4 100644
--- a/radio/src/datastructs_private.h
+++ b/radio/src/datastructs_private.h
@@ -930,8 +930,12 @@ PACK(struct RadioData {
 
   char ownerRegistrationID[PXX2_LEN_REGISTRATION_ID];
 
+#if defined(ROTARY_ENCODER_NAVIGATION) && !defined(USE_HATS_AS_KEYS)
   CUST_ATTR(rotEncDirection, r_rotEncDirection, nullptr);
-  NOBACKUP(uint8_t  rotEncMode:2);
+  NOBACKUP(uint8_t  rotEncMode:3);
+#else
+  NOBACKUP(uint8_t  rotEncModeSpare:3 SKIP);
+#endif
 
   NOBACKUP(int8_t   uartSampleMode:2); // See UartSampleModes
 
diff --git a/radio/src/gui/128x64/radio_setup.cpp b/radio/src/gui/128x64/radio_setup.cpp
index 4ad089d74..abf6fb0a6 100644
--- a/radio/src/gui/128x64/radio_setup.cpp
+++ b/radio/src/gui/128x64/radio_setup.cpp
@@ -757,7 +757,7 @@ void menuRadioSetup(event_t event)
           CHECK_INCDEC_GENVAR(event,
                               reusableBuffer.generalSettings.rotaryEncoderMode,
                               ROTARY_ENCODER_MODE_NORMAL,
-                              ROTARY_ENCODER_MODE_INVERT_VERT_HORZ_ALT);
+                              ROTARY_ENCODER_MODE_LAST);
         } else if (reusableBuffer.generalSettings.rotaryEncoderMode !=
                    g_eeGeneral.rotEncMode) {
           g_eeGeneral.rotEncMode =
diff --git a/radio/src/gui/212x64/radio_setup.cpp b/radio/src/gui/212x64/radio_setup.cpp
index f9fa67067..da261c83d 100644
--- a/radio/src/gui/212x64/radio_setup.cpp
+++ b/radio/src/gui/212x64/radio_setup.cpp
@@ -673,7 +673,7 @@ void menuRadioSetup(event_t event)
           CHECK_INCDEC_GENVAR(event,
                               reusableBuffer.generalSettings.rotaryEncoderMode,
                               ROTARY_ENCODER_MODE_NORMAL,
-                              ROTARY_ENCODER_MODE_INVERT_VERT_HORZ_ALT);
+                              ROTARY_ENCODER_MODE_LAST);
         } else if (reusableBuffer.generalSettings.rotaryEncoderMode !=
                    g_eeGeneral.rotEncMode) {
           g_eeGeneral.rotEncMode =
diff --git a/radio/src/gui/navigation/navigation_x7.cpp b/radio/src/gui/navigation/navigation_x7.cpp
index 6e2018810..201321895 100644
--- a/radio/src/gui/navigation/navigation_x7.cpp
+++ b/radio/src/gui/navigation/navigation_x7.cpp
@@ -51,9 +51,17 @@ int checkIncDec(event_t event, int val, int i_min, int i_max,
                 const CheckIncDecStops &stops)
 {
   int newval = val;
+  event_t evt_rot_inc = EVT_ROTARY_RIGHT;
+  event_t evt_rot_dec = EVT_ROTARY_LEFT;
+#if defined(ROTARY_ENCODER_NAVIGATION)
+  if (g_eeGeneral.rotEncMode == ROTARY_ENCODER_MODE_VERT_NORM_HORZ_INVERT) {
+    evt_rot_inc = EVT_ROTARY_LEFT;
+    evt_rot_dec = EVT_ROTARY_RIGHT;
+  }
+#endif
 
   if (s_editMode > 0) {
-    if (event == EVT_ROTARY_RIGHT || event == EVT_KEY_FIRST(KEY_PLUS) ||
+    if (event == evt_rot_inc || event == EVT_KEY_FIRST(KEY_PLUS) ||
         event == EVT_KEY_REPT(KEY_PLUS)) {
 
       if (IS_KEY_REPT(event) && (i_flags & INCDEC_REP10)) {
@@ -70,7 +78,7 @@ int checkIncDec(event_t event, int val, int i_min, int i_max,
         newval = val;
         AUDIO_KEY_ERROR();
       }
-    } else if (event == EVT_ROTARY_LEFT || event == EVT_KEY_FIRST(KEY_MINUS) ||
+    } else if (event == evt_rot_dec || event == EVT_KEY_FIRST(KEY_MINUS) ||
                event == EVT_KEY_REPT(KEY_MINUS)) {
 
       if (IS_KEY_REPT(event) && (i_flags & INCDEC_REP10)) {
@@ -375,8 +383,8 @@ void check(event_t event, uint8_t curr, const MenuHandler *menuTab,
 
       do {
 #if defined(ROTARY_ENCODER_NAVIGATION)
-        if (g_eeGeneral.rotEncMode >=
-            ROTARY_ENCODER_MODE_INVERT_VERT_HORZ_NORM) {
+        if (g_eeGeneral.rotEncMode == ROTARY_ENCODER_MODE_INVERT_VERT_HORZ_NORM || \
+            g_eeGeneral.rotEncMode == ROTARY_ENCODER_MODE_INVERT_VERT_HORZ_ALT) {
           DEC(l_posVert, MENU_FIRST_LINE_EDIT(horTab, horTabMax), rowcount - 1);
         } else {
           INC(l_posVert, MENU_FIRST_LINE_EDIT(horTab, horTabMax), rowcount - 1);
@@ -417,8 +425,8 @@ void check(event_t event, uint8_t curr, const MenuHandler *menuTab,
 
       do {
 #if defined(ROTARY_ENCODER_NAVIGATION)
-        if (g_eeGeneral.rotEncMode >=
-            ROTARY_ENCODER_MODE_INVERT_VERT_HORZ_NORM) {
+        if (g_eeGeneral.rotEncMode == ROTARY_ENCODER_MODE_INVERT_VERT_HORZ_NORM || \
+            g_eeGeneral.rotEncMode == ROTARY_ENCODER_MODE_INVERT_VERT_HORZ_ALT) {
           INC(l_posVert, MENU_FIRST_LINE_EDIT(horTab, horTabMax), rowcount - 1);
         } else {
           DEC(l_posVert, MENU_FIRST_LINE_EDIT(horTab, horTabMax), rowcount - 1);
diff --git a/radio/src/gui/navigation/navigation_x9d.cpp b/radio/src/gui/navigation/navigation_x9d.cpp
index ba1315853..1ec40ac27 100644
--- a/radio/src/gui/navigation/navigation_x9d.cpp
+++ b/radio/src/gui/navigation/navigation_x9d.cpp
@@ -51,9 +51,17 @@ int checkIncDec(event_t event, int val, int i_min, int i_max,
                 const CheckIncDecStops &stops)
 {
   int newval = val;
+  event_t evt_rot_inc = EVT_ROTARY_RIGHT;
+  event_t evt_rot_dec = EVT_ROTARY_LEFT;
+#if defined(ROTARY_ENCODER_NAVIGATION)
+  if (g_eeGeneral.rotEncMode == ROTARY_ENCODER_MODE_VERT_NORM_HORZ_INVERT) {
+    evt_rot_inc = EVT_ROTARY_LEFT;
+    evt_rot_dec = EVT_ROTARY_RIGHT;
+  }
+#endif
 
   if (s_editMode > 0) {
-    if (event == EVT_ROTARY_RIGHT || event == EVT_KEY_FIRST(KEY_PLUS) ||
+    if (event == evt_rot_inc || event == EVT_KEY_FIRST(KEY_PLUS) ||
         event == EVT_KEY_REPT(KEY_PLUS)) {
 
       if (IS_KEY_REPT(event) && (i_flags & INCDEC_REP10)) {
@@ -70,7 +78,7 @@ int checkIncDec(event_t event, int val, int i_min, int i_max,
         newval = val;
         AUDIO_KEY_ERROR();
       }
-    } else if (event == EVT_ROTARY_LEFT || event == EVT_KEY_FIRST(KEY_MINUS) ||
+    } else if (event == evt_rot_dec || event == EVT_KEY_FIRST(KEY_MINUS) ||
                event == EVT_KEY_REPT(KEY_MINUS)) {
 
       if (IS_KEY_REPT(event) && (i_flags & INCDEC_REP10)) {
@@ -407,8 +415,8 @@ void check(event_t event, uint8_t curr, const MenuHandler *menuTab,
 
       do {
 #if defined(ROTARY_ENCODER_NAVIGATION)
-        if (g_eeGeneral.rotEncMode >=
-            ROTARY_ENCODER_MODE_INVERT_VERT_HORZ_NORM) {
+        if (g_eeGeneral.rotEncMode == ROTARY_ENCODER_MODE_INVERT_VERT_HORZ_NORM || \
+            g_eeGeneral.rotEncMode == ROTARY_ENCODER_MODE_INVERT_VERT_HORZ_ALT) {
           DEC(l_posVert, MENU_FIRST_LINE_EDIT(horTab, horTabMax), rowcount - 1);
         } else {
           INC(l_posVert, MENU_FIRST_LINE_EDIT(horTab, horTabMax), rowcount - 1);
@@ -449,8 +457,8 @@ void check(event_t event, uint8_t curr, const MenuHandler *menuTab,
 
       do {
 #if defined(ROTARY_ENCODER_NAVIGATION)
-        if (g_eeGeneral.rotEncMode >=
-            ROTARY_ENCODER_MODE_INVERT_VERT_HORZ_NORM) {
+        if (g_eeGeneral.rotEncMode == ROTARY_ENCODER_MODE_INVERT_VERT_HORZ_NORM || \
+            g_eeGeneral.rotEncMode == ROTARY_ENCODER_MODE_INVERT_VERT_HORZ_ALT) {
           INC(l_posVert, MENU_FIRST_LINE_EDIT(horTab, horTabMax), rowcount - 1);
         } else {
           DEC(l_posVert, MENU_FIRST_LINE_EDIT(horTab, horTabMax), rowcount - 1);
diff --git a/radio/src/opentx.h b/radio/src/opentx.h
index ffb7cc604..15b2e7d47 100644
--- a/radio/src/opentx.h
+++ b/radio/src/opentx.h
@@ -76,7 +76,9 @@ enum RotaryEncoderMode {
   ROTARY_ENCODER_MODE_NORMAL,
   ROTARY_ENCODER_MODE_INVERT_BOTH,
   ROTARY_ENCODER_MODE_INVERT_VERT_HORZ_NORM,
-  ROTARY_ENCODER_MODE_INVERT_VERT_HORZ_ALT
+  ROTARY_ENCODER_MODE_INVERT_VERT_HORZ_ALT,
+  ROTARY_ENCODER_MODE_VERT_NORM_HORZ_INVERT,
+  ROTARY_ENCODER_MODE_LAST = ROTARY_ENCODER_MODE_VERT_NORM_HORZ_INVERT
 };
 #endif
 
diff --git a/radio/src/storage/yaml/yaml_datastructs_128x64.cpp b/radio/src/storage/yaml/yaml_datastructs_128x64.cpp
index 28d605c41..7647f5f2b 100644
--- a/radio/src/storage/yaml/yaml_datastructs_128x64.cpp
+++ b/radio/src/storage/yaml/yaml_datastructs_128x64.cpp
@@ -272,7 +272,8 @@ static const struct YamlNode struct_CustomFunctionData[] = {
   YAML_ENUM("func", 6, enum_Functions),
   YAML_CUSTOM("def",r_customFn,w_customFn),
   YAML_PADDING( 64 ),
-  YAML_PADDING( 8 ),
+  YAML_PADDING( 1 ),
+  YAML_PADDING( 7 ),
   YAML_END
 };
 static const struct YamlNode struct_RadioData[] = {
@@ -359,7 +360,7 @@ static const struct YamlNode struct_RadioData[] = {
   YAML_STRING("bluetoothName", 10),
   YAML_STRING("ownerRegistrationID", 8),
   YAML_CUSTOM("rotEncDirection",r_rotEncDirection,nullptr),
-  YAML_UNSIGNED( "rotEncMode", 2 ),
+  YAML_UNSIGNED( "rotEncMode", 3 ),
   YAML_SIGNED( "uartSampleMode", 2 ),
   YAML_PADDING( 3 ),
   YAML_UNSIGNED( "audioMuteEnable", 1 ),
diff --git a/radio/src/storage/yaml/yaml_datastructs_nv14.cpp b/radio/src/storage/yaml/yaml_datastructs_nv14.cpp
index 8d6ce30de..69593f617 100644
--- a/radio/src/storage/yaml/yaml_datastructs_nv14.cpp
+++ b/radio/src/storage/yaml/yaml_datastructs_nv14.cpp
@@ -283,7 +283,8 @@ static const struct YamlNode struct_CustomFunctionData[] = {
   YAML_ENUM("func", 6, enum_Functions),
   YAML_CUSTOM("def",r_customFn,w_customFn),
   YAML_PADDING( 48 ),
-  YAML_PADDING( 8 ),
+  YAML_PADDING( 1 ),
+  YAML_PADDING( 7 ),
   YAML_END
 };
 static const struct YamlNode struct_RadioData[] = {
@@ -370,8 +371,7 @@ static const struct YamlNode struct_RadioData[] = {
   YAML_UNSIGNED( "blOffBright", 7 ),
   YAML_STRING("bluetoothName", 10),
   YAML_STRING("ownerRegistrationID", 8),
-  YAML_CUSTOM("rotEncDirection",r_rotEncDirection,nullptr),
-  YAML_UNSIGNED( "rotEncMode", 2 ),
+  YAML_PADDING( 3 ),
   YAML_SIGNED( "uartSampleMode", 2 ),
   YAML_UNSIGNED( "stickDeadZone", 3 ),
   YAML_UNSIGNED( "audioMuteEnable", 1 ),
diff --git a/radio/src/storage/yaml/yaml_datastructs_pl18.cpp b/radio/src/storage/yaml/yaml_datastructs_pl18.cpp
index 283256262..04e0931bd 100644
--- a/radio/src/storage/yaml/yaml_datastructs_pl18.cpp
+++ b/radio/src/storage/yaml/yaml_datastructs_pl18.cpp
@@ -375,10 +375,9 @@ static const struct YamlNode struct_RadioData[] = {
   YAML_UNSIGNED( "blOffBright", 7 ),
   YAML_STRING("bluetoothName", 10),
   YAML_STRING("ownerRegistrationID", 8),
-  YAML_CUSTOM("rotEncDirection",r_rotEncDirection,nullptr),
-  YAML_UNSIGNED( "rotEncMode", 2 ),
-  YAML_SIGNED( "uartSampleMode", 2 ),
   YAML_PADDING( 3 ),
+  YAML_SIGNED( "uartSampleMode", 2 ),
+  YAML_UNSIGNED( "stickDeadZone", 3 ),
   YAML_UNSIGNED( "audioMuteEnable", 1 ),
   YAML_STRING("selectedTheme", 26),
   YAML_UNSIGNED( "radioThemesDisabled", 1 ),
diff --git a/radio/src/storage/yaml/yaml_datastructs_t20.cpp b/radio/src/storage/yaml/yaml_datastructs_t20.cpp
index 2229e097b..7119dec89 100644
--- a/radio/src/storage/yaml/yaml_datastructs_t20.cpp
+++ b/radio/src/storage/yaml/yaml_datastructs_t20.cpp
@@ -157,6 +157,10 @@ const struct YamlIdStr enum_SwashType[] = {
 };
 const struct YamlIdStr enum_SwitchSources[] = {
   {  SWSRC_NONE, "NONE"  },
+  {  SWSRC_TrimT7Down, "TrimT7Down"  },
+  {  SWSRC_TrimT7Up, "TrimT7Up"  },
+  {  SWSRC_TrimT8Down, "TrimT8Down"  },
+  {  SWSRC_TrimT8Up, "TrimT8Up"  },
   {  SWSRC_ON, "ON"  },
   {  SWSRC_ONE, "ONE"  },
   {  SWSRC_TELEMETRY_STREAMING, "TELEMETRY_STREAMING"  },
@@ -272,7 +276,8 @@ static const struct YamlNode struct_CustomFunctionData[] = {
   YAML_ENUM("func", 6, enum_Functions),
   YAML_CUSTOM("def",r_customFn,w_customFn),
   YAML_PADDING( 64 ),
-  YAML_PADDING( 8 ),
+  YAML_PADDING( 1 ),
+  YAML_PADDING( 7 ),
   YAML_END
 };
 static const struct YamlNode struct_RadioData[] = {
@@ -357,7 +362,7 @@ static const struct YamlNode struct_RadioData[] = {
   YAML_UNSIGNED( "backlightColor", 8 ),
   YAML_STRING("ownerRegistrationID", 8),
   YAML_CUSTOM("rotEncDirection",r_rotEncDirection,nullptr),
-  YAML_UNSIGNED( "rotEncMode", 2 ),
+  YAML_UNSIGNED( "rotEncMode", 3 ),
   YAML_SIGNED( "uartSampleMode", 2 ),
   YAML_PADDING( 3 ),
   YAML_UNSIGNED( "audioMuteEnable", 1 ),
diff --git a/radio/src/storage/yaml/yaml_datastructs_tpro.cpp b/radio/src/storage/yaml/yaml_datastructs_tpro.cpp
index 0ef153a79..dcd42bed7 100644
--- a/radio/src/storage/yaml/yaml_datastructs_tpro.cpp
+++ b/radio/src/storage/yaml/yaml_datastructs_tpro.cpp
@@ -272,7 +272,8 @@ static const struct YamlNode struct_CustomFunctionData[] = {
   YAML_ENUM("func", 6, enum_Functions),
   YAML_CUSTOM("def",r_customFn,w_customFn),
   YAML_PADDING( 64 ),
-  YAML_PADDING( 8 ),
+  YAML_PADDING( 1 ),
+  YAML_PADDING( 7 ),
   YAML_END
 };
 static const struct YamlNode struct_RadioData[] = {
@@ -357,7 +358,7 @@ static const struct YamlNode struct_RadioData[] = {
   YAML_UNSIGNED( "backlightColor", 8 ),
   YAML_STRING("ownerRegistrationID", 8),
   YAML_CUSTOM("rotEncDirection",r_rotEncDirection,nullptr),
-  YAML_UNSIGNED( "rotEncMode", 2 ),
+  YAML_UNSIGNED( "rotEncMode", 3 ),
   YAML_SIGNED( "uartSampleMode", 2 ),
   YAML_PADDING( 3 ),
   YAML_UNSIGNED( "audioMuteEnable", 1 ),
diff --git a/radio/src/storage/yaml/yaml_datastructs_x10.cpp b/radio/src/storage/yaml/yaml_datastructs_x10.cpp
index 66ea8d1f7..438ce26a8 100644
--- a/radio/src/storage/yaml/yaml_datastructs_x10.cpp
+++ b/radio/src/storage/yaml/yaml_datastructs_x10.cpp
@@ -291,7 +291,8 @@ static const struct YamlNode struct_CustomFunctionData[] = {
   YAML_ENUM("func", 6, enum_Functions),
   YAML_CUSTOM("def",r_customFn,w_customFn),
   YAML_PADDING( 48 ),
-  YAML_PADDING( 8 ),
+  YAML_PADDING( 1 ),
+  YAML_PADDING( 7 ),
   YAML_END
 };
 static const struct YamlNode struct_RadioData[] = {
@@ -377,7 +378,7 @@ static const struct YamlNode struct_RadioData[] = {
   YAML_STRING("bluetoothName", 10),
   YAML_STRING("ownerRegistrationID", 8),
   YAML_CUSTOM("rotEncDirection",r_rotEncDirection,nullptr),
-  YAML_UNSIGNED( "rotEncMode", 2 ),
+  YAML_UNSIGNED( "rotEncMode", 3 ),
   YAML_SIGNED( "uartSampleMode", 2 ),
   YAML_PADDING( 3 ),
   YAML_UNSIGNED( "audioMuteEnable", 1 ),
diff --git a/radio/src/storage/yaml/yaml_datastructs_x12s.cpp b/radio/src/storage/yaml/yaml_datastructs_x12s.cpp
index 66ea8d1f7..438ce26a8 100644
--- a/radio/src/storage/yaml/yaml_datastructs_x12s.cpp
+++ b/radio/src/storage/yaml/yaml_datastructs_x12s.cpp
@@ -291,7 +291,8 @@ static const struct YamlNode struct_CustomFunctionData[] = {
   YAML_ENUM("func", 6, enum_Functions),
   YAML_CUSTOM("def",r_customFn,w_customFn),
   YAML_PADDING( 48 ),
-  YAML_PADDING( 8 ),
+  YAML_PADDING( 1 ),
+  YAML_PADDING( 7 ),
   YAML_END
 };
 static const struct YamlNode struct_RadioData[] = {
@@ -377,7 +378,7 @@ static const struct YamlNode struct_RadioData[] = {
   YAML_STRING("bluetoothName", 10),
   YAML_STRING("ownerRegistrationID", 8),
   YAML_CUSTOM("rotEncDirection",r_rotEncDirection,nullptr),
-  YAML_UNSIGNED( "rotEncMode", 2 ),
+  YAML_UNSIGNED( "rotEncMode", 3 ),
   YAML_SIGNED( "uartSampleMode", 2 ),
   YAML_PADDING( 3 ),
   YAML_UNSIGNED( "audioMuteEnable", 1 ),
diff --git a/radio/src/storage/yaml/yaml_datastructs_x9d.cpp b/radio/src/storage/yaml/yaml_datastructs_x9d.cpp
index 080accc11..ac8c8c28d 100644
--- a/radio/src/storage/yaml/yaml_datastructs_x9d.cpp
+++ b/radio/src/storage/yaml/yaml_datastructs_x9d.cpp
@@ -272,7 +272,8 @@ static const struct YamlNode struct_CustomFunctionData[] = {
   YAML_ENUM("func", 6, enum_Functions),
   YAML_CUSTOM("def",r_customFn,w_customFn),
   YAML_PADDING( 64 ),
-  YAML_PADDING( 8 ),
+  YAML_PADDING( 1 ),
+  YAML_PADDING( 7 ),
   YAML_END
 };
 static const struct YamlNode struct_RadioData[] = {
@@ -358,8 +359,7 @@ static const struct YamlNode struct_RadioData[] = {
   YAML_PADDING( 8 ),
   YAML_STRING("bluetoothName", 10),
   YAML_STRING("ownerRegistrationID", 8),
-  YAML_CUSTOM("rotEncDirection",r_rotEncDirection,nullptr),
-  YAML_UNSIGNED( "rotEncMode", 2 ),
+  YAML_PADDING( 3 ),
   YAML_SIGNED( "uartSampleMode", 2 ),
   YAML_PADDING( 3 ),
   YAML_UNSIGNED( "audioMuteEnable", 1 ),
diff --git a/radio/src/storage/yaml/yaml_datastructs_x9e.cpp b/radio/src/storage/yaml/yaml_datastructs_x9e.cpp
index cbb0f609a..f62fd2c80 100644
--- a/radio/src/storage/yaml/yaml_datastructs_x9e.cpp
+++ b/radio/src/storage/yaml/yaml_datastructs_x9e.cpp
@@ -272,7 +272,8 @@ static const struct YamlNode struct_CustomFunctionData[] = {
   YAML_ENUM("func", 6, enum_Functions),
   YAML_CUSTOM("def",r_customFn,w_customFn),
   YAML_PADDING( 64 ),
-  YAML_PADDING( 8 ),
+  YAML_PADDING( 1 ),
+  YAML_PADDING( 7 ),
   YAML_END
 };
 static const struct YamlNode struct_RadioData[] = {
@@ -359,7 +360,7 @@ static const struct YamlNode struct_RadioData[] = {
   YAML_STRING("bluetoothName", 10),
   YAML_STRING("ownerRegistrationID", 8),
   YAML_CUSTOM("rotEncDirection",r_rotEncDirection,nullptr),
-  YAML_UNSIGNED( "rotEncMode", 2 ),
+  YAML_UNSIGNED( "rotEncMode", 3 ),
   YAML_SIGNED( "uartSampleMode", 2 ),
   YAML_PADDING( 3 ),
   YAML_UNSIGNED( "audioMuteEnable", 1 ),
diff --git a/radio/src/storage/yaml/yaml_datastructs_x9lite.cpp b/radio/src/storage/yaml/yaml_datastructs_x9lite.cpp
index 14a3329de..b1e7537c8 100644
--- a/radio/src/storage/yaml/yaml_datastructs_x9lite.cpp
+++ b/radio/src/storage/yaml/yaml_datastructs_x9lite.cpp
@@ -272,7 +272,8 @@ static const struct YamlNode struct_CustomFunctionData[] = {
   YAML_ENUM("func", 6, enum_Functions),
   YAML_CUSTOM("def",r_customFn,w_customFn),
   YAML_PADDING( 64 ),
-  YAML_PADDING( 8 ),
+  YAML_PADDING( 1 ),
+  YAML_PADDING( 7 ),
   YAML_END
 };
 static const struct YamlNode struct_RadioData[] = {
@@ -357,7 +358,7 @@ static const struct YamlNode struct_RadioData[] = {
   YAML_UNSIGNED( "backlightColor", 8 ),
   YAML_STRING("ownerRegistrationID", 8),
   YAML_CUSTOM("rotEncDirection",r_rotEncDirection,nullptr),
-  YAML_UNSIGNED( "rotEncMode", 2 ),
+  YAML_UNSIGNED( "rotEncMode", 3 ),
   YAML_SIGNED( "uartSampleMode", 2 ),
   YAML_PADDING( 3 ),
   YAML_UNSIGNED( "audioMuteEnable", 1 ),
diff --git a/radio/src/storage/yaml/yaml_datastructs_xlites.cpp b/radio/src/storage/yaml/yaml_datastructs_xlites.cpp
index 0258d5039..49bb5fa46 100644
--- a/radio/src/storage/yaml/yaml_datastructs_xlites.cpp
+++ b/radio/src/storage/yaml/yaml_datastructs_xlites.cpp
@@ -274,7 +274,8 @@ static const struct YamlNode struct_CustomFunctionData[] = {
   YAML_ENUM("func", 6, enum_Functions),
   YAML_CUSTOM("def",r_customFn,w_customFn),
   YAML_PADDING( 64 ),
-  YAML_PADDING( 8 ),
+  YAML_PADDING( 1 ),
+  YAML_PADDING( 7 ),
   YAML_END
 };
 static const struct YamlNode struct_RadioData[] = {
@@ -360,8 +361,7 @@ static const struct YamlNode struct_RadioData[] = {
   YAML_PADDING( 8 ),
   YAML_STRING("bluetoothName", 10),
   YAML_STRING("ownerRegistrationID", 8),
-  YAML_CUSTOM("rotEncDirection",r_rotEncDirection,nullptr),
-  YAML_UNSIGNED( "rotEncMode", 2 ),
+  YAML_PADDING( 3 ),
   YAML_SIGNED( "uartSampleMode", 2 ),
   YAML_PADDING( 3 ),
   YAML_UNSIGNED( "audioMuteEnable", 1 ),
diff --git a/radio/src/translations/cn.h b/radio/src/translations/cn.h
index 4f144dc06..4a5dd7216 100644
--- a/radio/src/translations/cn.h
+++ b/radio/src/translations/cn.h
@@ -166,7 +166,7 @@
 #if defined(COLORLCD)
   #define TR_ROTARY_ENC_OPT         "正常","反向"
 #else
-  #define TR_ROTARY_ENC_OPT         "正常","反向","V-I H-N","V-I H-A"
+  #define TR_ROTARY_ENC_OPT         "正常","反向","V-I H-N","V-I H-A","V-N-E-I"
 #endif
 
 #if defined(IMU)
diff --git a/radio/src/translations/cz.h b/radio/src/translations/cz.h
index a3e8df750..07e81a8d1 100644
--- a/radio/src/translations/cz.h
+++ b/radio/src/translations/cz.h
@@ -178,7 +178,7 @@
 #if defined(COLORLCD)
   #define TR_ROTARY_ENC_OPT         "Normal","Invertován"
 #else
-  #define TR_ROTARY_ENC_OPT         "Normal","Invertován","V-I H-N","V-I H-A"
+  #define TR_ROTARY_ENC_OPT         "Normal","Invertován","V-I H-N","V-I H-A","V-N-E-I"
 #endif
 
 #if defined(IMU)
diff --git a/radio/src/translations/da.h b/radio/src/translations/da.h
index ecffd00d5..8ec34bd5a 100644
--- a/radio/src/translations/da.h
+++ b/radio/src/translations/da.h
@@ -173,7 +173,7 @@
 #if defined(COLORLCD)
   #define TR_ROTARY_ENC_OPT            "Normal","Invers"
 #else
-  #define TR_ROTARY_ENC_OPT            "Normal","Invers","V-I H-N","V-I H-A"
+  #define TR_ROTARY_ENC_OPT            "Normal","Invers","V-I H-N","V-I H-A","V-N-E-I"
 #endif
 
 #if defined(IMU)
diff --git a/radio/src/translations/de.h b/radio/src/translations/de.h
index e406ceaba..9ef7e828f 100644
--- a/radio/src/translations/de.h
+++ b/radio/src/translations/de.h
@@ -168,7 +168,7 @@
 #if defined(COLORLCD)
   #define TR_ROTARY_ENC_OPT         "Normal","Inverted"
 #else
-  #define TR_ROTARY_ENC_OPT         "Normal","Inverted","V-I H-N","V-I H-A"
+  #define TR_ROTARY_ENC_OPT         "Normal","Inverted","V-I H-N","V-I H-A","V-N-E-I"
 #endif
 
 #if defined(IMU)
diff --git a/radio/src/translations/en.h b/radio/src/translations/en.h
index 43750aa4d..705c1ed9a 100644
--- a/radio/src/translations/en.h
+++ b/radio/src/translations/en.h
@@ -170,7 +170,7 @@
 #if defined(COLORLCD)
   #define TR_ROTARY_ENC_OPT         "Normal","Inverted"
 #else
-  #define TR_ROTARY_ENC_OPT         "Normal","Inverted","V-I H-N","V-I H-A"
+  #define TR_ROTARY_ENC_OPT         "Normal","Inverted","V-I H-N","V-I H-A","V-N-E-I"
 #endif
 
 #if defined(IMU)
diff --git a/radio/src/translations/es.h b/radio/src/translations/es.h
index 254c98661..f080833ff 100644
--- a/radio/src/translations/es.h
+++ b/radio/src/translations/es.h
@@ -166,7 +166,7 @@
 #if defined(COLORLCD)
   #define TR_ROTARY_ENC_OPT         "Normal","Inverted"
 #else
-  #define TR_ROTARY_ENC_OPT         "Normal","Inverted","V-I H-N","V-I H-A"
+  #define TR_ROTARY_ENC_OPT         "Normal","Inverted","V-I H-N","V-I H-A","V-N-E-I"
 #endif
 
 #if defined(IMU)
diff --git a/radio/src/translations/fi.h b/radio/src/translations/fi.h
index 6814f004e..3be130de0 100644
--- a/radio/src/translations/fi.h
+++ b/radio/src/translations/fi.h
@@ -177,7 +177,7 @@
 #if defined(COLORLCD)
   #define TR_ROTARY_ENC_OPT         "Normal","Inverted"
 #else
-  #define TR_ROTARY_ENC_OPT         "Normal","Inverted","V-I H-N","V-I H-A"
+  #define TR_ROTARY_ENC_OPT         "Normal","Inverted","V-I H-N","V-I H-A","V-N-E-I"
 #endif
 
 #if defined(IMU)
diff --git a/radio/src/translations/fr.h b/radio/src/translations/fr.h
index c72e0d68a..06e07408b 100644
--- a/radio/src/translations/fr.h
+++ b/radio/src/translations/fr.h
@@ -175,7 +175,7 @@
 #if defined(COLORLCD)
   #define TR_ROTARY_ENC_OPT         "Normal","Inversé"
 #else
-  #define TR_ROTARY_ENC_OPT         "Normal","Inversé","V-I H-N","V-I H-A"
+  #define TR_ROTARY_ENC_OPT         "Normal","Inversé","V-I H-N","V-I H-A","V-N-E-I"
 #endif
 
 #if defined(IMU)
diff --git a/radio/src/translations/he.h b/radio/src/translations/he.h
index a2c47087b..908fc5d2e 100644
--- a/radio/src/translations/he.h
+++ b/radio/src/translations/he.h
@@ -174,7 +174,7 @@
 #if defined(COLORLCD)
   #define TR_ROTARY_ENC_OPT         "רגיל","הפוך"
 #else
-  #define TR_ROTARY_ENC_OPT         "רגיל","הפוך","V-I H-N","V-I H-A"
+  #define TR_ROTARY_ENC_OPT         "רגיל","הפוך","V-I H-N","V-I H-A","V-N-E-I"
 #endif
 
 #if defined(IMU)
diff --git a/radio/src/translations/it.h b/radio/src/translations/it.h
index 2489dd2f3..216d9c6ae 100644
--- a/radio/src/translations/it.h
+++ b/radio/src/translations/it.h
@@ -171,7 +171,7 @@
 #if defined(COLORLCD)
   #define TR_ROTARY_ENC_OPT            "Normale","Invertito"
 #else
-  #define TR_ROTARY_ENC_OPT            "Normale","Invertito","V-I H-N","V-I H-A"
+  #define TR_ROTARY_ENC_OPT            "Normale","Invertito","V-I H-N","V-I H-A","V-N-E-I"
 #endif
 
 #if defined(IMU)
diff --git a/radio/src/translations/jp.h b/radio/src/translations/jp.h
index 540897e20..6af900fe5 100644
--- a/radio/src/translations/jp.h
+++ b/radio/src/translations/jp.h
@@ -170,7 +170,7 @@
 #if defined(COLORLCD)
   #define TR_ROTARY_ENC_OPT         "標準","リバース"
 #else
-  #define TR_ROTARY_ENC_OPT         "標準","リバース","V-I H-N","V-I H-A"
+  #define TR_ROTARY_ENC_OPT         "標準","リバース","V-I H-N","V-I H-A","V-N-E-I"
 #endif
 
 #if defined(IMU)
diff --git a/radio/src/translations/nl.h b/radio/src/translations/nl.h
index e7850c536..aacf21333 100644
--- a/radio/src/translations/nl.h
+++ b/radio/src/translations/nl.h
@@ -167,7 +167,7 @@
 #if defined(COLORLCD)
   #define TR_ROTARY_ENC_OPT         "Normal","Inverted"
 #else
-  #define TR_ROTARY_ENC_OPT         "Normal","Inverted","V-I H-N","V-I H-A"
+  #define TR_ROTARY_ENC_OPT         "Normal","Inverted","V-I H-N","V-I H-A","V-N-E-I"
 #endif
 
 #if defined(IMU)
diff --git a/radio/src/translations/pl.h b/radio/src/translations/pl.h
index 0ddc68d05..b2f8f421e 100644
--- a/radio/src/translations/pl.h
+++ b/radio/src/translations/pl.h
@@ -166,7 +166,7 @@
 #if defined(COLORLCD)
   #define TR_ROTARY_ENC_OPT  "Normal","Inverted"
 #else
-  #define TR_ROTARY_ENC_OPT  "Normal","Inverted","V-I H-N","V-I H-A"
+  #define TR_ROTARY_ENC_OPT  "Normal","Inverted","V-I H-N","V-I H-A","V-N-E-I"
 #endif
 
 #if defined(IMU)
diff --git a/radio/src/translations/pt.h b/radio/src/translations/pt.h
index 44d38b029..68089d839 100644
--- a/radio/src/translations/pt.h
+++ b/radio/src/translations/pt.h
@@ -173,7 +173,7 @@
 #if defined(COLORLCD)
   #define TR_ROTARY_ENC_OPT         "Normal","Invert"
 #else
-  #define TR_ROTARY_ENC_OPT         "Normal","Invert","V-I H-N","V-I H-A"
+  #define TR_ROTARY_ENC_OPT         "Normal","Invert","V-I H-N","V-I H-A","V-N-E-I"
 #endif
 
 #if defined(IMU)
diff --git a/radio/src/translations/ru.h b/radio/src/translations/ru.h
index 9679e3aa8..ad260c4f8 100644
--- a/radio/src/translations/ru.h
+++ b/radio/src/translations/ru.h
@@ -172,7 +172,7 @@
 #if defined(COLORLCD)
   #define TR_ROTARY_ENC_OPT            "Норм","Перевер"
 #else
-  #define TR_ROTARY_ENC_OPT            "Норм","Перевер","V-I H-N","V-I H-A"
+  #define TR_ROTARY_ENC_OPT            "Норм","Перевер","V-I H-N","V-I H-A","V-N-E-I"
 #endif
 
 #if defined(IMU)
diff --git a/radio/src/translations/se.h b/radio/src/translations/se.h
index c3b427a1e..02143c11a 100644
--- a/radio/src/translations/se.h
+++ b/radio/src/translations/se.h
@@ -173,7 +173,7 @@
 #if defined(COLORLCD)
   #define TR_ROTARY_ENC_OPT             "Normal","Inverterad"
 #else
-  #define TR_ROTARY_ENC_OPT             "Normal","Inverterad","V-I H-N","V-I H-A"
+  #define TR_ROTARY_ENC_OPT             "Normal","Inverterad","V-I H-N","V-I H-A","V-N-E-I"
 #endif
 
 #define TR_ON_ONE_SWITCHES              "PÅ","Ett"
diff --git a/radio/src/translations/tw.h b/radio/src/translations/tw.h
index 0792092d1..ede93b28b 100644
--- a/radio/src/translations/tw.h
+++ b/radio/src/translations/tw.h
@@ -171,7 +171,7 @@
 #if defined(COLORLCD)
   #define TR_ROTARY_ENC_OPT          "正常","反向"
 #else
-  #define TR_ROTARY_ENC_OPT          "正常","反向","V-I H-N","V-I H-A"
+  #define TR_ROTARY_ENC_OPT          "正常","反向","V-I H-N","V-I H-A","V-N-E-I"
 #endif
 
 #if defined(IMU)