diff --git a/src/frsky.cpp b/src/frsky.cpp
index 4029b15f4..d8f3850ec 100644
--- a/src/frsky.cpp
+++ b/src/frsky.cpp
@@ -939,6 +939,11 @@ uint8_t maxTelemValue(uint8_t channel)
   }
 }
 
+int16_t convertBarValue(uint8_t bar, uint8_t value)
+{
+  return convertTelemValue(bar, (uint16_t)value * maxTelemValue(bar) / 31);
+}
+
 int16_t convertTelemValue(uint8_t channel, uint8_t value)
 {
   int16_t result;
@@ -1083,14 +1088,16 @@ void putsTelemetryChannel(uint8_t x, uint8_t y, uint8_t channel, int16_t val, ui
 }
 
 enum FrskyViews {
-  e_frsky_custom,
-  e_frsky_bars,
+  e_frsky_custom_screen_1,
+  e_frsky_custom_screen_2,
+  IF_PCBSKY9X(e_frsky_custom_screen_3)
+  IF_PCBSKY9X(e_frsky_custom_screen_4)
   e_frsky_voltages,
   e_frsky_after_flight,
   FRSKY_VIEW_MAX = e_frsky_after_flight
 };
 
-static uint8_t s_frsky_view = e_frsky_custom;
+static uint8_t s_frsky_view = e_frsky_custom_screen_1;
 
 void displayRssiLine()
 {
@@ -1157,17 +1164,6 @@ void displayGpsCoord(uint8_t y, char direction, int16_t bp, int16_t ap)
 }
 #endif
 
-uint8_t getTelemCustomField(uint8_t line, uint8_t col)
-{
-#if defined(PCBSKY9X)
-  return g_model.frsky.lines[2*line+col];
-#else
-  uint8_t result = (col==0 ? (g_model.frsky.lines[line] & 0x0f) : ((g_model.frsky.lines[line] & 0xf0) / 16));
-  result += (((g_model.frsky.linesXtra >> (4*line+2*col)) & 0x03) * 16);
-  return result;
-#endif
-}
-
 NOINLINE uint8_t getRssiAlarmValue(uint8_t alarm)
 {
   return (50 + g_model.frsky.rssiAlarms[alarm].value);
@@ -1181,6 +1177,11 @@ void displayVoltageScreenLine(uint8_t y, uint8_t index)
   lcd_putc(12*FW, y, '>');      putsTelemetryChannel(17*FW, y, index+TELEM_A1-1, frskyData.analog[index].max, NO_UNIT);
 }
 
+uint8_t barCoord(int16_t value, int16_t min, int16_t max)
+{
+  return limit((uint8_t)0, (uint8_t)(((int32_t)99 * (value - min)) / (max - min)), (uint8_t)100);
+}
+
 void menuTelemetryFrsky(uint8_t event)
 {
   switch (event) {
@@ -1214,111 +1215,112 @@ void menuTelemetryFrsky(uint8_t event)
   lcd_filled_rect(0, 0, DISPLAY_W, 8);
 
   if (frskyStreaming >= 0) {
-    if (s_frsky_view == e_frsky_custom) {
-      // The custom view
-      uint8_t fields_count = 0;
-      for (uint8_t i=0; i<4; i++) {
-        for (uint8_t j=0; j<2; j++) {
-          uint8_t field = getTelemCustomField(i, j);
-          if (i==3 && j==0) {
-            lcd_vline(63, 8, 48);
-            if (frskyStreaming > 0) {
+    if (s_frsky_view < MAX_FRSKY_SCREENS) {
+      FrSkyScreenData & screen = g_model.frsky.screens[s_frsky_view];
+      if (g_model.frsky.screensType & (1<<s_frsky_view)) {
+        // Custom Screen with gauges
+        uint8_t barHeight = 5;
+        for (int8_t i=3; i>=0; i--) {
+          FrSkyBarData & bar = screen.bars[i];
+          uint8_t source = bar.source;
+          int16_t barMin = convertBarValue(source, bar.barMin);
+          int16_t barMax = convertBarValue(source, 31-bar.barMax);
+          if (source && barMax > barMin) {
+            uint8_t y = barHeight+6+i*(barHeight+6);
+            lcd_putsiAtt(0, y+barHeight-5, STR_VTELEMCHNS, source, 0);
+            lcd_rect(25, y, 101, barHeight+2);
+            int16_t value = getValue(CSW_CHOUT_BASE+NUM_CHNOUT+source-1);
+            int16_t threshold = 0;
+            uint8_t thresholdX = 0;
+            if (source <= TELEM_TM2)
+              threshold = 0;
+            else if (source <= TELEM_RSSI_RX)
+              threshold = getRssiAlarmValue(source-TELEM_RSSI_TX);
+            else if (source <= TELEM_A2)
+              threshold = g_model.frsky.channels[source-TELEM_A1].alarms_value[0];
+  #if defined(FRSKY_HUB)
+            else
+              threshold = convertTelemValue(source, barsThresholds[source-TELEM_ALT]);
+  #endif
+
+            if (threshold) {
+              thresholdX = barCoord(threshold, barMin, barMax);
+              if (thresholdX == 100)
+                thresholdX = 0;
+            }
+
+            uint8_t width = barCoord(value, barMin, barMax);
+
+            // reversed barshade for T1/T2
+            uint8_t barShade;
+            if (source == TELEM_T1 || source == TELEM_T2)
+              barShade = ((threshold < value) ? DOTTED : SOLID);
+            else
+              barShade = ((threshold > value) ? DOTTED : SOLID);
+
+            lcd_filled_rect(26, y+1, width, barHeight, barShade);
+
+            for (uint8_t j=50; j<125; j+=25)
+              if (j>26+thresholdX || j>26+width) lcd_vline(j, y+1, barHeight);
+
+            if (thresholdX) {
+              lcd_vlineStip(26+thresholdX, y-2, barHeight+3, DOTTED);
+              lcd_hline(25+thresholdX, y-2, 3);
+            }
+          }
+          else {
+            barHeight += 2;
+          }
+        }
+        displayRssiLine();
+      }
+      else {
+        // Custom Screen with numbers
+        uint8_t fields_count = 0;
+        for (uint8_t i=0; i<4; i++) {
+          for (uint8_t j=0; j<2; j++) {
+            uint8_t field = screen.lines[i].sources[j];
+            if (i==3 && j==0) {
+              lcd_vline(63, 8, 48);
+              if (frskyStreaming > 0) {
 #if defined(FRSKY_HUB)
-              if (field == TELEM_ACC) {
-                lcd_putsLeft(7*FH+1, STR_ACCEL);
-                lcd_outdezNAtt(4*FW, 7*FH+1, frskyData.hub.accelX, LEFT|PREC2);
-                lcd_outdezNAtt(10*FW, 7*FH+1, frskyData.hub.accelY, LEFT|PREC2);
-                lcd_outdezNAtt(16*FW, 7*FH+1, frskyData.hub.accelZ, LEFT|PREC2);
-                break;
+                if (field == TELEM_ACC) {
+                  lcd_putsLeft(7*FH+1, STR_ACCEL);
+                  lcd_outdezNAtt(4*FW, 7*FH+1, frskyData.hub.accelX, LEFT|PREC2);
+                  lcd_outdezNAtt(10*FW, 7*FH+1, frskyData.hub.accelY, LEFT|PREC2);
+                  lcd_outdezNAtt(16*FW, 7*FH+1, frskyData.hub.accelZ, LEFT|PREC2);
+                  break;
+                }
+                else if (field == TELEM_GPS_TIME) {
+                  displayGpsTime();
+                  return;
+                }
+#endif
               }
-              else if (field == TELEM_GPS_TIME) {
-                displayGpsTime();
+              else {
+                displayRssiLine();
                 return;
               }
-#endif
             }
-            else {
-              displayRssiLine();
-              return;
-            }
-          }
-          if (field) {
-            fields_count++;
-            int16_t value = getValue(CSW_CHOUT_BASE+NUM_CHNOUT+field-1);
-            uint8_t att = (i==3 ? NO_UNIT : DBLSIZE|NO_UNIT);
-            if (field <= TELEM_TM2) {
-              uint8_t x = (i==3 ? j?80:20 : j?74:10);
-              putsTime(x, 1+FH+2*FH*i, value, att, att);
-            }
-            else {
-              putsTelemetryChannel(j ? 128 : 63, i==3 ? 1+7*FH : 1+2*FH+2*FH*i, field-1, value, att);
-              lcd_putsiAtt(j*65, 1+FH+2*FH*i, STR_VTELEMCHNS, field, 0);
+            if (field) {
+              fields_count++;
+              int16_t value = getValue(CSW_CHOUT_BASE+NUM_CHNOUT+field-1);
+              uint8_t att = (i==3 ? NO_UNIT : DBLSIZE|NO_UNIT);
+              if (field <= TELEM_TM2) {
+                uint8_t x = (i==3 ? j?80:20 : j?74:10);
+                putsTime(x, 1+FH+2*FH*i, value, att, att);
+              }
+              else {
+                putsTelemetryChannel(j ? 128 : 63, i==3 ? 1+7*FH : 1+2*FH+2*FH*i, field-1, value, att);
+                lcd_putsiAtt(j*65, 1+FH+2*FH*i, STR_VTELEMCHNS, field, 0);
+              }
             }
           }
         }
+        lcd_status_line();
+        if (fields_count == 0)
+          putEvent(event == EVT_KEY_BREAK(KEY_UP) ? event : EVT_KEY_BREAK(KEY_DOWN));
       }
-      if (fields_count == 0) {
-        // No custom fields at all!
-        putEvent(event == EVT_KEY_BREAK(KEY_UP) ? event : EVT_KEY_BREAK(KEY_DOWN));
-      }
-      lcd_status_line();
-    }
-    else if (s_frsky_view == e_frsky_bars) {
-      // The bars
-      uint8_t bars_height = 5;
-      for (int8_t i=3; i>=0; i--) {
-        uint8_t source = g_model.frsky.bars[i].source;
-        uint8_t bmin = g_model.frsky.bars[i].barMin * 5;
-        uint8_t bmax = (51 - g_model.frsky.bars[i].barMax) * 5;
-        if (source && bmax > bmin) {
-          lcd_putsiAtt(0, bars_height+bars_height+1+i*(bars_height+6), STR_VTELEMCHNS, source, 0);
-          lcd_rect(25, bars_height+6+i*(bars_height+6), 101, bars_height+2);
-          int16_t value = getValue(CSW_CHOUT_BASE+NUM_CHNOUT+source-1);
-          int16_t threshold = 0;
-          uint8_t thresholdX = 0;
-          if (source <= TELEM_TM2)
-            threshold = 0;
-          else if (source <= TELEM_RSSI_RX)
-            threshold = getRssiAlarmValue(source-TELEM_RSSI_TX);
-          else if (source <= TELEM_A2)
-            threshold = g_model.frsky.channels[source-TELEM_A1].alarms_value[0];
-#if defined(FRSKY_HUB)
-          else
-            threshold = convertTelemValue(source, barsThresholds[source-TELEM_ALT]);
-#endif
-          int16_t barMin = convertTelemValue(source, bmin);
-          int16_t barMax = convertTelemValue(source, bmax);
-          if (threshold) {
-            thresholdX = (uint8_t)(((int32_t)(threshold - barMin) * (int32_t)100) / (barMax - barMin));
-            if (thresholdX > 100)
-              thresholdX = 0;
-          }
-          uint8_t width = (uint8_t)limit((int16_t)0, (int16_t)(((int32_t)100 * (value - barMin)) / (barMax - barMin)), (int16_t)100);
-
-	   // reversed barshade for T1/T2
-	  uint8_t barShade;
-	  if (source == TELEM_T1 || source == TELEM_T2)
-		barShade = ((threshold < value) ? DOTTED : SOLID);
-	  else
-		barShade = ((threshold > value) ? DOTTED : SOLID);
-	  lcd_filled_rect(26, bars_height+6+1+i*(bars_height+6), width, bars_height, barShade);
-	  
-          for (uint8_t j=50; j<125; j+=25)
-            if (j>26+thresholdX || j>26+width) lcd_vline(j, bars_height+6+1+i*(bars_height+6), bars_height);
-          if (thresholdX) {
-            lcd_vlineStip(26+thresholdX, bars_height+4+i*(bars_height+6), bars_height+3, DOTTED);
-            lcd_hline(25+thresholdX, bars_height+4+i*(bars_height+6), 3);
-          }
-        }
-        else {
-          bars_height += 2;
-        }
-      }
-      if (bars_height == 13) {
-        // No bars at all!
-        putEvent(event == EVT_KEY_BREAK(KEY_UP) ? event : EVT_KEY_BREAK(KEY_DOWN));
-      }
-      displayRssiLine();
     }
     else if (s_frsky_view == e_frsky_voltages) {
       // Volts / Amps / Watts / mAh
diff --git a/src/frsky.h b/src/frsky.h
index 728515f2e..9e6916a92 100644
--- a/src/frsky.h
+++ b/src/frsky.h
@@ -209,9 +209,9 @@ inline void FRSKY_setModelAlarms(void)
 bool FRSKY_alarmRaised(uint8_t idx);
 
 void resetTelemetry();
-uint8_t getTelemCustomField(uint8_t line, uint8_t col);
 uint8_t maxTelemValue(uint8_t channel);
 int16_t convertTelemValue(uint8_t channel, uint8_t value);
+int16_t convertBarValue(uint8_t bar, uint8_t value);
 NOINLINE uint8_t getRssiAlarmValue(uint8_t alarm);
 
 extern const pm_uint8_t bchunit_ar[];
diff --git a/src/main_views.cpp b/src/main_views.cpp
index 74968bd9b..80562a4f8 100644
--- a/src/main_views.cpp
+++ b/src/main_views.cpp
@@ -391,14 +391,19 @@ void menuMainView(uint8_t event)
     s_warning = NULL;
   }
 
-#if defined(GVARS) && defined(PCBSKY9X)
+#if defined(GVARS)
   else if (s_gvar_timer > 0) {
     s_gvar_timer--;
     s_warning = PSTR("Global Variable");
     displayBox();
+#if defined(PCBSKY9X)
     lcd_putsnAtt(16, 5*FH, g_model.gvars[s_gvar_last].name, sizeof(g_model.gvars[s_gvar_last].name), ZCHAR);
     lcd_putsAtt(16+7*FW, 5*FH, PSTR("[\004]"), BOLD);
-    lcd_outdezAtt(16+7*FW+4*FW+FW/2, 5*FH, g_model.gvars[s_gvar_last].value, BOLD);
+    lcd_outdezAtt(16+7*FW+4*FW+FW/2, 5*FH, GVAR_VALUE(s_gvar_last), BOLD);
+#else
+    lcd_putsAtt(16+4*FW, 5*FH, PSTR("[\004]"), BOLD);
+    lcd_outdezAtt(16+4*FW+4*FW+FW/2, 5*FH, GVAR_VALUE(s_gvar_last), BOLD);
+#endif
     s_warning = NULL;
   }
 #endif
diff --git a/src/model_menus.cpp b/src/model_menus.cpp
index 7f226b529..f8afd191c 100644
--- a/src/model_menus.cpp
+++ b/src/model_menus.cpp
@@ -616,11 +616,12 @@ void menuModelSetup(uint8_t event)
   MENU(STR_MENUSETUP, menuTabModel, e_Model, ((protocol<=PROTO_PPMSIM||IS_DSM2_PROTOCOL(protocol)||IS_PXX_PROTOCOL(protocol)) ? 14 : 13), {0,ZCHAR|(sizeof(g_model.name)-1),FIELD_TIMER_MAX,FIELD_TIMER_MAX,0,0,0,0,0,0,0,NUM_STICKS+NUM_POTS+NUM_ROTARY_ENCODERS-1,1,2});
 
   uint8_t  sub = m_posVert - 1;
+  int8_t editMode = s_editMode;
 
   for (uint8_t i=0; i<7; i++) {
     uint8_t y = 1*FH + i*FH;
     uint8_t k = i+s_pgOfs;
-    uint8_t blink = ((s_editMode>0) ? BLINK|INVERS : INVERS);
+    uint8_t blink = ((editMode>0) ? BLINK|INVERS : INVERS);
     uint8_t attr = (sub == k ? blink : 0);
 
     switch(k) {
@@ -643,7 +644,7 @@ void menuModelSetup(uint8_t event)
 #if defined(PCBSKY9X) || defined(PCBGRUVIN9X)
         lcd_putcAtt(MODEL_SETUP_2ND_COLUMN+10*FW-1, y, g_model.timersXtra[k-ITEM_MODEL_TIMER1].remanent ? 'R' : '-', (attr && m_posHorz==3) ? blink : 0);
 #endif
-        if (attr && (s_editMode>0 || p1valdiff)) {
+        if (attr && (editMode>0 || p1valdiff)) {
           div_t qr = div(timer->val, 60);
           switch (m_posHorz) {
             case 0:
@@ -758,7 +759,7 @@ void menuModelSetup(uint8_t event)
       case ITEM_MODEL_PROTOCOL:
         lcd_putsLeft(y, STR_PROTO);
         lcd_putsiAtt(MODEL_SETUP_2ND_COLUMN, y, STR_VPROTOS, protocol,
-            (attr && m_posHorz==0 ? (s_editMode>0 ? BLINK|INVERS : INVERS):0));
+            (attr && m_posHorz==0 ? (editMode>0 ? BLINK|INVERS : INVERS):0));
         if (protocol <= PROTO_PPMSIM) {
           lcd_putsiAtt(MODEL_SETUP_2ND_COLUMN+7*FW, y, STR_NCHANNELS, g_model.ppmNCH+2, (attr && m_posHorz==1) ? blink : 0);
         }
@@ -773,7 +774,7 @@ void menuModelSetup(uint8_t event)
         else if (attr) {
           m_posHorz = 0;
         }
-        if (attr && (s_editMode>0 || p1valdiff || (protocol>PROTO_PPMSIM && !IS_DSM2_PROTOCOL(protocol)))) {
+        if (attr && (editMode>0 || p1valdiff || (protocol>PROTO_PPMSIM && !IS_DSM2_PROTOCOL(protocol)))) {
           switch (m_posHorz) {
             case 0:
               CHECK_INCDEC_MODELVAR(event, g_model.protocol,0, PROTO_MAX-1);
@@ -794,12 +795,12 @@ void menuModelSetup(uint8_t event)
         if (protocol <= PROTO_PPMSIM) {
           lcd_putsLeft( y, STR_PPMFRAME);
           lcd_puts(MODEL_SETUP_2ND_COLUMN+3*FW, y, STR_MS);
-          lcd_outdezAtt(MODEL_SETUP_2ND_COLUMN, y, (int16_t)g_model.ppmFrameLength*5 + 225, ((attr && m_posHorz==0) ? (s_editMode>0 ? BLINK|INVERS : INVERS) : 0) | PREC1|LEFT);
+          lcd_outdezAtt(MODEL_SETUP_2ND_COLUMN, y, (int16_t)g_model.ppmFrameLength*5 + 225, ((attr && m_posHorz==0) ? (editMode>0 ? BLINK|INVERS : INVERS) : 0) | PREC1|LEFT);
           lcd_putc(MODEL_SETUP_2ND_COLUMN+8*FW+2, y, 'u');
           lcd_outdezAtt(MODEL_SETUP_2ND_COLUMN+8*FW+2, y, (g_model.ppmDelay*50)+300, ((attr && m_posHorz==1) ? blink : 0));
           lcd_putcAtt(MODEL_SETUP_2ND_COLUMN+10*FW, y, g_model.pulsePol ? '+' : '-', (attr && m_posHorz==2) ? INVERS : 0);
 
-          if(attr && (s_editMode>0 || p1valdiff)) {
+          if(attr && (editMode>0 || p1valdiff)) {
             switch (m_posHorz) {
               case 0:
                 CHECK_INCDEC_MODELVAR(event, g_model.ppmFrameLength, -20, 35);
@@ -819,23 +820,23 @@ void menuModelSetup(uint8_t event)
             m_posHorz = 0; // limit 3 column row to 2 colums for DSM2 protocol (Rx_Num and RANGE fields)
 
           lcd_putsLeft(y, STR_RXNUM);
-          lcd_outdezNAtt(MODEL_SETUP_2ND_COLUMN-(IS_DSM2_PROTOCOL(protocol) ? 0 : 3*FW), y, g_model.modelId, ((attr && m_posHorz==0) ? (s_editMode>0 ? BLINK|INVERS : INVERS) : 0) | LEADING0|LEFT, 2);
+          lcd_outdezNAtt(MODEL_SETUP_2ND_COLUMN-(IS_DSM2_PROTOCOL(protocol) ? 0 : 3*FW), y, g_model.modelId, ((attr && m_posHorz==0) ? (editMode>0 ? BLINK|INVERS : INVERS) : 0) | LEADING0|LEFT, 2);
 
 #if defined(DSM2)
           if (IS_DSM2_PROTOCOL(protocol)) { // RANGE CHECK
             lcd_putsnAtt(MODEL_SETUP_2ND_COLUMN+5*FW, y, PSTR("RANGErange")+5*(s_rangecheck_mode), 5, (m_posHorz==1 ? attr : 0));
-            s_rangecheck_mode = (attr && m_posHorz==1 && s_editMode>0); // [MENU] key toggles range check mode
+            s_rangecheck_mode = (attr && m_posHorz==1 && editMode>0); // [MENU] key toggles range check mode
           }
 #endif
 
-          if (attr && (m_posHorz==0 && (s_editMode>0 || p1valdiff)))
+          if (attr && (m_posHorz==0 && (editMode>0 || p1valdiff)))
             CHECK_INCDEC_MODELVAR(event, g_model.modelId, 0, 99);
 
 #if defined(PXX)
           if (protocol == PROTO_PXX) {
             lcd_putsAtt(MODEL_SETUP_2ND_COLUMN, y, STR_SYNCMENU, (m_posHorz==1 ? attr : 0));
             if (attr && m_posHorz==1) {
-              s_editMode = false;
+              s_editMode = 0;
               if (event==EVT_KEY_LONG(KEY_MENU)) {
                 // send reset code
                 pxxFlag = PXX_SEND_RXNUM;
@@ -886,16 +887,18 @@ PhasesType editPhases(uint8_t x, uint8_t y, uint8_t event, PhasesType value, uin
 {
   lcd_putsLeft(y, STR_FPHASE);
 
+  uint8_t posHorz = m_posHorz;
+
 #if defined(PCBSKY9X) && !defined(PCBX9D)
   bool expoMenu = (x==EXPO_ONE_2ND_COLUMN-2*FW);
 #endif
 
   for (uint8_t p=0; p<MAX_PHASES; p++) {
 #if defined(PCBSKY9X) && !defined(PCBX9D)
-    if (expoMenu && ((attr && p < m_posHorz-4) || (x > EXPO_ONE_2ND_COLUMN+2*FW)))
+    if (expoMenu && ((attr && p < posHorz-4) || (x > EXPO_ONE_2ND_COLUMN+2*FW)))
       continue;
 #endif
-    lcd_putcAtt(x, y, '0'+p, ((m_posHorz==p) && attr) ? BLINK|INVERS : ((value & (1<<p)) ? 0 : INVERS));
+    lcd_putcAtt(x, y, '0'+p, ((posHorz==p) && attr) ? BLINK|INVERS : ((value & (1<<p)) ? 0 : INVERS));
     x += FW;
   }
 
@@ -903,7 +906,7 @@ PhasesType editPhases(uint8_t x, uint8_t y, uint8_t event, PhasesType value, uin
     if ((event==EVT_KEY_FIRST(KEY_MENU)) || p1valdiff) {
       killEvents(event);
       s_editMode = 0;
-      value ^= (1<<m_posHorz);
+      value ^= (1<<posHorz);
       STORE_MODELVARS;
     }
   }
@@ -921,10 +924,11 @@ void menuModelPhaseOne(uint8_t event)
   SUBMENU(STR_MENUFLIGHTPHASE, (s_currIdx==0 ? 3 : 5), {ZCHAR|(sizeof(phase->name)-1), 0, MAX_TRIM_LINE, 0/*, 0*/});
 
   int8_t sub = m_posVert;
+  int8_t editMode = s_editMode;
 
   for (uint8_t i=0, k=0, y=2*FH; i<5; i++, k++, y+=FH) {
     if (s_currIdx == 0 && i==1) i = 3;
-    uint8_t attr = (sub==k ? (s_editMode>0 ? BLINK|INVERS : INVERS) : 0);
+    uint8_t attr = (sub==k ? (editMode>0 ? BLINK|INVERS : INVERS) : 0);
     switch(i) {
       case 0:
         editName(MIXES_2ND_COLUMN, y, phase->name, sizeof(phase->name), event, attr, m_posHorz);
@@ -933,10 +937,10 @@ void menuModelPhaseOne(uint8_t event)
         phase->swtch = switchMenuItem(MIXES_2ND_COLUMN, y, phase->swtch, attr, event);
         break;
       case 2:
-        lcd_putsLeft( y, STR_TRIMS);
+        lcd_putsLeft(y, STR_TRIMS);
         for (uint8_t t=0; t<NUM_STICKS; t++) {
-          putsTrimMode(MIXES_2ND_COLUMN+(t*FW), y, s_currIdx, t, (attr && m_posHorz==t) ? ((s_editMode>0) ? BLINK|INVERS : INVERS) : 0);
-          if (attr && m_posHorz==t && ((s_editMode>0) || p1valdiff)) {
+          putsTrimMode(MIXES_2ND_COLUMN+(t*FW), y, s_currIdx, t, (attr && m_posHorz==t) ? ((editMode>0) ? BLINK|INVERS : INVERS) : 0);
+          if (attr && m_posHorz==t && ((editMode>0) || p1valdiff)) {
             int16_t v = getRawTrimValue(s_currIdx, t);
             if (v < TRIM_EXTENDED_MAX) v = TRIM_EXTENDED_MAX;
             v = checkIncDec(event, v, TRIM_EXTENDED_MAX, TRIM_EXTENDED_MAX+MAX_PHASES-1, EE_MODEL);
@@ -948,8 +952,8 @@ void menuModelPhaseOne(uint8_t event)
         }
 #if defined(ROTARY_ENCODERS)
         for (uint8_t t=0; t<NUM_ROTARY_ENCODERS; t++) {
-          putsRotaryEncoderMode(MIXES_2ND_COLUMN+((4+t)*FW)+2, y, s_currIdx, t, (attr && m_posHorz==4+t) ? ((s_editMode>0) ? BLINK|INVERS : INVERS) : 0);
-          if (attr && m_posHorz==4+t && ((s_editMode>0) || p1valdiff)) {
+          putsRotaryEncoderMode(MIXES_2ND_COLUMN+((4+t)*FW)+2, y, s_currIdx, t, (attr && m_posHorz==4+t) ? ((editMode>0) ? BLINK|INVERS : INVERS) : 0);
+          if (attr && m_posHorz==4+t && ((editMode>0) || p1valdiff)) {
 #if defined(EXTRA_ROTARY_ENCODERS)
             int16_t v;
             if(t < (NUM_ROTARY_ENCODERS - NUM_ROTARY_ENCODERS_EXTRA))
@@ -1616,12 +1620,13 @@ void menuModelMixOne(uint8_t event)
 
   SUBMENU_NOTITLE(MIX_FIELD_COUNT, {IF_PCBSKY9X(sizeof(md2->name)) 0, 0, 0, 1, IF_CURVES(1) 0, IF_FLIGHT_PHASES(MAX_PHASES-1) 0 /*, ...*/});
 
-  int8_t  sub = m_posVert;
+  int8_t sub = m_posVert;
+  int8_t editMode = s_editMode;
 
   for (uint8_t k=0; k<7; k++) {
     uint8_t y = (k+1) * FH;
-    uint8_t i = k + s_pgOfs;
-    uint8_t attr = (sub==i ? (s_editMode>0 ? BLINK|INVERS : INVERS) : 0);
+    int8_t i = k + s_pgOfs;
+    uint8_t attr = (sub==i ? (editMode>0 ? BLINK|INVERS : INVERS) : 0);
     switch(i) {
 #if defined(PCBSKY9X)
       case MIX_FIELD_NAME:
@@ -1647,11 +1652,11 @@ void menuModelMixOne(uint8_t event)
         int8_t carryTrim = -md2->carryTrim;
         lcd_putsLeft(y, STR_TRIM);
         lcd_putsiAtt((not_stick ? MIXES_2ND_COLUMN : MIXES_2ND_COLUMN-5*FW), y, STR_VMIXTRIMS, (not_stick && carryTrim == 0) ? 0 : carryTrim+1, m_posHorz==0 ? attr : 0);
-        if (attr && m_posHorz==0 && (not_stick || s_editMode>0)) md2->carryTrim = -checkIncDecModel(event, carryTrim, not_stick ? TRIM_ON : -TRIM_OFF, -TRIM_AIL);
+        if (attr && m_posHorz==0 && (not_stick || editMode>0)) md2->carryTrim = -checkIncDecModel(event, carryTrim, not_stick ? TRIM_ON : -TRIM_OFF, -TRIM_AIL);
         if (!not_stick) {
           lcd_puts(MIXES_2ND_COLUMN, y, STR_DREX);
           menu_lcd_onoff(MIXES_2ND_COLUMN+5*FW, y, !md2->noExpo, m_posHorz==1 ? attr : 0);
-          if (attr && m_posHorz==1 && s_editMode>0) md2->noExpo = !checkIncDecModel(event, !md2->noExpo, 0, 1);
+          if (attr && m_posHorz==1 && editMode>0) md2->noExpo = !checkIncDecModel(event, !md2->noExpo, 0, 1);
         }
         else if (attr) {
           m_posHorz = 0;
@@ -1680,8 +1685,8 @@ void menuModelMixOne(uint8_t event)
         }
         else {
           lcd_putsAtt(MIXES_2ND_COLUMN, y, PSTR("Diff"), m_posHorz==0 ? attr : 0);
-          md2->curveParam = gvarMenuItem(MIXES_2ND_COLUMN+5*FW, y, curveParam, -100, 100, LEFT|(m_posHorz==1 ? attr : 0), s_editMode>0 ? event : 0);
-          if (attr && s_editMode>0 && m_posHorz==0) {
+          md2->curveParam = gvarMenuItem(MIXES_2ND_COLUMN+5*FW, y, curveParam, -100, 100, LEFT|(m_posHorz==1 ? attr : 0), editMode>0 ? event : 0);
+          if (attr && editMode>0 && m_posHorz==0) {
             int8_t tmp = 0;
             CHECK_INCDEC_MODELVAR(event, tmp, -1, 1);
             if (tmp != 0) {
@@ -1890,6 +1895,7 @@ void menuModelExpoMix(uint8_t expo, uint8_t _event)
 
   for (uint8_t ch=1; ch<=(expo ? NUM_STICKS : NUM_CHNOUT); ch++) {
     void *pointer = NULL; MixData * &md = (MixData * &)pointer; ExpoData * &ed = (ExpoData * &)pointer;
+    uint8_t y = (cur-s_pgOfs)*FH;
     if (expo ? (i<MAX_EXPOS && (ed=expoaddress(i))->chn+1 == ch && ed->mode) : (i<MAX_MIXERS && (md=mixaddress(i))->srcRaw && md->destCh+1 == ch)) {
       if (s_pgOfs < cur && cur-s_pgOfs < 8) {
         if (expo)
@@ -1901,9 +1907,8 @@ void menuModelExpoMix(uint8_t expo, uint8_t _event)
       do {
         if (s_copyMode) {
           if (s_copyMode == MOVE_MODE && s_pgOfs < cur && cur-s_pgOfs < 8 && s_copySrcCh == ch && s_copyTgtOfs != 0 && i == (s_copySrcIdx + (s_copyTgtOfs<0))) {
-            uint8_t y = (cur-s_pgOfs)*FH;
             lcd_rect(expo ? 18 : 22, y-1, expo ? DISPLAY_W-18 : DISPLAY_W-22, 9, DOTTED);
-            cur++;
+            cur++; y+=FH;
           }
           if (s_currIdx == i) {
             sub = m_posVert = cur;
@@ -1914,7 +1919,6 @@ void menuModelExpoMix(uint8_t expo, uint8_t _event)
           s_currIdx = i;
         }
         if (s_pgOfs < cur && cur-s_pgOfs < 8) {
-          uint8_t y = (cur-s_pgOfs)*FH;
           uint8_t attr = ((s_copyMode || sub != cur) ? 0 : INVERS);         
           if (expo) {
             ed->weight = gvarMenuItem(EXPO_LINE_WEIGHT_POS, y, ed->weight, 0, 100, attr | (isExpoActive(i) ? BOLD : 0), _event);
@@ -1978,12 +1982,11 @@ void menuModelExpoMix(uint8_t expo, uint8_t _event)
             }
           }
         }
-        cur++; mixCnt++; i++; if (expo) ed++; else md++;
+        cur++; y+=FH; mixCnt++; i++; if (expo) ed++; else md++;
       } while (expo ? (i<MAX_EXPOS && ed->chn+1 == ch && ed->mode) : (i<MAX_MIXERS && md->srcRaw && md->destCh+1 == ch));
       if (s_copyMode == MOVE_MODE && s_pgOfs < cur && cur-s_pgOfs < 8 && s_copySrcCh == ch && i == (s_copySrcIdx + (s_copyTgtOfs<0))) {
-        uint8_t y = (cur-s_pgOfs)*FH;
         lcd_rect(expo ? EXPO_LINE_SELECT_POS : 22, y-1, expo ? DISPLAY_W-EXPO_LINE_SELECT_POS : DISPLAY_W-22, 9, DOTTED);
-        cur++;
+        cur++; y+=FH;
       }
     }
     else {
@@ -1997,15 +2000,14 @@ void menuModelExpoMix(uint8_t expo, uint8_t _event)
       }
       if (s_pgOfs < cur && cur-s_pgOfs < 8) {
         if (expo)
-          putsChnRaw(0, (cur-s_pgOfs)*FH, ch, attr);
+          putsChnRaw(0, y, ch, attr);
         else
-          putsChn(0, (cur-s_pgOfs)*FH, ch, attr); // show CHx
+          putsChn(0, y, ch, attr); // show CHx
         if (s_copyMode == MOVE_MODE && s_copySrcCh == ch) {
-          uint8_t y = (cur-s_pgOfs)*FH;
           lcd_rect(expo ? EXPO_LINE_SELECT_POS : 22, y-1, expo ? (DISPLAY_W-EXPO_LINE_SELECT_POS) : (DISPLAY_W-22), 9, DOTTED);
         }
       }
-      cur++;
+      cur++; y+=FH;
     }
   }
   s_maxLines = cur;
@@ -2177,7 +2179,7 @@ void menuModelLimits(uint8_t event)
 #else
           lcd_outdezAtt(12*FW, y, (int8_t)(ld->min-100), attr);
 #endif
-          if (active) ld->min = 100 + checkIncDec(event, ld->min-100, -limit, 25, EE_MODEL);
+          if (active) ld->min = 100 + checkIncDecModel(event, ld->min-100, -limit, 25);
           break;
         case ITEM_LIMITS_MAX:
 #ifdef PPM_LIMITS_UNIT_US
@@ -2185,7 +2187,7 @@ void menuModelLimits(uint8_t event)
 #else
           lcd_outdezAtt(LIMITS_MAX_POS, y, (int8_t)(ld->max+100), attr);
 #endif
-          if (active) ld->max = -100 + checkIncDec(event, ld->max+100, -25, limit, EE_MODEL);
+          if (active) ld->max = -100 + checkIncDecModel(event, ld->max+100, -25, limit);
           break;
         case ITEM_LIMITS_DIRECTION:
 #ifdef PPM_CENTER_ADJUSTABLE
@@ -2668,8 +2670,8 @@ void menuModelFunctionSwitches(uint8_t event)
         case 2:
           if (sd->swtch) {
             int16_t val_displayed = FSW_PARAM(sd);
-            int16_t val_min = 0;
-            int16_t val_max = 255;
+            int8_t val_min = 0;
+            uint8_t val_max = 255;
             if (sd->func == FUNC_PLAY_SOUND) {
 #if defined(AUDIO)
               val_max = AU_FRSKY_LAST-AU_FRSKY_FIRST-1;
@@ -2820,21 +2822,19 @@ enum menuModelTelemetryItems {
 #endif
   ITEM_TELEMETRY_USR_VOLTAGE_SOURCE,
   ITEM_TELEMETRY_USR_CURRENT_SOURCE,
-#if defined(VARIO)
-  ITEM_TELEMETRY_VARIO_LABEL,
-  ITEM_TELEMETRY_VARIO_SOURCE,
-  ITEM_TELEMETRY_VARIO_SPEED,
-#endif
-  ITEM_TELEMETRY_CUSTOM_SCREEN_LABEL,
-  ITEM_TELEMETRY_CUSTOM_SCREEN_LINE1,
-  ITEM_TELEMETRY_CUSTOM_SCREEN_LINE2,
-  ITEM_TELEMETRY_CUSTOM_SCREEN_LINE3,
-  ITEM_TELEMETRY_CUSTOM_SCREEN_LINE4,
-  ITEM_TELEMETRY_GAUGES_LABEL,
-  ITEM_TELEMETRY_GAUGES_LINE1,
-  ITEM_TELEMETRY_GAUGES_LINE2,
-  ITEM_TELEMETRY_GAUGES_LINE3,
-  ITEM_TELEMETRY_GAUGES_LINE4,
+  IF_VARIO(ITEM_TELEMETRY_VARIO_LABEL)
+  IF_VARIO(ITEM_TELEMETRY_VARIO_SOURCE)
+  IF_VARIO(ITEM_TELEMETRY_VARIO_SPEED)
+  ITEM_TELEMETRY_SCREEN_LABEL1,
+  ITEM_TELEMETRY_SCREEN_LINE1,
+  ITEM_TELEMETRY_SCREEN_LINE2,
+  ITEM_TELEMETRY_SCREEN_LINE3,
+  ITEM_TELEMETRY_SCREEN_LINE4,
+  ITEM_TELEMETRY_SCREEN_LABEL2,
+  ITEM_TELEMETRY_SCREEN_LINE5,
+  ITEM_TELEMETRY_SCREEN_LINE6,
+  ITEM_TELEMETRY_SCREEN_LINE7,
+  ITEM_TELEMETRY_SCREEN_LINE8,
   ITEM_TELEMETRY_MAX
 };
 
@@ -2843,11 +2843,6 @@ enum menuModelTelemetryItems {
 #else
 #define USRDATA_LINES
 #endif
-#if defined(VARIO)
-#define VARIO_LINES   (uint8_t)-1, 0, 1,
-#else
-#define VARIO_LINES
-#endif
 
 #ifdef FRSKY
 #if defined(TRANSLATIONS_FR) || defined(TRANSLATIONS_CZ)
@@ -2858,7 +2853,7 @@ enum menuModelTelemetryItems {
 
 void menuModelTelemetry(uint8_t event)
 {
-  MENU(STR_MENUTELEMETRY, menuTabModel, e_Telemetry, ITEM_TELEMETRY_MAX+1, {0, (uint8_t)-1, 1, 0, 2, 2, (uint8_t)-1, 1, 0, 2, 2, (uint8_t)-1, 1, 1, USRDATA_LINES 0, 0, VARIO_LINES (uint8_t)-1, 1, 1, 1, 1, (uint8_t)-1, 2, 2, 2, 2});
+  MENU(STR_MENUTELEMETRY, menuTabModel, e_Telemetry, ITEM_TELEMETRY_MAX+1, {0, (uint8_t)-1, 1, 0, 2, 2, (uint8_t)-1, 1, 0, 2, 2, (uint8_t)-1, 1, 1, USRDATA_LINES 0, 0, IF_VARIO((uint8_t)-1) IF_VARIO(0) IF_VARIO(1) 0, 2, 2, 2, 2, 0, 2, 2, 2, 2});
 
   uint8_t sub = m_posVert - 1;
 
@@ -2868,7 +2863,7 @@ void menuModelTelemetry(uint8_t event)
     case EVT_KEY_BREAK(KEY_LEFT):
     case EVT_KEY_BREAK(KEY_RIGHT):
       if (s_editMode>0 && sub<=ITEM_TELEMETRY_RSSI_ALARM2)
-        FRSKY_setModelAlarms(); // update Fr-Sky module when edit mode exited
+        FRSKY_setModelAlarms(); // update FrSky module when edit mode exited
       break;
   }
 
@@ -2937,13 +2932,14 @@ void menuModelTelemetry(uint8_t event)
           switch (m_posHorz) {
            case 0:
              t = ALARM_LEVEL(ch, j);
-             channel.alarms_level = (channel.alarms_level & ~(3<<(2*j))) + (checkIncDec(event, t, 0, 3, EE_MODEL) << (2*j));
+             channel.alarms_level = (channel.alarms_level & ~(3<<(2*j))) + (checkIncDecModel(event, t, 0, 3) << (2*j));
              break;
            case 1:
              t = ALARM_GREATER(ch, j);
-             channel.alarms_greater = (channel.alarms_greater & ~(1<<j)) + (checkIncDec(event, t, 0, 1, EE_MODEL) << j);
-             if(checkIncDec_Ret)
+             if (t != checkIncDecModel(event, t, 0, 1)) {
+               channel.alarms_greater ^= (1 << j);
                FRSKY_setModelAlarms();
+             }
              break;
            case 2:
              channel.alarms_value[j] = checkIncDec(event, channel.alarms_value[j], 0, 255, EE_MODEL);
@@ -3040,71 +3036,69 @@ void menuModelTelemetry(uint8_t event)
         break;
 #endif
 
-      case ITEM_TELEMETRY_CUSTOM_SCREEN_LABEL:
-        lcd_putsLeft(y, STR_DISPLAY);
+      case ITEM_TELEMETRY_SCREEN_LABEL1:
+      case ITEM_TELEMETRY_SCREEN_LABEL2:
+      {
+        uint8_t screenIndex = (k < ITEM_TELEMETRY_SCREEN_LABEL2 ? 1 : 2);
+        putsStrIdx(0*FW, y, STR_SCREEN, screenIndex);
+        bool screenType = g_model.frsky.screensType & screenIndex;
+        if (screenType != selectMenuItem(10*FW, y, PSTR(""), STR_VSCREEN, screenType, 0, 1, attr, event))
+          g_model.frsky.screensType ^= screenIndex;
         break;
+      }
 
-      case ITEM_TELEMETRY_CUSTOM_SCREEN_LINE1:
-      case ITEM_TELEMETRY_CUSTOM_SCREEN_LINE2:
-      case ITEM_TELEMETRY_CUSTOM_SCREEN_LINE3:
-      case ITEM_TELEMETRY_CUSTOM_SCREEN_LINE4:
-        for (uint8_t c=0; c<2; c++) {
-          uint8_t j = k - ITEM_TELEMETRY_CUSTOM_SCREEN_LINE1;
-          uint8_t value = getTelemCustomField(j, c);
-          lcd_putsiAtt(c==0?4:TELEM_COL2, y, STR_VTELEMCHNS, value, (attr && m_posHorz==c) ? blink : 0);
-          if (attr && m_posHorz==c && (s_editMode>0 || p1valdiff)) {
-            CHECK_INCDEC_MODELVAR(event, value, 0, (j==3 && c==0) ? TELEM_STATUS_MAX : TELEM_DISPLAY_MAX);
-            if (checkIncDec_Ret) {
-#if defined (PCBSKY9X)
-              g_model.frsky.lines[2*j+c] = value;
-#else
-              g_model.frsky.lines[j] = (c==0 ? ((g_model.frsky.lines[j] & 0xf0) + (value & 0x0f)) : (g_model.frsky.lines[j] & 0x0f) + ((value & 0x0f) << 4));
-              uint16_t mask = 0x3 << (4*j+2*c);
-              g_model.frsky.linesXtra &= ~mask;
-              mask = (value / 16) << (4*j+2*c);
-              g_model.frsky.linesXtra |= mask;
-#endif
+      case ITEM_TELEMETRY_SCREEN_LINE1:
+      case ITEM_TELEMETRY_SCREEN_LINE2:
+      case ITEM_TELEMETRY_SCREEN_LINE3:
+      case ITEM_TELEMETRY_SCREEN_LINE4:
+      case ITEM_TELEMETRY_SCREEN_LINE5:
+      case ITEM_TELEMETRY_SCREEN_LINE6:
+      case ITEM_TELEMETRY_SCREEN_LINE7:
+      case ITEM_TELEMETRY_SCREEN_LINE8:
+      {
+        uint8_t screenIndex, lineIndex;
+        if (k < ITEM_TELEMETRY_SCREEN_LABEL2) {
+          screenIndex = 0;
+          lineIndex = k-ITEM_TELEMETRY_SCREEN_LINE1;
+        }
+        else {
+          screenIndex = 1;
+          lineIndex = k-ITEM_TELEMETRY_SCREEN_LINE5;
+        }
+        if (g_model.frsky.screensType & (screenIndex+1)) {
+          FrSkyBarData & bar = g_model.frsky.screens[screenIndex].bars[lineIndex];
+          uint8_t barSource = bar.source;
+          lcd_putsiAtt(4, y, STR_VTELEMCHNS, barSource, (attr && m_posHorz==0) ? blink : 0);
+          if (barSource) {
+            putsTelemetryChannel(56-3*FW, y, barSource-1, convertBarValue(barSource, bar.barMin), (attr && m_posHorz==1 ? blink : 0) | LEFT);
+            putsTelemetryChannel(14*FW-3, y, barSource-1, convertBarValue(barSource, 31-bar.barMax), (attr && m_posHorz==2 ? blink : 0) | LEFT);
+          }
+          else {
+            if (attr) m_posHorz = 0;
+          }
+          if (attr && (s_editMode>0 || p1valdiff)) {
+            switch (m_posHorz) {
+              case 0:
+                bar.source = checkIncDecModel(event, barSource, 0, g_model.frsky.usrProto ? TELEM_DISPLAY_MAX : TELEM_NOUSR_MAX);
+                break;
+              case 1:
+                CHECK_INCDEC_MODELVAR(event, bar.barMin, 0, 30-bar.barMax);
+                break;
+              case 2:
+                bar.barMax = 31 - checkIncDecModel(event, 31-bar.barMax, bar.barMin+1, 31);
+                break;
             }
           }
         }
-        break;
-
-      case ITEM_TELEMETRY_GAUGES_LABEL:
-        lcd_putsLeft(y, STR_BARS);
-        break;
-
-      case ITEM_TELEMETRY_GAUGES_LINE1:
-      case ITEM_TELEMETRY_GAUGES_LINE2:
-      case ITEM_TELEMETRY_GAUGES_LINE3:
-      case ITEM_TELEMETRY_GAUGES_LINE4:
-      {
-        FrSkyBarData & bar = g_model.frsky.bars[k-ITEM_TELEMETRY_GAUGES_LINE1];
-        uint8_t barSource = bar.source;
-        lcd_putsiAtt(4, y, STR_VTELEMCHNS, barSource, (attr && m_posHorz==0) ? blink : 0);
-        if (barSource) {
-          putsTelemetryChannel(56-3*FW, y, barSource-1, convertTelemValue(barSource, bar.barMin*5), (attr && m_posHorz==1 ? blink : 0) | LEFT);
-          putsTelemetryChannel(14*FW-3, y, barSource-1, convertTelemValue(barSource, (51-bar.barMax)*5), (attr && m_posHorz==2 ? blink : 0) | LEFT);
-        }
         else {
-          if (attr) m_posHorz = 0;
-        }
-        if (attr && (s_editMode>0 || p1valdiff)) {
-          switch (m_posHorz) {
-            case 0:
-              CHECK_INCDEC_MODELVAR(event, barSource, 0, g_model.frsky.usrProto ? TELEM_BAR_MAX : TELEM_NOUSR_BAR_MAX);
-              if (checkIncDec_Ret) {
-                bar.source = barSource;
-                bar.barMin = 0;
-                bar.barMax = 51 - (maxTelemValue(barSource) / 5);
-              }
-              break;
-            case 1:
-              CHECK_INCDEC_MODELVAR(event, bar.barMin, 0, 50-bar.barMax);
-              break;
-            case 2:
-              bar.barMax = 51 - checkIncDec(event, 51 - bar.barMax, bar.barMin+1, maxTelemValue(barSource) / 5, EE_MODEL);
-              break;
+          for (uint8_t c=0; c<2; c++) {
+            uint8_t & value = g_model.frsky.screens[screenIndex].lines[lineIndex].sources[c];
+            lcd_putsiAtt(c==0?4:TELEM_COL2, y, STR_VTELEMCHNS, value, (attr && m_posHorz==c) ? blink : 0);
+            if (attr && m_posHorz==c && (s_editMode>0 || p1valdiff)) {
+              CHECK_INCDEC_MODELVAR(event, value, 0, g_model.frsky.usrProto ? ((lineIndex==3 && c==0) ? TELEM_STATUS_MAX : TELEM_DISPLAY_MAX) : TELEM_NOUSR_MAX);
+            }
           }
+          if (attr && m_posHorz == 2) m_posHorz = 0;
         }
         break;
       }
diff --git a/src/myeeprom.h b/src/myeeprom.h
index 800c58e45..fda719a72 100644
--- a/src/myeeprom.h
+++ b/src/myeeprom.h
@@ -49,11 +49,11 @@
 #define BEEP_VAL     ( (g_eeGeneral.warnOpts & WARN_BVAL_BIT) >>3 )
 
 #if defined(PCBSKY9X)
-#define EEPROM_VER       212
+#define EEPROM_VER       213
 #elif defined(PCBGRUVIN9X)
-#define EEPROM_VER       211
+#define EEPROM_VER       212
 #else
-#define EEPROM_VER       211
+#define EEPROM_VER       212
 #endif
 
 #ifndef PACK
@@ -475,10 +475,8 @@ enum TelemetrySource {
   TELEM_MAX_CURRENT,
   TELEM_ACC,
   TELEM_GPS_TIME,
-  TELEM_BAR_MAX = TELEM_CELL,
-  TELEM_NOUSR_BAR_MAX = TELEM_A2,
   TELEM_CSW_MAX = TELEM_POWER,
-  TELEM_NOUSR_CSW_MAX = TELEM_A2,
+  TELEM_NOUSR_MAX = TELEM_A2,
   TELEM_DISPLAY_MAX = TELEM_MAX_CURRENT,
   TELEM_STATUS_MAX = TELEM_GPS_TIME
 };
@@ -499,12 +497,21 @@ PACK(typedef struct t_FrSkyBarData {
 }) FrSkyBarData;
 #else
 PACK(typedef struct t_FrSkyBarData {
-  uint16_t   source:4;
-  uint16_t   barMin:6;           // minimum for bar display
-  uint16_t   barMax:6;           // ditto for max display (would usually = ratio)
+  uint16_t   source:6;
+  uint16_t   barMin:5;           // minimum for bar display
+  uint16_t   barMax:5;           // ditto for max display (would usually = ratio)
 }) FrSkyBarData;
 #endif
 
+PACK(typedef struct t_FrSkyLineData {
+  uint8_t    sources[2];
+}) FrSkyLineData;
+
+typedef union t_FrSkyScreenData {
+  FrSkyBarData  bars[4];
+  FrSkyLineData lines[4];
+} FrSkyScreenData;
+
 enum FrskyUsrProtocols {
   USR_PROTO_NONE,
   USR_PROTO_FRSKY_HUB,
@@ -521,6 +528,7 @@ enum FrskySource {
 };
 
 #if defined(PCBSKY9X)
+#define MAX_FRSKY_SCREENS 4
 PACK(typedef struct t_FrSkyData {
   FrSkyChannelData channels[2];
   FrSkyRSSIAlarm rssiAlarms[2];
@@ -528,14 +536,14 @@ PACK(typedef struct t_FrSkyData {
   uint8_t voltsSource;
   uint8_t blades;   // How many blades for RPMs, 0=2 blades, 1=3 blades
   uint8_t currentSource;
-  FrSkyBarData bars[4];
-  uint8_t lines[4*2*2];
+  FrSkyScreenData screens[MAX_FRSKY_SCREENS];
   uint8_t varioSource;
   uint8_t varioSpeedUpMin;    // if increment in 0.2m/s = 3.0m/s max
   uint8_t varioSpeedDownMin;
   uint8_t spare[4];
 }) FrSkyData;
 #else
+#define MAX_FRSKY_SCREENS 2
 PACK(typedef struct t_FrSkyData {
   FrSkyChannelData channels[2];
   uint8_t usrProto:2; // Protocol in FrSky user data, 0=None, 1=FrSky hub, 2=WS HowHigh, 3=Halcyon
@@ -543,11 +551,9 @@ PACK(typedef struct t_FrSkyData {
   uint8_t spare1:4;
   uint8_t voltsSource:3;
   uint8_t currentSource:3;
-  uint8_t spare2:2;
-  FrSkyBarData bars[4];
+  uint8_t screensType:2;
   FrSkyRSSIAlarm rssiAlarms[2];
-  uint8_t   lines[4];
-  uint16_t  linesXtra;
+  FrSkyScreenData screens[MAX_FRSKY_SCREENS];
   uint8_t   varioSource:3;
   uint8_t   varioSpeedUpMin:5;    // if increment in 0.2m/s = 3.0m/s max
   uint8_t   varioSpeedDownMin;
diff --git a/src/open9x.cpp b/src/open9x.cpp
index 12f748c0f..e76310296 100644
--- a/src/open9x.cpp
+++ b/src/open9x.cpp
@@ -936,20 +936,15 @@ int8_t GVAR(int8_t x, int8_t min, int8_t max)
   return (x >= 126 || x <= -126) ? limit(min, GVAR_VALUE((uint8_t)x - 126), max) : x;
 }
 
-#if defined(PCBSKY9X)
 uint8_t s_gvar_timer = 0;
 uint8_t s_gvar_last = 0;
-#endif
-
 void setGVarValue(uint8_t x, int8_t value)
 {
   if (GVAR_VALUE(x) != value) {
     GVAR_VALUE(x) = value;
     eeDirty(EE_MODEL);
-#if defined(PCBSKY9X)
     s_gvar_last = x;
     s_gvar_timer = GVAR_DISPLAY_TIME;
-#endif
   }
 }
 #endif
@@ -1342,10 +1337,8 @@ void checkTrims()
     if (TRIM_REUSED()) {
       *trimPtr[idx] = after;
       eeDirty(EE_MODEL);
-#if defined(PCBSKY9X)
-      s_gvar_last = (trimPtr[idx] - &g_model.gvars[0].value) / sizeof(g_model.gvars[0]);
+      s_gvar_last = (trimPtr[idx] - &GVAR_VALUE(0)) / sizeof(g_model.gvars[0]);
       s_gvar_timer = GVAR_DISPLAY_TIME;
-#endif
     }
     else {
       setTrimValue(phase, idx, after);
diff --git a/src/open9x.h b/src/open9x.h
index 7862b2dc2..78f115000 100644
--- a/src/open9x.h
+++ b/src/open9x.h
@@ -67,6 +67,12 @@
 #define IF_VOICE(x)
 #endif
 
+#if defined(VARIO)
+#define IF_VARIO(x) x,
+#else
+#define IF_VARIO(x)
+#endif
+
 #if defined(HAPTIC)
 #define IF_HAPTIC(x) x,
 #else
@@ -698,11 +704,9 @@ inline bool navigationRotaryEncoder(uint8_t event)
 
 #if defined(GVARS)
 int8_t GVAR(int8_t x, int8_t min, int8_t max);
-#if defined(PCBSKY9X)
 #define GVAR_DISPLAY_TIME     100 /*1 second*/;
 extern uint8_t s_gvar_timer;
 extern uint8_t s_gvar_last;
-#endif
 #else
 #define GVAR(x, min, max) (x)
 #endif
diff --git a/src/translations.cpp b/src/translations.cpp
index e2fec6566..ab7c718b3 100644
--- a/src/translations.cpp
+++ b/src/translations.cpp
@@ -73,6 +73,7 @@ const pm_char STR_OPEN9X[] PROGMEM =
     ISTR(GPSFORMAT)
     ISTR(VOLTSRC)
     ISTR(VARIOSRC)
+    ISTR(VSCREEN)
 #endif
 #ifdef TEMPLATES
     ISTR(VTEMPLATES)
@@ -159,8 +160,7 @@ const pm_char STR_BAR[] PROGMEM = TR_BAR;
 const pm_char STR_ALARM[] PROGMEM = TR_ALARM;
 const pm_char STR_USRDATA[] PROGMEM = TR_USRDATA;
 const pm_char STR_BLADES[] PROGMEM = TR_BLADES;
-const pm_char STR_BARS[] PROGMEM = TR_BARS;
-const pm_char STR_DISPLAY[] PROGMEM = TR_DISPLAY;
+const pm_char STR_SCREEN[] PROGMEM = TR_SCREEN;
 const pm_char STR_BEEPERMODE[] PROGMEM = TR_BEEPERMODE;
 const pm_char STR_BEEPERLEN[] PROGMEM = TR_BEEPERLEN;
 #if defined(AUDIO)
diff --git a/src/translations.h b/src/translations.h
index 9c2828a3b..79a323d71 100644
--- a/src/translations.h
+++ b/src/translations.h
@@ -100,7 +100,8 @@ extern const pm_char STR_OPEN9X[];
 #define OFS_GPSFORMAT  (OFS_VTELPROTO + sizeof(TR_VTELPROTO))
 #define OFS_VOLTSRC (OFS_GPSFORMAT + sizeof(TR_GPSFORMAT))
 #define OFS_VARIOSRC   (OFS_VOLTSRC + sizeof(TR_VOLTSRC))
-#define OFS_ENDTELEM   (OFS_VARIOSRC + sizeof(TR_VARIOSRC))
+#define OFS_VSCREEN    (OFS_VARIOSRC + sizeof(TR_VARIOSRC))
+#define OFS_ENDTELEM   (OFS_VSCREEN + sizeof(TR_VSCREEN))
 #else
 #define OFS_ENDTELEM   (OFS_VTELEMCHNS + sizeof(TR_VTELEMCHNS))
 #endif
@@ -168,6 +169,7 @@ extern const pm_char STR_OPEN9X[];
 #define STR_GPSFORMAT  (STR_OPEN9X + OFS_GPSFORMAT)
 #define STR_VOLTSRC (STR_OPEN9X + OFS_VOLTSRC)
 #define STR_VARIOSRC   (STR_OPEN9X + OFS_VARIOSRC)
+#define STR_VSCREEN    (STR_OPEN9X + OFS_VSCREEN)
 #define STR_TELEMCHNS  (STR_OPEN9X + OFS_TELEMCHNS)
 #endif
 
@@ -266,8 +268,7 @@ extern const pm_char STR_BAR[];
 extern const pm_char STR_ALARM[];
 extern const pm_char STR_USRDATA[];
 extern const pm_char STR_BLADES[];
-extern const pm_char STR_BARS[];
-extern const pm_char STR_DISPLAY[];
+extern const pm_char STR_SCREEN[];
 extern const pm_char STR_BEEPERMODE[];
 extern const pm_char STR_BEEPERLEN[];
 extern const pm_char STR_SPKRPITCH[];
diff --git a/src/translations/cz.h b/src/translations/cz.h
index 42803070b..963c77dca 100644
--- a/src/translations/cz.h
+++ b/src/translations/cz.h
@@ -178,6 +178,9 @@
 #define LEN_VARIOSRC     "\004"
 #define TR_VARIOSRC      "Data""A1\0 ""A2\0"
 
+#define LEN_VSCREEN      "\004"
+#define TR_VSCREEN       "Nums""Bars"
+
 #define LEN_GPSFORMAT    "\004"
 #define TR_GPSFORMAT     "HMS NMEA"
 
@@ -288,8 +291,7 @@
 #define TR_ALARM        "Alarm"
 #define TR_USRDATA      "U\217ivData"
 #define TR_BLADES       "VrtListy"
-#define TR_BARS         "Ukazatele"
-#define TR_DISPLAY      "Zobrazen\204"
+#define TR_SCREEN       "Screen "
 #ifdef AUDIO
 #define TR_BEEPERMODE   "Repro: M\205d"
 #define TR_BEEPERLEN    " += D\202lka"
diff --git a/src/translations/de.h b/src/translations/de.h
index 5b54ed5fa..751136fb5 100644
--- a/src/translations/de.h
+++ b/src/translations/de.h
@@ -178,6 +178,9 @@
 #define LEN_VARIOSRC                    "\004"
 #define TR_VARIOSRC                     "Data""A1\0 ""A2\0"
                                                                                                                                                                                                                                                                                                    
+#define LEN_VSCREEN      "\004"
+#define TR_VSCREEN       "Nums""Bars"
+
 #define LEN_GPSFORMAT                   "\004"                                                                                                                                                                                                                                                     
 #define TR_GPSFORMAT                    "HMS NMEA"                                                                                                                                                                                                                                                 
                                                                                                                                                                                                                                                                                                    
@@ -288,8 +291,7 @@
 #define TR_ALARM                        "Alarm"                                                               
 #define TR_USRDATA                      "UsrData"                                                             
 #define TR_BLADES                       "Blades"                                                              
-#define TR_BARS                         "Bars"                                                                
-#define TR_DISPLAY                      "Display"                                                             
+#define TR_SCREEN                       "Screen "
 #ifdef AUDIO                                                                                                  
 #define TR_BEEPERMODE                   "Speaker Modus"                                                       
 #define TR_BEEPERLEN                    "Speaker L\201nge"                                                    
diff --git a/src/translations/en.h b/src/translations/en.h
index f5b01fd43..59fef5e57 100644
--- a/src/translations/en.h
+++ b/src/translations/en.h
@@ -179,6 +179,9 @@
 #define LEN_VARIOSRC     "\004"
 #define TR_VARIOSRC      "Data""A1\0 ""A2\0"
 
+#define LEN_VSCREEN      "\004"
+#define TR_VSCREEN       "Nums""Bars"
+
 #define LEN_GPSFORMAT    "\004"
 #define TR_GPSFORMAT     "HMS NMEA"
 
@@ -289,8 +292,7 @@
 #define TR_ALARM               "Alarm"
 #define TR_USRDATA             "UsrData"
 #define TR_BLADES              "Blades"
-#define TR_BARS                "Bars"
-#define TR_DISPLAY             "Display"
+#define TR_SCREEN              "Screen "
 #ifdef AUDIO
 #define TR_BEEPERMODE          "Speaker Mode"
 #define TR_BEEPERLEN           "Speaker Length"
diff --git a/src/translations/fr.h b/src/translations/fr.h
index 1027697e3..fa21afda8 100644
--- a/src/translations/fr.h
+++ b/src/translations/fr.h
@@ -173,6 +173,9 @@
 #define LEN_VARIOSRC     "\004"
 #define TR_VARIOSRC      "Data""A1\0 ""A2\0"
 
+#define LEN_VSCREEN      "\004"
+#define TR_VSCREEN       "Nums""Bars"
+
 #define LEN_GPSFORMAT    "\004"
 #define TR_GPSFORMAT     "HMS NMEA"
 
@@ -286,8 +289,7 @@
 #define TR_ALARM        "Alarme"
 #define TR_USRDATA      "Donn\200es"
 #define TR_BLADES       "Pales"
-#define TR_BARS         "Jauges"
-#define TR_DISPLAY      "Affichage"
+#define TR_SCREEN       "Ecran "
 #ifdef AUDIO
 #define TR_BEEPERMODE   "Choix mode sons"
 #define TR_BEEPERLEN    "Dur\200e sons"
diff --git a/src/translations/it.h b/src/translations/it.h
index ac3251878..7d5b6e413 100644
--- a/src/translations/it.h
+++ b/src/translations/it.h
@@ -178,6 +178,9 @@
 #define LEN_VARIOSRC     "\004"
 #define TR_VARIOSRC      "Data""A1\0 ""A2\0"
 
+#define LEN_VSCREEN      "\004"
+#define TR_VSCREEN       "Nums""Bars"
+
 #define LEN_GPSFORMAT    "\004"
 #define TR_GPSFORMAT     "HMS NMEA"
 
@@ -288,8 +291,7 @@
 #define TR_ALARM        "Allarme"
 #define TR_USRDATA      "Dati"
 #define TR_BLADES       "Pale"
-#define TR_BARS         "Barre"
-#define TR_DISPLAY      "Display"
+#define TR_SCREEN       "Screen "
 #ifdef AUDIO
 #define TR_BEEPERMODE   "Modo Audio"
 #define TR_BEEPERLEN    "Durata Audio"
diff --git a/src/translations/se.h b/src/translations/se.h
index fe1de5cae..165c41d5a 100644
--- a/src/translations/se.h
+++ b/src/translations/se.h
@@ -173,6 +173,9 @@
 #define LEN_VARIOSRC     "\004"
 #define TR_VARIOSRC      "Data""A1\0 ""A2\0"
 
+#define LEN_VSCREEN      "\004"
+#define TR_VSCREEN       "Nums""Bars"
+
 #define LEN_GPSFORMAT    "\004"
 #define TR_GPSFORMAT     "HMS NMEA"
 
@@ -285,8 +288,7 @@
 #define TR_ALARM        "Alarm"
 #define TR_USRDATA      "Anv\201ndardata"
 #define TR_BLADES       "Blad"
-#define TR_BARS         "Visa Grafiskt"
-#define TR_DISPLAY      "Visa Numeriskt"
+#define TR_SCREEN       "Screen "
 #ifdef AUDIO
 #define TR_BEEPERMODE   "H\202gtalare l\201ge"
 #define TR_BEEPERLEN    "H\202gtalare tid"