diff --git a/companion/src/firmwares/opentx/opentxeeprom.cpp b/companion/src/firmwares/opentx/opentxeeprom.cpp
index db597bb1f..c7f0366f8 100644
--- a/companion/src/firmwares/opentx/opentxeeprom.cpp
+++ b/companion/src/firmwares/opentx/opentxeeprom.cpp
@@ -945,12 +945,13 @@ class InputField: public TransformedField {
     {
       if (IS_TARANIS(board) && version >= 216) {
         internalField.Append(new SourceField<8>(expo.srcRaw, board, version, 0));
-        internalField.Append(new UnsignedField<16>(expo.scale));
+        internalField.Append(new UnsignedField<16>(expo.scale, "Scale"));
         internalField.Append(new UnsignedField<8>(expo.chn, "Channel"));
         internalField.Append(new SwitchField<8>(expo.swtch, board, version));
         internalField.Append(new UnsignedField<16>(expo.phases));
         internalField.Append(new SignedField<8>(_weight, "Weight"));
-        internalField.Append(new SignedField<8>(expo.carryTrim));
+        internalField.Append(new SignedField<6>(expo.carryTrim, "CarryTrim"));
+        internalField.Append(new UnsignedField<2>(expo.mode, "Mode"));
         internalField.Append(new ZCharField<8>(expo.name));
         internalField.Append(new SignedField<8>(expo.offset, "Offset"));
         internalField.Append(new CurveReferenceField(expo.curve, board, version));
@@ -1021,10 +1022,6 @@ class InputField: public TransformedField {
             expo.srcRaw = RawSource(SOURCE_TYPE_STICK, expo.chn);
           }
         }
-        else {
-          if (expo.srcRaw.type != SOURCE_TYPE_NONE)
-            expo.mode = 3;
-        }
       }
 
       expo.weight = smallGvarToC9x(_weight);
diff --git a/companion/src/modeledit/expodialog.cpp b/companion/src/modeledit/expodialog.cpp
index 7b04620ff..6dff103c2 100644
--- a/companion/src/modeledit/expodialog.cpp
+++ b/companion/src/modeledit/expodialog.cpp
@@ -46,8 +46,6 @@ ExpoDialog::ExpoDialog(QWidget *parent, ModelData & model, ExpoData *expoData, i
   }
 
   if (GetEepromInterface()->getCapability(VirtualInputs)) {
-    ui->sideLabel->hide();
-    ui->sideCB->hide();
     ui->inputName->setMaxLength(4);
     populateSourceCB(ui->sourceCB, ed->srcRaw, model, POPULATE_SOURCES | POPULATE_SWITCHES | POPULATE_TRIMS | POPULATE_TELEMETRY);
     ui->sourceCB->removeItem(0);
diff --git a/companion/src/modeledit/inputs.cpp b/companion/src/modeledit/inputs.cpp
index 6096c8cdf..e828c52cc 100644
--- a/companion/src/modeledit/inputs.cpp
+++ b/companion/src/modeledit/inputs.cpp
@@ -98,12 +98,11 @@ void InputsPanel::update()
         str += " " + RawSource(SOURCE_TYPE_TRIM, (-(md->carryTrim)-1)).toString();
       }
     }
-    else {
-      switch (md->mode) {
-        case (1): str += " <-"; break;
-        case (2): str += " ->"; break;
-        default:  str += "   "; break;
-      };
+
+    switch (md->mode) {
+      case (1): str += " <-"; break;
+      case (2): str += " ->"; break;
+      default:  str += "   "; break;
     }
 
     str += " " + tr("Weight(%1)").arg(getGVarString(md->weight));
diff --git a/radio/src/Makefile b/radio/src/Makefile
index b4c7f048f..b7ecaef64 100644
--- a/radio/src/Makefile
+++ b/radio/src/Makefile
@@ -994,8 +994,10 @@ ifeq ($(HELI), YES)
 endif
 
 ifeq ($(TEMPLATES), YES)
-  CPPDEFS += -DTEMPLATES
-  CPPSRC += templates.cpp
+  ifneq ($(PCB), TARANIS) 
+    CPPDEFS += -DTEMPLATES
+    CPPSRC += templates.cpp
+  endif
 endif
 
 ifeq ($(PXX), YES)
diff --git a/radio/src/gui/menu_model.cpp b/radio/src/gui/menu_model.cpp
index 1c0a63b91..faec332cd 100644
--- a/radio/src/gui/menu_model.cpp
+++ b/radio/src/gui/menu_model.cpp
@@ -3283,7 +3283,7 @@ static uint8_t s_copySrcCh;
   #define EXPO_LINE_SRC_POS    9*FW-2
   #define EXPO_LINE_CURVE_POS  12*FW+4
   #define EXPO_LINE_SWITCH_POS 17*FW-1
-  #define EXPO_LINE_SIDE_POS   20*FW-1
+  #define EXPO_LINE_SIDE_POS   20*FW-2
   #define EXPO_LINE_SELECT_POS 5*FW+2
   #define EXPO_LINE_FM_POS     LCD_W-LEN_EXPOMIX_NAME*FW-MENUS_SCROLLBAR_WIDTH-FW
   #define EXPO_LINE_NAME_POS   LCD_W-LEN_EXPOMIX_NAME*FW-MENUS_SCROLLBAR_WIDTH
diff --git a/radio/src/templates.cpp b/radio/src/templates.cpp
index 1b725bded..07e2c9670 100644
--- a/radio/src/templates.cpp
+++ b/radio/src/templates.cpp
@@ -56,6 +56,10 @@
 
 #include "opentx.h"
 
+#if defined(PCBTARANIS)
+  #pragma message("Templates with virtual inputs (FrSky Taranis) are not implemented!")
+#endif
+
 MixData* setDest(uint8_t dch, uint8_t src, bool clear=false)
 {
   uint8_t i = 0;
@@ -184,13 +188,10 @@ void applyTemplate(uint8_t idx)
       // Simple 4-Ch
       case TMPL_SIMPLE_4CH:
         defaultInputs();
-#if defined(PCBTARANIS)
-  #pragma message("Templates with virtual inputs (FrSky Taranis) are not implemented!")
-#endif
-        setDest(ICC(STK_RUD), MIXSRC_Rud);
-        setDest(ICC(STK_ELE), MIXSRC_Ele);
-        setDest(ICC(STK_THR), MIXSRC_Thr);
-        setDest(ICC(STK_AIL), MIXSRC_Ail);
+        setDest(ICC(STK_RUD), TMPL_INPUT(STK_RUD));
+        setDest(ICC(STK_ELE), TMPL_INPUT(STK_ELE));
+        setDest(ICC(STK_THR), TMPL_INPUT(STK_THR));
+        setDest(ICC(STK_AIL), TMPL_INPUT(STK_AIL));
         break;
 
       // Sticky-T-Cut